kernel: Move CONFIG_IONIC to generic kernel config

It is deactivated everywhere, just set this in the generic config.

Acked-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/armvirt/64/config-5.4 b/target/linux/armvirt/64/config-5.4
index c69ad8943f59bd31c8c0b33767a0ed64800f2514..44d792025bbfbcfa49d3ef7536ce8633c40172f0 100644 (file)
--- a/target/linux/armvirt/64/config-5.4
+++ b/target/linux/armvirt/64/config-5.4
@@ -210,7 +210,6 @@ CONFIG_INLINE_WRITE_LOCK_IRQ=y
 CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
 CONFIG_INLINE_WRITE_UNLOCK_BH=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-# CONFIG_IONIC is not set
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_MEMORY_HOTPLUG is not set

diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4
index b1923da34715f34ee1134db26a02df5bae0a29a0..a0dcc9bb46aeccf2c0b741b0e5c34aa7c08e3fc3 100644 (file)
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -406,7 +406,6 @@ CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IONIC is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y

diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4
index 9c09fb02afca446fc34b6d67226ba7e131f68251..abaaef5549c1498986d7db0bacb7d8a9d618ab3c 100644 (file)
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -412,7 +412,6 @@ CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IONIC is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index ae97a1580e8418e9123dbfc0f92e5d0e43622c69..052409eb62de2a08fa46d79c71e3cbbefd0c7786 100644 (file)
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -2344,6 +2344,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IONIC is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y

diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index 40bf4a9c5c5cc72cb7e07a3c0d8bd0ce86b3a124..11d88cafe8ceb12491917db85a929d47b9a12fa2 100644 (file)
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -552,7 +552,6 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_SUPPORT=y
-# CONFIG_IONIC is not set
 CONFIG_IPC_NS=y
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set

diff --git a/target/linux/malta/be64/config-default b/target/linux/malta/be64/config-default
index 8edef1a8579e2d80236adbdde416974d9fe40013..e7352e68ee62462e0c0edd6cf5494a626cf02e0c 100644 (file)
--- a/target/linux/malta/be64/config-default
+++ b/target/linux/malta/be64/config-default
@@ -13,7 +13,6 @@ CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HUGEPAGES=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_IONIC is not set
 # CONFIG_MIPS32_N32 is not set
 # CONFIG_MIPS32_O32 is not set
 # CONFIG_MIPS_VA_BITS_48 is not set

diff --git a/target/linux/malta/le64/config-default b/target/linux/malta/le64/config-default
index fd4019c7b38f7aea797d844848bb7dcd324dbf8e..23e838aaba418e0744a86facb64bae7146059f02 100644 (file)
--- a/target/linux/malta/le64/config-default
+++ b/target/linux/malta/le64/config-default
@@ -12,7 +12,6 @@ CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HUGEPAGES=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-# CONFIG_IONIC is not set
 # CONFIG_MIPS32_N32 is not set
 # CONFIG_MIPS32_O32 is not set
 # CONFIG_MIPS_VA_BITS_48 is not set

diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7622/config-5.4
index 92da879a826fa1d4b944762cd08b182a4740b44f..71c5a9588fc37320d4b7885d28129f115826475c 100755 (executable)
--- a/target/linux/mediatek/mt7622/config-5.4
+++ b/target/linux/mediatek/mt7622/config-5.4
@@ -374,7 +374,6 @@ CONFIG_INLINE_WRITE_LOCK_IRQ=y
 CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
 CONFIG_INLINE_WRITE_UNLOCK_BH=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-# CONFIG_IONIC is not set
 CONFIG_IO_URING=y
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y

diff --git a/target/linux/mvebu/cortexa53/config-5.4 b/target/linux/mvebu/cortexa53/config-5.4
index c2c55161f66fe718c019cdc088f4ebff8ff3c76f..cc44f997da90df6d79c3e7f2baf59213957f8218 100644 (file)
--- a/target/linux/mvebu/cortexa53/config-5.4
+++ b/target/linux/mvebu/cortexa53/config-5.4
@@ -164,7 +164,6 @@ CONFIG_INLINE_WRITE_LOCK_IRQ=y
 CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
 CONFIG_INLINE_WRITE_UNLOCK_BH=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-# CONFIG_IONIC is not set
 CONFIG_KASAN_STACK=1
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_MFD_SYSCON=y

diff --git a/target/linux/octeon/config-5.4 b/target/linux/octeon/config-5.4
index a0644243cefeaac1e2745d9bc3c992a136e15f15..722a4c773ea7470e246a8e30107e68d215d89efa 100644 (file)
--- a/target/linux/octeon/config-5.4
+++ b/target/linux/octeon/config-5.4
@@ -153,7 +153,6 @@ CONFIG_HZ_250=y
 CONFIG_HZ_PERIODIC=y
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IONIC is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y

diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4
index bc7b46b8791bdbe82b81352387dcbe71f31f60c5..0b402e4de7ffcde81ee1cfcfa743e6ec95af4d67 100644 (file)
--- a/target/linux/octeontx/config-5.4
+++ b/target/linux/octeontx/config-5.4
@@ -385,7 +385,6 @@ CONFIG_INLINE_WRITE_LOCK_IRQ=y
 CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
 CONFIG_INLINE_WRITE_UNLOCK_BH=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-# CONFIG_IONIC is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y

diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index d059e8abbcdf2c810b0b720b944b8bdbc96f8ff4..08dd7222635e8face3eff05fa21d47398fc504ab 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -209,7 +209,6 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_SUPPORT=y
-# CONFIG_IONIC is not set
 # CONFIG_IO_STRICT_DEVMEM is not set
 CONFIG_IO_URING=y
 CONFIG_IRQ_MSI_IOMMU=y

diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index 8d40d99ee9bf0ed10ec0e7474d643477b1ba0712..3954abfd4fbca2546fbcee06a12ad99e3b31b647 100644 (file)
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -268,7 +268,6 @@ CONFIG_INTEL_SOC_DTS_THERMAL=y
 CONFIG_INTERVAL_TREE=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_IOMMU_HELPER=y
-# CONFIG_IONIC is not set
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 # CONFIG_ISCSI_IBFT is not set