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 <hauke@hauke-m.de>

diff --git a/target/linux/gemini/config-5.4 b/target/linux/gemini/config-5.4
index 7cfdb3ccdbd061a7dbea0a9d280471c1669febfe..c98f66148e0bdf11cab223daf87453427112c56b 100644 (file)
--- 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 3bf985dc4c71d903885a9794b42ff4c92d9a4839..457f62b195c0680936b829ae369f46795954cdad 100644 (file)
--- 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 1dc97ce745981f7998d626afd7ecf54f9983c0ae..baa26221c7715b09201ff869701db096a74ad52e 100644 (file)
--- 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 172a9d43b107d8fea12f26ee564a70d0168af936..304d40da949fcc9af4d38363be0f79839bbf89dc 100644 (file)
--- 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 65e82eef8c6ac9d37ce1669817dae6bdd969eee1..b32052ada2cb7161bb64ba9407531174342dfda2 100644 (file)
--- 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 73f6965d01a95a756b74c6caf6e56f5113963c2b..9bcaae2208d9728fbb752f60a0910329b122a66c 100644 (file)
--- 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 aa15fa4ad9b49a4cd0da9a103f8836530e0eb68b..3e2cc70d27b6448ccfbadbde1c17219971d66716 100644 (file)
--- 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 9fc31194695448bd923c71fb4ac1baebe024c32e..9feea93b866f2d2ea47a9e8651b295ec8ba10e82 100644 (file)
--- 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 11f35e295a3a47f6bda4833741417e27709d45d6..c7ac30089261e0218058a94ef619fe9489e45ef9 100644 (file)
--- 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 fedbeb5c4e54e9061daf8dd21c2bfb5f2edf8922..e68534f2ae64bd9efacc2a78fa76caa11c29e6c8 100644 (file)
--- 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 a1663b19988f64333753dbdad7b6e671ee4bfc66..84fce34480bad9705ac6098de71670086358a298 100644 (file)
--- 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 c5e37f8d3bb03a1c171cf49ae8b463c6d6a632b3..6c9cc1af3c7589da204c8a92edcef5e0d9aea9d5 100644 (file)
--- 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 c90700af292510293eb64b44bdab01bb9e36f1cc..2392a39d33117554072f241123cbf9573b0ea513 100644 (file)
--- 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 f26c20c59dbdaf9a81dde295ffb744d716b4ba23..ebc3ec538d25c4372bbc98d4a7a8f6aef52d4b04 100644 (file)
--- 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 130d4b59eafcd5a41c318b2df0ce2f2a05fd1ac6..b25d789db727d1d128ed2956482adfee9b724671 100644 (file)
--- 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