From: Sungbo Eo <mans0n@gorani.run>
Date: Sun, 15 Mar 2020 11:39:36 +0000 (+0900)
Subject: oxnas: remove duplicate config options
X-Git-Tag: v21.02.0-rc1~3468
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=166b2dec9e1032104a139657e23ffa4c501fdb5d;p=openwrt%2Fstaging%2Fhauke.git

oxnas: remove duplicate config options

Remove symbols already covered by generic and target kernel configs.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4
index 3b7f2bcdf6..2fcd462b42 100644
--- a/target/linux/oxnas/config-5.4
+++ b/target/linux/oxnas/config-5.4
@@ -253,7 +253,6 @@ CONFIG_NLS=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
-# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/oxnas/ox810se/config-default b/target/linux/oxnas/ox810se/config-default
index e8257cef4d..e27d65a99c 100644
--- a/target/linux/oxnas/ox810se/config-default
+++ b/target/linux/oxnas/ox810se/config-default
@@ -1,39 +1,12 @@
-CONFIG_ARCH_MULTI_CPU_AUTO=y
-# CONFIG_ARCH_MULTI_V4 is not set
-# CONFIG_ARCH_MULTI_V4T is not set
-CONFIG_ARCH_MULTI_V4_V5=y
-CONFIG_ARCH_MULTI_V5=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_USE_DOMAINS=y
-# CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_UNCOMPRESS is not set
-CONFIG_GENERIC_ATOMIC64=y
 CONFIG_MACH_OX810SE=y
-CONFIG_NEED_KUSER_HELPERS=y
-CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_RCU_EXPERT is not set
 # CONFIG_RCU_NEED_SEGCBLIST is not set
 # CONFIG_RCU_STALL_COMMON is not set
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-CONFIG_TINY_SRCU=y
 CONFIG_EXT4_FS=y
-CONFIG_FAT_FS=y
 CONFIG_FS_MBCACHE=y
diff --git a/target/linux/oxnas/ox820/config-default b/target/linux/oxnas/ox820/config-default
index ed757730ee..f5e18f6116 100644
--- a/target/linux/oxnas/ox820/config-default
+++ b/target/linux/oxnas/ox820/config-default
@@ -13,19 +13,14 @@ CONFIG_CPU_ABRT_EV6=y
 CONFIG_CPU_CACHE_V6=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_PABRT_V6=y
-CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
-CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_V6K=y
 CONFIG_DCACHE_WORD_ACCESS=y
@@ -40,7 +35,6 @@ CONFIG_DEBUG_UART_VIRT=0xf4200000
 CONFIG_DEBUG_UNCOMPRESS=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress-ox820.h"
 CONFIG_DMA_CACHE_RWFO=y
-CONFIG_FIXED_PHY=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y