From ebfc94aee99e3e7bb82a64abb3b9eacd1fae470d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 25 Mar 2021 11:31:23 +0100 Subject: [PATCH] kernel: Move CONFIG_USERIO to generic config The CONFIG_USERIO option is unset in multiple target configurations. On the sunxi target it is activated. Move the kernel configuration option to the generic kernel configuration. Signed-off-by: Hauke Mehrtens --- target/linux/gemini/config-5.4 | 1 - target/linux/generic/config-5.10 | 1 + target/linux/generic/config-5.4 | 1 + target/linux/layerscape/armv8_64b/config-5.4 | 1 - target/linux/malta/config-5.10 | 1 - target/linux/malta/config-5.4 | 1 - target/linux/omap/config-5.4 | 1 - target/linux/oxnas/config-5.10 | 1 - target/linux/oxnas/config-5.4 | 1 - target/linux/rockchip/armv8/config-5.10 | 1 - target/linux/rockchip/armv8/config-5.4 | 1 - target/linux/tegra/config-5.4 | 1 - target/linux/x86/config-5.10 | 1 - target/linux/x86/config-5.4 | 1 - target/linux/zynq/config-5.4 | 1 - 15 files changed, 2 insertions(+), 13 deletions(-) diff --git a/target/linux/gemini/config-5.4 b/target/linux/gemini/config-5.4 index 7cfdb3ccdbd..c98f66148e0 100644 --- a/target/linux/gemini/config-5.4 +++ b/target/linux/gemini/config-5.4 @@ -441,7 +441,6 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_UNWINDER_ARM=y CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_USE_OF=y CONFIG_UTS_NS=y diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 3bf985dc4c7..457f62b195c 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -6688,6 +6688,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_ZR364XX is not set # CONFIG_USELIB is not set # CONFIG_USERFAULTFD is not set +# CONFIG_USERIO is not set # CONFIG_USE_OF is not set # CONFIG_UTS_NS is not set # CONFIG_UWB is not set diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 1dc97ce7459..baa26221c77 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -6242,6 +6242,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_ZR364XX is not set # CONFIG_USELIB is not set # CONFIG_USERFAULTFD is not set +# CONFIG_USERIO is not set # CONFIG_USE_OF is not set # CONFIG_UTS_NS is not set # CONFIG_UWB is not set diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4 index 172a9d43b10..304d40da949 100644 --- a/target/linux/layerscape/armv8_64b/config-5.4 +++ b/target/linux/layerscape/armv8_64b/config-5.4 @@ -925,7 +925,6 @@ CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_UNIX_DIAG=y CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_UTS_NS=y diff --git a/target/linux/malta/config-5.10 b/target/linux/malta/config-5.10 index 65e82eef8c6..b32052ada2c 100644 --- a/target/linux/malta/config-5.10 +++ b/target/linux/malta/config-5.10 @@ -275,7 +275,6 @@ CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y # CONFIG_VGA_CONSOLE is not set CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 73f6965d01a..9bcaae2208d 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -329,7 +329,6 @@ CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y # CONFIG_VGA_CONSOLE is not set CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/omap/config-5.4 b/target/linux/omap/config-5.4 index aa15fa4ad9b..3e2cc70d27b 100644 --- a/target/linux/omap/config-5.4 +++ b/target/linux/omap/config-5.4 @@ -731,7 +731,6 @@ CONFIG_USB_PHY=y CONFIG_USB_SUPPORT=y CONFIG_USB_TI_CPPI41_DMA=y CONFIG_USB_TUSB_OMAP_DMA=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y CONFIG_VFAT_FS=y CONFIG_VFP=y diff --git a/target/linux/oxnas/config-5.10 b/target/linux/oxnas/config-5.10 index 9fc31194695..9feea93b866 100644 --- a/target/linux/oxnas/config-5.10 +++ b/target/linux/oxnas/config-5.10 @@ -343,7 +343,6 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y CONFIG_VERSATILE_FPGA_IRQ=y CONFIG_VERSATILE_FPGA_IRQ_NR=4 diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4 index 11f35e295a3..c7ac3008926 100644 --- a/target/linux/oxnas/config-5.4 +++ b/target/linux/oxnas/config-5.4 @@ -340,7 +340,6 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB_SUPPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y CONFIG_VERSATILE_FPGA_IRQ=y CONFIG_VERSATILE_FPGA_IRQ_NR=4 diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10 index fedbeb5c4e5..e68534f2ae6 100644 --- a/target/linux/rockchip/armv8/config-5.10 +++ b/target/linux/rockchip/armv8/config-5.10 @@ -644,7 +644,6 @@ CONFIG_USB_ULPI_BUS=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=y -# CONFIG_USERIO is not set # CONFIG_VIRTIO_MENU is not set CONFIG_VMAP_STACK=y CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4 index a1663b19988..84fce34480b 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -616,7 +616,6 @@ CONFIG_USB_ULPI_BUS=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=y -# CONFIG_USERIO is not set # CONFIG_VIRTIO_MENU is not set CONFIG_VMAP_STACK=y CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4 index c5e37f8d3bb..6c9cc1af3c7 100644 --- a/target/linux/tegra/config-5.4 +++ b/target/linux/tegra/config-5.4 @@ -551,7 +551,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_TEGRA_PHY=y CONFIG_USB_ULPI=y CONFIG_USB_ULPI_VIEWPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y CONFIG_VFP=y CONFIG_VFPv3=y diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10 index c90700af292..2392a39d331 100644 --- a/target/linux/x86/config-5.10 +++ b/target/linux/x86/config-5.10 @@ -355,7 +355,6 @@ CONFIG_USB_UHCI_HCD=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set -# CONFIG_USERIO is not set # CONFIG_USER_NS is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_VGA_CONSOLE=y diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index f26c20c59db..ebc3ec538d2 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -462,7 +462,6 @@ CONFIG_USB_UHCI_HCD=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set -# CONFIG_USERIO is not set # CONFIG_USER_NS is not set CONFIG_USER_STACKTRACE_SUPPORT=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4 index 130d4b59eaf..b25d789db72 100644 --- a/target/linux/zynq/config-5.4 +++ b/target/linux/zynq/config-5.4 @@ -613,7 +613,6 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI=y CONFIG_USB_ULPI_BUS=y CONFIG_USB_ULPI_VIEWPORT=y -# CONFIG_USERIO is not set CONFIG_USE_OF=y CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y -- 2.30.2