From: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
Date: Tue, 10 Mar 2020 21:25:22 +0000 (+0100)
Subject: sunxi: remove options that are already in generic kconfig
X-Git-Tag: v21.02.0-rc1~3446
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4fbac1ebc5f712de7edbaec48a8779da6b6495b7;p=openwrt%2Fstaging%2Fhauke.git

sunxi: remove options that are already in generic kconfig

These options are already definied in generic 5.4 kconfig.

Signed-off-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
---

diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4
index d55679b842..c2d5260bb3 100644
--- a/target/linux/sunxi/config-5.4
+++ b/target/linux/sunxi/config-5.4
@@ -64,7 +64,6 @@ CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_ATA=y
 CONFIG_ATAGS=y
-# CONFIG_ATA_SFF is not set
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AXP20X_POWER=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -140,7 +139,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -308,7 +306,6 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
-# CONFIG_KERNEL_MODE_NEON is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=y
 CONFIG_KSM=y
 CONFIG_KVM=y
@@ -389,7 +386,6 @@ CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PADATA=y
 CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -425,7 +421,6 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
-# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_PRINTK_TIME=y
@@ -517,10 +512,8 @@ CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SWCONFIG=y
 CONFIG_SWCONFIG_B53=y
-# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
 CONFIG_SWCONFIG_B53_PHY_DRIVER=y
 CONFIG_SWCONFIG_B53_PHY_FIXUP=y
-# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_SWPHY=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYSFS_SYSCALL=y
@@ -570,7 +563,6 @@ CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_WATCHDOG_CORE=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
diff --git a/target/linux/sunxi/cortexa53/config-5.4 b/target/linux/sunxi/cortexa53/config-5.4
index 1b3121eda8..96afdaae73 100644
--- a/target/linux/sunxi/cortexa53/config-5.4
+++ b/target/linux/sunxi/cortexa53/config-5.4
@@ -52,7 +52,6 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_HOLES_IN_ZONE=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_KERNEL_MODE_NEON=y
 CONFIG_KVM_ARM_PMU=y
 CONFIG_KVM_INDIRECT_VECTORS=y
 CONFIG_MDIO_BUS_MUX=y
diff --git a/target/linux/sunxi/cortexa8/config-5.4 b/target/linux/sunxi/cortexa8/config-5.4
index c5ba821668..b03aa7a029 100644
--- a/target/linux/sunxi/cortexa8/config-5.4
+++ b/target/linux/sunxi/cortexa8/config-5.4
@@ -1,4 +1,3 @@
-# CONFIG_ARM_ERRATA_643719 is not set
 # CONFIG_MACH_SUN6I is not set
 # CONFIG_MACH_SUN7I is not set
 # CONFIG_MACH_SUN8I is not set