From 1d03283eb240759b58d7246ba72fabdb35fddb29 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 10 Mar 2020 14:42:01 +0800 Subject: [PATCH] kernel: 5.4: remove some dup config options already set in generic This furthers 860652f4b9da ("kernel: 5.4: move some kconfig options to generic") Signed-off-by: Yousong Zhou --- target/linux/ipq806x/config-5.4 | 6 ------ target/linux/kirkwood/config-5.4 | 6 ------ target/linux/mxs/config-5.4 | 1 - target/linux/octeontx/config-5.4 | 6 ------ target/linux/oxnas/config-5.4 | 6 ------ 5 files changed, 25 deletions(-) diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4 index ccd1a12e7481..d07c02f423f2 100644 --- a/target/linux/ipq806x/config-5.4 +++ b/target/linux/ipq806x/config-5.4 @@ -1,4 +1,3 @@ -CONFIG_64BIT_TIME=y CONFIG_ALIGNMENT_TRAP=y # CONFIG_APQ_GCC_8084 is not set # CONFIG_APQ_MMCC_8084 is not set @@ -155,7 +154,6 @@ CONFIG_DEBUG_GPIO=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_REMAP=y @@ -272,7 +270,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y -CONFIG_KASAN_STACK=1 CONFIG_KPSS_XCC=y CONFIG_KRAITCC=y CONFIG_KRAIT_CLOCKS=y @@ -360,7 +357,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PADATA=y @@ -515,10 +511,8 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4 index 93c630444d74..68eb6569575b 100644 --- a/target/linux/kirkwood/config-5.4 +++ b/target/linux/kirkwood/config-5.4 @@ -1,4 +1,3 @@ -CONFIG_64BIT_TIME=y CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y @@ -116,7 +115,6 @@ CONFIG_DEBUG_UART_VIRT=0xfed12000 CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DEBUG_USER is not set # CONFIG_DLCI is not set -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_REMAP=y CONFIG_DNOTIFY=y CONFIG_DTC=y @@ -208,7 +206,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_KASAN_STACK=1 CONFIG_KIRKWOOD_CLK=y CONFIG_KIRKWOOD_THERMAL=y CONFIG_LEDS_GPIO=y @@ -265,7 +262,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_ORION_IRQCHIP=y @@ -339,9 +335,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_ZSTD is not set -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y diff --git a/target/linux/mxs/config-5.4 b/target/linux/mxs/config-5.4 index a5c3c578c362..7232234b9762 100644 --- a/target/linux/mxs/config-5.4 +++ b/target/linux/mxs/config-5.4 @@ -223,7 +223,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PAGE_OFFSET=0xC0000000 diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4 index 524279f681a6..4db69184c235 100644 --- a/target/linux/octeontx/config-5.4 +++ b/target/linux/octeontx/config-5.4 @@ -1,5 +1,4 @@ CONFIG_64BIT=y -CONFIG_64BIT_TIME=y # CONFIG_ARCH_AGILEX is not set # CONFIG_ARCH_BITMAIN is not set CONFIG_ARCH_CLOCKSOURCE_DATA=y @@ -231,7 +230,6 @@ CONFIG_CRYPTO_SIMD=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DMADEVICES=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -415,7 +413,6 @@ CONFIG_IRQ_WORK=y # CONFIG_ISDN is not set CONFIG_JBD2=y CONFIG_JUMP_LABEL=y -CONFIG_KASAN_STACK=1 CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KSM=y @@ -478,7 +475,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_NUMA=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OPTEE=y CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1 CONFIG_PADATA=y @@ -604,8 +600,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBSAN_ALIGNMENT=y -CONFIG_UNIX_SCM=y CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB=y CONFIG_USB_COMMON=y diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4 index 85e41d9c851b..3b7f2bcdf611 100644 --- a/target/linux/oxnas/config-5.4 +++ b/target/linux/oxnas/config-5.4 @@ -1,4 +1,3 @@ -CONFIG_64BIT_TIME=y CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y @@ -123,7 +122,6 @@ CONFIG_DECOMPRESS_XZ=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_REMAP=y CONFIG_DNOTIFY=y CONFIG_DTC=y @@ -222,7 +220,6 @@ CONFIG_IRQ_WORK=y # CONFIG_ISDN is not set # CONFIG_JFFS2_FS is not set CONFIG_KALLSYMS=y -CONFIG_KASAN_STACK=1 CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC=y @@ -266,7 +263,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OXNAS_RPS_TIMER=y @@ -339,10 +335,8 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TINY_SRCU=y CONFIG_TRACE_CLOCK=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB_SUPPORT=y -- 2.30.2