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/octeontx/config-5.4 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'target/linux/octeontx/config-5.4') diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4 index 524279f681..4db69184c2 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 -- cgit v1.2.3