From 1d03283eb240759b58d7246ba72fabdb35fddb29 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 10 Mar 2020 14:42:01 +0800 Subject: 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/kirkwood/config-5.4 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'target/linux/kirkwood/config-5.4') diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4 index 93c630444d..68eb656957 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 -- cgit v1.2.3