aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2020-03-10 14:42:01 +0800
committerYousong Zhou <yszhou4tech@gmail.com>2020-03-10 14:45:36 +0800
commit1d03283eb240759b58d7246ba72fabdb35fddb29 (patch)
treecefd6da8663f269c4a17e273b7c01fdea590a7fc /target/linux/oxnas
parente5ffb94dc53361a75a1b2920006bdedf0791c7f7 (diff)
downloadupstream-1d03283eb240759b58d7246ba72fabdb35fddb29.tar.gz
upstream-1d03283eb240759b58d7246ba72fabdb35fddb29.tar.bz2
upstream-1d03283eb240759b58d7246ba72fabdb35fddb29.zip
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 <yszhou4tech@gmail.com>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/config-5.46
1 files changed, 0 insertions, 6 deletions
diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4
index 85e41d9c85..3b7f2bcdf6 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