From b35c54227b4fbe7f57ab9d0ddda224cd8b6345a2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 9 Aug 2020 17:28:39 +0200 Subject: [PATCH] kernel: Move CONFIG_IONIC to generic kernel config It is deactivated everywhere, just set this in the generic config. Acked-by: Yousong Zhou Signed-off-by: Hauke Mehrtens --- target/linux/armvirt/64/config-5.4 | 1 - target/linux/bcm27xx/bcm2710/config-5.4 | 1 - target/linux/bcm27xx/bcm2711/config-5.4 | 1 - target/linux/generic/config-5.4 | 1 + target/linux/layerscape/armv8_64b/config-5.4 | 1 - target/linux/malta/be64/config-default | 1 - target/linux/malta/le64/config-default | 1 - target/linux/mediatek/mt7622/config-5.4 | 1 - target/linux/mvebu/cortexa53/config-5.4 | 1 - target/linux/octeon/config-5.4 | 1 - target/linux/octeontx/config-5.4 | 1 - target/linux/rockchip/armv8/config-5.4 | 1 - target/linux/x86/64/config-5.4 | 1 - 13 files changed, 1 insertion(+), 12 deletions(-) diff --git a/target/linux/armvirt/64/config-5.4 b/target/linux/armvirt/64/config-5.4 index c69ad8943f59..44d792025bbf 100644 --- 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 b1923da34715..a0dcc9bb46ae 100644 --- 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 9c09fb02afca..abaaef5549c1 100644 --- 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 ae97a1580e84..052409eb62de 100644 --- 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 40bf4a9c5c5c..11d88cafe8ce 100644 --- 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 8edef1a8579e..e7352e68ee62 100644 --- 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 fd4019c7b38f..23e838aaba41 100644 --- 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 92da879a826f..71c5a9588fc3 100755 --- 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 c2c55161f66f..cc44f997da90 100644 --- 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 a0644243cefe..722a4c773ea7 100644 --- 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 bc7b46b8791b..0b402e4de7ff 100644 --- 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 d059e8abbcdf..08dd7222635e 100644 --- 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 8d40d99ee9bf..3954abfd4fbc 100644 --- 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 -- 2.30.2