configs: Rename config directories to sub-directory

As part of an effort to foster better cross collaboration with
internal Red Hat kernels, align the configs layout to match
that kernel.  This will allow Red Hat engineers to provide easier
guidance on how to set various config options.

In addition, the scripts that process the config options will migrate
to the configs/ directory too in later patches.  Future config
workflows will stage all work in the configs/ area.

A simple diff between the kernels will easily expose which config
options are different.  Reading the comments in the file provides
guidance to Fedora to determine if that kernel should make a
similar change or not.

Rename debugconfig -> configs/base-debug
Rename baseconfig -> configs/base-generic
Rename configs/base-generic/arm/arm64 -> configs/base-generic/arm/aarch64

No code changes made.

10155 files changed, 0 insertions, 0 deletions

diff --git a/debugconfig/CONFIG_ACPI_DEBUG b/configs/base-debug/CONFIG_ACPI_DEBUG
index eeb4407c4..eeb4407c4 100644
--- a/debugconfig/CONFIG_ACPI_DEBUG
+++ b/configs/base-debug/CONFIG_ACPI_DEBUG
diff --git a/debugconfig/CONFIG_ARM64_PTDUMP b/configs/base-debug/CONFIG_ARM64_PTDUMP
index 9a94c23be..9a94c23be 100644
--- a/debugconfig/CONFIG_ARM64_PTDUMP
+++ b/configs/base-debug/CONFIG_ARM64_PTDUMP
diff --git a/debugconfig/CONFIG_ATH_DEBUG b/configs/base-debug/CONFIG_ATH_DEBUG
index 5a0871131..5a0871131 100644
--- a/debugconfig/CONFIG_ATH_DEBUG
+++ b/configs/base-debug/CONFIG_ATH_DEBUG
diff --git a/debugconfig/CONFIG_B43LEGACY_DEBUG b/configs/base-debug/CONFIG_B43LEGACY_DEBUG
index 02f67a471..02f67a471 100644
--- a/debugconfig/CONFIG_B43LEGACY_DEBUG
+++ b/configs/base-debug/CONFIG_B43LEGACY_DEBUG
diff --git a/debugconfig/CONFIG_B43_DEBUG b/configs/base-debug/CONFIG_B43_DEBUG
index 9346a4511..9346a4511 100644
--- a/debugconfig/CONFIG_B43_DEBUG
+++ b/configs/base-debug/CONFIG_B43_DEBUG
diff --git a/debugconfig/CONFIG_CAN_DEBUG_DEVICES b/configs/base-debug/CONFIG_CAN_DEBUG_DEVICES
index 31f8d9411..31f8d9411 100644
--- a/debugconfig/CONFIG_CAN_DEBUG_DEVICES
+++ b/configs/base-debug/CONFIG_CAN_DEBUG_DEVICES
diff --git a/debugconfig/CONFIG_CARL9170_DEBUGFS b/configs/base-debug/CONFIG_CARL9170_DEBUGFS
index b965aefe3..b965aefe3 100644
--- a/debugconfig/CONFIG_CARL9170_DEBUGFS
+++ b/configs/base-debug/CONFIG_CARL9170_DEBUGFS
diff --git a/debugconfig/CONFIG_CEPH_LIB_PRETTYDEBUG b/configs/base-debug/CONFIG_CEPH_LIB_PRETTYDEBUG
index e30b3da3a..e30b3da3a 100644
--- a/debugconfig/CONFIG_CEPH_LIB_PRETTYDEBUG
+++ b/configs/base-debug/CONFIG_CEPH_LIB_PRETTYDEBUG
diff --git a/debugconfig/CONFIG_CPU_NOTIFIER_ERROR_INJECT b/configs/base-debug/CONFIG_CPU_NOTIFIER_ERROR_INJECT
index 07cab8fee..07cab8fee 100644
--- a/debugconfig/CONFIG_CPU_NOTIFIER_ERROR_INJECT
+++ b/configs/base-debug/CONFIG_CPU_NOTIFIER_ERROR_INJECT
diff --git a/debugconfig/CONFIG_DEBUG_ATOMIC_SLEEP b/configs/base-debug/CONFIG_DEBUG_ATOMIC_SLEEP
index 5a3c352f4..5a3c352f4 100644
--- a/debugconfig/CONFIG_DEBUG_ATOMIC_SLEEP
+++ b/configs/base-debug/CONFIG_DEBUG_ATOMIC_SLEEP
diff --git a/debugconfig/CONFIG_DEBUG_BLK_CGROUP b/configs/base-debug/CONFIG_DEBUG_BLK_CGROUP
index 997e389d7..997e389d7 100644
--- a/debugconfig/CONFIG_DEBUG_BLK_CGROUP
+++ b/configs/base-debug/CONFIG_DEBUG_BLK_CGROUP
diff --git a/debugconfig/CONFIG_DEBUG_CREDENTIALS b/configs/base-debug/CONFIG_DEBUG_CREDENTIALS
index 0911429f4..0911429f4 100644
--- a/debugconfig/CONFIG_DEBUG_CREDENTIALS
+++ b/configs/base-debug/CONFIG_DEBUG_CREDENTIALS
diff --git a/debugconfig/CONFIG_DEBUG_FORCE_WEAK_PER_CPU b/configs/base-debug/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
index 0d5a82e69..0d5a82e69 100644
--- a/debugconfig/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
+++ b/configs/base-debug/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
diff --git a/debugconfig/CONFIG_DEBUG_KMEMLEAK b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK
index 0e9b0e169..0e9b0e169 100644
--- a/debugconfig/CONFIG_DEBUG_KMEMLEAK
+++ b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK
diff --git a/debugconfig/CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
index d7041412d..d7041412d 100644
--- a/debugconfig/CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
+++ b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
diff --git a/debugconfig/CONFIG_DEBUG_KMEMLEAK_EARLY b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK_EARLY
index 48732e524..48732e524 100644
--- a/debugconfig/CONFIG_DEBUG_KMEMLEAK_EARLY
+++ b/configs/base-debug/CONFIG_DEBUG_KMEMLEAK_EARLY
diff --git a/debugconfig/CONFIG_DEBUG_LOCK_ALLOC b/configs/base-debug/CONFIG_DEBUG_LOCK_ALLOC
index 8a3e5c0ad..8a3e5c0ad 100644
--- a/debugconfig/CONFIG_DEBUG_LOCK_ALLOC
+++ b/configs/base-debug/CONFIG_DEBUG_LOCK_ALLOC
diff --git a/debugconfig/CONFIG_DEBUG_MUTEXES b/configs/base-debug/CONFIG_DEBUG_MUTEXES
index b8204fed6..b8204fed6 100644
--- a/debugconfig/CONFIG_DEBUG_MUTEXES
+++ b/configs/base-debug/CONFIG_DEBUG_MUTEXES
diff --git a/debugconfig/CONFIG_DEBUG_NOTIFIERS b/configs/base-debug/CONFIG_DEBUG_NOTIFIERS
index fc84e6614..fc84e6614 100644
--- a/debugconfig/CONFIG_DEBUG_NOTIFIERS
+++ b/configs/base-debug/CONFIG_DEBUG_NOTIFIERS
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS b/configs/base-debug/CONFIG_DEBUG_OBJECTS
index edd26a859..edd26a859 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS_FREE b/configs/base-debug/CONFIG_DEBUG_OBJECTS_FREE
index 449c27a9d..449c27a9d 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS_FREE
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS_FREE
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER b/configs/base-debug/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER
index b31dd6749..b31dd6749 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS_RCU_HEAD b/configs/base-debug/CONFIG_DEBUG_OBJECTS_RCU_HEAD
index 8909d264f..8909d264f 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS_RCU_HEAD
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS_RCU_HEAD
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS_TIMERS b/configs/base-debug/CONFIG_DEBUG_OBJECTS_TIMERS
index d321c4a81..d321c4a81 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS_TIMERS
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS_TIMERS
diff --git a/debugconfig/CONFIG_DEBUG_OBJECTS_WORK b/configs/base-debug/CONFIG_DEBUG_OBJECTS_WORK
index 6b0adfc94..6b0adfc94 100644
--- a/debugconfig/CONFIG_DEBUG_OBJECTS_WORK
+++ b/configs/base-debug/CONFIG_DEBUG_OBJECTS_WORK
diff --git a/baseconfig/CONFIG_DEBUG_PAGEALLOC b/configs/base-debug/CONFIG_DEBUG_PAGEALLOC
index 0e1c7855b..0e1c7855b 100644
--- a/baseconfig/CONFIG_DEBUG_PAGEALLOC
+++ b/configs/base-debug/CONFIG_DEBUG_PAGEALLOC
diff --git a/debugconfig/CONFIG_DEBUG_PERF_USE_VMALLOC b/configs/base-debug/CONFIG_DEBUG_PERF_USE_VMALLOC
index 3aeeb5cd4..3aeeb5cd4 100644
--- a/debugconfig/CONFIG_DEBUG_PERF_USE_VMALLOC
+++ b/configs/base-debug/CONFIG_DEBUG_PERF_USE_VMALLOC
diff --git a/debugconfig/CONFIG_DEBUG_PER_CPU_MAPS b/configs/base-debug/CONFIG_DEBUG_PER_CPU_MAPS
index 0b1af0ede..0b1af0ede 100644
--- a/debugconfig/CONFIG_DEBUG_PER_CPU_MAPS
+++ b/configs/base-debug/CONFIG_DEBUG_PER_CPU_MAPS
diff --git a/debugconfig/CONFIG_DEBUG_PI_LIST b/configs/base-debug/CONFIG_DEBUG_PI_LIST
index 0a47f5b7e..0a47f5b7e 100644
--- a/debugconfig/CONFIG_DEBUG_PI_LIST
+++ b/configs/base-debug/CONFIG_DEBUG_PI_LIST
diff --git a/debugconfig/CONFIG_DEBUG_REFCOUNT b/configs/base-debug/CONFIG_DEBUG_REFCOUNT
index cf296c8de..cf296c8de 100644
--- a/debugconfig/CONFIG_DEBUG_REFCOUNT
+++ b/configs/base-debug/CONFIG_DEBUG_REFCOUNT
diff --git a/debugconfig/CONFIG_DEBUG_RT_MUTEXES b/configs/base-debug/CONFIG_DEBUG_RT_MUTEXES
index ef986edc1..ef986edc1 100644
--- a/debugconfig/CONFIG_DEBUG_RT_MUTEXES
+++ b/configs/base-debug/CONFIG_DEBUG_RT_MUTEXES
diff --git a/debugconfig/CONFIG_DEBUG_SG b/configs/base-debug/CONFIG_DEBUG_SG
index 02361b0bc..02361b0bc 100644
--- a/debugconfig/CONFIG_DEBUG_SG
+++ b/configs/base-debug/CONFIG_DEBUG_SG
diff --git a/debugconfig/CONFIG_DEBUG_SLAB b/configs/base-debug/CONFIG_DEBUG_SLAB
index 1baa7ec85..1baa7ec85 100644
--- a/debugconfig/CONFIG_DEBUG_SLAB
+++ b/configs/base-debug/CONFIG_DEBUG_SLAB
diff --git a/debugconfig/CONFIG_DEBUG_SPINLOCK b/configs/base-debug/CONFIG_DEBUG_SPINLOCK
index 5642145af..5642145af 100644
--- a/debugconfig/CONFIG_DEBUG_SPINLOCK
+++ b/configs/base-debug/CONFIG_DEBUG_SPINLOCK
diff --git a/debugconfig/CONFIG_DEBUG_STACK_USAGE b/configs/base-debug/CONFIG_DEBUG_STACK_USAGE
index 8a710b684..8a710b684 100644
--- a/debugconfig/CONFIG_DEBUG_STACK_USAGE
+++ b/configs/base-debug/CONFIG_DEBUG_STACK_USAGE
diff --git a/baseconfig/CONFIG_DEBUG_VM b/configs/base-debug/CONFIG_DEBUG_VM
index d19bdfddb..d19bdfddb 100644
--- a/baseconfig/CONFIG_DEBUG_VM
+++ b/configs/base-debug/CONFIG_DEBUG_VM
diff --git a/debugconfig/CONFIG_DEBUG_VM_PGFLAGS b/configs/base-debug/CONFIG_DEBUG_VM_PGFLAGS
index 7469f919a..7469f919a 100644
--- a/debugconfig/CONFIG_DEBUG_VM_PGFLAGS
+++ b/configs/base-debug/CONFIG_DEBUG_VM_PGFLAGS
diff --git a/debugconfig/CONFIG_DETECT_HUNG_TASK b/configs/base-debug/CONFIG_DETECT_HUNG_TASK
index 28ac9ac1f..28ac9ac1f 100644
--- a/debugconfig/CONFIG_DETECT_HUNG_TASK
+++ b/configs/base-debug/CONFIG_DETECT_HUNG_TASK
diff --git a/debugconfig/CONFIG_DMADEVICES_DEBUG b/configs/base-debug/CONFIG_DMADEVICES_DEBUG
index 0b101be4e..0b101be4e 100644
--- a/debugconfig/CONFIG_DMADEVICES_DEBUG
+++ b/configs/base-debug/CONFIG_DMADEVICES_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_DMADEVICES_VDEBUG b/configs/base-debug/CONFIG_DMADEVICES_VDEBUG
index b1584ee3b..b1584ee3b 100644
--- a/baseconfig/arm/armv7/CONFIG_DMADEVICES_VDEBUG
+++ b/configs/base-debug/CONFIG_DMADEVICES_VDEBUG
diff --git a/debugconfig/CONFIG_DMA_API_DEBUG b/configs/base-debug/CONFIG_DMA_API_DEBUG
index d5c832fe4..d5c832fe4 100644
--- a/debugconfig/CONFIG_DMA_API_DEBUG
+++ b/configs/base-debug/CONFIG_DMA_API_DEBUG
diff --git a/debugconfig/CONFIG_DRBD_FAULT_INJECTION b/configs/base-debug/CONFIG_DRBD_FAULT_INJECTION
index 3ebb5a38e..3ebb5a38e 100644
--- a/debugconfig/CONFIG_DRBD_FAULT_INJECTION
+++ b/configs/base-debug/CONFIG_DRBD_FAULT_INJECTION
diff --git a/debugconfig/CONFIG_EFI_PGT_DUMP b/configs/base-debug/CONFIG_EFI_PGT_DUMP
index 42e942258..42e942258 100644
--- a/debugconfig/CONFIG_EFI_PGT_DUMP
+++ b/configs/base-debug/CONFIG_EFI_PGT_DUMP
diff --git a/debugconfig/CONFIG_EXT4_DEBUG b/configs/base-debug/CONFIG_EXT4_DEBUG
index 878ac6b45..878ac6b45 100644
--- a/debugconfig/CONFIG_EXT4_DEBUG
+++ b/configs/base-debug/CONFIG_EXT4_DEBUG
diff --git a/debugconfig/CONFIG_FAILSLAB b/configs/base-debug/CONFIG_FAILSLAB
index 46d92ad21..46d92ad21 100644
--- a/debugconfig/CONFIG_FAILSLAB
+++ b/configs/base-debug/CONFIG_FAILSLAB
diff --git a/debugconfig/CONFIG_FAIL_IO_TIMEOUT b/configs/base-debug/CONFIG_FAIL_IO_TIMEOUT
index cca143964..cca143964 100644
--- a/debugconfig/CONFIG_FAIL_IO_TIMEOUT
+++ b/configs/base-debug/CONFIG_FAIL_IO_TIMEOUT
diff --git a/debugconfig/CONFIG_FAIL_MAKE_REQUEST b/configs/base-debug/CONFIG_FAIL_MAKE_REQUEST
index cc65a4ab0..cc65a4ab0 100644
--- a/debugconfig/CONFIG_FAIL_MAKE_REQUEST
+++ b/configs/base-debug/CONFIG_FAIL_MAKE_REQUEST
diff --git a/debugconfig/CONFIG_FAIL_MMC_REQUEST b/configs/base-debug/CONFIG_FAIL_MMC_REQUEST
index aa7fe5a82..aa7fe5a82 100644
--- a/debugconfig/CONFIG_FAIL_MMC_REQUEST
+++ b/configs/base-debug/CONFIG_FAIL_MMC_REQUEST
diff --git a/debugconfig/CONFIG_FAIL_PAGE_ALLOC b/configs/base-debug/CONFIG_FAIL_PAGE_ALLOC
index ca1ddbbde..ca1ddbbde 100644
--- a/debugconfig/CONFIG_FAIL_PAGE_ALLOC
+++ b/configs/base-debug/CONFIG_FAIL_PAGE_ALLOC
diff --git a/debugconfig/CONFIG_FAULT_INJECTION b/configs/base-debug/CONFIG_FAULT_INJECTION
index 3fa074698..3fa074698 100644
--- a/debugconfig/CONFIG_FAULT_INJECTION
+++ b/configs/base-debug/CONFIG_FAULT_INJECTION
diff --git a/debugconfig/CONFIG_FAULT_INJECTION_DEBUG_FS b/configs/base-debug/CONFIG_FAULT_INJECTION_DEBUG_FS
index 272b69161..272b69161 100644
--- a/debugconfig/CONFIG_FAULT_INJECTION_DEBUG_FS
+++ b/configs/base-debug/CONFIG_FAULT_INJECTION_DEBUG_FS
diff --git a/debugconfig/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER b/configs/base-debug/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
index a487df351..a487df351 100644
--- a/debugconfig/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
+++ b/configs/base-debug/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
diff --git a/debugconfig/CONFIG_IWLWIFI_DEVICE_TRACING b/configs/base-debug/CONFIG_IWLWIFI_DEVICE_TRACING
index ae00a4727..ae00a4727 100644
--- a/debugconfig/CONFIG_IWLWIFI_DEVICE_TRACING
+++ b/configs/base-debug/CONFIG_IWLWIFI_DEVICE_TRACING
diff --git a/debugconfig/CONFIG_JBD2_DEBUG b/configs/base-debug/CONFIG_JBD2_DEBUG
index 8d6ceeacc..8d6ceeacc 100644
--- a/debugconfig/CONFIG_JBD2_DEBUG
+++ b/configs/base-debug/CONFIG_JBD2_DEBUG
diff --git a/debugconfig/CONFIG_KDB_DEFAULT_ENABLE b/configs/base-debug/CONFIG_KDB_DEFAULT_ENABLE
index aeef61ee9..aeef61ee9 100644
--- a/debugconfig/CONFIG_KDB_DEFAULT_ENABLE
+++ b/configs/base-debug/CONFIG_KDB_DEFAULT_ENABLE
diff --git a/debugconfig/CONFIG_KDB_KEYBOARD b/configs/base-debug/CONFIG_KDB_KEYBOARD
index afe601d90..afe601d90 100644
--- a/debugconfig/CONFIG_KDB_KEYBOARD
+++ b/configs/base-debug/CONFIG_KDB_KEYBOARD
diff --git a/debugconfig/CONFIG_KGDB_GDB b/configs/base-debug/CONFIG_KGDB_GDB
index 3bb4d48c4..3bb4d48c4 100644
--- a/debugconfig/CONFIG_KGDB_GDB
+++ b/configs/base-debug/CONFIG_KGDB_GDB
diff --git a/debugconfig/CONFIG_LOCK_STAT b/configs/base-debug/CONFIG_LOCK_STAT
index e8b2a5f50..e8b2a5f50 100644
--- a/debugconfig/CONFIG_LOCK_STAT
+++ b/configs/base-debug/CONFIG_LOCK_STAT
diff --git a/debugconfig/CONFIG_LOCK_TORTURE_TEST b/configs/base-debug/CONFIG_LOCK_TORTURE_TEST
index 321718457..321718457 100644
--- a/debugconfig/CONFIG_LOCK_TORTURE_TEST
+++ b/configs/base-debug/CONFIG_LOCK_TORTURE_TEST
diff --git a/baseconfig/x86/CONFIG_MAXSMP b/configs/base-debug/CONFIG_MAXSMP
index d0d71de53..d0d71de53 100644
--- a/baseconfig/x86/CONFIG_MAXSMP
+++ b/configs/base-debug/CONFIG_MAXSMP
diff --git a/baseconfig/x86/CONFIG_MMIOTRACE b/configs/base-debug/CONFIG_MMIOTRACE
index dd8016c2c..dd8016c2c 100644
--- a/baseconfig/x86/CONFIG_MMIOTRACE
+++ b/configs/base-debug/CONFIG_MMIOTRACE
diff --git a/debugconfig/CONFIG_MODULE_FORCE_UNLOAD b/configs/base-debug/CONFIG_MODULE_FORCE_UNLOAD
index e03c0cb69..e03c0cb69 100644
--- a/debugconfig/CONFIG_MODULE_FORCE_UNLOAD
+++ b/configs/base-debug/CONFIG_MODULE_FORCE_UNLOAD
diff --git a/debugconfig/CONFIG_NFSD_FAULT_INJECTION b/configs/base-debug/CONFIG_NFSD_FAULT_INJECTION
index 7ddd9be3b..7ddd9be3b 100644
--- a/debugconfig/CONFIG_NFSD_FAULT_INJECTION
+++ b/configs/base-debug/CONFIG_NFSD_FAULT_INJECTION
diff --git a/debugconfig/CONFIG_PM_ADVANCED_DEBUG b/configs/base-debug/CONFIG_PM_ADVANCED_DEBUG
index 4d0cf54d2..4d0cf54d2 100644
--- a/debugconfig/CONFIG_PM_ADVANCED_DEBUG
+++ b/configs/base-debug/CONFIG_PM_ADVANCED_DEBUG
diff --git a/baseconfig/CONFIG_PM_TEST_SUSPEND b/configs/base-debug/CONFIG_PM_TEST_SUSPEND
index ce7dae5cb..ce7dae5cb 100644
--- a/baseconfig/CONFIG_PM_TEST_SUSPEND
+++ b/configs/base-debug/CONFIG_PM_TEST_SUSPEND
diff --git a/debugconfig/CONFIG_PROVE_LOCKING b/configs/base-debug/CONFIG_PROVE_LOCKING
index 36980566b..36980566b 100644
--- a/debugconfig/CONFIG_PROVE_LOCKING
+++ b/configs/base-debug/CONFIG_PROVE_LOCKING
diff --git a/debugconfig/CONFIG_PROVE_RCU b/configs/base-debug/CONFIG_PROVE_RCU
index d7a71a2e7..d7a71a2e7 100644
--- a/debugconfig/CONFIG_PROVE_RCU
+++ b/configs/base-debug/CONFIG_PROVE_RCU
diff --git a/debugconfig/CONFIG_QUOTA_DEBUG b/configs/base-debug/CONFIG_QUOTA_DEBUG
index 584e3dff4..584e3dff4 100644
--- a/debugconfig/CONFIG_QUOTA_DEBUG
+++ b/configs/base-debug/CONFIG_QUOTA_DEBUG
diff --git a/debugconfig/CONFIG_REFCOUNT_FULL b/configs/base-debug/CONFIG_REFCOUNT_FULL
index c7e4a167a..c7e4a167a 100644
--- a/debugconfig/CONFIG_REFCOUNT_FULL
+++ b/configs/base-debug/CONFIG_REFCOUNT_FULL
diff --git a/debugconfig/CONFIG_SND_DEBUG b/configs/base-debug/CONFIG_SND_DEBUG
index e010c86a7..e010c86a7 100644
--- a/debugconfig/CONFIG_SND_DEBUG
+++ b/configs/base-debug/CONFIG_SND_DEBUG
diff --git a/debugconfig/CONFIG_SND_PCM_XRUN_DEBUG b/configs/base-debug/CONFIG_SND_PCM_XRUN_DEBUG
index abc910421..abc910421 100644
--- a/debugconfig/CONFIG_SND_PCM_XRUN_DEBUG
+++ b/configs/base-debug/CONFIG_SND_PCM_XRUN_DEBUG
diff --git a/debugconfig/CONFIG_SND_VERBOSE_PRINTK b/configs/base-debug/CONFIG_SND_VERBOSE_PRINTK
index 1ccc7cafc..1ccc7cafc 100644
--- a/debugconfig/CONFIG_SND_VERBOSE_PRINTK
+++ b/configs/base-debug/CONFIG_SND_VERBOSE_PRINTK
diff --git a/debugconfig/CONFIG_TEST_LIST_SORT b/configs/base-debug/CONFIG_TEST_LIST_SORT
index be97b6ab5..be97b6ab5 100644
--- a/debugconfig/CONFIG_TEST_LIST_SORT
+++ b/configs/base-debug/CONFIG_TEST_LIST_SORT
diff --git a/debugconfig/CONFIG_WQ_WATCHDOG b/configs/base-debug/CONFIG_WQ_WATCHDOG
index 262e5853d..262e5853d 100644
--- a/debugconfig/CONFIG_WQ_WATCHDOG
+++ b/configs/base-debug/CONFIG_WQ_WATCHDOG
diff --git a/debugconfig/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK b/configs/base-debug/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
index a7f3f793f..a7f3f793f 100644
--- a/debugconfig/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
+++ b/configs/base-debug/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
diff --git a/debugconfig/CONFIG_X86_PTDUMP b/configs/base-debug/CONFIG_X86_PTDUMP
index fa4b11459..fa4b11459 100644
--- a/debugconfig/CONFIG_X86_PTDUMP
+++ b/configs/base-debug/CONFIG_X86_PTDUMP
diff --git a/baseconfig/CONFIG_DMADEVICES_DEBUG b/configs/base-debug/arm/CONFIG_DMADEVICES_DEBUG
index 7cd4fec86..7cd4fec86 100644
--- a/baseconfig/CONFIG_DMADEVICES_DEBUG
+++ b/configs/base-debug/arm/CONFIG_DMADEVICES_DEBUG
diff --git a/baseconfig/CONFIG_LOCK_STAT b/configs/base-debug/arm/CONFIG_LOCK_STAT
index ab733ddc2..ab733ddc2 100644
--- a/baseconfig/CONFIG_LOCK_STAT
+++ b/configs/base-debug/arm/CONFIG_LOCK_STAT
diff --git a/baseconfig/CONFIG_DEBUG_PER_CPU_MAPS b/configs/base-debug/x86/CONFIG_DEBUG_PER_CPU_MAPS
index 01ead7281..01ead7281 100644
--- a/baseconfig/CONFIG_DEBUG_PER_CPU_MAPS
+++ b/configs/base-debug/x86/CONFIG_DEBUG_PER_CPU_MAPS
diff --git a/debugconfig/x86/x86_64/CONFIG_NR_CPUS b/configs/base-debug/x86/x86_64/CONFIG_NR_CPUS
index 441191641..441191641 100644
--- a/debugconfig/x86/x86_64/CONFIG_NR_CPUS
+++ b/configs/base-debug/x86/x86_64/CONFIG_NR_CPUS
diff --git a/baseconfig/CONFIG_60XX_WDT b/configs/base-generic/CONFIG_60XX_WDT
index 4506c4b5b..4506c4b5b 100644
--- a/baseconfig/CONFIG_60XX_WDT
+++ b/configs/base-generic/CONFIG_60XX_WDT
diff --git a/baseconfig/CONFIG_6LOWPAN b/configs/base-generic/CONFIG_6LOWPAN
index 4b6ead829..4b6ead829 100644
--- a/baseconfig/CONFIG_6LOWPAN
+++ b/configs/base-generic/CONFIG_6LOWPAN
diff --git a/baseconfig/CONFIG_6LOWPAN_DEBUGFS b/configs/base-generic/CONFIG_6LOWPAN_DEBUGFS
index 5b4c23c8f..5b4c23c8f 100644
--- a/baseconfig/CONFIG_6LOWPAN_DEBUGFS
+++ b/configs/base-generic/CONFIG_6LOWPAN_DEBUGFS
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST
index 8fdec204d..8fdec204d 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG
index 1ff6c345d..1ff6c345d 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP
index faf698c43..faf698c43 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE
index 83b853c98..83b853c98 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_ICMPV6 b/configs/base-generic/CONFIG_6LOWPAN_GHC_ICMPV6
index 0fa73a5fc..0fa73a5fc 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_ICMPV6
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_ICMPV6
diff --git a/baseconfig/CONFIG_6LOWPAN_GHC_UDP b/configs/base-generic/CONFIG_6LOWPAN_GHC_UDP
index 20709b762..20709b762 100644
--- a/baseconfig/CONFIG_6LOWPAN_GHC_UDP
+++ b/configs/base-generic/CONFIG_6LOWPAN_GHC_UDP
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC b/configs/base-generic/CONFIG_6LOWPAN_NHC
index 458180903..458180903 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_DEST b/configs/base-generic/CONFIG_6LOWPAN_NHC_DEST
index f17af11a8..f17af11a8 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_DEST
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_DEST
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_FRAGMENT b/configs/base-generic/CONFIG_6LOWPAN_NHC_FRAGMENT
index 2e477862a..2e477862a 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_FRAGMENT
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_FRAGMENT
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_HOP b/configs/base-generic/CONFIG_6LOWPAN_NHC_HOP
index 0c38fd2b8..0c38fd2b8 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_HOP
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_HOP
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_IPV6 b/configs/base-generic/CONFIG_6LOWPAN_NHC_IPV6
index bd54173af..bd54173af 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_IPV6
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_IPV6
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_MOBILITY b/configs/base-generic/CONFIG_6LOWPAN_NHC_MOBILITY
index 272d31787..272d31787 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_MOBILITY
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_MOBILITY
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_ROUTING b/configs/base-generic/CONFIG_6LOWPAN_NHC_ROUTING
index 41924a682..41924a682 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_ROUTING
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_ROUTING
diff --git a/baseconfig/CONFIG_6LOWPAN_NHC_UDP b/configs/base-generic/CONFIG_6LOWPAN_NHC_UDP
index 77c91dabd..77c91dabd 100644
--- a/baseconfig/CONFIG_6LOWPAN_NHC_UDP
+++ b/configs/base-generic/CONFIG_6LOWPAN_NHC_UDP
diff --git a/baseconfig/CONFIG_6PACK b/configs/base-generic/CONFIG_6PACK
index 773e4f1a8..773e4f1a8 100644
--- a/baseconfig/CONFIG_6PACK
+++ b/configs/base-generic/CONFIG_6PACK
diff --git a/baseconfig/CONFIG_8139CP b/configs/base-generic/CONFIG_8139CP
index 7688cd893..7688cd893 100644
--- a/baseconfig/CONFIG_8139CP
+++ b/configs/base-generic/CONFIG_8139CP
diff --git a/baseconfig/CONFIG_8139TOO b/configs/base-generic/CONFIG_8139TOO
index fe0133295..fe0133295 100644
--- a/baseconfig/CONFIG_8139TOO
+++ b/configs/base-generic/CONFIG_8139TOO
diff --git a/baseconfig/CONFIG_8139TOO_8129 b/configs/base-generic/CONFIG_8139TOO_8129
index b8b8ef3d7..b8b8ef3d7 100644
--- a/baseconfig/CONFIG_8139TOO_8129
+++ b/configs/base-generic/CONFIG_8139TOO_8129
diff --git a/baseconfig/CONFIG_8139TOO_PIO b/configs/base-generic/CONFIG_8139TOO_PIO
index 28b3b851a..28b3b851a 100644
--- a/baseconfig/CONFIG_8139TOO_PIO
+++ b/configs/base-generic/CONFIG_8139TOO_PIO
diff --git a/baseconfig/CONFIG_8139TOO_TUNE_TWISTER b/configs/base-generic/CONFIG_8139TOO_TUNE_TWISTER
index ba1c1bd0d..ba1c1bd0d 100644
--- a/baseconfig/CONFIG_8139TOO_TUNE_TWISTER
+++ b/configs/base-generic/CONFIG_8139TOO_TUNE_TWISTER
diff --git a/baseconfig/CONFIG_8139_OLD_RX_RESET b/configs/base-generic/CONFIG_8139_OLD_RX_RESET
index d30a504da..d30a504da 100644
--- a/baseconfig/CONFIG_8139_OLD_RX_RESET
+++ b/configs/base-generic/CONFIG_8139_OLD_RX_RESET
diff --git a/baseconfig/CONFIG_8723AU_AP_MODE b/configs/base-generic/CONFIG_8723AU_AP_MODE
index ce3e4c0b6..ce3e4c0b6 100644
--- a/baseconfig/CONFIG_8723AU_AP_MODE
+++ b/configs/base-generic/CONFIG_8723AU_AP_MODE
diff --git a/baseconfig/CONFIG_8723AU_BT_COEXIST b/configs/base-generic/CONFIG_8723AU_BT_COEXIST
index 6aab1d0b8..6aab1d0b8 100644
--- a/baseconfig/CONFIG_8723AU_BT_COEXIST
+++ b/configs/base-generic/CONFIG_8723AU_BT_COEXIST
diff --git a/baseconfig/CONFIG_9P_FS b/configs/base-generic/CONFIG_9P_FS
index f7f752d51..f7f752d51 100644
--- a/baseconfig/CONFIG_9P_FS
+++ b/configs/base-generic/CONFIG_9P_FS
diff --git a/baseconfig/CONFIG_9P_FSCACHE b/configs/base-generic/CONFIG_9P_FSCACHE
index aa032883e..aa032883e 100644
--- a/baseconfig/CONFIG_9P_FSCACHE
+++ b/configs/base-generic/CONFIG_9P_FSCACHE
diff --git a/baseconfig/CONFIG_9P_FS_POSIX_ACL b/configs/base-generic/CONFIG_9P_FS_POSIX_ACL
index 1e6bdf4a3..1e6bdf4a3 100644
--- a/baseconfig/CONFIG_9P_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_9P_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_9P_FS_SECURITY b/configs/base-generic/CONFIG_9P_FS_SECURITY
index 059a20dbd..059a20dbd 100644
--- a/baseconfig/CONFIG_9P_FS_SECURITY
+++ b/configs/base-generic/CONFIG_9P_FS_SECURITY
diff --git a/baseconfig/CONFIG_A11Y_BRAILLE_CONSOLE b/configs/base-generic/CONFIG_A11Y_BRAILLE_CONSOLE
index f363662a7..f363662a7 100644
--- a/baseconfig/CONFIG_A11Y_BRAILLE_CONSOLE
+++ b/configs/base-generic/CONFIG_A11Y_BRAILLE_CONSOLE
diff --git a/baseconfig/CONFIG_AB3100_CORE b/configs/base-generic/CONFIG_AB3100_CORE
index f2cd31717..f2cd31717 100644
--- a/baseconfig/CONFIG_AB3100_CORE
+++ b/configs/base-generic/CONFIG_AB3100_CORE
diff --git a/baseconfig/CONFIG_AB3100_OTP b/configs/base-generic/CONFIG_AB3100_OTP
index 9382666c6..9382666c6 100644
--- a/baseconfig/CONFIG_AB3100_OTP
+++ b/configs/base-generic/CONFIG_AB3100_OTP
diff --git a/baseconfig/CONFIG_ABP060MG b/configs/base-generic/CONFIG_ABP060MG
index 23ef37890..23ef37890 100644
--- a/baseconfig/CONFIG_ABP060MG
+++ b/configs/base-generic/CONFIG_ABP060MG
diff --git a/baseconfig/CONFIG_ABX500_CORE b/configs/base-generic/CONFIG_ABX500_CORE
index a31cac647..a31cac647 100644
--- a/baseconfig/CONFIG_ABX500_CORE
+++ b/configs/base-generic/CONFIG_ABX500_CORE
diff --git a/baseconfig/CONFIG_ACCESSIBILITY b/configs/base-generic/CONFIG_ACCESSIBILITY
index 518ea3c27..518ea3c27 100644
--- a/baseconfig/CONFIG_ACCESSIBILITY
+++ b/configs/base-generic/CONFIG_ACCESSIBILITY
diff --git a/baseconfig/CONFIG_ACENIC b/configs/base-generic/CONFIG_ACENIC
index 1d4146b92..1d4146b92 100644
--- a/baseconfig/CONFIG_ACENIC
+++ b/configs/base-generic/CONFIG_ACENIC
diff --git a/baseconfig/CONFIG_ACENIC_OMIT_TIGON_I b/configs/base-generic/CONFIG_ACENIC_OMIT_TIGON_I
index 706ae3868..706ae3868 100644
--- a/baseconfig/CONFIG_ACENIC_OMIT_TIGON_I
+++ b/configs/base-generic/CONFIG_ACENIC_OMIT_TIGON_I
diff --git a/baseconfig/CONFIG_ACORN_PARTITION b/configs/base-generic/CONFIG_ACORN_PARTITION
index 91e1dd621..91e1dd621 100644
--- a/baseconfig/CONFIG_ACORN_PARTITION
+++ b/configs/base-generic/CONFIG_ACORN_PARTITION
diff --git a/baseconfig/CONFIG_ACPI_ALS b/configs/base-generic/CONFIG_ACPI_ALS
index 338a0f0de..338a0f0de 100644
--- a/baseconfig/CONFIG_ACPI_ALS
+++ b/configs/base-generic/CONFIG_ACPI_ALS
diff --git a/baseconfig/CONFIG_ACPI_DEBUG b/configs/base-generic/CONFIG_ACPI_DEBUG
index aee5969aa..aee5969aa 100644
--- a/baseconfig/CONFIG_ACPI_DEBUG
+++ b/configs/base-generic/CONFIG_ACPI_DEBUG
diff --git a/baseconfig/CONFIG_ACPI_DEBUGGER b/configs/base-generic/CONFIG_ACPI_DEBUGGER
index 3f5999200..3f5999200 100644
--- a/baseconfig/CONFIG_ACPI_DEBUGGER
+++ b/configs/base-generic/CONFIG_ACPI_DEBUGGER
diff --git a/baseconfig/CONFIG_ACPI_NFIT b/configs/base-generic/CONFIG_ACPI_NFIT
index ded79a032..ded79a032 100644
--- a/baseconfig/CONFIG_ACPI_NFIT
+++ b/configs/base-generic/CONFIG_ACPI_NFIT
diff --git a/baseconfig/CONFIG_ACPI_PCI_SLOT b/configs/base-generic/CONFIG_ACPI_PCI_SLOT
index 6ef14483b..6ef14483b 100644
--- a/baseconfig/CONFIG_ACPI_PCI_SLOT
+++ b/configs/base-generic/CONFIG_ACPI_PCI_SLOT
diff --git a/baseconfig/CONFIG_ACQUIRE_WDT b/configs/base-generic/CONFIG_ACQUIRE_WDT
index 400222bb0..400222bb0 100644
--- a/baseconfig/CONFIG_ACQUIRE_WDT
+++ b/configs/base-generic/CONFIG_ACQUIRE_WDT
diff --git a/baseconfig/CONFIG_ACT200L_DONGLE b/configs/base-generic/CONFIG_ACT200L_DONGLE
index ea14a0dd3..ea14a0dd3 100644
--- a/baseconfig/CONFIG_ACT200L_DONGLE
+++ b/configs/base-generic/CONFIG_ACT200L_DONGLE
diff --git a/baseconfig/CONFIG_ACTISYS_DONGLE b/configs/base-generic/CONFIG_ACTISYS_DONGLE
index 5180ba7e1..5180ba7e1 100644
--- a/baseconfig/CONFIG_ACTISYS_DONGLE
+++ b/configs/base-generic/CONFIG_ACTISYS_DONGLE
diff --git a/baseconfig/CONFIG_AD2S1200 b/configs/base-generic/CONFIG_AD2S1200
index 4c8357680..4c8357680 100644
--- a/baseconfig/CONFIG_AD2S1200
+++ b/configs/base-generic/CONFIG_AD2S1200
diff --git a/baseconfig/CONFIG_AD2S1210 b/configs/base-generic/CONFIG_AD2S1210
index ae2b01f67..ae2b01f67 100644
--- a/baseconfig/CONFIG_AD2S1210
+++ b/configs/base-generic/CONFIG_AD2S1210
diff --git a/baseconfig/CONFIG_AD2S90 b/configs/base-generic/CONFIG_AD2S90
index 8652c5814..8652c5814 100644
--- a/baseconfig/CONFIG_AD2S90
+++ b/configs/base-generic/CONFIG_AD2S90
diff --git a/baseconfig/CONFIG_AD5064 b/configs/base-generic/CONFIG_AD5064
index d26142d73..d26142d73 100644
--- a/baseconfig/CONFIG_AD5064
+++ b/configs/base-generic/CONFIG_AD5064
diff --git a/baseconfig/CONFIG_AD525X_DPOT b/configs/base-generic/CONFIG_AD525X_DPOT
index 789ddbbca..789ddbbca 100644
--- a/baseconfig/CONFIG_AD525X_DPOT
+++ b/configs/base-generic/CONFIG_AD525X_DPOT
diff --git a/baseconfig/CONFIG_AD5360 b/configs/base-generic/CONFIG_AD5360
index 294533b24..294533b24 100644
--- a/baseconfig/CONFIG_AD5360
+++ b/configs/base-generic/CONFIG_AD5360
diff --git a/baseconfig/CONFIG_AD5380 b/configs/base-generic/CONFIG_AD5380
index cc21a83aa..cc21a83aa 100644
--- a/baseconfig/CONFIG_AD5380
+++ b/configs/base-generic/CONFIG_AD5380
diff --git a/baseconfig/CONFIG_AD5421 b/configs/base-generic/CONFIG_AD5421
index 9ec8d94a8..9ec8d94a8 100644
--- a/baseconfig/CONFIG_AD5421
+++ b/configs/base-generic/CONFIG_AD5421
diff --git a/baseconfig/CONFIG_AD5446 b/configs/base-generic/CONFIG_AD5446
index 1a8d66614..1a8d66614 100644
--- a/baseconfig/CONFIG_AD5446
+++ b/configs/base-generic/CONFIG_AD5446
diff --git a/baseconfig/CONFIG_AD5449 b/configs/base-generic/CONFIG_AD5449
index a370e945d..a370e945d 100644
--- a/baseconfig/CONFIG_AD5449
+++ b/configs/base-generic/CONFIG_AD5449
diff --git a/baseconfig/CONFIG_AD5504 b/configs/base-generic/CONFIG_AD5504
index cad3ffe12..cad3ffe12 100644
--- a/baseconfig/CONFIG_AD5504
+++ b/configs/base-generic/CONFIG_AD5504
diff --git a/baseconfig/CONFIG_AD5592R b/configs/base-generic/CONFIG_AD5592R
index 019d6225d..019d6225d 100644
--- a/baseconfig/CONFIG_AD5592R
+++ b/configs/base-generic/CONFIG_AD5592R
diff --git a/baseconfig/CONFIG_AD5593R b/configs/base-generic/CONFIG_AD5593R
index a0a89f52b..a0a89f52b 100644
--- a/baseconfig/CONFIG_AD5593R
+++ b/configs/base-generic/CONFIG_AD5593R
diff --git a/baseconfig/CONFIG_AD5624R_SPI b/configs/base-generic/CONFIG_AD5624R_SPI
index fb8e93bb2..fb8e93bb2 100644
--- a/baseconfig/CONFIG_AD5624R_SPI
+++ b/configs/base-generic/CONFIG_AD5624R_SPI
diff --git a/baseconfig/CONFIG_AD5686 b/configs/base-generic/CONFIG_AD5686
index 7f95be208..7f95be208 100644
--- a/baseconfig/CONFIG_AD5686
+++ b/configs/base-generic/CONFIG_AD5686
diff --git a/baseconfig/CONFIG_AD5755 b/configs/base-generic/CONFIG_AD5755
index 986e3bdc9..986e3bdc9 100644
--- a/baseconfig/CONFIG_AD5755
+++ b/configs/base-generic/CONFIG_AD5755
diff --git a/baseconfig/CONFIG_AD5761 b/configs/base-generic/CONFIG_AD5761
index 93e281ced..93e281ced 100644
--- a/baseconfig/CONFIG_AD5761
+++ b/configs/base-generic/CONFIG_AD5761
diff --git a/baseconfig/CONFIG_AD5764 b/configs/base-generic/CONFIG_AD5764
index c6885466f..c6885466f 100644
--- a/baseconfig/CONFIG_AD5764
+++ b/configs/base-generic/CONFIG_AD5764
diff --git a/baseconfig/CONFIG_AD5791 b/configs/base-generic/CONFIG_AD5791
index 4d143c659..4d143c659 100644
--- a/baseconfig/CONFIG_AD5791
+++ b/configs/base-generic/CONFIG_AD5791
diff --git a/baseconfig/CONFIG_AD5933 b/configs/base-generic/CONFIG_AD5933
index 431e44258..431e44258 100644
--- a/baseconfig/CONFIG_AD5933
+++ b/configs/base-generic/CONFIG_AD5933
diff --git a/baseconfig/CONFIG_AD7150 b/configs/base-generic/CONFIG_AD7150
index cd5a3edb0..cd5a3edb0 100644
--- a/baseconfig/CONFIG_AD7150
+++ b/configs/base-generic/CONFIG_AD7150
diff --git a/baseconfig/CONFIG_AD7152 b/configs/base-generic/CONFIG_AD7152
index 24be7e64e..24be7e64e 100644
--- a/baseconfig/CONFIG_AD7152
+++ b/configs/base-generic/CONFIG_AD7152
diff --git a/baseconfig/CONFIG_AD7192 b/configs/base-generic/CONFIG_AD7192
index 231728de4..231728de4 100644
--- a/baseconfig/CONFIG_AD7192
+++ b/configs/base-generic/CONFIG_AD7192
diff --git a/baseconfig/CONFIG_AD7266 b/configs/base-generic/CONFIG_AD7266
index 62b03da04..62b03da04 100644
--- a/baseconfig/CONFIG_AD7266
+++ b/configs/base-generic/CONFIG_AD7266
diff --git a/baseconfig/CONFIG_AD7280 b/configs/base-generic/CONFIG_AD7280
index 6ac49feef..6ac49feef 100644
--- a/baseconfig/CONFIG_AD7280
+++ b/configs/base-generic/CONFIG_AD7280
diff --git a/baseconfig/CONFIG_AD7291 b/configs/base-generic/CONFIG_AD7291
index 9257aeb05..9257aeb05 100644
--- a/baseconfig/CONFIG_AD7291
+++ b/configs/base-generic/CONFIG_AD7291
diff --git a/baseconfig/CONFIG_AD7298 b/configs/base-generic/CONFIG_AD7298
index 40ce2af3a..40ce2af3a 100644
--- a/baseconfig/CONFIG_AD7298
+++ b/configs/base-generic/CONFIG_AD7298
diff --git a/baseconfig/CONFIG_AD7303 b/configs/base-generic/CONFIG_AD7303
index f4909c7c0..f4909c7c0 100644
--- a/baseconfig/CONFIG_AD7303
+++ b/configs/base-generic/CONFIG_AD7303
diff --git a/baseconfig/CONFIG_AD7476 b/configs/base-generic/CONFIG_AD7476
index a8a9e9361..a8a9e9361 100644
--- a/baseconfig/CONFIG_AD7476
+++ b/configs/base-generic/CONFIG_AD7476
diff --git a/baseconfig/CONFIG_AD7606 b/configs/base-generic/CONFIG_AD7606
index d667ba7be..d667ba7be 100644
--- a/baseconfig/CONFIG_AD7606
+++ b/configs/base-generic/CONFIG_AD7606
diff --git a/baseconfig/CONFIG_AD7746 b/configs/base-generic/CONFIG_AD7746
index 49d1a7d26..49d1a7d26 100644
--- a/baseconfig/CONFIG_AD7746
+++ b/configs/base-generic/CONFIG_AD7746
diff --git a/baseconfig/CONFIG_AD7766 b/configs/base-generic/CONFIG_AD7766
index a0d9775d2..a0d9775d2 100644
--- a/baseconfig/CONFIG_AD7766
+++ b/configs/base-generic/CONFIG_AD7766
diff --git a/baseconfig/CONFIG_AD7780 b/configs/base-generic/CONFIG_AD7780
index ad5e89ca5..ad5e89ca5 100644
--- a/baseconfig/CONFIG_AD7780
+++ b/configs/base-generic/CONFIG_AD7780
diff --git a/baseconfig/CONFIG_AD7791 b/configs/base-generic/CONFIG_AD7791
index 3b0b7f0f1..3b0b7f0f1 100644
--- a/baseconfig/CONFIG_AD7791
+++ b/configs/base-generic/CONFIG_AD7791
diff --git a/baseconfig/CONFIG_AD7793 b/configs/base-generic/CONFIG_AD7793
index f2cf5fc2f..f2cf5fc2f 100644
--- a/baseconfig/CONFIG_AD7793
+++ b/configs/base-generic/CONFIG_AD7793
diff --git a/baseconfig/CONFIG_AD7816 b/configs/base-generic/CONFIG_AD7816
index 20fef3ad7..20fef3ad7 100644
--- a/baseconfig/CONFIG_AD7816
+++ b/configs/base-generic/CONFIG_AD7816
diff --git a/baseconfig/CONFIG_AD7887 b/configs/base-generic/CONFIG_AD7887
index 4746e6e69..4746e6e69 100644
--- a/baseconfig/CONFIG_AD7887
+++ b/configs/base-generic/CONFIG_AD7887
diff --git a/baseconfig/CONFIG_AD7923 b/configs/base-generic/CONFIG_AD7923
index cc3b9c694..cc3b9c694 100644
--- a/baseconfig/CONFIG_AD7923
+++ b/configs/base-generic/CONFIG_AD7923
diff --git a/baseconfig/CONFIG_AD799X b/configs/base-generic/CONFIG_AD799X
index 66e971f76..66e971f76 100644
--- a/baseconfig/CONFIG_AD799X
+++ b/configs/base-generic/CONFIG_AD799X
diff --git a/baseconfig/CONFIG_AD8366 b/configs/base-generic/CONFIG_AD8366
index 0d9754eeb..0d9754eeb 100644
--- a/baseconfig/CONFIG_AD8366
+++ b/configs/base-generic/CONFIG_AD8366
diff --git a/baseconfig/CONFIG_AD8801 b/configs/base-generic/CONFIG_AD8801
index e634e5925..e634e5925 100644
--- a/baseconfig/CONFIG_AD8801
+++ b/configs/base-generic/CONFIG_AD8801
diff --git a/baseconfig/CONFIG_AD9523 b/configs/base-generic/CONFIG_AD9523
index abfd7e162..abfd7e162 100644
--- a/baseconfig/CONFIG_AD9523
+++ b/configs/base-generic/CONFIG_AD9523
diff --git a/baseconfig/CONFIG_AD9832 b/configs/base-generic/CONFIG_AD9832
index 784885907..784885907 100644
--- a/baseconfig/CONFIG_AD9832
+++ b/configs/base-generic/CONFIG_AD9832
diff --git a/baseconfig/CONFIG_AD9834 b/configs/base-generic/CONFIG_AD9834
index 32e972603..32e972603 100644
--- a/baseconfig/CONFIG_AD9834
+++ b/configs/base-generic/CONFIG_AD9834
diff --git a/baseconfig/CONFIG_ADAPTEC_STARFIRE b/configs/base-generic/CONFIG_ADAPTEC_STARFIRE
index 3c40ed400..3c40ed400 100644
--- a/baseconfig/CONFIG_ADAPTEC_STARFIRE
+++ b/configs/base-generic/CONFIG_ADAPTEC_STARFIRE
diff --git a/baseconfig/CONFIG_ADE7753 b/configs/base-generic/CONFIG_ADE7753
index 2de35e173..2de35e173 100644
--- a/baseconfig/CONFIG_ADE7753
+++ b/configs/base-generic/CONFIG_ADE7753
diff --git a/baseconfig/CONFIG_ADE7754 b/configs/base-generic/CONFIG_ADE7754
index c6e2fc278..c6e2fc278 100644
--- a/baseconfig/CONFIG_ADE7754
+++ b/configs/base-generic/CONFIG_ADE7754
diff --git a/baseconfig/CONFIG_ADE7758 b/configs/base-generic/CONFIG_ADE7758
index fde3576c0..fde3576c0 100644
--- a/baseconfig/CONFIG_ADE7758
+++ b/configs/base-generic/CONFIG_ADE7758
diff --git a/baseconfig/CONFIG_ADE7759 b/configs/base-generic/CONFIG_ADE7759
index 072748fd0..072748fd0 100644
--- a/baseconfig/CONFIG_ADE7759
+++ b/configs/base-generic/CONFIG_ADE7759
diff --git a/baseconfig/CONFIG_ADE7854 b/configs/base-generic/CONFIG_ADE7854
index ad8522b0b..ad8522b0b 100644
--- a/baseconfig/CONFIG_ADE7854
+++ b/configs/base-generic/CONFIG_ADE7854
diff --git a/baseconfig/CONFIG_ADF4350 b/configs/base-generic/CONFIG_ADF4350
index 77a7e7660..77a7e7660 100644
--- a/baseconfig/CONFIG_ADF4350
+++ b/configs/base-generic/CONFIG_ADF4350
diff --git a/baseconfig/CONFIG_ADFS_FS b/configs/base-generic/CONFIG_ADFS_FS
index 5d5a3e9c8..5d5a3e9c8 100644
--- a/baseconfig/CONFIG_ADFS_FS
+++ b/configs/base-generic/CONFIG_ADFS_FS
diff --git a/baseconfig/CONFIG_ADIS16060 b/configs/base-generic/CONFIG_ADIS16060
index 1d881bbd1..1d881bbd1 100644
--- a/baseconfig/CONFIG_ADIS16060
+++ b/configs/base-generic/CONFIG_ADIS16060
diff --git a/baseconfig/CONFIG_ADIS16080 b/configs/base-generic/CONFIG_ADIS16080
index 5718d4066..5718d4066 100644
--- a/baseconfig/CONFIG_ADIS16080
+++ b/configs/base-generic/CONFIG_ADIS16080
diff --git a/baseconfig/CONFIG_ADIS16130 b/configs/base-generic/CONFIG_ADIS16130
index 2a9469708..2a9469708 100644
--- a/baseconfig/CONFIG_ADIS16130
+++ b/configs/base-generic/CONFIG_ADIS16130
diff --git a/baseconfig/CONFIG_ADIS16136 b/configs/base-generic/CONFIG_ADIS16136
index efe24e8bc..efe24e8bc 100644
--- a/baseconfig/CONFIG_ADIS16136
+++ b/configs/base-generic/CONFIG_ADIS16136
diff --git a/baseconfig/CONFIG_ADIS16201 b/configs/base-generic/CONFIG_ADIS16201
index 87928c554..87928c554 100644
--- a/baseconfig/CONFIG_ADIS16201
+++ b/configs/base-generic/CONFIG_ADIS16201
diff --git a/baseconfig/CONFIG_ADIS16203 b/configs/base-generic/CONFIG_ADIS16203
index 81fcffe0e..81fcffe0e 100644
--- a/baseconfig/CONFIG_ADIS16203
+++ b/configs/base-generic/CONFIG_ADIS16203
diff --git a/baseconfig/CONFIG_ADIS16209 b/configs/base-generic/CONFIG_ADIS16209
index 8f686138b..8f686138b 100644
--- a/baseconfig/CONFIG_ADIS16209
+++ b/configs/base-generic/CONFIG_ADIS16209
diff --git a/baseconfig/CONFIG_ADIS16240 b/configs/base-generic/CONFIG_ADIS16240
index 85e6982e7..85e6982e7 100644
--- a/baseconfig/CONFIG_ADIS16240
+++ b/configs/base-generic/CONFIG_ADIS16240
diff --git a/baseconfig/CONFIG_ADIS16260 b/configs/base-generic/CONFIG_ADIS16260
index a96770bc9..a96770bc9 100644
--- a/baseconfig/CONFIG_ADIS16260
+++ b/configs/base-generic/CONFIG_ADIS16260
diff --git a/baseconfig/CONFIG_ADIS16400 b/configs/base-generic/CONFIG_ADIS16400
index f7717e8d8..f7717e8d8 100644
--- a/baseconfig/CONFIG_ADIS16400
+++ b/configs/base-generic/CONFIG_ADIS16400
diff --git a/baseconfig/CONFIG_ADIS16480 b/configs/base-generic/CONFIG_ADIS16480
index 023204875..023204875 100644
--- a/baseconfig/CONFIG_ADIS16480
+++ b/configs/base-generic/CONFIG_ADIS16480
diff --git a/baseconfig/CONFIG_ADJD_S311 b/configs/base-generic/CONFIG_ADJD_S311
index 624a7bc07..624a7bc07 100644
--- a/baseconfig/CONFIG_ADJD_S311
+++ b/configs/base-generic/CONFIG_ADJD_S311
diff --git a/baseconfig/CONFIG_ADM8211 b/configs/base-generic/CONFIG_ADM8211
index aeb6df840..aeb6df840 100644
--- a/baseconfig/CONFIG_ADM8211
+++ b/configs/base-generic/CONFIG_ADM8211
diff --git a/baseconfig/CONFIG_ADT7316 b/configs/base-generic/CONFIG_ADT7316
index 5d2901907..5d2901907 100644
--- a/baseconfig/CONFIG_ADT7316
+++ b/configs/base-generic/CONFIG_ADT7316
diff --git a/baseconfig/CONFIG_ADVANTECH_WDT b/configs/base-generic/CONFIG_ADVANTECH_WDT
index 07d7f5d17..07d7f5d17 100644
--- a/baseconfig/CONFIG_ADVANTECH_WDT
+++ b/configs/base-generic/CONFIG_ADVANTECH_WDT
diff --git a/baseconfig/CONFIG_ADXL345_I2C b/configs/base-generic/CONFIG_ADXL345_I2C
index f6976b836..f6976b836 100644
--- a/baseconfig/CONFIG_ADXL345_I2C
+++ b/configs/base-generic/CONFIG_ADXL345_I2C
diff --git a/baseconfig/CONFIG_ADXL345_SPI b/configs/base-generic/CONFIG_ADXL345_SPI
index 186ab0d3a..186ab0d3a 100644
--- a/baseconfig/CONFIG_ADXL345_SPI
+++ b/configs/base-generic/CONFIG_ADXL345_SPI
diff --git a/baseconfig/CONFIG_ADXRS450 b/configs/base-generic/CONFIG_ADXRS450
index 7abb6c9c5..7abb6c9c5 100644
--- a/baseconfig/CONFIG_ADXRS450
+++ b/configs/base-generic/CONFIG_ADXRS450
diff --git a/baseconfig/CONFIG_AFE4403 b/configs/base-generic/CONFIG_AFE4403
index 26df5ff60..26df5ff60 100644
--- a/baseconfig/CONFIG_AFE4403
+++ b/configs/base-generic/CONFIG_AFE4403
diff --git a/baseconfig/CONFIG_AFE4404 b/configs/base-generic/CONFIG_AFE4404
index 0244492b5..0244492b5 100644
--- a/baseconfig/CONFIG_AFE4404
+++ b/configs/base-generic/CONFIG_AFE4404
diff --git a/baseconfig/CONFIG_AFFS_FS b/configs/base-generic/CONFIG_AFFS_FS
index fe6b1544c..fe6b1544c 100644
--- a/baseconfig/CONFIG_AFFS_FS
+++ b/configs/base-generic/CONFIG_AFFS_FS
diff --git a/baseconfig/CONFIG_AFS_FS b/configs/base-generic/CONFIG_AFS_FS
index b622cdb8e..b622cdb8e 100644
--- a/baseconfig/CONFIG_AFS_FS
+++ b/configs/base-generic/CONFIG_AFS_FS
diff --git a/baseconfig/CONFIG_AF_KCM b/configs/base-generic/CONFIG_AF_KCM
index b26e52616..b26e52616 100644
--- a/baseconfig/CONFIG_AF_KCM
+++ b/configs/base-generic/CONFIG_AF_KCM
diff --git a/baseconfig/CONFIG_AF_RXRPC b/configs/base-generic/CONFIG_AF_RXRPC
index b703c0366..b703c0366 100644
--- a/baseconfig/CONFIG_AF_RXRPC
+++ b/configs/base-generic/CONFIG_AF_RXRPC
diff --git a/baseconfig/CONFIG_AHCI_CEVA b/configs/base-generic/CONFIG_AHCI_CEVA
index d9279dda2..d9279dda2 100644
--- a/baseconfig/CONFIG_AHCI_CEVA
+++ b/configs/base-generic/CONFIG_AHCI_CEVA
diff --git a/baseconfig/CONFIG_AHCI_QORIQ b/configs/base-generic/CONFIG_AHCI_QORIQ
index 07fd566a1..07fd566a1 100644
--- a/baseconfig/CONFIG_AHCI_QORIQ
+++ b/configs/base-generic/CONFIG_AHCI_QORIQ
diff --git a/baseconfig/CONFIG_AIC79XX_BUILD_FIRMWARE b/configs/base-generic/CONFIG_AIC79XX_BUILD_FIRMWARE
index 934b0b436..934b0b436 100644
--- a/baseconfig/CONFIG_AIC79XX_BUILD_FIRMWARE
+++ b/configs/base-generic/CONFIG_AIC79XX_BUILD_FIRMWARE
diff --git a/baseconfig/CONFIG_AIC79XX_CMDS_PER_DEVICE b/configs/base-generic/CONFIG_AIC79XX_CMDS_PER_DEVICE
index 58f85a9b2..58f85a9b2 100644
--- a/baseconfig/CONFIG_AIC79XX_CMDS_PER_DEVICE
+++ b/configs/base-generic/CONFIG_AIC79XX_CMDS_PER_DEVICE
diff --git a/baseconfig/CONFIG_AIC79XX_DEBUG_ENABLE b/configs/base-generic/CONFIG_AIC79XX_DEBUG_ENABLE
index 83be363f4..83be363f4 100644
--- a/baseconfig/CONFIG_AIC79XX_DEBUG_ENABLE
+++ b/configs/base-generic/CONFIG_AIC79XX_DEBUG_ENABLE
diff --git a/baseconfig/CONFIG_AIC79XX_DEBUG_MASK b/configs/base-generic/CONFIG_AIC79XX_DEBUG_MASK
index cce0c9c2f..cce0c9c2f 100644
--- a/baseconfig/CONFIG_AIC79XX_DEBUG_MASK
+++ b/configs/base-generic/CONFIG_AIC79XX_DEBUG_MASK
diff --git a/baseconfig/CONFIG_AIC79XX_REG_PRETTY_PRINT b/configs/base-generic/CONFIG_AIC79XX_REG_PRETTY_PRINT
index 75c1e9f05..75c1e9f05 100644
--- a/baseconfig/CONFIG_AIC79XX_REG_PRETTY_PRINT
+++ b/configs/base-generic/CONFIG_AIC79XX_REG_PRETTY_PRINT
diff --git a/baseconfig/CONFIG_AIC79XX_RESET_DELAY_MS b/configs/base-generic/CONFIG_AIC79XX_RESET_DELAY_MS
index 4cbb0d15f..4cbb0d15f 100644
--- a/baseconfig/CONFIG_AIC79XX_RESET_DELAY_MS
+++ b/configs/base-generic/CONFIG_AIC79XX_RESET_DELAY_MS
diff --git a/baseconfig/CONFIG_AIC7XXX_BUILD_FIRMWARE b/configs/base-generic/CONFIG_AIC7XXX_BUILD_FIRMWARE
index 006fe4bed..006fe4bed 100644
--- a/baseconfig/CONFIG_AIC7XXX_BUILD_FIRMWARE
+++ b/configs/base-generic/CONFIG_AIC7XXX_BUILD_FIRMWARE
diff --git a/baseconfig/CONFIG_AIC7XXX_CMDS_PER_DEVICE b/configs/base-generic/CONFIG_AIC7XXX_CMDS_PER_DEVICE
index acdb12fff..acdb12fff 100644
--- a/baseconfig/CONFIG_AIC7XXX_CMDS_PER_DEVICE
+++ b/configs/base-generic/CONFIG_AIC7XXX_CMDS_PER_DEVICE
diff --git a/baseconfig/CONFIG_AIC7XXX_DEBUG_ENABLE b/configs/base-generic/CONFIG_AIC7XXX_DEBUG_ENABLE
index f2990469d..f2990469d 100644
--- a/baseconfig/CONFIG_AIC7XXX_DEBUG_ENABLE
+++ b/configs/base-generic/CONFIG_AIC7XXX_DEBUG_ENABLE
diff --git a/baseconfig/CONFIG_AIC7XXX_DEBUG_MASK b/configs/base-generic/CONFIG_AIC7XXX_DEBUG_MASK
index bec997fbc..bec997fbc 100644
--- a/baseconfig/CONFIG_AIC7XXX_DEBUG_MASK
+++ b/configs/base-generic/CONFIG_AIC7XXX_DEBUG_MASK
diff --git a/baseconfig/CONFIG_AIC7XXX_REG_PRETTY_PRINT b/configs/base-generic/CONFIG_AIC7XXX_REG_PRETTY_PRINT
index c11c4c95f..c11c4c95f 100644
--- a/baseconfig/CONFIG_AIC7XXX_REG_PRETTY_PRINT
+++ b/configs/base-generic/CONFIG_AIC7XXX_REG_PRETTY_PRINT
diff --git a/baseconfig/CONFIG_AIC7XXX_RESET_DELAY_MS b/configs/base-generic/CONFIG_AIC7XXX_RESET_DELAY_MS
index 42f836725..42f836725 100644
--- a/baseconfig/CONFIG_AIC7XXX_RESET_DELAY_MS
+++ b/configs/base-generic/CONFIG_AIC7XXX_RESET_DELAY_MS
diff --git a/baseconfig/CONFIG_AIRO b/configs/base-generic/CONFIG_AIRO
index 5f3dfbe4a..5f3dfbe4a 100644
--- a/baseconfig/CONFIG_AIRO
+++ b/configs/base-generic/CONFIG_AIRO
diff --git a/baseconfig/CONFIG_AIRO_CS b/configs/base-generic/CONFIG_AIRO_CS
index a37c0a2ae..a37c0a2ae 100644
--- a/baseconfig/CONFIG_AIRO_CS
+++ b/configs/base-generic/CONFIG_AIRO_CS
diff --git a/baseconfig/CONFIG_AIX_PARTITION b/configs/base-generic/CONFIG_AIX_PARTITION
index 712ad1f93..712ad1f93 100644
--- a/baseconfig/CONFIG_AIX_PARTITION
+++ b/configs/base-generic/CONFIG_AIX_PARTITION
diff --git a/baseconfig/CONFIG_AK09911 b/configs/base-generic/CONFIG_AK09911
index e4eae5d43..e4eae5d43 100644
--- a/baseconfig/CONFIG_AK09911
+++ b/configs/base-generic/CONFIG_AK09911
diff --git a/baseconfig/CONFIG_AK8974 b/configs/base-generic/CONFIG_AK8974
index c74de8fec..c74de8fec 100644
--- a/baseconfig/CONFIG_AK8974
+++ b/configs/base-generic/CONFIG_AK8974
diff --git a/baseconfig/CONFIG_AK8975 b/configs/base-generic/CONFIG_AK8975
index 958f0bd06..958f0bd06 100644
--- a/baseconfig/CONFIG_AK8975
+++ b/configs/base-generic/CONFIG_AK8975
diff --git a/baseconfig/CONFIG_AL3320A b/configs/base-generic/CONFIG_AL3320A
index 0b60a6dfd..0b60a6dfd 100644
--- a/baseconfig/CONFIG_AL3320A
+++ b/configs/base-generic/CONFIG_AL3320A
diff --git a/baseconfig/CONFIG_ALIM1535_WDT b/configs/base-generic/CONFIG_ALIM1535_WDT
index 752901cdd..752901cdd 100644
--- a/baseconfig/CONFIG_ALIM1535_WDT
+++ b/configs/base-generic/CONFIG_ALIM1535_WDT
diff --git a/baseconfig/CONFIG_ALIM7101_WDT b/configs/base-generic/CONFIG_ALIM7101_WDT
index 6ded51391..6ded51391 100644
--- a/baseconfig/CONFIG_ALIM7101_WDT
+++ b/configs/base-generic/CONFIG_ALIM7101_WDT
diff --git a/baseconfig/CONFIG_ALI_FIR b/configs/base-generic/CONFIG_ALI_FIR
index 524b1f1c0..524b1f1c0 100644
--- a/baseconfig/CONFIG_ALI_FIR
+++ b/configs/base-generic/CONFIG_ALI_FIR
diff --git a/baseconfig/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ b/configs/base-generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ
index 40a287f0f..40a287f0f 100644
--- a/baseconfig/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ
+++ b/configs/base-generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ
diff --git a/baseconfig/CONFIG_ALTERA_MBOX b/configs/base-generic/CONFIG_ALTERA_MBOX
index 62cd998d2..62cd998d2 100644
--- a/baseconfig/CONFIG_ALTERA_MBOX
+++ b/configs/base-generic/CONFIG_ALTERA_MBOX
diff --git a/baseconfig/CONFIG_ALTERA_MSGDMA b/configs/base-generic/CONFIG_ALTERA_MSGDMA
index 7a1edd837..7a1edd837 100644
--- a/baseconfig/CONFIG_ALTERA_MSGDMA
+++ b/configs/base-generic/CONFIG_ALTERA_MSGDMA
diff --git a/baseconfig/CONFIG_ALTERA_STAPL b/configs/base-generic/CONFIG_ALTERA_STAPL
index 7931c1e5a..7931c1e5a 100644
--- a/baseconfig/CONFIG_ALTERA_STAPL
+++ b/configs/base-generic/CONFIG_ALTERA_STAPL
diff --git a/baseconfig/CONFIG_ALTERA_TSE b/configs/base-generic/CONFIG_ALTERA_TSE
index 67d2ebfd8..67d2ebfd8 100644
--- a/baseconfig/CONFIG_ALTERA_TSE
+++ b/configs/base-generic/CONFIG_ALTERA_TSE
diff --git a/baseconfig/CONFIG_ALX b/configs/base-generic/CONFIG_ALX
index 00298a2d4..00298a2d4 100644
--- a/baseconfig/CONFIG_ALX
+++ b/configs/base-generic/CONFIG_ALX
diff --git a/baseconfig/CONFIG_AM2315 b/configs/base-generic/CONFIG_AM2315
index 9acd70310..9acd70310 100644
--- a/baseconfig/CONFIG_AM2315
+++ b/configs/base-generic/CONFIG_AM2315
diff --git a/baseconfig/CONFIG_AMD8111_ETH b/configs/base-generic/CONFIG_AMD8111_ETH
index 8d92898a8..8d92898a8 100644
--- a/baseconfig/CONFIG_AMD8111_ETH
+++ b/configs/base-generic/CONFIG_AMD8111_ETH
diff --git a/baseconfig/CONFIG_AMD_PHY b/configs/base-generic/CONFIG_AMD_PHY
index 6675832f2..6675832f2 100644
--- a/baseconfig/CONFIG_AMD_PHY
+++ b/configs/base-generic/CONFIG_AMD_PHY
diff --git a/baseconfig/CONFIG_AMD_XGBE b/configs/base-generic/CONFIG_AMD_XGBE
index bc3c626e4..bc3c626e4 100644
--- a/baseconfig/CONFIG_AMD_XGBE
+++ b/configs/base-generic/CONFIG_AMD_XGBE
diff --git a/baseconfig/CONFIG_AMD_XGBE_DCB b/configs/base-generic/CONFIG_AMD_XGBE_DCB
index f76ed0831..f76ed0831 100644
--- a/baseconfig/CONFIG_AMD_XGBE_DCB
+++ b/configs/base-generic/CONFIG_AMD_XGBE_DCB
diff --git a/baseconfig/CONFIG_AMIGA_PARTITION b/configs/base-generic/CONFIG_AMIGA_PARTITION
index 5f03ffaf5..5f03ffaf5 100644
--- a/baseconfig/CONFIG_AMIGA_PARTITION
+++ b/configs/base-generic/CONFIG_AMIGA_PARTITION
diff --git a/baseconfig/CONFIG_ANDROID b/configs/base-generic/CONFIG_ANDROID
index 17b25568b..17b25568b 100644
--- a/baseconfig/CONFIG_ANDROID
+++ b/configs/base-generic/CONFIG_ANDROID
diff --git a/baseconfig/CONFIG_APDS9300 b/configs/base-generic/CONFIG_APDS9300
index 21d374565..21d374565 100644
--- a/baseconfig/CONFIG_APDS9300
+++ b/configs/base-generic/CONFIG_APDS9300
diff --git a/baseconfig/CONFIG_APDS9802ALS b/configs/base-generic/CONFIG_APDS9802ALS
index 086fb1bec..086fb1bec 100644
--- a/baseconfig/CONFIG_APDS9802ALS
+++ b/configs/base-generic/CONFIG_APDS9802ALS
diff --git a/baseconfig/CONFIG_APDS9960 b/configs/base-generic/CONFIG_APDS9960
index ac56682f4..ac56682f4 100644
--- a/baseconfig/CONFIG_APDS9960
+++ b/configs/base-generic/CONFIG_APDS9960
diff --git a/baseconfig/CONFIG_APM_POWER b/configs/base-generic/CONFIG_APM_POWER
index 6fdad8509..6fdad8509 100644
--- a/baseconfig/CONFIG_APM_POWER
+++ b/configs/base-generic/CONFIG_APM_POWER
diff --git a/baseconfig/CONFIG_APPLE_PROPERTIES b/configs/base-generic/CONFIG_APPLE_PROPERTIES
index 5f2035b0e..5f2035b0e 100644
--- a/baseconfig/CONFIG_APPLE_PROPERTIES
+++ b/configs/base-generic/CONFIG_APPLE_PROPERTIES
diff --git a/baseconfig/CONFIG_APPLICOM b/configs/base-generic/CONFIG_APPLICOM
index 0b3abc60a..0b3abc60a 100644
--- a/baseconfig/CONFIG_APPLICOM
+++ b/configs/base-generic/CONFIG_APPLICOM
diff --git a/baseconfig/CONFIG_AQUANTIA_PHY b/configs/base-generic/CONFIG_AQUANTIA_PHY
index 81c48619e..81c48619e 100644
--- a/baseconfig/CONFIG_AQUANTIA_PHY
+++ b/configs/base-generic/CONFIG_AQUANTIA_PHY
diff --git a/baseconfig/CONFIG_AR5523 b/configs/base-generic/CONFIG_AR5523
index 1e36fd1e8..1e36fd1e8 100644
--- a/baseconfig/CONFIG_AR5523
+++ b/configs/base-generic/CONFIG_AR5523
diff --git a/baseconfig/CONFIG_ARCNET b/configs/base-generic/CONFIG_ARCNET
index 8c988b7ca..8c988b7ca 100644
--- a/baseconfig/CONFIG_ARCNET
+++ b/configs/base-generic/CONFIG_ARCNET
diff --git a/baseconfig/CONFIG_ARM64_ERRATUM_858921 b/configs/base-generic/CONFIG_ARM64_ERRATUM_858921
index 055a6880c..055a6880c 100644
--- a/baseconfig/CONFIG_ARM64_ERRATUM_858921
+++ b/configs/base-generic/CONFIG_ARM64_ERRATUM_858921
diff --git a/baseconfig/CONFIG_AS3935 b/configs/base-generic/CONFIG_AS3935
index 3d08d5594..3d08d5594 100644
--- a/baseconfig/CONFIG_AS3935
+++ b/configs/base-generic/CONFIG_AS3935
diff --git a/baseconfig/CONFIG_ASYNC_RAID6_TEST b/configs/base-generic/CONFIG_ASYNC_RAID6_TEST
index 8fb25dd27..8fb25dd27 100644
--- a/baseconfig/CONFIG_ASYNC_RAID6_TEST
+++ b/configs/base-generic/CONFIG_ASYNC_RAID6_TEST
diff --git a/baseconfig/CONFIG_ASYNC_TX_DMA b/configs/base-generic/CONFIG_ASYNC_TX_DMA
index c62f8624b..c62f8624b 100644
--- a/baseconfig/CONFIG_ASYNC_TX_DMA
+++ b/configs/base-generic/CONFIG_ASYNC_TX_DMA
diff --git a/baseconfig/CONFIG_AT76C50X_USB b/configs/base-generic/CONFIG_AT76C50X_USB
index d47ef6cfa..d47ef6cfa 100644
--- a/baseconfig/CONFIG_AT76C50X_USB
+++ b/configs/base-generic/CONFIG_AT76C50X_USB
diff --git a/baseconfig/CONFIG_AT803X_PHY b/configs/base-generic/CONFIG_AT803X_PHY
index 93e86302b..93e86302b 100644
--- a/baseconfig/CONFIG_AT803X_PHY
+++ b/configs/base-generic/CONFIG_AT803X_PHY
diff --git a/baseconfig/CONFIG_ATA b/configs/base-generic/CONFIG_ATA
index 76a102725..76a102725 100644
--- a/baseconfig/CONFIG_ATA
+++ b/configs/base-generic/CONFIG_ATA
diff --git a/baseconfig/CONFIG_ATALK b/configs/base-generic/CONFIG_ATALK
index d52e0ddfe..d52e0ddfe 100644
--- a/baseconfig/CONFIG_ATALK
+++ b/configs/base-generic/CONFIG_ATALK
diff --git a/baseconfig/CONFIG_ATARI_PARTITION b/configs/base-generic/CONFIG_ATARI_PARTITION
index c4f07279c..c4f07279c 100644
--- a/baseconfig/CONFIG_ATARI_PARTITION
+++ b/configs/base-generic/CONFIG_ATARI_PARTITION
diff --git a/baseconfig/CONFIG_ATA_BMDMA b/configs/base-generic/CONFIG_ATA_BMDMA
index 06163193f..06163193f 100644
--- a/baseconfig/CONFIG_ATA_BMDMA
+++ b/configs/base-generic/CONFIG_ATA_BMDMA
diff --git a/baseconfig/CONFIG_ATA_GENERIC b/configs/base-generic/CONFIG_ATA_GENERIC
index eb3093a11..eb3093a11 100644
--- a/baseconfig/CONFIG_ATA_GENERIC
+++ b/configs/base-generic/CONFIG_ATA_GENERIC
diff --git a/baseconfig/CONFIG_ATA_OVER_ETH b/configs/base-generic/CONFIG_ATA_OVER_ETH
index f9a30b59a..f9a30b59a 100644
--- a/baseconfig/CONFIG_ATA_OVER_ETH
+++ b/configs/base-generic/CONFIG_ATA_OVER_ETH
diff --git a/baseconfig/CONFIG_ATA_PIIX b/configs/base-generic/CONFIG_ATA_PIIX
index 04e31e955..04e31e955 100644
--- a/baseconfig/CONFIG_ATA_PIIX
+++ b/configs/base-generic/CONFIG_ATA_PIIX
diff --git a/baseconfig/CONFIG_ATA_SFF b/configs/base-generic/CONFIG_ATA_SFF
index 8631ad6d7..8631ad6d7 100644
--- a/baseconfig/CONFIG_ATA_SFF
+++ b/configs/base-generic/CONFIG_ATA_SFF
diff --git a/baseconfig/CONFIG_ATA_VERBOSE_ERROR b/configs/base-generic/CONFIG_ATA_VERBOSE_ERROR
index cc5b03f8d..cc5b03f8d 100644
--- a/baseconfig/CONFIG_ATA_VERBOSE_ERROR
+++ b/configs/base-generic/CONFIG_ATA_VERBOSE_ERROR
diff --git a/baseconfig/CONFIG_ATH10K b/configs/base-generic/CONFIG_ATH10K
index 7e304c3b6..7e304c3b6 100644
--- a/baseconfig/CONFIG_ATH10K
+++ b/configs/base-generic/CONFIG_ATH10K
diff --git a/baseconfig/CONFIG_ATH10K_AHB b/configs/base-generic/CONFIG_ATH10K_AHB
index 19eb73472..19eb73472 100644
--- a/baseconfig/CONFIG_ATH10K_AHB
+++ b/configs/base-generic/CONFIG_ATH10K_AHB
diff --git a/baseconfig/CONFIG_ATH10K_DEBUG b/configs/base-generic/CONFIG_ATH10K_DEBUG
index 6390cff87..6390cff87 100644
--- a/baseconfig/CONFIG_ATH10K_DEBUG
+++ b/configs/base-generic/CONFIG_ATH10K_DEBUG
diff --git a/baseconfig/CONFIG_ATH10K_DEBUGFS b/configs/base-generic/CONFIG_ATH10K_DEBUGFS
index b0cefc48d..b0cefc48d 100644
--- a/baseconfig/CONFIG_ATH10K_DEBUGFS
+++ b/configs/base-generic/CONFIG_ATH10K_DEBUGFS
diff --git a/baseconfig/CONFIG_ATH10K_PCI b/configs/base-generic/CONFIG_ATH10K_PCI
index 888f54594..888f54594 100644
--- a/baseconfig/CONFIG_ATH10K_PCI
+++ b/configs/base-generic/CONFIG_ATH10K_PCI
diff --git a/baseconfig/CONFIG_ATH10K_SDIO b/configs/base-generic/CONFIG_ATH10K_SDIO
index 9ddf1123b..9ddf1123b 100644
--- a/baseconfig/CONFIG_ATH10K_SDIO
+++ b/configs/base-generic/CONFIG_ATH10K_SDIO
diff --git a/baseconfig/CONFIG_ATH10K_TRACING b/configs/base-generic/CONFIG_ATH10K_TRACING
index e6827cecb..e6827cecb 100644
--- a/baseconfig/CONFIG_ATH10K_TRACING
+++ b/configs/base-generic/CONFIG_ATH10K_TRACING
diff --git a/baseconfig/CONFIG_ATH10K_USB b/configs/base-generic/CONFIG_ATH10K_USB
index 29021503d..29021503d 100644
--- a/baseconfig/CONFIG_ATH10K_USB
+++ b/configs/base-generic/CONFIG_ATH10K_USB
diff --git a/baseconfig/CONFIG_ATH5K b/configs/base-generic/CONFIG_ATH5K
index 1000480fd..1000480fd 100644
--- a/baseconfig/CONFIG_ATH5K
+++ b/configs/base-generic/CONFIG_ATH5K
diff --git a/baseconfig/CONFIG_ATH5K_DEBUG b/configs/base-generic/CONFIG_ATH5K_DEBUG
index 70f3088dc..70f3088dc 100644
--- a/baseconfig/CONFIG_ATH5K_DEBUG
+++ b/configs/base-generic/CONFIG_ATH5K_DEBUG
diff --git a/baseconfig/CONFIG_ATH5K_TRACER b/configs/base-generic/CONFIG_ATH5K_TRACER
index 440c23784..440c23784 100644
--- a/baseconfig/CONFIG_ATH5K_TRACER
+++ b/configs/base-generic/CONFIG_ATH5K_TRACER
diff --git a/baseconfig/CONFIG_ATH6KL b/configs/base-generic/CONFIG_ATH6KL
index a0ccaa44e..a0ccaa44e 100644
--- a/baseconfig/CONFIG_ATH6KL
+++ b/configs/base-generic/CONFIG_ATH6KL
diff --git a/baseconfig/CONFIG_ATH6KL_DEBUG b/configs/base-generic/CONFIG_ATH6KL_DEBUG
index 232723532..232723532 100644
--- a/baseconfig/CONFIG_ATH6KL_DEBUG
+++ b/configs/base-generic/CONFIG_ATH6KL_DEBUG
diff --git a/baseconfig/CONFIG_ATH6KL_SDIO b/configs/base-generic/CONFIG_ATH6KL_SDIO
index abc6907af..abc6907af 100644
--- a/baseconfig/CONFIG_ATH6KL_SDIO
+++ b/configs/base-generic/CONFIG_ATH6KL_SDIO
diff --git a/baseconfig/CONFIG_ATH6KL_TRACING b/configs/base-generic/CONFIG_ATH6KL_TRACING
index c21956179..c21956179 100644
--- a/baseconfig/CONFIG_ATH6KL_TRACING
+++ b/configs/base-generic/CONFIG_ATH6KL_TRACING
diff --git a/baseconfig/CONFIG_ATH6KL_USB b/configs/base-generic/CONFIG_ATH6KL_USB
index d319474ca..d319474ca 100644
--- a/baseconfig/CONFIG_ATH6KL_USB
+++ b/configs/base-generic/CONFIG_ATH6KL_USB
diff --git a/baseconfig/CONFIG_ATH9K b/configs/base-generic/CONFIG_ATH9K
index 334647898..334647898 100644
--- a/baseconfig/CONFIG_ATH9K
+++ b/configs/base-generic/CONFIG_ATH9K
diff --git a/baseconfig/CONFIG_ATH9K_AHB b/configs/base-generic/CONFIG_ATH9K_AHB
index b9a31aab7..b9a31aab7 100644
--- a/baseconfig/CONFIG_ATH9K_AHB
+++ b/configs/base-generic/CONFIG_ATH9K_AHB
diff --git a/baseconfig/CONFIG_ATH9K_BTCOEX_SUPPORT b/configs/base-generic/CONFIG_ATH9K_BTCOEX_SUPPORT
index 64cf5324c..64cf5324c 100644
--- a/baseconfig/CONFIG_ATH9K_BTCOEX_SUPPORT
+++ b/configs/base-generic/CONFIG_ATH9K_BTCOEX_SUPPORT
diff --git a/baseconfig/CONFIG_ATH9K_CHANNEL_CONTEXT b/configs/base-generic/CONFIG_ATH9K_CHANNEL_CONTEXT
index e63bc2c75..e63bc2c75 100644
--- a/baseconfig/CONFIG_ATH9K_CHANNEL_CONTEXT
+++ b/configs/base-generic/CONFIG_ATH9K_CHANNEL_CONTEXT
diff --git a/baseconfig/CONFIG_ATH9K_DEBUG b/configs/base-generic/CONFIG_ATH9K_DEBUG
index a40b011e2..a40b011e2 100644
--- a/baseconfig/CONFIG_ATH9K_DEBUG
+++ b/configs/base-generic/CONFIG_ATH9K_DEBUG
diff --git a/baseconfig/CONFIG_ATH9K_DEBUGFS b/configs/base-generic/CONFIG_ATH9K_DEBUGFS
index 87a6218f9..87a6218f9 100644
--- a/baseconfig/CONFIG_ATH9K_DEBUGFS
+++ b/configs/base-generic/CONFIG_ATH9K_DEBUGFS
diff --git a/baseconfig/CONFIG_ATH9K_DYNACK b/configs/base-generic/CONFIG_ATH9K_DYNACK
index fd6896cbc..fd6896cbc 100644
--- a/baseconfig/CONFIG_ATH9K_DYNACK
+++ b/configs/base-generic/CONFIG_ATH9K_DYNACK
diff --git a/baseconfig/CONFIG_ATH9K_HTC b/configs/base-generic/CONFIG_ATH9K_HTC
index 604c94574..604c94574 100644
--- a/baseconfig/CONFIG_ATH9K_HTC
+++ b/configs/base-generic/CONFIG_ATH9K_HTC
diff --git a/baseconfig/CONFIG_ATH9K_HTC_DEBUGFS b/configs/base-generic/CONFIG_ATH9K_HTC_DEBUGFS
index 811b2d5bd..811b2d5bd 100644
--- a/baseconfig/CONFIG_ATH9K_HTC_DEBUGFS
+++ b/configs/base-generic/CONFIG_ATH9K_HTC_DEBUGFS
diff --git a/baseconfig/CONFIG_ATH9K_HWRNG b/configs/base-generic/CONFIG_ATH9K_HWRNG
index 7b35feaa0..7b35feaa0 100644
--- a/baseconfig/CONFIG_ATH9K_HWRNG
+++ b/configs/base-generic/CONFIG_ATH9K_HWRNG
diff --git a/baseconfig/CONFIG_ATH9K_PCI b/configs/base-generic/CONFIG_ATH9K_PCI
index adbd39248..adbd39248 100644
--- a/baseconfig/CONFIG_ATH9K_PCI
+++ b/configs/base-generic/CONFIG_ATH9K_PCI
diff --git a/baseconfig/CONFIG_ATH9K_STATION_STATISTICS b/configs/base-generic/CONFIG_ATH9K_STATION_STATISTICS
index a8ee2a27c..a8ee2a27c 100644
--- a/baseconfig/CONFIG_ATH9K_STATION_STATISTICS
+++ b/configs/base-generic/CONFIG_ATH9K_STATION_STATISTICS
diff --git a/baseconfig/CONFIG_ATH9K_WOW b/configs/base-generic/CONFIG_ATH9K_WOW
index 26e46611d..26e46611d 100644
--- a/baseconfig/CONFIG_ATH9K_WOW
+++ b/configs/base-generic/CONFIG_ATH9K_WOW
diff --git a/baseconfig/CONFIG_ATH_COMMON b/configs/base-generic/CONFIG_ATH_COMMON
index 98ba398b9..98ba398b9 100644
--- a/baseconfig/CONFIG_ATH_COMMON
+++ b/configs/base-generic/CONFIG_ATH_COMMON
diff --git a/baseconfig/CONFIG_ATH_DEBUG b/configs/base-generic/CONFIG_ATH_DEBUG
index a93cd5ce2..a93cd5ce2 100644
--- a/baseconfig/CONFIG_ATH_DEBUG
+++ b/configs/base-generic/CONFIG_ATH_DEBUG
diff --git a/baseconfig/CONFIG_ATH_TRACEPOINTS b/configs/base-generic/CONFIG_ATH_TRACEPOINTS
index 74e6e5667..74e6e5667 100644
--- a/baseconfig/CONFIG_ATH_TRACEPOINTS
+++ b/configs/base-generic/CONFIG_ATH_TRACEPOINTS
diff --git a/baseconfig/CONFIG_ATL1 b/configs/base-generic/CONFIG_ATL1
index ed8b8ff63..ed8b8ff63 100644
--- a/baseconfig/CONFIG_ATL1
+++ b/configs/base-generic/CONFIG_ATL1
diff --git a/baseconfig/CONFIG_ATL1C b/configs/base-generic/CONFIG_ATL1C
index 391eb51ee..391eb51ee 100644
--- a/baseconfig/CONFIG_ATL1C
+++ b/configs/base-generic/CONFIG_ATL1C
diff --git a/baseconfig/CONFIG_ATL1E b/configs/base-generic/CONFIG_ATL1E
index e2ce74691..e2ce74691 100644
--- a/baseconfig/CONFIG_ATL1E
+++ b/configs/base-generic/CONFIG_ATL1E
diff --git a/baseconfig/CONFIG_ATL2 b/configs/base-generic/CONFIG_ATL2
index 789b4a0d9..789b4a0d9 100644
--- a/baseconfig/CONFIG_ATL2
+++ b/configs/base-generic/CONFIG_ATL2
diff --git a/baseconfig/CONFIG_ATLAS_PH_SENSOR b/configs/base-generic/CONFIG_ATLAS_PH_SENSOR
index 1a854eb57..1a854eb57 100644
--- a/baseconfig/CONFIG_ATLAS_PH_SENSOR
+++ b/configs/base-generic/CONFIG_ATLAS_PH_SENSOR
diff --git a/baseconfig/CONFIG_ATM b/configs/base-generic/CONFIG_ATM
index 70dd368fa..70dd368fa 100644
--- a/baseconfig/CONFIG_ATM
+++ b/configs/base-generic/CONFIG_ATM
diff --git a/baseconfig/CONFIG_ATMEL b/configs/base-generic/CONFIG_ATMEL
index 1c06679a7..1c06679a7 100644
--- a/baseconfig/CONFIG_ATMEL
+++ b/configs/base-generic/CONFIG_ATMEL
diff --git a/baseconfig/CONFIG_ATM_AMBASSADOR b/configs/base-generic/CONFIG_ATM_AMBASSADOR
index bb0583114..bb0583114 100644
--- a/baseconfig/CONFIG_ATM_AMBASSADOR
+++ b/configs/base-generic/CONFIG_ATM_AMBASSADOR
diff --git a/baseconfig/CONFIG_ATM_AMBASSADOR_DEBUG b/configs/base-generic/CONFIG_ATM_AMBASSADOR_DEBUG
index 9435808ec..9435808ec 100644
--- a/baseconfig/CONFIG_ATM_AMBASSADOR_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_AMBASSADOR_DEBUG
diff --git a/baseconfig/CONFIG_ATM_BR2684 b/configs/base-generic/CONFIG_ATM_BR2684
index 65ae8b6ac..65ae8b6ac 100644
--- a/baseconfig/CONFIG_ATM_BR2684
+++ b/configs/base-generic/CONFIG_ATM_BR2684
diff --git a/baseconfig/CONFIG_ATM_BR2684_IPFILTER b/configs/base-generic/CONFIG_ATM_BR2684_IPFILTER
index 655294fd4..655294fd4 100644
--- a/baseconfig/CONFIG_ATM_BR2684_IPFILTER
+++ b/configs/base-generic/CONFIG_ATM_BR2684_IPFILTER
diff --git a/baseconfig/CONFIG_ATM_CLIP b/configs/base-generic/CONFIG_ATM_CLIP
index 1474a1978..1474a1978 100644
--- a/baseconfig/CONFIG_ATM_CLIP
+++ b/configs/base-generic/CONFIG_ATM_CLIP
diff --git a/baseconfig/CONFIG_ATM_CLIP_NO_ICMP b/configs/base-generic/CONFIG_ATM_CLIP_NO_ICMP
index 011e40340..011e40340 100644
--- a/baseconfig/CONFIG_ATM_CLIP_NO_ICMP
+++ b/configs/base-generic/CONFIG_ATM_CLIP_NO_ICMP
diff --git a/baseconfig/CONFIG_ATM_DRIVERS b/configs/base-generic/CONFIG_ATM_DRIVERS
index 762b125d1..762b125d1 100644
--- a/baseconfig/CONFIG_ATM_DRIVERS
+++ b/configs/base-generic/CONFIG_ATM_DRIVERS
diff --git a/baseconfig/CONFIG_ATM_DUMMY b/configs/base-generic/CONFIG_ATM_DUMMY
index cf0e13da0..cf0e13da0 100644
--- a/baseconfig/CONFIG_ATM_DUMMY
+++ b/configs/base-generic/CONFIG_ATM_DUMMY
diff --git a/baseconfig/CONFIG_ATM_ENI b/configs/base-generic/CONFIG_ATM_ENI
index d444db9ae..d444db9ae 100644
--- a/baseconfig/CONFIG_ATM_ENI
+++ b/configs/base-generic/CONFIG_ATM_ENI
diff --git a/baseconfig/CONFIG_ATM_ENI_DEBUG b/configs/base-generic/CONFIG_ATM_ENI_DEBUG
index d92696150..d92696150 100644
--- a/baseconfig/CONFIG_ATM_ENI_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_ENI_DEBUG
diff --git a/baseconfig/CONFIG_ATM_ENI_TUNE_BURST b/configs/base-generic/CONFIG_ATM_ENI_TUNE_BURST
index 95f9d2e65..95f9d2e65 100644
--- a/baseconfig/CONFIG_ATM_ENI_TUNE_BURST
+++ b/configs/base-generic/CONFIG_ATM_ENI_TUNE_BURST
diff --git a/baseconfig/CONFIG_ATM_FIRESTREAM b/configs/base-generic/CONFIG_ATM_FIRESTREAM
index ffdb02cb5..ffdb02cb5 100644
--- a/baseconfig/CONFIG_ATM_FIRESTREAM
+++ b/configs/base-generic/CONFIG_ATM_FIRESTREAM
diff --git a/baseconfig/CONFIG_ATM_FORE200E b/configs/base-generic/CONFIG_ATM_FORE200E
index 169cabe85..169cabe85 100644
--- a/baseconfig/CONFIG_ATM_FORE200E
+++ b/configs/base-generic/CONFIG_ATM_FORE200E
diff --git a/baseconfig/CONFIG_ATM_FORE200E_DEBUG b/configs/base-generic/CONFIG_ATM_FORE200E_DEBUG
index c785d4ffe..c785d4ffe 100644
--- a/baseconfig/CONFIG_ATM_FORE200E_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_FORE200E_DEBUG
diff --git a/baseconfig/CONFIG_ATM_FORE200E_TX_RETRY b/configs/base-generic/CONFIG_ATM_FORE200E_TX_RETRY
index c6e626cb3..c6e626cb3 100644
--- a/baseconfig/CONFIG_ATM_FORE200E_TX_RETRY
+++ b/configs/base-generic/CONFIG_ATM_FORE200E_TX_RETRY
diff --git a/baseconfig/CONFIG_ATM_FORE200E_USE_TASKLET b/configs/base-generic/CONFIG_ATM_FORE200E_USE_TASKLET
index 093752a0f..093752a0f 100644
--- a/baseconfig/CONFIG_ATM_FORE200E_USE_TASKLET
+++ b/configs/base-generic/CONFIG_ATM_FORE200E_USE_TASKLET
diff --git a/baseconfig/CONFIG_ATM_HE b/configs/base-generic/CONFIG_ATM_HE
index e4e172ab2..e4e172ab2 100644
--- a/baseconfig/CONFIG_ATM_HE
+++ b/configs/base-generic/CONFIG_ATM_HE
diff --git a/baseconfig/CONFIG_ATM_HE_USE_SUNI b/configs/base-generic/CONFIG_ATM_HE_USE_SUNI
index bbde1e1ba..bbde1e1ba 100644
--- a/baseconfig/CONFIG_ATM_HE_USE_SUNI
+++ b/configs/base-generic/CONFIG_ATM_HE_USE_SUNI
diff --git a/baseconfig/CONFIG_ATM_HORIZON b/configs/base-generic/CONFIG_ATM_HORIZON
index 54be0dfd3..54be0dfd3 100644
--- a/baseconfig/CONFIG_ATM_HORIZON
+++ b/configs/base-generic/CONFIG_ATM_HORIZON
diff --git a/baseconfig/CONFIG_ATM_HORIZON_DEBUG b/configs/base-generic/CONFIG_ATM_HORIZON_DEBUG
index 58221ea36..58221ea36 100644
--- a/baseconfig/CONFIG_ATM_HORIZON_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_HORIZON_DEBUG
diff --git a/baseconfig/CONFIG_ATM_IA b/configs/base-generic/CONFIG_ATM_IA
index e0ae6d985..e0ae6d985 100644
--- a/baseconfig/CONFIG_ATM_IA
+++ b/configs/base-generic/CONFIG_ATM_IA
diff --git a/baseconfig/CONFIG_ATM_IA_DEBUG b/configs/base-generic/CONFIG_ATM_IA_DEBUG
index 1523c4374..1523c4374 100644
--- a/baseconfig/CONFIG_ATM_IA_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_IA_DEBUG
diff --git a/baseconfig/CONFIG_ATM_IDT77252 b/configs/base-generic/CONFIG_ATM_IDT77252
index 905f782d4..905f782d4 100644
--- a/baseconfig/CONFIG_ATM_IDT77252
+++ b/configs/base-generic/CONFIG_ATM_IDT77252
diff --git a/baseconfig/CONFIG_ATM_IDT77252_DEBUG b/configs/base-generic/CONFIG_ATM_IDT77252_DEBUG
index ec447231d..ec447231d 100644
--- a/baseconfig/CONFIG_ATM_IDT77252_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_IDT77252_DEBUG
diff --git a/baseconfig/CONFIG_ATM_IDT77252_RCV_ALL b/configs/base-generic/CONFIG_ATM_IDT77252_RCV_ALL
index d8dca57bf..d8dca57bf 100644
--- a/baseconfig/CONFIG_ATM_IDT77252_RCV_ALL
+++ b/configs/base-generic/CONFIG_ATM_IDT77252_RCV_ALL
diff --git a/baseconfig/CONFIG_ATM_LANAI b/configs/base-generic/CONFIG_ATM_LANAI
index 0cbba5d06..0cbba5d06 100644
--- a/baseconfig/CONFIG_ATM_LANAI
+++ b/configs/base-generic/CONFIG_ATM_LANAI
diff --git a/baseconfig/CONFIG_ATM_LANE b/configs/base-generic/CONFIG_ATM_LANE
index b7578abbd..b7578abbd 100644
--- a/baseconfig/CONFIG_ATM_LANE
+++ b/configs/base-generic/CONFIG_ATM_LANE
diff --git a/baseconfig/CONFIG_ATM_MPOA b/configs/base-generic/CONFIG_ATM_MPOA
index 75378a2c5..75378a2c5 100644
--- a/baseconfig/CONFIG_ATM_MPOA
+++ b/configs/base-generic/CONFIG_ATM_MPOA
diff --git a/baseconfig/CONFIG_ATM_NICSTAR b/configs/base-generic/CONFIG_ATM_NICSTAR
index 0baad3945..0baad3945 100644
--- a/baseconfig/CONFIG_ATM_NICSTAR
+++ b/configs/base-generic/CONFIG_ATM_NICSTAR
diff --git a/baseconfig/CONFIG_ATM_NICSTAR_USE_IDT77105 b/configs/base-generic/CONFIG_ATM_NICSTAR_USE_IDT77105
index 976d7c655..976d7c655 100644
--- a/baseconfig/CONFIG_ATM_NICSTAR_USE_IDT77105
+++ b/configs/base-generic/CONFIG_ATM_NICSTAR_USE_IDT77105
diff --git a/baseconfig/CONFIG_ATM_NICSTAR_USE_SUNI b/configs/base-generic/CONFIG_ATM_NICSTAR_USE_SUNI
index fcd454d92..fcd454d92 100644
--- a/baseconfig/CONFIG_ATM_NICSTAR_USE_SUNI
+++ b/configs/base-generic/CONFIG_ATM_NICSTAR_USE_SUNI
diff --git a/baseconfig/CONFIG_ATM_SOLOS b/configs/base-generic/CONFIG_ATM_SOLOS
index 854fb2821..854fb2821 100644
--- a/baseconfig/CONFIG_ATM_SOLOS
+++ b/configs/base-generic/CONFIG_ATM_SOLOS
diff --git a/baseconfig/CONFIG_ATM_TCP b/configs/base-generic/CONFIG_ATM_TCP
index bbc064e41..bbc064e41 100644
--- a/baseconfig/CONFIG_ATM_TCP
+++ b/configs/base-generic/CONFIG_ATM_TCP
diff --git a/baseconfig/CONFIG_ATM_ZATM b/configs/base-generic/CONFIG_ATM_ZATM
index 43f24b667..43f24b667 100644
--- a/baseconfig/CONFIG_ATM_ZATM
+++ b/configs/base-generic/CONFIG_ATM_ZATM
diff --git a/baseconfig/CONFIG_ATM_ZATM_DEBUG b/configs/base-generic/CONFIG_ATM_ZATM_DEBUG
index 2a7986df2..2a7986df2 100644
--- a/baseconfig/CONFIG_ATM_ZATM_DEBUG
+++ b/configs/base-generic/CONFIG_ATM_ZATM_DEBUG
diff --git a/baseconfig/CONFIG_ATOMIC64_SELFTEST b/configs/base-generic/CONFIG_ATOMIC64_SELFTEST
index 26a054e27..26a054e27 100644
--- a/baseconfig/CONFIG_ATOMIC64_SELFTEST
+++ b/configs/base-generic/CONFIG_ATOMIC64_SELFTEST
diff --git a/baseconfig/CONFIG_ATP b/configs/base-generic/CONFIG_ATP
index 3101a7837..3101a7837 100644
--- a/baseconfig/CONFIG_ATP
+++ b/configs/base-generic/CONFIG_ATP
diff --git a/baseconfig/CONFIG_AUDIT b/configs/base-generic/CONFIG_AUDIT
index aa15dd05b..aa15dd05b 100644
--- a/baseconfig/CONFIG_AUDIT
+++ b/configs/base-generic/CONFIG_AUDIT
diff --git a/baseconfig/CONFIG_AUDITSYSCALL b/configs/base-generic/CONFIG_AUDITSYSCALL
index 7ae4f9cd8..7ae4f9cd8 100644
--- a/baseconfig/CONFIG_AUDITSYSCALL
+++ b/configs/base-generic/CONFIG_AUDITSYSCALL
diff --git a/baseconfig/CONFIG_AUTOFS4_FS b/configs/base-generic/CONFIG_AUTOFS4_FS
index d5967796f..d5967796f 100644
--- a/baseconfig/CONFIG_AUTOFS4_FS
+++ b/configs/base-generic/CONFIG_AUTOFS4_FS
diff --git a/baseconfig/CONFIG_AUXDISPLAY b/configs/base-generic/CONFIG_AUXDISPLAY
index c29991a69..c29991a69 100644
--- a/baseconfig/CONFIG_AUXDISPLAY
+++ b/configs/base-generic/CONFIG_AUXDISPLAY
diff --git a/baseconfig/CONFIG_AVERAGE b/configs/base-generic/CONFIG_AVERAGE
index 0d55d2766..0d55d2766 100644
--- a/baseconfig/CONFIG_AVERAGE
+++ b/configs/base-generic/CONFIG_AVERAGE
diff --git a/baseconfig/CONFIG_AX25 b/configs/base-generic/CONFIG_AX25
index 2838a653a..2838a653a 100644
--- a/baseconfig/CONFIG_AX25
+++ b/configs/base-generic/CONFIG_AX25
diff --git a/baseconfig/CONFIG_AX25_DAMA_SLAVE b/configs/base-generic/CONFIG_AX25_DAMA_SLAVE
index 8e31af908..8e31af908 100644
--- a/baseconfig/CONFIG_AX25_DAMA_SLAVE
+++ b/configs/base-generic/CONFIG_AX25_DAMA_SLAVE
diff --git a/baseconfig/CONFIG_B43 b/configs/base-generic/CONFIG_B43
index 5e934edfc..5e934edfc 100644
--- a/baseconfig/CONFIG_B43
+++ b/configs/base-generic/CONFIG_B43
diff --git a/baseconfig/CONFIG_B43LEGACY b/configs/base-generic/CONFIG_B43LEGACY
index 92e41e3c4..92e41e3c4 100644
--- a/baseconfig/CONFIG_B43LEGACY
+++ b/configs/base-generic/CONFIG_B43LEGACY
diff --git a/baseconfig/CONFIG_B43LEGACY_DEBUG b/configs/base-generic/CONFIG_B43LEGACY_DEBUG
index 494982463..494982463 100644
--- a/baseconfig/CONFIG_B43LEGACY_DEBUG
+++ b/configs/base-generic/CONFIG_B43LEGACY_DEBUG
diff --git a/baseconfig/CONFIG_B43LEGACY_DMA b/configs/base-generic/CONFIG_B43LEGACY_DMA
index a04c9a39c..a04c9a39c 100644
--- a/baseconfig/CONFIG_B43LEGACY_DMA
+++ b/configs/base-generic/CONFIG_B43LEGACY_DMA
diff --git a/baseconfig/CONFIG_B43LEGACY_DMA_AND_PIO_MODE b/configs/base-generic/CONFIG_B43LEGACY_DMA_AND_PIO_MODE
index 807e8cd6d..807e8cd6d 100644
--- a/baseconfig/CONFIG_B43LEGACY_DMA_AND_PIO_MODE
+++ b/configs/base-generic/CONFIG_B43LEGACY_DMA_AND_PIO_MODE
diff --git a/baseconfig/CONFIG_B43LEGACY_DMA_MODE b/configs/base-generic/CONFIG_B43LEGACY_DMA_MODE
index 6cfbffc8a..6cfbffc8a 100644
--- a/baseconfig/CONFIG_B43LEGACY_DMA_MODE
+++ b/configs/base-generic/CONFIG_B43LEGACY_DMA_MODE
diff --git a/baseconfig/CONFIG_B43LEGACY_PIO b/configs/base-generic/CONFIG_B43LEGACY_PIO
index 76fba9acd..76fba9acd 100644
--- a/baseconfig/CONFIG_B43LEGACY_PIO
+++ b/configs/base-generic/CONFIG_B43LEGACY_PIO
diff --git a/baseconfig/CONFIG_B43LEGACY_PIO_MODE b/configs/base-generic/CONFIG_B43LEGACY_PIO_MODE
index 5ba8b6ff5..5ba8b6ff5 100644
--- a/baseconfig/CONFIG_B43LEGACY_PIO_MODE
+++ b/configs/base-generic/CONFIG_B43LEGACY_PIO_MODE
diff --git a/baseconfig/CONFIG_B43_BCMA b/configs/base-generic/CONFIG_B43_BCMA
index 128db4c0c..128db4c0c 100644
--- a/baseconfig/CONFIG_B43_BCMA
+++ b/configs/base-generic/CONFIG_B43_BCMA
diff --git a/baseconfig/CONFIG_B43_BCMA_PIO b/configs/base-generic/CONFIG_B43_BCMA_PIO
index 609d4d9c0..609d4d9c0 100644
--- a/baseconfig/CONFIG_B43_BCMA_PIO
+++ b/configs/base-generic/CONFIG_B43_BCMA_PIO
diff --git a/baseconfig/CONFIG_B43_DEBUG b/configs/base-generic/CONFIG_B43_DEBUG
index a2bf9bb1f..a2bf9bb1f 100644
--- a/baseconfig/CONFIG_B43_DEBUG
+++ b/configs/base-generic/CONFIG_B43_DEBUG
diff --git a/baseconfig/CONFIG_B43_PHY_G b/configs/base-generic/CONFIG_B43_PHY_G
index 4efc2efb5..4efc2efb5 100644
--- a/baseconfig/CONFIG_B43_PHY_G
+++ b/configs/base-generic/CONFIG_B43_PHY_G
diff --git a/baseconfig/CONFIG_B43_PHY_HT b/configs/base-generic/CONFIG_B43_PHY_HT
index 384f35e56..384f35e56 100644
--- a/baseconfig/CONFIG_B43_PHY_HT
+++ b/configs/base-generic/CONFIG_B43_PHY_HT
diff --git a/baseconfig/CONFIG_B43_PHY_LP b/configs/base-generic/CONFIG_B43_PHY_LP
index e03437102..e03437102 100644
--- a/baseconfig/CONFIG_B43_PHY_LP
+++ b/configs/base-generic/CONFIG_B43_PHY_LP
diff --git a/baseconfig/CONFIG_B43_PHY_N b/configs/base-generic/CONFIG_B43_PHY_N
index 415f6ff02..415f6ff02 100644
--- a/baseconfig/CONFIG_B43_PHY_N
+++ b/configs/base-generic/CONFIG_B43_PHY_N
diff --git a/baseconfig/CONFIG_B43_SDIO b/configs/base-generic/CONFIG_B43_SDIO
index 206c9c169..206c9c169 100644
--- a/baseconfig/CONFIG_B43_SDIO
+++ b/configs/base-generic/CONFIG_B43_SDIO
diff --git a/baseconfig/CONFIG_B44 b/configs/base-generic/CONFIG_B44
index 050cd0055..050cd0055 100644
--- a/baseconfig/CONFIG_B44
+++ b/configs/base-generic/CONFIG_B44
diff --git a/baseconfig/CONFIG_B44_PCI b/configs/base-generic/CONFIG_B44_PCI
index 9a2bb97bf..9a2bb97bf 100644
--- a/baseconfig/CONFIG_B44_PCI
+++ b/configs/base-generic/CONFIG_B44_PCI
diff --git a/baseconfig/CONFIG_B53 b/configs/base-generic/CONFIG_B53
index 9c762dafb..9c762dafb 100644
--- a/baseconfig/CONFIG_B53
+++ b/configs/base-generic/CONFIG_B53
diff --git a/baseconfig/CONFIG_B53_MDIO_DRIVER b/configs/base-generic/CONFIG_B53_MDIO_DRIVER
index 10b07ff23..10b07ff23 100644
--- a/baseconfig/CONFIG_B53_MDIO_DRIVER
+++ b/configs/base-generic/CONFIG_B53_MDIO_DRIVER
diff --git a/baseconfig/CONFIG_B53_MMAP_DRIVER b/configs/base-generic/CONFIG_B53_MMAP_DRIVER
index 491c79107..491c79107 100644
--- a/baseconfig/CONFIG_B53_MMAP_DRIVER
+++ b/configs/base-generic/CONFIG_B53_MMAP_DRIVER
diff --git a/baseconfig/CONFIG_B53_SPI_DRIVER b/configs/base-generic/CONFIG_B53_SPI_DRIVER
index b87f7beda..b87f7beda 100644
--- a/baseconfig/CONFIG_B53_SPI_DRIVER
+++ b/configs/base-generic/CONFIG_B53_SPI_DRIVER
diff --git a/baseconfig/CONFIG_B53_SRAB_DRIVER b/configs/base-generic/CONFIG_B53_SRAB_DRIVER
index c2dcca72a..c2dcca72a 100644
--- a/baseconfig/CONFIG_B53_SRAB_DRIVER
+++ b/configs/base-generic/CONFIG_B53_SRAB_DRIVER
diff --git a/baseconfig/CONFIG_BACKLIGHT_ADP8860 b/configs/base-generic/CONFIG_BACKLIGHT_ADP8860
index 401ceb236..401ceb236 100644
--- a/baseconfig/CONFIG_BACKLIGHT_ADP8860
+++ b/configs/base-generic/CONFIG_BACKLIGHT_ADP8860
diff --git a/baseconfig/CONFIG_BACKLIGHT_ADP8870 b/configs/base-generic/CONFIG_BACKLIGHT_ADP8870
index 6d0c88caf..6d0c88caf 100644
--- a/baseconfig/CONFIG_BACKLIGHT_ADP8870
+++ b/configs/base-generic/CONFIG_BACKLIGHT_ADP8870
diff --git a/baseconfig/CONFIG_BACKLIGHT_ARCXCNN b/configs/base-generic/CONFIG_BACKLIGHT_ARCXCNN
index 49161963d..49161963d 100644
--- a/baseconfig/CONFIG_BACKLIGHT_ARCXCNN
+++ b/configs/base-generic/CONFIG_BACKLIGHT_ARCXCNN
diff --git a/baseconfig/CONFIG_BACKLIGHT_BD6107 b/configs/base-generic/CONFIG_BACKLIGHT_BD6107
index 07df4bf15..07df4bf15 100644
--- a/baseconfig/CONFIG_BACKLIGHT_BD6107
+++ b/configs/base-generic/CONFIG_BACKLIGHT_BD6107
diff --git a/baseconfig/CONFIG_BACKLIGHT_CLASS_DEVICE b/configs/base-generic/CONFIG_BACKLIGHT_CLASS_DEVICE
index c37961b4c..c37961b4c 100644
--- a/baseconfig/CONFIG_BACKLIGHT_CLASS_DEVICE
+++ b/configs/base-generic/CONFIG_BACKLIGHT_CLASS_DEVICE
diff --git a/baseconfig/CONFIG_BACKLIGHT_GENERIC b/configs/base-generic/CONFIG_BACKLIGHT_GENERIC
index c675dd5bd..c675dd5bd 100644
--- a/baseconfig/CONFIG_BACKLIGHT_GENERIC
+++ b/configs/base-generic/CONFIG_BACKLIGHT_GENERIC
diff --git a/baseconfig/CONFIG_BACKLIGHT_GPIO b/configs/base-generic/CONFIG_BACKLIGHT_GPIO
index 4ddf33e9a..4ddf33e9a 100644
--- a/baseconfig/CONFIG_BACKLIGHT_GPIO
+++ b/configs/base-generic/CONFIG_BACKLIGHT_GPIO
diff --git a/baseconfig/CONFIG_BACKLIGHT_LCD_SUPPORT b/configs/base-generic/CONFIG_BACKLIGHT_LCD_SUPPORT
index ac802ca1c..ac802ca1c 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LCD_SUPPORT
diff --git a/baseconfig/CONFIG_BACKLIGHT_LM3630 b/configs/base-generic/CONFIG_BACKLIGHT_LM3630
index 939480d0b..939480d0b 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LM3630
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LM3630
diff --git a/baseconfig/CONFIG_BACKLIGHT_LM3630A b/configs/base-generic/CONFIG_BACKLIGHT_LM3630A
index 1cc4fc66b..1cc4fc66b 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LM3630A
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LM3630A
diff --git a/baseconfig/CONFIG_BACKLIGHT_LM3639 b/configs/base-generic/CONFIG_BACKLIGHT_LM3639
index cf301c4f9..cf301c4f9 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LM3639
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LM3639
diff --git a/baseconfig/CONFIG_BACKLIGHT_LP855X b/configs/base-generic/CONFIG_BACKLIGHT_LP855X
index bf846f832..bf846f832 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LP855X
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LP855X
diff --git a/baseconfig/CONFIG_BACKLIGHT_LV5207LP b/configs/base-generic/CONFIG_BACKLIGHT_LV5207LP
index ed80d7e66..ed80d7e66 100644
--- a/baseconfig/CONFIG_BACKLIGHT_LV5207LP
+++ b/configs/base-generic/CONFIG_BACKLIGHT_LV5207LP
diff --git a/baseconfig/CONFIG_BACKLIGHT_PM8941_WLED b/configs/base-generic/CONFIG_BACKLIGHT_PM8941_WLED
index cd95d798e..cd95d798e 100644
--- a/baseconfig/CONFIG_BACKLIGHT_PM8941_WLED
+++ b/configs/base-generic/CONFIG_BACKLIGHT_PM8941_WLED
diff --git a/baseconfig/CONFIG_BACKLIGHT_PWM b/configs/base-generic/CONFIG_BACKLIGHT_PWM
index e867170c2..e867170c2 100644
--- a/baseconfig/CONFIG_BACKLIGHT_PWM
+++ b/configs/base-generic/CONFIG_BACKLIGHT_PWM
diff --git a/baseconfig/CONFIG_BACKLIGHT_SAHARA b/configs/base-generic/CONFIG_BACKLIGHT_SAHARA
index bec58af81..bec58af81 100644
--- a/baseconfig/CONFIG_BACKLIGHT_SAHARA
+++ b/configs/base-generic/CONFIG_BACKLIGHT_SAHARA
diff --git a/baseconfig/CONFIG_BACKLIGHT_WM831X b/configs/base-generic/CONFIG_BACKLIGHT_WM831X
index 4bf3961d0..4bf3961d0 100644
--- a/baseconfig/CONFIG_BACKLIGHT_WM831X
+++ b/configs/base-generic/CONFIG_BACKLIGHT_WM831X
diff --git a/baseconfig/CONFIG_BACKTRACE_SELF_TEST b/configs/base-generic/CONFIG_BACKTRACE_SELF_TEST
index d8da78650..d8da78650 100644
--- a/baseconfig/CONFIG_BACKTRACE_SELF_TEST
+++ b/configs/base-generic/CONFIG_BACKTRACE_SELF_TEST
diff --git a/baseconfig/CONFIG_BALLOON_COMPACTION b/configs/base-generic/CONFIG_BALLOON_COMPACTION
index 930afec9d..930afec9d 100644
--- a/baseconfig/CONFIG_BALLOON_COMPACTION
+++ b/configs/base-generic/CONFIG_BALLOON_COMPACTION
diff --git a/baseconfig/CONFIG_BATMAN_ADV b/configs/base-generic/CONFIG_BATMAN_ADV
index a0c27974d..a0c27974d 100644
--- a/baseconfig/CONFIG_BATMAN_ADV
+++ b/configs/base-generic/CONFIG_BATMAN_ADV
diff --git a/baseconfig/CONFIG_BATMAN_ADV_BATMAN_V b/configs/base-generic/CONFIG_BATMAN_ADV_BATMAN_V
index 488120630..488120630 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_BATMAN_V
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_BATMAN_V
diff --git a/baseconfig/CONFIG_BATMAN_ADV_BLA b/configs/base-generic/CONFIG_BATMAN_ADV_BLA
index 3306da12a..3306da12a 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_BLA
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_BLA
diff --git a/baseconfig/CONFIG_BATMAN_ADV_DAT b/configs/base-generic/CONFIG_BATMAN_ADV_DAT
index 84e0835a9..84e0835a9 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_DAT
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_DAT
diff --git a/baseconfig/CONFIG_BATMAN_ADV_DEBUG b/configs/base-generic/CONFIG_BATMAN_ADV_DEBUG
index b5f8a4036..b5f8a4036 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_DEBUG
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_DEBUG
diff --git a/baseconfig/CONFIG_BATMAN_ADV_DEBUGFS b/configs/base-generic/CONFIG_BATMAN_ADV_DEBUGFS
index db1e9aa06..db1e9aa06 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_DEBUGFS
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_DEBUGFS
diff --git a/baseconfig/CONFIG_BATMAN_ADV_MCAST b/configs/base-generic/CONFIG_BATMAN_ADV_MCAST
index 0794171af..0794171af 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_MCAST
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_MCAST
diff --git a/baseconfig/CONFIG_BATMAN_ADV_NC b/configs/base-generic/CONFIG_BATMAN_ADV_NC
index b452510ea..b452510ea 100644
--- a/baseconfig/CONFIG_BATMAN_ADV_NC
+++ b/configs/base-generic/CONFIG_BATMAN_ADV_NC
diff --git a/baseconfig/CONFIG_BATTERY_BQ27XXX b/configs/base-generic/CONFIG_BATTERY_BQ27XXX
index 4ddb243ba..4ddb243ba 100644
--- a/baseconfig/CONFIG_BATTERY_BQ27XXX
+++ b/configs/base-generic/CONFIG_BATTERY_BQ27XXX
diff --git a/baseconfig/CONFIG_BATTERY_DS2760 b/configs/base-generic/CONFIG_BATTERY_DS2760
index 76bcf1b55..76bcf1b55 100644
--- a/baseconfig/CONFIG_BATTERY_DS2760
+++ b/configs/base-generic/CONFIG_BATTERY_DS2760
diff --git a/baseconfig/CONFIG_BATTERY_DS2780 b/configs/base-generic/CONFIG_BATTERY_DS2780
index 508ab19d9..508ab19d9 100644
--- a/baseconfig/CONFIG_BATTERY_DS2780
+++ b/configs/base-generic/CONFIG_BATTERY_DS2780
diff --git a/baseconfig/CONFIG_BATTERY_DS2781 b/configs/base-generic/CONFIG_BATTERY_DS2781
index f35c00807..f35c00807 100644
--- a/baseconfig/CONFIG_BATTERY_DS2781
+++ b/configs/base-generic/CONFIG_BATTERY_DS2781
diff --git a/baseconfig/CONFIG_BATTERY_DS2782 b/configs/base-generic/CONFIG_BATTERY_DS2782
index 126e3105a..126e3105a 100644
--- a/baseconfig/CONFIG_BATTERY_DS2782
+++ b/configs/base-generic/CONFIG_BATTERY_DS2782
diff --git a/baseconfig/CONFIG_BATTERY_GAUGE_LTC2941 b/configs/base-generic/CONFIG_BATTERY_GAUGE_LTC2941
index a4a35e337..a4a35e337 100644
--- a/baseconfig/CONFIG_BATTERY_GAUGE_LTC2941
+++ b/configs/base-generic/CONFIG_BATTERY_GAUGE_LTC2941
diff --git a/baseconfig/CONFIG_BATTERY_LEGO_EV3 b/configs/base-generic/CONFIG_BATTERY_LEGO_EV3
index 3305bd311..3305bd311 100644
--- a/baseconfig/CONFIG_BATTERY_LEGO_EV3
+++ b/configs/base-generic/CONFIG_BATTERY_LEGO_EV3
diff --git a/baseconfig/CONFIG_BATTERY_MAX17040 b/configs/base-generic/CONFIG_BATTERY_MAX17040
index 074c2386b..074c2386b 100644
--- a/baseconfig/CONFIG_BATTERY_MAX17040
+++ b/configs/base-generic/CONFIG_BATTERY_MAX17040
diff --git a/baseconfig/CONFIG_BATTERY_MAX17042 b/configs/base-generic/CONFIG_BATTERY_MAX17042
index 19ff6af7a..19ff6af7a 100644
--- a/baseconfig/CONFIG_BATTERY_MAX17042
+++ b/configs/base-generic/CONFIG_BATTERY_MAX17042
diff --git a/baseconfig/CONFIG_BATTERY_MAX1721X b/configs/base-generic/CONFIG_BATTERY_MAX1721X
index 98c04567c..98c04567c 100644
--- a/baseconfig/CONFIG_BATTERY_MAX1721X
+++ b/configs/base-generic/CONFIG_BATTERY_MAX1721X
diff --git a/baseconfig/CONFIG_BATTERY_SBS b/configs/base-generic/CONFIG_BATTERY_SBS
index c624a2f7f..c624a2f7f 100644
--- a/baseconfig/CONFIG_BATTERY_SBS
+++ b/configs/base-generic/CONFIG_BATTERY_SBS
diff --git a/baseconfig/CONFIG_BAYCOM_EPP b/configs/base-generic/CONFIG_BAYCOM_EPP
index fcf41f090..fcf41f090 100644
--- a/baseconfig/CONFIG_BAYCOM_EPP
+++ b/configs/base-generic/CONFIG_BAYCOM_EPP
diff --git a/baseconfig/CONFIG_BAYCOM_PAR b/configs/base-generic/CONFIG_BAYCOM_PAR
index 5db4511f1..5db4511f1 100644
--- a/baseconfig/CONFIG_BAYCOM_PAR
+++ b/configs/base-generic/CONFIG_BAYCOM_PAR
diff --git a/baseconfig/CONFIG_BAYCOM_SER_FDX b/configs/base-generic/CONFIG_BAYCOM_SER_FDX
index 3d0b88364..3d0b88364 100644
--- a/baseconfig/CONFIG_BAYCOM_SER_FDX
+++ b/configs/base-generic/CONFIG_BAYCOM_SER_FDX
diff --git a/baseconfig/CONFIG_BAYCOM_SER_HDX b/configs/base-generic/CONFIG_BAYCOM_SER_HDX
index 538d75c4f..538d75c4f 100644
--- a/baseconfig/CONFIG_BAYCOM_SER_HDX
+++ b/configs/base-generic/CONFIG_BAYCOM_SER_HDX
diff --git a/baseconfig/CONFIG_BCACHE b/configs/base-generic/CONFIG_BCACHE
index c7813b081..c7813b081 100644
--- a/baseconfig/CONFIG_BCACHE
+++ b/configs/base-generic/CONFIG_BCACHE
diff --git a/baseconfig/CONFIG_BCACHE_CLOSURES_DEBUG b/configs/base-generic/CONFIG_BCACHE_CLOSURES_DEBUG
index eb3f1af90..eb3f1af90 100644
--- a/baseconfig/CONFIG_BCACHE_CLOSURES_DEBUG
+++ b/configs/base-generic/CONFIG_BCACHE_CLOSURES_DEBUG
diff --git a/baseconfig/CONFIG_BCACHE_DEBUG b/configs/base-generic/CONFIG_BCACHE_DEBUG
index 36426027b..36426027b 100644
--- a/baseconfig/CONFIG_BCACHE_DEBUG
+++ b/configs/base-generic/CONFIG_BCACHE_DEBUG
diff --git a/baseconfig/CONFIG_BCM2835_VCHIQ b/configs/base-generic/CONFIG_BCM2835_VCHIQ
index 0f1da7edd..0f1da7edd 100644
--- a/baseconfig/CONFIG_BCM2835_VCHIQ
+++ b/configs/base-generic/CONFIG_BCM2835_VCHIQ
diff --git a/baseconfig/CONFIG_BCM63XX_PHY b/configs/base-generic/CONFIG_BCM63XX_PHY
index 2edb10c16..2edb10c16 100644
--- a/baseconfig/CONFIG_BCM63XX_PHY
+++ b/configs/base-generic/CONFIG_BCM63XX_PHY
diff --git a/baseconfig/CONFIG_BCM7038_WDT b/configs/base-generic/CONFIG_BCM7038_WDT
index e720354d9..e720354d9 100644
--- a/baseconfig/CONFIG_BCM7038_WDT
+++ b/configs/base-generic/CONFIG_BCM7038_WDT
diff --git a/baseconfig/CONFIG_BCM7XXX_PHY b/configs/base-generic/CONFIG_BCM7XXX_PHY
index 09c4987ca..09c4987ca 100644
--- a/baseconfig/CONFIG_BCM7XXX_PHY
+++ b/configs/base-generic/CONFIG_BCM7XXX_PHY
diff --git a/baseconfig/CONFIG_BCM87XX_PHY b/configs/base-generic/CONFIG_BCM87XX_PHY
index b9dd7faba..b9dd7faba 100644
--- a/baseconfig/CONFIG_BCM87XX_PHY
+++ b/configs/base-generic/CONFIG_BCM87XX_PHY
diff --git a/baseconfig/CONFIG_BCMA b/configs/base-generic/CONFIG_BCMA
index d9d0a9bbc..d9d0a9bbc 100644
--- a/baseconfig/CONFIG_BCMA
+++ b/configs/base-generic/CONFIG_BCMA
diff --git a/baseconfig/CONFIG_BCMA_BLOCKIO b/configs/base-generic/CONFIG_BCMA_BLOCKIO
index adb6a43d7..adb6a43d7 100644
--- a/baseconfig/CONFIG_BCMA_BLOCKIO
+++ b/configs/base-generic/CONFIG_BCMA_BLOCKIO
diff --git a/baseconfig/CONFIG_BCMA_DEBUG b/configs/base-generic/CONFIG_BCMA_DEBUG
index c5cc6a5cf..c5cc6a5cf 100644
--- a/baseconfig/CONFIG_BCMA_DEBUG
+++ b/configs/base-generic/CONFIG_BCMA_DEBUG
diff --git a/baseconfig/CONFIG_BCMA_DRIVER_GMAC_CMN b/configs/base-generic/CONFIG_BCMA_DRIVER_GMAC_CMN
index 501bc2aec..501bc2aec 100644
--- a/baseconfig/CONFIG_BCMA_DRIVER_GMAC_CMN
+++ b/configs/base-generic/CONFIG_BCMA_DRIVER_GMAC_CMN
diff --git a/baseconfig/CONFIG_BCMA_DRIVER_GPIO b/configs/base-generic/CONFIG_BCMA_DRIVER_GPIO
index ae73e2287..ae73e2287 100644
--- a/baseconfig/CONFIG_BCMA_DRIVER_GPIO
+++ b/configs/base-generic/CONFIG_BCMA_DRIVER_GPIO
diff --git a/baseconfig/CONFIG_BCMA_HOST_PCI b/configs/base-generic/CONFIG_BCMA_HOST_PCI
index a37624a12..a37624a12 100644
--- a/baseconfig/CONFIG_BCMA_HOST_PCI
+++ b/configs/base-generic/CONFIG_BCMA_HOST_PCI
diff --git a/baseconfig/CONFIG_BCMA_HOST_PCI_POSSIBLE b/configs/base-generic/CONFIG_BCMA_HOST_PCI_POSSIBLE
index 204a2cca7..204a2cca7 100644
--- a/baseconfig/CONFIG_BCMA_HOST_PCI_POSSIBLE
+++ b/configs/base-generic/CONFIG_BCMA_HOST_PCI_POSSIBLE
diff --git a/baseconfig/CONFIG_BCMA_HOST_SOC b/configs/base-generic/CONFIG_BCMA_HOST_SOC
index 0c3f2477f..0c3f2477f 100644
--- a/baseconfig/CONFIG_BCMA_HOST_SOC
+++ b/configs/base-generic/CONFIG_BCMA_HOST_SOC
diff --git a/baseconfig/CONFIG_BCMGENET b/configs/base-generic/CONFIG_BCMGENET
index 032b739ae..032b739ae 100644
--- a/baseconfig/CONFIG_BCMGENET
+++ b/configs/base-generic/CONFIG_BCMGENET
diff --git a/baseconfig/CONFIG_BCM_FLEXRM_MBOX b/configs/base-generic/CONFIG_BCM_FLEXRM_MBOX
index b47d4f392..b47d4f392 100644
--- a/baseconfig/CONFIG_BCM_FLEXRM_MBOX
+++ b/configs/base-generic/CONFIG_BCM_FLEXRM_MBOX
diff --git a/baseconfig/CONFIG_BCM_KONA_USB2_PHY b/configs/base-generic/CONFIG_BCM_KONA_USB2_PHY
index 787233648..787233648 100644
--- a/baseconfig/CONFIG_BCM_KONA_USB2_PHY
+++ b/configs/base-generic/CONFIG_BCM_KONA_USB2_PHY
diff --git a/baseconfig/CONFIG_BE2ISCSI b/configs/base-generic/CONFIG_BE2ISCSI
index d27a7a058..d27a7a058 100644
--- a/baseconfig/CONFIG_BE2ISCSI
+++ b/configs/base-generic/CONFIG_BE2ISCSI
diff --git a/baseconfig/CONFIG_BE2NET b/configs/base-generic/CONFIG_BE2NET
index b5f51dbbd..b5f51dbbd 100644
--- a/baseconfig/CONFIG_BE2NET
+++ b/configs/base-generic/CONFIG_BE2NET
diff --git a/baseconfig/CONFIG_BE2NET_HWMON b/configs/base-generic/CONFIG_BE2NET_HWMON
index e88bff0ec..e88bff0ec 100644
--- a/baseconfig/CONFIG_BE2NET_HWMON
+++ b/configs/base-generic/CONFIG_BE2NET_HWMON
diff --git a/baseconfig/CONFIG_BEFS_DEBUG b/configs/base-generic/CONFIG_BEFS_DEBUG
index bc9b28a2f..bc9b28a2f 100644
--- a/baseconfig/CONFIG_BEFS_DEBUG
+++ b/configs/base-generic/CONFIG_BEFS_DEBUG
diff --git a/baseconfig/CONFIG_BEFS_FS b/configs/base-generic/CONFIG_BEFS_FS
index 33f0c8783..33f0c8783 100644
--- a/baseconfig/CONFIG_BEFS_FS
+++ b/configs/base-generic/CONFIG_BEFS_FS
diff --git a/baseconfig/CONFIG_BFQ_GROUP_IOSCHED b/configs/base-generic/CONFIG_BFQ_GROUP_IOSCHED
index 731981ca3..731981ca3 100644
--- a/baseconfig/CONFIG_BFQ_GROUP_IOSCHED
+++ b/configs/base-generic/CONFIG_BFQ_GROUP_IOSCHED
diff --git a/baseconfig/CONFIG_BFS_FS b/configs/base-generic/CONFIG_BFS_FS
index e667a937b..e667a937b 100644
--- a/baseconfig/CONFIG_BFS_FS
+++ b/configs/base-generic/CONFIG_BFS_FS
diff --git a/baseconfig/CONFIG_BH1750 b/configs/base-generic/CONFIG_BH1750
index cbb8bb29e..cbb8bb29e 100644
--- a/baseconfig/CONFIG_BH1750
+++ b/configs/base-generic/CONFIG_BH1750
diff --git a/baseconfig/CONFIG_BH1780 b/configs/base-generic/CONFIG_BH1780
index 07bbc5b68..07bbc5b68 100644
--- a/baseconfig/CONFIG_BH1780
+++ b/configs/base-generic/CONFIG_BH1780
diff --git a/baseconfig/CONFIG_BIG_KEYS b/configs/base-generic/CONFIG_BIG_KEYS
index 645e925e1..645e925e1 100644
--- a/baseconfig/CONFIG_BIG_KEYS
+++ b/configs/base-generic/CONFIG_BIG_KEYS
diff --git a/baseconfig/CONFIG_BINFMT_AOUT b/configs/base-generic/CONFIG_BINFMT_AOUT
index c9ad1ae1b..c9ad1ae1b 100644
--- a/baseconfig/CONFIG_BINFMT_AOUT
+++ b/configs/base-generic/CONFIG_BINFMT_AOUT
diff --git a/baseconfig/CONFIG_BINFMT_ELF b/configs/base-generic/CONFIG_BINFMT_ELF
index f9a79c64b..f9a79c64b 100644
--- a/baseconfig/CONFIG_BINFMT_ELF
+++ b/configs/base-generic/CONFIG_BINFMT_ELF
diff --git a/baseconfig/CONFIG_BINFMT_FLAT b/configs/base-generic/CONFIG_BINFMT_FLAT
index 00d16919b..00d16919b 100644
--- a/baseconfig/CONFIG_BINFMT_FLAT
+++ b/configs/base-generic/CONFIG_BINFMT_FLAT
diff --git a/baseconfig/CONFIG_BINFMT_MISC b/configs/base-generic/CONFIG_BINFMT_MISC
index 20754804b..20754804b 100644
--- a/baseconfig/CONFIG_BINFMT_MISC
+++ b/configs/base-generic/CONFIG_BINFMT_MISC
diff --git a/baseconfig/CONFIG_BINFMT_SCRIPT b/configs/base-generic/CONFIG_BINFMT_SCRIPT
index b9821f947..b9821f947 100644
--- a/baseconfig/CONFIG_BINFMT_SCRIPT
+++ b/configs/base-generic/CONFIG_BINFMT_SCRIPT
diff --git a/baseconfig/CONFIG_BLK_CGROUP b/configs/base-generic/CONFIG_BLK_CGROUP
index b80f0100a..b80f0100a 100644
--- a/baseconfig/CONFIG_BLK_CGROUP
+++ b/configs/base-generic/CONFIG_BLK_CGROUP
diff --git a/baseconfig/CONFIG_BLK_CMDLINE_PARSER b/configs/base-generic/CONFIG_BLK_CMDLINE_PARSER
index c5c79ad38..c5c79ad38 100644
--- a/baseconfig/CONFIG_BLK_CMDLINE_PARSER
+++ b/configs/base-generic/CONFIG_BLK_CMDLINE_PARSER
diff --git a/baseconfig/CONFIG_BLK_DEBUG_FS b/configs/base-generic/CONFIG_BLK_DEBUG_FS
index 71cc6e708..71cc6e708 100644
--- a/baseconfig/CONFIG_BLK_DEBUG_FS
+++ b/configs/base-generic/CONFIG_BLK_DEBUG_FS
diff --git a/baseconfig/CONFIG_BLK_DEV b/configs/base-generic/CONFIG_BLK_DEV
index 8b43214d0..8b43214d0 100644
--- a/baseconfig/CONFIG_BLK_DEV
+++ b/configs/base-generic/CONFIG_BLK_DEV
diff --git a/baseconfig/CONFIG_BLK_DEV_3W_XXXX_RAID b/configs/base-generic/CONFIG_BLK_DEV_3W_XXXX_RAID
index 4e5d48634..4e5d48634 100644
--- a/baseconfig/CONFIG_BLK_DEV_3W_XXXX_RAID
+++ b/configs/base-generic/CONFIG_BLK_DEV_3W_XXXX_RAID
diff --git a/baseconfig/CONFIG_BLK_DEV_BSG b/configs/base-generic/CONFIG_BLK_DEV_BSG
index 8acabf1ac..8acabf1ac 100644
--- a/baseconfig/CONFIG_BLK_DEV_BSG
+++ b/configs/base-generic/CONFIG_BLK_DEV_BSG
diff --git a/baseconfig/CONFIG_BLK_DEV_BSGLIB b/configs/base-generic/CONFIG_BLK_DEV_BSGLIB
index 5e1a78b5e..5e1a78b5e 100644
--- a/baseconfig/CONFIG_BLK_DEV_BSGLIB
+++ b/configs/base-generic/CONFIG_BLK_DEV_BSGLIB
diff --git a/baseconfig/CONFIG_BLK_DEV_CRYPTOLOOP b/configs/base-generic/CONFIG_BLK_DEV_CRYPTOLOOP
index 788df0ed6..788df0ed6 100644
--- a/baseconfig/CONFIG_BLK_DEV_CRYPTOLOOP
+++ b/configs/base-generic/CONFIG_BLK_DEV_CRYPTOLOOP
diff --git a/baseconfig/CONFIG_BLK_DEV_DAC960 b/configs/base-generic/CONFIG_BLK_DEV_DAC960
index c6817f9bc..c6817f9bc 100644
--- a/baseconfig/CONFIG_BLK_DEV_DAC960
+++ b/configs/base-generic/CONFIG_BLK_DEV_DAC960
diff --git a/baseconfig/CONFIG_BLK_DEV_DM b/configs/base-generic/CONFIG_BLK_DEV_DM
index 67b69359d..67b69359d 100644
--- a/baseconfig/CONFIG_BLK_DEV_DM
+++ b/configs/base-generic/CONFIG_BLK_DEV_DM
diff --git a/baseconfig/CONFIG_BLK_DEV_DRBD b/configs/base-generic/CONFIG_BLK_DEV_DRBD
index 765459aae..765459aae 100644
--- a/baseconfig/CONFIG_BLK_DEV_DRBD
+++ b/configs/base-generic/CONFIG_BLK_DEV_DRBD
diff --git a/baseconfig/CONFIG_BLK_DEV_FD b/configs/base-generic/CONFIG_BLK_DEV_FD
index c75cd3b03..c75cd3b03 100644
--- a/baseconfig/CONFIG_BLK_DEV_FD
+++ b/configs/base-generic/CONFIG_BLK_DEV_FD
diff --git a/baseconfig/CONFIG_BLK_DEV_INITRD b/configs/base-generic/CONFIG_BLK_DEV_INITRD
index f97f7a0a9..f97f7a0a9 100644
--- a/baseconfig/CONFIG_BLK_DEV_INITRD
+++ b/configs/base-generic/CONFIG_BLK_DEV_INITRD
diff --git a/baseconfig/CONFIG_BLK_DEV_INTEGRITY b/configs/base-generic/CONFIG_BLK_DEV_INTEGRITY
index 1ef600f47..1ef600f47 100644
--- a/baseconfig/CONFIG_BLK_DEV_INTEGRITY
+++ b/configs/base-generic/CONFIG_BLK_DEV_INTEGRITY
diff --git a/baseconfig/CONFIG_BLK_DEV_IO_TRACE b/configs/base-generic/CONFIG_BLK_DEV_IO_TRACE
index 3e61f2b38..3e61f2b38 100644
--- a/baseconfig/CONFIG_BLK_DEV_IO_TRACE
+++ b/configs/base-generic/CONFIG_BLK_DEV_IO_TRACE
diff --git a/baseconfig/CONFIG_BLK_DEV_LOOP b/configs/base-generic/CONFIG_BLK_DEV_LOOP
index 72437e0c0..72437e0c0 100644
--- a/baseconfig/CONFIG_BLK_DEV_LOOP
+++ b/configs/base-generic/CONFIG_BLK_DEV_LOOP
diff --git a/baseconfig/CONFIG_BLK_DEV_LOOP_MIN_COUNT b/configs/base-generic/CONFIG_BLK_DEV_LOOP_MIN_COUNT
index e81690649..e81690649 100644
--- a/baseconfig/CONFIG_BLK_DEV_LOOP_MIN_COUNT
+++ b/configs/base-generic/CONFIG_BLK_DEV_LOOP_MIN_COUNT
diff --git a/baseconfig/CONFIG_BLK_DEV_MD b/configs/base-generic/CONFIG_BLK_DEV_MD
index 791d32f45..791d32f45 100644
--- a/baseconfig/CONFIG_BLK_DEV_MD
+++ b/configs/base-generic/CONFIG_BLK_DEV_MD
diff --git a/baseconfig/CONFIG_BLK_DEV_NBD b/configs/base-generic/CONFIG_BLK_DEV_NBD
index be2735d45..be2735d45 100644
--- a/baseconfig/CONFIG_BLK_DEV_NBD
+++ b/configs/base-generic/CONFIG_BLK_DEV_NBD
diff --git a/baseconfig/CONFIG_BLK_DEV_NULL_BLK b/configs/base-generic/CONFIG_BLK_DEV_NULL_BLK
index 09340ef3d..09340ef3d 100644
--- a/baseconfig/CONFIG_BLK_DEV_NULL_BLK
+++ b/configs/base-generic/CONFIG_BLK_DEV_NULL_BLK
diff --git a/baseconfig/CONFIG_BLK_DEV_NVME b/configs/base-generic/CONFIG_BLK_DEV_NVME
index b1e62d9ad..b1e62d9ad 100644
--- a/baseconfig/CONFIG_BLK_DEV_NVME
+++ b/configs/base-generic/CONFIG_BLK_DEV_NVME
diff --git a/baseconfig/CONFIG_BLK_DEV_NVME_SCSI b/configs/base-generic/CONFIG_BLK_DEV_NVME_SCSI
index aeca874f9..aeca874f9 100644
--- a/baseconfig/CONFIG_BLK_DEV_NVME_SCSI
+++ b/configs/base-generic/CONFIG_BLK_DEV_NVME_SCSI
diff --git a/baseconfig/CONFIG_BLK_DEV_OSD b/configs/base-generic/CONFIG_BLK_DEV_OSD
index d04409d74..d04409d74 100644
--- a/baseconfig/CONFIG_BLK_DEV_OSD
+++ b/configs/base-generic/CONFIG_BLK_DEV_OSD
diff --git a/baseconfig/CONFIG_BLK_DEV_PCIESSD_MTIP32XX b/configs/base-generic/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
index 82024346d..82024346d 100644
--- a/baseconfig/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
+++ b/configs/base-generic/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
diff --git a/baseconfig/CONFIG_BLK_DEV_PMEM b/configs/base-generic/CONFIG_BLK_DEV_PMEM
index 04cb6f83a..04cb6f83a 100644
--- a/baseconfig/CONFIG_BLK_DEV_PMEM
+++ b/configs/base-generic/CONFIG_BLK_DEV_PMEM
diff --git a/baseconfig/CONFIG_BLK_DEV_RAM b/configs/base-generic/CONFIG_BLK_DEV_RAM
index 834088f95..834088f95 100644
--- a/baseconfig/CONFIG_BLK_DEV_RAM
+++ b/configs/base-generic/CONFIG_BLK_DEV_RAM
diff --git a/baseconfig/CONFIG_BLK_DEV_RAM_COUNT b/configs/base-generic/CONFIG_BLK_DEV_RAM_COUNT
index cefe13e14..cefe13e14 100644
--- a/baseconfig/CONFIG_BLK_DEV_RAM_COUNT
+++ b/configs/base-generic/CONFIG_BLK_DEV_RAM_COUNT
diff --git a/baseconfig/CONFIG_BLK_DEV_RAM_DAX b/configs/base-generic/CONFIG_BLK_DEV_RAM_DAX
index 20b5f7949..20b5f7949 100644
--- a/baseconfig/CONFIG_BLK_DEV_RAM_DAX
+++ b/configs/base-generic/CONFIG_BLK_DEV_RAM_DAX
diff --git a/baseconfig/CONFIG_BLK_DEV_RAM_SIZE b/configs/base-generic/CONFIG_BLK_DEV_RAM_SIZE
index ac4916f29..ac4916f29 100644
--- a/baseconfig/CONFIG_BLK_DEV_RAM_SIZE
+++ b/configs/base-generic/CONFIG_BLK_DEV_RAM_SIZE
diff --git a/baseconfig/CONFIG_BLK_DEV_RBD b/configs/base-generic/CONFIG_BLK_DEV_RBD
index 156a09970..156a09970 100644
--- a/baseconfig/CONFIG_BLK_DEV_RBD
+++ b/configs/base-generic/CONFIG_BLK_DEV_RBD
diff --git a/baseconfig/CONFIG_BLK_DEV_RSXX b/configs/base-generic/CONFIG_BLK_DEV_RSXX
index 1c40cd47c..1c40cd47c 100644
--- a/baseconfig/CONFIG_BLK_DEV_RSXX
+++ b/configs/base-generic/CONFIG_BLK_DEV_RSXX
diff --git a/baseconfig/CONFIG_BLK_DEV_SD b/configs/base-generic/CONFIG_BLK_DEV_SD
index e71b9a47a..e71b9a47a 100644
--- a/baseconfig/CONFIG_BLK_DEV_SD
+++ b/configs/base-generic/CONFIG_BLK_DEV_SD
diff --git a/baseconfig/CONFIG_BLK_DEV_SKD b/configs/base-generic/CONFIG_BLK_DEV_SKD
index 83aa502b6..83aa502b6 100644
--- a/baseconfig/CONFIG_BLK_DEV_SKD
+++ b/configs/base-generic/CONFIG_BLK_DEV_SKD
diff --git a/baseconfig/CONFIG_BLK_DEV_SR b/configs/base-generic/CONFIG_BLK_DEV_SR
index 9c97cecfc..9c97cecfc 100644
--- a/baseconfig/CONFIG_BLK_DEV_SR
+++ b/configs/base-generic/CONFIG_BLK_DEV_SR
diff --git a/baseconfig/CONFIG_BLK_DEV_SR_VENDOR b/configs/base-generic/CONFIG_BLK_DEV_SR_VENDOR
index e6691712a..e6691712a 100644
--- a/baseconfig/CONFIG_BLK_DEV_SR_VENDOR
+++ b/configs/base-generic/CONFIG_BLK_DEV_SR_VENDOR
diff --git a/baseconfig/CONFIG_BLK_DEV_SX8 b/configs/base-generic/CONFIG_BLK_DEV_SX8
index 143fc9420..143fc9420 100644
--- a/baseconfig/CONFIG_BLK_DEV_SX8
+++ b/configs/base-generic/CONFIG_BLK_DEV_SX8
diff --git a/baseconfig/CONFIG_BLK_DEV_THROTTLING b/configs/base-generic/CONFIG_BLK_DEV_THROTTLING
index 54ba3b928..54ba3b928 100644
--- a/baseconfig/CONFIG_BLK_DEV_THROTTLING
+++ b/configs/base-generic/CONFIG_BLK_DEV_THROTTLING
diff --git a/baseconfig/CONFIG_BLK_DEV_THROTTLING_LOW b/configs/base-generic/CONFIG_BLK_DEV_THROTTLING_LOW
index 802bc55b4..802bc55b4 100644
--- a/baseconfig/CONFIG_BLK_DEV_THROTTLING_LOW
+++ b/configs/base-generic/CONFIG_BLK_DEV_THROTTLING_LOW
diff --git a/baseconfig/CONFIG_BLK_DEV_UMEM b/configs/base-generic/CONFIG_BLK_DEV_UMEM
index bf783841a..bf783841a 100644
--- a/baseconfig/CONFIG_BLK_DEV_UMEM
+++ b/configs/base-generic/CONFIG_BLK_DEV_UMEM
diff --git a/baseconfig/CONFIG_BLK_DEV_ZONED b/configs/base-generic/CONFIG_BLK_DEV_ZONED
index 529b0b105..529b0b105 100644
--- a/baseconfig/CONFIG_BLK_DEV_ZONED
+++ b/configs/base-generic/CONFIG_BLK_DEV_ZONED
diff --git a/baseconfig/CONFIG_BLK_SED_OPAL b/configs/base-generic/CONFIG_BLK_SED_OPAL
index 11d139705..11d139705 100644
--- a/baseconfig/CONFIG_BLK_SED_OPAL
+++ b/configs/base-generic/CONFIG_BLK_SED_OPAL
diff --git a/baseconfig/CONFIG_BLK_WBT b/configs/base-generic/CONFIG_BLK_WBT
index 66627cb1a..66627cb1a 100644
--- a/baseconfig/CONFIG_BLK_WBT
+++ b/configs/base-generic/CONFIG_BLK_WBT
diff --git a/baseconfig/CONFIG_BLK_WBT_MQ b/configs/base-generic/CONFIG_BLK_WBT_MQ
index 2f4475f63..2f4475f63 100644
--- a/baseconfig/CONFIG_BLK_WBT_MQ
+++ b/configs/base-generic/CONFIG_BLK_WBT_MQ
diff --git a/baseconfig/CONFIG_BLK_WBT_SQ b/configs/base-generic/CONFIG_BLK_WBT_SQ
index 155d4b2bf..155d4b2bf 100644
--- a/baseconfig/CONFIG_BLK_WBT_SQ
+++ b/configs/base-generic/CONFIG_BLK_WBT_SQ
diff --git a/baseconfig/CONFIG_BMA180 b/configs/base-generic/CONFIG_BMA180
index f1c41d290..f1c41d290 100644
--- a/baseconfig/CONFIG_BMA180
+++ b/configs/base-generic/CONFIG_BMA180
diff --git a/baseconfig/CONFIG_BMA220 b/configs/base-generic/CONFIG_BMA220
index 21f418545..21f418545 100644
--- a/baseconfig/CONFIG_BMA220
+++ b/configs/base-generic/CONFIG_BMA220
diff --git a/baseconfig/CONFIG_BMC150_ACCEL b/configs/base-generic/CONFIG_BMC150_ACCEL
index 31f233fc1..31f233fc1 100644
--- a/baseconfig/CONFIG_BMC150_ACCEL
+++ b/configs/base-generic/CONFIG_BMC150_ACCEL
diff --git a/baseconfig/CONFIG_BMC150_MAGN b/configs/base-generic/CONFIG_BMC150_MAGN
index fa61de4cc..fa61de4cc 100644
--- a/baseconfig/CONFIG_BMC150_MAGN
+++ b/configs/base-generic/CONFIG_BMC150_MAGN
diff --git a/baseconfig/CONFIG_BMC150_MAGN_I2C b/configs/base-generic/CONFIG_BMC150_MAGN_I2C
index 9ee4a7205..9ee4a7205 100644
--- a/baseconfig/CONFIG_BMC150_MAGN_I2C
+++ b/configs/base-generic/CONFIG_BMC150_MAGN_I2C
diff --git a/baseconfig/CONFIG_BMC150_MAGN_SPI b/configs/base-generic/CONFIG_BMC150_MAGN_SPI
index 500adb833..500adb833 100644
--- a/baseconfig/CONFIG_BMC150_MAGN_SPI
+++ b/configs/base-generic/CONFIG_BMC150_MAGN_SPI
diff --git a/baseconfig/CONFIG_BMG160 b/configs/base-generic/CONFIG_BMG160
index 6406a84d5..6406a84d5 100644
--- a/baseconfig/CONFIG_BMG160
+++ b/configs/base-generic/CONFIG_BMG160
diff --git a/baseconfig/CONFIG_BMI160_I2C b/configs/base-generic/CONFIG_BMI160_I2C
index f58224424..f58224424 100644
--- a/baseconfig/CONFIG_BMI160_I2C
+++ b/configs/base-generic/CONFIG_BMI160_I2C
diff --git a/baseconfig/CONFIG_BMI160_SPI b/configs/base-generic/CONFIG_BMI160_SPI
index 9ca7127ae..9ca7127ae 100644
--- a/baseconfig/CONFIG_BMI160_SPI
+++ b/configs/base-generic/CONFIG_BMI160_SPI
diff --git a/baseconfig/CONFIG_BMP280 b/configs/base-generic/CONFIG_BMP280
index b41053b52..b41053b52 100644
--- a/baseconfig/CONFIG_BMP280
+++ b/configs/base-generic/CONFIG_BMP280
diff --git a/baseconfig/CONFIG_BNA b/configs/base-generic/CONFIG_BNA
index 5d8103dc7..5d8103dc7 100644
--- a/baseconfig/CONFIG_BNA
+++ b/configs/base-generic/CONFIG_BNA
diff --git a/baseconfig/CONFIG_BNX2 b/configs/base-generic/CONFIG_BNX2
index ff541ef7f..ff541ef7f 100644
--- a/baseconfig/CONFIG_BNX2
+++ b/configs/base-generic/CONFIG_BNX2
diff --git a/baseconfig/CONFIG_BNX2X b/configs/base-generic/CONFIG_BNX2X
index d32b37750..d32b37750 100644
--- a/baseconfig/CONFIG_BNX2X
+++ b/configs/base-generic/CONFIG_BNX2X
diff --git a/baseconfig/CONFIG_BNX2X_SRIOV b/configs/base-generic/CONFIG_BNX2X_SRIOV
index 73521e4aa..73521e4aa 100644
--- a/baseconfig/CONFIG_BNX2X_SRIOV
+++ b/configs/base-generic/CONFIG_BNX2X_SRIOV
diff --git a/baseconfig/CONFIG_BNXT b/configs/base-generic/CONFIG_BNXT
index 3305b042d..3305b042d 100644
--- a/baseconfig/CONFIG_BNXT
+++ b/configs/base-generic/CONFIG_BNXT
diff --git a/baseconfig/CONFIG_BNXT_DCB b/configs/base-generic/CONFIG_BNXT_DCB
index fd4061d58..fd4061d58 100644
--- a/baseconfig/CONFIG_BNXT_DCB
+++ b/configs/base-generic/CONFIG_BNXT_DCB
diff --git a/baseconfig/CONFIG_BNXT_FLOWER_OFFLOAD b/configs/base-generic/CONFIG_BNXT_FLOWER_OFFLOAD
index 170bbf312..170bbf312 100644
--- a/baseconfig/CONFIG_BNXT_FLOWER_OFFLOAD
+++ b/configs/base-generic/CONFIG_BNXT_FLOWER_OFFLOAD
diff --git a/baseconfig/CONFIG_BNXT_SRIOV b/configs/base-generic/CONFIG_BNXT_SRIOV
index 92285090d..92285090d 100644
--- a/baseconfig/CONFIG_BNXT_SRIOV
+++ b/configs/base-generic/CONFIG_BNXT_SRIOV
diff --git a/baseconfig/CONFIG_BONDING b/configs/base-generic/CONFIG_BONDING
index 2fd2a3159..2fd2a3159 100644
--- a/baseconfig/CONFIG_BONDING
+++ b/configs/base-generic/CONFIG_BONDING
diff --git a/baseconfig/CONFIG_BOOTPARAM_HARDLOCKUP_PANIC b/configs/base-generic/CONFIG_BOOTPARAM_HARDLOCKUP_PANIC
index 6964b23d0..6964b23d0 100644
--- a/baseconfig/CONFIG_BOOTPARAM_HARDLOCKUP_PANIC
+++ b/configs/base-generic/CONFIG_BOOTPARAM_HARDLOCKUP_PANIC
diff --git a/baseconfig/CONFIG_BOOTPARAM_HOTPLUG_CPU0 b/configs/base-generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
index 1ef7b66de..1ef7b66de 100644
--- a/baseconfig/CONFIG_BOOTPARAM_HOTPLUG_CPU0
+++ b/configs/base-generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0
diff --git a/baseconfig/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC b/configs/base-generic/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC
index 20270b1c6..20270b1c6 100644
--- a/baseconfig/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC
+++ b/configs/base-generic/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC
diff --git a/baseconfig/CONFIG_BOOT_PRINTK_DELAY b/configs/base-generic/CONFIG_BOOT_PRINTK_DELAY
index 081352b0c..081352b0c 100644
--- a/baseconfig/CONFIG_BOOT_PRINTK_DELAY
+++ b/configs/base-generic/CONFIG_BOOT_PRINTK_DELAY
diff --git a/baseconfig/CONFIG_BOUNCE b/configs/base-generic/CONFIG_BOUNCE
index 3f66da157..3f66da157 100644
--- a/baseconfig/CONFIG_BOUNCE
+++ b/configs/base-generic/CONFIG_BOUNCE
diff --git a/baseconfig/CONFIG_BPF_JIT b/configs/base-generic/CONFIG_BPF_JIT
index 5f9bba753..5f9bba753 100644
--- a/baseconfig/CONFIG_BPF_JIT
+++ b/configs/base-generic/CONFIG_BPF_JIT
diff --git a/baseconfig/CONFIG_BPF_STREAM_PARSER b/configs/base-generic/CONFIG_BPF_STREAM_PARSER
index 7cf783506..7cf783506 100644
--- a/baseconfig/CONFIG_BPF_STREAM_PARSER
+++ b/configs/base-generic/CONFIG_BPF_STREAM_PARSER
diff --git a/baseconfig/CONFIG_BPF_SYSCALL b/configs/base-generic/CONFIG_BPF_SYSCALL
index 4adb0f7e9..4adb0f7e9 100644
--- a/baseconfig/CONFIG_BPF_SYSCALL
+++ b/configs/base-generic/CONFIG_BPF_SYSCALL
diff --git a/baseconfig/CONFIG_BPQETHER b/configs/base-generic/CONFIG_BPQETHER
index c3fb8212d..c3fb8212d 100644
--- a/baseconfig/CONFIG_BPQETHER
+++ b/configs/base-generic/CONFIG_BPQETHER
diff --git a/baseconfig/CONFIG_BRCMDBG b/configs/base-generic/CONFIG_BRCMDBG
index 6c88b45b4..6c88b45b4 100644
--- a/baseconfig/CONFIG_BRCMDBG
+++ b/configs/base-generic/CONFIG_BRCMDBG
diff --git a/baseconfig/CONFIG_BRCMFMAC b/configs/base-generic/CONFIG_BRCMFMAC
index bd1d084d3..bd1d084d3 100644
--- a/baseconfig/CONFIG_BRCMFMAC
+++ b/configs/base-generic/CONFIG_BRCMFMAC
diff --git a/baseconfig/CONFIG_BRCMFMAC_PCIE b/configs/base-generic/CONFIG_BRCMFMAC_PCIE
index 7f83fdfbd..7f83fdfbd 100644
--- a/baseconfig/CONFIG_BRCMFMAC_PCIE
+++ b/configs/base-generic/CONFIG_BRCMFMAC_PCIE
diff --git a/baseconfig/CONFIG_BRCMFMAC_SDIO b/configs/base-generic/CONFIG_BRCMFMAC_SDIO
index be5c23d2e..be5c23d2e 100644
--- a/baseconfig/CONFIG_BRCMFMAC_SDIO
+++ b/configs/base-generic/CONFIG_BRCMFMAC_SDIO
diff --git a/baseconfig/CONFIG_BRCMFMAC_USB b/configs/base-generic/CONFIG_BRCMFMAC_USB
index 0bcd32d69..0bcd32d69 100644
--- a/baseconfig/CONFIG_BRCMFMAC_USB
+++ b/configs/base-generic/CONFIG_BRCMFMAC_USB
diff --git a/baseconfig/CONFIG_BRCMSMAC b/configs/base-generic/CONFIG_BRCMSMAC
index 92915921f..92915921f 100644
--- a/baseconfig/CONFIG_BRCMSMAC
+++ b/configs/base-generic/CONFIG_BRCMSMAC
diff --git a/baseconfig/CONFIG_BRCMSTB_GISB_ARB b/configs/base-generic/CONFIG_BRCMSTB_GISB_ARB
index 36e31edd2..36e31edd2 100644
--- a/baseconfig/CONFIG_BRCMSTB_GISB_ARB
+++ b/configs/base-generic/CONFIG_BRCMSTB_GISB_ARB
diff --git a/baseconfig/CONFIG_BRCM_TRACING b/configs/base-generic/CONFIG_BRCM_TRACING
index cda166d43..cda166d43 100644
--- a/baseconfig/CONFIG_BRCM_TRACING
+++ b/configs/base-generic/CONFIG_BRCM_TRACING
diff --git a/baseconfig/CONFIG_BRIDGE b/configs/base-generic/CONFIG_BRIDGE
index 06ef54326..06ef54326 100644
--- a/baseconfig/CONFIG_BRIDGE
+++ b/configs/base-generic/CONFIG_BRIDGE
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_802_3 b/configs/base-generic/CONFIG_BRIDGE_EBT_802_3
index a7a385edf..a7a385edf 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_802_3
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_802_3
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_AMONG b/configs/base-generic/CONFIG_BRIDGE_EBT_AMONG
index 5b854f904..5b854f904 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_AMONG
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_AMONG
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_ARP b/configs/base-generic/CONFIG_BRIDGE_EBT_ARP
index a8781c379..a8781c379 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_ARP
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_ARP
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_ARPREPLY b/configs/base-generic/CONFIG_BRIDGE_EBT_ARPREPLY
index f1bd17c9d..f1bd17c9d 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_ARPREPLY
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_ARPREPLY
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_BROUTE b/configs/base-generic/CONFIG_BRIDGE_EBT_BROUTE
index d8c6c59ad..d8c6c59ad 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_BROUTE
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_BROUTE
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_DNAT b/configs/base-generic/CONFIG_BRIDGE_EBT_DNAT
index 309f316d1..309f316d1 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_DNAT
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_DNAT
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_IP b/configs/base-generic/CONFIG_BRIDGE_EBT_IP
index 5a60e537e..5a60e537e 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_IP
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_IP
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_IP6 b/configs/base-generic/CONFIG_BRIDGE_EBT_IP6
index df1578dc2..df1578dc2 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_IP6
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_IP6
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_LIMIT b/configs/base-generic/CONFIG_BRIDGE_EBT_LIMIT
index 5c74954a0..5c74954a0 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_LIMIT
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_LIMIT
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_LOG b/configs/base-generic/CONFIG_BRIDGE_EBT_LOG
index 33821290e..33821290e 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_LOG
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_LOG
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_MARK b/configs/base-generic/CONFIG_BRIDGE_EBT_MARK
index 63b5e4b0a..63b5e4b0a 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_MARK
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_MARK
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_MARK_T b/configs/base-generic/CONFIG_BRIDGE_EBT_MARK_T
index b89d06ee3..b89d06ee3 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_MARK_T
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_MARK_T
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_NFLOG b/configs/base-generic/CONFIG_BRIDGE_EBT_NFLOG
index 0419263a0..0419263a0 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_NFLOG
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_NFLOG
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_PKTTYPE b/configs/base-generic/CONFIG_BRIDGE_EBT_PKTTYPE
index c29e3e030..c29e3e030 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_PKTTYPE
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_PKTTYPE
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_REDIRECT b/configs/base-generic/CONFIG_BRIDGE_EBT_REDIRECT
index c40b497d1..c40b497d1 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_REDIRECT
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_REDIRECT
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_SNAT b/configs/base-generic/CONFIG_BRIDGE_EBT_SNAT
index 1bd963216..1bd963216 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_SNAT
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_SNAT
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_STP b/configs/base-generic/CONFIG_BRIDGE_EBT_STP
index f1c9e454d..f1c9e454d 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_STP
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_STP
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_T_FILTER b/configs/base-generic/CONFIG_BRIDGE_EBT_T_FILTER
index e2c7f4772..e2c7f4772 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_T_FILTER
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_T_FILTER
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_T_NAT b/configs/base-generic/CONFIG_BRIDGE_EBT_T_NAT
index a64d08d8d..a64d08d8d 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_T_NAT
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_T_NAT
diff --git a/baseconfig/CONFIG_BRIDGE_EBT_VLAN b/configs/base-generic/CONFIG_BRIDGE_EBT_VLAN
index bde07d6ec..bde07d6ec 100644
--- a/baseconfig/CONFIG_BRIDGE_EBT_VLAN
+++ b/configs/base-generic/CONFIG_BRIDGE_EBT_VLAN
diff --git a/baseconfig/CONFIG_BRIDGE_IGMP_SNOOPING b/configs/base-generic/CONFIG_BRIDGE_IGMP_SNOOPING
index a7abc6bb4..a7abc6bb4 100644
--- a/baseconfig/CONFIG_BRIDGE_IGMP_SNOOPING
+++ b/configs/base-generic/CONFIG_BRIDGE_IGMP_SNOOPING
diff --git a/baseconfig/CONFIG_BRIDGE_NETFILTER b/configs/base-generic/CONFIG_BRIDGE_NETFILTER
index d052fbcce..d052fbcce 100644
--- a/baseconfig/CONFIG_BRIDGE_NETFILTER
+++ b/configs/base-generic/CONFIG_BRIDGE_NETFILTER
diff --git a/baseconfig/CONFIG_BRIDGE_NF_EBTABLES b/configs/base-generic/CONFIG_BRIDGE_NF_EBTABLES
index f68518f59..f68518f59 100644
--- a/baseconfig/CONFIG_BRIDGE_NF_EBTABLES
+++ b/configs/base-generic/CONFIG_BRIDGE_NF_EBTABLES
diff --git a/baseconfig/CONFIG_BRIDGE_VLAN_FILTERING b/configs/base-generic/CONFIG_BRIDGE_VLAN_FILTERING
index 0792e0d51..0792e0d51 100644
--- a/baseconfig/CONFIG_BRIDGE_VLAN_FILTERING
+++ b/configs/base-generic/CONFIG_BRIDGE_VLAN_FILTERING
diff --git a/baseconfig/CONFIG_BROADCOM_PHY b/configs/base-generic/CONFIG_BROADCOM_PHY
index a4c3dcde0..a4c3dcde0 100644
--- a/baseconfig/CONFIG_BROADCOM_PHY
+++ b/configs/base-generic/CONFIG_BROADCOM_PHY
diff --git a/baseconfig/CONFIG_BSD_DISKLABEL b/configs/base-generic/CONFIG_BSD_DISKLABEL
index 980fa2b75..980fa2b75 100644
--- a/baseconfig/CONFIG_BSD_DISKLABEL
+++ b/configs/base-generic/CONFIG_BSD_DISKLABEL
diff --git a/baseconfig/CONFIG_BSD_PROCESS_ACCT b/configs/base-generic/CONFIG_BSD_PROCESS_ACCT
index b9a496601..b9a496601 100644
--- a/baseconfig/CONFIG_BSD_PROCESS_ACCT
+++ b/configs/base-generic/CONFIG_BSD_PROCESS_ACCT
diff --git a/baseconfig/CONFIG_BSD_PROCESS_ACCT_V3 b/configs/base-generic/CONFIG_BSD_PROCESS_ACCT_V3
index bf334a252..bf334a252 100644
--- a/baseconfig/CONFIG_BSD_PROCESS_ACCT_V3
+++ b/configs/base-generic/CONFIG_BSD_PROCESS_ACCT_V3
diff --git a/baseconfig/CONFIG_BT b/configs/base-generic/CONFIG_BT
index ec1159297..ec1159297 100644
--- a/baseconfig/CONFIG_BT
+++ b/configs/base-generic/CONFIG_BT
diff --git a/baseconfig/CONFIG_BTRFS_ASSERT b/configs/base-generic/CONFIG_BTRFS_ASSERT
index a4f8b0817..a4f8b0817 100644
--- a/baseconfig/CONFIG_BTRFS_ASSERT
+++ b/configs/base-generic/CONFIG_BTRFS_ASSERT
diff --git a/baseconfig/CONFIG_BTRFS_DEBUG b/configs/base-generic/CONFIG_BTRFS_DEBUG
index 3e69c0f7d..3e69c0f7d 100644
--- a/baseconfig/CONFIG_BTRFS_DEBUG
+++ b/configs/base-generic/CONFIG_BTRFS_DEBUG
diff --git a/baseconfig/CONFIG_BTRFS_FS b/configs/base-generic/CONFIG_BTRFS_FS
index 3b4d4254c..3b4d4254c 100644
--- a/baseconfig/CONFIG_BTRFS_FS
+++ b/configs/base-generic/CONFIG_BTRFS_FS
diff --git a/baseconfig/CONFIG_BTRFS_FS_CHECK_INTEGRITY b/configs/base-generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY
index 018480b8b..018480b8b 100644
--- a/baseconfig/CONFIG_BTRFS_FS_CHECK_INTEGRITY
+++ b/configs/base-generic/CONFIG_BTRFS_FS_CHECK_INTEGRITY
diff --git a/baseconfig/CONFIG_BTRFS_FS_POSIX_ACL b/configs/base-generic/CONFIG_BTRFS_FS_POSIX_ACL
index a4a1406d6..a4a1406d6 100644
--- a/baseconfig/CONFIG_BTRFS_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_BTRFS_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_BTRFS_FS_RUN_SANITY_TESTS b/configs/base-generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS
index b3ae62702..b3ae62702 100644
--- a/baseconfig/CONFIG_BTRFS_FS_RUN_SANITY_TESTS
+++ b/configs/base-generic/CONFIG_BTRFS_FS_RUN_SANITY_TESTS
diff --git a/baseconfig/CONFIG_BTT b/configs/base-generic/CONFIG_BTT
index 7635bf674..7635bf674 100644
--- a/baseconfig/CONFIG_BTT
+++ b/configs/base-generic/CONFIG_BTT
diff --git a/baseconfig/CONFIG_BT_6LOWPAN b/configs/base-generic/CONFIG_BT_6LOWPAN
index 07e13ff73..07e13ff73 100644
--- a/baseconfig/CONFIG_BT_6LOWPAN
+++ b/configs/base-generic/CONFIG_BT_6LOWPAN
diff --git a/baseconfig/CONFIG_BT_ATH3K b/configs/base-generic/CONFIG_BT_ATH3K
index 7dc74ada0..7dc74ada0 100644
--- a/baseconfig/CONFIG_BT_ATH3K
+++ b/configs/base-generic/CONFIG_BT_ATH3K
diff --git a/baseconfig/CONFIG_BT_BNEP b/configs/base-generic/CONFIG_BT_BNEP
index 36b8e51be..36b8e51be 100644
--- a/baseconfig/CONFIG_BT_BNEP
+++ b/configs/base-generic/CONFIG_BT_BNEP
diff --git a/baseconfig/CONFIG_BT_BNEP_MC_FILTER b/configs/base-generic/CONFIG_BT_BNEP_MC_FILTER
index fc4bf7c14..fc4bf7c14 100644
--- a/baseconfig/CONFIG_BT_BNEP_MC_FILTER
+++ b/configs/base-generic/CONFIG_BT_BNEP_MC_FILTER
diff --git a/baseconfig/CONFIG_BT_BNEP_PROTO_FILTER b/configs/base-generic/CONFIG_BT_BNEP_PROTO_FILTER
index 0cfac59b0..0cfac59b0 100644
--- a/baseconfig/CONFIG_BT_BNEP_PROTO_FILTER
+++ b/configs/base-generic/CONFIG_BT_BNEP_PROTO_FILTER
diff --git a/baseconfig/CONFIG_BT_BREDR b/configs/base-generic/CONFIG_BT_BREDR
index c7b6f3ddb..c7b6f3ddb 100644
--- a/baseconfig/CONFIG_BT_BREDR
+++ b/configs/base-generic/CONFIG_BT_BREDR
diff --git a/baseconfig/CONFIG_BT_CMTP b/configs/base-generic/CONFIG_BT_CMTP
index 6fe276815..6fe276815 100644
--- a/baseconfig/CONFIG_BT_CMTP
+++ b/configs/base-generic/CONFIG_BT_CMTP
diff --git a/baseconfig/CONFIG_BT_DEBUGFS b/configs/base-generic/CONFIG_BT_DEBUGFS
index 141edfed7..141edfed7 100644
--- a/baseconfig/CONFIG_BT_DEBUGFS
+++ b/configs/base-generic/CONFIG_BT_DEBUGFS
diff --git a/baseconfig/CONFIG_BT_HCIBCM203X b/configs/base-generic/CONFIG_BT_HCIBCM203X
index 08b55441f..08b55441f 100644
--- a/baseconfig/CONFIG_BT_HCIBCM203X
+++ b/configs/base-generic/CONFIG_BT_HCIBCM203X
diff --git a/baseconfig/CONFIG_BT_HCIBFUSB b/configs/base-generic/CONFIG_BT_HCIBFUSB
index 14a07fa0e..14a07fa0e 100644
--- a/baseconfig/CONFIG_BT_HCIBFUSB
+++ b/configs/base-generic/CONFIG_BT_HCIBFUSB
diff --git a/baseconfig/CONFIG_BT_HCIBLUECARD b/configs/base-generic/CONFIG_BT_HCIBLUECARD
index bb8b39590..bb8b39590 100644
--- a/baseconfig/CONFIG_BT_HCIBLUECARD
+++ b/configs/base-generic/CONFIG_BT_HCIBLUECARD
diff --git a/baseconfig/CONFIG_BT_HCIBPA10X b/configs/base-generic/CONFIG_BT_HCIBPA10X
index fec109e44..fec109e44 100644
--- a/baseconfig/CONFIG_BT_HCIBPA10X
+++ b/configs/base-generic/CONFIG_BT_HCIBPA10X
diff --git a/baseconfig/CONFIG_BT_HCIBT3C b/configs/base-generic/CONFIG_BT_HCIBT3C
index c2a3b43cd..c2a3b43cd 100644
--- a/baseconfig/CONFIG_BT_HCIBT3C
+++ b/configs/base-generic/CONFIG_BT_HCIBT3C
diff --git a/baseconfig/CONFIG_BT_HCIBTSDIO b/configs/base-generic/CONFIG_BT_HCIBTSDIO
index 82ea86e49..82ea86e49 100644
--- a/baseconfig/CONFIG_BT_HCIBTSDIO
+++ b/configs/base-generic/CONFIG_BT_HCIBTSDIO
diff --git a/baseconfig/CONFIG_BT_HCIBTUART b/configs/base-generic/CONFIG_BT_HCIBTUART
index 779036710..779036710 100644
--- a/baseconfig/CONFIG_BT_HCIBTUART
+++ b/configs/base-generic/CONFIG_BT_HCIBTUART
diff --git a/baseconfig/CONFIG_BT_HCIBTUSB b/configs/base-generic/CONFIG_BT_HCIBTUSB
index 87df53377..87df53377 100644
--- a/baseconfig/CONFIG_BT_HCIBTUSB
+++ b/configs/base-generic/CONFIG_BT_HCIBTUSB
diff --git a/baseconfig/CONFIG_BT_HCIBTUSB_BCM b/configs/base-generic/CONFIG_BT_HCIBTUSB_BCM
index 61e55a376..61e55a376 100644
--- a/baseconfig/CONFIG_BT_HCIBTUSB_BCM
+++ b/configs/base-generic/CONFIG_BT_HCIBTUSB_BCM
diff --git a/baseconfig/CONFIG_BT_HCIBTUSB_RTL b/configs/base-generic/CONFIG_BT_HCIBTUSB_RTL
index 0ea9fa578..0ea9fa578 100644
--- a/baseconfig/CONFIG_BT_HCIBTUSB_RTL
+++ b/configs/base-generic/CONFIG_BT_HCIBTUSB_RTL
diff --git a/baseconfig/CONFIG_BT_HCIDTL1 b/configs/base-generic/CONFIG_BT_HCIDTL1
index 40d99eca1..40d99eca1 100644
--- a/baseconfig/CONFIG_BT_HCIDTL1
+++ b/configs/base-generic/CONFIG_BT_HCIDTL1
diff --git a/baseconfig/CONFIG_BT_HCIUART b/configs/base-generic/CONFIG_BT_HCIUART
index a22748bb0..a22748bb0 100644
--- a/baseconfig/CONFIG_BT_HCIUART
+++ b/configs/base-generic/CONFIG_BT_HCIUART
diff --git a/baseconfig/CONFIG_BT_HCIUART_3WIRE b/configs/base-generic/CONFIG_BT_HCIUART_3WIRE
index 6d890f118..6d890f118 100644
--- a/baseconfig/CONFIG_BT_HCIUART_3WIRE
+++ b/configs/base-generic/CONFIG_BT_HCIUART_3WIRE
diff --git a/baseconfig/CONFIG_BT_HCIUART_AG6XX b/configs/base-generic/CONFIG_BT_HCIUART_AG6XX
index 4b58e8562..4b58e8562 100644
--- a/baseconfig/CONFIG_BT_HCIUART_AG6XX
+++ b/configs/base-generic/CONFIG_BT_HCIUART_AG6XX
diff --git a/baseconfig/CONFIG_BT_HCIUART_ATH3K b/configs/base-generic/CONFIG_BT_HCIUART_ATH3K
index 818b4f4f4..818b4f4f4 100644
--- a/baseconfig/CONFIG_BT_HCIUART_ATH3K
+++ b/configs/base-generic/CONFIG_BT_HCIUART_ATH3K
diff --git a/baseconfig/CONFIG_BT_HCIUART_BCM b/configs/base-generic/CONFIG_BT_HCIUART_BCM
index e288f63f4..e288f63f4 100644
--- a/baseconfig/CONFIG_BT_HCIUART_BCM
+++ b/configs/base-generic/CONFIG_BT_HCIUART_BCM
diff --git a/baseconfig/CONFIG_BT_HCIUART_BCSP b/configs/base-generic/CONFIG_BT_HCIUART_BCSP
index c90c17852..c90c17852 100644
--- a/baseconfig/CONFIG_BT_HCIUART_BCSP
+++ b/configs/base-generic/CONFIG_BT_HCIUART_BCSP
diff --git a/baseconfig/CONFIG_BT_HCIUART_H4 b/configs/base-generic/CONFIG_BT_HCIUART_H4
index 813998955..813998955 100644
--- a/baseconfig/CONFIG_BT_HCIUART_H4
+++ b/configs/base-generic/CONFIG_BT_HCIUART_H4
diff --git a/baseconfig/CONFIG_BT_HCIUART_INTEL b/configs/base-generic/CONFIG_BT_HCIUART_INTEL
index 70c73ce27..70c73ce27 100644
--- a/baseconfig/CONFIG_BT_HCIUART_INTEL
+++ b/configs/base-generic/CONFIG_BT_HCIUART_INTEL
diff --git a/baseconfig/CONFIG_BT_HCIUART_LL b/configs/base-generic/CONFIG_BT_HCIUART_LL
index d8d986405..d8d986405 100644
--- a/baseconfig/CONFIG_BT_HCIUART_LL
+++ b/configs/base-generic/CONFIG_BT_HCIUART_LL
diff --git a/baseconfig/CONFIG_BT_HCIUART_MRVL b/configs/base-generic/CONFIG_BT_HCIUART_MRVL
index f729502bf..f729502bf 100644
--- a/baseconfig/CONFIG_BT_HCIUART_MRVL
+++ b/configs/base-generic/CONFIG_BT_HCIUART_MRVL
diff --git a/baseconfig/CONFIG_BT_HCIUART_NOKIA b/configs/base-generic/CONFIG_BT_HCIUART_NOKIA
index 6f09b31e6..6f09b31e6 100644
--- a/baseconfig/CONFIG_BT_HCIUART_NOKIA
+++ b/configs/base-generic/CONFIG_BT_HCIUART_NOKIA
diff --git a/baseconfig/CONFIG_BT_HCIUART_QCA b/configs/base-generic/CONFIG_BT_HCIUART_QCA
index 59d4f58cb..59d4f58cb 100644
--- a/baseconfig/CONFIG_BT_HCIUART_QCA
+++ b/configs/base-generic/CONFIG_BT_HCIUART_QCA
diff --git a/baseconfig/CONFIG_BT_HCIUART_SERDEV b/configs/base-generic/CONFIG_BT_HCIUART_SERDEV
index 0b0ef5abd..0b0ef5abd 100644
--- a/baseconfig/CONFIG_BT_HCIUART_SERDEV
+++ b/configs/base-generic/CONFIG_BT_HCIUART_SERDEV
diff --git a/baseconfig/CONFIG_BT_HCIVHCI b/configs/base-generic/CONFIG_BT_HCIVHCI
index caba0cdc8..caba0cdc8 100644
--- a/baseconfig/CONFIG_BT_HCIVHCI
+++ b/configs/base-generic/CONFIG_BT_HCIVHCI
diff --git a/baseconfig/CONFIG_BT_HIDP b/configs/base-generic/CONFIG_BT_HIDP
index b555d07c3..b555d07c3 100644
--- a/baseconfig/CONFIG_BT_HIDP
+++ b/configs/base-generic/CONFIG_BT_HIDP
diff --git a/baseconfig/CONFIG_BT_HS b/configs/base-generic/CONFIG_BT_HS
index e0151a2e9..e0151a2e9 100644
--- a/baseconfig/CONFIG_BT_HS
+++ b/configs/base-generic/CONFIG_BT_HS
diff --git a/baseconfig/CONFIG_BT_LE b/configs/base-generic/CONFIG_BT_LE
index e4bd7f9ac..e4bd7f9ac 100644
--- a/baseconfig/CONFIG_BT_LE
+++ b/configs/base-generic/CONFIG_BT_LE
diff --git a/baseconfig/CONFIG_BT_LEDS b/configs/base-generic/CONFIG_BT_LEDS
index 7045c04b3..7045c04b3 100644
--- a/baseconfig/CONFIG_BT_LEDS
+++ b/configs/base-generic/CONFIG_BT_LEDS
diff --git a/baseconfig/CONFIG_BT_MRVL b/configs/base-generic/CONFIG_BT_MRVL
index a22a81e3c..a22a81e3c 100644
--- a/baseconfig/CONFIG_BT_MRVL
+++ b/configs/base-generic/CONFIG_BT_MRVL
diff --git a/baseconfig/CONFIG_BT_MRVL_SDIO b/configs/base-generic/CONFIG_BT_MRVL_SDIO
index 9b96ff020..9b96ff020 100644
--- a/baseconfig/CONFIG_BT_MRVL_SDIO
+++ b/configs/base-generic/CONFIG_BT_MRVL_SDIO
diff --git a/baseconfig/CONFIG_BT_QCA b/configs/base-generic/CONFIG_BT_QCA
index 8eff84da6..8eff84da6 100644
--- a/baseconfig/CONFIG_BT_QCA
+++ b/configs/base-generic/CONFIG_BT_QCA
diff --git a/baseconfig/CONFIG_BT_RFCOMM b/configs/base-generic/CONFIG_BT_RFCOMM
index a203466fc..a203466fc 100644
--- a/baseconfig/CONFIG_BT_RFCOMM
+++ b/configs/base-generic/CONFIG_BT_RFCOMM
diff --git a/baseconfig/CONFIG_BT_RFCOMM_TTY b/configs/base-generic/CONFIG_BT_RFCOMM_TTY
index b3bbd0634..b3bbd0634 100644
--- a/baseconfig/CONFIG_BT_RFCOMM_TTY
+++ b/configs/base-generic/CONFIG_BT_RFCOMM_TTY
diff --git a/baseconfig/CONFIG_BT_SELFTEST b/configs/base-generic/CONFIG_BT_SELFTEST
index e7b42ec08..e7b42ec08 100644
--- a/baseconfig/CONFIG_BT_SELFTEST
+++ b/configs/base-generic/CONFIG_BT_SELFTEST
diff --git a/baseconfig/CONFIG_BT_WILINK b/configs/base-generic/CONFIG_BT_WILINK
index de6a56bcb..de6a56bcb 100644
--- a/baseconfig/CONFIG_BT_WILINK
+++ b/configs/base-generic/CONFIG_BT_WILINK
diff --git a/baseconfig/CONFIG_BUG_ON_DATA_CORRUPTION b/configs/base-generic/CONFIG_BUG_ON_DATA_CORRUPTION
index 5ebeba7b2..5ebeba7b2 100644
--- a/baseconfig/CONFIG_BUG_ON_DATA_CORRUPTION
+++ b/configs/base-generic/CONFIG_BUG_ON_DATA_CORRUPTION
diff --git a/baseconfig/CONFIG_BUILD_DOCSRC b/configs/base-generic/CONFIG_BUILD_DOCSRC
index 29a544688..29a544688 100644
--- a/baseconfig/CONFIG_BUILD_DOCSRC
+++ b/configs/base-generic/CONFIG_BUILD_DOCSRC
diff --git a/baseconfig/CONFIG_C2PORT b/configs/base-generic/CONFIG_C2PORT
index 98a99aa3e..98a99aa3e 100644
--- a/baseconfig/CONFIG_C2PORT
+++ b/configs/base-generic/CONFIG_C2PORT
diff --git a/baseconfig/CONFIG_CACHEFILES b/configs/base-generic/CONFIG_CACHEFILES
index 9c31a788b..9c31a788b 100644
--- a/baseconfig/CONFIG_CACHEFILES
+++ b/configs/base-generic/CONFIG_CACHEFILES
diff --git a/baseconfig/CONFIG_CACHEFILES_DEBUG b/configs/base-generic/CONFIG_CACHEFILES_DEBUG
index 81ad37f97..81ad37f97 100644
--- a/baseconfig/CONFIG_CACHEFILES_DEBUG
+++ b/configs/base-generic/CONFIG_CACHEFILES_DEBUG
diff --git a/baseconfig/CONFIG_CACHEFILES_HISTOGRAM b/configs/base-generic/CONFIG_CACHEFILES_HISTOGRAM
index dd9551260..dd9551260 100644
--- a/baseconfig/CONFIG_CACHEFILES_HISTOGRAM
+++ b/configs/base-generic/CONFIG_CACHEFILES_HISTOGRAM
diff --git a/baseconfig/CONFIG_CADENCE_WATCHDOG b/configs/base-generic/CONFIG_CADENCE_WATCHDOG
index 3892db328..3892db328 100644
--- a/baseconfig/CONFIG_CADENCE_WATCHDOG
+++ b/configs/base-generic/CONFIG_CADENCE_WATCHDOG
diff --git a/baseconfig/CONFIG_CAIF b/configs/base-generic/CONFIG_CAIF
index e48469763..e48469763 100644
--- a/baseconfig/CONFIG_CAIF
+++ b/configs/base-generic/CONFIG_CAIF
diff --git a/baseconfig/CONFIG_CAN b/configs/base-generic/CONFIG_CAN
index a982d3fc5..a982d3fc5 100644
--- a/baseconfig/CONFIG_CAN
+++ b/configs/base-generic/CONFIG_CAN
diff --git a/baseconfig/CONFIG_CAN_8DEV_USB b/configs/base-generic/CONFIG_CAN_8DEV_USB
index fafff4422..fafff4422 100644
--- a/baseconfig/CONFIG_CAN_8DEV_USB
+++ b/configs/base-generic/CONFIG_CAN_8DEV_USB
diff --git a/baseconfig/CONFIG_CAN_BCM b/configs/base-generic/CONFIG_CAN_BCM
index 63b05e151..63b05e151 100644
--- a/baseconfig/CONFIG_CAN_BCM
+++ b/configs/base-generic/CONFIG_CAN_BCM
diff --git a/baseconfig/CONFIG_CAN_CALC_BITTIMING b/configs/base-generic/CONFIG_CAN_CALC_BITTIMING
index f0124ae91..f0124ae91 100644
--- a/baseconfig/CONFIG_CAN_CALC_BITTIMING
+++ b/configs/base-generic/CONFIG_CAN_CALC_BITTIMING
diff --git a/baseconfig/CONFIG_CAN_CC770 b/configs/base-generic/CONFIG_CAN_CC770
index 34f324850..34f324850 100644
--- a/baseconfig/CONFIG_CAN_CC770
+++ b/configs/base-generic/CONFIG_CAN_CC770
diff --git a/baseconfig/CONFIG_CAN_CC770_ISA b/configs/base-generic/CONFIG_CAN_CC770_ISA
index 28f129cf4..28f129cf4 100644
--- a/baseconfig/CONFIG_CAN_CC770_ISA
+++ b/configs/base-generic/CONFIG_CAN_CC770_ISA
diff --git a/baseconfig/CONFIG_CAN_CC770_PLATFORM b/configs/base-generic/CONFIG_CAN_CC770_PLATFORM
index c3f3656ea..c3f3656ea 100644
--- a/baseconfig/CONFIG_CAN_CC770_PLATFORM
+++ b/configs/base-generic/CONFIG_CAN_CC770_PLATFORM
diff --git a/baseconfig/CONFIG_CAN_C_CAN b/configs/base-generic/CONFIG_CAN_C_CAN
index bf0bc15df..bf0bc15df 100644
--- a/baseconfig/CONFIG_CAN_C_CAN
+++ b/configs/base-generic/CONFIG_CAN_C_CAN
diff --git a/baseconfig/CONFIG_CAN_C_CAN_PCI b/configs/base-generic/CONFIG_CAN_C_CAN_PCI
index fda584edc..fda584edc 100644
--- a/baseconfig/CONFIG_CAN_C_CAN_PCI
+++ b/configs/base-generic/CONFIG_CAN_C_CAN_PCI
diff --git a/baseconfig/CONFIG_CAN_C_CAN_PLATFORM b/configs/base-generic/CONFIG_CAN_C_CAN_PLATFORM
index 386c5e4ca..386c5e4ca 100644
--- a/baseconfig/CONFIG_CAN_C_CAN_PLATFORM
+++ b/configs/base-generic/CONFIG_CAN_C_CAN_PLATFORM
diff --git a/baseconfig/CONFIG_CAN_DEBUG_DEVICES b/configs/base-generic/CONFIG_CAN_DEBUG_DEVICES
index e443c862c..e443c862c 100644
--- a/baseconfig/CONFIG_CAN_DEBUG_DEVICES
+++ b/configs/base-generic/CONFIG_CAN_DEBUG_DEVICES
diff --git a/baseconfig/CONFIG_CAN_DEV b/configs/base-generic/CONFIG_CAN_DEV
index 302e4ddb0..302e4ddb0 100644
--- a/baseconfig/CONFIG_CAN_DEV
+++ b/configs/base-generic/CONFIG_CAN_DEV
diff --git a/baseconfig/CONFIG_CAN_EMS_PCI b/configs/base-generic/CONFIG_CAN_EMS_PCI
index b4b86c797..b4b86c797 100644
--- a/baseconfig/CONFIG_CAN_EMS_PCI
+++ b/configs/base-generic/CONFIG_CAN_EMS_PCI
diff --git a/baseconfig/CONFIG_CAN_EMS_PCMCIA b/configs/base-generic/CONFIG_CAN_EMS_PCMCIA
index 89d30f2c9..89d30f2c9 100644
--- a/baseconfig/CONFIG_CAN_EMS_PCMCIA
+++ b/configs/base-generic/CONFIG_CAN_EMS_PCMCIA
diff --git a/baseconfig/CONFIG_CAN_EMS_USB b/configs/base-generic/CONFIG_CAN_EMS_USB
index 116cfee99..116cfee99 100644
--- a/baseconfig/CONFIG_CAN_EMS_USB
+++ b/configs/base-generic/CONFIG_CAN_EMS_USB
diff --git a/baseconfig/CONFIG_CAN_ESD_USB2 b/configs/base-generic/CONFIG_CAN_ESD_USB2
index 94d08344a..94d08344a 100644
--- a/baseconfig/CONFIG_CAN_ESD_USB2
+++ b/configs/base-generic/CONFIG_CAN_ESD_USB2
diff --git a/baseconfig/CONFIG_CAN_GRCAN b/configs/base-generic/CONFIG_CAN_GRCAN
index dc80238a6..dc80238a6 100644
--- a/baseconfig/CONFIG_CAN_GRCAN
+++ b/configs/base-generic/CONFIG_CAN_GRCAN
diff --git a/baseconfig/CONFIG_CAN_GS_USB b/configs/base-generic/CONFIG_CAN_GS_USB
index 5518dcc32..5518dcc32 100644
--- a/baseconfig/CONFIG_CAN_GS_USB
+++ b/configs/base-generic/CONFIG_CAN_GS_USB
diff --git a/baseconfig/CONFIG_CAN_GW b/configs/base-generic/CONFIG_CAN_GW
index 3a563f338..3a563f338 100644
--- a/baseconfig/CONFIG_CAN_GW
+++ b/configs/base-generic/CONFIG_CAN_GW
diff --git a/baseconfig/CONFIG_CAN_HI311X b/configs/base-generic/CONFIG_CAN_HI311X
index a775c67f7..a775c67f7 100644
--- a/baseconfig/CONFIG_CAN_HI311X
+++ b/configs/base-generic/CONFIG_CAN_HI311X
diff --git a/baseconfig/CONFIG_CAN_IFI_CANFD b/configs/base-generic/CONFIG_CAN_IFI_CANFD
index 3af27f67a..3af27f67a 100644
--- a/baseconfig/CONFIG_CAN_IFI_CANFD
+++ b/configs/base-generic/CONFIG_CAN_IFI_CANFD
diff --git a/baseconfig/CONFIG_CAN_KVASER_PCI b/configs/base-generic/CONFIG_CAN_KVASER_PCI
index 525287586..525287586 100644
--- a/baseconfig/CONFIG_CAN_KVASER_PCI
+++ b/configs/base-generic/CONFIG_CAN_KVASER_PCI
diff --git a/baseconfig/CONFIG_CAN_KVASER_USB b/configs/base-generic/CONFIG_CAN_KVASER_USB
index 114569878..114569878 100644
--- a/baseconfig/CONFIG_CAN_KVASER_USB
+++ b/configs/base-generic/CONFIG_CAN_KVASER_USB
diff --git a/baseconfig/CONFIG_CAN_LEDS b/configs/base-generic/CONFIG_CAN_LEDS
index eadced3a1..eadced3a1 100644
--- a/baseconfig/CONFIG_CAN_LEDS
+++ b/configs/base-generic/CONFIG_CAN_LEDS
diff --git a/baseconfig/CONFIG_CAN_MCBA_USB b/configs/base-generic/CONFIG_CAN_MCBA_USB
index 9a21b3bcb..9a21b3bcb 100644
--- a/baseconfig/CONFIG_CAN_MCBA_USB
+++ b/configs/base-generic/CONFIG_CAN_MCBA_USB
diff --git a/baseconfig/CONFIG_CAN_MCP251X b/configs/base-generic/CONFIG_CAN_MCP251X
index 7f655e8d7..7f655e8d7 100644
--- a/baseconfig/CONFIG_CAN_MCP251X
+++ b/configs/base-generic/CONFIG_CAN_MCP251X
diff --git a/baseconfig/CONFIG_CAN_M_CAN b/configs/base-generic/CONFIG_CAN_M_CAN
index d3f08b1c8..d3f08b1c8 100644
--- a/baseconfig/CONFIG_CAN_M_CAN
+++ b/configs/base-generic/CONFIG_CAN_M_CAN
diff --git a/baseconfig/CONFIG_CAN_PEAK_PCI b/configs/base-generic/CONFIG_CAN_PEAK_PCI
index a3d5575e4..a3d5575e4 100644
--- a/baseconfig/CONFIG_CAN_PEAK_PCI
+++ b/configs/base-generic/CONFIG_CAN_PEAK_PCI
diff --git a/baseconfig/CONFIG_CAN_PEAK_PCIEC b/configs/base-generic/CONFIG_CAN_PEAK_PCIEC
index 271c0df69..271c0df69 100644
--- a/baseconfig/CONFIG_CAN_PEAK_PCIEC
+++ b/configs/base-generic/CONFIG_CAN_PEAK_PCIEC
diff --git a/baseconfig/CONFIG_CAN_PEAK_PCIEFD b/configs/base-generic/CONFIG_CAN_PEAK_PCIEFD
index 3a388b984..3a388b984 100644
--- a/baseconfig/CONFIG_CAN_PEAK_PCIEFD
+++ b/configs/base-generic/CONFIG_CAN_PEAK_PCIEFD
diff --git a/baseconfig/CONFIG_CAN_PEAK_PCMCIA b/configs/base-generic/CONFIG_CAN_PEAK_PCMCIA
index 62e029004..62e029004 100644
--- a/baseconfig/CONFIG_CAN_PEAK_PCMCIA
+++ b/configs/base-generic/CONFIG_CAN_PEAK_PCMCIA
diff --git a/baseconfig/CONFIG_CAN_PEAK_USB b/configs/base-generic/CONFIG_CAN_PEAK_USB
index f8dcd8649..f8dcd8649 100644
--- a/baseconfig/CONFIG_CAN_PEAK_USB
+++ b/configs/base-generic/CONFIG_CAN_PEAK_USB
diff --git a/baseconfig/CONFIG_CAN_PLX_PCI b/configs/base-generic/CONFIG_CAN_PLX_PCI
index bc31ac376..bc31ac376 100644
--- a/baseconfig/CONFIG_CAN_PLX_PCI
+++ b/configs/base-generic/CONFIG_CAN_PLX_PCI
diff --git a/baseconfig/CONFIG_CAN_RAW b/configs/base-generic/CONFIG_CAN_RAW
index a30b178e4..a30b178e4 100644
--- a/baseconfig/CONFIG_CAN_RAW
+++ b/configs/base-generic/CONFIG_CAN_RAW
diff --git a/baseconfig/CONFIG_CAN_SJA1000 b/configs/base-generic/CONFIG_CAN_SJA1000
index cff9dfa84..cff9dfa84 100644
--- a/baseconfig/CONFIG_CAN_SJA1000
+++ b/configs/base-generic/CONFIG_CAN_SJA1000
diff --git a/baseconfig/CONFIG_CAN_SJA1000_ISA b/configs/base-generic/CONFIG_CAN_SJA1000_ISA
index 93aa7c727..93aa7c727 100644
--- a/baseconfig/CONFIG_CAN_SJA1000_ISA
+++ b/configs/base-generic/CONFIG_CAN_SJA1000_ISA
diff --git a/baseconfig/CONFIG_CAN_SJA1000_PLATFORM b/configs/base-generic/CONFIG_CAN_SJA1000_PLATFORM
index bdb2831f4..bdb2831f4 100644
--- a/baseconfig/CONFIG_CAN_SJA1000_PLATFORM
+++ b/configs/base-generic/CONFIG_CAN_SJA1000_PLATFORM
diff --git a/baseconfig/CONFIG_CAN_SLCAN b/configs/base-generic/CONFIG_CAN_SLCAN
index e1e06ff87..e1e06ff87 100644
--- a/baseconfig/CONFIG_CAN_SLCAN
+++ b/configs/base-generic/CONFIG_CAN_SLCAN
diff --git a/baseconfig/CONFIG_CAN_SOFTING b/configs/base-generic/CONFIG_CAN_SOFTING
index 99c859db2..99c859db2 100644
--- a/baseconfig/CONFIG_CAN_SOFTING
+++ b/configs/base-generic/CONFIG_CAN_SOFTING
diff --git a/baseconfig/CONFIG_CAN_SOFTING_CS b/configs/base-generic/CONFIG_CAN_SOFTING_CS
index 6bbcefe01..6bbcefe01 100644
--- a/baseconfig/CONFIG_CAN_SOFTING_CS
+++ b/configs/base-generic/CONFIG_CAN_SOFTING_CS
diff --git a/baseconfig/CONFIG_CAN_TSCAN1 b/configs/base-generic/CONFIG_CAN_TSCAN1
index 619f1597b..619f1597b 100644
--- a/baseconfig/CONFIG_CAN_TSCAN1
+++ b/configs/base-generic/CONFIG_CAN_TSCAN1
diff --git a/baseconfig/CONFIG_CAN_VCAN b/configs/base-generic/CONFIG_CAN_VCAN
index a458cc886..a458cc886 100644
--- a/baseconfig/CONFIG_CAN_VCAN
+++ b/configs/base-generic/CONFIG_CAN_VCAN
diff --git a/baseconfig/CONFIG_CAN_VXCAN b/configs/base-generic/CONFIG_CAN_VXCAN
index a6e002cff..a6e002cff 100644
--- a/baseconfig/CONFIG_CAN_VXCAN
+++ b/configs/base-generic/CONFIG_CAN_VXCAN
diff --git a/baseconfig/CONFIG_CAN_XILINXCAN b/configs/base-generic/CONFIG_CAN_XILINXCAN
index 5c5bc1993..5c5bc1993 100644
--- a/baseconfig/CONFIG_CAN_XILINXCAN
+++ b/configs/base-generic/CONFIG_CAN_XILINXCAN
diff --git a/baseconfig/CONFIG_CAPI_AVM b/configs/base-generic/CONFIG_CAPI_AVM
index e22084428..e22084428 100644
--- a/baseconfig/CONFIG_CAPI_AVM
+++ b/configs/base-generic/CONFIG_CAPI_AVM
diff --git a/baseconfig/CONFIG_CAPI_EICON b/configs/base-generic/CONFIG_CAPI_EICON
index 546c0b3f7..546c0b3f7 100644
--- a/baseconfig/CONFIG_CAPI_EICON
+++ b/configs/base-generic/CONFIG_CAPI_EICON
diff --git a/baseconfig/CONFIG_CAPI_TRACE b/configs/base-generic/CONFIG_CAPI_TRACE
index c56a82f04..c56a82f04 100644
--- a/baseconfig/CONFIG_CAPI_TRACE
+++ b/configs/base-generic/CONFIG_CAPI_TRACE
diff --git a/baseconfig/CONFIG_CARDBUS b/configs/base-generic/CONFIG_CARDBUS
index 398c23673..398c23673 100644
--- a/baseconfig/CONFIG_CARDBUS
+++ b/configs/base-generic/CONFIG_CARDBUS
diff --git a/baseconfig/CONFIG_CARDMAN_4000 b/configs/base-generic/CONFIG_CARDMAN_4000
index ee3304848..ee3304848 100644
--- a/baseconfig/CONFIG_CARDMAN_4000
+++ b/configs/base-generic/CONFIG_CARDMAN_4000
diff --git a/baseconfig/CONFIG_CARDMAN_4040 b/configs/base-generic/CONFIG_CARDMAN_4040
index 8c7f4a5fb..8c7f4a5fb 100644
--- a/baseconfig/CONFIG_CARDMAN_4040
+++ b/configs/base-generic/CONFIG_CARDMAN_4040
diff --git a/baseconfig/CONFIG_CARL9170 b/configs/base-generic/CONFIG_CARL9170
index 08f3fe171..08f3fe171 100644
--- a/baseconfig/CONFIG_CARL9170
+++ b/configs/base-generic/CONFIG_CARL9170
diff --git a/baseconfig/CONFIG_CARL9170_DEBUGFS b/configs/base-generic/CONFIG_CARL9170_DEBUGFS
index 5d878db24..5d878db24 100644
--- a/baseconfig/CONFIG_CARL9170_DEBUGFS
+++ b/configs/base-generic/CONFIG_CARL9170_DEBUGFS
diff --git a/baseconfig/CONFIG_CARL9170_HWRNG b/configs/base-generic/CONFIG_CARL9170_HWRNG
index 37917c332..37917c332 100644
--- a/baseconfig/CONFIG_CARL9170_HWRNG
+++ b/configs/base-generic/CONFIG_CARL9170_HWRNG
diff --git a/baseconfig/CONFIG_CARL9170_LEDS b/configs/base-generic/CONFIG_CARL9170_LEDS
index f108e9506..f108e9506 100644
--- a/baseconfig/CONFIG_CARL9170_LEDS
+++ b/configs/base-generic/CONFIG_CARL9170_LEDS
diff --git a/baseconfig/CONFIG_CASSINI b/configs/base-generic/CONFIG_CASSINI
index 74c70d3f8..74c70d3f8 100644
--- a/baseconfig/CONFIG_CASSINI
+++ b/configs/base-generic/CONFIG_CASSINI
diff --git a/baseconfig/CONFIG_CB710_CORE b/configs/base-generic/CONFIG_CB710_CORE
index 88c0c9f9c..88c0c9f9c 100644
--- a/baseconfig/CONFIG_CB710_CORE
+++ b/configs/base-generic/CONFIG_CB710_CORE
diff --git a/baseconfig/CONFIG_CB710_DEBUG b/configs/base-generic/CONFIG_CB710_DEBUG
index fc70a51d0..fc70a51d0 100644
--- a/baseconfig/CONFIG_CB710_DEBUG
+++ b/configs/base-generic/CONFIG_CB710_DEBUG
diff --git a/baseconfig/CONFIG_CC10001_ADC b/configs/base-generic/CONFIG_CC10001_ADC
index 291160498..291160498 100644
--- a/baseconfig/CONFIG_CC10001_ADC
+++ b/configs/base-generic/CONFIG_CC10001_ADC
diff --git a/baseconfig/CONFIG_CCS811 b/configs/base-generic/CONFIG_CCS811
index 931f14e2a..931f14e2a 100644
--- a/baseconfig/CONFIG_CCS811
+++ b/configs/base-generic/CONFIG_CCS811
diff --git a/baseconfig/CONFIG_CC_OPTIMIZE_FOR_SIZE b/configs/base-generic/CONFIG_CC_OPTIMIZE_FOR_SIZE
index 781657e57..781657e57 100644
--- a/baseconfig/CONFIG_CC_OPTIMIZE_FOR_SIZE
+++ b/configs/base-generic/CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git a/baseconfig/CONFIG_CDROM_PKTCDVD b/configs/base-generic/CONFIG_CDROM_PKTCDVD
index 509827e58..509827e58 100644
--- a/baseconfig/CONFIG_CDROM_PKTCDVD
+++ b/configs/base-generic/CONFIG_CDROM_PKTCDVD
diff --git a/baseconfig/CONFIG_CDROM_PKTCDVD_BUFFERS b/configs/base-generic/CONFIG_CDROM_PKTCDVD_BUFFERS
index 8dafda735..8dafda735 100644
--- a/baseconfig/CONFIG_CDROM_PKTCDVD_BUFFERS
+++ b/configs/base-generic/CONFIG_CDROM_PKTCDVD_BUFFERS
diff --git a/baseconfig/CONFIG_CDROM_PKTCDVD_WCACHE b/configs/base-generic/CONFIG_CDROM_PKTCDVD_WCACHE
index ce8fec39d..ce8fec39d 100644
--- a/baseconfig/CONFIG_CDROM_PKTCDVD_WCACHE
+++ b/configs/base-generic/CONFIG_CDROM_PKTCDVD_WCACHE
diff --git a/baseconfig/CONFIG_CEC_PIN b/configs/base-generic/CONFIG_CEC_PIN
index 395ddfbf2..395ddfbf2 100644
--- a/baseconfig/CONFIG_CEC_PIN
+++ b/configs/base-generic/CONFIG_CEC_PIN
diff --git a/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS b/configs/base-generic/CONFIG_CEC_PLATFORM_DRIVERS
index 07bd8e955..07bd8e955 100644
--- a/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS
+++ b/configs/base-generic/CONFIG_CEC_PLATFORM_DRIVERS
diff --git a/baseconfig/CONFIG_CEPH_FS b/configs/base-generic/CONFIG_CEPH_FS
index 25623fa97..25623fa97 100644
--- a/baseconfig/CONFIG_CEPH_FS
+++ b/configs/base-generic/CONFIG_CEPH_FS
diff --git a/baseconfig/CONFIG_CEPH_FSCACHE b/configs/base-generic/CONFIG_CEPH_FSCACHE
index 940b60819..940b60819 100644
--- a/baseconfig/CONFIG_CEPH_FSCACHE
+++ b/configs/base-generic/CONFIG_CEPH_FSCACHE
diff --git a/baseconfig/CONFIG_CEPH_FS_POSIX_ACL b/configs/base-generic/CONFIG_CEPH_FS_POSIX_ACL
index 680364368..680364368 100644
--- a/baseconfig/CONFIG_CEPH_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_CEPH_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_CEPH_LIB b/configs/base-generic/CONFIG_CEPH_LIB
index 5f539b4b6..5f539b4b6 100644
--- a/baseconfig/CONFIG_CEPH_LIB
+++ b/configs/base-generic/CONFIG_CEPH_LIB
diff --git a/baseconfig/CONFIG_CEPH_LIB_PRETTYDEBUG b/configs/base-generic/CONFIG_CEPH_LIB_PRETTYDEBUG
index 57958e0f5..57958e0f5 100644
--- a/baseconfig/CONFIG_CEPH_LIB_PRETTYDEBUG
+++ b/configs/base-generic/CONFIG_CEPH_LIB_PRETTYDEBUG
diff --git a/baseconfig/CONFIG_CEPH_LIB_USE_DNS_RESOLVER b/configs/base-generic/CONFIG_CEPH_LIB_USE_DNS_RESOLVER
index 564af978f..564af978f 100644
--- a/baseconfig/CONFIG_CEPH_LIB_USE_DNS_RESOLVER
+++ b/configs/base-generic/CONFIG_CEPH_LIB_USE_DNS_RESOLVER
diff --git a/baseconfig/CONFIG_CFAG12864B b/configs/base-generic/CONFIG_CFAG12864B
index b8e9decb4..b8e9decb4 100644
--- a/baseconfig/CONFIG_CFAG12864B
+++ b/configs/base-generic/CONFIG_CFAG12864B
diff --git a/baseconfig/CONFIG_CFAG12864B_RATE b/configs/base-generic/CONFIG_CFAG12864B_RATE
index e99776ccf..e99776ccf 100644
--- a/baseconfig/CONFIG_CFAG12864B_RATE
+++ b/configs/base-generic/CONFIG_CFAG12864B_RATE
diff --git a/baseconfig/CONFIG_CFG80211 b/configs/base-generic/CONFIG_CFG80211
index c61c420dd..c61c420dd 100644
--- a/baseconfig/CONFIG_CFG80211
+++ b/configs/base-generic/CONFIG_CFG80211
diff --git a/baseconfig/CONFIG_CFG80211_CRDA_SUPPORT b/configs/base-generic/CONFIG_CFG80211_CRDA_SUPPORT
index 51f113cca..51f113cca 100644
--- a/baseconfig/CONFIG_CFG80211_CRDA_SUPPORT
+++ b/configs/base-generic/CONFIG_CFG80211_CRDA_SUPPORT
diff --git a/baseconfig/CONFIG_CFG80211_DEBUGFS b/configs/base-generic/CONFIG_CFG80211_DEBUGFS
index c72a5e7bc..c72a5e7bc 100644
--- a/baseconfig/CONFIG_CFG80211_DEBUGFS
+++ b/configs/base-generic/CONFIG_CFG80211_DEBUGFS
diff --git a/baseconfig/CONFIG_CFG80211_DEFAULT_PS b/configs/base-generic/CONFIG_CFG80211_DEFAULT_PS
index 89fd54c1b..89fd54c1b 100644
--- a/baseconfig/CONFIG_CFG80211_DEFAULT_PS
+++ b/configs/base-generic/CONFIG_CFG80211_DEFAULT_PS
diff --git a/baseconfig/CONFIG_CFG80211_DEVELOPER_WARNINGS b/configs/base-generic/CONFIG_CFG80211_DEVELOPER_WARNINGS
index 92c3d1dcd..92c3d1dcd 100644
--- a/baseconfig/CONFIG_CFG80211_DEVELOPER_WARNINGS
+++ b/configs/base-generic/CONFIG_CFG80211_DEVELOPER_WARNINGS
diff --git a/baseconfig/CONFIG_CFG80211_WEXT b/configs/base-generic/CONFIG_CFG80211_WEXT
index 892d0cb7b..892d0cb7b 100644
--- a/baseconfig/CONFIG_CFG80211_WEXT
+++ b/configs/base-generic/CONFIG_CFG80211_WEXT
diff --git a/baseconfig/CONFIG_CFQ_GROUP_IOSCHED b/configs/base-generic/CONFIG_CFQ_GROUP_IOSCHED
index 2331f8e4a..2331f8e4a 100644
--- a/baseconfig/CONFIG_CFQ_GROUP_IOSCHED
+++ b/configs/base-generic/CONFIG_CFQ_GROUP_IOSCHED
diff --git a/baseconfig/CONFIG_CFS_BANDWIDTH b/configs/base-generic/CONFIG_CFS_BANDWIDTH
index 0be30bfd5..0be30bfd5 100644
--- a/baseconfig/CONFIG_CFS_BANDWIDTH
+++ b/configs/base-generic/CONFIG_CFS_BANDWIDTH
diff --git a/baseconfig/CONFIG_CGROUPS b/configs/base-generic/CONFIG_CGROUPS
index de40ae788..de40ae788 100644
--- a/baseconfig/CONFIG_CGROUPS
+++ b/configs/base-generic/CONFIG_CGROUPS
diff --git a/baseconfig/CONFIG_CGROUP_BPF b/configs/base-generic/CONFIG_CGROUP_BPF
index 659477cdb..659477cdb 100644
--- a/baseconfig/CONFIG_CGROUP_BPF
+++ b/configs/base-generic/CONFIG_CGROUP_BPF
diff --git a/baseconfig/CONFIG_CGROUP_CPUACCT b/configs/base-generic/CONFIG_CGROUP_CPUACCT
index 43f05000a..43f05000a 100644
--- a/baseconfig/CONFIG_CGROUP_CPUACCT
+++ b/configs/base-generic/CONFIG_CGROUP_CPUACCT
diff --git a/baseconfig/CONFIG_CGROUP_DEBUG b/configs/base-generic/CONFIG_CGROUP_DEBUG
index 3d57cb63b..3d57cb63b 100644
--- a/baseconfig/CONFIG_CGROUP_DEBUG
+++ b/configs/base-generic/CONFIG_CGROUP_DEBUG
diff --git a/baseconfig/CONFIG_CGROUP_DEVICE b/configs/base-generic/CONFIG_CGROUP_DEVICE
index 5a233a69b..5a233a69b 100644
--- a/baseconfig/CONFIG_CGROUP_DEVICE
+++ b/configs/base-generic/CONFIG_CGROUP_DEVICE
diff --git a/baseconfig/CONFIG_CGROUP_FREEZER b/configs/base-generic/CONFIG_CGROUP_FREEZER
index d7e06d250..d7e06d250 100644
--- a/baseconfig/CONFIG_CGROUP_FREEZER
+++ b/configs/base-generic/CONFIG_CGROUP_FREEZER
diff --git a/baseconfig/CONFIG_CGROUP_HUGETLB b/configs/base-generic/CONFIG_CGROUP_HUGETLB
index 6310d8f5c..6310d8f5c 100644
--- a/baseconfig/CONFIG_CGROUP_HUGETLB
+++ b/configs/base-generic/CONFIG_CGROUP_HUGETLB
diff --git a/baseconfig/CONFIG_CGROUP_NET_CLASSID b/configs/base-generic/CONFIG_CGROUP_NET_CLASSID
index 73e4e4b3f..73e4e4b3f 100644
--- a/baseconfig/CONFIG_CGROUP_NET_CLASSID
+++ b/configs/base-generic/CONFIG_CGROUP_NET_CLASSID
diff --git a/baseconfig/CONFIG_CGROUP_NET_PRIO b/configs/base-generic/CONFIG_CGROUP_NET_PRIO
index b4e8e68d5..b4e8e68d5 100644
--- a/baseconfig/CONFIG_CGROUP_NET_PRIO
+++ b/configs/base-generic/CONFIG_CGROUP_NET_PRIO
diff --git a/baseconfig/CONFIG_CGROUP_PERF b/configs/base-generic/CONFIG_CGROUP_PERF
index faa1d1cb7..faa1d1cb7 100644
--- a/baseconfig/CONFIG_CGROUP_PERF
+++ b/configs/base-generic/CONFIG_CGROUP_PERF
diff --git a/baseconfig/CONFIG_CGROUP_PIDS b/configs/base-generic/CONFIG_CGROUP_PIDS
index 399a03754..399a03754 100644
--- a/baseconfig/CONFIG_CGROUP_PIDS
+++ b/configs/base-generic/CONFIG_CGROUP_PIDS
diff --git a/baseconfig/CONFIG_CGROUP_RDMA b/configs/base-generic/CONFIG_CGROUP_RDMA
index 94ae4f4bc..94ae4f4bc 100644
--- a/baseconfig/CONFIG_CGROUP_RDMA
+++ b/configs/base-generic/CONFIG_CGROUP_RDMA
diff --git a/baseconfig/CONFIG_CGROUP_SCHED b/configs/base-generic/CONFIG_CGROUP_SCHED
index aa4be387e..aa4be387e 100644
--- a/baseconfig/CONFIG_CGROUP_SCHED
+++ b/configs/base-generic/CONFIG_CGROUP_SCHED
diff --git a/baseconfig/CONFIG_CHARGER_BQ2415X b/configs/base-generic/CONFIG_CHARGER_BQ2415X
index bd6cf1aef..bd6cf1aef 100644
--- a/baseconfig/CONFIG_CHARGER_BQ2415X
+++ b/configs/base-generic/CONFIG_CHARGER_BQ2415X
diff --git a/baseconfig/CONFIG_CHARGER_BQ24190 b/configs/base-generic/CONFIG_CHARGER_BQ24190
index 676283f06..676283f06 100644
--- a/baseconfig/CONFIG_CHARGER_BQ24190
+++ b/configs/base-generic/CONFIG_CHARGER_BQ24190
diff --git a/baseconfig/CONFIG_CHARGER_BQ24257 b/configs/base-generic/CONFIG_CHARGER_BQ24257
index b4a8aea45..b4a8aea45 100644
--- a/baseconfig/CONFIG_CHARGER_BQ24257
+++ b/configs/base-generic/CONFIG_CHARGER_BQ24257
diff --git a/baseconfig/CONFIG_CHARGER_BQ24735 b/configs/base-generic/CONFIG_CHARGER_BQ24735
index bc9915c84..bc9915c84 100644
--- a/baseconfig/CONFIG_CHARGER_BQ24735
+++ b/configs/base-generic/CONFIG_CHARGER_BQ24735
diff --git a/baseconfig/CONFIG_CHARGER_BQ25890 b/configs/base-generic/CONFIG_CHARGER_BQ25890
index a5d1bc4b3..a5d1bc4b3 100644
--- a/baseconfig/CONFIG_CHARGER_BQ25890
+++ b/configs/base-generic/CONFIG_CHARGER_BQ25890
diff --git a/baseconfig/CONFIG_CHARGER_DETECTOR_MAX14656 b/configs/base-generic/CONFIG_CHARGER_DETECTOR_MAX14656
index 434d9466f..434d9466f 100644
--- a/baseconfig/CONFIG_CHARGER_DETECTOR_MAX14656
+++ b/configs/base-generic/CONFIG_CHARGER_DETECTOR_MAX14656
diff --git a/baseconfig/CONFIG_CHARGER_GPIO b/configs/base-generic/CONFIG_CHARGER_GPIO
index 436dad60a..436dad60a 100644
--- a/baseconfig/CONFIG_CHARGER_GPIO
+++ b/configs/base-generic/CONFIG_CHARGER_GPIO
diff --git a/baseconfig/CONFIG_CHARGER_ISP1704 b/configs/base-generic/CONFIG_CHARGER_ISP1704
index 2ca2e458f..2ca2e458f 100644
--- a/baseconfig/CONFIG_CHARGER_ISP1704
+++ b/configs/base-generic/CONFIG_CHARGER_ISP1704
diff --git a/baseconfig/CONFIG_CHARGER_LP8727 b/configs/base-generic/CONFIG_CHARGER_LP8727
index cf915198f..cf915198f 100644
--- a/baseconfig/CONFIG_CHARGER_LP8727
+++ b/configs/base-generic/CONFIG_CHARGER_LP8727
diff --git a/baseconfig/CONFIG_CHARGER_LTC3651 b/configs/base-generic/CONFIG_CHARGER_LTC3651
index a4243da74..a4243da74 100644
--- a/baseconfig/CONFIG_CHARGER_LTC3651
+++ b/configs/base-generic/CONFIG_CHARGER_LTC3651
diff --git a/baseconfig/CONFIG_CHARGER_MAX8903 b/configs/base-generic/CONFIG_CHARGER_MAX8903
index 6e62d27d7..6e62d27d7 100644
--- a/baseconfig/CONFIG_CHARGER_MAX8903
+++ b/configs/base-generic/CONFIG_CHARGER_MAX8903
diff --git a/baseconfig/CONFIG_CHARGER_PCF50633 b/configs/base-generic/CONFIG_CHARGER_PCF50633
index c6e49dc2c..c6e49dc2c 100644
--- a/baseconfig/CONFIG_CHARGER_PCF50633
+++ b/configs/base-generic/CONFIG_CHARGER_PCF50633
diff --git a/baseconfig/CONFIG_CHARGER_RT9455 b/configs/base-generic/CONFIG_CHARGER_RT9455
index e9ffbe4d1..e9ffbe4d1 100644
--- a/baseconfig/CONFIG_CHARGER_RT9455
+++ b/configs/base-generic/CONFIG_CHARGER_RT9455
diff --git a/baseconfig/CONFIG_CHARGER_SBS b/configs/base-generic/CONFIG_CHARGER_SBS
index afb3f2f1d..afb3f2f1d 100644
--- a/baseconfig/CONFIG_CHARGER_SBS
+++ b/configs/base-generic/CONFIG_CHARGER_SBS
diff --git a/baseconfig/CONFIG_CHARGER_SMB347 b/configs/base-generic/CONFIG_CHARGER_SMB347
index b388a2f6e..b388a2f6e 100644
--- a/baseconfig/CONFIG_CHARGER_SMB347
+++ b/configs/base-generic/CONFIG_CHARGER_SMB347
diff --git a/baseconfig/CONFIG_CHECKPOINT_RESTORE b/configs/base-generic/CONFIG_CHECKPOINT_RESTORE
index 0fa27e37e..0fa27e37e 100644
--- a/baseconfig/CONFIG_CHECKPOINT_RESTORE
+++ b/configs/base-generic/CONFIG_CHECKPOINT_RESTORE
diff --git a/baseconfig/CONFIG_CHELSIO_T1 b/configs/base-generic/CONFIG_CHELSIO_T1
index fd83b5243..fd83b5243 100644
--- a/baseconfig/CONFIG_CHELSIO_T1
+++ b/configs/base-generic/CONFIG_CHELSIO_T1
diff --git a/baseconfig/CONFIG_CHELSIO_T1_1G b/configs/base-generic/CONFIG_CHELSIO_T1_1G
index 00b09be57..00b09be57 100644
--- a/baseconfig/CONFIG_CHELSIO_T1_1G
+++ b/configs/base-generic/CONFIG_CHELSIO_T1_1G
diff --git a/baseconfig/CONFIG_CHELSIO_T3 b/configs/base-generic/CONFIG_CHELSIO_T3
index 85e1cb37c..85e1cb37c 100644
--- a/baseconfig/CONFIG_CHELSIO_T3
+++ b/configs/base-generic/CONFIG_CHELSIO_T3
diff --git a/baseconfig/CONFIG_CHELSIO_T4 b/configs/base-generic/CONFIG_CHELSIO_T4
index a9f70238b..a9f70238b 100644
--- a/baseconfig/CONFIG_CHELSIO_T4
+++ b/configs/base-generic/CONFIG_CHELSIO_T4
diff --git a/baseconfig/CONFIG_CHELSIO_T4VF b/configs/base-generic/CONFIG_CHELSIO_T4VF
index f18059568..f18059568 100644
--- a/baseconfig/CONFIG_CHELSIO_T4VF
+++ b/configs/base-generic/CONFIG_CHELSIO_T4VF
diff --git a/baseconfig/CONFIG_CHELSIO_T4_DCB b/configs/base-generic/CONFIG_CHELSIO_T4_DCB
index 7ace47bae..7ace47bae 100644
--- a/baseconfig/CONFIG_CHELSIO_T4_DCB
+++ b/configs/base-generic/CONFIG_CHELSIO_T4_DCB
diff --git a/baseconfig/CONFIG_CHELSIO_T4_FCOE b/configs/base-generic/CONFIG_CHELSIO_T4_FCOE
index 438fb49e5..438fb49e5 100644
--- a/baseconfig/CONFIG_CHELSIO_T4_FCOE
+++ b/configs/base-generic/CONFIG_CHELSIO_T4_FCOE
diff --git a/baseconfig/CONFIG_CHROME_PLATFORMS b/configs/base-generic/CONFIG_CHROME_PLATFORMS
index c9336a3aa..c9336a3aa 100644
--- a/baseconfig/CONFIG_CHROME_PLATFORMS
+++ b/configs/base-generic/CONFIG_CHROME_PLATFORMS
diff --git a/baseconfig/CONFIG_CHR_DEV_OSST b/configs/base-generic/CONFIG_CHR_DEV_OSST
index 24cde6013..24cde6013 100644
--- a/baseconfig/CONFIG_CHR_DEV_OSST
+++ b/configs/base-generic/CONFIG_CHR_DEV_OSST
diff --git a/baseconfig/CONFIG_CHR_DEV_SCH b/configs/base-generic/CONFIG_CHR_DEV_SCH
index 06017f05f..06017f05f 100644
--- a/baseconfig/CONFIG_CHR_DEV_SCH
+++ b/configs/base-generic/CONFIG_CHR_DEV_SCH
diff --git a/baseconfig/CONFIG_CHR_DEV_SG b/configs/base-generic/CONFIG_CHR_DEV_SG
index 18c2fc641..18c2fc641 100644
--- a/baseconfig/CONFIG_CHR_DEV_SG
+++ b/configs/base-generic/CONFIG_CHR_DEV_SG
diff --git a/baseconfig/CONFIG_CHR_DEV_ST b/configs/base-generic/CONFIG_CHR_DEV_ST
index 430ba8718..430ba8718 100644
--- a/baseconfig/CONFIG_CHR_DEV_ST
+++ b/configs/base-generic/CONFIG_CHR_DEV_ST
diff --git a/baseconfig/CONFIG_CICADA_PHY b/configs/base-generic/CONFIG_CICADA_PHY
index 4e90d6243..4e90d6243 100644
--- a/baseconfig/CONFIG_CICADA_PHY
+++ b/configs/base-generic/CONFIG_CICADA_PHY
diff --git a/baseconfig/CONFIG_CIFS b/configs/base-generic/CONFIG_CIFS
index bc37a8fc6..bc37a8fc6 100644
--- a/baseconfig/CONFIG_CIFS
+++ b/configs/base-generic/CONFIG_CIFS
diff --git a/baseconfig/CONFIG_CIFS_ACL b/configs/base-generic/CONFIG_CIFS_ACL
index 244aecf58..244aecf58 100644
--- a/baseconfig/CONFIG_CIFS_ACL
+++ b/configs/base-generic/CONFIG_CIFS_ACL
diff --git a/baseconfig/CONFIG_CIFS_DEBUG b/configs/base-generic/CONFIG_CIFS_DEBUG
index 4fc95add9..4fc95add9 100644
--- a/baseconfig/CONFIG_CIFS_DEBUG
+++ b/configs/base-generic/CONFIG_CIFS_DEBUG
diff --git a/baseconfig/CONFIG_CIFS_DEBUG2 b/configs/base-generic/CONFIG_CIFS_DEBUG2
index 5f9304873..5f9304873 100644
--- a/baseconfig/CONFIG_CIFS_DEBUG2
+++ b/configs/base-generic/CONFIG_CIFS_DEBUG2
diff --git a/baseconfig/CONFIG_CIFS_DEBUG_DUMP_KEYS b/configs/base-generic/CONFIG_CIFS_DEBUG_DUMP_KEYS
index 03f554dba..03f554dba 100644
--- a/baseconfig/CONFIG_CIFS_DEBUG_DUMP_KEYS
+++ b/configs/base-generic/CONFIG_CIFS_DEBUG_DUMP_KEYS
diff --git a/baseconfig/CONFIG_CIFS_DFS_UPCALL b/configs/base-generic/CONFIG_CIFS_DFS_UPCALL
index 5f96d08c0..5f96d08c0 100644
--- a/baseconfig/CONFIG_CIFS_DFS_UPCALL
+++ b/configs/base-generic/CONFIG_CIFS_DFS_UPCALL
diff --git a/baseconfig/CONFIG_CIFS_FSCACHE b/configs/base-generic/CONFIG_CIFS_FSCACHE
index f11460bb9..f11460bb9 100644
--- a/baseconfig/CONFIG_CIFS_FSCACHE
+++ b/configs/base-generic/CONFIG_CIFS_FSCACHE
diff --git a/baseconfig/CONFIG_CIFS_NFSD_EXPORT b/configs/base-generic/CONFIG_CIFS_NFSD_EXPORT
index f96d9efa0..f96d9efa0 100644
--- a/baseconfig/CONFIG_CIFS_NFSD_EXPORT
+++ b/configs/base-generic/CONFIG_CIFS_NFSD_EXPORT
diff --git a/baseconfig/CONFIG_CIFS_POSIX b/configs/base-generic/CONFIG_CIFS_POSIX
index 1737fa4cd..1737fa4cd 100644
--- a/baseconfig/CONFIG_CIFS_POSIX
+++ b/configs/base-generic/CONFIG_CIFS_POSIX
diff --git a/baseconfig/CONFIG_CIFS_SMB2 b/configs/base-generic/CONFIG_CIFS_SMB2
index 2231cfe20..2231cfe20 100644
--- a/baseconfig/CONFIG_CIFS_SMB2
+++ b/configs/base-generic/CONFIG_CIFS_SMB2
diff --git a/baseconfig/CONFIG_CIFS_SMB311 b/configs/base-generic/CONFIG_CIFS_SMB311
index c8722d5d1..c8722d5d1 100644
--- a/baseconfig/CONFIG_CIFS_SMB311
+++ b/configs/base-generic/CONFIG_CIFS_SMB311
diff --git a/baseconfig/CONFIG_CIFS_STATS b/configs/base-generic/CONFIG_CIFS_STATS
index 3e72283d0..3e72283d0 100644
--- a/baseconfig/CONFIG_CIFS_STATS
+++ b/configs/base-generic/CONFIG_CIFS_STATS
diff --git a/baseconfig/CONFIG_CIFS_STATS2 b/configs/base-generic/CONFIG_CIFS_STATS2
index 16763446c..16763446c 100644
--- a/baseconfig/CONFIG_CIFS_STATS2
+++ b/configs/base-generic/CONFIG_CIFS_STATS2
diff --git a/baseconfig/CONFIG_CIFS_UPCALL b/configs/base-generic/CONFIG_CIFS_UPCALL
index d41540f23..d41540f23 100644
--- a/baseconfig/CONFIG_CIFS_UPCALL
+++ b/configs/base-generic/CONFIG_CIFS_UPCALL
diff --git a/baseconfig/CONFIG_CIFS_WEAK_PW_HASH b/configs/base-generic/CONFIG_CIFS_WEAK_PW_HASH
index 8a402088e..8a402088e 100644
--- a/baseconfig/CONFIG_CIFS_WEAK_PW_HASH
+++ b/configs/base-generic/CONFIG_CIFS_WEAK_PW_HASH
diff --git a/baseconfig/CONFIG_CIFS_XATTR b/configs/base-generic/CONFIG_CIFS_XATTR
index 7e35cc630..7e35cc630 100644
--- a/baseconfig/CONFIG_CIFS_XATTR
+++ b/configs/base-generic/CONFIG_CIFS_XATTR
diff --git a/baseconfig/CONFIG_CLEANCACHE b/configs/base-generic/CONFIG_CLEANCACHE
index 74b03640c..74b03640c 100644
--- a/baseconfig/CONFIG_CLEANCACHE
+++ b/configs/base-generic/CONFIG_CLEANCACHE
diff --git a/baseconfig/CONFIG_CLK_HSDK b/configs/base-generic/CONFIG_CLK_HSDK
index e1788bbc5..e1788bbc5 100644
--- a/baseconfig/CONFIG_CLK_HSDK
+++ b/configs/base-generic/CONFIG_CLK_HSDK
diff --git a/baseconfig/CONFIG_CLK_QORIQ b/configs/base-generic/CONFIG_CLK_QORIQ
index b05638e5c..b05638e5c 100644
--- a/baseconfig/CONFIG_CLK_QORIQ
+++ b/configs/base-generic/CONFIG_CLK_QORIQ
diff --git a/baseconfig/CONFIG_CLOCK_THERMAL b/configs/base-generic/CONFIG_CLOCK_THERMAL
index 72ca05f2c..72ca05f2c 100644
--- a/baseconfig/CONFIG_CLOCK_THERMAL
+++ b/configs/base-generic/CONFIG_CLOCK_THERMAL
diff --git a/baseconfig/CONFIG_CLS_U32_MARK b/configs/base-generic/CONFIG_CLS_U32_MARK
index 5fb0654ba..5fb0654ba 100644
--- a/baseconfig/CONFIG_CLS_U32_MARK
+++ b/configs/base-generic/CONFIG_CLS_U32_MARK
diff --git a/baseconfig/CONFIG_CLS_U32_PERF b/configs/base-generic/CONFIG_CLS_U32_PERF
index 44646ed87..44646ed87 100644
--- a/baseconfig/CONFIG_CLS_U32_PERF
+++ b/configs/base-generic/CONFIG_CLS_U32_PERF
diff --git a/baseconfig/CONFIG_CM32181 b/configs/base-generic/CONFIG_CM32181
index 4f0d47d5b..4f0d47d5b 100644
--- a/baseconfig/CONFIG_CM32181
+++ b/configs/base-generic/CONFIG_CM32181
diff --git a/baseconfig/CONFIG_CM3232 b/configs/base-generic/CONFIG_CM3232
index 12580fd2f..12580fd2f 100644
--- a/baseconfig/CONFIG_CM3232
+++ b/configs/base-generic/CONFIG_CM3232
diff --git a/baseconfig/CONFIG_CM3323 b/configs/base-generic/CONFIG_CM3323
index 133771257..133771257 100644
--- a/baseconfig/CONFIG_CM3323
+++ b/configs/base-generic/CONFIG_CM3323
diff --git a/baseconfig/CONFIG_CM3605 b/configs/base-generic/CONFIG_CM3605
index 138742e11..138742e11 100644
--- a/baseconfig/CONFIG_CM3605
+++ b/configs/base-generic/CONFIG_CM3605
diff --git a/baseconfig/CONFIG_CM36651 b/configs/base-generic/CONFIG_CM36651
index 5ad3dd89d..5ad3dd89d 100644
--- a/baseconfig/CONFIG_CM36651
+++ b/configs/base-generic/CONFIG_CM36651
diff --git a/baseconfig/CONFIG_CMA b/configs/base-generic/CONFIG_CMA
index 9af668819..9af668819 100644
--- a/baseconfig/CONFIG_CMA
+++ b/configs/base-generic/CONFIG_CMA
diff --git a/baseconfig/CONFIG_CMDLINE_PARTITION b/configs/base-generic/CONFIG_CMDLINE_PARTITION
index 2de3d9b7e..2de3d9b7e 100644
--- a/baseconfig/CONFIG_CMDLINE_PARTITION
+++ b/configs/base-generic/CONFIG_CMDLINE_PARTITION
diff --git a/baseconfig/CONFIG_CNIC b/configs/base-generic/CONFIG_CNIC
index b32c2cc2a..b32c2cc2a 100644
--- a/baseconfig/CONFIG_CNIC
+++ b/configs/base-generic/CONFIG_CNIC
diff --git a/baseconfig/CONFIG_CODA_FS b/configs/base-generic/CONFIG_CODA_FS
index 8459bcb13..8459bcb13 100644
--- a/baseconfig/CONFIG_CODA_FS
+++ b/configs/base-generic/CONFIG_CODA_FS
diff --git a/baseconfig/CONFIG_COMEDI b/configs/base-generic/CONFIG_COMEDI
index 2d36fa996..2d36fa996 100644
--- a/baseconfig/CONFIG_COMEDI
+++ b/configs/base-generic/CONFIG_COMEDI
diff --git a/baseconfig/CONFIG_COMMON_CLK_CDCE706 b/configs/base-generic/CONFIG_COMMON_CLK_CDCE706
index 518e96d45..518e96d45 100644
--- a/baseconfig/CONFIG_COMMON_CLK_CDCE706
+++ b/configs/base-generic/CONFIG_COMMON_CLK_CDCE706
diff --git a/baseconfig/CONFIG_COMMON_CLK_CDCE925 b/configs/base-generic/CONFIG_COMMON_CLK_CDCE925
index ea85e5876..ea85e5876 100644
--- a/baseconfig/CONFIG_COMMON_CLK_CDCE925
+++ b/configs/base-generic/CONFIG_COMMON_CLK_CDCE925
diff --git a/baseconfig/CONFIG_COMMON_CLK_CS2000_CP b/configs/base-generic/CONFIG_COMMON_CLK_CS2000_CP
index 25982987f..25982987f 100644
--- a/baseconfig/CONFIG_COMMON_CLK_CS2000_CP
+++ b/configs/base-generic/CONFIG_COMMON_CLK_CS2000_CP
diff --git a/baseconfig/CONFIG_COMMON_CLK_PWM b/configs/base-generic/CONFIG_COMMON_CLK_PWM
index 8e6730839..8e6730839 100644
--- a/baseconfig/CONFIG_COMMON_CLK_PWM
+++ b/configs/base-generic/CONFIG_COMMON_CLK_PWM
diff --git a/baseconfig/CONFIG_COMMON_CLK_SI514 b/configs/base-generic/CONFIG_COMMON_CLK_SI514
index 04b8fe1dc..04b8fe1dc 100644
--- a/baseconfig/CONFIG_COMMON_CLK_SI514
+++ b/configs/base-generic/CONFIG_COMMON_CLK_SI514
diff --git a/baseconfig/CONFIG_COMMON_CLK_SI5351 b/configs/base-generic/CONFIG_COMMON_CLK_SI5351
index 3951baf04..3951baf04 100644
--- a/baseconfig/CONFIG_COMMON_CLK_SI5351
+++ b/configs/base-generic/CONFIG_COMMON_CLK_SI5351
diff --git a/baseconfig/CONFIG_COMMON_CLK_SI570 b/configs/base-generic/CONFIG_COMMON_CLK_SI570
index aa746413a..aa746413a 100644
--- a/baseconfig/CONFIG_COMMON_CLK_SI570
+++ b/configs/base-generic/CONFIG_COMMON_CLK_SI570
diff --git a/baseconfig/CONFIG_COMMON_CLK_VC5 b/configs/base-generic/CONFIG_COMMON_CLK_VC5
index 9aaf6ae19..9aaf6ae19 100644
--- a/baseconfig/CONFIG_COMMON_CLK_VC5
+++ b/configs/base-generic/CONFIG_COMMON_CLK_VC5
diff --git a/baseconfig/CONFIG_COMMON_CLK_XLNX_CLKWZRD b/configs/base-generic/CONFIG_COMMON_CLK_XLNX_CLKWZRD
index de088b678..de088b678 100644
--- a/baseconfig/CONFIG_COMMON_CLK_XLNX_CLKWZRD
+++ b/configs/base-generic/CONFIG_COMMON_CLK_XLNX_CLKWZRD
diff --git a/baseconfig/CONFIG_COMMON_RESET_HI3660 b/configs/base-generic/CONFIG_COMMON_RESET_HI3660
index 0d13136e0..0d13136e0 100644
--- a/baseconfig/CONFIG_COMMON_RESET_HI3660
+++ b/configs/base-generic/CONFIG_COMMON_RESET_HI3660
diff --git a/baseconfig/CONFIG_COMPACTION b/configs/base-generic/CONFIG_COMPACTION
index 23ab91c48..23ab91c48 100644
--- a/baseconfig/CONFIG_COMPACTION
+++ b/configs/base-generic/CONFIG_COMPACTION
diff --git a/baseconfig/CONFIG_COMPAT_BRK b/configs/base-generic/CONFIG_COMPAT_BRK
index e05246612..e05246612 100644
--- a/baseconfig/CONFIG_COMPAT_BRK
+++ b/configs/base-generic/CONFIG_COMPAT_BRK
diff --git a/baseconfig/CONFIG_COMPILE_TEST b/configs/base-generic/CONFIG_COMPILE_TEST
index bcee8efc3..bcee8efc3 100644
--- a/baseconfig/CONFIG_COMPILE_TEST
+++ b/configs/base-generic/CONFIG_COMPILE_TEST
diff --git a/baseconfig/CONFIG_CONFIGFS_FS b/configs/base-generic/CONFIG_CONFIGFS_FS
index 1ef892062..1ef892062 100644
--- a/baseconfig/CONFIG_CONFIGFS_FS
+++ b/configs/base-generic/CONFIG_CONFIGFS_FS
diff --git a/baseconfig/CONFIG_CONNECTOR b/configs/base-generic/CONFIG_CONNECTOR
index ea191496d..ea191496d 100644
--- a/baseconfig/CONFIG_CONNECTOR
+++ b/configs/base-generic/CONFIG_CONNECTOR
diff --git a/baseconfig/CONFIG_CONSOLE_LOGLEVEL_DEFAULT b/configs/base-generic/CONFIG_CONSOLE_LOGLEVEL_DEFAULT
index 7f3f03e39..7f3f03e39 100644
--- a/baseconfig/CONFIG_CONSOLE_LOGLEVEL_DEFAULT
+++ b/configs/base-generic/CONFIG_CONSOLE_LOGLEVEL_DEFAULT
diff --git a/baseconfig/CONFIG_CONTEXT_SWITCH_TRACER b/configs/base-generic/CONFIG_CONTEXT_SWITCH_TRACER
index 72ba91c11..72ba91c11 100644
--- a/baseconfig/CONFIG_CONTEXT_SWITCH_TRACER
+++ b/configs/base-generic/CONFIG_CONTEXT_SWITCH_TRACER
diff --git a/baseconfig/CONFIG_CORDIC b/configs/base-generic/CONFIG_CORDIC
index 1e5e51d4f..1e5e51d4f 100644
--- a/baseconfig/CONFIG_CORDIC
+++ b/configs/base-generic/CONFIG_CORDIC
diff --git a/baseconfig/CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS b/configs/base-generic/CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS
index db11fb1a7..db11fb1a7 100644
--- a/baseconfig/CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS
+++ b/configs/base-generic/CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS
diff --git a/baseconfig/CONFIG_CORTINA_PHY b/configs/base-generic/CONFIG_CORTINA_PHY
index 87341d40e..87341d40e 100644
--- a/baseconfig/CONFIG_CORTINA_PHY
+++ b/configs/base-generic/CONFIG_CORTINA_PHY
diff --git a/baseconfig/CONFIG_CPU5_WDT b/configs/base-generic/CONFIG_CPU5_WDT
index 146167517..146167517 100644
--- a/baseconfig/CONFIG_CPU5_WDT
+++ b/configs/base-generic/CONFIG_CPU5_WDT
diff --git a/baseconfig/CONFIG_CPUFREQ_DT b/configs/base-generic/CONFIG_CPUFREQ_DT
index 5a49a0530..5a49a0530 100644
--- a/baseconfig/CONFIG_CPUFREQ_DT
+++ b/configs/base-generic/CONFIG_CPUFREQ_DT
diff --git a/baseconfig/CONFIG_CPUMASK_OFFSTACK b/configs/base-generic/CONFIG_CPUMASK_OFFSTACK
index aa9b7f323..aa9b7f323 100644
--- a/baseconfig/CONFIG_CPUMASK_OFFSTACK
+++ b/configs/base-generic/CONFIG_CPUMASK_OFFSTACK
diff --git a/baseconfig/CONFIG_CPUSETS b/configs/base-generic/CONFIG_CPUSETS
index 9920b4659..9920b4659 100644
--- a/baseconfig/CONFIG_CPUSETS
+++ b/configs/base-generic/CONFIG_CPUSETS
diff --git a/baseconfig/CONFIG_CPU_FREQ b/configs/base-generic/CONFIG_CPU_FREQ
index 04872f671..04872f671 100644
--- a/baseconfig/CONFIG_CPU_FREQ
+++ b/configs/base-generic/CONFIG_CPU_FREQ
diff --git a/baseconfig/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/configs/base-generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
index 2a186347d..2a186347d 100644
--- a/baseconfig/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
+++ b/configs/base-generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_CONSERVATIVE b/configs/base-generic/CONFIG_CPU_FREQ_GOV_CONSERVATIVE
index ff981a945..ff981a945 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_CONSERVATIVE
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_CONSERVATIVE
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_ONDEMAND b/configs/base-generic/CONFIG_CPU_FREQ_GOV_ONDEMAND
index fb152cb92..fb152cb92 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_ONDEMAND
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_ONDEMAND
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_PERFORMANCE b/configs/base-generic/CONFIG_CPU_FREQ_GOV_PERFORMANCE
index 2bf548fc4..2bf548fc4 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_PERFORMANCE
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_PERFORMANCE
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_POWERSAVE b/configs/base-generic/CONFIG_CPU_FREQ_GOV_POWERSAVE
index a22c37962..a22c37962 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_POWERSAVE
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_POWERSAVE
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_SCHEDUTIL b/configs/base-generic/CONFIG_CPU_FREQ_GOV_SCHEDUTIL
index 0aec99643..0aec99643 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_SCHEDUTIL
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_SCHEDUTIL
diff --git a/baseconfig/CONFIG_CPU_FREQ_GOV_USERSPACE b/configs/base-generic/CONFIG_CPU_FREQ_GOV_USERSPACE
index 8c1bc6848..8c1bc6848 100644
--- a/baseconfig/CONFIG_CPU_FREQ_GOV_USERSPACE
+++ b/configs/base-generic/CONFIG_CPU_FREQ_GOV_USERSPACE
diff --git a/baseconfig/CONFIG_CPU_FREQ_STAT b/configs/base-generic/CONFIG_CPU_FREQ_STAT
index ea0bc7f53..ea0bc7f53 100644
--- a/baseconfig/CONFIG_CPU_FREQ_STAT
+++ b/configs/base-generic/CONFIG_CPU_FREQ_STAT
diff --git a/baseconfig/CONFIG_CPU_FREQ_STAT_DETAILS b/configs/base-generic/CONFIG_CPU_FREQ_STAT_DETAILS
index 00ef17e92..00ef17e92 100644
--- a/baseconfig/CONFIG_CPU_FREQ_STAT_DETAILS
+++ b/configs/base-generic/CONFIG_CPU_FREQ_STAT_DETAILS
diff --git a/baseconfig/CONFIG_CPU_HOTPLUG_STATE_CONTROL b/configs/base-generic/CONFIG_CPU_HOTPLUG_STATE_CONTROL
index 4b0b6ab02..4b0b6ab02 100644
--- a/baseconfig/CONFIG_CPU_HOTPLUG_STATE_CONTROL
+++ b/configs/base-generic/CONFIG_CPU_HOTPLUG_STATE_CONTROL
diff --git a/baseconfig/CONFIG_CPU_IDLE b/configs/base-generic/CONFIG_CPU_IDLE
index 98dd7d370..98dd7d370 100644
--- a/baseconfig/CONFIG_CPU_IDLE
+++ b/configs/base-generic/CONFIG_CPU_IDLE
diff --git a/baseconfig/CONFIG_CPU_IDLE_GOV_LADDER b/configs/base-generic/CONFIG_CPU_IDLE_GOV_LADDER
index 776a3b20b..776a3b20b 100644
--- a/baseconfig/CONFIG_CPU_IDLE_GOV_LADDER
+++ b/configs/base-generic/CONFIG_CPU_IDLE_GOV_LADDER
diff --git a/baseconfig/CONFIG_CPU_THERMAL b/configs/base-generic/CONFIG_CPU_THERMAL
index 157f3e758..157f3e758 100644
--- a/baseconfig/CONFIG_CPU_THERMAL
+++ b/configs/base-generic/CONFIG_CPU_THERMAL
diff --git a/baseconfig/CONFIG_CRAMFS b/configs/base-generic/CONFIG_CRAMFS
index 99803b5a1..99803b5a1 100644
--- a/baseconfig/CONFIG_CRAMFS
+++ b/configs/base-generic/CONFIG_CRAMFS
diff --git a/baseconfig/CONFIG_CRASH b/configs/base-generic/CONFIG_CRASH
index 98a38fe93..98a38fe93 100644
--- a/baseconfig/CONFIG_CRASH
+++ b/configs/base-generic/CONFIG_CRASH
diff --git a/baseconfig/CONFIG_CRASH_DUMP b/configs/base-generic/CONFIG_CRASH_DUMP
index 84bb04c03..84bb04c03 100644
--- a/baseconfig/CONFIG_CRASH_DUMP
+++ b/configs/base-generic/CONFIG_CRASH_DUMP
diff --git a/baseconfig/CONFIG_CRC16 b/configs/base-generic/CONFIG_CRC16
index 3c20a511a..3c20a511a 100644
--- a/baseconfig/CONFIG_CRC16
+++ b/configs/base-generic/CONFIG_CRC16
diff --git a/baseconfig/CONFIG_CRC32 b/configs/base-generic/CONFIG_CRC32
index 133330012..133330012 100644
--- a/baseconfig/CONFIG_CRC32
+++ b/configs/base-generic/CONFIG_CRC32
diff --git a/baseconfig/CONFIG_CRC32_SELFTEST b/configs/base-generic/CONFIG_CRC32_SELFTEST
index ddea70b11..ddea70b11 100644
--- a/baseconfig/CONFIG_CRC32_SELFTEST
+++ b/configs/base-generic/CONFIG_CRC32_SELFTEST
diff --git a/baseconfig/CONFIG_CRC4 b/configs/base-generic/CONFIG_CRC4
index a67720667..a67720667 100644
--- a/baseconfig/CONFIG_CRC4
+++ b/configs/base-generic/CONFIG_CRC4
diff --git a/baseconfig/CONFIG_CRC7 b/configs/base-generic/CONFIG_CRC7
index 0e8b98dc4..0e8b98dc4 100644
--- a/baseconfig/CONFIG_CRC7
+++ b/configs/base-generic/CONFIG_CRC7
diff --git a/baseconfig/CONFIG_CRC8 b/configs/base-generic/CONFIG_CRC8
index 2fd408e1b..2fd408e1b 100644
--- a/baseconfig/CONFIG_CRC8
+++ b/configs/base-generic/CONFIG_CRC8
diff --git a/baseconfig/CONFIG_CRC_CCITT b/configs/base-generic/CONFIG_CRC_CCITT
index e5498da09..e5498da09 100644
--- a/baseconfig/CONFIG_CRC_CCITT
+++ b/configs/base-generic/CONFIG_CRC_CCITT
diff --git a/baseconfig/CONFIG_CRC_ITU_T b/configs/base-generic/CONFIG_CRC_ITU_T
index b69e01140..b69e01140 100644
--- a/baseconfig/CONFIG_CRC_ITU_T
+++ b/configs/base-generic/CONFIG_CRC_ITU_T
diff --git a/baseconfig/CONFIG_CRC_T10DIF b/configs/base-generic/CONFIG_CRC_T10DIF
index 0f16713a6..0f16713a6 100644
--- a/baseconfig/CONFIG_CRC_T10DIF
+++ b/configs/base-generic/CONFIG_CRC_T10DIF
diff --git a/baseconfig/CONFIG_CROSS_COMPILE b/configs/base-generic/CONFIG_CROSS_COMPILE
index 38c7b569b..38c7b569b 100644
--- a/baseconfig/CONFIG_CROSS_COMPILE
+++ b/configs/base-generic/CONFIG_CROSS_COMPILE
diff --git a/baseconfig/CONFIG_CROSS_MEMORY_ATTACH b/configs/base-generic/CONFIG_CROSS_MEMORY_ATTACH
index e960b1020..e960b1020 100644
--- a/baseconfig/CONFIG_CROSS_MEMORY_ATTACH
+++ b/configs/base-generic/CONFIG_CROSS_MEMORY_ATTACH
diff --git a/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT b/configs/base-generic/CONFIG_CROS_KBD_LED_BACKLIGHT
index 83b61e1e1..83b61e1e1 100644
--- a/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
+++ b/configs/base-generic/CONFIG_CROS_KBD_LED_BACKLIGHT
diff --git a/baseconfig/CONFIG_CRYPTO b/configs/base-generic/CONFIG_CRYPTO
index 6fc752ec5..6fc752ec5 100644
--- a/baseconfig/CONFIG_CRYPTO
+++ b/configs/base-generic/CONFIG_CRYPTO
diff --git a/baseconfig/CONFIG_CRYPTO_842 b/configs/base-generic/CONFIG_CRYPTO_842
index 08a7bd9b0..08a7bd9b0 100644
--- a/baseconfig/CONFIG_CRYPTO_842
+++ b/configs/base-generic/CONFIG_CRYPTO_842
diff --git a/baseconfig/CONFIG_CRYPTO_AES b/configs/base-generic/CONFIG_CRYPTO_AES
index dd56b423e..dd56b423e 100644
--- a/baseconfig/CONFIG_CRYPTO_AES
+++ b/configs/base-generic/CONFIG_CRYPTO_AES
diff --git a/baseconfig/CONFIG_CRYPTO_AES_TI b/configs/base-generic/CONFIG_CRYPTO_AES_TI
index fa0a3c5e1..fa0a3c5e1 100644
--- a/baseconfig/CONFIG_CRYPTO_AES_TI
+++ b/configs/base-generic/CONFIG_CRYPTO_AES_TI
diff --git a/baseconfig/CONFIG_CRYPTO_ANSI_CPRNG b/configs/base-generic/CONFIG_CRYPTO_ANSI_CPRNG
index eca113843..eca113843 100644
--- a/baseconfig/CONFIG_CRYPTO_ANSI_CPRNG
+++ b/configs/base-generic/CONFIG_CRYPTO_ANSI_CPRNG
diff --git a/baseconfig/CONFIG_CRYPTO_ANUBIS b/configs/base-generic/CONFIG_CRYPTO_ANUBIS
index f7884852a..f7884852a 100644
--- a/baseconfig/CONFIG_CRYPTO_ANUBIS
+++ b/configs/base-generic/CONFIG_CRYPTO_ANUBIS
diff --git a/baseconfig/CONFIG_CRYPTO_ARC4 b/configs/base-generic/CONFIG_CRYPTO_ARC4
index 08d710ec5..08d710ec5 100644
--- a/baseconfig/CONFIG_CRYPTO_ARC4
+++ b/configs/base-generic/CONFIG_CRYPTO_ARC4
diff --git a/baseconfig/CONFIG_CRYPTO_AUTHENC b/configs/base-generic/CONFIG_CRYPTO_AUTHENC
index 07d7a88a5..07d7a88a5 100644
--- a/baseconfig/CONFIG_CRYPTO_AUTHENC
+++ b/configs/base-generic/CONFIG_CRYPTO_AUTHENC
diff --git a/baseconfig/CONFIG_CRYPTO_BLKCIPHER b/configs/base-generic/CONFIG_CRYPTO_BLKCIPHER
index ba301e0ea..ba301e0ea 100644
--- a/baseconfig/CONFIG_CRYPTO_BLKCIPHER
+++ b/configs/base-generic/CONFIG_CRYPTO_BLKCIPHER
diff --git a/baseconfig/CONFIG_CRYPTO_BLOWFISH b/configs/base-generic/CONFIG_CRYPTO_BLOWFISH
index 5145b0c97..5145b0c97 100644
--- a/baseconfig/CONFIG_CRYPTO_BLOWFISH
+++ b/configs/base-generic/CONFIG_CRYPTO_BLOWFISH
diff --git a/baseconfig/CONFIG_CRYPTO_CAMELLIA b/configs/base-generic/CONFIG_CRYPTO_CAMELLIA
index 5781d7da1..5781d7da1 100644
--- a/baseconfig/CONFIG_CRYPTO_CAMELLIA
+++ b/configs/base-generic/CONFIG_CRYPTO_CAMELLIA
diff --git a/baseconfig/CONFIG_CRYPTO_CAST5 b/configs/base-generic/CONFIG_CRYPTO_CAST5
index 3dd03560f..3dd03560f 100644
--- a/baseconfig/CONFIG_CRYPTO_CAST5
+++ b/configs/base-generic/CONFIG_CRYPTO_CAST5
diff --git a/baseconfig/CONFIG_CRYPTO_CAST6 b/configs/base-generic/CONFIG_CRYPTO_CAST6
index 6c52c80f3..6c52c80f3 100644
--- a/baseconfig/CONFIG_CRYPTO_CAST6
+++ b/configs/base-generic/CONFIG_CRYPTO_CAST6
diff --git a/baseconfig/CONFIG_CRYPTO_CBC b/configs/base-generic/CONFIG_CRYPTO_CBC
index c501e8e03..c501e8e03 100644
--- a/baseconfig/CONFIG_CRYPTO_CBC
+++ b/configs/base-generic/CONFIG_CRYPTO_CBC
diff --git a/baseconfig/CONFIG_CRYPTO_CCM b/configs/base-generic/CONFIG_CRYPTO_CCM
index f552c9a96..f552c9a96 100644
--- a/baseconfig/CONFIG_CRYPTO_CCM
+++ b/configs/base-generic/CONFIG_CRYPTO_CCM
diff --git a/baseconfig/CONFIG_CRYPTO_CHACHA20 b/configs/base-generic/CONFIG_CRYPTO_CHACHA20
index 1eb6ab8d3..1eb6ab8d3 100644
--- a/baseconfig/CONFIG_CRYPTO_CHACHA20
+++ b/configs/base-generic/CONFIG_CRYPTO_CHACHA20
diff --git a/baseconfig/CONFIG_CRYPTO_CHACHA20POLY1305 b/configs/base-generic/CONFIG_CRYPTO_CHACHA20POLY1305
index 09126b7b2..09126b7b2 100644
--- a/baseconfig/CONFIG_CRYPTO_CHACHA20POLY1305
+++ b/configs/base-generic/CONFIG_CRYPTO_CHACHA20POLY1305
diff --git a/baseconfig/CONFIG_CRYPTO_CMAC b/configs/base-generic/CONFIG_CRYPTO_CMAC
index 587b31509..587b31509 100644
--- a/baseconfig/CONFIG_CRYPTO_CMAC
+++ b/configs/base-generic/CONFIG_CRYPTO_CMAC
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32 b/configs/base-generic/CONFIG_CRYPTO_CRC32
index 9ab72d652..9ab72d652 100644
--- a/baseconfig/CONFIG_CRYPTO_CRC32
+++ b/configs/base-generic/CONFIG_CRYPTO_CRC32
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32C b/configs/base-generic/CONFIG_CRYPTO_CRC32C
index 9323d8397..9323d8397 100644
--- a/baseconfig/CONFIG_CRYPTO_CRC32C
+++ b/configs/base-generic/CONFIG_CRYPTO_CRC32C
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32C_VPMSUM b/configs/base-generic/CONFIG_CRYPTO_CRC32C_VPMSUM
index 8d0ade331..8d0ade331 100644
--- a/baseconfig/CONFIG_CRYPTO_CRC32C_VPMSUM
+++ b/configs/base-generic/CONFIG_CRYPTO_CRC32C_VPMSUM
diff --git a/baseconfig/CONFIG_CRYPTO_CRYPTD b/configs/base-generic/CONFIG_CRYPTO_CRYPTD
index 6390e6f24..6390e6f24 100644
--- a/baseconfig/CONFIG_CRYPTO_CRYPTD
+++ b/configs/base-generic/CONFIG_CRYPTO_CRYPTD
diff --git a/baseconfig/CONFIG_CRYPTO_CTR b/configs/base-generic/CONFIG_CRYPTO_CTR
index 63e15a0d8..63e15a0d8 100644
--- a/baseconfig/CONFIG_CRYPTO_CTR
+++ b/configs/base-generic/CONFIG_CRYPTO_CTR
diff --git a/baseconfig/CONFIG_CRYPTO_CTS b/configs/base-generic/CONFIG_CRYPTO_CTS
index e7ff7297c..e7ff7297c 100644
--- a/baseconfig/CONFIG_CRYPTO_CTS
+++ b/configs/base-generic/CONFIG_CRYPTO_CTS
diff --git a/baseconfig/CONFIG_CRYPTO_DEFLATE b/configs/base-generic/CONFIG_CRYPTO_DEFLATE
index 2f60a06f0..2f60a06f0 100644
--- a/baseconfig/CONFIG_CRYPTO_DEFLATE
+++ b/configs/base-generic/CONFIG_CRYPTO_DEFLATE
diff --git a/baseconfig/CONFIG_CRYPTO_DES b/configs/base-generic/CONFIG_CRYPTO_DES
index e8145a59a..e8145a59a 100644
--- a/baseconfig/CONFIG_CRYPTO_DES
+++ b/configs/base-generic/CONFIG_CRYPTO_DES
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_CCREE b/configs/base-generic/CONFIG_CRYPTO_DEV_CCREE
index fe4fcee59..fe4fcee59 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_CCREE
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_CCREE
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_CHELSIO b/configs/base-generic/CONFIG_CRYPTO_DEV_CHELSIO
index 42606535d..42606535d 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_CHELSIO
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_CHELSIO
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_HIFN_795X b/configs/base-generic/CONFIG_CRYPTO_DEV_HIFN_795X
index 30afc129f..30afc129f 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_HIFN_795X
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_HIFN_795X
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_HIFN_795X_RNG b/configs/base-generic/CONFIG_CRYPTO_DEV_HIFN_795X_RNG
index 6bcdf27e6..6bcdf27e6 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_HIFN_795X_RNG
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_HIFN_795X_RNG
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_NITROX_CNN55XX b/configs/base-generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
index 47ee7d9bc..47ee7d9bc 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_SP_CCP b/configs/base-generic/CONFIG_CRYPTO_DEV_SP_CCP
index c494dcc87..c494dcc87 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_SP_CCP
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_SP_CCP
diff --git a/baseconfig/CONFIG_CRYPTO_DEV_VIRTIO b/configs/base-generic/CONFIG_CRYPTO_DEV_VIRTIO
index 2997f10e2..2997f10e2 100644
--- a/baseconfig/CONFIG_CRYPTO_DEV_VIRTIO
+++ b/configs/base-generic/CONFIG_CRYPTO_DEV_VIRTIO
diff --git a/baseconfig/CONFIG_CRYPTO_DH b/configs/base-generic/CONFIG_CRYPTO_DH
index c92378433..c92378433 100644
--- a/baseconfig/CONFIG_CRYPTO_DH
+++ b/configs/base-generic/CONFIG_CRYPTO_DH
diff --git a/baseconfig/CONFIG_CRYPTO_DRBG_CTR b/configs/base-generic/CONFIG_CRYPTO_DRBG_CTR
index 1c292fe5c..1c292fe5c 100644
--- a/baseconfig/CONFIG_CRYPTO_DRBG_CTR
+++ b/configs/base-generic/CONFIG_CRYPTO_DRBG_CTR
diff --git a/baseconfig/CONFIG_CRYPTO_DRBG_HASH b/configs/base-generic/CONFIG_CRYPTO_DRBG_HASH
index 2ec6b20ee..2ec6b20ee 100644
--- a/baseconfig/CONFIG_CRYPTO_DRBG_HASH
+++ b/configs/base-generic/CONFIG_CRYPTO_DRBG_HASH
diff --git a/baseconfig/CONFIG_CRYPTO_DRBG_MENU b/configs/base-generic/CONFIG_CRYPTO_DRBG_MENU
index f11183adb..f11183adb 100644
--- a/baseconfig/CONFIG_CRYPTO_DRBG_MENU
+++ b/configs/base-generic/CONFIG_CRYPTO_DRBG_MENU
diff --git a/baseconfig/CONFIG_CRYPTO_ECB b/configs/base-generic/CONFIG_CRYPTO_ECB
index bc645abc9..bc645abc9 100644
--- a/baseconfig/CONFIG_CRYPTO_ECB
+++ b/configs/base-generic/CONFIG_CRYPTO_ECB
diff --git a/baseconfig/CONFIG_CRYPTO_ECDH b/configs/base-generic/CONFIG_CRYPTO_ECDH
index 0244ab63e..0244ab63e 100644
--- a/baseconfig/CONFIG_CRYPTO_ECDH
+++ b/configs/base-generic/CONFIG_CRYPTO_ECDH
diff --git a/baseconfig/CONFIG_CRYPTO_ECHAINIV b/configs/base-generic/CONFIG_CRYPTO_ECHAINIV
index f6f8d76f3..f6f8d76f3 100644
--- a/baseconfig/CONFIG_CRYPTO_ECHAINIV
+++ b/configs/base-generic/CONFIG_CRYPTO_ECHAINIV
diff --git a/baseconfig/CONFIG_CRYPTO_FCRYPT b/configs/base-generic/CONFIG_CRYPTO_FCRYPT
index e3905ab84..e3905ab84 100644
--- a/baseconfig/CONFIG_CRYPTO_FCRYPT
+++ b/configs/base-generic/CONFIG_CRYPTO_FCRYPT
diff --git a/baseconfig/CONFIG_CRYPTO_FIPS b/configs/base-generic/CONFIG_CRYPTO_FIPS
index a948c8208..a948c8208 100644
--- a/baseconfig/CONFIG_CRYPTO_FIPS
+++ b/configs/base-generic/CONFIG_CRYPTO_FIPS
diff --git a/baseconfig/CONFIG_CRYPTO_GCM b/configs/base-generic/CONFIG_CRYPTO_GCM
index 8b509be56..8b509be56 100644
--- a/baseconfig/CONFIG_CRYPTO_GCM
+++ b/configs/base-generic/CONFIG_CRYPTO_GCM
diff --git a/baseconfig/CONFIG_CRYPTO_GF128MUL b/configs/base-generic/CONFIG_CRYPTO_GF128MUL
index c9fca11f5..c9fca11f5 100644
--- a/baseconfig/CONFIG_CRYPTO_GF128MUL
+++ b/configs/base-generic/CONFIG_CRYPTO_GF128MUL
diff --git a/baseconfig/CONFIG_CRYPTO_GHASH b/configs/base-generic/CONFIG_CRYPTO_GHASH
index 2104f2f02..2104f2f02 100644
--- a/baseconfig/CONFIG_CRYPTO_GHASH
+++ b/configs/base-generic/CONFIG_CRYPTO_GHASH
diff --git a/baseconfig/CONFIG_CRYPTO_HMAC b/configs/base-generic/CONFIG_CRYPTO_HMAC
index 2aa4086a0..2aa4086a0 100644
--- a/baseconfig/CONFIG_CRYPTO_HMAC
+++ b/configs/base-generic/CONFIG_CRYPTO_HMAC
diff --git a/baseconfig/CONFIG_CRYPTO_HW b/configs/base-generic/CONFIG_CRYPTO_HW
index 245062d86..245062d86 100644
--- a/baseconfig/CONFIG_CRYPTO_HW
+++ b/configs/base-generic/CONFIG_CRYPTO_HW
diff --git a/baseconfig/CONFIG_CRYPTO_KEYWRAP b/configs/base-generic/CONFIG_CRYPTO_KEYWRAP
index 6379932c9..6379932c9 100644
--- a/baseconfig/CONFIG_CRYPTO_KEYWRAP
+++ b/configs/base-generic/CONFIG_CRYPTO_KEYWRAP
diff --git a/baseconfig/CONFIG_CRYPTO_KHAZAD b/configs/base-generic/CONFIG_CRYPTO_KHAZAD
index 23d94b45f..23d94b45f 100644
--- a/baseconfig/CONFIG_CRYPTO_KHAZAD
+++ b/configs/base-generic/CONFIG_CRYPTO_KHAZAD
diff --git a/baseconfig/CONFIG_CRYPTO_LRW b/configs/base-generic/CONFIG_CRYPTO_LRW
index 22ce862b8..22ce862b8 100644
--- a/baseconfig/CONFIG_CRYPTO_LRW
+++ b/configs/base-generic/CONFIG_CRYPTO_LRW
diff --git a/baseconfig/CONFIG_CRYPTO_LZ4 b/configs/base-generic/CONFIG_CRYPTO_LZ4
index 2f1d09a8a..2f1d09a8a 100644
--- a/baseconfig/CONFIG_CRYPTO_LZ4
+++ b/configs/base-generic/CONFIG_CRYPTO_LZ4
diff --git a/baseconfig/CONFIG_CRYPTO_LZ4HC b/configs/base-generic/CONFIG_CRYPTO_LZ4HC
index 9f1a3d6a2..9f1a3d6a2 100644
--- a/baseconfig/CONFIG_CRYPTO_LZ4HC
+++ b/configs/base-generic/CONFIG_CRYPTO_LZ4HC
diff --git a/baseconfig/CONFIG_CRYPTO_LZO b/configs/base-generic/CONFIG_CRYPTO_LZO
index 418ab2f79..418ab2f79 100644
--- a/baseconfig/CONFIG_CRYPTO_LZO
+++ b/configs/base-generic/CONFIG_CRYPTO_LZO
diff --git a/baseconfig/CONFIG_CRYPTO_MANAGER b/configs/base-generic/CONFIG_CRYPTO_MANAGER
index 084eac591..084eac591 100644
--- a/baseconfig/CONFIG_CRYPTO_MANAGER
+++ b/configs/base-generic/CONFIG_CRYPTO_MANAGER
diff --git a/baseconfig/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS b/configs/base-generic/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
index 2b7116fd2..2b7116fd2 100644
--- a/baseconfig/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+++ b/configs/base-generic/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
diff --git a/baseconfig/CONFIG_CRYPTO_MCRYPTD b/configs/base-generic/CONFIG_CRYPTO_MCRYPTD
index 58c8cfad0..58c8cfad0 100644
--- a/baseconfig/CONFIG_CRYPTO_MCRYPTD
+++ b/configs/base-generic/CONFIG_CRYPTO_MCRYPTD
diff --git a/baseconfig/CONFIG_CRYPTO_MD4 b/configs/base-generic/CONFIG_CRYPTO_MD4
index 52b528475..52b528475 100644
--- a/baseconfig/CONFIG_CRYPTO_MD4
+++ b/configs/base-generic/CONFIG_CRYPTO_MD4
diff --git a/baseconfig/CONFIG_CRYPTO_MD5 b/configs/base-generic/CONFIG_CRYPTO_MD5
index 4ae53bd15..4ae53bd15 100644
--- a/baseconfig/CONFIG_CRYPTO_MD5
+++ b/configs/base-generic/CONFIG_CRYPTO_MD5
diff --git a/baseconfig/CONFIG_CRYPTO_MICHAEL_MIC b/configs/base-generic/CONFIG_CRYPTO_MICHAEL_MIC
index 7075e63ec..7075e63ec 100644
--- a/baseconfig/CONFIG_CRYPTO_MICHAEL_MIC
+++ b/configs/base-generic/CONFIG_CRYPTO_MICHAEL_MIC
diff --git a/baseconfig/CONFIG_CRYPTO_NULL b/configs/base-generic/CONFIG_CRYPTO_NULL
index 0747b1197..0747b1197 100644
--- a/baseconfig/CONFIG_CRYPTO_NULL
+++ b/configs/base-generic/CONFIG_CRYPTO_NULL
diff --git a/baseconfig/CONFIG_CRYPTO_PCBC b/configs/base-generic/CONFIG_CRYPTO_PCBC
index b59ce6d78..b59ce6d78 100644
--- a/baseconfig/CONFIG_CRYPTO_PCBC
+++ b/configs/base-generic/CONFIG_CRYPTO_PCBC
diff --git a/baseconfig/CONFIG_CRYPTO_PCRYPT b/configs/base-generic/CONFIG_CRYPTO_PCRYPT
index 59772cc02..59772cc02 100644
--- a/baseconfig/CONFIG_CRYPTO_PCRYPT
+++ b/configs/base-generic/CONFIG_CRYPTO_PCRYPT
diff --git a/baseconfig/CONFIG_CRYPTO_POLY1305 b/configs/base-generic/CONFIG_CRYPTO_POLY1305
index 71c5d4b38..71c5d4b38 100644
--- a/baseconfig/CONFIG_CRYPTO_POLY1305
+++ b/configs/base-generic/CONFIG_CRYPTO_POLY1305
diff --git a/baseconfig/CONFIG_CRYPTO_RMD128 b/configs/base-generic/CONFIG_CRYPTO_RMD128
index 46d7e7a27..46d7e7a27 100644
--- a/baseconfig/CONFIG_CRYPTO_RMD128
+++ b/configs/base-generic/CONFIG_CRYPTO_RMD128
diff --git a/baseconfig/CONFIG_CRYPTO_RMD160 b/configs/base-generic/CONFIG_CRYPTO_RMD160
index 7fd4b816b..7fd4b816b 100644
--- a/baseconfig/CONFIG_CRYPTO_RMD160
+++ b/configs/base-generic/CONFIG_CRYPTO_RMD160
diff --git a/baseconfig/CONFIG_CRYPTO_RMD256 b/configs/base-generic/CONFIG_CRYPTO_RMD256
index 08ee067ef..08ee067ef 100644
--- a/baseconfig/CONFIG_CRYPTO_RMD256
+++ b/configs/base-generic/CONFIG_CRYPTO_RMD256
diff --git a/baseconfig/CONFIG_CRYPTO_RMD320 b/configs/base-generic/CONFIG_CRYPTO_RMD320
index 9afe4de4d..9afe4de4d 100644
--- a/baseconfig/CONFIG_CRYPTO_RMD320
+++ b/configs/base-generic/CONFIG_CRYPTO_RMD320
diff --git a/baseconfig/CONFIG_CRYPTO_RSA b/configs/base-generic/CONFIG_CRYPTO_RSA
index bd58f1205..bd58f1205 100644
--- a/baseconfig/CONFIG_CRYPTO_RSA
+++ b/configs/base-generic/CONFIG_CRYPTO_RSA
diff --git a/baseconfig/CONFIG_CRYPTO_SALSA20 b/configs/base-generic/CONFIG_CRYPTO_SALSA20
index 8d94d02e6..8d94d02e6 100644
--- a/baseconfig/CONFIG_CRYPTO_SALSA20
+++ b/configs/base-generic/CONFIG_CRYPTO_SALSA20
diff --git a/baseconfig/CONFIG_CRYPTO_SALSA20_586 b/configs/base-generic/CONFIG_CRYPTO_SALSA20_586
index 8f14eaa26..8f14eaa26 100644
--- a/baseconfig/CONFIG_CRYPTO_SALSA20_586
+++ b/configs/base-generic/CONFIG_CRYPTO_SALSA20_586
diff --git a/baseconfig/CONFIG_CRYPTO_SEED b/configs/base-generic/CONFIG_CRYPTO_SEED
index 09ec68ec6..09ec68ec6 100644
--- a/baseconfig/CONFIG_CRYPTO_SEED
+++ b/configs/base-generic/CONFIG_CRYPTO_SEED
diff --git a/baseconfig/CONFIG_CRYPTO_SEQIV b/configs/base-generic/CONFIG_CRYPTO_SEQIV
index 7be12018f..7be12018f 100644
--- a/baseconfig/CONFIG_CRYPTO_SEQIV
+++ b/configs/base-generic/CONFIG_CRYPTO_SEQIV
diff --git a/baseconfig/CONFIG_CRYPTO_SERPENT b/configs/base-generic/CONFIG_CRYPTO_SERPENT
index f8a7bfbb5..f8a7bfbb5 100644
--- a/baseconfig/CONFIG_CRYPTO_SERPENT
+++ b/configs/base-generic/CONFIG_CRYPTO_SERPENT
diff --git a/baseconfig/CONFIG_CRYPTO_SHA1 b/configs/base-generic/CONFIG_CRYPTO_SHA1
index 82e74b118..82e74b118 100644
--- a/baseconfig/CONFIG_CRYPTO_SHA1
+++ b/configs/base-generic/CONFIG_CRYPTO_SHA1
diff --git a/baseconfig/CONFIG_CRYPTO_SHA256 b/configs/base-generic/CONFIG_CRYPTO_SHA256
index dcaffa2eb..dcaffa2eb 100644
--- a/baseconfig/CONFIG_CRYPTO_SHA256
+++ b/configs/base-generic/CONFIG_CRYPTO_SHA256
diff --git a/baseconfig/CONFIG_CRYPTO_SHA3 b/configs/base-generic/CONFIG_CRYPTO_SHA3
index 0fa7ce522..0fa7ce522 100644
--- a/baseconfig/CONFIG_CRYPTO_SHA3
+++ b/configs/base-generic/CONFIG_CRYPTO_SHA3
diff --git a/baseconfig/CONFIG_CRYPTO_SHA512 b/configs/base-generic/CONFIG_CRYPTO_SHA512
index 29ce3726b..29ce3726b 100644
--- a/baseconfig/CONFIG_CRYPTO_SHA512
+++ b/configs/base-generic/CONFIG_CRYPTO_SHA512
diff --git a/baseconfig/CONFIG_CRYPTO_SIMD b/configs/base-generic/CONFIG_CRYPTO_SIMD
index 91fac0ebe..91fac0ebe 100644
--- a/baseconfig/CONFIG_CRYPTO_SIMD
+++ b/configs/base-generic/CONFIG_CRYPTO_SIMD
diff --git a/baseconfig/CONFIG_CRYPTO_TEA b/configs/base-generic/CONFIG_CRYPTO_TEA
index 53982fa7c..53982fa7c 100644
--- a/baseconfig/CONFIG_CRYPTO_TEA
+++ b/configs/base-generic/CONFIG_CRYPTO_TEA
diff --git a/baseconfig/CONFIG_CRYPTO_TEST b/configs/base-generic/CONFIG_CRYPTO_TEST
index a2e883781..a2e883781 100644
--- a/baseconfig/CONFIG_CRYPTO_TEST
+++ b/configs/base-generic/CONFIG_CRYPTO_TEST
diff --git a/baseconfig/CONFIG_CRYPTO_TGR192 b/configs/base-generic/CONFIG_CRYPTO_TGR192
index 5dfd61a9b..5dfd61a9b 100644
--- a/baseconfig/CONFIG_CRYPTO_TGR192
+++ b/configs/base-generic/CONFIG_CRYPTO_TGR192
diff --git a/baseconfig/CONFIG_CRYPTO_TWOFISH b/configs/base-generic/CONFIG_CRYPTO_TWOFISH
index 41e8b34b8..41e8b34b8 100644
--- a/baseconfig/CONFIG_CRYPTO_TWOFISH
+++ b/configs/base-generic/CONFIG_CRYPTO_TWOFISH
diff --git a/baseconfig/CONFIG_CRYPTO_USER b/configs/base-generic/CONFIG_CRYPTO_USER
index 9bd523374..9bd523374 100644
--- a/baseconfig/CONFIG_CRYPTO_USER
+++ b/configs/base-generic/CONFIG_CRYPTO_USER
diff --git a/baseconfig/CONFIG_CRYPTO_USER_API_AEAD b/configs/base-generic/CONFIG_CRYPTO_USER_API_AEAD
index 01f9c504d..01f9c504d 100644
--- a/baseconfig/CONFIG_CRYPTO_USER_API_AEAD
+++ b/configs/base-generic/CONFIG_CRYPTO_USER_API_AEAD
diff --git a/baseconfig/CONFIG_CRYPTO_USER_API_HASH b/configs/base-generic/CONFIG_CRYPTO_USER_API_HASH
index d5d61c654..d5d61c654 100644
--- a/baseconfig/CONFIG_CRYPTO_USER_API_HASH
+++ b/configs/base-generic/CONFIG_CRYPTO_USER_API_HASH
diff --git a/baseconfig/CONFIG_CRYPTO_USER_API_RNG b/configs/base-generic/CONFIG_CRYPTO_USER_API_RNG
index 3562fafe7..3562fafe7 100644
--- a/baseconfig/CONFIG_CRYPTO_USER_API_RNG
+++ b/configs/base-generic/CONFIG_CRYPTO_USER_API_RNG
diff --git a/baseconfig/CONFIG_CRYPTO_USER_API_SKCIPHER b/configs/base-generic/CONFIG_CRYPTO_USER_API_SKCIPHER
index 4a7da08a5..4a7da08a5 100644
--- a/baseconfig/CONFIG_CRYPTO_USER_API_SKCIPHER
+++ b/configs/base-generic/CONFIG_CRYPTO_USER_API_SKCIPHER
diff --git a/baseconfig/CONFIG_CRYPTO_VMAC b/configs/base-generic/CONFIG_CRYPTO_VMAC
index eb719b78e..eb719b78e 100644
--- a/baseconfig/CONFIG_CRYPTO_VMAC
+++ b/configs/base-generic/CONFIG_CRYPTO_VMAC
diff --git a/baseconfig/CONFIG_CRYPTO_WP512 b/configs/base-generic/CONFIG_CRYPTO_WP512
index d907a1abe..d907a1abe 100644
--- a/baseconfig/CONFIG_CRYPTO_WP512
+++ b/configs/base-generic/CONFIG_CRYPTO_WP512
diff --git a/baseconfig/CONFIG_CRYPTO_XCBC b/configs/base-generic/CONFIG_CRYPTO_XCBC
index 8984fb2e7..8984fb2e7 100644
--- a/baseconfig/CONFIG_CRYPTO_XCBC
+++ b/configs/base-generic/CONFIG_CRYPTO_XCBC
diff --git a/baseconfig/CONFIG_CRYPTO_XTS b/configs/base-generic/CONFIG_CRYPTO_XTS
index b7e82261c..b7e82261c 100644
--- a/baseconfig/CONFIG_CRYPTO_XTS
+++ b/configs/base-generic/CONFIG_CRYPTO_XTS
diff --git a/baseconfig/CONFIG_CUSE b/configs/base-generic/CONFIG_CUSE
index 9796e51da..9796e51da 100644
--- a/baseconfig/CONFIG_CUSE
+++ b/configs/base-generic/CONFIG_CUSE
diff --git a/baseconfig/CONFIG_CW1200 b/configs/base-generic/CONFIG_CW1200
index b94db3265..b94db3265 100644
--- a/baseconfig/CONFIG_CW1200
+++ b/configs/base-generic/CONFIG_CW1200
diff --git a/baseconfig/CONFIG_CW1200_WLAN_SDIO b/configs/base-generic/CONFIG_CW1200_WLAN_SDIO
index d6f62fee9..d6f62fee9 100644
--- a/baseconfig/CONFIG_CW1200_WLAN_SDIO
+++ b/configs/base-generic/CONFIG_CW1200_WLAN_SDIO
diff --git a/baseconfig/CONFIG_CW1200_WLAN_SPI b/configs/base-generic/CONFIG_CW1200_WLAN_SPI
index a522a5f60..a522a5f60 100644
--- a/baseconfig/CONFIG_CW1200_WLAN_SPI
+++ b/configs/base-generic/CONFIG_CW1200_WLAN_SPI
diff --git a/baseconfig/CONFIG_CX_ECAT b/configs/base-generic/CONFIG_CX_ECAT
index f1dda12b0..f1dda12b0 100644
--- a/baseconfig/CONFIG_CX_ECAT
+++ b/configs/base-generic/CONFIG_CX_ECAT
diff --git a/baseconfig/CONFIG_CYCLADES b/configs/base-generic/CONFIG_CYCLADES
index 1b6707fab..1b6707fab 100644
--- a/baseconfig/CONFIG_CYCLADES
+++ b/configs/base-generic/CONFIG_CYCLADES
diff --git a/baseconfig/CONFIG_CYZ_INTR b/configs/base-generic/CONFIG_CYZ_INTR
index 4eed6997c..4eed6997c 100644
--- a/baseconfig/CONFIG_CYZ_INTR
+++ b/configs/base-generic/CONFIG_CYZ_INTR
diff --git a/baseconfig/CONFIG_DA280 b/configs/base-generic/CONFIG_DA280
index 1bd6a460e..1bd6a460e 100644
--- a/baseconfig/CONFIG_DA280
+++ b/configs/base-generic/CONFIG_DA280
diff --git a/baseconfig/CONFIG_DA311 b/configs/base-generic/CONFIG_DA311
index 7cfaaba5d..7cfaaba5d 100644
--- a/baseconfig/CONFIG_DA311
+++ b/configs/base-generic/CONFIG_DA311
diff --git a/baseconfig/CONFIG_DAVICOM_PHY b/configs/base-generic/CONFIG_DAVICOM_PHY
index 064b2beba..064b2beba 100644
--- a/baseconfig/CONFIG_DAVICOM_PHY
+++ b/configs/base-generic/CONFIG_DAVICOM_PHY
diff --git a/baseconfig/CONFIG_DCB b/configs/base-generic/CONFIG_DCB
index 01340a052..01340a052 100644
--- a/baseconfig/CONFIG_DCB
+++ b/configs/base-generic/CONFIG_DCB
diff --git a/baseconfig/CONFIG_DDR b/configs/base-generic/CONFIG_DDR
index 20983d43d..20983d43d 100644
--- a/baseconfig/CONFIG_DDR
+++ b/configs/base-generic/CONFIG_DDR
diff --git a/baseconfig/CONFIG_DE2104X b/configs/base-generic/CONFIG_DE2104X
index e9a75453a..e9a75453a 100644
--- a/baseconfig/CONFIG_DE2104X
+++ b/configs/base-generic/CONFIG_DE2104X
diff --git a/baseconfig/CONFIG_DE2104X_DSL b/configs/base-generic/CONFIG_DE2104X_DSL
index c5398503d..c5398503d 100644
--- a/baseconfig/CONFIG_DE2104X_DSL
+++ b/configs/base-generic/CONFIG_DE2104X_DSL
diff --git a/baseconfig/CONFIG_DE4X5 b/configs/base-generic/CONFIG_DE4X5
index c1d0b730e..c1d0b730e 100644
--- a/baseconfig/CONFIG_DE4X5
+++ b/configs/base-generic/CONFIG_DE4X5
diff --git a/baseconfig/CONFIG_DEBUG_ATOMIC_SLEEP b/configs/base-generic/CONFIG_DEBUG_ATOMIC_SLEEP
index cfd25ccf5..cfd25ccf5 100644
--- a/baseconfig/CONFIG_DEBUG_ATOMIC_SLEEP
+++ b/configs/base-generic/CONFIG_DEBUG_ATOMIC_SLEEP
diff --git a/baseconfig/CONFIG_DEBUG_BLK_CGROUP b/configs/base-generic/CONFIG_DEBUG_BLK_CGROUP
index d931922ce..d931922ce 100644
--- a/baseconfig/CONFIG_DEBUG_BLK_CGROUP
+++ b/configs/base-generic/CONFIG_DEBUG_BLK_CGROUP
diff --git a/baseconfig/CONFIG_DEBUG_BLOCK_EXT_DEVT b/configs/base-generic/CONFIG_DEBUG_BLOCK_EXT_DEVT
index 837c44880..837c44880 100644
--- a/baseconfig/CONFIG_DEBUG_BLOCK_EXT_DEVT
+++ b/configs/base-generic/CONFIG_DEBUG_BLOCK_EXT_DEVT
diff --git a/baseconfig/CONFIG_DEBUG_BOOT_PARAMS b/configs/base-generic/CONFIG_DEBUG_BOOT_PARAMS
index fa10c0ea7..fa10c0ea7 100644
--- a/baseconfig/CONFIG_DEBUG_BOOT_PARAMS
+++ b/configs/base-generic/CONFIG_DEBUG_BOOT_PARAMS
diff --git a/baseconfig/CONFIG_DEBUG_CREDENTIALS b/configs/base-generic/CONFIG_DEBUG_CREDENTIALS
index 10a75412e..10a75412e 100644
--- a/baseconfig/CONFIG_DEBUG_CREDENTIALS
+++ b/configs/base-generic/CONFIG_DEBUG_CREDENTIALS
diff --git a/baseconfig/CONFIG_DEBUG_DEVRES b/configs/base-generic/CONFIG_DEBUG_DEVRES
index 8a9310c0f..8a9310c0f 100644
--- a/baseconfig/CONFIG_DEBUG_DEVRES
+++ b/configs/base-generic/CONFIG_DEBUG_DEVRES
diff --git a/baseconfig/CONFIG_DEBUG_DRIVER b/configs/base-generic/CONFIG_DEBUG_DRIVER
index 84f5416f9..84f5416f9 100644
--- a/baseconfig/CONFIG_DEBUG_DRIVER
+++ b/configs/base-generic/CONFIG_DEBUG_DRIVER
diff --git a/baseconfig/CONFIG_DEBUG_FORCE_WEAK_PER_CPU b/configs/base-generic/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
index 2d64b9779..2d64b9779 100644
--- a/baseconfig/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
+++ b/configs/base-generic/CONFIG_DEBUG_FORCE_WEAK_PER_CPU
diff --git a/baseconfig/CONFIG_DEBUG_FS b/configs/base-generic/CONFIG_DEBUG_FS
index 39c2d2680..39c2d2680 100644
--- a/baseconfig/CONFIG_DEBUG_FS
+++ b/configs/base-generic/CONFIG_DEBUG_FS
diff --git a/baseconfig/CONFIG_DEBUG_GPIO b/configs/base-generic/CONFIG_DEBUG_GPIO
index c278d8cce..c278d8cce 100644
--- a/baseconfig/CONFIG_DEBUG_GPIO
+++ b/configs/base-generic/CONFIG_DEBUG_GPIO
diff --git a/baseconfig/CONFIG_DEBUG_HIGHMEM b/configs/base-generic/CONFIG_DEBUG_HIGHMEM
index c067a26ba..c067a26ba 100644
--- a/baseconfig/CONFIG_DEBUG_HIGHMEM
+++ b/configs/base-generic/CONFIG_DEBUG_HIGHMEM
diff --git a/baseconfig/CONFIG_DEBUG_HOTPLUG_CPU0 b/configs/base-generic/CONFIG_DEBUG_HOTPLUG_CPU0
index 8e44d8f12..8e44d8f12 100644
--- a/baseconfig/CONFIG_DEBUG_HOTPLUG_CPU0
+++ b/configs/base-generic/CONFIG_DEBUG_HOTPLUG_CPU0
diff --git a/baseconfig/CONFIG_DEBUG_INFO b/configs/base-generic/CONFIG_DEBUG_INFO
index 4df8bd06f..4df8bd06f 100644
--- a/baseconfig/CONFIG_DEBUG_INFO
+++ b/configs/base-generic/CONFIG_DEBUG_INFO
diff --git a/baseconfig/CONFIG_DEBUG_INFO_DWARF4 b/configs/base-generic/CONFIG_DEBUG_INFO_DWARF4
index 571ad34e0..571ad34e0 100644
--- a/baseconfig/CONFIG_DEBUG_INFO_DWARF4
+++ b/configs/base-generic/CONFIG_DEBUG_INFO_DWARF4
diff --git a/baseconfig/CONFIG_DEBUG_INFO_REDUCED b/configs/base-generic/CONFIG_DEBUG_INFO_REDUCED
index e78eada40..e78eada40 100644
--- a/baseconfig/CONFIG_DEBUG_INFO_REDUCED
+++ b/configs/base-generic/CONFIG_DEBUG_INFO_REDUCED
diff --git a/baseconfig/CONFIG_DEBUG_INFO_SPLIT b/configs/base-generic/CONFIG_DEBUG_INFO_SPLIT
index dbce5882e..dbce5882e 100644
--- a/baseconfig/CONFIG_DEBUG_INFO_SPLIT
+++ b/configs/base-generic/CONFIG_DEBUG_INFO_SPLIT
diff --git a/baseconfig/CONFIG_DEBUG_INFO_VTA b/configs/base-generic/CONFIG_DEBUG_INFO_VTA
index 593de8069..593de8069 100644
--- a/baseconfig/CONFIG_DEBUG_INFO_VTA
+++ b/configs/base-generic/CONFIG_DEBUG_INFO_VTA
diff --git a/baseconfig/CONFIG_DEBUG_KERNEL b/configs/base-generic/CONFIG_DEBUG_KERNEL
index cc34cddf4..cc34cddf4 100644
--- a/baseconfig/CONFIG_DEBUG_KERNEL
+++ b/configs/base-generic/CONFIG_DEBUG_KERNEL
diff --git a/baseconfig/CONFIG_DEBUG_KMEMLEAK b/configs/base-generic/CONFIG_DEBUG_KMEMLEAK
index 40fa8633d..40fa8633d 100644
--- a/baseconfig/CONFIG_DEBUG_KMEMLEAK
+++ b/configs/base-generic/CONFIG_DEBUG_KMEMLEAK
diff --git a/baseconfig/CONFIG_DEBUG_KMEMLEAK_TEST b/configs/base-generic/CONFIG_DEBUG_KMEMLEAK_TEST
index 4d7b6929e..4d7b6929e 100644
--- a/baseconfig/CONFIG_DEBUG_KMEMLEAK_TEST
+++ b/configs/base-generic/CONFIG_DEBUG_KMEMLEAK_TEST
diff --git a/baseconfig/CONFIG_DEBUG_KOBJECT b/configs/base-generic/CONFIG_DEBUG_KOBJECT
index c62a3581c..c62a3581c 100644
--- a/baseconfig/CONFIG_DEBUG_KOBJECT
+++ b/configs/base-generic/CONFIG_DEBUG_KOBJECT
diff --git a/baseconfig/CONFIG_DEBUG_KOBJECT_RELEASE b/configs/base-generic/CONFIG_DEBUG_KOBJECT_RELEASE
index be181190e..be181190e 100644
--- a/baseconfig/CONFIG_DEBUG_KOBJECT_RELEASE
+++ b/configs/base-generic/CONFIG_DEBUG_KOBJECT_RELEASE
diff --git a/baseconfig/CONFIG_DEBUG_LIST b/configs/base-generic/CONFIG_DEBUG_LIST
index b5386ce11..b5386ce11 100644
--- a/baseconfig/CONFIG_DEBUG_LIST
+++ b/configs/base-generic/CONFIG_DEBUG_LIST
diff --git a/baseconfig/CONFIG_DEBUG_LOCKDEP b/configs/base-generic/CONFIG_DEBUG_LOCKDEP
index 6e46da16a..6e46da16a 100644
--- a/baseconfig/CONFIG_DEBUG_LOCKDEP
+++ b/configs/base-generic/CONFIG_DEBUG_LOCKDEP
diff --git a/baseconfig/CONFIG_DEBUG_LOCKING_API_SELFTESTS b/configs/base-generic/CONFIG_DEBUG_LOCKING_API_SELFTESTS
index bc7067b6b..bc7067b6b 100644
--- a/baseconfig/CONFIG_DEBUG_LOCKING_API_SELFTESTS
+++ b/configs/base-generic/CONFIG_DEBUG_LOCKING_API_SELFTESTS
diff --git a/baseconfig/CONFIG_DEBUG_LOCK_ALLOC b/configs/base-generic/CONFIG_DEBUG_LOCK_ALLOC
index ea3c2dc12..ea3c2dc12 100644
--- a/baseconfig/CONFIG_DEBUG_LOCK_ALLOC
+++ b/configs/base-generic/CONFIG_DEBUG_LOCK_ALLOC
diff --git a/baseconfig/CONFIG_DEBUG_MUTEXES b/configs/base-generic/CONFIG_DEBUG_MUTEXES
index 92a6a5fea..92a6a5fea 100644
--- a/baseconfig/CONFIG_DEBUG_MUTEXES
+++ b/configs/base-generic/CONFIG_DEBUG_MUTEXES
diff --git a/baseconfig/CONFIG_DEBUG_NOTIFIERS b/configs/base-generic/CONFIG_DEBUG_NOTIFIERS
index 4f6c1fe4c..4f6c1fe4c 100644
--- a/baseconfig/CONFIG_DEBUG_NOTIFIERS
+++ b/configs/base-generic/CONFIG_DEBUG_NOTIFIERS
diff --git a/baseconfig/CONFIG_DEBUG_NX_TEST b/configs/base-generic/CONFIG_DEBUG_NX_TEST
index 73d22f93b..73d22f93b 100644
--- a/baseconfig/CONFIG_DEBUG_NX_TEST
+++ b/configs/base-generic/CONFIG_DEBUG_NX_TEST
diff --git a/baseconfig/CONFIG_DEBUG_OBJECTS b/configs/base-generic/CONFIG_DEBUG_OBJECTS
index 0846705c9..0846705c9 100644
--- a/baseconfig/CONFIG_DEBUG_OBJECTS
+++ b/configs/base-generic/CONFIG_DEBUG_OBJECTS
diff --git a/baseconfig/CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT b/configs/base-generic/CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT
index f36fba279..f36fba279 100644
--- a/baseconfig/CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT
+++ b/configs/base-generic/CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT
diff --git a/baseconfig/CONFIG_DEBUG_OBJECTS_SELFTEST b/configs/base-generic/CONFIG_DEBUG_OBJECTS_SELFTEST
index 7bb79771e..7bb79771e 100644
--- a/baseconfig/CONFIG_DEBUG_OBJECTS_SELFTEST
+++ b/configs/base-generic/CONFIG_DEBUG_OBJECTS_SELFTEST
diff --git a/debugconfig/CONFIG_DEBUG_PAGEALLOC b/configs/base-generic/CONFIG_DEBUG_PAGEALLOC
index 0e1c7855b..0e1c7855b 100644
--- a/debugconfig/CONFIG_DEBUG_PAGEALLOC
+++ b/configs/base-generic/CONFIG_DEBUG_PAGEALLOC
diff --git a/baseconfig/CONFIG_DEBUG_PAGE_REF b/configs/base-generic/CONFIG_DEBUG_PAGE_REF
index c35abbd89..c35abbd89 100644
--- a/baseconfig/CONFIG_DEBUG_PAGE_REF
+++ b/configs/base-generic/CONFIG_DEBUG_PAGE_REF
diff --git a/baseconfig/CONFIG_DEBUG_PERF_USE_VMALLOC b/configs/base-generic/CONFIG_DEBUG_PERF_USE_VMALLOC
index a1d865d21..a1d865d21 100644
--- a/baseconfig/CONFIG_DEBUG_PERF_USE_VMALLOC
+++ b/configs/base-generic/CONFIG_DEBUG_PERF_USE_VMALLOC
diff --git a/baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS b/configs/base-generic/CONFIG_DEBUG_PER_CPU_MAPS
index 01ead7281..01ead7281 100644
--- a/baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS
+++ b/configs/base-generic/CONFIG_DEBUG_PER_CPU_MAPS
diff --git a/baseconfig/CONFIG_DEBUG_PINCTRL b/configs/base-generic/CONFIG_DEBUG_PINCTRL
index 82a04e826..82a04e826 100644
--- a/baseconfig/CONFIG_DEBUG_PINCTRL
+++ b/configs/base-generic/CONFIG_DEBUG_PINCTRL
diff --git a/baseconfig/CONFIG_DEBUG_PI_LIST b/configs/base-generic/CONFIG_DEBUG_PI_LIST
index 47c8c9f67..47c8c9f67 100644
--- a/baseconfig/CONFIG_DEBUG_PI_LIST
+++ b/configs/base-generic/CONFIG_DEBUG_PI_LIST
diff --git a/baseconfig/CONFIG_DEBUG_REFCOUNT b/configs/base-generic/CONFIG_DEBUG_REFCOUNT
index 9d1b9de89..9d1b9de89 100644
--- a/baseconfig/CONFIG_DEBUG_REFCOUNT
+++ b/configs/base-generic/CONFIG_DEBUG_REFCOUNT
diff --git a/baseconfig/CONFIG_DEBUG_RODATA_TEST b/configs/base-generic/CONFIG_DEBUG_RODATA_TEST
index d74fce106..d74fce106 100644
--- a/baseconfig/CONFIG_DEBUG_RODATA_TEST
+++ b/configs/base-generic/CONFIG_DEBUG_RODATA_TEST
diff --git a/baseconfig/CONFIG_DEBUG_RT_MUTEXES b/configs/base-generic/CONFIG_DEBUG_RT_MUTEXES
index 742d62fb4..742d62fb4 100644
--- a/baseconfig/CONFIG_DEBUG_RT_MUTEXES
+++ b/configs/base-generic/CONFIG_DEBUG_RT_MUTEXES
diff --git a/baseconfig/CONFIG_DEBUG_SECTION_MISMATCH b/configs/base-generic/CONFIG_DEBUG_SECTION_MISMATCH
index 0a28b2663..0a28b2663 100644
--- a/baseconfig/CONFIG_DEBUG_SECTION_MISMATCH
+++ b/configs/base-generic/CONFIG_DEBUG_SECTION_MISMATCH
diff --git a/baseconfig/CONFIG_DEBUG_SET_MODULE_RONX b/configs/base-generic/CONFIG_DEBUG_SET_MODULE_RONX
index 18cd0f5c8..18cd0f5c8 100644
--- a/baseconfig/CONFIG_DEBUG_SET_MODULE_RONX
+++ b/configs/base-generic/CONFIG_DEBUG_SET_MODULE_RONX
diff --git a/baseconfig/CONFIG_DEBUG_SG b/configs/base-generic/CONFIG_DEBUG_SG
index 8c3ab98dd..8c3ab98dd 100644
--- a/baseconfig/CONFIG_DEBUG_SG
+++ b/configs/base-generic/CONFIG_DEBUG_SG
diff --git a/baseconfig/CONFIG_DEBUG_SHIRQ b/configs/base-generic/CONFIG_DEBUG_SHIRQ
index ab64f3007..ab64f3007 100644
--- a/baseconfig/CONFIG_DEBUG_SHIRQ
+++ b/configs/base-generic/CONFIG_DEBUG_SHIRQ
diff --git a/baseconfig/CONFIG_DEBUG_SPINLOCK b/configs/base-generic/CONFIG_DEBUG_SPINLOCK
index 1440abeb3..1440abeb3 100644
--- a/baseconfig/CONFIG_DEBUG_SPINLOCK
+++ b/configs/base-generic/CONFIG_DEBUG_SPINLOCK
diff --git a/baseconfig/CONFIG_DEBUG_STACK_USAGE b/configs/base-generic/CONFIG_DEBUG_STACK_USAGE
index 50688e28a..50688e28a 100644
--- a/baseconfig/CONFIG_DEBUG_STACK_USAGE
+++ b/configs/base-generic/CONFIG_DEBUG_STACK_USAGE
diff --git a/baseconfig/CONFIG_DEBUG_TEST_DRIVER_REMOVE b/configs/base-generic/CONFIG_DEBUG_TEST_DRIVER_REMOVE
index a7886e4ac..a7886e4ac 100644
--- a/baseconfig/CONFIG_DEBUG_TEST_DRIVER_REMOVE
+++ b/configs/base-generic/CONFIG_DEBUG_TEST_DRIVER_REMOVE
diff --git a/baseconfig/CONFIG_DEBUG_TIMEKEEPING b/configs/base-generic/CONFIG_DEBUG_TIMEKEEPING
index 2c0dd678c..2c0dd678c 100644
--- a/baseconfig/CONFIG_DEBUG_TIMEKEEPING
+++ b/configs/base-generic/CONFIG_DEBUG_TIMEKEEPING
diff --git a/baseconfig/CONFIG_DEBUG_VIRTUAL b/configs/base-generic/CONFIG_DEBUG_VIRTUAL
index c06eb53be..c06eb53be 100644
--- a/baseconfig/CONFIG_DEBUG_VIRTUAL
+++ b/configs/base-generic/CONFIG_DEBUG_VIRTUAL
diff --git a/debugconfig/CONFIG_DEBUG_VM b/configs/base-generic/CONFIG_DEBUG_VM
index d19bdfddb..d19bdfddb 100644
--- a/debugconfig/CONFIG_DEBUG_VM
+++ b/configs/base-generic/CONFIG_DEBUG_VM
diff --git a/baseconfig/CONFIG_DEBUG_VM_PGFLAGS b/configs/base-generic/CONFIG_DEBUG_VM_PGFLAGS
index 618cf72c8..618cf72c8 100644
--- a/baseconfig/CONFIG_DEBUG_VM_PGFLAGS
+++ b/configs/base-generic/CONFIG_DEBUG_VM_PGFLAGS
diff --git a/baseconfig/CONFIG_DEBUG_VM_RB b/configs/base-generic/CONFIG_DEBUG_VM_RB
index fbc8aaef8..fbc8aaef8 100644
--- a/baseconfig/CONFIG_DEBUG_VM_RB
+++ b/configs/base-generic/CONFIG_DEBUG_VM_RB
diff --git a/baseconfig/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible b/configs/base-generic/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
index fbc8aaef8..fbc8aaef8 100644
--- a/baseconfig/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
+++ b/configs/base-generic/CONFIG_DEBUG_VM_RB revisit this if performance isn't horrible
diff --git a/baseconfig/CONFIG_DEBUG_VM_VMACACHE b/configs/base-generic/CONFIG_DEBUG_VM_VMACACHE
index ddb2c3c3a..ddb2c3c3a 100644
--- a/baseconfig/CONFIG_DEBUG_VM_VMACACHE
+++ b/configs/base-generic/CONFIG_DEBUG_VM_VMACACHE
diff --git a/baseconfig/CONFIG_DEBUG_WQ_FORCE_RR_CPU b/configs/base-generic/CONFIG_DEBUG_WQ_FORCE_RR_CPU
index f5952cf0b..f5952cf0b 100644
--- a/baseconfig/CONFIG_DEBUG_WQ_FORCE_RR_CPU
+++ b/configs/base-generic/CONFIG_DEBUG_WQ_FORCE_RR_CPU
diff --git a/baseconfig/CONFIG_DEBUG_WW_MUTEX_SLOWPATH b/configs/base-generic/CONFIG_DEBUG_WW_MUTEX_SLOWPATH
index f4151e3d5..f4151e3d5 100644
--- a/baseconfig/CONFIG_DEBUG_WW_MUTEX_SLOWPATH
+++ b/configs/base-generic/CONFIG_DEBUG_WW_MUTEX_SLOWPATH
diff --git a/baseconfig/CONFIG_DECNET b/configs/base-generic/CONFIG_DECNET
index 1d83ee185..1d83ee185 100644
--- a/baseconfig/CONFIG_DECNET
+++ b/configs/base-generic/CONFIG_DECNET
diff --git a/baseconfig/CONFIG_DEFAULT_BOOTPARAM_HUNG_TASK_PANIC b/configs/base-generic/CONFIG_DEFAULT_BOOTPARAM_HUNG_TASK_PANIC
index 93452648f..93452648f 100644
--- a/baseconfig/CONFIG_DEFAULT_BOOTPARAM_HUNG_TASK_PANIC
+++ b/configs/base-generic/CONFIG_DEFAULT_BOOTPARAM_HUNG_TASK_PANIC
diff --git a/baseconfig/CONFIG_DEFAULT_CFQ b/configs/base-generic/CONFIG_DEFAULT_CFQ
index 2dea0a29e..2dea0a29e 100644
--- a/baseconfig/CONFIG_DEFAULT_CFQ
+++ b/configs/base-generic/CONFIG_DEFAULT_CFQ
diff --git a/baseconfig/CONFIG_DEFAULT_HOSTNAME b/configs/base-generic/CONFIG_DEFAULT_HOSTNAME
index 2991d2f11..2991d2f11 100644
--- a/baseconfig/CONFIG_DEFAULT_HOSTNAME
+++ b/configs/base-generic/CONFIG_DEFAULT_HOSTNAME
diff --git a/baseconfig/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT b/configs/base-generic/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
index 715091634..715091634 100644
--- a/baseconfig/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
+++ b/configs/base-generic/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
diff --git a/baseconfig/CONFIG_DEFAULT_MMAP_MIN_ADDR b/configs/base-generic/CONFIG_DEFAULT_MMAP_MIN_ADDR
index 68e78b7aa..68e78b7aa 100644
--- a/baseconfig/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ b/configs/base-generic/CONFIG_DEFAULT_MMAP_MIN_ADDR
diff --git a/baseconfig/CONFIG_DEFERRED_STRUCT_PAGE_INIT b/configs/base-generic/CONFIG_DEFERRED_STRUCT_PAGE_INIT
index c23e98f1e..c23e98f1e 100644
--- a/baseconfig/CONFIG_DEFERRED_STRUCT_PAGE_INIT
+++ b/configs/base-generic/CONFIG_DEFERRED_STRUCT_PAGE_INIT
diff --git a/baseconfig/CONFIG_DEFXX b/configs/base-generic/CONFIG_DEFXX
index 8e78ac0b3..8e78ac0b3 100644
--- a/baseconfig/CONFIG_DEFXX
+++ b/configs/base-generic/CONFIG_DEFXX
diff --git a/baseconfig/CONFIG_DETECT_HUNG_TASK b/configs/base-generic/CONFIG_DETECT_HUNG_TASK
index 8a997bafe..8a997bafe 100644
--- a/baseconfig/CONFIG_DETECT_HUNG_TASK
+++ b/configs/base-generic/CONFIG_DETECT_HUNG_TASK
diff --git a/baseconfig/CONFIG_DEVFREQ_GOV_PASSIVE b/configs/base-generic/CONFIG_DEVFREQ_GOV_PASSIVE
index 5f80876fc..5f80876fc 100644
--- a/baseconfig/CONFIG_DEVFREQ_GOV_PASSIVE
+++ b/configs/base-generic/CONFIG_DEVFREQ_GOV_PASSIVE
diff --git a/baseconfig/CONFIG_DEVFREQ_GOV_PERFORMANCE b/configs/base-generic/CONFIG_DEVFREQ_GOV_PERFORMANCE
index b79a05cf1..b79a05cf1 100644
--- a/baseconfig/CONFIG_DEVFREQ_GOV_PERFORMANCE
+++ b/configs/base-generic/CONFIG_DEVFREQ_GOV_PERFORMANCE
diff --git a/baseconfig/CONFIG_DEVFREQ_GOV_POWERSAVE b/configs/base-generic/CONFIG_DEVFREQ_GOV_POWERSAVE
index 5b1218239..5b1218239 100644
--- a/baseconfig/CONFIG_DEVFREQ_GOV_POWERSAVE
+++ b/configs/base-generic/CONFIG_DEVFREQ_GOV_POWERSAVE
diff --git a/baseconfig/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/configs/base-generic/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
index ca7663b83..ca7663b83 100644
--- a/baseconfig/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ b/configs/base-generic/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
diff --git a/baseconfig/CONFIG_DEVFREQ_GOV_USERSPACE b/configs/base-generic/CONFIG_DEVFREQ_GOV_USERSPACE
index 001f636a5..001f636a5 100644
--- a/baseconfig/CONFIG_DEVFREQ_GOV_USERSPACE
+++ b/configs/base-generic/CONFIG_DEVFREQ_GOV_USERSPACE
diff --git a/baseconfig/CONFIG_DEVFREQ_THERMAL b/configs/base-generic/CONFIG_DEVFREQ_THERMAL
index 5b90f9082..5b90f9082 100644
--- a/baseconfig/CONFIG_DEVFREQ_THERMAL
+++ b/configs/base-generic/CONFIG_DEVFREQ_THERMAL
diff --git a/baseconfig/CONFIG_DEVKMEM b/configs/base-generic/CONFIG_DEVKMEM
index c74b3b033..c74b3b033 100644
--- a/baseconfig/CONFIG_DEVKMEM
+++ b/configs/base-generic/CONFIG_DEVKMEM
diff --git a/baseconfig/CONFIG_DEVMEM b/configs/base-generic/CONFIG_DEVMEM
index 174a3f203..174a3f203 100644
--- a/baseconfig/CONFIG_DEVMEM
+++ b/configs/base-generic/CONFIG_DEVMEM
diff --git a/baseconfig/CONFIG_DEVPORT b/configs/base-generic/CONFIG_DEVPORT
index ff170aad1..ff170aad1 100644
--- a/baseconfig/CONFIG_DEVPORT
+++ b/configs/base-generic/CONFIG_DEVPORT
diff --git a/baseconfig/CONFIG_DEVTMPFS b/configs/base-generic/CONFIG_DEVTMPFS
index 4b7052847..4b7052847 100644
--- a/baseconfig/CONFIG_DEVTMPFS
+++ b/configs/base-generic/CONFIG_DEVTMPFS
diff --git a/baseconfig/CONFIG_DEVTMPFS_MOUNT b/configs/base-generic/CONFIG_DEVTMPFS_MOUNT
index e1cd3e81b..e1cd3e81b 100644
--- a/baseconfig/CONFIG_DEVTMPFS_MOUNT
+++ b/configs/base-generic/CONFIG_DEVTMPFS_MOUNT
diff --git a/baseconfig/CONFIG_DEV_APPLETALK b/configs/base-generic/CONFIG_DEV_APPLETALK
index 7c47a1ff6..7c47a1ff6 100644
--- a/baseconfig/CONFIG_DEV_APPLETALK
+++ b/configs/base-generic/CONFIG_DEV_APPLETALK
diff --git a/baseconfig/CONFIG_DE_AOC b/configs/base-generic/CONFIG_DE_AOC
index cbeac6bee..cbeac6bee 100644
--- a/baseconfig/CONFIG_DE_AOC
+++ b/configs/base-generic/CONFIG_DE_AOC
diff --git a/baseconfig/CONFIG_DGAP b/configs/base-generic/CONFIG_DGAP
index 68887c95a..68887c95a 100644
--- a/baseconfig/CONFIG_DGAP
+++ b/configs/base-generic/CONFIG_DGAP
diff --git a/baseconfig/CONFIG_DGNC b/configs/base-generic/CONFIG_DGNC
index f91665a87..f91665a87 100644
--- a/baseconfig/CONFIG_DGNC
+++ b/configs/base-generic/CONFIG_DGNC
diff --git a/baseconfig/CONFIG_DHT11 b/configs/base-generic/CONFIG_DHT11
index d8ecdb811..d8ecdb811 100644
--- a/baseconfig/CONFIG_DHT11
+++ b/configs/base-generic/CONFIG_DHT11
diff --git a/baseconfig/CONFIG_DL2K b/configs/base-generic/CONFIG_DL2K
index 97724baa9..97724baa9 100644
--- a/baseconfig/CONFIG_DL2K
+++ b/configs/base-generic/CONFIG_DL2K
diff --git a/baseconfig/CONFIG_DLM b/configs/base-generic/CONFIG_DLM
index 5a1c1ed7c..5a1c1ed7c 100644
--- a/baseconfig/CONFIG_DLM
+++ b/configs/base-generic/CONFIG_DLM
diff --git a/baseconfig/CONFIG_DLM_DEBUG b/configs/base-generic/CONFIG_DLM_DEBUG
index 002a38454..002a38454 100644
--- a/baseconfig/CONFIG_DLM_DEBUG
+++ b/configs/base-generic/CONFIG_DLM_DEBUG
diff --git a/baseconfig/CONFIG_DM9102 b/configs/base-generic/CONFIG_DM9102
index c46ce4fae..c46ce4fae 100644
--- a/baseconfig/CONFIG_DM9102
+++ b/configs/base-generic/CONFIG_DM9102
diff --git a/baseconfig/CONFIG_DMADEVICES b/configs/base-generic/CONFIG_DMADEVICES
index 169d6c3d0..169d6c3d0 100644
--- a/baseconfig/CONFIG_DMADEVICES
+++ b/configs/base-generic/CONFIG_DMADEVICES
diff --git a/baseconfig/arm/armv7/CONFIG_DMADEVICES_DEBUG b/configs/base-generic/CONFIG_DMADEVICES_DEBUG
index 7cd4fec86..7cd4fec86 100644
--- a/baseconfig/arm/armv7/CONFIG_DMADEVICES_DEBUG
+++ b/configs/base-generic/CONFIG_DMADEVICES_DEBUG
diff --git a/baseconfig/CONFIG_DMARD06 b/configs/base-generic/CONFIG_DMARD06
index 0d22f625b..0d22f625b 100644
--- a/baseconfig/CONFIG_DMARD06
+++ b/configs/base-generic/CONFIG_DMARD06
diff --git a/baseconfig/CONFIG_DMARD09 b/configs/base-generic/CONFIG_DMARD09
index cdf8d6bad..cdf8d6bad 100644
--- a/baseconfig/CONFIG_DMARD09
+++ b/configs/base-generic/CONFIG_DMARD09
diff --git a/baseconfig/CONFIG_DMARD10 b/configs/base-generic/CONFIG_DMARD10
index 3041c81a5..3041c81a5 100644
--- a/baseconfig/CONFIG_DMARD10
+++ b/configs/base-generic/CONFIG_DMARD10
diff --git a/baseconfig/CONFIG_DMATEST b/configs/base-generic/CONFIG_DMATEST
index 4a57f67f5..4a57f67f5 100644
--- a/baseconfig/CONFIG_DMATEST
+++ b/configs/base-generic/CONFIG_DMATEST
diff --git a/baseconfig/CONFIG_DMA_API_DEBUG b/configs/base-generic/CONFIG_DMA_API_DEBUG
index cf9e6050e..cf9e6050e 100644
--- a/baseconfig/CONFIG_DMA_API_DEBUG
+++ b/configs/base-generic/CONFIG_DMA_API_DEBUG
diff --git a/baseconfig/CONFIG_DMA_CMA b/configs/base-generic/CONFIG_DMA_CMA
index d7f1fc657..d7f1fc657 100644
--- a/baseconfig/CONFIG_DMA_CMA
+++ b/configs/base-generic/CONFIG_DMA_CMA
diff --git a/baseconfig/CONFIG_DMA_ENGINE b/configs/base-generic/CONFIG_DMA_ENGINE
index 167354c01..167354c01 100644
--- a/baseconfig/CONFIG_DMA_ENGINE
+++ b/configs/base-generic/CONFIG_DMA_ENGINE
diff --git a/baseconfig/CONFIG_DMA_FENCE_TRACE b/configs/base-generic/CONFIG_DMA_FENCE_TRACE
index bb21d9c52..bb21d9c52 100644
--- a/baseconfig/CONFIG_DMA_FENCE_TRACE
+++ b/configs/base-generic/CONFIG_DMA_FENCE_TRACE
diff --git a/baseconfig/CONFIG_DM_CACHE b/configs/base-generic/CONFIG_DM_CACHE
index 24a42667d..24a42667d 100644
--- a/baseconfig/CONFIG_DM_CACHE
+++ b/configs/base-generic/CONFIG_DM_CACHE
diff --git a/baseconfig/CONFIG_DM_CACHE_CLEANER b/configs/base-generic/CONFIG_DM_CACHE_CLEANER
index a33b5b6d8..a33b5b6d8 100644
--- a/baseconfig/CONFIG_DM_CACHE_CLEANER
+++ b/configs/base-generic/CONFIG_DM_CACHE_CLEANER
diff --git a/baseconfig/CONFIG_DM_CACHE_SMQ b/configs/base-generic/CONFIG_DM_CACHE_SMQ
index 41f26854f..41f26854f 100644
--- a/baseconfig/CONFIG_DM_CACHE_SMQ
+++ b/configs/base-generic/CONFIG_DM_CACHE_SMQ
diff --git a/baseconfig/CONFIG_DM_CRYPT b/configs/base-generic/CONFIG_DM_CRYPT
index 2ca34ebc7..2ca34ebc7 100644
--- a/baseconfig/CONFIG_DM_CRYPT
+++ b/configs/base-generic/CONFIG_DM_CRYPT
diff --git a/baseconfig/CONFIG_DM_DEBUG b/configs/base-generic/CONFIG_DM_DEBUG
index 1f45a5797..1f45a5797 100644
--- a/baseconfig/CONFIG_DM_DEBUG
+++ b/configs/base-generic/CONFIG_DM_DEBUG
diff --git a/baseconfig/CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING b/configs/base-generic/CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING
index c1d353713..c1d353713 100644
--- a/baseconfig/CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING
+++ b/configs/base-generic/CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING
diff --git a/baseconfig/CONFIG_DM_DEBUG_BLOCK_STACK_TRACING b/configs/base-generic/CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
index bab54bbda..bab54bbda 100644
--- a/baseconfig/CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
+++ b/configs/base-generic/CONFIG_DM_DEBUG_BLOCK_STACK_TRACING
diff --git a/baseconfig/CONFIG_DM_DELAY b/configs/base-generic/CONFIG_DM_DELAY
index 95fbe6249..95fbe6249 100644
--- a/baseconfig/CONFIG_DM_DELAY
+++ b/configs/base-generic/CONFIG_DM_DELAY
diff --git a/baseconfig/CONFIG_DM_ERA b/configs/base-generic/CONFIG_DM_ERA
index ec6bc25b4..ec6bc25b4 100644
--- a/baseconfig/CONFIG_DM_ERA
+++ b/configs/base-generic/CONFIG_DM_ERA
diff --git a/baseconfig/CONFIG_DM_FLAKEY b/configs/base-generic/CONFIG_DM_FLAKEY
index a68a41332..a68a41332 100644
--- a/baseconfig/CONFIG_DM_FLAKEY
+++ b/configs/base-generic/CONFIG_DM_FLAKEY
diff --git a/baseconfig/CONFIG_DM_INTEGRITY b/configs/base-generic/CONFIG_DM_INTEGRITY
index ee953fd2d..ee953fd2d 100644
--- a/baseconfig/CONFIG_DM_INTEGRITY
+++ b/configs/base-generic/CONFIG_DM_INTEGRITY
diff --git a/baseconfig/CONFIG_DM_LOG_USERSPACE b/configs/base-generic/CONFIG_DM_LOG_USERSPACE
index 085b4e385..085b4e385 100644
--- a/baseconfig/CONFIG_DM_LOG_USERSPACE
+++ b/configs/base-generic/CONFIG_DM_LOG_USERSPACE
diff --git a/baseconfig/CONFIG_DM_LOG_WRITES b/configs/base-generic/CONFIG_DM_LOG_WRITES
index f9030b9f4..f9030b9f4 100644
--- a/baseconfig/CONFIG_DM_LOG_WRITES
+++ b/configs/base-generic/CONFIG_DM_LOG_WRITES
diff --git a/baseconfig/CONFIG_DM_MIRROR b/configs/base-generic/CONFIG_DM_MIRROR
index b0a37bc10..b0a37bc10 100644
--- a/baseconfig/CONFIG_DM_MIRROR
+++ b/configs/base-generic/CONFIG_DM_MIRROR
diff --git a/baseconfig/CONFIG_DM_MQ_DEFAULT b/configs/base-generic/CONFIG_DM_MQ_DEFAULT
index 122314bad..122314bad 100644
--- a/baseconfig/CONFIG_DM_MQ_DEFAULT
+++ b/configs/base-generic/CONFIG_DM_MQ_DEFAULT
diff --git a/baseconfig/CONFIG_DM_MULTIPATH b/configs/base-generic/CONFIG_DM_MULTIPATH
index 3613fcce0..3613fcce0 100644
--- a/baseconfig/CONFIG_DM_MULTIPATH
+++ b/configs/base-generic/CONFIG_DM_MULTIPATH
diff --git a/baseconfig/CONFIG_DM_MULTIPATH_QL b/configs/base-generic/CONFIG_DM_MULTIPATH_QL
index d220fcab6..d220fcab6 100644
--- a/baseconfig/CONFIG_DM_MULTIPATH_QL
+++ b/configs/base-generic/CONFIG_DM_MULTIPATH_QL
diff --git a/baseconfig/CONFIG_DM_MULTIPATH_ST b/configs/base-generic/CONFIG_DM_MULTIPATH_ST
index 6bd64251b..6bd64251b 100644
--- a/baseconfig/CONFIG_DM_MULTIPATH_ST
+++ b/configs/base-generic/CONFIG_DM_MULTIPATH_ST
diff --git a/baseconfig/CONFIG_DM_RAID b/configs/base-generic/CONFIG_DM_RAID
index c2387b555..c2387b555 100644
--- a/baseconfig/CONFIG_DM_RAID
+++ b/configs/base-generic/CONFIG_DM_RAID
diff --git a/baseconfig/CONFIG_DM_SNAPSHOT b/configs/base-generic/CONFIG_DM_SNAPSHOT
index 325171f3d..325171f3d 100644
--- a/baseconfig/CONFIG_DM_SNAPSHOT
+++ b/configs/base-generic/CONFIG_DM_SNAPSHOT
diff --git a/baseconfig/CONFIG_DM_SWITCH b/configs/base-generic/CONFIG_DM_SWITCH
index 4dc3ff401..4dc3ff401 100644
--- a/baseconfig/CONFIG_DM_SWITCH
+++ b/configs/base-generic/CONFIG_DM_SWITCH
diff --git a/baseconfig/CONFIG_DM_THIN_PROVISIONING b/configs/base-generic/CONFIG_DM_THIN_PROVISIONING
index b5e94cbd6..b5e94cbd6 100644
--- a/baseconfig/CONFIG_DM_THIN_PROVISIONING
+++ b/configs/base-generic/CONFIG_DM_THIN_PROVISIONING
diff --git a/baseconfig/CONFIG_DM_UEVENT b/configs/base-generic/CONFIG_DM_UEVENT
index 6d88d4893..6d88d4893 100644
--- a/baseconfig/CONFIG_DM_UEVENT
+++ b/configs/base-generic/CONFIG_DM_UEVENT
diff --git a/baseconfig/CONFIG_DM_VERITY b/configs/base-generic/CONFIG_DM_VERITY
index 3906845c1..3906845c1 100644
--- a/baseconfig/CONFIG_DM_VERITY
+++ b/configs/base-generic/CONFIG_DM_VERITY
diff --git a/baseconfig/CONFIG_DM_VERITY_FEC b/configs/base-generic/CONFIG_DM_VERITY_FEC
index 736684b2b..736684b2b 100644
--- a/baseconfig/CONFIG_DM_VERITY_FEC
+++ b/configs/base-generic/CONFIG_DM_VERITY_FEC
diff --git a/baseconfig/CONFIG_DM_ZERO b/configs/base-generic/CONFIG_DM_ZERO
index 64e6a9f70..64e6a9f70 100644
--- a/baseconfig/CONFIG_DM_ZERO
+++ b/configs/base-generic/CONFIG_DM_ZERO
diff --git a/baseconfig/CONFIG_DM_ZONED b/configs/base-generic/CONFIG_DM_ZONED
index 0cfba7b46..0cfba7b46 100644
--- a/baseconfig/CONFIG_DM_ZONED
+++ b/configs/base-generic/CONFIG_DM_ZONED
diff --git a/baseconfig/CONFIG_DNET b/configs/base-generic/CONFIG_DNET
index 55807a9e0..55807a9e0 100644
--- a/baseconfig/CONFIG_DNET
+++ b/configs/base-generic/CONFIG_DNET
diff --git a/baseconfig/CONFIG_DNOTIFY b/configs/base-generic/CONFIG_DNOTIFY
index 1871c683b..1871c683b 100644
--- a/baseconfig/CONFIG_DNOTIFY
+++ b/configs/base-generic/CONFIG_DNOTIFY
diff --git a/baseconfig/CONFIG_DNS_RESOLVER b/configs/base-generic/CONFIG_DNS_RESOLVER
index bf44e0eea..bf44e0eea 100644
--- a/baseconfig/CONFIG_DNS_RESOLVER
+++ b/configs/base-generic/CONFIG_DNS_RESOLVER
diff --git a/baseconfig/CONFIG_DONGLE b/configs/base-generic/CONFIG_DONGLE
index e78b38f81..e78b38f81 100644
--- a/baseconfig/CONFIG_DONGLE
+++ b/configs/base-generic/CONFIG_DONGLE
diff --git a/baseconfig/CONFIG_DP83640_PHY b/configs/base-generic/CONFIG_DP83640_PHY
index 15f62f802..15f62f802 100644
--- a/baseconfig/CONFIG_DP83640_PHY
+++ b/configs/base-generic/CONFIG_DP83640_PHY
diff --git a/baseconfig/CONFIG_DP83848_PHY b/configs/base-generic/CONFIG_DP83848_PHY
index 86d916a4a..86d916a4a 100644
--- a/baseconfig/CONFIG_DP83848_PHY
+++ b/configs/base-generic/CONFIG_DP83848_PHY
diff --git a/baseconfig/CONFIG_DP83867_PHY b/configs/base-generic/CONFIG_DP83867_PHY
index 2bb3289c3..2bb3289c3 100644
--- a/baseconfig/CONFIG_DP83867_PHY
+++ b/configs/base-generic/CONFIG_DP83867_PHY
diff --git a/baseconfig/CONFIG_DPM_WATCHDOG revisit this in debug b/configs/base-generic/CONFIG_DPM_WATCHDOG revisit this in debug
index c12b35c43..c12b35c43 100644
--- a/baseconfig/CONFIG_DPM_WATCHDOG revisit this in debug
+++ b/configs/base-generic/CONFIG_DPM_WATCHDOG revisit this in debug
diff --git a/baseconfig/CONFIG_DPOT_DAC b/configs/base-generic/CONFIG_DPOT_DAC
index ed36b1e16..ed36b1e16 100644
--- a/baseconfig/CONFIG_DPOT_DAC
+++ b/configs/base-generic/CONFIG_DPOT_DAC
diff --git a/baseconfig/CONFIG_DRAGONRISE_FF b/configs/base-generic/CONFIG_DRAGONRISE_FF
index 8323d4b87..8323d4b87 100644
--- a/baseconfig/CONFIG_DRAGONRISE_FF
+++ b/configs/base-generic/CONFIG_DRAGONRISE_FF
diff --git a/baseconfig/CONFIG_DRBD_FAULT_INJECTION b/configs/base-generic/CONFIG_DRBD_FAULT_INJECTION
index df09e1cbb..df09e1cbb 100644
--- a/baseconfig/CONFIG_DRBD_FAULT_INJECTION
+++ b/configs/base-generic/CONFIG_DRBD_FAULT_INJECTION
diff --git a/baseconfig/CONFIG_DRM b/configs/base-generic/CONFIG_DRM
index 1ba603c1c..1ba603c1c 100644
--- a/baseconfig/CONFIG_DRM
+++ b/configs/base-generic/CONFIG_DRM
diff --git a/baseconfig/CONFIG_DRM_AMDGPU b/configs/base-generic/CONFIG_DRM_AMDGPU
index a7c6b65b6..a7c6b65b6 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU
+++ b/configs/base-generic/CONFIG_DRM_AMDGPU
diff --git a/baseconfig/CONFIG_DRM_AMDGPU_CIK b/configs/base-generic/CONFIG_DRM_AMDGPU_CIK
index 6f3da0bab..6f3da0bab 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU_CIK
+++ b/configs/base-generic/CONFIG_DRM_AMDGPU_CIK
diff --git a/baseconfig/CONFIG_DRM_AMDGPU_GART_DEBUGFS b/configs/base-generic/CONFIG_DRM_AMDGPU_GART_DEBUGFS
index 1074d5475..1074d5475 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU_GART_DEBUGFS
+++ b/configs/base-generic/CONFIG_DRM_AMDGPU_GART_DEBUGFS
diff --git a/baseconfig/CONFIG_DRM_AMDGPU_SI b/configs/base-generic/CONFIG_DRM_AMDGPU_SI
index 78dd0a3c6..78dd0a3c6 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU_SI
+++ b/configs/base-generic/CONFIG_DRM_AMDGPU_SI
diff --git a/baseconfig/CONFIG_DRM_AMDGPU_USERPTR b/configs/base-generic/CONFIG_DRM_AMDGPU_USERPTR
index 4134231af..4134231af 100644
--- a/baseconfig/CONFIG_DRM_AMDGPU_USERPTR
+++ b/configs/base-generic/CONFIG_DRM_AMDGPU_USERPTR
diff --git a/baseconfig/CONFIG_DRM_AMD_ACP b/configs/base-generic/CONFIG_DRM_AMD_ACP
index dfff6b592..dfff6b592 100644
--- a/baseconfig/CONFIG_DRM_AMD_ACP
+++ b/configs/base-generic/CONFIG_DRM_AMD_ACP
diff --git a/baseconfig/CONFIG_DRM_AMD_POWERPLAY b/configs/base-generic/CONFIG_DRM_AMD_POWERPLAY
index 235706467..235706467 100644
--- a/baseconfig/CONFIG_DRM_AMD_POWERPLAY
+++ b/configs/base-generic/CONFIG_DRM_AMD_POWERPLAY
diff --git a/baseconfig/CONFIG_DRM_ANALOGIX_ANX78XX b/configs/base-generic/CONFIG_DRM_ANALOGIX_ANX78XX
index d01c28a04..d01c28a04 100644
--- a/baseconfig/CONFIG_DRM_ANALOGIX_ANX78XX
+++ b/configs/base-generic/CONFIG_DRM_ANALOGIX_ANX78XX
diff --git a/baseconfig/CONFIG_DRM_ARCPGU b/configs/base-generic/CONFIG_DRM_ARCPGU
index d7d5d576a..d7d5d576a 100644
--- a/baseconfig/CONFIG_DRM_ARCPGU
+++ b/configs/base-generic/CONFIG_DRM_ARCPGU
diff --git a/baseconfig/CONFIG_DRM_AST b/configs/base-generic/CONFIG_DRM_AST
index d427867f1..d427867f1 100644
--- a/baseconfig/CONFIG_DRM_AST
+++ b/configs/base-generic/CONFIG_DRM_AST
diff --git a/baseconfig/CONFIG_DRM_BOCHS b/configs/base-generic/CONFIG_DRM_BOCHS
index 8dff9db06..8dff9db06 100644
--- a/baseconfig/CONFIG_DRM_BOCHS
+++ b/configs/base-generic/CONFIG_DRM_BOCHS
diff --git a/baseconfig/CONFIG_DRM_CIRRUS_QEMU b/configs/base-generic/CONFIG_DRM_CIRRUS_QEMU
index 75df6271a..75df6271a 100644
--- a/baseconfig/CONFIG_DRM_CIRRUS_QEMU
+++ b/configs/base-generic/CONFIG_DRM_CIRRUS_QEMU
diff --git a/baseconfig/CONFIG_DRM_DEBUG_MM_SELFTEST b/configs/base-generic/CONFIG_DRM_DEBUG_MM_SELFTEST
index 9607ae3de..9607ae3de 100644
--- a/baseconfig/CONFIG_DRM_DEBUG_MM_SELFTEST
+++ b/configs/base-generic/CONFIG_DRM_DEBUG_MM_SELFTEST
diff --git a/baseconfig/CONFIG_DRM_DP_AUX_CHARDEV b/configs/base-generic/CONFIG_DRM_DP_AUX_CHARDEV
index d875280a0..d875280a0 100644
--- a/baseconfig/CONFIG_DRM_DP_AUX_CHARDEV
+++ b/configs/base-generic/CONFIG_DRM_DP_AUX_CHARDEV
diff --git a/baseconfig/CONFIG_DRM_DUMB_VGA_DAC b/configs/base-generic/CONFIG_DRM_DUMB_VGA_DAC
index 9d926e169..9d926e169 100644
--- a/baseconfig/CONFIG_DRM_DUMB_VGA_DAC
+++ b/configs/base-generic/CONFIG_DRM_DUMB_VGA_DAC
diff --git a/baseconfig/CONFIG_DRM_DW_HDMI_AHB_AUDIO b/configs/base-generic/CONFIG_DRM_DW_HDMI_AHB_AUDIO
index 5c276f1dc..5c276f1dc 100644
--- a/baseconfig/CONFIG_DRM_DW_HDMI_AHB_AUDIO
+++ b/configs/base-generic/CONFIG_DRM_DW_HDMI_AHB_AUDIO
diff --git a/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO b/configs/base-generic/CONFIG_DRM_DW_HDMI_I2S_AUDIO
index d1f777db4..d1f777db4 100644
--- a/baseconfig/CONFIG_DRM_DW_HDMI_I2S_AUDIO
+++ b/configs/base-generic/CONFIG_DRM_DW_HDMI_I2S_AUDIO
diff --git a/baseconfig/CONFIG_DRM_FBDEV_EMULATION b/configs/base-generic/CONFIG_DRM_FBDEV_EMULATION
index 16ef2c82e..16ef2c82e 100644
--- a/baseconfig/CONFIG_DRM_FBDEV_EMULATION
+++ b/configs/base-generic/CONFIG_DRM_FBDEV_EMULATION
diff --git a/baseconfig/CONFIG_DRM_FBDEV_OVERALLOC b/configs/base-generic/CONFIG_DRM_FBDEV_OVERALLOC
index 32e5c4520..32e5c4520 100644
--- a/baseconfig/CONFIG_DRM_FBDEV_OVERALLOC
+++ b/configs/base-generic/CONFIG_DRM_FBDEV_OVERALLOC
diff --git a/baseconfig/CONFIG_DRM_HISI_HIBMC b/configs/base-generic/CONFIG_DRM_HISI_HIBMC
index 3138ee3c9..3138ee3c9 100644
--- a/baseconfig/CONFIG_DRM_HISI_HIBMC
+++ b/configs/base-generic/CONFIG_DRM_HISI_HIBMC
diff --git a/baseconfig/CONFIG_DRM_I2C_ADV7511 b/configs/base-generic/CONFIG_DRM_I2C_ADV7511
index 2d931f712..2d931f712 100644
--- a/baseconfig/CONFIG_DRM_I2C_ADV7511
+++ b/configs/base-generic/CONFIG_DRM_I2C_ADV7511
diff --git a/baseconfig/CONFIG_DRM_I2C_ADV7511_AUDIO b/configs/base-generic/CONFIG_DRM_I2C_ADV7511_AUDIO
index da69ce940..da69ce940 100644
--- a/baseconfig/CONFIG_DRM_I2C_ADV7511_AUDIO
+++ b/configs/base-generic/CONFIG_DRM_I2C_ADV7511_AUDIO
diff --git a/baseconfig/CONFIG_DRM_I2C_ADV7533 b/configs/base-generic/CONFIG_DRM_I2C_ADV7533
index 9f7b3dccf..9f7b3dccf 100644
--- a/baseconfig/CONFIG_DRM_I2C_ADV7533
+++ b/configs/base-generic/CONFIG_DRM_I2C_ADV7533
diff --git a/baseconfig/CONFIG_DRM_I2C_CH7006 b/configs/base-generic/CONFIG_DRM_I2C_CH7006
index 0e04442bf..0e04442bf 100644
--- a/baseconfig/CONFIG_DRM_I2C_CH7006
+++ b/configs/base-generic/CONFIG_DRM_I2C_CH7006
diff --git a/baseconfig/CONFIG_DRM_I2C_NXP_TDA998X b/configs/base-generic/CONFIG_DRM_I2C_NXP_TDA998X
index a816d583e..a816d583e 100644
--- a/baseconfig/CONFIG_DRM_I2C_NXP_TDA998X
+++ b/configs/base-generic/CONFIG_DRM_I2C_NXP_TDA998X
diff --git a/baseconfig/CONFIG_DRM_I2C_SIL164 b/configs/base-generic/CONFIG_DRM_I2C_SIL164
index fb5fc4d67..fb5fc4d67 100644
--- a/baseconfig/CONFIG_DRM_I2C_SIL164
+++ b/configs/base-generic/CONFIG_DRM_I2C_SIL164
diff --git a/baseconfig/CONFIG_DRM_LEGACY b/configs/base-generic/CONFIG_DRM_LEGACY
index 2c74b876f..2c74b876f 100644
--- a/baseconfig/CONFIG_DRM_LEGACY
+++ b/configs/base-generic/CONFIG_DRM_LEGACY
diff --git a/baseconfig/CONFIG_DRM_LOAD_EDID_FIRMWARE b/configs/base-generic/CONFIG_DRM_LOAD_EDID_FIRMWARE
index cbc53f636..cbc53f636 100644
--- a/baseconfig/CONFIG_DRM_LOAD_EDID_FIRMWARE
+++ b/configs/base-generic/CONFIG_DRM_LOAD_EDID_FIRMWARE
diff --git a/baseconfig/CONFIG_DRM_LVDS_ENCODER b/configs/base-generic/CONFIG_DRM_LVDS_ENCODER
index e2ea277b3..e2ea277b3 100644
--- a/baseconfig/CONFIG_DRM_LVDS_ENCODER
+++ b/configs/base-generic/CONFIG_DRM_LVDS_ENCODER
diff --git a/baseconfig/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW b/configs/base-generic/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
index 7aa3826f4..7aa3826f4 100644
--- a/baseconfig/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
+++ b/configs/base-generic/CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
diff --git a/baseconfig/CONFIG_DRM_MGA b/configs/base-generic/CONFIG_DRM_MGA
index d1cf1836c..d1cf1836c 100644
--- a/baseconfig/CONFIG_DRM_MGA
+++ b/configs/base-generic/CONFIG_DRM_MGA
diff --git a/baseconfig/CONFIG_DRM_MGAG200 b/configs/base-generic/CONFIG_DRM_MGAG200
index 48b6c6106..48b6c6106 100644
--- a/baseconfig/CONFIG_DRM_MGAG200
+++ b/configs/base-generic/CONFIG_DRM_MGAG200
diff --git a/baseconfig/CONFIG_DRM_MXSFB b/configs/base-generic/CONFIG_DRM_MXSFB
index 550352f6d..550352f6d 100644
--- a/baseconfig/CONFIG_DRM_MXSFB
+++ b/configs/base-generic/CONFIG_DRM_MXSFB
diff --git a/baseconfig/CONFIG_DRM_NOUVEAU b/configs/base-generic/CONFIG_DRM_NOUVEAU
index 9375fdfc7..9375fdfc7 100644
--- a/baseconfig/CONFIG_DRM_NOUVEAU
+++ b/configs/base-generic/CONFIG_DRM_NOUVEAU
diff --git a/baseconfig/CONFIG_DRM_NOUVEAU_BACKLIGHT b/configs/base-generic/CONFIG_DRM_NOUVEAU_BACKLIGHT
index bb06e5458..bb06e5458 100644
--- a/baseconfig/CONFIG_DRM_NOUVEAU_BACKLIGHT
+++ b/configs/base-generic/CONFIG_DRM_NOUVEAU_BACKLIGHT
diff --git a/baseconfig/CONFIG_DRM_NXP_PTN3460 b/configs/base-generic/CONFIG_DRM_NXP_PTN3460
index be8b96f79..be8b96f79 100644
--- a/baseconfig/CONFIG_DRM_NXP_PTN3460
+++ b/configs/base-generic/CONFIG_DRM_NXP_PTN3460
diff --git a/baseconfig/CONFIG_DRM_PANEL b/configs/base-generic/CONFIG_DRM_PANEL
index dc23d2384..dc23d2384 100644
--- a/baseconfig/CONFIG_DRM_PANEL
+++ b/configs/base-generic/CONFIG_DRM_PANEL
diff --git a/baseconfig/CONFIG_DRM_PANEL_INNOLUX_P079ZCA b/configs/base-generic/CONFIG_DRM_PANEL_INNOLUX_P079ZCA
index c84531b68..c84531b68 100644
--- a/baseconfig/CONFIG_DRM_PANEL_INNOLUX_P079ZCA
+++ b/configs/base-generic/CONFIG_DRM_PANEL_INNOLUX_P079ZCA
diff --git a/baseconfig/CONFIG_DRM_PANEL_JDI_LT070ME05000 b/configs/base-generic/CONFIG_DRM_PANEL_JDI_LT070ME05000
index 1bd549c73..1bd549c73 100644
--- a/baseconfig/CONFIG_DRM_PANEL_JDI_LT070ME05000
+++ b/configs/base-generic/CONFIG_DRM_PANEL_JDI_LT070ME05000
diff --git a/baseconfig/CONFIG_DRM_PANEL_LG_LG4573 b/configs/base-generic/CONFIG_DRM_PANEL_LG_LG4573
index 35ecd6eba..35ecd6eba 100644
--- a/baseconfig/CONFIG_DRM_PANEL_LG_LG4573
+++ b/configs/base-generic/CONFIG_DRM_PANEL_LG_LG4573
diff --git a/baseconfig/CONFIG_DRM_PANEL_LVDS b/configs/base-generic/CONFIG_DRM_PANEL_LVDS
index af4bf6e01..af4bf6e01 100644
--- a/baseconfig/CONFIG_DRM_PANEL_LVDS
+++ b/configs/base-generic/CONFIG_DRM_PANEL_LVDS
diff --git a/baseconfig/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/configs/base-generic/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
index 5b25d7565..5b25d7565 100644
--- a/baseconfig/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
+++ b/configs/base-generic/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
diff --git a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_LD9040 b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_LD9040
index 8aae09888..8aae09888 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_LD9040
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_LD9040
diff --git a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
index 8cb5243d1..8cb5243d1 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
diff --git a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
index 253f569cc..253f569cc 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
diff --git a/baseconfig/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 b/configs/base-generic/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
index 9d584f6ab..9d584f6ab 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
diff --git a/baseconfig/CONFIG_DRM_PANEL_SHARP_LS043T1LE01 b/configs/base-generic/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
index 64dedb057..64dedb057 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
diff --git a/baseconfig/CONFIG_DRM_PANEL_SIMPLE b/configs/base-generic/CONFIG_DRM_PANEL_SIMPLE
index a1ed63eca..a1ed63eca 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SIMPLE
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SIMPLE
diff --git a/baseconfig/CONFIG_DRM_PANEL_SITRONIX_ST7789V b/configs/base-generic/CONFIG_DRM_PANEL_SITRONIX_ST7789V
index 712cb79a7..712cb79a7 100644
--- a/baseconfig/CONFIG_DRM_PANEL_SITRONIX_ST7789V
+++ b/configs/base-generic/CONFIG_DRM_PANEL_SITRONIX_ST7789V
diff --git a/baseconfig/CONFIG_DRM_PARADE_PS8622 b/configs/base-generic/CONFIG_DRM_PARADE_PS8622
index e541cb693..e541cb693 100644
--- a/baseconfig/CONFIG_DRM_PARADE_PS8622
+++ b/configs/base-generic/CONFIG_DRM_PARADE_PS8622
diff --git a/baseconfig/CONFIG_DRM_QXL b/configs/base-generic/CONFIG_DRM_QXL
index cff18896b..cff18896b 100644
--- a/baseconfig/CONFIG_DRM_QXL
+++ b/configs/base-generic/CONFIG_DRM_QXL
diff --git a/baseconfig/CONFIG_DRM_R128 b/configs/base-generic/CONFIG_DRM_R128
index 701800ad5..701800ad5 100644
--- a/baseconfig/CONFIG_DRM_R128
+++ b/configs/base-generic/CONFIG_DRM_R128
diff --git a/baseconfig/CONFIG_DRM_RADEON b/configs/base-generic/CONFIG_DRM_RADEON
index 12dfb1eb3..12dfb1eb3 100644
--- a/baseconfig/CONFIG_DRM_RADEON
+++ b/configs/base-generic/CONFIG_DRM_RADEON
diff --git a/baseconfig/CONFIG_DRM_RADEON_USERPTR b/configs/base-generic/CONFIG_DRM_RADEON_USERPTR
index feecc1853..feecc1853 100644
--- a/baseconfig/CONFIG_DRM_RADEON_USERPTR
+++ b/configs/base-generic/CONFIG_DRM_RADEON_USERPTR
diff --git a/baseconfig/CONFIG_DRM_RCAR_DW_HDMI b/configs/base-generic/CONFIG_DRM_RCAR_DW_HDMI
index d3dace0e8..d3dace0e8 100644
--- a/baseconfig/CONFIG_DRM_RCAR_DW_HDMI
+++ b/configs/base-generic/CONFIG_DRM_RCAR_DW_HDMI
diff --git a/baseconfig/CONFIG_DRM_SAVAGE b/configs/base-generic/CONFIG_DRM_SAVAGE
index 614154be4..614154be4 100644
--- a/baseconfig/CONFIG_DRM_SAVAGE
+++ b/configs/base-generic/CONFIG_DRM_SAVAGE
diff --git a/baseconfig/CONFIG_DRM_SII902X b/configs/base-generic/CONFIG_DRM_SII902X
index 18a102e07..18a102e07 100644
--- a/baseconfig/CONFIG_DRM_SII902X
+++ b/configs/base-generic/CONFIG_DRM_SII902X
diff --git a/baseconfig/CONFIG_DRM_SIL_SII8620 b/configs/base-generic/CONFIG_DRM_SIL_SII8620
index 9aa2a3752..9aa2a3752 100644
--- a/baseconfig/CONFIG_DRM_SIL_SII8620
+++ b/configs/base-generic/CONFIG_DRM_SIL_SII8620
diff --git a/baseconfig/CONFIG_DRM_SIS b/configs/base-generic/CONFIG_DRM_SIS
index f1dd790a0..f1dd790a0 100644
--- a/baseconfig/CONFIG_DRM_SIS
+++ b/configs/base-generic/CONFIG_DRM_SIS
diff --git a/baseconfig/CONFIG_DRM_TDFX b/configs/base-generic/CONFIG_DRM_TDFX
index 36f8ba1f9..36f8ba1f9 100644
--- a/baseconfig/CONFIG_DRM_TDFX
+++ b/configs/base-generic/CONFIG_DRM_TDFX
diff --git a/baseconfig/CONFIG_DRM_TINYDRM b/configs/base-generic/CONFIG_DRM_TINYDRM
index be104b06c..be104b06c 100644
--- a/baseconfig/CONFIG_DRM_TINYDRM
+++ b/configs/base-generic/CONFIG_DRM_TINYDRM
diff --git a/baseconfig/CONFIG_DRM_TI_TFP410 b/configs/base-generic/CONFIG_DRM_TI_TFP410
index 9d9bec99c..9d9bec99c 100644
--- a/baseconfig/CONFIG_DRM_TI_TFP410
+++ b/configs/base-generic/CONFIG_DRM_TI_TFP410
diff --git a/baseconfig/CONFIG_DRM_TOSHIBA_TC358767 b/configs/base-generic/CONFIG_DRM_TOSHIBA_TC358767
index cdb5218c6..cdb5218c6 100644
--- a/baseconfig/CONFIG_DRM_TOSHIBA_TC358767
+++ b/configs/base-generic/CONFIG_DRM_TOSHIBA_TC358767
diff --git a/baseconfig/CONFIG_DRM_UDL b/configs/base-generic/CONFIG_DRM_UDL
index 6b64ab832..6b64ab832 100644
--- a/baseconfig/CONFIG_DRM_UDL
+++ b/configs/base-generic/CONFIG_DRM_UDL
diff --git a/baseconfig/CONFIG_DRM_VBOXVIDEO b/configs/base-generic/CONFIG_DRM_VBOXVIDEO
index 8cd637a0c..8cd637a0c 100644
--- a/baseconfig/CONFIG_DRM_VBOXVIDEO
+++ b/configs/base-generic/CONFIG_DRM_VBOXVIDEO
diff --git a/baseconfig/CONFIG_DRM_VGEM b/configs/base-generic/CONFIG_DRM_VGEM
index 51b4e1fa6..51b4e1fa6 100644
--- a/baseconfig/CONFIG_DRM_VGEM
+++ b/configs/base-generic/CONFIG_DRM_VGEM
diff --git a/baseconfig/CONFIG_DRM_VIA b/configs/base-generic/CONFIG_DRM_VIA
index b54e19d33..b54e19d33 100644
--- a/baseconfig/CONFIG_DRM_VIA
+++ b/configs/base-generic/CONFIG_DRM_VIA
diff --git a/baseconfig/CONFIG_DRM_VIRTIO_GPU b/configs/base-generic/CONFIG_DRM_VIRTIO_GPU
index 3f7fd91d7..3f7fd91d7 100644
--- a/baseconfig/CONFIG_DRM_VIRTIO_GPU
+++ b/configs/base-generic/CONFIG_DRM_VIRTIO_GPU
diff --git a/baseconfig/CONFIG_DS1682 b/configs/base-generic/CONFIG_DS1682
index 7266bceb4..7266bceb4 100644
--- a/baseconfig/CONFIG_DS1682
+++ b/configs/base-generic/CONFIG_DS1682
diff --git a/baseconfig/CONFIG_DS1803 b/configs/base-generic/CONFIG_DS1803
index 04e81cfe1..04e81cfe1 100644
--- a/baseconfig/CONFIG_DS1803
+++ b/configs/base-generic/CONFIG_DS1803
diff --git a/baseconfig/CONFIG_DT3155 b/configs/base-generic/CONFIG_DT3155
index 5e9a468ee..5e9a468ee 100644
--- a/baseconfig/CONFIG_DT3155
+++ b/configs/base-generic/CONFIG_DT3155
diff --git a/baseconfig/CONFIG_DUMMY b/configs/base-generic/CONFIG_DUMMY
index 5c3261758..5c3261758 100644
--- a/baseconfig/CONFIG_DUMMY
+++ b/configs/base-generic/CONFIG_DUMMY
diff --git a/baseconfig/CONFIG_DUMMY_CONSOLE b/configs/base-generic/CONFIG_DUMMY_CONSOLE
index 4a7a56908..4a7a56908 100644
--- a/baseconfig/CONFIG_DUMMY_CONSOLE
+++ b/configs/base-generic/CONFIG_DUMMY_CONSOLE
diff --git a/baseconfig/CONFIG_DUMMY_CONSOLE_COLUMNS b/configs/base-generic/CONFIG_DUMMY_CONSOLE_COLUMNS
index e05b288c4..e05b288c4 100644
--- a/baseconfig/CONFIG_DUMMY_CONSOLE_COLUMNS
+++ b/configs/base-generic/CONFIG_DUMMY_CONSOLE_COLUMNS
diff --git a/baseconfig/CONFIG_DUMMY_CONSOLE_ROWS b/configs/base-generic/CONFIG_DUMMY_CONSOLE_ROWS
index 4b42476d8..4b42476d8 100644
--- a/baseconfig/CONFIG_DUMMY_CONSOLE_ROWS
+++ b/configs/base-generic/CONFIG_DUMMY_CONSOLE_ROWS
diff --git a/baseconfig/CONFIG_DUMMY_IRQ b/configs/base-generic/CONFIG_DUMMY_IRQ
index d24642867..d24642867 100644
--- a/baseconfig/CONFIG_DUMMY_IRQ
+++ b/configs/base-generic/CONFIG_DUMMY_IRQ
diff --git a/baseconfig/CONFIG_DVB_AS102 b/configs/base-generic/CONFIG_DVB_AS102
index 631c90919..631c90919 100644
--- a/baseconfig/CONFIG_DVB_AS102
+++ b/configs/base-generic/CONFIG_DVB_AS102
diff --git a/baseconfig/CONFIG_DVB_AV7110 b/configs/base-generic/CONFIG_DVB_AV7110
index c96399763..c96399763 100644
--- a/baseconfig/CONFIG_DVB_AV7110
+++ b/configs/base-generic/CONFIG_DVB_AV7110
diff --git a/baseconfig/CONFIG_DVB_AV7110_OSD b/configs/base-generic/CONFIG_DVB_AV7110_OSD
index 2c175a56e..2c175a56e 100644
--- a/baseconfig/CONFIG_DVB_AV7110_OSD
+++ b/configs/base-generic/CONFIG_DVB_AV7110_OSD
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP
index c1ecaa8c7..c1ecaa8c7 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_DEBUG b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_DEBUG
index f4146629a..f4146629a 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_DEBUG
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_PCI b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_PCI
index 9f86ea48f..9f86ea48f 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_PCI
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_PCI
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG
index ed24dba89..ed24dba89 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_USB b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_USB
index 3b7388ba7..3b7388ba7 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_USB
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_USB
diff --git a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG
index 6227d9a12..6227d9a12 100644
--- a/baseconfig/CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG
+++ b/configs/base-generic/CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG
diff --git a/baseconfig/CONFIG_DVB_BT8XX b/configs/base-generic/CONFIG_DVB_BT8XX
index 0b80e6687..0b80e6687 100644
--- a/baseconfig/CONFIG_DVB_BT8XX
+++ b/configs/base-generic/CONFIG_DVB_BT8XX
diff --git a/baseconfig/CONFIG_DVB_BUDGET b/configs/base-generic/CONFIG_DVB_BUDGET
index f68466fca..f68466fca 100644
--- a/baseconfig/CONFIG_DVB_BUDGET
+++ b/configs/base-generic/CONFIG_DVB_BUDGET
diff --git a/baseconfig/CONFIG_DVB_BUDGET_AV b/configs/base-generic/CONFIG_DVB_BUDGET_AV
index d34c3f2e9..d34c3f2e9 100644
--- a/baseconfig/CONFIG_DVB_BUDGET_AV
+++ b/configs/base-generic/CONFIG_DVB_BUDGET_AV
diff --git a/baseconfig/CONFIG_DVB_BUDGET_CI b/configs/base-generic/CONFIG_DVB_BUDGET_CI
index 3b72b9f3d..3b72b9f3d 100644
--- a/baseconfig/CONFIG_DVB_BUDGET_CI
+++ b/configs/base-generic/CONFIG_DVB_BUDGET_CI
diff --git a/baseconfig/CONFIG_DVB_BUDGET_CORE b/configs/base-generic/CONFIG_DVB_BUDGET_CORE
index e1a8802ae..e1a8802ae 100644
--- a/baseconfig/CONFIG_DVB_BUDGET_CORE
+++ b/configs/base-generic/CONFIG_DVB_BUDGET_CORE
diff --git a/baseconfig/CONFIG_DVB_BUDGET_PATCH b/configs/base-generic/CONFIG_DVB_BUDGET_PATCH
index ec1005c89..ec1005c89 100644
--- a/baseconfig/CONFIG_DVB_BUDGET_PATCH
+++ b/configs/base-generic/CONFIG_DVB_BUDGET_PATCH
diff --git a/baseconfig/CONFIG_DVB_CORE b/configs/base-generic/CONFIG_DVB_CORE
index 4b2687aeb..4b2687aeb 100644
--- a/baseconfig/CONFIG_DVB_CORE
+++ b/configs/base-generic/CONFIG_DVB_CORE
diff --git a/baseconfig/CONFIG_DVB_CXD2099 b/configs/base-generic/CONFIG_DVB_CXD2099
index 76f5431d2..76f5431d2 100644
--- a/baseconfig/CONFIG_DVB_CXD2099
+++ b/configs/base-generic/CONFIG_DVB_CXD2099
diff --git a/baseconfig/CONFIG_DVB_DDBRIDGE b/configs/base-generic/CONFIG_DVB_DDBRIDGE
index 2ec63b3c3..2ec63b3c3 100644
--- a/baseconfig/CONFIG_DVB_DDBRIDGE
+++ b/configs/base-generic/CONFIG_DVB_DDBRIDGE
diff --git a/baseconfig/CONFIG_DVB_DDBRIDGE_MSIENABLE b/configs/base-generic/CONFIG_DVB_DDBRIDGE_MSIENABLE
index 4f0814b60..4f0814b60 100644
--- a/baseconfig/CONFIG_DVB_DDBRIDGE_MSIENABLE
+++ b/configs/base-generic/CONFIG_DVB_DDBRIDGE_MSIENABLE
diff --git a/baseconfig/CONFIG_DVB_DEMUX_SECTION_LOSS_LOG b/configs/base-generic/CONFIG_DVB_DEMUX_SECTION_LOSS_LOG
index 21729454c..21729454c 100644
--- a/baseconfig/CONFIG_DVB_DEMUX_SECTION_LOSS_LOG
+++ b/configs/base-generic/CONFIG_DVB_DEMUX_SECTION_LOSS_LOG
diff --git a/baseconfig/CONFIG_DVB_DM1105 b/configs/base-generic/CONFIG_DVB_DM1105
index a3754cf08..a3754cf08 100644
--- a/baseconfig/CONFIG_DVB_DM1105
+++ b/configs/base-generic/CONFIG_DVB_DM1105
diff --git a/baseconfig/CONFIG_DVB_DYNAMIC_MINORS b/configs/base-generic/CONFIG_DVB_DYNAMIC_MINORS
index f9bd0d910..f9bd0d910 100644
--- a/baseconfig/CONFIG_DVB_DYNAMIC_MINORS
+++ b/configs/base-generic/CONFIG_DVB_DYNAMIC_MINORS
diff --git a/baseconfig/CONFIG_DVB_FIREDTV b/configs/base-generic/CONFIG_DVB_FIREDTV
index ed424ffcf..ed424ffcf 100644
--- a/baseconfig/CONFIG_DVB_FIREDTV
+++ b/configs/base-generic/CONFIG_DVB_FIREDTV
diff --git a/baseconfig/CONFIG_DVB_HOPPER b/configs/base-generic/CONFIG_DVB_HOPPER
index e00776d8c..e00776d8c 100644
--- a/baseconfig/CONFIG_DVB_HOPPER
+++ b/configs/base-generic/CONFIG_DVB_HOPPER
diff --git a/baseconfig/CONFIG_DVB_MANTIS b/configs/base-generic/CONFIG_DVB_MANTIS
index ddd7a6913..ddd7a6913 100644
--- a/baseconfig/CONFIG_DVB_MANTIS
+++ b/configs/base-generic/CONFIG_DVB_MANTIS
diff --git a/baseconfig/CONFIG_DVB_MAX_ADAPTERS b/configs/base-generic/CONFIG_DVB_MAX_ADAPTERS
index 01b45579f..01b45579f 100644
--- a/baseconfig/CONFIG_DVB_MAX_ADAPTERS
+++ b/configs/base-generic/CONFIG_DVB_MAX_ADAPTERS
diff --git a/baseconfig/CONFIG_DVB_MN88472 b/configs/base-generic/CONFIG_DVB_MN88472
index c695bb925..c695bb925 100644
--- a/baseconfig/CONFIG_DVB_MN88472
+++ b/configs/base-generic/CONFIG_DVB_MN88472
diff --git a/baseconfig/CONFIG_DVB_MN88473 b/configs/base-generic/CONFIG_DVB_MN88473
index 03c9c318f..03c9c318f 100644
--- a/baseconfig/CONFIG_DVB_MN88473
+++ b/configs/base-generic/CONFIG_DVB_MN88473
diff --git a/baseconfig/CONFIG_DVB_NET b/configs/base-generic/CONFIG_DVB_NET
index d7c7f782d..d7c7f782d 100644
--- a/baseconfig/CONFIG_DVB_NET
+++ b/configs/base-generic/CONFIG_DVB_NET
diff --git a/baseconfig/CONFIG_DVB_NETUP_UNIDVB b/configs/base-generic/CONFIG_DVB_NETUP_UNIDVB
index c8d81d169..c8d81d169 100644
--- a/baseconfig/CONFIG_DVB_NETUP_UNIDVB
+++ b/configs/base-generic/CONFIG_DVB_NETUP_UNIDVB
diff --git a/baseconfig/CONFIG_DVB_NGENE b/configs/base-generic/CONFIG_DVB_NGENE
index 03d500cb9..03d500cb9 100644
--- a/baseconfig/CONFIG_DVB_NGENE
+++ b/configs/base-generic/CONFIG_DVB_NGENE
diff --git a/baseconfig/CONFIG_DVB_PLATFORM_DRIVERS b/configs/base-generic/CONFIG_DVB_PLATFORM_DRIVERS
index 125f4b5bb..125f4b5bb 100644
--- a/baseconfig/CONFIG_DVB_PLATFORM_DRIVERS
+++ b/configs/base-generic/CONFIG_DVB_PLATFORM_DRIVERS
diff --git a/baseconfig/CONFIG_DVB_PLUTO2 b/configs/base-generic/CONFIG_DVB_PLUTO2
index 60fb4c629..60fb4c629 100644
--- a/baseconfig/CONFIG_DVB_PLUTO2
+++ b/configs/base-generic/CONFIG_DVB_PLUTO2
diff --git a/baseconfig/CONFIG_DVB_PT1 b/configs/base-generic/CONFIG_DVB_PT1
index 6427e67bf..6427e67bf 100644
--- a/baseconfig/CONFIG_DVB_PT1
+++ b/configs/base-generic/CONFIG_DVB_PT1
diff --git a/baseconfig/CONFIG_DVB_PT3 b/configs/base-generic/CONFIG_DVB_PT3
index ee60079fc..ee60079fc 100644
--- a/baseconfig/CONFIG_DVB_PT3
+++ b/configs/base-generic/CONFIG_DVB_PT3
diff --git a/baseconfig/CONFIG_DVB_RTL2832_SDR b/configs/base-generic/CONFIG_DVB_RTL2832_SDR
index b20426a67..b20426a67 100644
--- a/baseconfig/CONFIG_DVB_RTL2832_SDR
+++ b/configs/base-generic/CONFIG_DVB_RTL2832_SDR
diff --git a/baseconfig/CONFIG_DVB_SMIPCIE b/configs/base-generic/CONFIG_DVB_SMIPCIE
index 9e9cd81f7..9e9cd81f7 100644
--- a/baseconfig/CONFIG_DVB_SMIPCIE
+++ b/configs/base-generic/CONFIG_DVB_SMIPCIE
diff --git a/baseconfig/CONFIG_DVB_TTUSB_BUDGET b/configs/base-generic/CONFIG_DVB_TTUSB_BUDGET
index d155f3eb6..d155f3eb6 100644
--- a/baseconfig/CONFIG_DVB_TTUSB_BUDGET
+++ b/configs/base-generic/CONFIG_DVB_TTUSB_BUDGET
diff --git a/baseconfig/CONFIG_DVB_TTUSB_DEC b/configs/base-generic/CONFIG_DVB_TTUSB_DEC
index 8788bbc00..8788bbc00 100644
--- a/baseconfig/CONFIG_DVB_TTUSB_DEC
+++ b/configs/base-generic/CONFIG_DVB_TTUSB_DEC
diff --git a/baseconfig/CONFIG_DVB_USB b/configs/base-generic/CONFIG_DVB_USB
index 0c5b4f640..0c5b4f640 100644
--- a/baseconfig/CONFIG_DVB_USB
+++ b/configs/base-generic/CONFIG_DVB_USB
diff --git a/baseconfig/CONFIG_DVB_USB_A800 b/configs/base-generic/CONFIG_DVB_USB_A800
index 4f3729e57..4f3729e57 100644
--- a/baseconfig/CONFIG_DVB_USB_A800
+++ b/configs/base-generic/CONFIG_DVB_USB_A800
diff --git a/baseconfig/CONFIG_DVB_USB_AF9005 b/configs/base-generic/CONFIG_DVB_USB_AF9005
index e536d9817..e536d9817 100644
--- a/baseconfig/CONFIG_DVB_USB_AF9005
+++ b/configs/base-generic/CONFIG_DVB_USB_AF9005
diff --git a/baseconfig/CONFIG_DVB_USB_AF9005_REMOTE b/configs/base-generic/CONFIG_DVB_USB_AF9005_REMOTE
index f038bba12..f038bba12 100644
--- a/baseconfig/CONFIG_DVB_USB_AF9005_REMOTE
+++ b/configs/base-generic/CONFIG_DVB_USB_AF9005_REMOTE
diff --git a/baseconfig/CONFIG_DVB_USB_AF9015 b/configs/base-generic/CONFIG_DVB_USB_AF9015
index 422200eae..422200eae 100644
--- a/baseconfig/CONFIG_DVB_USB_AF9015
+++ b/configs/base-generic/CONFIG_DVB_USB_AF9015
diff --git a/baseconfig/CONFIG_DVB_USB_AF9035 b/configs/base-generic/CONFIG_DVB_USB_AF9035
index 8ee92b484..8ee92b484 100644
--- a/baseconfig/CONFIG_DVB_USB_AF9035
+++ b/configs/base-generic/CONFIG_DVB_USB_AF9035
diff --git a/baseconfig/CONFIG_DVB_USB_ANYSEE b/configs/base-generic/CONFIG_DVB_USB_ANYSEE
index 1776aacc8..1776aacc8 100644
--- a/baseconfig/CONFIG_DVB_USB_ANYSEE
+++ b/configs/base-generic/CONFIG_DVB_USB_ANYSEE
diff --git a/baseconfig/CONFIG_DVB_USB_AU6610 b/configs/base-generic/CONFIG_DVB_USB_AU6610
index d4ebae981..d4ebae981 100644
--- a/baseconfig/CONFIG_DVB_USB_AU6610
+++ b/configs/base-generic/CONFIG_DVB_USB_AU6610
diff --git a/baseconfig/CONFIG_DVB_USB_AZ6007 b/configs/base-generic/CONFIG_DVB_USB_AZ6007
index 363727f0c..363727f0c 100644
--- a/baseconfig/CONFIG_DVB_USB_AZ6007
+++ b/configs/base-generic/CONFIG_DVB_USB_AZ6007
diff --git a/baseconfig/CONFIG_DVB_USB_AZ6027 b/configs/base-generic/CONFIG_DVB_USB_AZ6027
index d165a9139..d165a9139 100644
--- a/baseconfig/CONFIG_DVB_USB_AZ6027
+++ b/configs/base-generic/CONFIG_DVB_USB_AZ6027
diff --git a/baseconfig/CONFIG_DVB_USB_CE6230 b/configs/base-generic/CONFIG_DVB_USB_CE6230
index f7a9e4d30..f7a9e4d30 100644
--- a/baseconfig/CONFIG_DVB_USB_CE6230
+++ b/configs/base-generic/CONFIG_DVB_USB_CE6230
diff --git a/baseconfig/CONFIG_DVB_USB_CINERGY_T2 b/configs/base-generic/CONFIG_DVB_USB_CINERGY_T2
index 9c8c7da0b..9c8c7da0b 100644
--- a/baseconfig/CONFIG_DVB_USB_CINERGY_T2
+++ b/configs/base-generic/CONFIG_DVB_USB_CINERGY_T2
diff --git a/baseconfig/CONFIG_DVB_USB_CXUSB b/configs/base-generic/CONFIG_DVB_USB_CXUSB
index fe7492041..fe7492041 100644
--- a/baseconfig/CONFIG_DVB_USB_CXUSB
+++ b/configs/base-generic/CONFIG_DVB_USB_CXUSB
diff --git a/baseconfig/CONFIG_DVB_USB_DEBUG b/configs/base-generic/CONFIG_DVB_USB_DEBUG
index 6c9a6e332..6c9a6e332 100644
--- a/baseconfig/CONFIG_DVB_USB_DEBUG
+++ b/configs/base-generic/CONFIG_DVB_USB_DEBUG
diff --git a/baseconfig/CONFIG_DVB_USB_DIB0700 b/configs/base-generic/CONFIG_DVB_USB_DIB0700
index 5c8b01058..5c8b01058 100644
--- a/baseconfig/CONFIG_DVB_USB_DIB0700
+++ b/configs/base-generic/CONFIG_DVB_USB_DIB0700
diff --git a/baseconfig/CONFIG_DVB_USB_DIBUSB_MB b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MB
index f7490fb30..f7490fb30 100644
--- a/baseconfig/CONFIG_DVB_USB_DIBUSB_MB
+++ b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MB
diff --git a/baseconfig/CONFIG_DVB_USB_DIBUSB_MB_FAULTY b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MB_FAULTY
index 5175eb954..5175eb954 100644
--- a/baseconfig/CONFIG_DVB_USB_DIBUSB_MB_FAULTY
+++ b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MB_FAULTY
diff --git a/baseconfig/CONFIG_DVB_USB_DIBUSB_MC b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MC
index b601da897..b601da897 100644
--- a/baseconfig/CONFIG_DVB_USB_DIBUSB_MC
+++ b/configs/base-generic/CONFIG_DVB_USB_DIBUSB_MC
diff --git a/baseconfig/CONFIG_DVB_USB_DIGITV b/configs/base-generic/CONFIG_DVB_USB_DIGITV
index 92bfbd6cd..92bfbd6cd 100644
--- a/baseconfig/CONFIG_DVB_USB_DIGITV
+++ b/configs/base-generic/CONFIG_DVB_USB_DIGITV
diff --git a/baseconfig/CONFIG_DVB_USB_DTT200U b/configs/base-generic/CONFIG_DVB_USB_DTT200U
index a7759331a..a7759331a 100644
--- a/baseconfig/CONFIG_DVB_USB_DTT200U
+++ b/configs/base-generic/CONFIG_DVB_USB_DTT200U
diff --git a/baseconfig/CONFIG_DVB_USB_DTV5100 b/configs/base-generic/CONFIG_DVB_USB_DTV5100
index cc3c2dd76..cc3c2dd76 100644
--- a/baseconfig/CONFIG_DVB_USB_DTV5100
+++ b/configs/base-generic/CONFIG_DVB_USB_DTV5100
diff --git a/baseconfig/CONFIG_DVB_USB_DVBSKY b/configs/base-generic/CONFIG_DVB_USB_DVBSKY
index 433c9612c..433c9612c 100644
--- a/baseconfig/CONFIG_DVB_USB_DVBSKY
+++ b/configs/base-generic/CONFIG_DVB_USB_DVBSKY
diff --git a/baseconfig/CONFIG_DVB_USB_DW2102 b/configs/base-generic/CONFIG_DVB_USB_DW2102
index 7a0fe51cb..7a0fe51cb 100644
--- a/baseconfig/CONFIG_DVB_USB_DW2102
+++ b/configs/base-generic/CONFIG_DVB_USB_DW2102
diff --git a/baseconfig/CONFIG_DVB_USB_EC168 b/configs/base-generic/CONFIG_DVB_USB_EC168
index 48fe2ae30..48fe2ae30 100644
--- a/baseconfig/CONFIG_DVB_USB_EC168
+++ b/configs/base-generic/CONFIG_DVB_USB_EC168
diff --git a/baseconfig/CONFIG_DVB_USB_FRIIO b/configs/base-generic/CONFIG_DVB_USB_FRIIO
index 9ddbab267..9ddbab267 100644
--- a/baseconfig/CONFIG_DVB_USB_FRIIO
+++ b/configs/base-generic/CONFIG_DVB_USB_FRIIO
diff --git a/baseconfig/CONFIG_DVB_USB_GL861 b/configs/base-generic/CONFIG_DVB_USB_GL861
index 92563492a..92563492a 100644
--- a/baseconfig/CONFIG_DVB_USB_GL861
+++ b/configs/base-generic/CONFIG_DVB_USB_GL861
diff --git a/baseconfig/CONFIG_DVB_USB_GP8PSK b/configs/base-generic/CONFIG_DVB_USB_GP8PSK
index 684ecab5a..684ecab5a 100644
--- a/baseconfig/CONFIG_DVB_USB_GP8PSK
+++ b/configs/base-generic/CONFIG_DVB_USB_GP8PSK
diff --git a/baseconfig/CONFIG_DVB_USB_LME2510 b/configs/base-generic/CONFIG_DVB_USB_LME2510
index 9d34c4c96..9d34c4c96 100644
--- a/baseconfig/CONFIG_DVB_USB_LME2510
+++ b/configs/base-generic/CONFIG_DVB_USB_LME2510
diff --git a/baseconfig/CONFIG_DVB_USB_M920X b/configs/base-generic/CONFIG_DVB_USB_M920X
index 62fe215c6..62fe215c6 100644
--- a/baseconfig/CONFIG_DVB_USB_M920X
+++ b/configs/base-generic/CONFIG_DVB_USB_M920X
diff --git a/baseconfig/CONFIG_DVB_USB_MXL111SF b/configs/base-generic/CONFIG_DVB_USB_MXL111SF
index f4d051c07..f4d051c07 100644
--- a/baseconfig/CONFIG_DVB_USB_MXL111SF
+++ b/configs/base-generic/CONFIG_DVB_USB_MXL111SF
diff --git a/baseconfig/CONFIG_DVB_USB_NOVA_T_USB2 b/configs/base-generic/CONFIG_DVB_USB_NOVA_T_USB2
index 1903a7155..1903a7155 100644
--- a/baseconfig/CONFIG_DVB_USB_NOVA_T_USB2
+++ b/configs/base-generic/CONFIG_DVB_USB_NOVA_T_USB2
diff --git a/baseconfig/CONFIG_DVB_USB_OPERA1 b/configs/base-generic/CONFIG_DVB_USB_OPERA1
index 0b85b4136..0b85b4136 100644
--- a/baseconfig/CONFIG_DVB_USB_OPERA1
+++ b/configs/base-generic/CONFIG_DVB_USB_OPERA1
diff --git a/baseconfig/CONFIG_DVB_USB_PCTV452E b/configs/base-generic/CONFIG_DVB_USB_PCTV452E
index 06c9b91e2..06c9b91e2 100644
--- a/baseconfig/CONFIG_DVB_USB_PCTV452E
+++ b/configs/base-generic/CONFIG_DVB_USB_PCTV452E
diff --git a/baseconfig/CONFIG_DVB_USB_RTL28XXU b/configs/base-generic/CONFIG_DVB_USB_RTL28XXU
index 17eb626a5..17eb626a5 100644
--- a/baseconfig/CONFIG_DVB_USB_RTL28XXU
+++ b/configs/base-generic/CONFIG_DVB_USB_RTL28XXU
diff --git a/baseconfig/CONFIG_DVB_USB_TECHNISAT_USB2 b/configs/base-generic/CONFIG_DVB_USB_TECHNISAT_USB2
index 2f18c2aac..2f18c2aac 100644
--- a/baseconfig/CONFIG_DVB_USB_TECHNISAT_USB2
+++ b/configs/base-generic/CONFIG_DVB_USB_TECHNISAT_USB2
diff --git a/baseconfig/CONFIG_DVB_USB_TTUSB2 b/configs/base-generic/CONFIG_DVB_USB_TTUSB2
index 753386b4f..753386b4f 100644
--- a/baseconfig/CONFIG_DVB_USB_TTUSB2
+++ b/configs/base-generic/CONFIG_DVB_USB_TTUSB2
diff --git a/baseconfig/CONFIG_DVB_USB_UMT_010 b/configs/base-generic/CONFIG_DVB_USB_UMT_010
index 4502f2d21..4502f2d21 100644
--- a/baseconfig/CONFIG_DVB_USB_UMT_010
+++ b/configs/base-generic/CONFIG_DVB_USB_UMT_010
diff --git a/baseconfig/CONFIG_DVB_USB_V2 b/configs/base-generic/CONFIG_DVB_USB_V2
index c483f2db3..c483f2db3 100644
--- a/baseconfig/CONFIG_DVB_USB_V2
+++ b/configs/base-generic/CONFIG_DVB_USB_V2
diff --git a/baseconfig/CONFIG_DVB_USB_VP702X b/configs/base-generic/CONFIG_DVB_USB_VP702X
index d237ed6db..d237ed6db 100644
--- a/baseconfig/CONFIG_DVB_USB_VP702X
+++ b/configs/base-generic/CONFIG_DVB_USB_VP702X
diff --git a/baseconfig/CONFIG_DVB_USB_VP7045 b/configs/base-generic/CONFIG_DVB_USB_VP7045
index 79297f8f7..79297f8f7 100644
--- a/baseconfig/CONFIG_DVB_USB_VP7045
+++ b/configs/base-generic/CONFIG_DVB_USB_VP7045
diff --git a/baseconfig/CONFIG_DVB_USB_ZD1301 b/configs/base-generic/CONFIG_DVB_USB_ZD1301
index 4e114ce58..4e114ce58 100644
--- a/baseconfig/CONFIG_DVB_USB_ZD1301
+++ b/configs/base-generic/CONFIG_DVB_USB_ZD1301
diff --git a/baseconfig/CONFIG_DW_DMAC b/configs/base-generic/CONFIG_DW_DMAC
index 5c8179948..5c8179948 100644
--- a/baseconfig/CONFIG_DW_DMAC
+++ b/configs/base-generic/CONFIG_DW_DMAC
diff --git a/baseconfig/CONFIG_DW_DMAC_BIG_ENDIAN_IO b/configs/base-generic/CONFIG_DW_DMAC_BIG_ENDIAN_IO
index b0da61aa4..b0da61aa4 100644
--- a/baseconfig/CONFIG_DW_DMAC_BIG_ENDIAN_IO
+++ b/configs/base-generic/CONFIG_DW_DMAC_BIG_ENDIAN_IO
diff --git a/baseconfig/CONFIG_DW_DMAC_CORE b/configs/base-generic/CONFIG_DW_DMAC_CORE
index bac83695b..bac83695b 100644
--- a/baseconfig/CONFIG_DW_DMAC_CORE
+++ b/configs/base-generic/CONFIG_DW_DMAC_CORE
diff --git a/baseconfig/CONFIG_DW_DMAC_PCI b/configs/base-generic/CONFIG_DW_DMAC_PCI
index c8fcf1485..c8fcf1485 100644
--- a/baseconfig/CONFIG_DW_DMAC_PCI
+++ b/configs/base-generic/CONFIG_DW_DMAC_PCI
diff --git a/baseconfig/CONFIG_DW_WATCHDOG b/configs/base-generic/CONFIG_DW_WATCHDOG
index e4db55403..e4db55403 100644
--- a/baseconfig/CONFIG_DW_WATCHDOG
+++ b/configs/base-generic/CONFIG_DW_WATCHDOG
diff --git a/baseconfig/CONFIG_DYNAMIC_DEBUG b/configs/base-generic/CONFIG_DYNAMIC_DEBUG
index 5698f5ebf..5698f5ebf 100644
--- a/baseconfig/CONFIG_DYNAMIC_DEBUG
+++ b/configs/base-generic/CONFIG_DYNAMIC_DEBUG
diff --git a/baseconfig/CONFIG_DYNAMIC_FTRACE b/configs/base-generic/CONFIG_DYNAMIC_FTRACE
index 21f2bdd48..21f2bdd48 100644
--- a/baseconfig/CONFIG_DYNAMIC_FTRACE
+++ b/configs/base-generic/CONFIG_DYNAMIC_FTRACE
diff --git a/baseconfig/CONFIG_E100 b/configs/base-generic/CONFIG_E100
index 676b90991..676b90991 100644
--- a/baseconfig/CONFIG_E100
+++ b/configs/base-generic/CONFIG_E100
diff --git a/baseconfig/CONFIG_E1000 b/configs/base-generic/CONFIG_E1000
index 7aebd6baf..7aebd6baf 100644
--- a/baseconfig/CONFIG_E1000
+++ b/configs/base-generic/CONFIG_E1000
diff --git a/baseconfig/CONFIG_E1000E b/configs/base-generic/CONFIG_E1000E
index 5c5726365..5c5726365 100644
--- a/baseconfig/CONFIG_E1000E
+++ b/configs/base-generic/CONFIG_E1000E
diff --git a/baseconfig/CONFIG_EARLY_PRINTK_DBGP b/configs/base-generic/CONFIG_EARLY_PRINTK_DBGP
index b8016d0cb..b8016d0cb 100644
--- a/baseconfig/CONFIG_EARLY_PRINTK_DBGP
+++ b/configs/base-generic/CONFIG_EARLY_PRINTK_DBGP
diff --git a/baseconfig/CONFIG_EARLY_PRINTK_USB_XDBC b/configs/base-generic/CONFIG_EARLY_PRINTK_USB_XDBC
index 47e8f4090..47e8f4090 100644
--- a/baseconfig/CONFIG_EARLY_PRINTK_USB_XDBC
+++ b/configs/base-generic/CONFIG_EARLY_PRINTK_USB_XDBC
diff --git a/baseconfig/CONFIG_EBC_C384_WDT b/configs/base-generic/CONFIG_EBC_C384_WDT
index 262928b23..262928b23 100644
--- a/baseconfig/CONFIG_EBC_C384_WDT
+++ b/configs/base-generic/CONFIG_EBC_C384_WDT
diff --git a/baseconfig/CONFIG_ECHO b/configs/base-generic/CONFIG_ECHO
index e117a59d1..e117a59d1 100644
--- a/baseconfig/CONFIG_ECHO
+++ b/configs/base-generic/CONFIG_ECHO
diff --git a/baseconfig/CONFIG_ECRYPT_FS b/configs/base-generic/CONFIG_ECRYPT_FS
index 43b8b0f77..43b8b0f77 100644
--- a/baseconfig/CONFIG_ECRYPT_FS
+++ b/configs/base-generic/CONFIG_ECRYPT_FS
diff --git a/baseconfig/CONFIG_ECRYPT_FS_MESSAGING b/configs/base-generic/CONFIG_ECRYPT_FS_MESSAGING
index 700eae5cb..700eae5cb 100644
--- a/baseconfig/CONFIG_ECRYPT_FS_MESSAGING
+++ b/configs/base-generic/CONFIG_ECRYPT_FS_MESSAGING
diff --git a/baseconfig/CONFIG_EDAC b/configs/base-generic/CONFIG_EDAC
index dcb32adb9..dcb32adb9 100644
--- a/baseconfig/CONFIG_EDAC
+++ b/configs/base-generic/CONFIG_EDAC
diff --git a/baseconfig/CONFIG_EDAC_DEBUG b/configs/base-generic/CONFIG_EDAC_DEBUG
index 78248bea8..78248bea8 100644
--- a/baseconfig/CONFIG_EDAC_DEBUG
+++ b/configs/base-generic/CONFIG_EDAC_DEBUG
diff --git a/baseconfig/CONFIG_EDAC_GHES b/configs/base-generic/CONFIG_EDAC_GHES
index e68c7c4c2..e68c7c4c2 100644
--- a/baseconfig/CONFIG_EDAC_GHES
+++ b/configs/base-generic/CONFIG_EDAC_GHES
diff --git a/baseconfig/CONFIG_EDAC_LEGACY_SYSFS b/configs/base-generic/CONFIG_EDAC_LEGACY_SYSFS
index 5d389a274..5d389a274 100644
--- a/baseconfig/CONFIG_EDAC_LEGACY_SYSFS
+++ b/configs/base-generic/CONFIG_EDAC_LEGACY_SYSFS
diff --git a/baseconfig/CONFIG_EEPROM_93CX6 b/configs/base-generic/CONFIG_EEPROM_93CX6
index 9e93b9eb0..9e93b9eb0 100644
--- a/baseconfig/CONFIG_EEPROM_93CX6
+++ b/configs/base-generic/CONFIG_EEPROM_93CX6
diff --git a/baseconfig/CONFIG_EEPROM_93XX46 b/configs/base-generic/CONFIG_EEPROM_93XX46
index 483f0eb88..483f0eb88 100644
--- a/baseconfig/CONFIG_EEPROM_93XX46
+++ b/configs/base-generic/CONFIG_EEPROM_93XX46
diff --git a/baseconfig/CONFIG_EEPROM_AT24 b/configs/base-generic/CONFIG_EEPROM_AT24
index cafb092af..cafb092af 100644
--- a/baseconfig/CONFIG_EEPROM_AT24
+++ b/configs/base-generic/CONFIG_EEPROM_AT24
diff --git a/baseconfig/CONFIG_EEPROM_AT25 b/configs/base-generic/CONFIG_EEPROM_AT25
index 5fe1f07de..5fe1f07de 100644
--- a/baseconfig/CONFIG_EEPROM_AT25
+++ b/configs/base-generic/CONFIG_EEPROM_AT25
diff --git a/baseconfig/CONFIG_EEPROM_IDT_89HPESX b/configs/base-generic/CONFIG_EEPROM_IDT_89HPESX
index 5ea592932..5ea592932 100644
--- a/baseconfig/CONFIG_EEPROM_IDT_89HPESX
+++ b/configs/base-generic/CONFIG_EEPROM_IDT_89HPESX
diff --git a/baseconfig/CONFIG_EEPROM_LEGACY b/configs/base-generic/CONFIG_EEPROM_LEGACY
index c53217d4d..c53217d4d 100644
--- a/baseconfig/CONFIG_EEPROM_LEGACY
+++ b/configs/base-generic/CONFIG_EEPROM_LEGACY
diff --git a/baseconfig/CONFIG_EEPROM_MAX6875 b/configs/base-generic/CONFIG_EEPROM_MAX6875
index 9fc04b971..9fc04b971 100644
--- a/baseconfig/CONFIG_EEPROM_MAX6875
+++ b/configs/base-generic/CONFIG_EEPROM_MAX6875
diff --git a/baseconfig/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT b/configs/base-generic/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
index 652a5bca1..652a5bca1 100644
--- a/baseconfig/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
+++ b/configs/base-generic/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
diff --git a/baseconfig/CONFIG_EFI_PARTITION b/configs/base-generic/CONFIG_EFI_PARTITION
index a7a899356..a7a899356 100644
--- a/baseconfig/CONFIG_EFI_PARTITION
+++ b/configs/base-generic/CONFIG_EFI_PARTITION
diff --git a/baseconfig/CONFIG_EFI_PGT_DUMP b/configs/base-generic/CONFIG_EFI_PGT_DUMP
index c7e9f9f08..c7e9f9f08 100644
--- a/baseconfig/CONFIG_EFI_PGT_DUMP
+++ b/configs/base-generic/CONFIG_EFI_PGT_DUMP
diff --git a/baseconfig/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN b/configs/base-generic/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
index 5d8c2fb51..5d8c2fb51 100644
--- a/baseconfig/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
+++ b/configs/base-generic/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
diff --git a/baseconfig/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/base-generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
index 4c9e08c11..4c9e08c11 100644
--- a/baseconfig/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ b/configs/base-generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
diff --git a/baseconfig/CONFIG_EFI_TEST b/configs/base-generic/CONFIG_EFI_TEST
index 455eb3061..455eb3061 100644
--- a/baseconfig/CONFIG_EFI_TEST
+++ b/configs/base-generic/CONFIG_EFI_TEST
diff --git a/baseconfig/CONFIG_EFS_FS b/configs/base-generic/CONFIG_EFS_FS
index 8b1f1cbec..8b1f1cbec 100644
--- a/baseconfig/CONFIG_EFS_FS
+++ b/configs/base-generic/CONFIG_EFS_FS
diff --git a/baseconfig/CONFIG_EMBEDDED b/configs/base-generic/CONFIG_EMBEDDED
index af252a01d..af252a01d 100644
--- a/baseconfig/CONFIG_EMBEDDED
+++ b/configs/base-generic/CONFIG_EMBEDDED
diff --git a/baseconfig/CONFIG_ENABLE_MUST_CHECK b/configs/base-generic/CONFIG_ENABLE_MUST_CHECK
index 87b800646..87b800646 100644
--- a/baseconfig/CONFIG_ENABLE_MUST_CHECK
+++ b/configs/base-generic/CONFIG_ENABLE_MUST_CHECK
diff --git a/baseconfig/CONFIG_ENABLE_WARN_DEPRECATED b/configs/base-generic/CONFIG_ENABLE_WARN_DEPRECATED
index b128e07db..b128e07db 100644
--- a/baseconfig/CONFIG_ENABLE_WARN_DEPRECATED
+++ b/configs/base-generic/CONFIG_ENABLE_WARN_DEPRECATED
diff --git a/baseconfig/CONFIG_ENC28J60 b/configs/base-generic/CONFIG_ENC28J60
index 5b66a8980..5b66a8980 100644
--- a/baseconfig/CONFIG_ENC28J60
+++ b/configs/base-generic/CONFIG_ENC28J60
diff --git a/baseconfig/CONFIG_ENCLOSURE_SERVICES b/configs/base-generic/CONFIG_ENCLOSURE_SERVICES
index 040c8ef00..040c8ef00 100644
--- a/baseconfig/CONFIG_ENCLOSURE_SERVICES
+++ b/configs/base-generic/CONFIG_ENCLOSURE_SERVICES
diff --git a/baseconfig/CONFIG_ENCRYPTED_KEYS b/configs/base-generic/CONFIG_ENCRYPTED_KEYS
index 09d264daf..09d264daf 100644
--- a/baseconfig/CONFIG_ENCRYPTED_KEYS
+++ b/configs/base-generic/CONFIG_ENCRYPTED_KEYS
diff --git a/baseconfig/CONFIG_ENIC b/configs/base-generic/CONFIG_ENIC
index 5c206ee50..5c206ee50 100644
--- a/baseconfig/CONFIG_ENIC
+++ b/configs/base-generic/CONFIG_ENIC
diff --git a/baseconfig/CONFIG_ENVELOPE_DETECTOR b/configs/base-generic/CONFIG_ENVELOPE_DETECTOR
index 9e523aaef..9e523aaef 100644
--- a/baseconfig/CONFIG_ENVELOPE_DETECTOR
+++ b/configs/base-generic/CONFIG_ENVELOPE_DETECTOR
diff --git a/baseconfig/CONFIG_EPIC100 b/configs/base-generic/CONFIG_EPIC100
index ef922fca0..ef922fca0 100644
--- a/baseconfig/CONFIG_EPIC100
+++ b/configs/base-generic/CONFIG_EPIC100
diff --git a/baseconfig/CONFIG_EPOLL b/configs/base-generic/CONFIG_EPOLL
index eb0dd3c21..eb0dd3c21 100644
--- a/baseconfig/CONFIG_EPOLL
+++ b/configs/base-generic/CONFIG_EPOLL
diff --git a/baseconfig/CONFIG_EQUALIZER b/configs/base-generic/CONFIG_EQUALIZER
index c80b1354b..c80b1354b 100644
--- a/baseconfig/CONFIG_EQUALIZER
+++ b/configs/base-generic/CONFIG_EQUALIZER
diff --git a/baseconfig/CONFIG_ESI_DONGLE b/configs/base-generic/CONFIG_ESI_DONGLE
index 08f59c82e..08f59c82e 100644
--- a/baseconfig/CONFIG_ESI_DONGLE
+++ b/configs/base-generic/CONFIG_ESI_DONGLE
diff --git a/baseconfig/CONFIG_ET131X b/configs/base-generic/CONFIG_ET131X
index c7cb921a3..c7cb921a3 100644
--- a/baseconfig/CONFIG_ET131X
+++ b/configs/base-generic/CONFIG_ET131X
diff --git a/baseconfig/CONFIG_ETHERNET b/configs/base-generic/CONFIG_ETHERNET
index 62a7778f1..62a7778f1 100644
--- a/baseconfig/CONFIG_ETHERNET
+++ b/configs/base-generic/CONFIG_ETHERNET
diff --git a/baseconfig/CONFIG_ETHOC b/configs/base-generic/CONFIG_ETHOC
index e78d27772..e78d27772 100644
--- a/baseconfig/CONFIG_ETHOC
+++ b/configs/base-generic/CONFIG_ETHOC
diff --git a/baseconfig/CONFIG_EUROTECH_WDT b/configs/base-generic/CONFIG_EUROTECH_WDT
index 08f35862f..08f35862f 100644
--- a/baseconfig/CONFIG_EUROTECH_WDT
+++ b/configs/base-generic/CONFIG_EUROTECH_WDT
diff --git a/baseconfig/CONFIG_EVM b/configs/base-generic/CONFIG_EVM
index c9e172e39..c9e172e39 100644
--- a/baseconfig/CONFIG_EVM
+++ b/configs/base-generic/CONFIG_EVM
diff --git a/baseconfig/CONFIG_EXOFS_DEBUG b/configs/base-generic/CONFIG_EXOFS_DEBUG
index 200708ab6..200708ab6 100644
--- a/baseconfig/CONFIG_EXOFS_DEBUG
+++ b/configs/base-generic/CONFIG_EXOFS_DEBUG
diff --git a/baseconfig/CONFIG_EXOFS_FS b/configs/base-generic/CONFIG_EXOFS_FS
index 46dfd9d1c..46dfd9d1c 100644
--- a/baseconfig/CONFIG_EXOFS_FS
+++ b/configs/base-generic/CONFIG_EXOFS_FS
diff --git a/baseconfig/CONFIG_EXPERT b/configs/base-generic/CONFIG_EXPERT
index 6643b3280..6643b3280 100644
--- a/baseconfig/CONFIG_EXPERT
+++ b/configs/base-generic/CONFIG_EXPERT
diff --git a/baseconfig/CONFIG_EXPORTFS b/configs/base-generic/CONFIG_EXPORTFS
index 21b4cdeba..21b4cdeba 100644
--- a/baseconfig/CONFIG_EXPORTFS
+++ b/configs/base-generic/CONFIG_EXPORTFS
diff --git a/baseconfig/CONFIG_EXT2_FS b/configs/base-generic/CONFIG_EXT2_FS
index 95332e711..95332e711 100644
--- a/baseconfig/CONFIG_EXT2_FS
+++ b/configs/base-generic/CONFIG_EXT2_FS
diff --git a/baseconfig/CONFIG_EXT3_FS b/configs/base-generic/CONFIG_EXT3_FS
index eb9a201e4..eb9a201e4 100644
--- a/baseconfig/CONFIG_EXT3_FS
+++ b/configs/base-generic/CONFIG_EXT3_FS
diff --git a/baseconfig/CONFIG_EXT4_DEBUG b/configs/base-generic/CONFIG_EXT4_DEBUG
index cade17e50..cade17e50 100644
--- a/baseconfig/CONFIG_EXT4_DEBUG
+++ b/configs/base-generic/CONFIG_EXT4_DEBUG
diff --git a/baseconfig/CONFIG_EXT4_ENCRYPTION b/configs/base-generic/CONFIG_EXT4_ENCRYPTION
index 2758bcf0b..2758bcf0b 100644
--- a/baseconfig/CONFIG_EXT4_ENCRYPTION
+++ b/configs/base-generic/CONFIG_EXT4_ENCRYPTION
diff --git a/baseconfig/CONFIG_EXT4_FS b/configs/base-generic/CONFIG_EXT4_FS
index 7f2f33f27..7f2f33f27 100644
--- a/baseconfig/CONFIG_EXT4_FS
+++ b/configs/base-generic/CONFIG_EXT4_FS
diff --git a/baseconfig/CONFIG_EXT4_FS_POSIX_ACL b/configs/base-generic/CONFIG_EXT4_FS_POSIX_ACL
index 5dd650fde..5dd650fde 100644
--- a/baseconfig/CONFIG_EXT4_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_EXT4_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_EXT4_FS_SECURITY b/configs/base-generic/CONFIG_EXT4_FS_SECURITY
index 6603fbbd6..6603fbbd6 100644
--- a/baseconfig/CONFIG_EXT4_FS_SECURITY
+++ b/configs/base-generic/CONFIG_EXT4_FS_SECURITY
diff --git a/baseconfig/CONFIG_EXT4_USE_FOR_EXT2 b/configs/base-generic/CONFIG_EXT4_USE_FOR_EXT2
index 05d6610ff..05d6610ff 100644
--- a/baseconfig/CONFIG_EXT4_USE_FOR_EXT2
+++ b/configs/base-generic/CONFIG_EXT4_USE_FOR_EXT2
diff --git a/baseconfig/CONFIG_EXTCON b/configs/base-generic/CONFIG_EXTCON
index bde29bcfc..bde29bcfc 100644
--- a/baseconfig/CONFIG_EXTCON
+++ b/configs/base-generic/CONFIG_EXTCON
diff --git a/baseconfig/CONFIG_EXTCON_ADC_JACK b/configs/base-generic/CONFIG_EXTCON_ADC_JACK
index ace919542..ace919542 100644
--- a/baseconfig/CONFIG_EXTCON_ADC_JACK
+++ b/configs/base-generic/CONFIG_EXTCON_ADC_JACK
diff --git a/baseconfig/CONFIG_EXTCON_GPIO b/configs/base-generic/CONFIG_EXTCON_GPIO
index 87ca2bd05..87ca2bd05 100644
--- a/baseconfig/CONFIG_EXTCON_GPIO
+++ b/configs/base-generic/CONFIG_EXTCON_GPIO
diff --git a/baseconfig/CONFIG_EXTCON_MAX3355 b/configs/base-generic/CONFIG_EXTCON_MAX3355
index 680b5a774..680b5a774 100644
--- a/baseconfig/CONFIG_EXTCON_MAX3355
+++ b/configs/base-generic/CONFIG_EXTCON_MAX3355
diff --git a/baseconfig/CONFIG_EXTCON_QCOM_SPMI_MISC b/configs/base-generic/CONFIG_EXTCON_QCOM_SPMI_MISC
index 5f2508da3..5f2508da3 100644
--- a/baseconfig/CONFIG_EXTCON_QCOM_SPMI_MISC
+++ b/configs/base-generic/CONFIG_EXTCON_QCOM_SPMI_MISC
diff --git a/baseconfig/CONFIG_EXTCON_RT8973A b/configs/base-generic/CONFIG_EXTCON_RT8973A
index e5f7236c9..e5f7236c9 100644
--- a/baseconfig/CONFIG_EXTCON_RT8973A
+++ b/configs/base-generic/CONFIG_EXTCON_RT8973A
diff --git a/baseconfig/CONFIG_EXTCON_SM5502 b/configs/base-generic/CONFIG_EXTCON_SM5502
index 916994aa9..916994aa9 100644
--- a/baseconfig/CONFIG_EXTCON_SM5502
+++ b/configs/base-generic/CONFIG_EXTCON_SM5502
diff --git a/baseconfig/CONFIG_EXTCON_USB_GPIO b/configs/base-generic/CONFIG_EXTCON_USB_GPIO
index 7a0c9af30..7a0c9af30 100644
--- a/baseconfig/CONFIG_EXTCON_USB_GPIO
+++ b/configs/base-generic/CONFIG_EXTCON_USB_GPIO
diff --git a/baseconfig/CONFIG_EXTRA_FIRMWARE b/configs/base-generic/CONFIG_EXTRA_FIRMWARE
index 46a0a270c..46a0a270c 100644
--- a/baseconfig/CONFIG_EXTRA_FIRMWARE
+++ b/configs/base-generic/CONFIG_EXTRA_FIRMWARE
diff --git a/baseconfig/CONFIG_EZNPS_GIC b/configs/base-generic/CONFIG_EZNPS_GIC
index 9644d2bcc..9644d2bcc 100644
--- a/baseconfig/CONFIG_EZNPS_GIC
+++ b/configs/base-generic/CONFIG_EZNPS_GIC
diff --git a/baseconfig/CONFIG_EZX_PCAP b/configs/base-generic/CONFIG_EZX_PCAP
index f4ac470bd..f4ac470bd 100644
--- a/baseconfig/CONFIG_EZX_PCAP
+++ b/configs/base-generic/CONFIG_EZX_PCAP
diff --git a/baseconfig/CONFIG_F2FS_CHECK_FS b/configs/base-generic/CONFIG_F2FS_CHECK_FS
index 050067441..050067441 100644
--- a/baseconfig/CONFIG_F2FS_CHECK_FS
+++ b/configs/base-generic/CONFIG_F2FS_CHECK_FS
diff --git a/baseconfig/CONFIG_F2FS_FAULT_INJECTION b/configs/base-generic/CONFIG_F2FS_FAULT_INJECTION
index f37ff52d1..f37ff52d1 100644
--- a/baseconfig/CONFIG_F2FS_FAULT_INJECTION
+++ b/configs/base-generic/CONFIG_F2FS_FAULT_INJECTION
diff --git a/baseconfig/CONFIG_F2FS_FS b/configs/base-generic/CONFIG_F2FS_FS
index fed4055eb..fed4055eb 100644
--- a/baseconfig/CONFIG_F2FS_FS
+++ b/configs/base-generic/CONFIG_F2FS_FS
diff --git a/baseconfig/CONFIG_F2FS_FS_ENCRYPTION b/configs/base-generic/CONFIG_F2FS_FS_ENCRYPTION
index 9be753d68..9be753d68 100644
--- a/baseconfig/CONFIG_F2FS_FS_ENCRYPTION
+++ b/configs/base-generic/CONFIG_F2FS_FS_ENCRYPTION
diff --git a/baseconfig/CONFIG_F2FS_FS_POSIX_ACL b/configs/base-generic/CONFIG_F2FS_FS_POSIX_ACL
index 63c03618b..63c03618b 100644
--- a/baseconfig/CONFIG_F2FS_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_F2FS_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_F2FS_FS_SECURITY b/configs/base-generic/CONFIG_F2FS_FS_SECURITY
index 47dd1f319..47dd1f319 100644
--- a/baseconfig/CONFIG_F2FS_FS_SECURITY
+++ b/configs/base-generic/CONFIG_F2FS_FS_SECURITY
diff --git a/baseconfig/CONFIG_F2FS_FS_XATTR b/configs/base-generic/CONFIG_F2FS_FS_XATTR
index 9a90791e8..9a90791e8 100644
--- a/baseconfig/CONFIG_F2FS_FS_XATTR
+++ b/configs/base-generic/CONFIG_F2FS_FS_XATTR
diff --git a/baseconfig/CONFIG_F2FS_IO_TRACE b/configs/base-generic/CONFIG_F2FS_IO_TRACE
index 12130542a..12130542a 100644
--- a/baseconfig/CONFIG_F2FS_IO_TRACE
+++ b/configs/base-generic/CONFIG_F2FS_IO_TRACE
diff --git a/baseconfig/CONFIG_F2FS_STAT_FS b/configs/base-generic/CONFIG_F2FS_STAT_FS
index 0af12d46d..0af12d46d 100644
--- a/baseconfig/CONFIG_F2FS_STAT_FS
+++ b/configs/base-generic/CONFIG_F2FS_STAT_FS
diff --git a/baseconfig/CONFIG_FAIL_FUTEX b/configs/base-generic/CONFIG_FAIL_FUTEX
index 4df2a53d0..4df2a53d0 100644
--- a/baseconfig/CONFIG_FAIL_FUTEX
+++ b/configs/base-generic/CONFIG_FAIL_FUTEX
diff --git a/baseconfig/CONFIG_FAIR_GROUP_SCHED b/configs/base-generic/CONFIG_FAIR_GROUP_SCHED
index 7c73cd02e..7c73cd02e 100644
--- a/baseconfig/CONFIG_FAIR_GROUP_SCHED
+++ b/configs/base-generic/CONFIG_FAIR_GROUP_SCHED
diff --git a/baseconfig/CONFIG_FANOTIFY b/configs/base-generic/CONFIG_FANOTIFY
index 03964624f..03964624f 100644
--- a/baseconfig/CONFIG_FANOTIFY
+++ b/configs/base-generic/CONFIG_FANOTIFY
diff --git a/baseconfig/CONFIG_FANOTIFY_ACCESS_PERMISSIONS b/configs/base-generic/CONFIG_FANOTIFY_ACCESS_PERMISSIONS
index 197a02ec7..197a02ec7 100644
--- a/baseconfig/CONFIG_FANOTIFY_ACCESS_PERMISSIONS
+++ b/configs/base-generic/CONFIG_FANOTIFY_ACCESS_PERMISSIONS
diff --git a/baseconfig/CONFIG_FAT_DEFAULT_CODEPAGE b/configs/base-generic/CONFIG_FAT_DEFAULT_CODEPAGE
index 280e26edb..280e26edb 100644
--- a/baseconfig/CONFIG_FAT_DEFAULT_CODEPAGE
+++ b/configs/base-generic/CONFIG_FAT_DEFAULT_CODEPAGE
diff --git a/baseconfig/CONFIG_FAT_DEFAULT_IOCHARSET b/configs/base-generic/CONFIG_FAT_DEFAULT_IOCHARSET
index f4e49e2a3..f4e49e2a3 100644
--- a/baseconfig/CONFIG_FAT_DEFAULT_IOCHARSET
+++ b/configs/base-generic/CONFIG_FAT_DEFAULT_IOCHARSET
diff --git a/baseconfig/CONFIG_FAT_DEFAULT_UTF8 b/configs/base-generic/CONFIG_FAT_DEFAULT_UTF8
index ee85a55f0..ee85a55f0 100644
--- a/baseconfig/CONFIG_FAT_DEFAULT_UTF8
+++ b/configs/base-generic/CONFIG_FAT_DEFAULT_UTF8
diff --git a/baseconfig/CONFIG_FAT_FS b/configs/base-generic/CONFIG_FAT_FS
index bb11abcfa..bb11abcfa 100644
--- a/baseconfig/CONFIG_FAT_FS
+++ b/configs/base-generic/CONFIG_FAT_FS
diff --git a/baseconfig/CONFIG_FAULT_INJECTION b/configs/base-generic/CONFIG_FAULT_INJECTION
index 288866e72..288866e72 100644
--- a/baseconfig/CONFIG_FAULT_INJECTION
+++ b/configs/base-generic/CONFIG_FAULT_INJECTION
diff --git a/baseconfig/CONFIG_FB b/configs/base-generic/CONFIG_FB
index 7adf7d497..7adf7d497 100644
--- a/baseconfig/CONFIG_FB
+++ b/configs/base-generic/CONFIG_FB
diff --git a/baseconfig/CONFIG_FB_3DFX b/configs/base-generic/CONFIG_FB_3DFX
index 63214cf1b..63214cf1b 100644
--- a/baseconfig/CONFIG_FB_3DFX
+++ b/configs/base-generic/CONFIG_FB_3DFX
diff --git a/baseconfig/CONFIG_FB_ARK b/configs/base-generic/CONFIG_FB_ARK
index 3ed9dfc30..3ed9dfc30 100644
--- a/baseconfig/CONFIG_FB_ARK
+++ b/configs/base-generic/CONFIG_FB_ARK
diff --git a/baseconfig/CONFIG_FB_ASILIANT b/configs/base-generic/CONFIG_FB_ASILIANT
index 34148fdc4..34148fdc4 100644
--- a/baseconfig/CONFIG_FB_ASILIANT
+++ b/configs/base-generic/CONFIG_FB_ASILIANT
diff --git a/baseconfig/CONFIG_FB_ATY b/configs/base-generic/CONFIG_FB_ATY
index cae8eee36..cae8eee36 100644
--- a/baseconfig/CONFIG_FB_ATY
+++ b/configs/base-generic/CONFIG_FB_ATY
diff --git a/baseconfig/CONFIG_FB_ATY128 b/configs/base-generic/CONFIG_FB_ATY128
index da6946555..da6946555 100644
--- a/baseconfig/CONFIG_FB_ATY128
+++ b/configs/base-generic/CONFIG_FB_ATY128
diff --git a/baseconfig/CONFIG_FB_ATY128_BACKLIGHT b/configs/base-generic/CONFIG_FB_ATY128_BACKLIGHT
index 6644d7180..6644d7180 100644
--- a/baseconfig/CONFIG_FB_ATY128_BACKLIGHT
+++ b/configs/base-generic/CONFIG_FB_ATY128_BACKLIGHT
diff --git a/baseconfig/CONFIG_FB_ATY_BACKLIGHT b/configs/base-generic/CONFIG_FB_ATY_BACKLIGHT
index f05623ac1..f05623ac1 100644
--- a/baseconfig/CONFIG_FB_ATY_BACKLIGHT
+++ b/configs/base-generic/CONFIG_FB_ATY_BACKLIGHT
diff --git a/baseconfig/CONFIG_FB_ATY_CT b/configs/base-generic/CONFIG_FB_ATY_CT
index b5a2fe4a0..b5a2fe4a0 100644
--- a/baseconfig/CONFIG_FB_ATY_CT
+++ b/configs/base-generic/CONFIG_FB_ATY_CT
diff --git a/baseconfig/CONFIG_FB_ATY_GX b/configs/base-generic/CONFIG_FB_ATY_GX
index c79359bf2..c79359bf2 100644
--- a/baseconfig/CONFIG_FB_ATY_GX
+++ b/configs/base-generic/CONFIG_FB_ATY_GX
diff --git a/baseconfig/CONFIG_FB_AUO_K190X b/configs/base-generic/CONFIG_FB_AUO_K190X
index 723baacfe..723baacfe 100644
--- a/baseconfig/CONFIG_FB_AUO_K190X
+++ b/configs/base-generic/CONFIG_FB_AUO_K190X
diff --git a/baseconfig/CONFIG_FB_BROADSHEET b/configs/base-generic/CONFIG_FB_BROADSHEET
index 5610ad9f7..5610ad9f7 100644
--- a/baseconfig/CONFIG_FB_BROADSHEET
+++ b/configs/base-generic/CONFIG_FB_BROADSHEET
diff --git a/baseconfig/CONFIG_FB_CARMINE b/configs/base-generic/CONFIG_FB_CARMINE
index 4710f2f33..4710f2f33 100644
--- a/baseconfig/CONFIG_FB_CARMINE
+++ b/configs/base-generic/CONFIG_FB_CARMINE
diff --git a/baseconfig/CONFIG_FB_CIRRUS b/configs/base-generic/CONFIG_FB_CIRRUS
index e4a9f519a..e4a9f519a 100644
--- a/baseconfig/CONFIG_FB_CIRRUS
+++ b/configs/base-generic/CONFIG_FB_CIRRUS
diff --git a/baseconfig/CONFIG_FB_CYBER2000 b/configs/base-generic/CONFIG_FB_CYBER2000
index 27a73fa27..27a73fa27 100644
--- a/baseconfig/CONFIG_FB_CYBER2000
+++ b/configs/base-generic/CONFIG_FB_CYBER2000
diff --git a/baseconfig/CONFIG_FB_EFI b/configs/base-generic/CONFIG_FB_EFI
index 62adf192c..62adf192c 100644
--- a/baseconfig/CONFIG_FB_EFI
+++ b/configs/base-generic/CONFIG_FB_EFI
diff --git a/baseconfig/CONFIG_FB_FOREIGN_ENDIAN b/configs/base-generic/CONFIG_FB_FOREIGN_ENDIAN
index 583ddc4f9..583ddc4f9 100644
--- a/baseconfig/CONFIG_FB_FOREIGN_ENDIAN
+++ b/configs/base-generic/CONFIG_FB_FOREIGN_ENDIAN
diff --git a/baseconfig/CONFIG_FB_HECUBA b/configs/base-generic/CONFIG_FB_HECUBA
index fbcf20a92..fbcf20a92 100644
--- a/baseconfig/CONFIG_FB_HECUBA
+++ b/configs/base-generic/CONFIG_FB_HECUBA
diff --git a/baseconfig/CONFIG_FB_I740 b/configs/base-generic/CONFIG_FB_I740
index 4a3cb7ceb..4a3cb7ceb 100644
--- a/baseconfig/CONFIG_FB_I740
+++ b/configs/base-generic/CONFIG_FB_I740
diff --git a/baseconfig/CONFIG_FB_IBM_GXT4500 b/configs/base-generic/CONFIG_FB_IBM_GXT4500
index 628c9a85e..628c9a85e 100644
--- a/baseconfig/CONFIG_FB_IBM_GXT4500
+++ b/configs/base-generic/CONFIG_FB_IBM_GXT4500
diff --git a/baseconfig/CONFIG_FB_IMSTT b/configs/base-generic/CONFIG_FB_IMSTT
index 4ca1a915d..4ca1a915d 100644
--- a/baseconfig/CONFIG_FB_IMSTT
+++ b/configs/base-generic/CONFIG_FB_IMSTT
diff --git a/baseconfig/CONFIG_FB_KYRO b/configs/base-generic/CONFIG_FB_KYRO
index 812aad0b8..812aad0b8 100644
--- a/baseconfig/CONFIG_FB_KYRO
+++ b/configs/base-generic/CONFIG_FB_KYRO
diff --git a/baseconfig/CONFIG_FB_MATROX b/configs/base-generic/CONFIG_FB_MATROX
index ff6a83e39..ff6a83e39 100644
--- a/baseconfig/CONFIG_FB_MATROX
+++ b/configs/base-generic/CONFIG_FB_MATROX
diff --git a/baseconfig/CONFIG_FB_MATROX_G b/configs/base-generic/CONFIG_FB_MATROX_G
index 2b7716dd6..2b7716dd6 100644
--- a/baseconfig/CONFIG_FB_MATROX_G
+++ b/configs/base-generic/CONFIG_FB_MATROX_G
diff --git a/baseconfig/CONFIG_FB_MATROX_I2C b/configs/base-generic/CONFIG_FB_MATROX_I2C
index 62c353859..62c353859 100644
--- a/baseconfig/CONFIG_FB_MATROX_I2C
+++ b/configs/base-generic/CONFIG_FB_MATROX_I2C
diff --git a/baseconfig/CONFIG_FB_MATROX_MILLENIUM b/configs/base-generic/CONFIG_FB_MATROX_MILLENIUM
index 3162457bd..3162457bd 100644
--- a/baseconfig/CONFIG_FB_MATROX_MILLENIUM
+++ b/configs/base-generic/CONFIG_FB_MATROX_MILLENIUM
diff --git a/baseconfig/CONFIG_FB_MATROX_MYSTIQUE b/configs/base-generic/CONFIG_FB_MATROX_MYSTIQUE
index 29e19a880..29e19a880 100644
--- a/baseconfig/CONFIG_FB_MATROX_MYSTIQUE
+++ b/configs/base-generic/CONFIG_FB_MATROX_MYSTIQUE
diff --git a/baseconfig/CONFIG_FB_MB862XX b/configs/base-generic/CONFIG_FB_MB862XX
index b2ea119f3..b2ea119f3 100644
--- a/baseconfig/CONFIG_FB_MB862XX
+++ b/configs/base-generic/CONFIG_FB_MB862XX
diff --git a/baseconfig/CONFIG_FB_METRONOME b/configs/base-generic/CONFIG_FB_METRONOME
index 7eb7b58ca..7eb7b58ca 100644
--- a/baseconfig/CONFIG_FB_METRONOME
+++ b/configs/base-generic/CONFIG_FB_METRONOME
diff --git a/baseconfig/CONFIG_FB_MODE_HELPERS b/configs/base-generic/CONFIG_FB_MODE_HELPERS
index e9eb6ec4f..e9eb6ec4f 100644
--- a/baseconfig/CONFIG_FB_MODE_HELPERS
+++ b/configs/base-generic/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/CONFIG_FB_NEOMAGIC b/configs/base-generic/CONFIG_FB_NEOMAGIC
index c40b63c27..c40b63c27 100644
--- a/baseconfig/CONFIG_FB_NEOMAGIC
+++ b/configs/base-generic/CONFIG_FB_NEOMAGIC
diff --git a/baseconfig/CONFIG_FB_NVIDIA b/configs/base-generic/CONFIG_FB_NVIDIA
index 00e8d12d5..00e8d12d5 100644
--- a/baseconfig/CONFIG_FB_NVIDIA
+++ b/configs/base-generic/CONFIG_FB_NVIDIA
diff --git a/baseconfig/CONFIG_FB_NVIDIA_BACKLIGHT b/configs/base-generic/CONFIG_FB_NVIDIA_BACKLIGHT
index 20dce2e12..20dce2e12 100644
--- a/baseconfig/CONFIG_FB_NVIDIA_BACKLIGHT
+++ b/configs/base-generic/CONFIG_FB_NVIDIA_BACKLIGHT
diff --git a/baseconfig/CONFIG_FB_NVIDIA_DEBUG b/configs/base-generic/CONFIG_FB_NVIDIA_DEBUG
index 0df849356..0df849356 100644
--- a/baseconfig/CONFIG_FB_NVIDIA_DEBUG
+++ b/configs/base-generic/CONFIG_FB_NVIDIA_DEBUG
diff --git a/baseconfig/CONFIG_FB_NVIDIA_I2C b/configs/base-generic/CONFIG_FB_NVIDIA_I2C
index afbb4bb38..afbb4bb38 100644
--- a/baseconfig/CONFIG_FB_NVIDIA_I2C
+++ b/configs/base-generic/CONFIG_FB_NVIDIA_I2C
diff --git a/baseconfig/CONFIG_FB_OPENCORES b/configs/base-generic/CONFIG_FB_OPENCORES
index af7bd5b48..af7bd5b48 100644
--- a/baseconfig/CONFIG_FB_OPENCORES
+++ b/configs/base-generic/CONFIG_FB_OPENCORES
diff --git a/baseconfig/CONFIG_FB_PM2 b/configs/base-generic/CONFIG_FB_PM2
index 402b162af..402b162af 100644
--- a/baseconfig/CONFIG_FB_PM2
+++ b/configs/base-generic/CONFIG_FB_PM2
diff --git a/baseconfig/CONFIG_FB_PM2_FIFO_DISCONNECT b/configs/base-generic/CONFIG_FB_PM2_FIFO_DISCONNECT
index 1596d4c93..1596d4c93 100644
--- a/baseconfig/CONFIG_FB_PM2_FIFO_DISCONNECT
+++ b/configs/base-generic/CONFIG_FB_PM2_FIFO_DISCONNECT
diff --git a/baseconfig/CONFIG_FB_PM3 b/configs/base-generic/CONFIG_FB_PM3
index c0e9092e3..c0e9092e3 100644
--- a/baseconfig/CONFIG_FB_PM3
+++ b/configs/base-generic/CONFIG_FB_PM3
diff --git a/baseconfig/CONFIG_FB_PRE_INIT_FB b/configs/base-generic/CONFIG_FB_PRE_INIT_FB
index ea755dbf9..ea755dbf9 100644
--- a/baseconfig/CONFIG_FB_PRE_INIT_FB
+++ b/configs/base-generic/CONFIG_FB_PRE_INIT_FB
diff --git a/baseconfig/CONFIG_FB_RADEON b/configs/base-generic/CONFIG_FB_RADEON
index 844570e81..844570e81 100644
--- a/baseconfig/CONFIG_FB_RADEON
+++ b/configs/base-generic/CONFIG_FB_RADEON
diff --git a/baseconfig/CONFIG_FB_RADEON_BACKLIGHT b/configs/base-generic/CONFIG_FB_RADEON_BACKLIGHT
index 06708f97b..06708f97b 100644
--- a/baseconfig/CONFIG_FB_RADEON_BACKLIGHT
+++ b/configs/base-generic/CONFIG_FB_RADEON_BACKLIGHT
diff --git a/baseconfig/CONFIG_FB_RADEON_DEBUG b/configs/base-generic/CONFIG_FB_RADEON_DEBUG
index 729060ede..729060ede 100644
--- a/baseconfig/CONFIG_FB_RADEON_DEBUG
+++ b/configs/base-generic/CONFIG_FB_RADEON_DEBUG
diff --git a/baseconfig/CONFIG_FB_RADEON_I2C b/configs/base-generic/CONFIG_FB_RADEON_I2C
index be99cdab4..be99cdab4 100644
--- a/baseconfig/CONFIG_FB_RADEON_I2C
+++ b/configs/base-generic/CONFIG_FB_RADEON_I2C
diff --git a/baseconfig/CONFIG_FB_RIVA b/configs/base-generic/CONFIG_FB_RIVA
index 51d3df8eb..51d3df8eb 100644
--- a/baseconfig/CONFIG_FB_RIVA
+++ b/configs/base-generic/CONFIG_FB_RIVA
diff --git a/baseconfig/CONFIG_FB_RIVA_BACKLIGHT b/configs/base-generic/CONFIG_FB_RIVA_BACKLIGHT
index 6705eb333..6705eb333 100644
--- a/baseconfig/CONFIG_FB_RIVA_BACKLIGHT
+++ b/configs/base-generic/CONFIG_FB_RIVA_BACKLIGHT
diff --git a/baseconfig/CONFIG_FB_RIVA_DEBUG b/configs/base-generic/CONFIG_FB_RIVA_DEBUG
index 05e0fba79..05e0fba79 100644
--- a/baseconfig/CONFIG_FB_RIVA_DEBUG
+++ b/configs/base-generic/CONFIG_FB_RIVA_DEBUG
diff --git a/baseconfig/CONFIG_FB_RIVA_I2C b/configs/base-generic/CONFIG_FB_RIVA_I2C
index 9fa889248..9fa889248 100644
--- a/baseconfig/CONFIG_FB_RIVA_I2C
+++ b/configs/base-generic/CONFIG_FB_RIVA_I2C
diff --git a/baseconfig/CONFIG_FB_S1D13XXX b/configs/base-generic/CONFIG_FB_S1D13XXX
index 723326189..723326189 100644
--- a/baseconfig/CONFIG_FB_S1D13XXX
+++ b/configs/base-generic/CONFIG_FB_S1D13XXX
diff --git a/baseconfig/CONFIG_FB_S3 b/configs/base-generic/CONFIG_FB_S3
index 5e8d701d4..5e8d701d4 100644
--- a/baseconfig/CONFIG_FB_S3
+++ b/configs/base-generic/CONFIG_FB_S3
diff --git a/baseconfig/CONFIG_FB_SAVAGE b/configs/base-generic/CONFIG_FB_SAVAGE
index 7512c54c6..7512c54c6 100644
--- a/baseconfig/CONFIG_FB_SAVAGE
+++ b/configs/base-generic/CONFIG_FB_SAVAGE
diff --git a/baseconfig/CONFIG_FB_SIMPLE b/configs/base-generic/CONFIG_FB_SIMPLE
index 3ae9be22c..3ae9be22c 100644
--- a/baseconfig/CONFIG_FB_SIMPLE
+++ b/configs/base-generic/CONFIG_FB_SIMPLE
diff --git a/baseconfig/CONFIG_FB_SIS b/configs/base-generic/CONFIG_FB_SIS
index 3ad07d50a..3ad07d50a 100644
--- a/baseconfig/CONFIG_FB_SIS
+++ b/configs/base-generic/CONFIG_FB_SIS
diff --git a/baseconfig/CONFIG_FB_SM501 b/configs/base-generic/CONFIG_FB_SM501
index 8ee07d09d..8ee07d09d 100644
--- a/baseconfig/CONFIG_FB_SM501
+++ b/configs/base-generic/CONFIG_FB_SM501
diff --git a/baseconfig/CONFIG_FB_SM712 b/configs/base-generic/CONFIG_FB_SM712
index 78188e33d..78188e33d 100644
--- a/baseconfig/CONFIG_FB_SM712
+++ b/configs/base-generic/CONFIG_FB_SM712
diff --git a/baseconfig/CONFIG_FB_SM750 b/configs/base-generic/CONFIG_FB_SM750
index 2275940be..2275940be 100644
--- a/baseconfig/CONFIG_FB_SM750
+++ b/configs/base-generic/CONFIG_FB_SM750
diff --git a/baseconfig/CONFIG_FB_SMSCUFX b/configs/base-generic/CONFIG_FB_SMSCUFX
index f80de74b8..f80de74b8 100644
--- a/baseconfig/CONFIG_FB_SMSCUFX
+++ b/configs/base-generic/CONFIG_FB_SMSCUFX
diff --git a/baseconfig/CONFIG_FB_TFT b/configs/base-generic/CONFIG_FB_TFT
index ec64dd189..ec64dd189 100644
--- a/baseconfig/CONFIG_FB_TFT
+++ b/configs/base-generic/CONFIG_FB_TFT
diff --git a/baseconfig/CONFIG_FB_TILEBLITTING b/configs/base-generic/CONFIG_FB_TILEBLITTING
index f3b6635cf..f3b6635cf 100644
--- a/baseconfig/CONFIG_FB_TILEBLITTING
+++ b/configs/base-generic/CONFIG_FB_TILEBLITTING
diff --git a/baseconfig/CONFIG_FB_TMIO b/configs/base-generic/CONFIG_FB_TMIO
index 377ef364a..377ef364a 100644
--- a/baseconfig/CONFIG_FB_TMIO
+++ b/configs/base-generic/CONFIG_FB_TMIO
diff --git a/baseconfig/CONFIG_FB_TRIDENT b/configs/base-generic/CONFIG_FB_TRIDENT
index d5a885fb9..d5a885fb9 100644
--- a/baseconfig/CONFIG_FB_TRIDENT
+++ b/configs/base-generic/CONFIG_FB_TRIDENT
diff --git a/baseconfig/CONFIG_FB_UDL b/configs/base-generic/CONFIG_FB_UDL
index b61aece88..b61aece88 100644
--- a/baseconfig/CONFIG_FB_UDL
+++ b/configs/base-generic/CONFIG_FB_UDL
diff --git a/baseconfig/CONFIG_FB_UVESA b/configs/base-generic/CONFIG_FB_UVESA
index b677212dc..b677212dc 100644
--- a/baseconfig/CONFIG_FB_UVESA
+++ b/configs/base-generic/CONFIG_FB_UVESA
diff --git a/baseconfig/CONFIG_FB_VESA b/configs/base-generic/CONFIG_FB_VESA
index 3ef695ad3..3ef695ad3 100644
--- a/baseconfig/CONFIG_FB_VESA
+++ b/configs/base-generic/CONFIG_FB_VESA
diff --git a/baseconfig/CONFIG_FB_VIRTUAL b/configs/base-generic/CONFIG_FB_VIRTUAL
index bfa7af232..bfa7af232 100644
--- a/baseconfig/CONFIG_FB_VIRTUAL
+++ b/configs/base-generic/CONFIG_FB_VIRTUAL
diff --git a/baseconfig/CONFIG_FB_VOODOO1 b/configs/base-generic/CONFIG_FB_VOODOO1
index 230c5eca2..230c5eca2 100644
--- a/baseconfig/CONFIG_FB_VOODOO1
+++ b/configs/base-generic/CONFIG_FB_VOODOO1
diff --git a/baseconfig/CONFIG_FB_VT8623 b/configs/base-generic/CONFIG_FB_VT8623
index e8ebebc5f..e8ebebc5f 100644
--- a/baseconfig/CONFIG_FB_VT8623
+++ b/configs/base-generic/CONFIG_FB_VT8623
diff --git a/baseconfig/CONFIG_FB_XGI b/configs/base-generic/CONFIG_FB_XGI
index 6f60e1ed2..6f60e1ed2 100644
--- a/baseconfig/CONFIG_FB_XGI
+++ b/configs/base-generic/CONFIG_FB_XGI
diff --git a/baseconfig/CONFIG_FCOE b/configs/base-generic/CONFIG_FCOE
index 0516a0903..0516a0903 100644
--- a/baseconfig/CONFIG_FCOE
+++ b/configs/base-generic/CONFIG_FCOE
diff --git a/baseconfig/CONFIG_FCOE_FNIC b/configs/base-generic/CONFIG_FCOE_FNIC
index 197c5e704..197c5e704 100644
--- a/baseconfig/CONFIG_FCOE_FNIC
+++ b/configs/base-generic/CONFIG_FCOE_FNIC
diff --git a/baseconfig/CONFIG_FDDI b/configs/base-generic/CONFIG_FDDI
index e13f968a5..e13f968a5 100644
--- a/baseconfig/CONFIG_FDDI
+++ b/configs/base-generic/CONFIG_FDDI
diff --git a/baseconfig/CONFIG_FEALNX b/configs/base-generic/CONFIG_FEALNX
index da2bab71b..da2bab71b 100644
--- a/baseconfig/CONFIG_FEALNX
+++ b/configs/base-generic/CONFIG_FEALNX
diff --git a/baseconfig/CONFIG_FHANDLE b/configs/base-generic/CONFIG_FHANDLE
index edcdc053f..edcdc053f 100644
--- a/baseconfig/CONFIG_FHANDLE
+++ b/configs/base-generic/CONFIG_FHANDLE
diff --git a/baseconfig/CONFIG_FIREWIRE b/configs/base-generic/CONFIG_FIREWIRE
index 7e1163b28..7e1163b28 100644
--- a/baseconfig/CONFIG_FIREWIRE
+++ b/configs/base-generic/CONFIG_FIREWIRE
diff --git a/baseconfig/CONFIG_FIREWIRE_NET b/configs/base-generic/CONFIG_FIREWIRE_NET
index 5a9e50eb3..5a9e50eb3 100644
--- a/baseconfig/CONFIG_FIREWIRE_NET
+++ b/configs/base-generic/CONFIG_FIREWIRE_NET
diff --git a/baseconfig/CONFIG_FIREWIRE_NOSY b/configs/base-generic/CONFIG_FIREWIRE_NOSY
index 98a0d2847..98a0d2847 100644
--- a/baseconfig/CONFIG_FIREWIRE_NOSY
+++ b/configs/base-generic/CONFIG_FIREWIRE_NOSY
diff --git a/baseconfig/CONFIG_FIREWIRE_OHCI b/configs/base-generic/CONFIG_FIREWIRE_OHCI
index de045fe5a..de045fe5a 100644
--- a/baseconfig/CONFIG_FIREWIRE_OHCI
+++ b/configs/base-generic/CONFIG_FIREWIRE_OHCI
diff --git a/baseconfig/CONFIG_FIREWIRE_SBP2 b/configs/base-generic/CONFIG_FIREWIRE_SBP2
index 1255474ee..1255474ee 100644
--- a/baseconfig/CONFIG_FIREWIRE_SBP2
+++ b/configs/base-generic/CONFIG_FIREWIRE_SBP2
diff --git a/baseconfig/CONFIG_FIREWIRE_SERIAL b/configs/base-generic/CONFIG_FIREWIRE_SERIAL
index b9432fc45..b9432fc45 100644
--- a/baseconfig/CONFIG_FIREWIRE_SERIAL
+++ b/configs/base-generic/CONFIG_FIREWIRE_SERIAL
diff --git a/baseconfig/CONFIG_FIRMWARE_EDID b/configs/base-generic/CONFIG_FIRMWARE_EDID
index 7c3c659ce..7c3c659ce 100644
--- a/baseconfig/CONFIG_FIRMWARE_EDID
+++ b/configs/base-generic/CONFIG_FIRMWARE_EDID
diff --git a/baseconfig/CONFIG_FIRMWARE_IN_KERNEL b/configs/base-generic/CONFIG_FIRMWARE_IN_KERNEL
index 19640bd61..19640bd61 100644
--- a/baseconfig/CONFIG_FIRMWARE_IN_KERNEL
+++ b/configs/base-generic/CONFIG_FIRMWARE_IN_KERNEL
diff --git a/baseconfig/CONFIG_FIXED_PHY b/configs/base-generic/CONFIG_FIXED_PHY
index 80379efd3..80379efd3 100644
--- a/baseconfig/CONFIG_FIXED_PHY
+++ b/configs/base-generic/CONFIG_FIXED_PHY
diff --git a/baseconfig/CONFIG_FM10K b/configs/base-generic/CONFIG_FM10K
index c9b11d9bd..c9b11d9bd 100644
--- a/baseconfig/CONFIG_FM10K
+++ b/configs/base-generic/CONFIG_FM10K
diff --git a/baseconfig/CONFIG_FMC b/configs/base-generic/CONFIG_FMC
index 9e4990f41..9e4990f41 100644
--- a/baseconfig/CONFIG_FMC
+++ b/configs/base-generic/CONFIG_FMC
diff --git a/baseconfig/CONFIG_FMC_CHARDEV b/configs/base-generic/CONFIG_FMC_CHARDEV
index ea0267e43..ea0267e43 100644
--- a/baseconfig/CONFIG_FMC_CHARDEV
+++ b/configs/base-generic/CONFIG_FMC_CHARDEV
diff --git a/baseconfig/CONFIG_FMC_FAKEDEV b/configs/base-generic/CONFIG_FMC_FAKEDEV
index ca98e45dd..ca98e45dd 100644
--- a/baseconfig/CONFIG_FMC_FAKEDEV
+++ b/configs/base-generic/CONFIG_FMC_FAKEDEV
diff --git a/baseconfig/CONFIG_FMC_TRIVIAL b/configs/base-generic/CONFIG_FMC_TRIVIAL
index cd8c36bdb..cd8c36bdb 100644
--- a/baseconfig/CONFIG_FMC_TRIVIAL
+++ b/configs/base-generic/CONFIG_FMC_TRIVIAL
diff --git a/baseconfig/CONFIG_FMC_WRITE_EEPROM b/configs/base-generic/CONFIG_FMC_WRITE_EEPROM
index a2a65354e..a2a65354e 100644
--- a/baseconfig/CONFIG_FMC_WRITE_EEPROM
+++ b/configs/base-generic/CONFIG_FMC_WRITE_EEPROM
diff --git a/baseconfig/CONFIG_FONTS b/configs/base-generic/CONFIG_FONTS
index abe0213f9..abe0213f9 100644
--- a/baseconfig/CONFIG_FONTS
+++ b/configs/base-generic/CONFIG_FONTS
diff --git a/baseconfig/CONFIG_FORCEDETH b/configs/base-generic/CONFIG_FORCEDETH
index ee84dcca2..ee84dcca2 100644
--- a/baseconfig/CONFIG_FORCEDETH
+++ b/configs/base-generic/CONFIG_FORCEDETH
diff --git a/baseconfig/CONFIG_FORTIFY_SOURCE b/configs/base-generic/CONFIG_FORTIFY_SOURCE
index 926b56799..926b56799 100644
--- a/baseconfig/CONFIG_FORTIFY_SOURCE
+++ b/configs/base-generic/CONFIG_FORTIFY_SOURCE
diff --git a/baseconfig/CONFIG_FPGA b/configs/base-generic/CONFIG_FPGA
index 8bb6ca99e..8bb6ca99e 100644
--- a/baseconfig/CONFIG_FPGA
+++ b/configs/base-generic/CONFIG_FPGA
diff --git a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE
index 84ef39c68..84ef39c68 100644
--- a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE
+++ b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE
diff --git a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
index 3153802cd..3153802cd 100644
--- a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
+++ b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
diff --git a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE_ROTATION b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
index 3887f86bb..3887f86bb 100644
--- a/baseconfig/CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
+++ b/configs/base-generic/CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
diff --git a/baseconfig/CONFIG_FRAME_POINTER b/configs/base-generic/CONFIG_FRAME_POINTER
index 90a6184b1..90a6184b1 100644
--- a/baseconfig/CONFIG_FRAME_POINTER
+++ b/configs/base-generic/CONFIG_FRAME_POINTER
diff --git a/baseconfig/CONFIG_FRAME_WARN b/configs/base-generic/CONFIG_FRAME_WARN
index ca907a00b..ca907a00b 100644
--- a/baseconfig/CONFIG_FRAME_WARN
+++ b/configs/base-generic/CONFIG_FRAME_WARN
diff --git a/baseconfig/CONFIG_FRONTSWAP b/configs/base-generic/CONFIG_FRONTSWAP
index 78c7a8a6c..78c7a8a6c 100644
--- a/baseconfig/CONFIG_FRONTSWAP
+++ b/configs/base-generic/CONFIG_FRONTSWAP
diff --git a/baseconfig/CONFIG_FSCACHE b/configs/base-generic/CONFIG_FSCACHE
index 80b71a372..80b71a372 100644
--- a/baseconfig/CONFIG_FSCACHE
+++ b/configs/base-generic/CONFIG_FSCACHE
diff --git a/baseconfig/CONFIG_FSCACHE_DEBUG b/configs/base-generic/CONFIG_FSCACHE_DEBUG
index 4da10ce35..4da10ce35 100644
--- a/baseconfig/CONFIG_FSCACHE_DEBUG
+++ b/configs/base-generic/CONFIG_FSCACHE_DEBUG
diff --git a/baseconfig/CONFIG_FSCACHE_HISTOGRAM b/configs/base-generic/CONFIG_FSCACHE_HISTOGRAM
index e8a2cfe9c..e8a2cfe9c 100644
--- a/baseconfig/CONFIG_FSCACHE_HISTOGRAM
+++ b/configs/base-generic/CONFIG_FSCACHE_HISTOGRAM
diff --git a/baseconfig/CONFIG_FSCACHE_OBJECT_LIST b/configs/base-generic/CONFIG_FSCACHE_OBJECT_LIST
index 6819e59d5..6819e59d5 100644
--- a/baseconfig/CONFIG_FSCACHE_OBJECT_LIST
+++ b/configs/base-generic/CONFIG_FSCACHE_OBJECT_LIST
diff --git a/baseconfig/CONFIG_FSCACHE_STATS b/configs/base-generic/CONFIG_FSCACHE_STATS
index a65dcfa31..a65dcfa31 100644
--- a/baseconfig/CONFIG_FSCACHE_STATS
+++ b/configs/base-generic/CONFIG_FSCACHE_STATS
diff --git a/baseconfig/CONFIG_FSI b/configs/base-generic/CONFIG_FSI
index 1f548f4f0..1f548f4f0 100644
--- a/baseconfig/CONFIG_FSI
+++ b/configs/base-generic/CONFIG_FSI
diff --git a/baseconfig/CONFIG_FSI_MASTER_GPIO b/configs/base-generic/CONFIG_FSI_MASTER_GPIO
index 065a1456e..065a1456e 100644
--- a/baseconfig/CONFIG_FSI_MASTER_GPIO
+++ b/configs/base-generic/CONFIG_FSI_MASTER_GPIO
diff --git a/baseconfig/CONFIG_FSI_MASTER_HUB b/configs/base-generic/CONFIG_FSI_MASTER_HUB
index 5cfdc2e81..5cfdc2e81 100644
--- a/baseconfig/CONFIG_FSI_MASTER_HUB
+++ b/configs/base-generic/CONFIG_FSI_MASTER_HUB
diff --git a/baseconfig/CONFIG_FSI_SCOM b/configs/base-generic/CONFIG_FSI_SCOM
index 3aee9f30b..3aee9f30b 100644
--- a/baseconfig/CONFIG_FSI_SCOM
+++ b/configs/base-generic/CONFIG_FSI_SCOM
diff --git a/baseconfig/CONFIG_FSL_EDMA b/configs/base-generic/CONFIG_FSL_EDMA
index d9673ee72..d9673ee72 100644
--- a/baseconfig/CONFIG_FSL_EDMA
+++ b/configs/base-generic/CONFIG_FSL_EDMA
diff --git a/baseconfig/CONFIG_FSL_PQ_MDIO b/configs/base-generic/CONFIG_FSL_PQ_MDIO
index f7952819a..f7952819a 100644
--- a/baseconfig/CONFIG_FSL_PQ_MDIO
+++ b/configs/base-generic/CONFIG_FSL_PQ_MDIO
diff --git a/baseconfig/CONFIG_FSNOTIFY b/configs/base-generic/CONFIG_FSNOTIFY
index 2e3862d3a..2e3862d3a 100644
--- a/baseconfig/CONFIG_FSNOTIFY
+++ b/configs/base-generic/CONFIG_FSNOTIFY
diff --git a/baseconfig/CONFIG_FS_DAX b/configs/base-generic/CONFIG_FS_DAX
index 141ae8514..141ae8514 100644
--- a/baseconfig/CONFIG_FS_DAX
+++ b/configs/base-generic/CONFIG_FS_DAX
diff --git a/baseconfig/CONFIG_FS_ENCRYPTION b/configs/base-generic/CONFIG_FS_ENCRYPTION
index 9a40b85be..9a40b85be 100644
--- a/baseconfig/CONFIG_FS_ENCRYPTION
+++ b/configs/base-generic/CONFIG_FS_ENCRYPTION
diff --git a/baseconfig/CONFIG_FS_MBCACHE b/configs/base-generic/CONFIG_FS_MBCACHE
index 6bfe922de..6bfe922de 100644
--- a/baseconfig/CONFIG_FS_MBCACHE
+++ b/configs/base-generic/CONFIG_FS_MBCACHE
diff --git a/baseconfig/CONFIG_FTL b/configs/base-generic/CONFIG_FTL
index cc37e0b2b..cc37e0b2b 100644
--- a/baseconfig/CONFIG_FTL
+++ b/configs/base-generic/CONFIG_FTL
diff --git a/baseconfig/CONFIG_FTRACE b/configs/base-generic/CONFIG_FTRACE
index ef8214661..ef8214661 100644
--- a/baseconfig/CONFIG_FTRACE
+++ b/configs/base-generic/CONFIG_FTRACE
diff --git a/baseconfig/CONFIG_FTRACE_MCOUNT_RECORD b/configs/base-generic/CONFIG_FTRACE_MCOUNT_RECORD
index 5849b3c45..5849b3c45 100644
--- a/baseconfig/CONFIG_FTRACE_MCOUNT_RECORD
+++ b/configs/base-generic/CONFIG_FTRACE_MCOUNT_RECORD
diff --git a/baseconfig/CONFIG_FTRACE_STARTUP_TEST b/configs/base-generic/CONFIG_FTRACE_STARTUP_TEST
index 8e7db2757..8e7db2757 100644
--- a/baseconfig/CONFIG_FTRACE_STARTUP_TEST
+++ b/configs/base-generic/CONFIG_FTRACE_STARTUP_TEST
diff --git a/baseconfig/CONFIG_FTRACE_SYSCALLS b/configs/base-generic/CONFIG_FTRACE_SYSCALLS
index f2f6f04b0..f2f6f04b0 100644
--- a/baseconfig/CONFIG_FTRACE_SYSCALLS
+++ b/configs/base-generic/CONFIG_FTRACE_SYSCALLS
diff --git a/baseconfig/CONFIG_FUNCTION_GRAPH_TRACER b/configs/base-generic/CONFIG_FUNCTION_GRAPH_TRACER
index 6750cd8d3..6750cd8d3 100644
--- a/baseconfig/CONFIG_FUNCTION_GRAPH_TRACER
+++ b/configs/base-generic/CONFIG_FUNCTION_GRAPH_TRACER
diff --git a/baseconfig/CONFIG_FUNCTION_PROFILER b/configs/base-generic/CONFIG_FUNCTION_PROFILER
index de1cfdb54..de1cfdb54 100644
--- a/baseconfig/CONFIG_FUNCTION_PROFILER
+++ b/configs/base-generic/CONFIG_FUNCTION_PROFILER
diff --git a/baseconfig/CONFIG_FUNCTION_TRACER b/configs/base-generic/CONFIG_FUNCTION_TRACER
index d1977efec..d1977efec 100644
--- a/baseconfig/CONFIG_FUNCTION_TRACER
+++ b/configs/base-generic/CONFIG_FUNCTION_TRACER
diff --git a/baseconfig/CONFIG_FUSE_FS b/configs/base-generic/CONFIG_FUSE_FS
index 835c7f4da..835c7f4da 100644
--- a/baseconfig/CONFIG_FUSE_FS
+++ b/configs/base-generic/CONFIG_FUSE_FS
diff --git a/baseconfig/CONFIG_FUSION b/configs/base-generic/CONFIG_FUSION
index 6c920d6b1..6c920d6b1 100644
--- a/baseconfig/CONFIG_FUSION
+++ b/configs/base-generic/CONFIG_FUSION
diff --git a/baseconfig/CONFIG_FUSION_CTL b/configs/base-generic/CONFIG_FUSION_CTL
index 82bf50128..82bf50128 100644
--- a/baseconfig/CONFIG_FUSION_CTL
+++ b/configs/base-generic/CONFIG_FUSION_CTL
diff --git a/baseconfig/CONFIG_FUSION_FC b/configs/base-generic/CONFIG_FUSION_FC
index 88df4b32a..88df4b32a 100644
--- a/baseconfig/CONFIG_FUSION_FC
+++ b/configs/base-generic/CONFIG_FUSION_FC
diff --git a/baseconfig/CONFIG_FUSION_LAN b/configs/base-generic/CONFIG_FUSION_LAN
index c4753c393..c4753c393 100644
--- a/baseconfig/CONFIG_FUSION_LAN
+++ b/configs/base-generic/CONFIG_FUSION_LAN
diff --git a/baseconfig/CONFIG_FUSION_LOGGING b/configs/base-generic/CONFIG_FUSION_LOGGING
index 0c2d45eff..0c2d45eff 100644
--- a/baseconfig/CONFIG_FUSION_LOGGING
+++ b/configs/base-generic/CONFIG_FUSION_LOGGING
diff --git a/baseconfig/CONFIG_FUSION_MAX_SGE b/configs/base-generic/CONFIG_FUSION_MAX_SGE
index 2b2001a6e..2b2001a6e 100644
--- a/baseconfig/CONFIG_FUSION_MAX_SGE
+++ b/configs/base-generic/CONFIG_FUSION_MAX_SGE
diff --git a/baseconfig/CONFIG_FUSION_SAS b/configs/base-generic/CONFIG_FUSION_SAS
index fa9006f15..fa9006f15 100644
--- a/baseconfig/CONFIG_FUSION_SAS
+++ b/configs/base-generic/CONFIG_FUSION_SAS
diff --git a/baseconfig/CONFIG_FUSION_SPI b/configs/base-generic/CONFIG_FUSION_SPI
index 938c11275..938c11275 100644
--- a/baseconfig/CONFIG_FUSION_SPI
+++ b/configs/base-generic/CONFIG_FUSION_SPI
diff --git a/baseconfig/CONFIG_FUTEX b/configs/base-generic/CONFIG_FUTEX
index df59af0b6..df59af0b6 100644
--- a/baseconfig/CONFIG_FUTEX
+++ b/configs/base-generic/CONFIG_FUTEX
diff --git a/baseconfig/CONFIG_FW_CFG_SYSFS b/configs/base-generic/CONFIG_FW_CFG_SYSFS
index 1d490e401..1d490e401 100644
--- a/baseconfig/CONFIG_FW_CFG_SYSFS
+++ b/configs/base-generic/CONFIG_FW_CFG_SYSFS
diff --git a/baseconfig/CONFIG_FW_CFG_SYSFS_CMDLINE b/configs/base-generic/CONFIG_FW_CFG_SYSFS_CMDLINE
index ffca1920f..ffca1920f 100644
--- a/baseconfig/CONFIG_FW_CFG_SYSFS_CMDLINE
+++ b/configs/base-generic/CONFIG_FW_CFG_SYSFS_CMDLINE
diff --git a/baseconfig/CONFIG_FW_LOADER b/configs/base-generic/CONFIG_FW_LOADER
index c8e64ebb4..c8e64ebb4 100644
--- a/baseconfig/CONFIG_FW_LOADER
+++ b/configs/base-generic/CONFIG_FW_LOADER
diff --git a/baseconfig/CONFIG_FW_LOADER_USER_HELPER b/configs/base-generic/CONFIG_FW_LOADER_USER_HELPER
index 686f93187..686f93187 100644
--- a/baseconfig/CONFIG_FW_LOADER_USER_HELPER
+++ b/configs/base-generic/CONFIG_FW_LOADER_USER_HELPER
diff --git a/baseconfig/CONFIG_FW_LOADER_USER_HELPER_FALLBACK b/configs/base-generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK
index 29daf8fb6..29daf8fb6 100644
--- a/baseconfig/CONFIG_FW_LOADER_USER_HELPER_FALLBACK
+++ b/configs/base-generic/CONFIG_FW_LOADER_USER_HELPER_FALLBACK
diff --git a/baseconfig/CONFIG_GACT_PROB b/configs/base-generic/CONFIG_GACT_PROB
index aaec40095..aaec40095 100644
--- a/baseconfig/CONFIG_GACT_PROB
+++ b/configs/base-generic/CONFIG_GACT_PROB
diff --git a/baseconfig/CONFIG_GAMEPORT b/configs/base-generic/CONFIG_GAMEPORT
index 5f30f4fac..5f30f4fac 100644
--- a/baseconfig/CONFIG_GAMEPORT
+++ b/configs/base-generic/CONFIG_GAMEPORT
diff --git a/baseconfig/CONFIG_GAMEPORT_EMU10K1 b/configs/base-generic/CONFIG_GAMEPORT_EMU10K1
index 625d09d9f..625d09d9f 100644
--- a/baseconfig/CONFIG_GAMEPORT_EMU10K1
+++ b/configs/base-generic/CONFIG_GAMEPORT_EMU10K1
diff --git a/baseconfig/CONFIG_GAMEPORT_FM801 b/configs/base-generic/CONFIG_GAMEPORT_FM801
index b9bda832a..b9bda832a 100644
--- a/baseconfig/CONFIG_GAMEPORT_FM801
+++ b/configs/base-generic/CONFIG_GAMEPORT_FM801
diff --git a/baseconfig/CONFIG_GAMEPORT_L4 b/configs/base-generic/CONFIG_GAMEPORT_L4
index fde04a188..fde04a188 100644
--- a/baseconfig/CONFIG_GAMEPORT_L4
+++ b/configs/base-generic/CONFIG_GAMEPORT_L4
diff --git a/baseconfig/CONFIG_GAMEPORT_NS558 b/configs/base-generic/CONFIG_GAMEPORT_NS558
index 718792182..718792182 100644
--- a/baseconfig/CONFIG_GAMEPORT_NS558
+++ b/configs/base-generic/CONFIG_GAMEPORT_NS558
diff --git a/baseconfig/CONFIG_GCC_PLUGINS b/configs/base-generic/CONFIG_GCC_PLUGINS
index 072e253ed..072e253ed 100644
--- a/baseconfig/CONFIG_GCC_PLUGINS
+++ b/configs/base-generic/CONFIG_GCC_PLUGINS
diff --git a/baseconfig/CONFIG_GCOV_KERNEL b/configs/base-generic/CONFIG_GCOV_KERNEL
index 05f92777b..05f92777b 100644
--- a/baseconfig/CONFIG_GCOV_KERNEL
+++ b/configs/base-generic/CONFIG_GCOV_KERNEL
diff --git a/baseconfig/CONFIG_GDB_SCRIPTS b/configs/base-generic/CONFIG_GDB_SCRIPTS
index 72774e707..72774e707 100644
--- a/baseconfig/CONFIG_GDB_SCRIPTS
+++ b/configs/base-generic/CONFIG_GDB_SCRIPTS
diff --git a/baseconfig/CONFIG_GENERIC_ADC_BATTERY b/configs/base-generic/CONFIG_GENERIC_ADC_BATTERY
index 440938a36..440938a36 100644
--- a/baseconfig/CONFIG_GENERIC_ADC_BATTERY
+++ b/configs/base-generic/CONFIG_GENERIC_ADC_BATTERY
diff --git a/baseconfig/CONFIG_GENERIC_ADC_THERMAL b/configs/base-generic/CONFIG_GENERIC_ADC_THERMAL
index 7719b8960..7719b8960 100644
--- a/baseconfig/CONFIG_GENERIC_ADC_THERMAL
+++ b/configs/base-generic/CONFIG_GENERIC_ADC_THERMAL
diff --git a/baseconfig/CONFIG_GENERIC_IRQ_DEBUGFS b/configs/base-generic/CONFIG_GENERIC_IRQ_DEBUGFS
index 539bb6640..539bb6640 100644
--- a/baseconfig/CONFIG_GENERIC_IRQ_DEBUGFS
+++ b/configs/base-generic/CONFIG_GENERIC_IRQ_DEBUGFS
diff --git a/baseconfig/CONFIG_GENERIC_PHY b/configs/base-generic/CONFIG_GENERIC_PHY
index 582e87c3b..582e87c3b 100644
--- a/baseconfig/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/CONFIG_GENERIC_PHY
diff --git a/baseconfig/CONFIG_GENEVE b/configs/base-generic/CONFIG_GENEVE
index 99344bcd9..99344bcd9 100644
--- a/baseconfig/CONFIG_GENEVE
+++ b/configs/base-generic/CONFIG_GENEVE
diff --git a/baseconfig/CONFIG_GENWQE b/configs/base-generic/CONFIG_GENWQE
index 0d6952464..0d6952464 100644
--- a/baseconfig/CONFIG_GENWQE
+++ b/configs/base-generic/CONFIG_GENWQE
diff --git a/baseconfig/CONFIG_GEN_RTC b/configs/base-generic/CONFIG_GEN_RTC
index 313481994..313481994 100644
--- a/baseconfig/CONFIG_GEN_RTC
+++ b/configs/base-generic/CONFIG_GEN_RTC
diff --git a/baseconfig/CONFIG_GFS2_FS b/configs/base-generic/CONFIG_GFS2_FS
index 0ddd71153..0ddd71153 100644
--- a/baseconfig/CONFIG_GFS2_FS
+++ b/configs/base-generic/CONFIG_GFS2_FS
diff --git a/baseconfig/CONFIG_GFS2_FS_LOCKING_DLM b/configs/base-generic/CONFIG_GFS2_FS_LOCKING_DLM
index 424a3046b..424a3046b 100644
--- a/baseconfig/CONFIG_GFS2_FS_LOCKING_DLM
+++ b/configs/base-generic/CONFIG_GFS2_FS_LOCKING_DLM
diff --git a/baseconfig/CONFIG_GIGASET_BASE b/configs/base-generic/CONFIG_GIGASET_BASE
index fa7bb4bea..fa7bb4bea 100644
--- a/baseconfig/CONFIG_GIGASET_BASE
+++ b/configs/base-generic/CONFIG_GIGASET_BASE
diff --git a/baseconfig/CONFIG_GIGASET_CAPI b/configs/base-generic/CONFIG_GIGASET_CAPI
index b94738045..b94738045 100644
--- a/baseconfig/CONFIG_GIGASET_CAPI
+++ b/configs/base-generic/CONFIG_GIGASET_CAPI
diff --git a/baseconfig/CONFIG_GIGASET_DEBUG b/configs/base-generic/CONFIG_GIGASET_DEBUG
index 95c9cd104..95c9cd104 100644
--- a/baseconfig/CONFIG_GIGASET_DEBUG
+++ b/configs/base-generic/CONFIG_GIGASET_DEBUG
diff --git a/baseconfig/CONFIG_GIGASET_M101 b/configs/base-generic/CONFIG_GIGASET_M101
index 10388d0a9..10388d0a9 100644
--- a/baseconfig/CONFIG_GIGASET_M101
+++ b/configs/base-generic/CONFIG_GIGASET_M101
diff --git a/baseconfig/CONFIG_GIGASET_M105 b/configs/base-generic/CONFIG_GIGASET_M105
index cf3d1db9f..cf3d1db9f 100644
--- a/baseconfig/CONFIG_GIGASET_M105
+++ b/configs/base-generic/CONFIG_GIGASET_M105
diff --git a/baseconfig/CONFIG_GIRBIL_DONGLE b/configs/base-generic/CONFIG_GIRBIL_DONGLE
index 108bafcbd..108bafcbd 100644
--- a/baseconfig/CONFIG_GIRBIL_DONGLE
+++ b/configs/base-generic/CONFIG_GIRBIL_DONGLE
diff --git a/baseconfig/CONFIG_GLOB_SELFTEST b/configs/base-generic/CONFIG_GLOB_SELFTEST
index 8ee334320..8ee334320 100644
--- a/baseconfig/CONFIG_GLOB_SELFTEST
+++ b/configs/base-generic/CONFIG_GLOB_SELFTEST
diff --git a/baseconfig/CONFIG_GOLDFISH b/configs/base-generic/CONFIG_GOLDFISH
index 570eec3f0..570eec3f0 100644
--- a/baseconfig/CONFIG_GOLDFISH
+++ b/configs/base-generic/CONFIG_GOLDFISH
diff --git a/baseconfig/CONFIG_GOOGLE_FIRMWARE b/configs/base-generic/CONFIG_GOOGLE_FIRMWARE
index a9a15cf41..a9a15cf41 100644
--- a/baseconfig/CONFIG_GOOGLE_FIRMWARE
+++ b/configs/base-generic/CONFIG_GOOGLE_FIRMWARE
diff --git a/baseconfig/CONFIG_GP2AP020A00F b/configs/base-generic/CONFIG_GP2AP020A00F
index 15d94281d..15d94281d 100644
--- a/baseconfig/CONFIG_GP2AP020A00F
+++ b/configs/base-generic/CONFIG_GP2AP020A00F
diff --git a/baseconfig/CONFIG_GPIOLIB b/configs/base-generic/CONFIG_GPIOLIB
index 7c7603d68..7c7603d68 100644
--- a/baseconfig/CONFIG_GPIOLIB
+++ b/configs/base-generic/CONFIG_GPIOLIB
diff --git a/baseconfig/CONFIG_GPIO_104_DIO_48E b/configs/base-generic/CONFIG_GPIO_104_DIO_48E
index 25fa8a205..25fa8a205 100644
--- a/baseconfig/CONFIG_GPIO_104_DIO_48E
+++ b/configs/base-generic/CONFIG_GPIO_104_DIO_48E
diff --git a/baseconfig/CONFIG_GPIO_104_IDIO_16 b/configs/base-generic/CONFIG_GPIO_104_IDIO_16
index 1fcd4589f..1fcd4589f 100644
--- a/baseconfig/CONFIG_GPIO_104_IDIO_16
+++ b/configs/base-generic/CONFIG_GPIO_104_IDIO_16
diff --git a/baseconfig/CONFIG_GPIO_74X164 b/configs/base-generic/CONFIG_GPIO_74X164
index 543197b0b..543197b0b 100644
--- a/baseconfig/CONFIG_GPIO_74X164
+++ b/configs/base-generic/CONFIG_GPIO_74X164
diff --git a/baseconfig/CONFIG_GPIO_ADNP b/configs/base-generic/CONFIG_GPIO_ADNP
index 5f2bab733..5f2bab733 100644
--- a/baseconfig/CONFIG_GPIO_ADNP
+++ b/configs/base-generic/CONFIG_GPIO_ADNP
diff --git a/baseconfig/CONFIG_GPIO_ADP5588 b/configs/base-generic/CONFIG_GPIO_ADP5588
index 448478ae0..448478ae0 100644
--- a/baseconfig/CONFIG_GPIO_ADP5588
+++ b/configs/base-generic/CONFIG_GPIO_ADP5588
diff --git a/baseconfig/CONFIG_GPIO_ALTERA b/configs/base-generic/CONFIG_GPIO_ALTERA
index 621d4475b..621d4475b 100644
--- a/baseconfig/CONFIG_GPIO_ALTERA
+++ b/configs/base-generic/CONFIG_GPIO_ALTERA
diff --git a/baseconfig/CONFIG_GPIO_AMDPT b/configs/base-generic/CONFIG_GPIO_AMDPT
index b434f6d19..b434f6d19 100644
--- a/baseconfig/CONFIG_GPIO_AMDPT
+++ b/configs/base-generic/CONFIG_GPIO_AMDPT
diff --git a/baseconfig/CONFIG_GPIO_BD9571MWV b/configs/base-generic/CONFIG_GPIO_BD9571MWV
index 0cdd67b34..0cdd67b34 100644
--- a/baseconfig/CONFIG_GPIO_BD9571MWV
+++ b/configs/base-generic/CONFIG_GPIO_BD9571MWV
diff --git a/baseconfig/CONFIG_GPIO_BT8XX b/configs/base-generic/CONFIG_GPIO_BT8XX
index dbc524d7c..dbc524d7c 100644
--- a/baseconfig/CONFIG_GPIO_BT8XX
+++ b/configs/base-generic/CONFIG_GPIO_BT8XX
diff --git a/baseconfig/CONFIG_GPIO_DWAPB b/configs/base-generic/CONFIG_GPIO_DWAPB
index 364383328..364383328 100644
--- a/baseconfig/CONFIG_GPIO_DWAPB
+++ b/configs/base-generic/CONFIG_GPIO_DWAPB
diff --git a/baseconfig/CONFIG_GPIO_EXAR b/configs/base-generic/CONFIG_GPIO_EXAR
index e03739e86..e03739e86 100644
--- a/baseconfig/CONFIG_GPIO_EXAR
+++ b/configs/base-generic/CONFIG_GPIO_EXAR
diff --git a/baseconfig/CONFIG_GPIO_FTGPIO010 b/configs/base-generic/CONFIG_GPIO_FTGPIO010
index 3a1fb41ea..3a1fb41ea 100644
--- a/baseconfig/CONFIG_GPIO_FTGPIO010
+++ b/configs/base-generic/CONFIG_GPIO_FTGPIO010
diff --git a/baseconfig/CONFIG_GPIO_GENERIC_PLATFORM b/configs/base-generic/CONFIG_GPIO_GENERIC_PLATFORM
index d45d5bae2..d45d5bae2 100644
--- a/baseconfig/CONFIG_GPIO_GENERIC_PLATFORM
+++ b/configs/base-generic/CONFIG_GPIO_GENERIC_PLATFORM
diff --git a/baseconfig/CONFIG_GPIO_GRGPIO b/configs/base-generic/CONFIG_GPIO_GRGPIO
index 826d836bf..826d836bf 100644
--- a/baseconfig/CONFIG_GPIO_GRGPIO
+++ b/configs/base-generic/CONFIG_GPIO_GRGPIO
diff --git a/baseconfig/CONFIG_GPIO_IT87 b/configs/base-generic/CONFIG_GPIO_IT87
index aaeb504ac..aaeb504ac 100644
--- a/baseconfig/CONFIG_GPIO_IT87
+++ b/configs/base-generic/CONFIG_GPIO_IT87
diff --git a/baseconfig/CONFIG_GPIO_MAX7300 b/configs/base-generic/CONFIG_GPIO_MAX7300
index 27e781e57..27e781e57 100644
--- a/baseconfig/CONFIG_GPIO_MAX7300
+++ b/configs/base-generic/CONFIG_GPIO_MAX7300
diff --git a/baseconfig/CONFIG_GPIO_MAX7301 b/configs/base-generic/CONFIG_GPIO_MAX7301
index cd127dd6b..cd127dd6b 100644
--- a/baseconfig/CONFIG_GPIO_MAX7301
+++ b/configs/base-generic/CONFIG_GPIO_MAX7301
diff --git a/baseconfig/CONFIG_GPIO_MAX732X b/configs/base-generic/CONFIG_GPIO_MAX732X
index 690f87047..690f87047 100644
--- a/baseconfig/CONFIG_GPIO_MAX732X
+++ b/configs/base-generic/CONFIG_GPIO_MAX732X
diff --git a/baseconfig/CONFIG_GPIO_MC33880 b/configs/base-generic/CONFIG_GPIO_MC33880
index 17f039cfc..17f039cfc 100644
--- a/baseconfig/CONFIG_GPIO_MC33880
+++ b/configs/base-generic/CONFIG_GPIO_MC33880
diff --git a/baseconfig/CONFIG_GPIO_MCP23S08 b/configs/base-generic/CONFIG_GPIO_MCP23S08
index cee2057d6..cee2057d6 100644
--- a/baseconfig/CONFIG_GPIO_MCP23S08
+++ b/configs/base-generic/CONFIG_GPIO_MCP23S08
diff --git a/baseconfig/CONFIG_GPIO_MOCKUP b/configs/base-generic/CONFIG_GPIO_MOCKUP
index 7f135a6ef..7f135a6ef 100644
--- a/baseconfig/CONFIG_GPIO_MOCKUP
+++ b/configs/base-generic/CONFIG_GPIO_MOCKUP
diff --git a/baseconfig/CONFIG_GPIO_MPC8XXX b/configs/base-generic/CONFIG_GPIO_MPC8XXX
index 876fd6a58..876fd6a58 100644
--- a/baseconfig/CONFIG_GPIO_MPC8XXX
+++ b/configs/base-generic/CONFIG_GPIO_MPC8XXX
diff --git a/baseconfig/CONFIG_GPIO_PCA953X b/configs/base-generic/CONFIG_GPIO_PCA953X
index ca0543fbb..ca0543fbb 100644
--- a/baseconfig/CONFIG_GPIO_PCA953X
+++ b/configs/base-generic/CONFIG_GPIO_PCA953X
diff --git a/baseconfig/CONFIG_GPIO_PCF857X b/configs/base-generic/CONFIG_GPIO_PCF857X
index d58fab074..d58fab074 100644
--- a/baseconfig/CONFIG_GPIO_PCF857X
+++ b/configs/base-generic/CONFIG_GPIO_PCF857X
diff --git a/baseconfig/CONFIG_GPIO_PCH b/configs/base-generic/CONFIG_GPIO_PCH
index ec275271e..ec275271e 100644
--- a/baseconfig/CONFIG_GPIO_PCH
+++ b/configs/base-generic/CONFIG_GPIO_PCH
diff --git a/baseconfig/CONFIG_GPIO_PCI_IDIO_16 b/configs/base-generic/CONFIG_GPIO_PCI_IDIO_16
index e3e6eeab0..e3e6eeab0 100644
--- a/baseconfig/CONFIG_GPIO_PCI_IDIO_16
+++ b/configs/base-generic/CONFIG_GPIO_PCI_IDIO_16
diff --git a/baseconfig/CONFIG_GPIO_PISOSR b/configs/base-generic/CONFIG_GPIO_PISOSR
index 0026e4baf..0026e4baf 100644
--- a/baseconfig/CONFIG_GPIO_PISOSR
+++ b/configs/base-generic/CONFIG_GPIO_PISOSR
diff --git a/baseconfig/CONFIG_GPIO_RDC321X b/configs/base-generic/CONFIG_GPIO_RDC321X
index 241293f19..241293f19 100644
--- a/baseconfig/CONFIG_GPIO_RDC321X
+++ b/configs/base-generic/CONFIG_GPIO_RDC321X
diff --git a/baseconfig/CONFIG_GPIO_SCH311X b/configs/base-generic/CONFIG_GPIO_SCH311X
index 62c932c31..62c932c31 100644
--- a/baseconfig/CONFIG_GPIO_SCH311X
+++ b/configs/base-generic/CONFIG_GPIO_SCH311X
diff --git a/baseconfig/CONFIG_GPIO_SX150X b/configs/base-generic/CONFIG_GPIO_SX150X
index 62a20c7d2..62a20c7d2 100644
--- a/baseconfig/CONFIG_GPIO_SX150X
+++ b/configs/base-generic/CONFIG_GPIO_SX150X
diff --git a/baseconfig/CONFIG_GPIO_SYSCON b/configs/base-generic/CONFIG_GPIO_SYSCON
index 714d52d62..714d52d62 100644
--- a/baseconfig/CONFIG_GPIO_SYSCON
+++ b/configs/base-generic/CONFIG_GPIO_SYSCON
diff --git a/baseconfig/CONFIG_GPIO_SYSFS b/configs/base-generic/CONFIG_GPIO_SYSFS
index 006904523..006904523 100644
--- a/baseconfig/CONFIG_GPIO_SYSFS
+++ b/configs/base-generic/CONFIG_GPIO_SYSFS
diff --git a/baseconfig/CONFIG_GPIO_TPIC2810 b/configs/base-generic/CONFIG_GPIO_TPIC2810
index a522f6101..a522f6101 100644
--- a/baseconfig/CONFIG_GPIO_TPIC2810
+++ b/configs/base-generic/CONFIG_GPIO_TPIC2810
diff --git a/baseconfig/CONFIG_GPIO_TPS68470 b/configs/base-generic/CONFIG_GPIO_TPS68470
index 3176e956e..3176e956e 100644
--- a/baseconfig/CONFIG_GPIO_TPS68470
+++ b/configs/base-generic/CONFIG_GPIO_TPS68470
diff --git a/baseconfig/CONFIG_GPIO_TS4900 b/configs/base-generic/CONFIG_GPIO_TS4900
index 0104290a1..0104290a1 100644
--- a/baseconfig/CONFIG_GPIO_TS4900
+++ b/configs/base-generic/CONFIG_GPIO_TS4900
diff --git a/baseconfig/CONFIG_GPIO_TS5500 b/configs/base-generic/CONFIG_GPIO_TS5500
index 83fa08b1f..83fa08b1f 100644
--- a/baseconfig/CONFIG_GPIO_TS5500
+++ b/configs/base-generic/CONFIG_GPIO_TS5500
diff --git a/baseconfig/CONFIG_GPIO_VIPERBOARD b/configs/base-generic/CONFIG_GPIO_VIPERBOARD
index e92c6f0d3..e92c6f0d3 100644
--- a/baseconfig/CONFIG_GPIO_VIPERBOARD
+++ b/configs/base-generic/CONFIG_GPIO_VIPERBOARD
diff --git a/baseconfig/CONFIG_GPIO_WATCHDOG b/configs/base-generic/CONFIG_GPIO_WATCHDOG
index 9dab6e4e2..9dab6e4e2 100644
--- a/baseconfig/CONFIG_GPIO_WATCHDOG
+++ b/configs/base-generic/CONFIG_GPIO_WATCHDOG
diff --git a/baseconfig/CONFIG_GPIO_WS16C48 b/configs/base-generic/CONFIG_GPIO_WS16C48
index 75427dc0f..75427dc0f 100644
--- a/baseconfig/CONFIG_GPIO_WS16C48
+++ b/configs/base-generic/CONFIG_GPIO_WS16C48
diff --git a/baseconfig/CONFIG_GPIO_XILINX b/configs/base-generic/CONFIG_GPIO_XILINX
index d7769012b..d7769012b 100644
--- a/baseconfig/CONFIG_GPIO_XILINX
+++ b/configs/base-generic/CONFIG_GPIO_XILINX
diff --git a/baseconfig/CONFIG_GPIO_XRA1403 b/configs/base-generic/CONFIG_GPIO_XRA1403
index c9567433f..c9567433f 100644
--- a/baseconfig/CONFIG_GPIO_XRA1403
+++ b/configs/base-generic/CONFIG_GPIO_XRA1403
diff --git a/baseconfig/CONFIG_GREENASIA_FF b/configs/base-generic/CONFIG_GREENASIA_FF
index b2b58fd13..b2b58fd13 100644
--- a/baseconfig/CONFIG_GREENASIA_FF
+++ b/configs/base-generic/CONFIG_GREENASIA_FF
diff --git a/baseconfig/CONFIG_GREYBUS b/configs/base-generic/CONFIG_GREYBUS
index 7fa945c33..7fa945c33 100644
--- a/baseconfig/CONFIG_GREYBUS
+++ b/configs/base-generic/CONFIG_GREYBUS
diff --git a/baseconfig/CONFIG_GS_FPGABOOT b/configs/base-generic/CONFIG_GS_FPGABOOT
index 339d165e7..339d165e7 100644
--- a/baseconfig/CONFIG_GS_FPGABOOT
+++ b/configs/base-generic/CONFIG_GS_FPGABOOT
diff --git a/baseconfig/CONFIG_GTP b/configs/base-generic/CONFIG_GTP
index c2cc5ab00..c2cc5ab00 100644
--- a/baseconfig/CONFIG_GTP
+++ b/configs/base-generic/CONFIG_GTP
diff --git a/baseconfig/CONFIG_HAMACHI b/configs/base-generic/CONFIG_HAMACHI
index 88047b4d5..88047b4d5 100644
--- a/baseconfig/CONFIG_HAMACHI
+++ b/configs/base-generic/CONFIG_HAMACHI
diff --git a/baseconfig/CONFIG_HAMRADIO b/configs/base-generic/CONFIG_HAMRADIO
index ad6509f4a..ad6509f4a 100644
--- a/baseconfig/CONFIG_HAMRADIO
+++ b/configs/base-generic/CONFIG_HAMRADIO
diff --git a/baseconfig/CONFIG_HANGCHECK_TIMER b/configs/base-generic/CONFIG_HANGCHECK_TIMER
index 74d6f3e7a..74d6f3e7a 100644
--- a/baseconfig/CONFIG_HANGCHECK_TIMER
+++ b/configs/base-generic/CONFIG_HANGCHECK_TIMER
diff --git a/baseconfig/CONFIG_HAPPYMEAL b/configs/base-generic/CONFIG_HAPPYMEAL
index 042350f5c..042350f5c 100644
--- a/baseconfig/CONFIG_HAPPYMEAL
+++ b/configs/base-generic/CONFIG_HAPPYMEAL
diff --git a/baseconfig/CONFIG_HARDENED_USERCOPY b/configs/base-generic/CONFIG_HARDENED_USERCOPY
index d2dcc857f..d2dcc857f 100644
--- a/baseconfig/CONFIG_HARDENED_USERCOPY
+++ b/configs/base-generic/CONFIG_HARDENED_USERCOPY
diff --git a/baseconfig/CONFIG_HD44780 b/configs/base-generic/CONFIG_HD44780
index 22e6cf3b3..22e6cf3b3 100644
--- a/baseconfig/CONFIG_HD44780
+++ b/configs/base-generic/CONFIG_HD44780
diff --git a/baseconfig/CONFIG_HDC100X b/configs/base-generic/CONFIG_HDC100X
index e8e7ce278..e8e7ce278 100644
--- a/baseconfig/CONFIG_HDC100X
+++ b/configs/base-generic/CONFIG_HDC100X
diff --git a/baseconfig/CONFIG_HEADERS_CHECK b/configs/base-generic/CONFIG_HEADERS_CHECK
index 0658b1fce..0658b1fce 100644
--- a/baseconfig/CONFIG_HEADERS_CHECK
+++ b/configs/base-generic/CONFIG_HEADERS_CHECK
diff --git a/baseconfig/CONFIG_HERMES b/configs/base-generic/CONFIG_HERMES
index 704653c90..704653c90 100644
--- a/baseconfig/CONFIG_HERMES
+++ b/configs/base-generic/CONFIG_HERMES
diff --git a/baseconfig/CONFIG_HERMES_CACHE_FW_ON_INIT b/configs/base-generic/CONFIG_HERMES_CACHE_FW_ON_INIT
index fd8ccee40..fd8ccee40 100644
--- a/baseconfig/CONFIG_HERMES_CACHE_FW_ON_INIT
+++ b/configs/base-generic/CONFIG_HERMES_CACHE_FW_ON_INIT
diff --git a/baseconfig/CONFIG_HERMES_PRISM b/configs/base-generic/CONFIG_HERMES_PRISM
index 37ee1d017..37ee1d017 100644
--- a/baseconfig/CONFIG_HERMES_PRISM
+++ b/configs/base-generic/CONFIG_HERMES_PRISM
diff --git a/baseconfig/CONFIG_HFSPLUS_FS b/configs/base-generic/CONFIG_HFSPLUS_FS
index e3d6e0bc4..e3d6e0bc4 100644
--- a/baseconfig/CONFIG_HFSPLUS_FS
+++ b/configs/base-generic/CONFIG_HFSPLUS_FS
diff --git a/baseconfig/CONFIG_HFSPLUS_FS_POSIX_ACL b/configs/base-generic/CONFIG_HFSPLUS_FS_POSIX_ACL
index 103a9403b..103a9403b 100644
--- a/baseconfig/CONFIG_HFSPLUS_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_HFSPLUS_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_HFS_FS b/configs/base-generic/CONFIG_HFS_FS
index 3cbccd390..3cbccd390 100644
--- a/baseconfig/CONFIG_HFS_FS
+++ b/configs/base-generic/CONFIG_HFS_FS
diff --git a/baseconfig/CONFIG_HI8435 b/configs/base-generic/CONFIG_HI8435
index 21ee368ce..21ee368ce 100644
--- a/baseconfig/CONFIG_HI8435
+++ b/configs/base-generic/CONFIG_HI8435
diff --git a/baseconfig/CONFIG_HIBERNATION b/configs/base-generic/CONFIG_HIBERNATION
index 8df6f5c69..8df6f5c69 100644
--- a/baseconfig/CONFIG_HIBERNATION
+++ b/configs/base-generic/CONFIG_HIBERNATION
diff --git a/baseconfig/CONFIG_HID b/configs/base-generic/CONFIG_HID
index b82f510fc..b82f510fc 100644
--- a/baseconfig/CONFIG_HID
+++ b/configs/base-generic/CONFIG_HID
diff --git a/baseconfig/CONFIG_HIDRAW b/configs/base-generic/CONFIG_HIDRAW
index bbd271ab1..bbd271ab1 100644
--- a/baseconfig/CONFIG_HIDRAW
+++ b/configs/base-generic/CONFIG_HIDRAW
diff --git a/baseconfig/CONFIG_HID_A4TECH b/configs/base-generic/CONFIG_HID_A4TECH
index bc5b3baab..bc5b3baab 100644
--- a/baseconfig/CONFIG_HID_A4TECH
+++ b/configs/base-generic/CONFIG_HID_A4TECH
diff --git a/baseconfig/CONFIG_HID_ACCUTOUCH b/configs/base-generic/CONFIG_HID_ACCUTOUCH
index 7b8010de1..7b8010de1 100644
--- a/baseconfig/CONFIG_HID_ACCUTOUCH
+++ b/configs/base-generic/CONFIG_HID_ACCUTOUCH
diff --git a/baseconfig/CONFIG_HID_ACRUX b/configs/base-generic/CONFIG_HID_ACRUX
index 4964a93c2..4964a93c2 100644
--- a/baseconfig/CONFIG_HID_ACRUX
+++ b/configs/base-generic/CONFIG_HID_ACRUX
diff --git a/baseconfig/CONFIG_HID_ACRUX_FF b/configs/base-generic/CONFIG_HID_ACRUX_FF
index 68cf4fce6..68cf4fce6 100644
--- a/baseconfig/CONFIG_HID_ACRUX_FF
+++ b/configs/base-generic/CONFIG_HID_ACRUX_FF
diff --git a/baseconfig/CONFIG_HID_ALPS b/configs/base-generic/CONFIG_HID_ALPS
index 81f929d6b..81f929d6b 100644
--- a/baseconfig/CONFIG_HID_ALPS
+++ b/configs/base-generic/CONFIG_HID_ALPS
diff --git a/baseconfig/CONFIG_HID_APPLE b/configs/base-generic/CONFIG_HID_APPLE
index cf025b274..cf025b274 100644
--- a/baseconfig/CONFIG_HID_APPLE
+++ b/configs/base-generic/CONFIG_HID_APPLE
diff --git a/baseconfig/CONFIG_HID_APPLEIR b/configs/base-generic/CONFIG_HID_APPLEIR
index 6e8cc4a50..6e8cc4a50 100644
--- a/baseconfig/CONFIG_HID_APPLEIR
+++ b/configs/base-generic/CONFIG_HID_APPLEIR
diff --git a/baseconfig/CONFIG_HID_ASUS b/configs/base-generic/CONFIG_HID_ASUS
index b5df524a7..b5df524a7 100644
--- a/baseconfig/CONFIG_HID_ASUS
+++ b/configs/base-generic/CONFIG_HID_ASUS
diff --git a/baseconfig/CONFIG_HID_AUREAL b/configs/base-generic/CONFIG_HID_AUREAL
index c639c7db1..c639c7db1 100644
--- a/baseconfig/CONFIG_HID_AUREAL
+++ b/configs/base-generic/CONFIG_HID_AUREAL
diff --git a/baseconfig/CONFIG_HID_BATTERY_STRENGTH b/configs/base-generic/CONFIG_HID_BATTERY_STRENGTH
index 46efe6a26..46efe6a26 100644
--- a/baseconfig/CONFIG_HID_BATTERY_STRENGTH
+++ b/configs/base-generic/CONFIG_HID_BATTERY_STRENGTH
diff --git a/baseconfig/CONFIG_HID_BELKIN b/configs/base-generic/CONFIG_HID_BELKIN
index 62b7e7ed7..62b7e7ed7 100644
--- a/baseconfig/CONFIG_HID_BELKIN
+++ b/configs/base-generic/CONFIG_HID_BELKIN
diff --git a/baseconfig/CONFIG_HID_BETOP_FF b/configs/base-generic/CONFIG_HID_BETOP_FF
index 61c9a90cf..61c9a90cf 100644
--- a/baseconfig/CONFIG_HID_BETOP_FF
+++ b/configs/base-generic/CONFIG_HID_BETOP_FF
diff --git a/baseconfig/CONFIG_HID_CHERRY b/configs/base-generic/CONFIG_HID_CHERRY
index 160f0d200..160f0d200 100644
--- a/baseconfig/CONFIG_HID_CHERRY
+++ b/configs/base-generic/CONFIG_HID_CHERRY
diff --git a/baseconfig/CONFIG_HID_CHICONY b/configs/base-generic/CONFIG_HID_CHICONY
index c1d156579..c1d156579 100644
--- a/baseconfig/CONFIG_HID_CHICONY
+++ b/configs/base-generic/CONFIG_HID_CHICONY
diff --git a/baseconfig/CONFIG_HID_CMEDIA b/configs/base-generic/CONFIG_HID_CMEDIA
index c168e7ea0..c168e7ea0 100644
--- a/baseconfig/CONFIG_HID_CMEDIA
+++ b/configs/base-generic/CONFIG_HID_CMEDIA
diff --git a/baseconfig/CONFIG_HID_CORSAIR b/configs/base-generic/CONFIG_HID_CORSAIR
index a169a44ce..a169a44ce 100644
--- a/baseconfig/CONFIG_HID_CORSAIR
+++ b/configs/base-generic/CONFIG_HID_CORSAIR
diff --git a/baseconfig/CONFIG_HID_CP2112 b/configs/base-generic/CONFIG_HID_CP2112
index 3f9425d1d..3f9425d1d 100644
--- a/baseconfig/CONFIG_HID_CP2112
+++ b/configs/base-generic/CONFIG_HID_CP2112
diff --git a/baseconfig/CONFIG_HID_CYPRESS b/configs/base-generic/CONFIG_HID_CYPRESS
index 8e9d3427e..8e9d3427e 100644
--- a/baseconfig/CONFIG_HID_CYPRESS
+++ b/configs/base-generic/CONFIG_HID_CYPRESS
diff --git a/baseconfig/CONFIG_HID_DRAGONRISE b/configs/base-generic/CONFIG_HID_DRAGONRISE
index 284f173cb..284f173cb 100644
--- a/baseconfig/CONFIG_HID_DRAGONRISE
+++ b/configs/base-generic/CONFIG_HID_DRAGONRISE
diff --git a/baseconfig/CONFIG_HID_ELECOM b/configs/base-generic/CONFIG_HID_ELECOM
index 6257669d8..6257669d8 100644
--- a/baseconfig/CONFIG_HID_ELECOM
+++ b/configs/base-generic/CONFIG_HID_ELECOM
diff --git a/baseconfig/CONFIG_HID_ELO b/configs/base-generic/CONFIG_HID_ELO
index 96a4baae7..96a4baae7 100644
--- a/baseconfig/CONFIG_HID_ELO
+++ b/configs/base-generic/CONFIG_HID_ELO
diff --git a/baseconfig/CONFIG_HID_EMS_FF b/configs/base-generic/CONFIG_HID_EMS_FF
index 6d66fe598..6d66fe598 100644
--- a/baseconfig/CONFIG_HID_EMS_FF
+++ b/configs/base-generic/CONFIG_HID_EMS_FF
diff --git a/baseconfig/CONFIG_HID_EZKEY b/configs/base-generic/CONFIG_HID_EZKEY
index ddb013273..ddb013273 100644
--- a/baseconfig/CONFIG_HID_EZKEY
+++ b/configs/base-generic/CONFIG_HID_EZKEY
diff --git a/baseconfig/CONFIG_HID_GEMBIRD b/configs/base-generic/CONFIG_HID_GEMBIRD
index 30a71336e..30a71336e 100644
--- a/baseconfig/CONFIG_HID_GEMBIRD
+++ b/configs/base-generic/CONFIG_HID_GEMBIRD
diff --git a/baseconfig/CONFIG_HID_GENERIC b/configs/base-generic/CONFIG_HID_GENERIC
index a2b8a6c4a..a2b8a6c4a 100644
--- a/baseconfig/CONFIG_HID_GENERIC
+++ b/configs/base-generic/CONFIG_HID_GENERIC
diff --git a/baseconfig/CONFIG_HID_GFRM b/configs/base-generic/CONFIG_HID_GFRM
index 7d79dc791..7d79dc791 100644
--- a/baseconfig/CONFIG_HID_GFRM
+++ b/configs/base-generic/CONFIG_HID_GFRM
diff --git a/baseconfig/CONFIG_HID_GREENASIA b/configs/base-generic/CONFIG_HID_GREENASIA
index faed7bf9d..faed7bf9d 100644
--- a/baseconfig/CONFIG_HID_GREENASIA
+++ b/configs/base-generic/CONFIG_HID_GREENASIA
diff --git a/baseconfig/CONFIG_HID_GT683R b/configs/base-generic/CONFIG_HID_GT683R
index c65fcc22f..c65fcc22f 100644
--- a/baseconfig/CONFIG_HID_GT683R
+++ b/configs/base-generic/CONFIG_HID_GT683R
diff --git a/baseconfig/CONFIG_HID_GYRATION b/configs/base-generic/CONFIG_HID_GYRATION
index 6d4a9391f..6d4a9391f 100644
--- a/baseconfig/CONFIG_HID_GYRATION
+++ b/configs/base-generic/CONFIG_HID_GYRATION
diff --git a/baseconfig/CONFIG_HID_HOLTEK b/configs/base-generic/CONFIG_HID_HOLTEK
index 2118385dd..2118385dd 100644
--- a/baseconfig/CONFIG_HID_HOLTEK
+++ b/configs/base-generic/CONFIG_HID_HOLTEK
diff --git a/baseconfig/CONFIG_HID_ICADE b/configs/base-generic/CONFIG_HID_ICADE
index c9d3d1edd..c9d3d1edd 100644
--- a/baseconfig/CONFIG_HID_ICADE
+++ b/configs/base-generic/CONFIG_HID_ICADE
diff --git a/baseconfig/CONFIG_HID_ITE b/configs/base-generic/CONFIG_HID_ITE
index b4af4b45e..b4af4b45e 100644
--- a/baseconfig/CONFIG_HID_ITE
+++ b/configs/base-generic/CONFIG_HID_ITE
diff --git a/baseconfig/CONFIG_HID_KENSINGTON b/configs/base-generic/CONFIG_HID_KENSINGTON
index 4fbf2d237..4fbf2d237 100644
--- a/baseconfig/CONFIG_HID_KENSINGTON
+++ b/configs/base-generic/CONFIG_HID_KENSINGTON
diff --git a/baseconfig/CONFIG_HID_KEYTOUCH b/configs/base-generic/CONFIG_HID_KEYTOUCH
index 39d8ced60..39d8ced60 100644
--- a/baseconfig/CONFIG_HID_KEYTOUCH
+++ b/configs/base-generic/CONFIG_HID_KEYTOUCH
diff --git a/baseconfig/CONFIG_HID_KYE b/configs/base-generic/CONFIG_HID_KYE
index 0987d5b06..0987d5b06 100644
--- a/baseconfig/CONFIG_HID_KYE
+++ b/configs/base-generic/CONFIG_HID_KYE
diff --git a/baseconfig/CONFIG_HID_LCPOWER b/configs/base-generic/CONFIG_HID_LCPOWER
index 4ccf9204d..4ccf9204d 100644
--- a/baseconfig/CONFIG_HID_LCPOWER
+++ b/configs/base-generic/CONFIG_HID_LCPOWER
diff --git a/baseconfig/CONFIG_HID_LED b/configs/base-generic/CONFIG_HID_LED
index dfe3a9a1e..dfe3a9a1e 100644
--- a/baseconfig/CONFIG_HID_LED
+++ b/configs/base-generic/CONFIG_HID_LED
diff --git a/baseconfig/CONFIG_HID_LENOVO b/configs/base-generic/CONFIG_HID_LENOVO
index 32888ff64..32888ff64 100644
--- a/baseconfig/CONFIG_HID_LENOVO
+++ b/configs/base-generic/CONFIG_HID_LENOVO
diff --git a/baseconfig/CONFIG_HID_LOGITECH b/configs/base-generic/CONFIG_HID_LOGITECH
index dc04d70e8..dc04d70e8 100644
--- a/baseconfig/CONFIG_HID_LOGITECH
+++ b/configs/base-generic/CONFIG_HID_LOGITECH
diff --git a/baseconfig/CONFIG_HID_LOGITECH_DJ b/configs/base-generic/CONFIG_HID_LOGITECH_DJ
index 5973b1e78..5973b1e78 100644
--- a/baseconfig/CONFIG_HID_LOGITECH_DJ
+++ b/configs/base-generic/CONFIG_HID_LOGITECH_DJ
diff --git a/baseconfig/CONFIG_HID_LOGITECH_HIDPP b/configs/base-generic/CONFIG_HID_LOGITECH_HIDPP
index 965f6aa0f..965f6aa0f 100644
--- a/baseconfig/CONFIG_HID_LOGITECH_HIDPP
+++ b/configs/base-generic/CONFIG_HID_LOGITECH_HIDPP
diff --git a/baseconfig/CONFIG_HID_MAGICMOUSE b/configs/base-generic/CONFIG_HID_MAGICMOUSE
index 524303e24..524303e24 100644
--- a/baseconfig/CONFIG_HID_MAGICMOUSE
+++ b/configs/base-generic/CONFIG_HID_MAGICMOUSE
diff --git a/baseconfig/CONFIG_HID_MAYFLASH b/configs/base-generic/CONFIG_HID_MAYFLASH
index c8bef690b..c8bef690b 100644
--- a/baseconfig/CONFIG_HID_MAYFLASH
+++ b/configs/base-generic/CONFIG_HID_MAYFLASH
diff --git a/baseconfig/CONFIG_HID_MICROSOFT b/configs/base-generic/CONFIG_HID_MICROSOFT
index 48983ea3b..48983ea3b 100644
--- a/baseconfig/CONFIG_HID_MICROSOFT
+++ b/configs/base-generic/CONFIG_HID_MICROSOFT
diff --git a/baseconfig/CONFIG_HID_MONTEREY b/configs/base-generic/CONFIG_HID_MONTEREY
index 087b000d3..087b000d3 100644
--- a/baseconfig/CONFIG_HID_MONTEREY
+++ b/configs/base-generic/CONFIG_HID_MONTEREY
diff --git a/baseconfig/CONFIG_HID_MULTITOUCH b/configs/base-generic/CONFIG_HID_MULTITOUCH
index 790279888..790279888 100644
--- a/baseconfig/CONFIG_HID_MULTITOUCH
+++ b/configs/base-generic/CONFIG_HID_MULTITOUCH
diff --git a/baseconfig/CONFIG_HID_NTI b/configs/base-generic/CONFIG_HID_NTI
index c239c7052..c239c7052 100644
--- a/baseconfig/CONFIG_HID_NTI
+++ b/configs/base-generic/CONFIG_HID_NTI
diff --git a/baseconfig/CONFIG_HID_NTRIG b/configs/base-generic/CONFIG_HID_NTRIG
index 9b0ac9189..9b0ac9189 100644
--- a/baseconfig/CONFIG_HID_NTRIG
+++ b/configs/base-generic/CONFIG_HID_NTRIG
diff --git a/baseconfig/CONFIG_HID_ORTEK b/configs/base-generic/CONFIG_HID_ORTEK
index a0030810c..a0030810c 100644
--- a/baseconfig/CONFIG_HID_ORTEK
+++ b/configs/base-generic/CONFIG_HID_ORTEK
diff --git a/baseconfig/CONFIG_HID_PANTHERLORD b/configs/base-generic/CONFIG_HID_PANTHERLORD
index e12ea738a..e12ea738a 100644
--- a/baseconfig/CONFIG_HID_PANTHERLORD
+++ b/configs/base-generic/CONFIG_HID_PANTHERLORD
diff --git a/baseconfig/CONFIG_HID_PENMOUNT b/configs/base-generic/CONFIG_HID_PENMOUNT
index e8ce0dab6..e8ce0dab6 100644
--- a/baseconfig/CONFIG_HID_PENMOUNT
+++ b/configs/base-generic/CONFIG_HID_PENMOUNT
diff --git a/baseconfig/CONFIG_HID_PETALYNX b/configs/base-generic/CONFIG_HID_PETALYNX
index 260ea69bd..260ea69bd 100644
--- a/baseconfig/CONFIG_HID_PETALYNX
+++ b/configs/base-generic/CONFIG_HID_PETALYNX
diff --git a/baseconfig/CONFIG_HID_PICOLCD b/configs/base-generic/CONFIG_HID_PICOLCD
index fb20d5ce3..fb20d5ce3 100644
--- a/baseconfig/CONFIG_HID_PICOLCD
+++ b/configs/base-generic/CONFIG_HID_PICOLCD
diff --git a/baseconfig/CONFIG_HID_PID b/configs/base-generic/CONFIG_HID_PID
index d4c80820d..d4c80820d 100644
--- a/baseconfig/CONFIG_HID_PID
+++ b/configs/base-generic/CONFIG_HID_PID
diff --git a/baseconfig/CONFIG_HID_PLANTRONICS b/configs/base-generic/CONFIG_HID_PLANTRONICS
index f99242de7..f99242de7 100644
--- a/baseconfig/CONFIG_HID_PLANTRONICS
+++ b/configs/base-generic/CONFIG_HID_PLANTRONICS
diff --git a/baseconfig/CONFIG_HID_PRIMAX b/configs/base-generic/CONFIG_HID_PRIMAX
index 1c60e2cdc..1c60e2cdc 100644
--- a/baseconfig/CONFIG_HID_PRIMAX
+++ b/configs/base-generic/CONFIG_HID_PRIMAX
diff --git a/baseconfig/CONFIG_HID_PRODIKEYS b/configs/base-generic/CONFIG_HID_PRODIKEYS
index a7aa8256e..a7aa8256e 100644
--- a/baseconfig/CONFIG_HID_PRODIKEYS
+++ b/configs/base-generic/CONFIG_HID_PRODIKEYS
diff --git a/baseconfig/CONFIG_HID_RETRODE b/configs/base-generic/CONFIG_HID_RETRODE
index 9d8b33ccc..9d8b33ccc 100644
--- a/baseconfig/CONFIG_HID_RETRODE
+++ b/configs/base-generic/CONFIG_HID_RETRODE
diff --git a/baseconfig/CONFIG_HID_RMI b/configs/base-generic/CONFIG_HID_RMI
index 287d4bc0f..287d4bc0f 100644
--- a/baseconfig/CONFIG_HID_RMI
+++ b/configs/base-generic/CONFIG_HID_RMI
diff --git a/baseconfig/CONFIG_HID_ROCCAT b/configs/base-generic/CONFIG_HID_ROCCAT
index 9b2f14d42..9b2f14d42 100644
--- a/baseconfig/CONFIG_HID_ROCCAT
+++ b/configs/base-generic/CONFIG_HID_ROCCAT
diff --git a/baseconfig/CONFIG_HID_SAITEK b/configs/base-generic/CONFIG_HID_SAITEK
index fecfba018..fecfba018 100644
--- a/baseconfig/CONFIG_HID_SAITEK
+++ b/configs/base-generic/CONFIG_HID_SAITEK
diff --git a/baseconfig/CONFIG_HID_SAMSUNG b/configs/base-generic/CONFIG_HID_SAMSUNG
index 2540e9c9a..2540e9c9a 100644
--- a/baseconfig/CONFIG_HID_SAMSUNG
+++ b/configs/base-generic/CONFIG_HID_SAMSUNG
diff --git a/baseconfig/CONFIG_HID_SENSOR_ACCEL_3D b/configs/base-generic/CONFIG_HID_SENSOR_ACCEL_3D
index 58460b8bf..58460b8bf 100644
--- a/baseconfig/CONFIG_HID_SENSOR_ACCEL_3D
+++ b/configs/base-generic/CONFIG_HID_SENSOR_ACCEL_3D
diff --git a/baseconfig/CONFIG_HID_SENSOR_ALS b/configs/base-generic/CONFIG_HID_SENSOR_ALS
index a8a99f6b3..a8a99f6b3 100644
--- a/baseconfig/CONFIG_HID_SENSOR_ALS
+++ b/configs/base-generic/CONFIG_HID_SENSOR_ALS
diff --git a/baseconfig/CONFIG_HID_SENSOR_CUSTOM_SENSOR b/configs/base-generic/CONFIG_HID_SENSOR_CUSTOM_SENSOR
index ff4111852..ff4111852 100644
--- a/baseconfig/CONFIG_HID_SENSOR_CUSTOM_SENSOR
+++ b/configs/base-generic/CONFIG_HID_SENSOR_CUSTOM_SENSOR
diff --git a/baseconfig/CONFIG_HID_SENSOR_DEVICE_ROTATION b/configs/base-generic/CONFIG_HID_SENSOR_DEVICE_ROTATION
index 66449de3b..66449de3b 100644
--- a/baseconfig/CONFIG_HID_SENSOR_DEVICE_ROTATION
+++ b/configs/base-generic/CONFIG_HID_SENSOR_DEVICE_ROTATION
diff --git a/baseconfig/CONFIG_HID_SENSOR_GYRO_3D b/configs/base-generic/CONFIG_HID_SENSOR_GYRO_3D
index b2aa13a9f..b2aa13a9f 100644
--- a/baseconfig/CONFIG_HID_SENSOR_GYRO_3D
+++ b/configs/base-generic/CONFIG_HID_SENSOR_GYRO_3D
diff --git a/baseconfig/CONFIG_HID_SENSOR_HUB b/configs/base-generic/CONFIG_HID_SENSOR_HUB
index bfb17e403..bfb17e403 100644
--- a/baseconfig/CONFIG_HID_SENSOR_HUB
+++ b/configs/base-generic/CONFIG_HID_SENSOR_HUB
diff --git a/baseconfig/CONFIG_HID_SENSOR_HUMIDITY b/configs/base-generic/CONFIG_HID_SENSOR_HUMIDITY
index d50f5014a..d50f5014a 100644
--- a/baseconfig/CONFIG_HID_SENSOR_HUMIDITY
+++ b/configs/base-generic/CONFIG_HID_SENSOR_HUMIDITY
diff --git a/baseconfig/CONFIG_HID_SENSOR_IIO_COMMON b/configs/base-generic/CONFIG_HID_SENSOR_IIO_COMMON
index fc396a26c..fc396a26c 100644
--- a/baseconfig/CONFIG_HID_SENSOR_IIO_COMMON
+++ b/configs/base-generic/CONFIG_HID_SENSOR_IIO_COMMON
diff --git a/baseconfig/CONFIG_HID_SENSOR_IIO_TRIGGER b/configs/base-generic/CONFIG_HID_SENSOR_IIO_TRIGGER
index b9cfc649f..b9cfc649f 100644
--- a/baseconfig/CONFIG_HID_SENSOR_IIO_TRIGGER
+++ b/configs/base-generic/CONFIG_HID_SENSOR_IIO_TRIGGER
diff --git a/baseconfig/CONFIG_HID_SENSOR_INCLINOMETER_3D b/configs/base-generic/CONFIG_HID_SENSOR_INCLINOMETER_3D
index 7a9399cb1..7a9399cb1 100644
--- a/baseconfig/CONFIG_HID_SENSOR_INCLINOMETER_3D
+++ b/configs/base-generic/CONFIG_HID_SENSOR_INCLINOMETER_3D
diff --git a/baseconfig/CONFIG_HID_SENSOR_MAGNETOMETER_3D b/configs/base-generic/CONFIG_HID_SENSOR_MAGNETOMETER_3D
index 61036565f..61036565f 100644
--- a/baseconfig/CONFIG_HID_SENSOR_MAGNETOMETER_3D
+++ b/configs/base-generic/CONFIG_HID_SENSOR_MAGNETOMETER_3D
diff --git a/baseconfig/CONFIG_HID_SENSOR_PRESS b/configs/base-generic/CONFIG_HID_SENSOR_PRESS
index 10e33f2f5..10e33f2f5 100644
--- a/baseconfig/CONFIG_HID_SENSOR_PRESS
+++ b/configs/base-generic/CONFIG_HID_SENSOR_PRESS
diff --git a/baseconfig/CONFIG_HID_SENSOR_PROX b/configs/base-generic/CONFIG_HID_SENSOR_PROX
index bbdc287be..bbdc287be 100644
--- a/baseconfig/CONFIG_HID_SENSOR_PROX
+++ b/configs/base-generic/CONFIG_HID_SENSOR_PROX
diff --git a/baseconfig/CONFIG_HID_SENSOR_TEMP b/configs/base-generic/CONFIG_HID_SENSOR_TEMP
index 6f1a98bc0..6f1a98bc0 100644
--- a/baseconfig/CONFIG_HID_SENSOR_TEMP
+++ b/configs/base-generic/CONFIG_HID_SENSOR_TEMP
diff --git a/baseconfig/CONFIG_HID_SMARTJOYPLUS b/configs/base-generic/CONFIG_HID_SMARTJOYPLUS
index 9bbdeb0e6..9bbdeb0e6 100644
--- a/baseconfig/CONFIG_HID_SMARTJOYPLUS
+++ b/configs/base-generic/CONFIG_HID_SMARTJOYPLUS
diff --git a/baseconfig/CONFIG_HID_SONY b/configs/base-generic/CONFIG_HID_SONY
index 6ee0f6474..6ee0f6474 100644
--- a/baseconfig/CONFIG_HID_SONY
+++ b/configs/base-generic/CONFIG_HID_SONY
diff --git a/baseconfig/CONFIG_HID_SPEEDLINK b/configs/base-generic/CONFIG_HID_SPEEDLINK
index 6019addf9..6019addf9 100644
--- a/baseconfig/CONFIG_HID_SPEEDLINK
+++ b/configs/base-generic/CONFIG_HID_SPEEDLINK
diff --git a/baseconfig/CONFIG_HID_STEELSERIES b/configs/base-generic/CONFIG_HID_STEELSERIES
index 77f65e9e7..77f65e9e7 100644
--- a/baseconfig/CONFIG_HID_STEELSERIES
+++ b/configs/base-generic/CONFIG_HID_STEELSERIES
diff --git a/baseconfig/CONFIG_HID_SUNPLUS b/configs/base-generic/CONFIG_HID_SUNPLUS
index 724c2c737..724c2c737 100644
--- a/baseconfig/CONFIG_HID_SUNPLUS
+++ b/configs/base-generic/CONFIG_HID_SUNPLUS
diff --git a/baseconfig/CONFIG_HID_THINGM b/configs/base-generic/CONFIG_HID_THINGM
index a41c6e458..a41c6e458 100644
--- a/baseconfig/CONFIG_HID_THINGM
+++ b/configs/base-generic/CONFIG_HID_THINGM
diff --git a/baseconfig/CONFIG_HID_THRUSTMASTER b/configs/base-generic/CONFIG_HID_THRUSTMASTER
index 4dde89479..4dde89479 100644
--- a/baseconfig/CONFIG_HID_THRUSTMASTER
+++ b/configs/base-generic/CONFIG_HID_THRUSTMASTER
diff --git a/baseconfig/CONFIG_HID_TIVO b/configs/base-generic/CONFIG_HID_TIVO
index a33d735dd..a33d735dd 100644
--- a/baseconfig/CONFIG_HID_TIVO
+++ b/configs/base-generic/CONFIG_HID_TIVO
diff --git a/baseconfig/CONFIG_HID_TOPSEED b/configs/base-generic/CONFIG_HID_TOPSEED
index 8e1879f7c..8e1879f7c 100644
--- a/baseconfig/CONFIG_HID_TOPSEED
+++ b/configs/base-generic/CONFIG_HID_TOPSEED
diff --git a/baseconfig/CONFIG_HID_TWINHAN b/configs/base-generic/CONFIG_HID_TWINHAN
index 0f930a425..0f930a425 100644
--- a/baseconfig/CONFIG_HID_TWINHAN
+++ b/configs/base-generic/CONFIG_HID_TWINHAN
diff --git a/baseconfig/CONFIG_HID_UCLOGIC b/configs/base-generic/CONFIG_HID_UCLOGIC
index 9fa1b889b..9fa1b889b 100644
--- a/baseconfig/CONFIG_HID_UCLOGIC
+++ b/configs/base-generic/CONFIG_HID_UCLOGIC
diff --git a/baseconfig/CONFIG_HID_UDRAW_PS3 b/configs/base-generic/CONFIG_HID_UDRAW_PS3
index d8bb2f496..d8bb2f496 100644
--- a/baseconfig/CONFIG_HID_UDRAW_PS3
+++ b/configs/base-generic/CONFIG_HID_UDRAW_PS3
diff --git a/baseconfig/CONFIG_HID_WACOM b/configs/base-generic/CONFIG_HID_WACOM
index 9da42d4d3..9da42d4d3 100644
--- a/baseconfig/CONFIG_HID_WACOM
+++ b/configs/base-generic/CONFIG_HID_WACOM
diff --git a/baseconfig/CONFIG_HID_WALTOP b/configs/base-generic/CONFIG_HID_WALTOP
index be9f1ac7d..be9f1ac7d 100644
--- a/baseconfig/CONFIG_HID_WALTOP
+++ b/configs/base-generic/CONFIG_HID_WALTOP
diff --git a/baseconfig/CONFIG_HID_WIIMOTE b/configs/base-generic/CONFIG_HID_WIIMOTE
index 1f69eb18f..1f69eb18f 100644
--- a/baseconfig/CONFIG_HID_WIIMOTE
+++ b/configs/base-generic/CONFIG_HID_WIIMOTE
diff --git a/baseconfig/CONFIG_HID_XINMO b/configs/base-generic/CONFIG_HID_XINMO
index 05c54c7a9..05c54c7a9 100644
--- a/baseconfig/CONFIG_HID_XINMO
+++ b/configs/base-generic/CONFIG_HID_XINMO
diff --git a/baseconfig/CONFIG_HID_ZEROPLUS b/configs/base-generic/CONFIG_HID_ZEROPLUS
index 204a0cdf5..204a0cdf5 100644
--- a/baseconfig/CONFIG_HID_ZEROPLUS
+++ b/configs/base-generic/CONFIG_HID_ZEROPLUS
diff --git a/baseconfig/CONFIG_HID_ZYDACRON b/configs/base-generic/CONFIG_HID_ZYDACRON
index c145906db..c145906db 100644
--- a/baseconfig/CONFIG_HID_ZYDACRON
+++ b/configs/base-generic/CONFIG_HID_ZYDACRON
diff --git a/baseconfig/CONFIG_HIGH_RES_TIMERS b/configs/base-generic/CONFIG_HIGH_RES_TIMERS
index bf244406f..bf244406f 100644
--- a/baseconfig/CONFIG_HIGH_RES_TIMERS
+++ b/configs/base-generic/CONFIG_HIGH_RES_TIMERS
diff --git a/baseconfig/CONFIG_HIPPI b/configs/base-generic/CONFIG_HIPPI
index 8f4d0983a..8f4d0983a 100644
--- a/baseconfig/CONFIG_HIPPI
+++ b/configs/base-generic/CONFIG_HIPPI
diff --git a/baseconfig/CONFIG_HISAX_16_3 b/configs/base-generic/CONFIG_HISAX_16_3
index 4b424c0e1..4b424c0e1 100644
--- a/baseconfig/CONFIG_HISAX_16_3
+++ b/configs/base-generic/CONFIG_HISAX_16_3
diff --git a/baseconfig/CONFIG_HISAX_1TR6 b/configs/base-generic/CONFIG_HISAX_1TR6
index e41ec99fe..e41ec99fe 100644
--- a/baseconfig/CONFIG_HISAX_1TR6
+++ b/configs/base-generic/CONFIG_HISAX_1TR6
diff --git a/baseconfig/CONFIG_HISAX_AVM_A1_CS b/configs/base-generic/CONFIG_HISAX_AVM_A1_CS
index 6b1871d92..6b1871d92 100644
--- a/baseconfig/CONFIG_HISAX_AVM_A1_CS
+++ b/configs/base-generic/CONFIG_HISAX_AVM_A1_CS
diff --git a/baseconfig/CONFIG_HISAX_AVM_A1_PCMCIA b/configs/base-generic/CONFIG_HISAX_AVM_A1_PCMCIA
index 9b4454bd8..9b4454bd8 100644
--- a/baseconfig/CONFIG_HISAX_AVM_A1_PCMCIA
+++ b/configs/base-generic/CONFIG_HISAX_AVM_A1_PCMCIA
diff --git a/baseconfig/CONFIG_HISAX_BKM_A4T b/configs/base-generic/CONFIG_HISAX_BKM_A4T
index 5e70cdd78..5e70cdd78 100644
--- a/baseconfig/CONFIG_HISAX_BKM_A4T
+++ b/configs/base-generic/CONFIG_HISAX_BKM_A4T
diff --git a/baseconfig/CONFIG_HISAX_DEBUG b/configs/base-generic/CONFIG_HISAX_DEBUG
index 3aff1fbbb..3aff1fbbb 100644
--- a/baseconfig/CONFIG_HISAX_DEBUG
+++ b/configs/base-generic/CONFIG_HISAX_DEBUG
diff --git a/baseconfig/CONFIG_HISAX_DIEHLDIVA b/configs/base-generic/CONFIG_HISAX_DIEHLDIVA
index 272812a8d..272812a8d 100644
--- a/baseconfig/CONFIG_HISAX_DIEHLDIVA
+++ b/configs/base-generic/CONFIG_HISAX_DIEHLDIVA
diff --git a/baseconfig/CONFIG_HISAX_ELSA b/configs/base-generic/CONFIG_HISAX_ELSA
index 6ad2e9042..6ad2e9042 100644
--- a/baseconfig/CONFIG_HISAX_ELSA
+++ b/configs/base-generic/CONFIG_HISAX_ELSA
diff --git a/baseconfig/CONFIG_HISAX_ELSA_CS b/configs/base-generic/CONFIG_HISAX_ELSA_CS
index b94837cca..b94837cca 100644
--- a/baseconfig/CONFIG_HISAX_ELSA_CS
+++ b/configs/base-generic/CONFIG_HISAX_ELSA_CS
diff --git a/baseconfig/CONFIG_HISAX_ENTERNOW_PCI b/configs/base-generic/CONFIG_HISAX_ENTERNOW_PCI
index 022d7f7fb..022d7f7fb 100644
--- a/baseconfig/CONFIG_HISAX_ENTERNOW_PCI
+++ b/configs/base-generic/CONFIG_HISAX_ENTERNOW_PCI
diff --git a/baseconfig/CONFIG_HISAX_EURO b/configs/base-generic/CONFIG_HISAX_EURO
index a7ab5efe9..a7ab5efe9 100644
--- a/baseconfig/CONFIG_HISAX_EURO
+++ b/configs/base-generic/CONFIG_HISAX_EURO
diff --git a/baseconfig/CONFIG_HISAX_FRITZPCI b/configs/base-generic/CONFIG_HISAX_FRITZPCI
index 0a5c66a0d..0a5c66a0d 100644
--- a/baseconfig/CONFIG_HISAX_FRITZPCI
+++ b/configs/base-generic/CONFIG_HISAX_FRITZPCI
diff --git a/baseconfig/CONFIG_HISAX_FRITZ_PCIPNP b/configs/base-generic/CONFIG_HISAX_FRITZ_PCIPNP
index f088f4629..f088f4629 100644
--- a/baseconfig/CONFIG_HISAX_FRITZ_PCIPNP
+++ b/configs/base-generic/CONFIG_HISAX_FRITZ_PCIPNP
diff --git a/baseconfig/CONFIG_HISAX_GAZEL b/configs/base-generic/CONFIG_HISAX_GAZEL
index ef86f2bcc..ef86f2bcc 100644
--- a/baseconfig/CONFIG_HISAX_GAZEL
+++ b/configs/base-generic/CONFIG_HISAX_GAZEL
diff --git a/baseconfig/CONFIG_HISAX_HFC4S8S b/configs/base-generic/CONFIG_HISAX_HFC4S8S
index 85d13d8ed..85d13d8ed 100644
--- a/baseconfig/CONFIG_HISAX_HFC4S8S
+++ b/configs/base-generic/CONFIG_HISAX_HFC4S8S
diff --git a/baseconfig/CONFIG_HISAX_HFCUSB b/configs/base-generic/CONFIG_HISAX_HFCUSB
index dc74f3156..dc74f3156 100644
--- a/baseconfig/CONFIG_HISAX_HFCUSB
+++ b/configs/base-generic/CONFIG_HISAX_HFCUSB
diff --git a/baseconfig/CONFIG_HISAX_HFC_PCI b/configs/base-generic/CONFIG_HISAX_HFC_PCI
index 24ce75cc5..24ce75cc5 100644
--- a/baseconfig/CONFIG_HISAX_HFC_PCI
+++ b/configs/base-generic/CONFIG_HISAX_HFC_PCI
diff --git a/baseconfig/CONFIG_HISAX_HFC_SX b/configs/base-generic/CONFIG_HISAX_HFC_SX
index 1f117bcfe..1f117bcfe 100644
--- a/baseconfig/CONFIG_HISAX_HFC_SX
+++ b/configs/base-generic/CONFIG_HISAX_HFC_SX
diff --git a/baseconfig/CONFIG_HISAX_MAX_CARDS b/configs/base-generic/CONFIG_HISAX_MAX_CARDS
index cfcb4bb66..cfcb4bb66 100644
--- a/baseconfig/CONFIG_HISAX_MAX_CARDS
+++ b/configs/base-generic/CONFIG_HISAX_MAX_CARDS
diff --git a/baseconfig/CONFIG_HISAX_NETJET b/configs/base-generic/CONFIG_HISAX_NETJET
index 4c92d5e65..4c92d5e65 100644
--- a/baseconfig/CONFIG_HISAX_NETJET
+++ b/configs/base-generic/CONFIG_HISAX_NETJET
diff --git a/baseconfig/CONFIG_HISAX_NETJET_U b/configs/base-generic/CONFIG_HISAX_NETJET_U
index 36fcbfffa..36fcbfffa 100644
--- a/baseconfig/CONFIG_HISAX_NETJET_U
+++ b/configs/base-generic/CONFIG_HISAX_NETJET_U
diff --git a/baseconfig/CONFIG_HISAX_NI1 b/configs/base-generic/CONFIG_HISAX_NI1
index eaee0039d..eaee0039d 100644
--- a/baseconfig/CONFIG_HISAX_NI1
+++ b/configs/base-generic/CONFIG_HISAX_NI1
diff --git a/baseconfig/CONFIG_HISAX_NICCY b/configs/base-generic/CONFIG_HISAX_NICCY
index 83c99ffac..83c99ffac 100644
--- a/baseconfig/CONFIG_HISAX_NICCY
+++ b/configs/base-generic/CONFIG_HISAX_NICCY
diff --git a/baseconfig/CONFIG_HISAX_NO_KEYPAD b/configs/base-generic/CONFIG_HISAX_NO_KEYPAD
index d291d9216..d291d9216 100644
--- a/baseconfig/CONFIG_HISAX_NO_KEYPAD
+++ b/configs/base-generic/CONFIG_HISAX_NO_KEYPAD
diff --git a/baseconfig/CONFIG_HISAX_NO_LLC b/configs/base-generic/CONFIG_HISAX_NO_LLC
index 0060765ae..0060765ae 100644
--- a/baseconfig/CONFIG_HISAX_NO_LLC
+++ b/configs/base-generic/CONFIG_HISAX_NO_LLC
diff --git a/baseconfig/CONFIG_HISAX_NO_SENDCOMPLETE b/configs/base-generic/CONFIG_HISAX_NO_SENDCOMPLETE
index 58126598c..58126598c 100644
--- a/baseconfig/CONFIG_HISAX_NO_SENDCOMPLETE
+++ b/configs/base-generic/CONFIG_HISAX_NO_SENDCOMPLETE
diff --git a/baseconfig/CONFIG_HISAX_S0BOX b/configs/base-generic/CONFIG_HISAX_S0BOX
index 0f568ad72..0f568ad72 100644
--- a/baseconfig/CONFIG_HISAX_S0BOX
+++ b/configs/base-generic/CONFIG_HISAX_S0BOX
diff --git a/baseconfig/CONFIG_HISAX_SCT_QUADRO b/configs/base-generic/CONFIG_HISAX_SCT_QUADRO
index 130adf0a2..130adf0a2 100644
--- a/baseconfig/CONFIG_HISAX_SCT_QUADRO
+++ b/configs/base-generic/CONFIG_HISAX_SCT_QUADRO
diff --git a/baseconfig/CONFIG_HISAX_SEDLBAUER b/configs/base-generic/CONFIG_HISAX_SEDLBAUER
index b65ceff20..b65ceff20 100644
--- a/baseconfig/CONFIG_HISAX_SEDLBAUER
+++ b/configs/base-generic/CONFIG_HISAX_SEDLBAUER
diff --git a/baseconfig/CONFIG_HISAX_SEDLBAUER_CS b/configs/base-generic/CONFIG_HISAX_SEDLBAUER_CS
index ac2f299c9..ac2f299c9 100644
--- a/baseconfig/CONFIG_HISAX_SEDLBAUER_CS
+++ b/configs/base-generic/CONFIG_HISAX_SEDLBAUER_CS
diff --git a/baseconfig/CONFIG_HISAX_ST5481 b/configs/base-generic/CONFIG_HISAX_ST5481
index c2f4d7a14..c2f4d7a14 100644
--- a/baseconfig/CONFIG_HISAX_ST5481
+++ b/configs/base-generic/CONFIG_HISAX_ST5481
diff --git a/baseconfig/CONFIG_HISAX_TELESPCI b/configs/base-generic/CONFIG_HISAX_TELESPCI
index c71f00181..c71f00181 100644
--- a/baseconfig/CONFIG_HISAX_TELESPCI
+++ b/configs/base-generic/CONFIG_HISAX_TELESPCI
diff --git a/baseconfig/CONFIG_HISAX_TELES_CS b/configs/base-generic/CONFIG_HISAX_TELES_CS
index 3309116d0..3309116d0 100644
--- a/baseconfig/CONFIG_HISAX_TELES_CS
+++ b/configs/base-generic/CONFIG_HISAX_TELES_CS
diff --git a/baseconfig/CONFIG_HISAX_W6692 b/configs/base-generic/CONFIG_HISAX_W6692
index 054045f6a..054045f6a 100644
--- a/baseconfig/CONFIG_HISAX_W6692
+++ b/configs/base-generic/CONFIG_HISAX_W6692
diff --git a/baseconfig/CONFIG_HIST_TRIGGERS b/configs/base-generic/CONFIG_HIST_TRIGGERS
index 93ab853e5..93ab853e5 100644
--- a/baseconfig/CONFIG_HIST_TRIGGERS
+++ b/configs/base-generic/CONFIG_HIST_TRIGGERS
diff --git a/baseconfig/CONFIG_HMC6352 b/configs/base-generic/CONFIG_HMC6352
index c283a00bb..c283a00bb 100644
--- a/baseconfig/CONFIG_HMC6352
+++ b/configs/base-generic/CONFIG_HMC6352
diff --git a/baseconfig/CONFIG_HMC_DRV b/configs/base-generic/CONFIG_HMC_DRV
index db7178627..db7178627 100644
--- a/baseconfig/CONFIG_HMC_DRV
+++ b/configs/base-generic/CONFIG_HMC_DRV
diff --git a/baseconfig/CONFIG_HOLTEK_FF b/configs/base-generic/CONFIG_HOLTEK_FF
index 94cf3249e..94cf3249e 100644
--- a/baseconfig/CONFIG_HOLTEK_FF
+++ b/configs/base-generic/CONFIG_HOLTEK_FF
diff --git a/baseconfig/CONFIG_HOSTAP b/configs/base-generic/CONFIG_HOSTAP
index 24344f78a..24344f78a 100644
--- a/baseconfig/CONFIG_HOSTAP
+++ b/configs/base-generic/CONFIG_HOSTAP
diff --git a/baseconfig/CONFIG_HOTPLUG b/configs/base-generic/CONFIG_HOTPLUG
index bd3cc02e9..bd3cc02e9 100644
--- a/baseconfig/CONFIG_HOTPLUG
+++ b/configs/base-generic/CONFIG_HOTPLUG
diff --git a/baseconfig/CONFIG_HOTPLUG_CPU b/configs/base-generic/CONFIG_HOTPLUG_CPU
index 3704a7a0f..3704a7a0f 100644
--- a/baseconfig/CONFIG_HOTPLUG_CPU
+++ b/configs/base-generic/CONFIG_HOTPLUG_CPU
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI b/configs/base-generic/CONFIG_HOTPLUG_PCI
index 278cde73c..278cde73c 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI_ACPI b/configs/base-generic/CONFIG_HOTPLUG_PCI_ACPI
index 8086e293a..8086e293a 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI_ACPI
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI_ACPI
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI_ACPI_IBM b/configs/base-generic/CONFIG_HOTPLUG_PCI_ACPI_IBM
index c2e8de4e5..c2e8de4e5 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI_ACPI_IBM
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI_ACPI_IBM
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI_CPCI b/configs/base-generic/CONFIG_HOTPLUG_PCI_CPCI
index dcd07008e..dcd07008e 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI_CPCI
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI_CPCI
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI_PCIE b/configs/base-generic/CONFIG_HOTPLUG_PCI_PCIE
index 31781d4a9..31781d4a9 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI_PCIE
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI_PCIE
diff --git a/baseconfig/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/CONFIG_HOTPLUG_PCI_SHPC
index f03be8a8f..f03be8a8f 100644
--- a/baseconfig/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/CONFIG_HP03 b/configs/base-generic/CONFIG_HP03
index bd8714af3..bd8714af3 100644
--- a/baseconfig/CONFIG_HP03
+++ b/configs/base-generic/CONFIG_HP03
diff --git a/baseconfig/CONFIG_HP206C b/configs/base-generic/CONFIG_HP206C
index 6d5f07032..6d5f07032 100644
--- a/baseconfig/CONFIG_HP206C
+++ b/configs/base-generic/CONFIG_HP206C
diff --git a/baseconfig/CONFIG_HPFS_FS b/configs/base-generic/CONFIG_HPFS_FS
index e5ad7579f..e5ad7579f 100644
--- a/baseconfig/CONFIG_HPFS_FS
+++ b/configs/base-generic/CONFIG_HPFS_FS
diff --git a/baseconfig/CONFIG_HP_ILO b/configs/base-generic/CONFIG_HP_ILO
index 74de63a68..74de63a68 100644
--- a/baseconfig/CONFIG_HP_ILO
+++ b/configs/base-generic/CONFIG_HP_ILO
diff --git a/baseconfig/CONFIG_HSI b/configs/base-generic/CONFIG_HSI
index 1581f53f9..1581f53f9 100644
--- a/baseconfig/CONFIG_HSI
+++ b/configs/base-generic/CONFIG_HSI
diff --git a/baseconfig/CONFIG_HSR b/configs/base-generic/CONFIG_HSR
index 9a440220a..9a440220a 100644
--- a/baseconfig/CONFIG_HSR
+++ b/configs/base-generic/CONFIG_HSR
diff --git a/baseconfig/CONFIG_HSU_DMA b/configs/base-generic/CONFIG_HSU_DMA
index 3dd92655a..3dd92655a 100644
--- a/baseconfig/CONFIG_HSU_DMA
+++ b/configs/base-generic/CONFIG_HSU_DMA
diff --git a/baseconfig/CONFIG_HSU_DMA_PCI b/configs/base-generic/CONFIG_HSU_DMA_PCI
index 827457bbc..827457bbc 100644
--- a/baseconfig/CONFIG_HSU_DMA_PCI
+++ b/configs/base-generic/CONFIG_HSU_DMA_PCI
diff --git a/baseconfig/CONFIG_HT16K33 b/configs/base-generic/CONFIG_HT16K33
index be3d45ca3..be3d45ca3 100644
--- a/baseconfig/CONFIG_HT16K33
+++ b/configs/base-generic/CONFIG_HT16K33
diff --git a/baseconfig/CONFIG_HTC_EGPIO b/configs/base-generic/CONFIG_HTC_EGPIO
index f1165c201..f1165c201 100644
--- a/baseconfig/CONFIG_HTC_EGPIO
+++ b/configs/base-generic/CONFIG_HTC_EGPIO
diff --git a/baseconfig/CONFIG_HTC_I2CPLD b/configs/base-generic/CONFIG_HTC_I2CPLD
index 1cc6ab834..1cc6ab834 100644
--- a/baseconfig/CONFIG_HTC_I2CPLD
+++ b/configs/base-generic/CONFIG_HTC_I2CPLD
diff --git a/baseconfig/CONFIG_HTC_PASIC3 b/configs/base-generic/CONFIG_HTC_PASIC3
index 4cd0a6dc0..4cd0a6dc0 100644
--- a/baseconfig/CONFIG_HTC_PASIC3
+++ b/configs/base-generic/CONFIG_HTC_PASIC3
diff --git a/baseconfig/CONFIG_HTS221 b/configs/base-generic/CONFIG_HTS221
index 5833fcbfb..5833fcbfb 100644
--- a/baseconfig/CONFIG_HTS221
+++ b/configs/base-generic/CONFIG_HTS221
diff --git a/baseconfig/CONFIG_HTU21 b/configs/base-generic/CONFIG_HTU21
index 5ba8bbff7..5ba8bbff7 100644
--- a/baseconfig/CONFIG_HTU21
+++ b/configs/base-generic/CONFIG_HTU21
diff --git a/baseconfig/CONFIG_HT_IRQ b/configs/base-generic/CONFIG_HT_IRQ
index b9a61b356..b9a61b356 100644
--- a/baseconfig/CONFIG_HT_IRQ
+++ b/configs/base-generic/CONFIG_HT_IRQ
diff --git a/baseconfig/CONFIG_HUGETLBFS b/configs/base-generic/CONFIG_HUGETLBFS
index 3c2dea56a..3c2dea56a 100644
--- a/baseconfig/CONFIG_HUGETLBFS
+++ b/configs/base-generic/CONFIG_HUGETLBFS
diff --git a/baseconfig/CONFIG_HUGETLB_PAGE b/configs/base-generic/CONFIG_HUGETLB_PAGE
index 17c929f62..17c929f62 100644
--- a/baseconfig/CONFIG_HUGETLB_PAGE
+++ b/configs/base-generic/CONFIG_HUGETLB_PAGE
diff --git a/baseconfig/CONFIG_HWLAT_TRACER b/configs/base-generic/CONFIG_HWLAT_TRACER
index cfdda9784..cfdda9784 100644
--- a/baseconfig/CONFIG_HWLAT_TRACER
+++ b/configs/base-generic/CONFIG_HWLAT_TRACER
diff --git a/baseconfig/CONFIG_HWMON b/configs/base-generic/CONFIG_HWMON
index ff2b3294f..ff2b3294f 100644
--- a/baseconfig/CONFIG_HWMON
+++ b/configs/base-generic/CONFIG_HWMON
diff --git a/baseconfig/CONFIG_HWMON_DEBUG_CHIP b/configs/base-generic/CONFIG_HWMON_DEBUG_CHIP
index 700df4402..700df4402 100644
--- a/baseconfig/CONFIG_HWMON_DEBUG_CHIP
+++ b/configs/base-generic/CONFIG_HWMON_DEBUG_CHIP
diff --git a/baseconfig/CONFIG_HWPOISON_INJECT b/configs/base-generic/CONFIG_HWPOISON_INJECT
index ae646aa80..ae646aa80 100644
--- a/baseconfig/CONFIG_HWPOISON_INJECT
+++ b/configs/base-generic/CONFIG_HWPOISON_INJECT
diff --git a/baseconfig/CONFIG_HWSPINLOCK b/configs/base-generic/CONFIG_HWSPINLOCK
index e35b793e2..e35b793e2 100644
--- a/baseconfig/CONFIG_HWSPINLOCK
+++ b/configs/base-generic/CONFIG_HWSPINLOCK
diff --git a/baseconfig/CONFIG_HW_CONSOLE b/configs/base-generic/CONFIG_HW_CONSOLE
index 1a03cd404..1a03cd404 100644
--- a/baseconfig/CONFIG_HW_CONSOLE
+++ b/configs/base-generic/CONFIG_HW_CONSOLE
diff --git a/baseconfig/CONFIG_HW_RANDOM b/configs/base-generic/CONFIG_HW_RANDOM
index 971856ab7..971856ab7 100644
--- a/baseconfig/CONFIG_HW_RANDOM
+++ b/configs/base-generic/CONFIG_HW_RANDOM
diff --git a/baseconfig/CONFIG_HW_RANDOM_TIMERIOMEM b/configs/base-generic/CONFIG_HW_RANDOM_TIMERIOMEM
index b1963489b..b1963489b 100644
--- a/baseconfig/CONFIG_HW_RANDOM_TIMERIOMEM
+++ b/configs/base-generic/CONFIG_HW_RANDOM_TIMERIOMEM
diff --git a/baseconfig/CONFIG_HW_RANDOM_TPM b/configs/base-generic/CONFIG_HW_RANDOM_TPM
index 51b6ac9cb..51b6ac9cb 100644
--- a/baseconfig/CONFIG_HW_RANDOM_TPM
+++ b/configs/base-generic/CONFIG_HW_RANDOM_TPM
diff --git a/baseconfig/CONFIG_HW_RANDOM_VIRTIO b/configs/base-generic/CONFIG_HW_RANDOM_VIRTIO
index 1b31e5535..1b31e5535 100644
--- a/baseconfig/CONFIG_HW_RANDOM_VIRTIO
+++ b/configs/base-generic/CONFIG_HW_RANDOM_VIRTIO
diff --git a/baseconfig/CONFIG_HX711 b/configs/base-generic/CONFIG_HX711
index 5378c7339..5378c7339 100644
--- a/baseconfig/CONFIG_HX711
+++ b/configs/base-generic/CONFIG_HX711
diff --git a/baseconfig/CONFIG_HYSDN b/configs/base-generic/CONFIG_HYSDN
index 2f1ddde6c..2f1ddde6c 100644
--- a/baseconfig/CONFIG_HYSDN
+++ b/configs/base-generic/CONFIG_HYSDN
diff --git a/baseconfig/CONFIG_HYSDN_CAPI b/configs/base-generic/CONFIG_HYSDN_CAPI
index db9a861ab..db9a861ab 100644
--- a/baseconfig/CONFIG_HYSDN_CAPI
+++ b/configs/base-generic/CONFIG_HYSDN_CAPI
diff --git a/baseconfig/CONFIG_HZ_1000 b/configs/base-generic/CONFIG_HZ_1000
index 81777c737..81777c737 100644
--- a/baseconfig/CONFIG_HZ_1000
+++ b/configs/base-generic/CONFIG_HZ_1000
diff --git a/baseconfig/CONFIG_I2C b/configs/base-generic/CONFIG_I2C
index 063fe8213..063fe8213 100644
--- a/baseconfig/CONFIG_I2C
+++ b/configs/base-generic/CONFIG_I2C
diff --git a/baseconfig/CONFIG_I2C_ALGOBIT b/configs/base-generic/CONFIG_I2C_ALGOBIT
index 75e39f8b6..75e39f8b6 100644
--- a/baseconfig/CONFIG_I2C_ALGOBIT
+++ b/configs/base-generic/CONFIG_I2C_ALGOBIT
diff --git a/baseconfig/CONFIG_I2C_ALGOPCA b/configs/base-generic/CONFIG_I2C_ALGOPCA
index 2c5a40769..2c5a40769 100644
--- a/baseconfig/CONFIG_I2C_ALGOPCA
+++ b/configs/base-generic/CONFIG_I2C_ALGOPCA
diff --git a/baseconfig/CONFIG_I2C_ALGOPCF b/configs/base-generic/CONFIG_I2C_ALGOPCF
index 98e1f0c7a..98e1f0c7a 100644
--- a/baseconfig/CONFIG_I2C_ALGOPCF
+++ b/configs/base-generic/CONFIG_I2C_ALGOPCF
diff --git a/baseconfig/CONFIG_I2C_ALI1535 b/configs/base-generic/CONFIG_I2C_ALI1535
index 3f9e2fef1..3f9e2fef1 100644
--- a/baseconfig/CONFIG_I2C_ALI1535
+++ b/configs/base-generic/CONFIG_I2C_ALI1535
diff --git a/baseconfig/CONFIG_I2C_ALI1563 b/configs/base-generic/CONFIG_I2C_ALI1563
index 035045f8b..035045f8b 100644
--- a/baseconfig/CONFIG_I2C_ALI1563
+++ b/configs/base-generic/CONFIG_I2C_ALI1563
diff --git a/baseconfig/CONFIG_I2C_ALI15X3 b/configs/base-generic/CONFIG_I2C_ALI15X3
index 1621ea381..1621ea381 100644
--- a/baseconfig/CONFIG_I2C_ALI15X3
+++ b/configs/base-generic/CONFIG_I2C_ALI15X3
diff --git a/baseconfig/CONFIG_I2C_AMD756 b/configs/base-generic/CONFIG_I2C_AMD756
index d30b6d5d4..d30b6d5d4 100644
--- a/baseconfig/CONFIG_I2C_AMD756
+++ b/configs/base-generic/CONFIG_I2C_AMD756
diff --git a/baseconfig/CONFIG_I2C_AMD756_S4882 b/configs/base-generic/CONFIG_I2C_AMD756_S4882
index 48c2f9c29..48c2f9c29 100644
--- a/baseconfig/CONFIG_I2C_AMD756_S4882
+++ b/configs/base-generic/CONFIG_I2C_AMD756_S4882
diff --git a/baseconfig/CONFIG_I2C_AMD8111 b/configs/base-generic/CONFIG_I2C_AMD8111
index f200ec046..f200ec046 100644
--- a/baseconfig/CONFIG_I2C_AMD8111
+++ b/configs/base-generic/CONFIG_I2C_AMD8111
diff --git a/baseconfig/CONFIG_I2C_ARB_GPIO_CHALLENGE b/configs/base-generic/CONFIG_I2C_ARB_GPIO_CHALLENGE
index 849f1ce04..849f1ce04 100644
--- a/baseconfig/CONFIG_I2C_ARB_GPIO_CHALLENGE
+++ b/configs/base-generic/CONFIG_I2C_ARB_GPIO_CHALLENGE
diff --git a/baseconfig/CONFIG_I2C_BCM2048 b/configs/base-generic/CONFIG_I2C_BCM2048
index 65ce228bc..65ce228bc 100644
--- a/baseconfig/CONFIG_I2C_BCM2048
+++ b/configs/base-generic/CONFIG_I2C_BCM2048
diff --git a/baseconfig/CONFIG_I2C_CADENCE b/configs/base-generic/CONFIG_I2C_CADENCE
index f18079afe..f18079afe 100644
--- a/baseconfig/CONFIG_I2C_CADENCE
+++ b/configs/base-generic/CONFIG_I2C_CADENCE
diff --git a/baseconfig/CONFIG_I2C_CBUS_GPIO b/configs/base-generic/CONFIG_I2C_CBUS_GPIO
index d626de063..d626de063 100644
--- a/baseconfig/CONFIG_I2C_CBUS_GPIO
+++ b/configs/base-generic/CONFIG_I2C_CBUS_GPIO
diff --git a/baseconfig/CONFIG_I2C_CHARDEV b/configs/base-generic/CONFIG_I2C_CHARDEV
index d843de200..d843de200 100644
--- a/baseconfig/CONFIG_I2C_CHARDEV
+++ b/configs/base-generic/CONFIG_I2C_CHARDEV
diff --git a/baseconfig/CONFIG_I2C_COMPAT b/configs/base-generic/CONFIG_I2C_COMPAT
index e24cc28d3..e24cc28d3 100644
--- a/baseconfig/CONFIG_I2C_COMPAT
+++ b/configs/base-generic/CONFIG_I2C_COMPAT
diff --git a/baseconfig/CONFIG_I2C_DEBUG_ALGO b/configs/base-generic/CONFIG_I2C_DEBUG_ALGO
index 6c9561369..6c9561369 100644
--- a/baseconfig/CONFIG_I2C_DEBUG_ALGO
+++ b/configs/base-generic/CONFIG_I2C_DEBUG_ALGO
diff --git a/baseconfig/CONFIG_I2C_DEBUG_BUS b/configs/base-generic/CONFIG_I2C_DEBUG_BUS
index 944e06093..944e06093 100644
--- a/baseconfig/CONFIG_I2C_DEBUG_BUS
+++ b/configs/base-generic/CONFIG_I2C_DEBUG_BUS
diff --git a/baseconfig/CONFIG_I2C_DEBUG_CORE b/configs/base-generic/CONFIG_I2C_DEBUG_CORE
index 6b0f751b1..6b0f751b1 100644
--- a/baseconfig/CONFIG_I2C_DEBUG_CORE
+++ b/configs/base-generic/CONFIG_I2C_DEBUG_CORE
diff --git a/baseconfig/CONFIG_I2C_DEMUX_PINCTRL b/configs/base-generic/CONFIG_I2C_DEMUX_PINCTRL
index 92132d0e4..92132d0e4 100644
--- a/baseconfig/CONFIG_I2C_DEMUX_PINCTRL
+++ b/configs/base-generic/CONFIG_I2C_DEMUX_PINCTRL
diff --git a/baseconfig/CONFIG_I2C_DESIGNWARE b/configs/base-generic/CONFIG_I2C_DESIGNWARE
index 1bf3fcee0..1bf3fcee0 100644
--- a/baseconfig/CONFIG_I2C_DESIGNWARE
+++ b/configs/base-generic/CONFIG_I2C_DESIGNWARE
diff --git a/baseconfig/CONFIG_I2C_DESIGNWARE_PCI b/configs/base-generic/CONFIG_I2C_DESIGNWARE_PCI
index a517faad2..a517faad2 100644
--- a/baseconfig/CONFIG_I2C_DESIGNWARE_PCI
+++ b/configs/base-generic/CONFIG_I2C_DESIGNWARE_PCI
diff --git a/baseconfig/CONFIG_I2C_DESIGNWARE_PLATFORM b/configs/base-generic/CONFIG_I2C_DESIGNWARE_PLATFORM
index ceebaf5aa..ceebaf5aa 100644
--- a/baseconfig/CONFIG_I2C_DESIGNWARE_PLATFORM
+++ b/configs/base-generic/CONFIG_I2C_DESIGNWARE_PLATFORM
diff --git a/baseconfig/CONFIG_I2C_DESIGNWARE_SLAVE b/configs/base-generic/CONFIG_I2C_DESIGNWARE_SLAVE
index 8c847f261..8c847f261 100644
--- a/baseconfig/CONFIG_I2C_DESIGNWARE_SLAVE
+++ b/configs/base-generic/CONFIG_I2C_DESIGNWARE_SLAVE
diff --git a/baseconfig/CONFIG_I2C_DIOLAN_U2C b/configs/base-generic/CONFIG_I2C_DIOLAN_U2C
index 7cd85b9d7..7cd85b9d7 100644
--- a/baseconfig/CONFIG_I2C_DIOLAN_U2C
+++ b/configs/base-generic/CONFIG_I2C_DIOLAN_U2C
diff --git a/baseconfig/CONFIG_I2C_EG20T b/configs/base-generic/CONFIG_I2C_EG20T
index c8ee17e48..c8ee17e48 100644
--- a/baseconfig/CONFIG_I2C_EG20T
+++ b/configs/base-generic/CONFIG_I2C_EG20T
diff --git a/baseconfig/CONFIG_I2C_EMEV2 b/configs/base-generic/CONFIG_I2C_EMEV2
index 9121ff3a7..9121ff3a7 100644
--- a/baseconfig/CONFIG_I2C_EMEV2
+++ b/configs/base-generic/CONFIG_I2C_EMEV2
diff --git a/baseconfig/CONFIG_I2C_GPIO b/configs/base-generic/CONFIG_I2C_GPIO
index 1dd3eb654..1dd3eb654 100644
--- a/baseconfig/CONFIG_I2C_GPIO
+++ b/configs/base-generic/CONFIG_I2C_GPIO
diff --git a/baseconfig/CONFIG_I2C_HELPER_AUTO b/configs/base-generic/CONFIG_I2C_HELPER_AUTO
index 59be08e04..59be08e04 100644
--- a/baseconfig/CONFIG_I2C_HELPER_AUTO
+++ b/configs/base-generic/CONFIG_I2C_HELPER_AUTO
diff --git a/baseconfig/CONFIG_I2C_HID b/configs/base-generic/CONFIG_I2C_HID
index d4b9febdd..d4b9febdd 100644
--- a/baseconfig/CONFIG_I2C_HID
+++ b/configs/base-generic/CONFIG_I2C_HID
diff --git a/baseconfig/CONFIG_I2C_I801 b/configs/base-generic/CONFIG_I2C_I801
index 2663365cd..2663365cd 100644
--- a/baseconfig/CONFIG_I2C_I801
+++ b/configs/base-generic/CONFIG_I2C_I801
diff --git a/baseconfig/CONFIG_I2C_ISCH b/configs/base-generic/CONFIG_I2C_ISCH
index 083275fd9..083275fd9 100644
--- a/baseconfig/CONFIG_I2C_ISCH
+++ b/configs/base-generic/CONFIG_I2C_ISCH
diff --git a/baseconfig/CONFIG_I2C_MLXCPLD b/configs/base-generic/CONFIG_I2C_MLXCPLD
index 92afd7ee9..92afd7ee9 100644
--- a/baseconfig/CONFIG_I2C_MLXCPLD
+++ b/configs/base-generic/CONFIG_I2C_MLXCPLD
diff --git a/baseconfig/CONFIG_I2C_MUX b/configs/base-generic/CONFIG_I2C_MUX
index eab40a50a..eab40a50a 100644
--- a/baseconfig/CONFIG_I2C_MUX
+++ b/configs/base-generic/CONFIG_I2C_MUX
diff --git a/baseconfig/CONFIG_I2C_MUX_GPIO b/configs/base-generic/CONFIG_I2C_MUX_GPIO
index 7d3813d34..7d3813d34 100644
--- a/baseconfig/CONFIG_I2C_MUX_GPIO
+++ b/configs/base-generic/CONFIG_I2C_MUX_GPIO
diff --git a/baseconfig/CONFIG_I2C_MUX_GPMUX b/configs/base-generic/CONFIG_I2C_MUX_GPMUX
index 519b3e679..519b3e679 100644
--- a/baseconfig/CONFIG_I2C_MUX_GPMUX
+++ b/configs/base-generic/CONFIG_I2C_MUX_GPMUX
diff --git a/baseconfig/CONFIG_I2C_MUX_LTC4306 b/configs/base-generic/CONFIG_I2C_MUX_LTC4306
index f7c16456c..f7c16456c 100644
--- a/baseconfig/CONFIG_I2C_MUX_LTC4306
+++ b/configs/base-generic/CONFIG_I2C_MUX_LTC4306
diff --git a/baseconfig/CONFIG_I2C_MUX_MLXCPLD b/configs/base-generic/CONFIG_I2C_MUX_MLXCPLD
index d4e6b7b4f..d4e6b7b4f 100644
--- a/baseconfig/CONFIG_I2C_MUX_MLXCPLD
+++ b/configs/base-generic/CONFIG_I2C_MUX_MLXCPLD
diff --git a/baseconfig/CONFIG_I2C_MUX_PCA9541 b/configs/base-generic/CONFIG_I2C_MUX_PCA9541
index 77a2d7939..77a2d7939 100644
--- a/baseconfig/CONFIG_I2C_MUX_PCA9541
+++ b/configs/base-generic/CONFIG_I2C_MUX_PCA9541
diff --git a/baseconfig/CONFIG_I2C_MUX_PCA954x b/configs/base-generic/CONFIG_I2C_MUX_PCA954x
index 51e48b468..51e48b468 100644
--- a/baseconfig/CONFIG_I2C_MUX_PCA954x
+++ b/configs/base-generic/CONFIG_I2C_MUX_PCA954x
diff --git a/baseconfig/CONFIG_I2C_MUX_PINCTRL b/configs/base-generic/CONFIG_I2C_MUX_PINCTRL
index 28c7fa8fb..28c7fa8fb 100644
--- a/baseconfig/CONFIG_I2C_MUX_PINCTRL
+++ b/configs/base-generic/CONFIG_I2C_MUX_PINCTRL
diff --git a/baseconfig/CONFIG_I2C_MUX_REG b/configs/base-generic/CONFIG_I2C_MUX_REG
index f16a809e1..f16a809e1 100644
--- a/baseconfig/CONFIG_I2C_MUX_REG
+++ b/configs/base-generic/CONFIG_I2C_MUX_REG
diff --git a/baseconfig/CONFIG_I2C_NFORCE2 b/configs/base-generic/CONFIG_I2C_NFORCE2
index 50bbe34f2..50bbe34f2 100644
--- a/baseconfig/CONFIG_I2C_NFORCE2
+++ b/configs/base-generic/CONFIG_I2C_NFORCE2
diff --git a/baseconfig/CONFIG_I2C_NFORCE2_S4985 b/configs/base-generic/CONFIG_I2C_NFORCE2_S4985
index 0488d3104..0488d3104 100644
--- a/baseconfig/CONFIG_I2C_NFORCE2_S4985
+++ b/configs/base-generic/CONFIG_I2C_NFORCE2_S4985
diff --git a/baseconfig/CONFIG_I2C_OCORES b/configs/base-generic/CONFIG_I2C_OCORES
index 302dfede4..302dfede4 100644
--- a/baseconfig/CONFIG_I2C_OCORES
+++ b/configs/base-generic/CONFIG_I2C_OCORES
diff --git a/baseconfig/CONFIG_I2C_PARPORT_LIGHT b/configs/base-generic/CONFIG_I2C_PARPORT_LIGHT
index e18239222..e18239222 100644
--- a/baseconfig/CONFIG_I2C_PARPORT_LIGHT
+++ b/configs/base-generic/CONFIG_I2C_PARPORT_LIGHT
diff --git a/baseconfig/CONFIG_I2C_PCA_PLATFORM b/configs/base-generic/CONFIG_I2C_PCA_PLATFORM
index f01485df4..f01485df4 100644
--- a/baseconfig/CONFIG_I2C_PCA_PLATFORM
+++ b/configs/base-generic/CONFIG_I2C_PCA_PLATFORM
diff --git a/baseconfig/CONFIG_I2C_PIIX4 b/configs/base-generic/CONFIG_I2C_PIIX4
index ed534b473..ed534b473 100644
--- a/baseconfig/CONFIG_I2C_PIIX4
+++ b/configs/base-generic/CONFIG_I2C_PIIX4
diff --git a/baseconfig/CONFIG_I2C_RK3X b/configs/base-generic/CONFIG_I2C_RK3X
index b11d3db83..b11d3db83 100644
--- a/baseconfig/CONFIG_I2C_RK3X
+++ b/configs/base-generic/CONFIG_I2C_RK3X
diff --git a/baseconfig/CONFIG_I2C_ROBOTFUZZ_OSIF b/configs/base-generic/CONFIG_I2C_ROBOTFUZZ_OSIF
index f9b66870a..f9b66870a 100644
--- a/baseconfig/CONFIG_I2C_ROBOTFUZZ_OSIF
+++ b/configs/base-generic/CONFIG_I2C_ROBOTFUZZ_OSIF
diff --git a/baseconfig/CONFIG_I2C_SI470X b/configs/base-generic/CONFIG_I2C_SI470X
index 26fbae43e..26fbae43e 100644
--- a/baseconfig/CONFIG_I2C_SI470X
+++ b/configs/base-generic/CONFIG_I2C_SI470X
diff --git a/baseconfig/CONFIG_I2C_SI4713 b/configs/base-generic/CONFIG_I2C_SI4713
index 6499f8bff..6499f8bff 100644
--- a/baseconfig/CONFIG_I2C_SI4713
+++ b/configs/base-generic/CONFIG_I2C_SI4713
diff --git a/baseconfig/CONFIG_I2C_SIMTEC b/configs/base-generic/CONFIG_I2C_SIMTEC
index 9cfdf4eec..9cfdf4eec 100644
--- a/baseconfig/CONFIG_I2C_SIMTEC
+++ b/configs/base-generic/CONFIG_I2C_SIMTEC
diff --git a/baseconfig/CONFIG_I2C_SIS5595 b/configs/base-generic/CONFIG_I2C_SIS5595
index 881262cd6..881262cd6 100644
--- a/baseconfig/CONFIG_I2C_SIS5595
+++ b/configs/base-generic/CONFIG_I2C_SIS5595
diff --git a/baseconfig/CONFIG_I2C_SIS630 b/configs/base-generic/CONFIG_I2C_SIS630
index daa589151..daa589151 100644
--- a/baseconfig/CONFIG_I2C_SIS630
+++ b/configs/base-generic/CONFIG_I2C_SIS630
diff --git a/baseconfig/CONFIG_I2C_SIS96X b/configs/base-generic/CONFIG_I2C_SIS96X
index d896b4d2f..d896b4d2f 100644
--- a/baseconfig/CONFIG_I2C_SIS96X
+++ b/configs/base-generic/CONFIG_I2C_SIS96X
diff --git a/baseconfig/CONFIG_I2C_SLAVE b/configs/base-generic/CONFIG_I2C_SLAVE
index e17d76517..e17d76517 100644
--- a/baseconfig/CONFIG_I2C_SLAVE
+++ b/configs/base-generic/CONFIG_I2C_SLAVE
diff --git a/baseconfig/CONFIG_I2C_SLAVE_EEPROM b/configs/base-generic/CONFIG_I2C_SLAVE_EEPROM
index 682e5476b..682e5476b 100644
--- a/baseconfig/CONFIG_I2C_SLAVE_EEPROM
+++ b/configs/base-generic/CONFIG_I2C_SLAVE_EEPROM
diff --git a/baseconfig/CONFIG_I2C_STUB b/configs/base-generic/CONFIG_I2C_STUB
index 496682079..496682079 100644
--- a/baseconfig/CONFIG_I2C_STUB
+++ b/configs/base-generic/CONFIG_I2C_STUB
diff --git a/baseconfig/CONFIG_I2C_TAOS_EVM b/configs/base-generic/CONFIG_I2C_TAOS_EVM
index 3db7fabfb..3db7fabfb 100644
--- a/baseconfig/CONFIG_I2C_TAOS_EVM
+++ b/configs/base-generic/CONFIG_I2C_TAOS_EVM
diff --git a/baseconfig/CONFIG_I2C_TINY_USB b/configs/base-generic/CONFIG_I2C_TINY_USB
index ae818d4e9..ae818d4e9 100644
--- a/baseconfig/CONFIG_I2C_TINY_USB
+++ b/configs/base-generic/CONFIG_I2C_TINY_USB
diff --git a/baseconfig/CONFIG_I2C_VIA b/configs/base-generic/CONFIG_I2C_VIA
index 7fa98de9d..7fa98de9d 100644
--- a/baseconfig/CONFIG_I2C_VIA
+++ b/configs/base-generic/CONFIG_I2C_VIA
diff --git a/baseconfig/CONFIG_I2C_VIAPRO b/configs/base-generic/CONFIG_I2C_VIAPRO
index a1e152bbe..a1e152bbe 100644
--- a/baseconfig/CONFIG_I2C_VIAPRO
+++ b/configs/base-generic/CONFIG_I2C_VIAPRO
diff --git a/baseconfig/CONFIG_I2C_VIPERBOARD b/configs/base-generic/CONFIG_I2C_VIPERBOARD
index a041d4d66..a041d4d66 100644
--- a/baseconfig/CONFIG_I2C_VIPERBOARD
+++ b/configs/base-generic/CONFIG_I2C_VIPERBOARD
diff --git a/baseconfig/CONFIG_I2C_XILINX b/configs/base-generic/CONFIG_I2C_XILINX
index 9526c6adf..9526c6adf 100644
--- a/baseconfig/CONFIG_I2C_XILINX
+++ b/configs/base-generic/CONFIG_I2C_XILINX
diff --git a/baseconfig/CONFIG_I2O b/configs/base-generic/CONFIG_I2O
index c3064fb4b..c3064fb4b 100644
--- a/baseconfig/CONFIG_I2O
+++ b/configs/base-generic/CONFIG_I2O
diff --git a/baseconfig/CONFIG_I40E b/configs/base-generic/CONFIG_I40E
index c52af201e..c52af201e 100644
--- a/baseconfig/CONFIG_I40E
+++ b/configs/base-generic/CONFIG_I40E
diff --git a/baseconfig/CONFIG_I40EVF b/configs/base-generic/CONFIG_I40EVF
index 21e0bf4cd..21e0bf4cd 100644
--- a/baseconfig/CONFIG_I40EVF
+++ b/configs/base-generic/CONFIG_I40EVF
diff --git a/baseconfig/CONFIG_I40E_DCB b/configs/base-generic/CONFIG_I40E_DCB
index b65fe813f..b65fe813f 100644
--- a/baseconfig/CONFIG_I40E_DCB
+++ b/configs/base-generic/CONFIG_I40E_DCB
diff --git a/baseconfig/CONFIG_I40E_FCOE b/configs/base-generic/CONFIG_I40E_FCOE
index fdfb3d00c..fdfb3d00c 100644
--- a/baseconfig/CONFIG_I40E_FCOE
+++ b/configs/base-generic/CONFIG_I40E_FCOE
diff --git a/baseconfig/CONFIG_I6300ESB_WDT b/configs/base-generic/CONFIG_I6300ESB_WDT
index e65f0870c..e65f0870c 100644
--- a/baseconfig/CONFIG_I6300ESB_WDT
+++ b/configs/base-generic/CONFIG_I6300ESB_WDT
diff --git a/baseconfig/CONFIG_I82092 b/configs/base-generic/CONFIG_I82092
index 830a26c4d..830a26c4d 100644
--- a/baseconfig/CONFIG_I82092
+++ b/configs/base-generic/CONFIG_I82092
diff --git a/baseconfig/CONFIG_IAQCORE b/configs/base-generic/CONFIG_IAQCORE
index 7d167fb8a..7d167fb8a 100644
--- a/baseconfig/CONFIG_IAQCORE
+++ b/configs/base-generic/CONFIG_IAQCORE
diff --git a/baseconfig/CONFIG_ICPLUS_PHY b/configs/base-generic/CONFIG_ICPLUS_PHY
index f58838d2f..f58838d2f 100644
--- a/baseconfig/CONFIG_ICPLUS_PHY
+++ b/configs/base-generic/CONFIG_ICPLUS_PHY
diff --git a/baseconfig/CONFIG_ICS932S401 b/configs/base-generic/CONFIG_ICS932S401
index e8020befd..e8020befd 100644
--- a/baseconfig/CONFIG_ICS932S401
+++ b/configs/base-generic/CONFIG_ICS932S401
diff --git a/baseconfig/CONFIG_IDE b/configs/base-generic/CONFIG_IDE
index 5ae50381d..5ae50381d 100644
--- a/baseconfig/CONFIG_IDE
+++ b/configs/base-generic/CONFIG_IDE
diff --git a/baseconfig/CONFIG_IDLE_PAGE_TRACKING b/configs/base-generic/CONFIG_IDLE_PAGE_TRACKING
index f3745a57c..f3745a57c 100644
--- a/baseconfig/CONFIG_IDLE_PAGE_TRACKING
+++ b/configs/base-generic/CONFIG_IDLE_PAGE_TRACKING
diff --git a/baseconfig/CONFIG_IDMA64 b/configs/base-generic/CONFIG_IDMA64
index 502e09a45..502e09a45 100644
--- a/baseconfig/CONFIG_IDMA64
+++ b/configs/base-generic/CONFIG_IDMA64
diff --git a/baseconfig/CONFIG_IEEE802154 b/configs/base-generic/CONFIG_IEEE802154
index bff5041fd..bff5041fd 100644
--- a/baseconfig/CONFIG_IEEE802154
+++ b/configs/base-generic/CONFIG_IEEE802154
diff --git a/baseconfig/CONFIG_IEEE802154_6LOWPAN b/configs/base-generic/CONFIG_IEEE802154_6LOWPAN
index 4c23edbf7..4c23edbf7 100644
--- a/baseconfig/CONFIG_IEEE802154_6LOWPAN
+++ b/configs/base-generic/CONFIG_IEEE802154_6LOWPAN
diff --git a/baseconfig/CONFIG_IEEE802154_ADF7242 b/configs/base-generic/CONFIG_IEEE802154_ADF7242
index 5a0b67d68..5a0b67d68 100644
--- a/baseconfig/CONFIG_IEEE802154_ADF7242
+++ b/configs/base-generic/CONFIG_IEEE802154_ADF7242
diff --git a/baseconfig/CONFIG_IEEE802154_AT86RF230 b/configs/base-generic/CONFIG_IEEE802154_AT86RF230
index 8bd06c09b..8bd06c09b 100644
--- a/baseconfig/CONFIG_IEEE802154_AT86RF230
+++ b/configs/base-generic/CONFIG_IEEE802154_AT86RF230
diff --git a/baseconfig/CONFIG_IEEE802154_AT86RF230_DEBUGFS b/configs/base-generic/CONFIG_IEEE802154_AT86RF230_DEBUGFS
index 143caf923..143caf923 100644
--- a/baseconfig/CONFIG_IEEE802154_AT86RF230_DEBUGFS
+++ b/configs/base-generic/CONFIG_IEEE802154_AT86RF230_DEBUGFS
diff --git a/baseconfig/CONFIG_IEEE802154_ATUSB b/configs/base-generic/CONFIG_IEEE802154_ATUSB
index 51c7ffe05..51c7ffe05 100644
--- a/baseconfig/CONFIG_IEEE802154_ATUSB
+++ b/configs/base-generic/CONFIG_IEEE802154_ATUSB
diff --git a/baseconfig/CONFIG_IEEE802154_CA8210 b/configs/base-generic/CONFIG_IEEE802154_CA8210
index d4a2158a3..d4a2158a3 100644
--- a/baseconfig/CONFIG_IEEE802154_CA8210
+++ b/configs/base-generic/CONFIG_IEEE802154_CA8210
diff --git a/baseconfig/CONFIG_IEEE802154_CA8210_DEBUGFS b/configs/base-generic/CONFIG_IEEE802154_CA8210_DEBUGFS
index e919384b7..e919384b7 100644
--- a/baseconfig/CONFIG_IEEE802154_CA8210_DEBUGFS
+++ b/configs/base-generic/CONFIG_IEEE802154_CA8210_DEBUGFS
diff --git a/baseconfig/CONFIG_IEEE802154_CC2520 b/configs/base-generic/CONFIG_IEEE802154_CC2520
index e37179094..e37179094 100644
--- a/baseconfig/CONFIG_IEEE802154_CC2520
+++ b/configs/base-generic/CONFIG_IEEE802154_CC2520
diff --git a/baseconfig/CONFIG_IEEE802154_DRIVERS b/configs/base-generic/CONFIG_IEEE802154_DRIVERS
index caa6c2f87..caa6c2f87 100644
--- a/baseconfig/CONFIG_IEEE802154_DRIVERS
+++ b/configs/base-generic/CONFIG_IEEE802154_DRIVERS
diff --git a/baseconfig/CONFIG_IEEE802154_FAKELB b/configs/base-generic/CONFIG_IEEE802154_FAKELB
index 63f336d57..63f336d57 100644
--- a/baseconfig/CONFIG_IEEE802154_FAKELB
+++ b/configs/base-generic/CONFIG_IEEE802154_FAKELB
diff --git a/baseconfig/CONFIG_IEEE802154_MRF24J40 b/configs/base-generic/CONFIG_IEEE802154_MRF24J40
index dc61c11fd..dc61c11fd 100644
--- a/baseconfig/CONFIG_IEEE802154_MRF24J40
+++ b/configs/base-generic/CONFIG_IEEE802154_MRF24J40
diff --git a/baseconfig/CONFIG_IEEE802154_NL802154_EXPERIMENTAL b/configs/base-generic/CONFIG_IEEE802154_NL802154_EXPERIMENTAL
index 9a637d779..9a637d779 100644
--- a/baseconfig/CONFIG_IEEE802154_NL802154_EXPERIMENTAL
+++ b/configs/base-generic/CONFIG_IEEE802154_NL802154_EXPERIMENTAL
diff --git a/baseconfig/CONFIG_IEEE802154_SOCKET b/configs/base-generic/CONFIG_IEEE802154_SOCKET
index e7bfdca2d..e7bfdca2d 100644
--- a/baseconfig/CONFIG_IEEE802154_SOCKET
+++ b/configs/base-generic/CONFIG_IEEE802154_SOCKET
diff --git a/baseconfig/CONFIG_IFB b/configs/base-generic/CONFIG_IFB
index 738210cd4..738210cd4 100644
--- a/baseconfig/CONFIG_IFB
+++ b/configs/base-generic/CONFIG_IFB
diff --git a/baseconfig/CONFIG_IGB b/configs/base-generic/CONFIG_IGB
index 1a8ee8877..1a8ee8877 100644
--- a/baseconfig/CONFIG_IGB
+++ b/configs/base-generic/CONFIG_IGB
diff --git a/baseconfig/CONFIG_IGBVF b/configs/base-generic/CONFIG_IGBVF
index 63bb3beea..63bb3beea 100644
--- a/baseconfig/CONFIG_IGBVF
+++ b/configs/base-generic/CONFIG_IGBVF
diff --git a/baseconfig/CONFIG_IGB_DCA b/configs/base-generic/CONFIG_IGB_DCA
index c2fe0c3f6..c2fe0c3f6 100644
--- a/baseconfig/CONFIG_IGB_DCA
+++ b/configs/base-generic/CONFIG_IGB_DCA
diff --git a/baseconfig/CONFIG_IGB_HWMON b/configs/base-generic/CONFIG_IGB_HWMON
index d47de32e6..d47de32e6 100644
--- a/baseconfig/CONFIG_IGB_HWMON
+++ b/configs/base-generic/CONFIG_IGB_HWMON
diff --git a/baseconfig/CONFIG_IIO b/configs/base-generic/CONFIG_IIO
index 72953e4fa..72953e4fa 100644
--- a/baseconfig/CONFIG_IIO
+++ b/configs/base-generic/CONFIG_IIO
diff --git a/baseconfig/CONFIG_IIO_BUFFER b/configs/base-generic/CONFIG_IIO_BUFFER
index e10ee5ac8..e10ee5ac8 100644
--- a/baseconfig/CONFIG_IIO_BUFFER
+++ b/configs/base-generic/CONFIG_IIO_BUFFER
diff --git a/baseconfig/CONFIG_IIO_BUFFER_CB b/configs/base-generic/CONFIG_IIO_BUFFER_CB
index 7f2028d97..7f2028d97 100644
--- a/baseconfig/CONFIG_IIO_BUFFER_CB
+++ b/configs/base-generic/CONFIG_IIO_BUFFER_CB
diff --git a/baseconfig/CONFIG_IIO_CONFIGFS b/configs/base-generic/CONFIG_IIO_CONFIGFS
index 4b17ba908..4b17ba908 100644
--- a/baseconfig/CONFIG_IIO_CONFIGFS
+++ b/configs/base-generic/CONFIG_IIO_CONFIGFS
diff --git a/baseconfig/CONFIG_IIO_CONSUMERS_PER_TRIGGER b/configs/base-generic/CONFIG_IIO_CONSUMERS_PER_TRIGGER
index 9198f5933..9198f5933 100644
--- a/baseconfig/CONFIG_IIO_CONSUMERS_PER_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_CONSUMERS_PER_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_HRTIMER_TRIGGER b/configs/base-generic/CONFIG_IIO_HRTIMER_TRIGGER
index 4e3a9f155..4e3a9f155 100644
--- a/baseconfig/CONFIG_IIO_HRTIMER_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_HRTIMER_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_INTERRUPT_TRIGGER b/configs/base-generic/CONFIG_IIO_INTERRUPT_TRIGGER
index 50e7622fc..50e7622fc 100644
--- a/baseconfig/CONFIG_IIO_INTERRUPT_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_INTERRUPT_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_KFIFO_BUF b/configs/base-generic/CONFIG_IIO_KFIFO_BUF
index 5791c27c1..5791c27c1 100644
--- a/baseconfig/CONFIG_IIO_KFIFO_BUF
+++ b/configs/base-generic/CONFIG_IIO_KFIFO_BUF
diff --git a/baseconfig/CONFIG_IIO_MUX b/configs/base-generic/CONFIG_IIO_MUX
index a139de267..a139de267 100644
--- a/baseconfig/CONFIG_IIO_MUX
+++ b/configs/base-generic/CONFIG_IIO_MUX
diff --git a/baseconfig/CONFIG_IIO_SIMPLE_DUMMY b/configs/base-generic/CONFIG_IIO_SIMPLE_DUMMY
index 960ab9d43..960ab9d43 100644
--- a/baseconfig/CONFIG_IIO_SIMPLE_DUMMY
+++ b/configs/base-generic/CONFIG_IIO_SIMPLE_DUMMY
diff --git a/baseconfig/CONFIG_IIO_SSP_SENSORHUB b/configs/base-generic/CONFIG_IIO_SSP_SENSORHUB
index 65fe1e730..65fe1e730 100644
--- a/baseconfig/CONFIG_IIO_SSP_SENSORHUB
+++ b/configs/base-generic/CONFIG_IIO_SSP_SENSORHUB
diff --git a/baseconfig/CONFIG_IIO_ST_ACCEL_3AXIS b/configs/base-generic/CONFIG_IIO_ST_ACCEL_3AXIS
index b16f1ea2e..b16f1ea2e 100644
--- a/baseconfig/CONFIG_IIO_ST_ACCEL_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_ACCEL_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_ACCEL_I2C_3AXIS b/configs/base-generic/CONFIG_IIO_ST_ACCEL_I2C_3AXIS
index bb8b7bb84..bb8b7bb84 100644
--- a/baseconfig/CONFIG_IIO_ST_ACCEL_I2C_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_ACCEL_I2C_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_ACCEL_SPI_3AXIS b/configs/base-generic/CONFIG_IIO_ST_ACCEL_SPI_3AXIS
index f616c8095..f616c8095 100644
--- a/baseconfig/CONFIG_IIO_ST_ACCEL_SPI_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_ACCEL_SPI_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_GYRO_3AXIS b/configs/base-generic/CONFIG_IIO_ST_GYRO_3AXIS
index 3c6689dd8..3c6689dd8 100644
--- a/baseconfig/CONFIG_IIO_ST_GYRO_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_GYRO_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_GYRO_I2C_3AXIS b/configs/base-generic/CONFIG_IIO_ST_GYRO_I2C_3AXIS
index 19853c3f4..19853c3f4 100644
--- a/baseconfig/CONFIG_IIO_ST_GYRO_I2C_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_GYRO_I2C_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_GYRO_SPI_3AXIS b/configs/base-generic/CONFIG_IIO_ST_GYRO_SPI_3AXIS
index 89a3fbc21..89a3fbc21 100644
--- a/baseconfig/CONFIG_IIO_ST_GYRO_SPI_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_GYRO_SPI_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_LSM6DSX b/configs/base-generic/CONFIG_IIO_ST_LSM6DSX
index b6ec57836..b6ec57836 100644
--- a/baseconfig/CONFIG_IIO_ST_LSM6DSX
+++ b/configs/base-generic/CONFIG_IIO_ST_LSM6DSX
diff --git a/baseconfig/CONFIG_IIO_ST_MAGN_3AXIS b/configs/base-generic/CONFIG_IIO_ST_MAGN_3AXIS
index 4a9dc6fd3..4a9dc6fd3 100644
--- a/baseconfig/CONFIG_IIO_ST_MAGN_3AXIS
+++ b/configs/base-generic/CONFIG_IIO_ST_MAGN_3AXIS
diff --git a/baseconfig/CONFIG_IIO_ST_PRESS b/configs/base-generic/CONFIG_IIO_ST_PRESS
index 6932cca0b..6932cca0b 100644
--- a/baseconfig/CONFIG_IIO_ST_PRESS
+++ b/configs/base-generic/CONFIG_IIO_ST_PRESS
diff --git a/baseconfig/CONFIG_IIO_SW_DEVICE b/configs/base-generic/CONFIG_IIO_SW_DEVICE
index aba3cdb86..aba3cdb86 100644
--- a/baseconfig/CONFIG_IIO_SW_DEVICE
+++ b/configs/base-generic/CONFIG_IIO_SW_DEVICE
diff --git a/baseconfig/CONFIG_IIO_SW_TRIGGER b/configs/base-generic/CONFIG_IIO_SW_TRIGGER
index cba6f94f8..cba6f94f8 100644
--- a/baseconfig/CONFIG_IIO_SW_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_SW_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_SYSFS_TRIGGER b/configs/base-generic/CONFIG_IIO_SYSFS_TRIGGER
index 3ea306080..3ea306080 100644
--- a/baseconfig/CONFIG_IIO_SYSFS_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_SYSFS_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_TIGHTLOOP_TRIGGER b/configs/base-generic/CONFIG_IIO_TIGHTLOOP_TRIGGER
index 024c832ff..024c832ff 100644
--- a/baseconfig/CONFIG_IIO_TIGHTLOOP_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_TIGHTLOOP_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_TRIGGER b/configs/base-generic/CONFIG_IIO_TRIGGER
index f32839d5f..f32839d5f 100644
--- a/baseconfig/CONFIG_IIO_TRIGGER
+++ b/configs/base-generic/CONFIG_IIO_TRIGGER
diff --git a/baseconfig/CONFIG_IIO_TRIGGERED_BUFFER b/configs/base-generic/CONFIG_IIO_TRIGGERED_BUFFER
index 1707c5f48..1707c5f48 100644
--- a/baseconfig/CONFIG_IIO_TRIGGERED_BUFFER
+++ b/configs/base-generic/CONFIG_IIO_TRIGGERED_BUFFER
diff --git a/baseconfig/CONFIG_IKCONFIG b/configs/base-generic/CONFIG_IKCONFIG
index e167a1fc0..e167a1fc0 100644
--- a/baseconfig/CONFIG_IKCONFIG
+++ b/configs/base-generic/CONFIG_IKCONFIG
diff --git a/baseconfig/CONFIG_IMA b/configs/base-generic/CONFIG_IMA
index 83a06345b..83a06345b 100644
--- a/baseconfig/CONFIG_IMA
+++ b/configs/base-generic/CONFIG_IMA
diff --git a/baseconfig/CONFIG_IMA_LSM_RULES b/configs/base-generic/CONFIG_IMA_LSM_RULES
index 97d7dd642..97d7dd642 100644
--- a/baseconfig/CONFIG_IMA_LSM_RULES
+++ b/configs/base-generic/CONFIG_IMA_LSM_RULES
diff --git a/baseconfig/CONFIG_IMA_MEASURE_PCR_IDX b/configs/base-generic/CONFIG_IMA_MEASURE_PCR_IDX
index 685377b31..685377b31 100644
--- a/baseconfig/CONFIG_IMA_MEASURE_PCR_IDX
+++ b/configs/base-generic/CONFIG_IMA_MEASURE_PCR_IDX
diff --git a/baseconfig/CONFIG_IMG_ASCII_LCD b/configs/base-generic/CONFIG_IMG_ASCII_LCD
index 4de8f6cae..4de8f6cae 100644
--- a/baseconfig/CONFIG_IMG_ASCII_LCD
+++ b/configs/base-generic/CONFIG_IMG_ASCII_LCD
diff --git a/baseconfig/CONFIG_INA2XX_ADC b/configs/base-generic/CONFIG_INA2XX_ADC
index ee86c5485..ee86c5485 100644
--- a/baseconfig/CONFIG_INA2XX_ADC
+++ b/configs/base-generic/CONFIG_INA2XX_ADC
diff --git a/baseconfig/CONFIG_INET b/configs/base-generic/CONFIG_INET
index aac63495d..aac63495d 100644
--- a/baseconfig/CONFIG_INET
+++ b/configs/base-generic/CONFIG_INET
diff --git a/baseconfig/CONFIG_INET6_AH b/configs/base-generic/CONFIG_INET6_AH
index 9e4fbe002..9e4fbe002 100644
--- a/baseconfig/CONFIG_INET6_AH
+++ b/configs/base-generic/CONFIG_INET6_AH
diff --git a/baseconfig/CONFIG_INET6_ESP b/configs/base-generic/CONFIG_INET6_ESP
index e3a4a08d6..e3a4a08d6 100644
--- a/baseconfig/CONFIG_INET6_ESP
+++ b/configs/base-generic/CONFIG_INET6_ESP
diff --git a/baseconfig/CONFIG_INET6_ESP_OFFLOAD b/configs/base-generic/CONFIG_INET6_ESP_OFFLOAD
index 24c350004..24c350004 100644
--- a/baseconfig/CONFIG_INET6_ESP_OFFLOAD
+++ b/configs/base-generic/CONFIG_INET6_ESP_OFFLOAD
diff --git a/baseconfig/CONFIG_INET6_IPCOMP b/configs/base-generic/CONFIG_INET6_IPCOMP
index 40e0dde51..40e0dde51 100644
--- a/baseconfig/CONFIG_INET6_IPCOMP
+++ b/configs/base-generic/CONFIG_INET6_IPCOMP
diff --git a/baseconfig/CONFIG_INET6_XFRM_MODE_BEET b/configs/base-generic/CONFIG_INET6_XFRM_MODE_BEET
index 1b7c922b8..1b7c922b8 100644
--- a/baseconfig/CONFIG_INET6_XFRM_MODE_BEET
+++ b/configs/base-generic/CONFIG_INET6_XFRM_MODE_BEET
diff --git a/baseconfig/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION b/configs/base-generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
index c74e6f237..c74e6f237 100644
--- a/baseconfig/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
+++ b/configs/base-generic/CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
diff --git a/baseconfig/CONFIG_INET6_XFRM_MODE_TRANSPORT b/configs/base-generic/CONFIG_INET6_XFRM_MODE_TRANSPORT
index b76eceaab..b76eceaab 100644
--- a/baseconfig/CONFIG_INET6_XFRM_MODE_TRANSPORT
+++ b/configs/base-generic/CONFIG_INET6_XFRM_MODE_TRANSPORT
diff --git a/baseconfig/CONFIG_INET6_XFRM_MODE_TUNNEL b/configs/base-generic/CONFIG_INET6_XFRM_MODE_TUNNEL
index 794c8a962..794c8a962 100644
--- a/baseconfig/CONFIG_INET6_XFRM_MODE_TUNNEL
+++ b/configs/base-generic/CONFIG_INET6_XFRM_MODE_TUNNEL
diff --git a/baseconfig/CONFIG_INET_AH b/configs/base-generic/CONFIG_INET_AH
index 89b662d11..89b662d11 100644
--- a/baseconfig/CONFIG_INET_AH
+++ b/configs/base-generic/CONFIG_INET_AH
diff --git a/baseconfig/CONFIG_INET_DIAG b/configs/base-generic/CONFIG_INET_DIAG
index 8814c39c6..8814c39c6 100644
--- a/baseconfig/CONFIG_INET_DIAG
+++ b/configs/base-generic/CONFIG_INET_DIAG
diff --git a/baseconfig/CONFIG_INET_DIAG_DESTROY b/configs/base-generic/CONFIG_INET_DIAG_DESTROY
index ec1ba6c50..ec1ba6c50 100644
--- a/baseconfig/CONFIG_INET_DIAG_DESTROY
+++ b/configs/base-generic/CONFIG_INET_DIAG_DESTROY
diff --git a/baseconfig/CONFIG_INET_ESP b/configs/base-generic/CONFIG_INET_ESP
index 36f69aa2a..36f69aa2a 100644
--- a/baseconfig/CONFIG_INET_ESP
+++ b/configs/base-generic/CONFIG_INET_ESP
diff --git a/baseconfig/CONFIG_INET_ESP_OFFLOAD b/configs/base-generic/CONFIG_INET_ESP_OFFLOAD
index d5cca6d1d..d5cca6d1d 100644
--- a/baseconfig/CONFIG_INET_ESP_OFFLOAD
+++ b/configs/base-generic/CONFIG_INET_ESP_OFFLOAD
diff --git a/baseconfig/CONFIG_INET_IPCOMP b/configs/base-generic/CONFIG_INET_IPCOMP
index 27b6ba9d8..27b6ba9d8 100644
--- a/baseconfig/CONFIG_INET_IPCOMP
+++ b/configs/base-generic/CONFIG_INET_IPCOMP
diff --git a/baseconfig/CONFIG_INET_RAW_DIAG b/configs/base-generic/CONFIG_INET_RAW_DIAG
index b1932e98a..b1932e98a 100644
--- a/baseconfig/CONFIG_INET_RAW_DIAG
+++ b/configs/base-generic/CONFIG_INET_RAW_DIAG
diff --git a/baseconfig/CONFIG_INET_TUNNEL b/configs/base-generic/CONFIG_INET_TUNNEL
index ab07f3009..ab07f3009 100644
--- a/baseconfig/CONFIG_INET_TUNNEL
+++ b/configs/base-generic/CONFIG_INET_TUNNEL
diff --git a/baseconfig/CONFIG_INET_UDP_DIAG b/configs/base-generic/CONFIG_INET_UDP_DIAG
index 6abf65483..6abf65483 100644
--- a/baseconfig/CONFIG_INET_UDP_DIAG
+++ b/configs/base-generic/CONFIG_INET_UDP_DIAG
diff --git a/baseconfig/CONFIG_INET_XFRM_MODE_BEET b/configs/base-generic/CONFIG_INET_XFRM_MODE_BEET
index 1c221bad4..1c221bad4 100644
--- a/baseconfig/CONFIG_INET_XFRM_MODE_BEET
+++ b/configs/base-generic/CONFIG_INET_XFRM_MODE_BEET
diff --git a/baseconfig/CONFIG_INET_XFRM_MODE_TRANSPORT b/configs/base-generic/CONFIG_INET_XFRM_MODE_TRANSPORT
index 004ec87ba..004ec87ba 100644
--- a/baseconfig/CONFIG_INET_XFRM_MODE_TRANSPORT
+++ b/configs/base-generic/CONFIG_INET_XFRM_MODE_TRANSPORT
diff --git a/baseconfig/CONFIG_INET_XFRM_MODE_TUNNEL b/configs/base-generic/CONFIG_INET_XFRM_MODE_TUNNEL
index 326c015e8..326c015e8 100644
--- a/baseconfig/CONFIG_INET_XFRM_MODE_TUNNEL
+++ b/configs/base-generic/CONFIG_INET_XFRM_MODE_TUNNEL
diff --git a/baseconfig/CONFIG_INFINIBAND b/configs/base-generic/CONFIG_INFINIBAND
index 50f88a282..50f88a282 100644
--- a/baseconfig/CONFIG_INFINIBAND
+++ b/configs/base-generic/CONFIG_INFINIBAND
diff --git a/baseconfig/CONFIG_INFINIBAND_BNXT_RE b/configs/base-generic/CONFIG_INFINIBAND_BNXT_RE
index 47533209e..47533209e 100644
--- a/baseconfig/CONFIG_INFINIBAND_BNXT_RE
+++ b/configs/base-generic/CONFIG_INFINIBAND_BNXT_RE
diff --git a/baseconfig/CONFIG_INFINIBAND_CXGB3 b/configs/base-generic/CONFIG_INFINIBAND_CXGB3
index 7c0e12ff4..7c0e12ff4 100644
--- a/baseconfig/CONFIG_INFINIBAND_CXGB3
+++ b/configs/base-generic/CONFIG_INFINIBAND_CXGB3
diff --git a/baseconfig/CONFIG_INFINIBAND_CXGB3_DEBUG b/configs/base-generic/CONFIG_INFINIBAND_CXGB3_DEBUG
index 6daba400b..6daba400b 100644
--- a/baseconfig/CONFIG_INFINIBAND_CXGB3_DEBUG
+++ b/configs/base-generic/CONFIG_INFINIBAND_CXGB3_DEBUG
diff --git a/baseconfig/CONFIG_INFINIBAND_CXGB4 b/configs/base-generic/CONFIG_INFINIBAND_CXGB4
index 5968a3ee2..5968a3ee2 100644
--- a/baseconfig/CONFIG_INFINIBAND_CXGB4
+++ b/configs/base-generic/CONFIG_INFINIBAND_CXGB4
diff --git a/baseconfig/CONFIG_INFINIBAND_EXP_USER_ACCESS b/configs/base-generic/CONFIG_INFINIBAND_EXP_USER_ACCESS
index 478415c11..478415c11 100644
--- a/baseconfig/CONFIG_INFINIBAND_EXP_USER_ACCESS
+++ b/configs/base-generic/CONFIG_INFINIBAND_EXP_USER_ACCESS
diff --git a/baseconfig/CONFIG_INFINIBAND_I40IW b/configs/base-generic/CONFIG_INFINIBAND_I40IW
index e85acf588..e85acf588 100644
--- a/baseconfig/CONFIG_INFINIBAND_I40IW
+++ b/configs/base-generic/CONFIG_INFINIBAND_I40IW
diff --git a/baseconfig/CONFIG_INFINIBAND_IPOIB b/configs/base-generic/CONFIG_INFINIBAND_IPOIB
index 8548857aa..8548857aa 100644
--- a/baseconfig/CONFIG_INFINIBAND_IPOIB
+++ b/configs/base-generic/CONFIG_INFINIBAND_IPOIB
diff --git a/baseconfig/CONFIG_INFINIBAND_IPOIB_CM b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_CM
index e40868299..e40868299 100644
--- a/baseconfig/CONFIG_INFINIBAND_IPOIB_CM
+++ b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_CM
diff --git a/baseconfig/CONFIG_INFINIBAND_IPOIB_DEBUG b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_DEBUG
index d86370d98..d86370d98 100644
--- a/baseconfig/CONFIG_INFINIBAND_IPOIB_DEBUG
+++ b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_DEBUG
diff --git a/baseconfig/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
index ca88d94c1..ca88d94c1 100644
--- a/baseconfig/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
+++ b/configs/base-generic/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
diff --git a/baseconfig/CONFIG_INFINIBAND_ISER b/configs/base-generic/CONFIG_INFINIBAND_ISER
index c963877f5..c963877f5 100644
--- a/baseconfig/CONFIG_INFINIBAND_ISER
+++ b/configs/base-generic/CONFIG_INFINIBAND_ISER
diff --git a/baseconfig/CONFIG_INFINIBAND_ISERT b/configs/base-generic/CONFIG_INFINIBAND_ISERT
index 62b0f926c..62b0f926c 100644
--- a/baseconfig/CONFIG_INFINIBAND_ISERT
+++ b/configs/base-generic/CONFIG_INFINIBAND_ISERT
diff --git a/baseconfig/CONFIG_INFINIBAND_MTHCA b/configs/base-generic/CONFIG_INFINIBAND_MTHCA
index b5f09c38c..b5f09c38c 100644
--- a/baseconfig/CONFIG_INFINIBAND_MTHCA
+++ b/configs/base-generic/CONFIG_INFINIBAND_MTHCA
diff --git a/baseconfig/CONFIG_INFINIBAND_NES b/configs/base-generic/CONFIG_INFINIBAND_NES
index 133fd3098..133fd3098 100644
--- a/baseconfig/CONFIG_INFINIBAND_NES
+++ b/configs/base-generic/CONFIG_INFINIBAND_NES
diff --git a/baseconfig/CONFIG_INFINIBAND_NES_DEBUG b/configs/base-generic/CONFIG_INFINIBAND_NES_DEBUG
index 743cd631d..743cd631d 100644
--- a/baseconfig/CONFIG_INFINIBAND_NES_DEBUG
+++ b/configs/base-generic/CONFIG_INFINIBAND_NES_DEBUG
diff --git a/baseconfig/CONFIG_INFINIBAND_OCRDMA b/configs/base-generic/CONFIG_INFINIBAND_OCRDMA
index 5f6ad2a51..5f6ad2a51 100644
--- a/baseconfig/CONFIG_INFINIBAND_OCRDMA
+++ b/configs/base-generic/CONFIG_INFINIBAND_OCRDMA
diff --git a/baseconfig/CONFIG_INFINIBAND_ON_DEMAND_PAGING b/configs/base-generic/CONFIG_INFINIBAND_ON_DEMAND_PAGING
index ea5a3d8d8..ea5a3d8d8 100644
--- a/baseconfig/CONFIG_INFINIBAND_ON_DEMAND_PAGING
+++ b/configs/base-generic/CONFIG_INFINIBAND_ON_DEMAND_PAGING
diff --git a/baseconfig/CONFIG_INFINIBAND_QEDR b/configs/base-generic/CONFIG_INFINIBAND_QEDR
index 5fa3da394..5fa3da394 100644
--- a/baseconfig/CONFIG_INFINIBAND_QEDR
+++ b/configs/base-generic/CONFIG_INFINIBAND_QEDR
diff --git a/baseconfig/CONFIG_INFINIBAND_QIB b/configs/base-generic/CONFIG_INFINIBAND_QIB
index cbb28575e..cbb28575e 100644
--- a/baseconfig/CONFIG_INFINIBAND_QIB
+++ b/configs/base-generic/CONFIG_INFINIBAND_QIB
diff --git a/baseconfig/CONFIG_INFINIBAND_QIB_DCA b/configs/base-generic/CONFIG_INFINIBAND_QIB_DCA
index 58cb2f713..58cb2f713 100644
--- a/baseconfig/CONFIG_INFINIBAND_QIB_DCA
+++ b/configs/base-generic/CONFIG_INFINIBAND_QIB_DCA
diff --git a/baseconfig/CONFIG_INFINIBAND_RDMAVT b/configs/base-generic/CONFIG_INFINIBAND_RDMAVT
index ce4854611..ce4854611 100644
--- a/baseconfig/CONFIG_INFINIBAND_RDMAVT
+++ b/configs/base-generic/CONFIG_INFINIBAND_RDMAVT
diff --git a/baseconfig/CONFIG_INFINIBAND_SRP b/configs/base-generic/CONFIG_INFINIBAND_SRP
index b382bf656..b382bf656 100644
--- a/baseconfig/CONFIG_INFINIBAND_SRP
+++ b/configs/base-generic/CONFIG_INFINIBAND_SRP
diff --git a/baseconfig/CONFIG_INFINIBAND_SRPT b/configs/base-generic/CONFIG_INFINIBAND_SRPT
index ff4989b54..ff4989b54 100644
--- a/baseconfig/CONFIG_INFINIBAND_SRPT
+++ b/configs/base-generic/CONFIG_INFINIBAND_SRPT
diff --git a/baseconfig/CONFIG_INFINIBAND_USER_ACCESS b/configs/base-generic/CONFIG_INFINIBAND_USER_ACCESS
index 1b11b6f4a..1b11b6f4a 100644
--- a/baseconfig/CONFIG_INFINIBAND_USER_ACCESS
+++ b/configs/base-generic/CONFIG_INFINIBAND_USER_ACCESS
diff --git a/baseconfig/CONFIG_INFINIBAND_USER_MAD b/configs/base-generic/CONFIG_INFINIBAND_USER_MAD
index 36e7eb29d..36e7eb29d 100644
--- a/baseconfig/CONFIG_INFINIBAND_USER_MAD
+++ b/configs/base-generic/CONFIG_INFINIBAND_USER_MAD
diff --git a/baseconfig/CONFIG_INFINIBAND_USNIC b/configs/base-generic/CONFIG_INFINIBAND_USNIC
index 3d8c33da5..3d8c33da5 100644
--- a/baseconfig/CONFIG_INFINIBAND_USNIC
+++ b/configs/base-generic/CONFIG_INFINIBAND_USNIC
diff --git a/baseconfig/CONFIG_INFINIBAND_VMWARE_PVRDMA b/configs/base-generic/CONFIG_INFINIBAND_VMWARE_PVRDMA
index 0743f41a5..0743f41a5 100644
--- a/baseconfig/CONFIG_INFINIBAND_VMWARE_PVRDMA
+++ b/configs/base-generic/CONFIG_INFINIBAND_VMWARE_PVRDMA
diff --git a/baseconfig/CONFIG_INFTL b/configs/base-generic/CONFIG_INFTL
index bb3c8b3c5..bb3c8b3c5 100644
--- a/baseconfig/CONFIG_INFTL
+++ b/configs/base-generic/CONFIG_INFTL
diff --git a/baseconfig/CONFIG_INITRAMFS_SOURCE b/configs/base-generic/CONFIG_INITRAMFS_SOURCE
index becad4d7e..becad4d7e 100644
--- a/baseconfig/CONFIG_INITRAMFS_SOURCE
+++ b/configs/base-generic/CONFIG_INITRAMFS_SOURCE
diff --git a/baseconfig/CONFIG_INOTIFY_USER b/configs/base-generic/CONFIG_INOTIFY_USER
index eb2e0c9a8..eb2e0c9a8 100644
--- a/baseconfig/CONFIG_INOTIFY_USER
+++ b/configs/base-generic/CONFIG_INOTIFY_USER
diff --git a/baseconfig/CONFIG_INPUT b/configs/base-generic/CONFIG_INPUT
index de103d88f..de103d88f 100644
--- a/baseconfig/CONFIG_INPUT
+++ b/configs/base-generic/CONFIG_INPUT
diff --git a/baseconfig/CONFIG_INPUT_AD714X b/configs/base-generic/CONFIG_INPUT_AD714X
index ce04c7c5e..ce04c7c5e 100644
--- a/baseconfig/CONFIG_INPUT_AD714X
+++ b/configs/base-generic/CONFIG_INPUT_AD714X
diff --git a/baseconfig/CONFIG_INPUT_ADXL34X b/configs/base-generic/CONFIG_INPUT_ADXL34X
index 98fa01443..98fa01443 100644
--- a/baseconfig/CONFIG_INPUT_ADXL34X
+++ b/configs/base-generic/CONFIG_INPUT_ADXL34X
diff --git a/baseconfig/CONFIG_INPUT_APANEL b/configs/base-generic/CONFIG_INPUT_APANEL
index 16deb3fd3..16deb3fd3 100644
--- a/baseconfig/CONFIG_INPUT_APANEL
+++ b/configs/base-generic/CONFIG_INPUT_APANEL
diff --git a/baseconfig/CONFIG_INPUT_ATI_REMOTE2 b/configs/base-generic/CONFIG_INPUT_ATI_REMOTE2
index c60eb9e65..c60eb9e65 100644
--- a/baseconfig/CONFIG_INPUT_ATI_REMOTE2
+++ b/configs/base-generic/CONFIG_INPUT_ATI_REMOTE2
diff --git a/baseconfig/CONFIG_INPUT_ATLAS_BTNS b/configs/base-generic/CONFIG_INPUT_ATLAS_BTNS
index 730f49614..730f49614 100644
--- a/baseconfig/CONFIG_INPUT_ATLAS_BTNS
+++ b/configs/base-generic/CONFIG_INPUT_ATLAS_BTNS
diff --git a/baseconfig/CONFIG_INPUT_ATMEL_CAPTOUCH b/configs/base-generic/CONFIG_INPUT_ATMEL_CAPTOUCH
index e9e59840f..e9e59840f 100644
--- a/baseconfig/CONFIG_INPUT_ATMEL_CAPTOUCH
+++ b/configs/base-generic/CONFIG_INPUT_ATMEL_CAPTOUCH
diff --git a/baseconfig/CONFIG_INPUT_BMA150 b/configs/base-generic/CONFIG_INPUT_BMA150
index 4dd4cb0fe..4dd4cb0fe 100644
--- a/baseconfig/CONFIG_INPUT_BMA150
+++ b/configs/base-generic/CONFIG_INPUT_BMA150
diff --git a/baseconfig/CONFIG_INPUT_CM109 b/configs/base-generic/CONFIG_INPUT_CM109
index ede5a1df4..ede5a1df4 100644
--- a/baseconfig/CONFIG_INPUT_CM109
+++ b/configs/base-generic/CONFIG_INPUT_CM109
diff --git a/baseconfig/CONFIG_INPUT_CMA3000 b/configs/base-generic/CONFIG_INPUT_CMA3000
index c0e6decda..c0e6decda 100644
--- a/baseconfig/CONFIG_INPUT_CMA3000
+++ b/configs/base-generic/CONFIG_INPUT_CMA3000
diff --git a/baseconfig/CONFIG_INPUT_CMA3000_I2C b/configs/base-generic/CONFIG_INPUT_CMA3000_I2C
index 6cb940ca6..6cb940ca6 100644
--- a/baseconfig/CONFIG_INPUT_CMA3000_I2C
+++ b/configs/base-generic/CONFIG_INPUT_CMA3000_I2C
diff --git a/baseconfig/CONFIG_INPUT_DRV260X_HAPTICS b/configs/base-generic/CONFIG_INPUT_DRV260X_HAPTICS
index 482b80c54..482b80c54 100644
--- a/baseconfig/CONFIG_INPUT_DRV260X_HAPTICS
+++ b/configs/base-generic/CONFIG_INPUT_DRV260X_HAPTICS
diff --git a/baseconfig/CONFIG_INPUT_DRV2665_HAPTICS b/configs/base-generic/CONFIG_INPUT_DRV2665_HAPTICS
index 0ce8ccd60..0ce8ccd60 100644
--- a/baseconfig/CONFIG_INPUT_DRV2665_HAPTICS
+++ b/configs/base-generic/CONFIG_INPUT_DRV2665_HAPTICS
diff --git a/baseconfig/CONFIG_INPUT_DRV2667_HAPTICS b/configs/base-generic/CONFIG_INPUT_DRV2667_HAPTICS
index 29d7ce753..29d7ce753 100644
--- a/baseconfig/CONFIG_INPUT_DRV2667_HAPTICS
+++ b/configs/base-generic/CONFIG_INPUT_DRV2667_HAPTICS
diff --git a/baseconfig/CONFIG_INPUT_E3X0_BUTTON b/configs/base-generic/CONFIG_INPUT_E3X0_BUTTON
index 6f5fad51a..6f5fad51a 100644
--- a/baseconfig/CONFIG_INPUT_E3X0_BUTTON
+++ b/configs/base-generic/CONFIG_INPUT_E3X0_BUTTON
diff --git a/baseconfig/CONFIG_INPUT_EVBUG b/configs/base-generic/CONFIG_INPUT_EVBUG
index 93144f90a..93144f90a 100644
--- a/baseconfig/CONFIG_INPUT_EVBUG
+++ b/configs/base-generic/CONFIG_INPUT_EVBUG
diff --git a/baseconfig/CONFIG_INPUT_EVDEV b/configs/base-generic/CONFIG_INPUT_EVDEV
index b738491e8..b738491e8 100644
--- a/baseconfig/CONFIG_INPUT_EVDEV
+++ b/configs/base-generic/CONFIG_INPUT_EVDEV
diff --git a/baseconfig/CONFIG_INPUT_FF_MEMLESS b/configs/base-generic/CONFIG_INPUT_FF_MEMLESS
index 817e3e1ed..817e3e1ed 100644
--- a/baseconfig/CONFIG_INPUT_FF_MEMLESS
+++ b/configs/base-generic/CONFIG_INPUT_FF_MEMLESS
diff --git a/baseconfig/CONFIG_INPUT_GP2A b/configs/base-generic/CONFIG_INPUT_GP2A
index deca0f105..deca0f105 100644
--- a/baseconfig/CONFIG_INPUT_GP2A
+++ b/configs/base-generic/CONFIG_INPUT_GP2A
diff --git a/baseconfig/CONFIG_INPUT_GPIO b/configs/base-generic/CONFIG_INPUT_GPIO
index 32aa33ca0..32aa33ca0 100644
--- a/baseconfig/CONFIG_INPUT_GPIO
+++ b/configs/base-generic/CONFIG_INPUT_GPIO
diff --git a/baseconfig/CONFIG_INPUT_GPIO_BEEPER b/configs/base-generic/CONFIG_INPUT_GPIO_BEEPER
index 411fd135e..411fd135e 100644
--- a/baseconfig/CONFIG_INPUT_GPIO_BEEPER
+++ b/configs/base-generic/CONFIG_INPUT_GPIO_BEEPER
diff --git a/baseconfig/CONFIG_INPUT_GPIO_DECODER b/configs/base-generic/CONFIG_INPUT_GPIO_DECODER
index 47e04fe3a..47e04fe3a 100644
--- a/baseconfig/CONFIG_INPUT_GPIO_DECODER
+++ b/configs/base-generic/CONFIG_INPUT_GPIO_DECODER
diff --git a/baseconfig/CONFIG_INPUT_GPIO_ROTARY_ENCODER b/configs/base-generic/CONFIG_INPUT_GPIO_ROTARY_ENCODER
index fd61dc3ff..fd61dc3ff 100644
--- a/baseconfig/CONFIG_INPUT_GPIO_ROTARY_ENCODER
+++ b/configs/base-generic/CONFIG_INPUT_GPIO_ROTARY_ENCODER
diff --git a/baseconfig/CONFIG_INPUT_GPIO_TILT_POLLED b/configs/base-generic/CONFIG_INPUT_GPIO_TILT_POLLED
index 8b1ef8c62..8b1ef8c62 100644
--- a/baseconfig/CONFIG_INPUT_GPIO_TILT_POLLED
+++ b/configs/base-generic/CONFIG_INPUT_GPIO_TILT_POLLED
diff --git a/baseconfig/CONFIG_INPUT_IDEAPAD_SLIDEBAR b/configs/base-generic/CONFIG_INPUT_IDEAPAD_SLIDEBAR
index cd28de703..cd28de703 100644
--- a/baseconfig/CONFIG_INPUT_IDEAPAD_SLIDEBAR
+++ b/configs/base-generic/CONFIG_INPUT_IDEAPAD_SLIDEBAR
diff --git a/baseconfig/CONFIG_INPUT_IMS_PCU b/configs/base-generic/CONFIG_INPUT_IMS_PCU
index 476ca55ac..476ca55ac 100644
--- a/baseconfig/CONFIG_INPUT_IMS_PCU
+++ b/configs/base-generic/CONFIG_INPUT_IMS_PCU
diff --git a/baseconfig/CONFIG_INPUT_JOYDEV b/configs/base-generic/CONFIG_INPUT_JOYDEV
index d4bf799d0..d4bf799d0 100644
--- a/baseconfig/CONFIG_INPUT_JOYDEV
+++ b/configs/base-generic/CONFIG_INPUT_JOYDEV
diff --git a/baseconfig/CONFIG_INPUT_JOYSTICK b/configs/base-generic/CONFIG_INPUT_JOYSTICK
index 90ef112b5..90ef112b5 100644
--- a/baseconfig/CONFIG_INPUT_JOYSTICK
+++ b/configs/base-generic/CONFIG_INPUT_JOYSTICK
diff --git a/baseconfig/CONFIG_INPUT_KEYBOARD b/configs/base-generic/CONFIG_INPUT_KEYBOARD
index 42362ad6f..42362ad6f 100644
--- a/baseconfig/CONFIG_INPUT_KEYBOARD
+++ b/configs/base-generic/CONFIG_INPUT_KEYBOARD
diff --git a/baseconfig/CONFIG_INPUT_KEYSPAN_REMOTE b/configs/base-generic/CONFIG_INPUT_KEYSPAN_REMOTE
index 5cadd6973..5cadd6973 100644
--- a/baseconfig/CONFIG_INPUT_KEYSPAN_REMOTE
+++ b/configs/base-generic/CONFIG_INPUT_KEYSPAN_REMOTE
diff --git a/baseconfig/CONFIG_INPUT_KXTJ9 b/configs/base-generic/CONFIG_INPUT_KXTJ9
index 2ee0468fa..2ee0468fa 100644
--- a/baseconfig/CONFIG_INPUT_KXTJ9
+++ b/configs/base-generic/CONFIG_INPUT_KXTJ9
diff --git a/baseconfig/CONFIG_INPUT_KXTJ9_POLLED_MODE b/configs/base-generic/CONFIG_INPUT_KXTJ9_POLLED_MODE
index 8ecaad5bd..8ecaad5bd 100644
--- a/baseconfig/CONFIG_INPUT_KXTJ9_POLLED_MODE
+++ b/configs/base-generic/CONFIG_INPUT_KXTJ9_POLLED_MODE
diff --git a/baseconfig/CONFIG_INPUT_LEDS b/configs/base-generic/CONFIG_INPUT_LEDS
index 4fd79ff1b..4fd79ff1b 100644
--- a/baseconfig/CONFIG_INPUT_LEDS
+++ b/configs/base-generic/CONFIG_INPUT_LEDS
diff --git a/baseconfig/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/CONFIG_INPUT_MATRIXKMAP
index 2662c28f0..2662c28f0 100644
--- a/baseconfig/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/CONFIG_INPUT_MISC b/configs/base-generic/CONFIG_INPUT_MISC
index 3708f5641..3708f5641 100644
--- a/baseconfig/CONFIG_INPUT_MISC
+++ b/configs/base-generic/CONFIG_INPUT_MISC
diff --git a/baseconfig/CONFIG_INPUT_MMA8450 b/configs/base-generic/CONFIG_INPUT_MMA8450
index 105180917..105180917 100644
--- a/baseconfig/CONFIG_INPUT_MMA8450
+++ b/configs/base-generic/CONFIG_INPUT_MMA8450
diff --git a/baseconfig/CONFIG_INPUT_MOUSE b/configs/base-generic/CONFIG_INPUT_MOUSE
index 4f6de0eef..4f6de0eef 100644
--- a/baseconfig/CONFIG_INPUT_MOUSE
+++ b/configs/base-generic/CONFIG_INPUT_MOUSE
diff --git a/baseconfig/CONFIG_INPUT_MOUSEDEV b/configs/base-generic/CONFIG_INPUT_MOUSEDEV
index 53cd13a60..53cd13a60 100644
--- a/baseconfig/CONFIG_INPUT_MOUSEDEV
+++ b/configs/base-generic/CONFIG_INPUT_MOUSEDEV
diff --git a/baseconfig/CONFIG_INPUT_MOUSEDEV_PSAUX b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_PSAUX
index 9f3efab31..9f3efab31 100644
--- a/baseconfig/CONFIG_INPUT_MOUSEDEV_PSAUX
+++ b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_PSAUX
diff --git a/baseconfig/CONFIG_INPUT_MOUSEDEV_SCREEN_X b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_SCREEN_X
index 2d2125c5e..2d2125c5e 100644
--- a/baseconfig/CONFIG_INPUT_MOUSEDEV_SCREEN_X
+++ b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_SCREEN_X
diff --git a/baseconfig/CONFIG_INPUT_MOUSEDEV_SCREEN_Y b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_SCREEN_Y
index 661c803b9..661c803b9 100644
--- a/baseconfig/CONFIG_INPUT_MOUSEDEV_SCREEN_Y
+++ b/configs/base-generic/CONFIG_INPUT_MOUSEDEV_SCREEN_Y
diff --git a/baseconfig/CONFIG_INPUT_PCF50633_PMU b/configs/base-generic/CONFIG_INPUT_PCF50633_PMU
index fb8bbf2fe..fb8bbf2fe 100644
--- a/baseconfig/CONFIG_INPUT_PCF50633_PMU
+++ b/configs/base-generic/CONFIG_INPUT_PCF50633_PMU
diff --git a/baseconfig/CONFIG_INPUT_PCF8574 b/configs/base-generic/CONFIG_INPUT_PCF8574
index caaa9ddb2..caaa9ddb2 100644
--- a/baseconfig/CONFIG_INPUT_PCF8574
+++ b/configs/base-generic/CONFIG_INPUT_PCF8574
diff --git a/baseconfig/CONFIG_INPUT_PCSPKR b/configs/base-generic/CONFIG_INPUT_PCSPKR
index 87fa5268d..87fa5268d 100644
--- a/baseconfig/CONFIG_INPUT_PCSPKR
+++ b/configs/base-generic/CONFIG_INPUT_PCSPKR
diff --git a/baseconfig/CONFIG_INPUT_PM8XXX_VIBRATOR b/configs/base-generic/CONFIG_INPUT_PM8XXX_VIBRATOR
index 2a1af2b4e..2a1af2b4e 100644
--- a/baseconfig/CONFIG_INPUT_PM8XXX_VIBRATOR
+++ b/configs/base-generic/CONFIG_INPUT_PM8XXX_VIBRATOR
diff --git a/baseconfig/CONFIG_INPUT_PMIC8XXX_PWRKEY b/configs/base-generic/CONFIG_INPUT_PMIC8XXX_PWRKEY
index f14705e77..f14705e77 100644
--- a/baseconfig/CONFIG_INPUT_PMIC8XXX_PWRKEY
+++ b/configs/base-generic/CONFIG_INPUT_PMIC8XXX_PWRKEY
diff --git a/baseconfig/CONFIG_INPUT_POLLDEV b/configs/base-generic/CONFIG_INPUT_POLLDEV
index 338a8f930..338a8f930 100644
--- a/baseconfig/CONFIG_INPUT_POLLDEV
+++ b/configs/base-generic/CONFIG_INPUT_POLLDEV
diff --git a/baseconfig/CONFIG_INPUT_POWERMATE b/configs/base-generic/CONFIG_INPUT_POWERMATE
index e7251e1ce..e7251e1ce 100644
--- a/baseconfig/CONFIG_INPUT_POWERMATE
+++ b/configs/base-generic/CONFIG_INPUT_POWERMATE
diff --git a/baseconfig/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/CONFIG_INPUT_PWM_BEEPER
index 9ac1c7b31..9ac1c7b31 100644
--- a/baseconfig/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/CONFIG_INPUT_PWM_VIBRA b/configs/base-generic/CONFIG_INPUT_PWM_VIBRA
index 39a51b490..39a51b490 100644
--- a/baseconfig/CONFIG_INPUT_PWM_VIBRA
+++ b/configs/base-generic/CONFIG_INPUT_PWM_VIBRA
diff --git a/baseconfig/CONFIG_INPUT_RETU_PWRBUTTON b/configs/base-generic/CONFIG_INPUT_RETU_PWRBUTTON
index 8ad6873c8..8ad6873c8 100644
--- a/baseconfig/CONFIG_INPUT_RETU_PWRBUTTON
+++ b/configs/base-generic/CONFIG_INPUT_RETU_PWRBUTTON
diff --git a/baseconfig/CONFIG_INPUT_RK805_PWRKEY b/configs/base-generic/CONFIG_INPUT_RK805_PWRKEY
index 4ce96f558..4ce96f558 100644
--- a/baseconfig/CONFIG_INPUT_RK805_PWRKEY
+++ b/configs/base-generic/CONFIG_INPUT_RK805_PWRKEY
diff --git a/baseconfig/CONFIG_INPUT_SPARSEKMAP b/configs/base-generic/CONFIG_INPUT_SPARSEKMAP
index 5b212431a..5b212431a 100644
--- a/baseconfig/CONFIG_INPUT_SPARSEKMAP
+++ b/configs/base-generic/CONFIG_INPUT_SPARSEKMAP
diff --git a/baseconfig/CONFIG_INPUT_TABLET b/configs/base-generic/CONFIG_INPUT_TABLET
index a435e97d0..a435e97d0 100644
--- a/baseconfig/CONFIG_INPUT_TABLET
+++ b/configs/base-generic/CONFIG_INPUT_TABLET
diff --git a/baseconfig/CONFIG_INPUT_TOUCHSCREEN b/configs/base-generic/CONFIG_INPUT_TOUCHSCREEN
index 3ee240e2b..3ee240e2b 100644
--- a/baseconfig/CONFIG_INPUT_TOUCHSCREEN
+++ b/configs/base-generic/CONFIG_INPUT_TOUCHSCREEN
diff --git a/baseconfig/CONFIG_INPUT_UINPUT b/configs/base-generic/CONFIG_INPUT_UINPUT
index ae1ea9a9c..ae1ea9a9c 100644
--- a/baseconfig/CONFIG_INPUT_UINPUT
+++ b/configs/base-generic/CONFIG_INPUT_UINPUT
diff --git a/baseconfig/CONFIG_INPUT_WISTRON_BTNS b/configs/base-generic/CONFIG_INPUT_WISTRON_BTNS
index 98e8e4011..98e8e4011 100644
--- a/baseconfig/CONFIG_INPUT_WISTRON_BTNS
+++ b/configs/base-generic/CONFIG_INPUT_WISTRON_BTNS
diff --git a/baseconfig/CONFIG_INPUT_WM831X_ON b/configs/base-generic/CONFIG_INPUT_WM831X_ON
index 3c3f937d7..3c3f937d7 100644
--- a/baseconfig/CONFIG_INPUT_WM831X_ON
+++ b/configs/base-generic/CONFIG_INPUT_WM831X_ON
diff --git a/baseconfig/CONFIG_INPUT_YEALINK b/configs/base-generic/CONFIG_INPUT_YEALINK
index 328da30ac..328da30ac 100644
--- a/baseconfig/CONFIG_INPUT_YEALINK
+++ b/configs/base-generic/CONFIG_INPUT_YEALINK
diff --git a/baseconfig/CONFIG_INTEGRITY b/configs/base-generic/CONFIG_INTEGRITY
index 5dd074057..5dd074057 100644
--- a/baseconfig/CONFIG_INTEGRITY
+++ b/configs/base-generic/CONFIG_INTEGRITY
diff --git a/baseconfig/CONFIG_INTEL_IDMA64 b/configs/base-generic/CONFIG_INTEL_IDMA64
index 52e4d562a..52e4d562a 100644
--- a/baseconfig/CONFIG_INTEL_IDMA64
+++ b/configs/base-generic/CONFIG_INTEL_IDMA64
diff --git a/baseconfig/CONFIG_INTEL_SOC_PMIC b/configs/base-generic/CONFIG_INTEL_SOC_PMIC
index 2b6716fec..2b6716fec 100644
--- a/baseconfig/CONFIG_INTEL_SOC_PMIC
+++ b/configs/base-generic/CONFIG_INTEL_SOC_PMIC
diff --git a/baseconfig/CONFIG_INTEL_TH b/configs/base-generic/CONFIG_INTEL_TH
index 4b2285f56..4b2285f56 100644
--- a/baseconfig/CONFIG_INTEL_TH
+++ b/configs/base-generic/CONFIG_INTEL_TH
diff --git a/baseconfig/CONFIG_INTEL_XWAY_PHY b/configs/base-generic/CONFIG_INTEL_XWAY_PHY
index a21e3fff7..a21e3fff7 100644
--- a/baseconfig/CONFIG_INTEL_XWAY_PHY
+++ b/configs/base-generic/CONFIG_INTEL_XWAY_PHY
diff --git a/baseconfig/CONFIG_INTERVAL_TREE_TEST b/configs/base-generic/CONFIG_INTERVAL_TREE_TEST
index 16bcd6d9d..16bcd6d9d 100644
--- a/baseconfig/CONFIG_INTERVAL_TREE_TEST
+++ b/configs/base-generic/CONFIG_INTERVAL_TREE_TEST
diff --git a/baseconfig/CONFIG_INV_MPU6050_I2C b/configs/base-generic/CONFIG_INV_MPU6050_I2C
index 75930df43..75930df43 100644
--- a/baseconfig/CONFIG_INV_MPU6050_I2C
+++ b/configs/base-generic/CONFIG_INV_MPU6050_I2C
diff --git a/baseconfig/CONFIG_INV_MPU6050_IIO b/configs/base-generic/CONFIG_INV_MPU6050_IIO
index 090174647..090174647 100644
--- a/baseconfig/CONFIG_INV_MPU6050_IIO
+++ b/configs/base-generic/CONFIG_INV_MPU6050_IIO
diff --git a/baseconfig/CONFIG_INV_MPU6050_SPI b/configs/base-generic/CONFIG_INV_MPU6050_SPI
index 848862989..848862989 100644
--- a/baseconfig/CONFIG_INV_MPU6050_SPI
+++ b/configs/base-generic/CONFIG_INV_MPU6050_SPI
diff --git a/baseconfig/CONFIG_IOMMU_SUPPORT b/configs/base-generic/CONFIG_IOMMU_SUPPORT
index 05bdc99f3..05bdc99f3 100644
--- a/baseconfig/CONFIG_IOMMU_SUPPORT
+++ b/configs/base-generic/CONFIG_IOMMU_SUPPORT
diff --git a/baseconfig/CONFIG_IOSCHED_BFQ b/configs/base-generic/CONFIG_IOSCHED_BFQ
index 3023fb0b5..3023fb0b5 100644
--- a/baseconfig/CONFIG_IOSCHED_BFQ
+++ b/configs/base-generic/CONFIG_IOSCHED_BFQ
diff --git a/baseconfig/CONFIG_IOSCHED_CFQ b/configs/base-generic/CONFIG_IOSCHED_CFQ
index 99af23590..99af23590 100644
--- a/baseconfig/CONFIG_IOSCHED_CFQ
+++ b/configs/base-generic/CONFIG_IOSCHED_CFQ
diff --git a/baseconfig/CONFIG_IOSCHED_DEADLINE b/configs/base-generic/CONFIG_IOSCHED_DEADLINE
index c71a189de..c71a189de 100644
--- a/baseconfig/CONFIG_IOSCHED_DEADLINE
+++ b/configs/base-generic/CONFIG_IOSCHED_DEADLINE
diff --git a/baseconfig/CONFIG_IOSCHED_NOOP b/configs/base-generic/CONFIG_IOSCHED_NOOP
index eba6d2b83..eba6d2b83 100644
--- a/baseconfig/CONFIG_IOSCHED_NOOP
+++ b/configs/base-generic/CONFIG_IOSCHED_NOOP
diff --git a/baseconfig/CONFIG_IO_STRICT_DEVMEM b/configs/base-generic/CONFIG_IO_STRICT_DEVMEM
index 61860b4a1..61860b4a1 100644
--- a/baseconfig/CONFIG_IO_STRICT_DEVMEM
+++ b/configs/base-generic/CONFIG_IO_STRICT_DEVMEM
diff --git a/baseconfig/CONFIG_IP6_NF_FILTER b/configs/base-generic/CONFIG_IP6_NF_FILTER
index 40c33ab1f..40c33ab1f 100644
--- a/baseconfig/CONFIG_IP6_NF_FILTER
+++ b/configs/base-generic/CONFIG_IP6_NF_FILTER
diff --git a/baseconfig/CONFIG_IP6_NF_IPTABLES b/configs/base-generic/CONFIG_IP6_NF_IPTABLES
index 6505ac4fe..6505ac4fe 100644
--- a/baseconfig/CONFIG_IP6_NF_IPTABLES
+++ b/configs/base-generic/CONFIG_IP6_NF_IPTABLES
diff --git a/baseconfig/CONFIG_IP6_NF_MANGLE b/configs/base-generic/CONFIG_IP6_NF_MANGLE
index 20221d523..20221d523 100644
--- a/baseconfig/CONFIG_IP6_NF_MANGLE
+++ b/configs/base-generic/CONFIG_IP6_NF_MANGLE
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_AH b/configs/base-generic/CONFIG_IP6_NF_MATCH_AH
index c3a8d4bbf..c3a8d4bbf 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_AH
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_AH
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_EUI64 b/configs/base-generic/CONFIG_IP6_NF_MATCH_EUI64
index caa47b591..caa47b591 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_EUI64
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_EUI64
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_FRAG b/configs/base-generic/CONFIG_IP6_NF_MATCH_FRAG
index e288cb538..e288cb538 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_FRAG
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_FRAG
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_HL b/configs/base-generic/CONFIG_IP6_NF_MATCH_HL
index 179ce8d47..179ce8d47 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_HL
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_HL
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_IPV6HEADER b/configs/base-generic/CONFIG_IP6_NF_MATCH_IPV6HEADER
index e5c787396..e5c787396 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_IPV6HEADER
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_IPV6HEADER
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_MH b/configs/base-generic/CONFIG_IP6_NF_MATCH_MH
index 81b6caa1f..81b6caa1f 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_MH
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_MH
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_OPTS b/configs/base-generic/CONFIG_IP6_NF_MATCH_OPTS
index ff6c9a495..ff6c9a495 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_OPTS
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_OPTS
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_RPFILTER b/configs/base-generic/CONFIG_IP6_NF_MATCH_RPFILTER
index 7b0204783..7b0204783 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_RPFILTER
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_RPFILTER
diff --git a/baseconfig/CONFIG_IP6_NF_MATCH_RT b/configs/base-generic/CONFIG_IP6_NF_MATCH_RT
index 4f7509d4f..4f7509d4f 100644
--- a/baseconfig/CONFIG_IP6_NF_MATCH_RT
+++ b/configs/base-generic/CONFIG_IP6_NF_MATCH_RT
diff --git a/baseconfig/CONFIG_IP6_NF_NAT b/configs/base-generic/CONFIG_IP6_NF_NAT
index 9796b0b05..9796b0b05 100644
--- a/baseconfig/CONFIG_IP6_NF_NAT
+++ b/configs/base-generic/CONFIG_IP6_NF_NAT
diff --git a/baseconfig/CONFIG_IP6_NF_RAW b/configs/base-generic/CONFIG_IP6_NF_RAW
index d84b4a62d..d84b4a62d 100644
--- a/baseconfig/CONFIG_IP6_NF_RAW
+++ b/configs/base-generic/CONFIG_IP6_NF_RAW
diff --git a/baseconfig/CONFIG_IP6_NF_SECURITY b/configs/base-generic/CONFIG_IP6_NF_SECURITY
index 01c6144f8..01c6144f8 100644
--- a/baseconfig/CONFIG_IP6_NF_SECURITY
+++ b/configs/base-generic/CONFIG_IP6_NF_SECURITY
diff --git a/baseconfig/CONFIG_IP6_NF_TARGET_HL b/configs/base-generic/CONFIG_IP6_NF_TARGET_HL
index 96b2c9470..96b2c9470 100644
--- a/baseconfig/CONFIG_IP6_NF_TARGET_HL
+++ b/configs/base-generic/CONFIG_IP6_NF_TARGET_HL
diff --git a/baseconfig/CONFIG_IP6_NF_TARGET_MASQUERADE b/configs/base-generic/CONFIG_IP6_NF_TARGET_MASQUERADE
index 4b63a260a..4b63a260a 100644
--- a/baseconfig/CONFIG_IP6_NF_TARGET_MASQUERADE
+++ b/configs/base-generic/CONFIG_IP6_NF_TARGET_MASQUERADE
diff --git a/baseconfig/CONFIG_IP6_NF_TARGET_NPT b/configs/base-generic/CONFIG_IP6_NF_TARGET_NPT
index bb6d2f77a..bb6d2f77a 100644
--- a/baseconfig/CONFIG_IP6_NF_TARGET_NPT
+++ b/configs/base-generic/CONFIG_IP6_NF_TARGET_NPT
diff --git a/baseconfig/CONFIG_IP6_NF_TARGET_REJECT b/configs/base-generic/CONFIG_IP6_NF_TARGET_REJECT
index 2de07d601..2de07d601 100644
--- a/baseconfig/CONFIG_IP6_NF_TARGET_REJECT
+++ b/configs/base-generic/CONFIG_IP6_NF_TARGET_REJECT
diff --git a/baseconfig/CONFIG_IP6_NF_TARGET_SYNPROXY b/configs/base-generic/CONFIG_IP6_NF_TARGET_SYNPROXY
index 6a3245b1f..6a3245b1f 100644
--- a/baseconfig/CONFIG_IP6_NF_TARGET_SYNPROXY
+++ b/configs/base-generic/CONFIG_IP6_NF_TARGET_SYNPROXY
diff --git a/baseconfig/CONFIG_IPACK_BUS b/configs/base-generic/CONFIG_IPACK_BUS
index 6c582c83a..6c582c83a 100644
--- a/baseconfig/CONFIG_IPACK_BUS
+++ b/configs/base-generic/CONFIG_IPACK_BUS
diff --git a/baseconfig/CONFIG_IPC_NS b/configs/base-generic/CONFIG_IPC_NS
index 037635cb2..037635cb2 100644
--- a/baseconfig/CONFIG_IPC_NS
+++ b/configs/base-generic/CONFIG_IPC_NS
diff --git a/baseconfig/CONFIG_IPDDP b/configs/base-generic/CONFIG_IPDDP
index a85b0f724..a85b0f724 100644
--- a/baseconfig/CONFIG_IPDDP
+++ b/configs/base-generic/CONFIG_IPDDP
diff --git a/baseconfig/CONFIG_IPDDP_ENCAP b/configs/base-generic/CONFIG_IPDDP_ENCAP
index 69c235e7c..69c235e7c 100644
--- a/baseconfig/CONFIG_IPDDP_ENCAP
+++ b/configs/base-generic/CONFIG_IPDDP_ENCAP
diff --git a/baseconfig/CONFIG_IPMI_DEVICE_INTERFACE b/configs/base-generic/CONFIG_IPMI_DEVICE_INTERFACE
index 3d0a94d76..3d0a94d76 100644
--- a/baseconfig/CONFIG_IPMI_DEVICE_INTERFACE
+++ b/configs/base-generic/CONFIG_IPMI_DEVICE_INTERFACE
diff --git a/baseconfig/CONFIG_IPMI_HANDLER b/configs/base-generic/CONFIG_IPMI_HANDLER
index 55e555c77..55e555c77 100644
--- a/baseconfig/CONFIG_IPMI_HANDLER
+++ b/configs/base-generic/CONFIG_IPMI_HANDLER
diff --git a/baseconfig/CONFIG_IPMI_PANIC_EVENT b/configs/base-generic/CONFIG_IPMI_PANIC_EVENT
index 225dc7b8d..225dc7b8d 100644
--- a/baseconfig/CONFIG_IPMI_PANIC_EVENT
+++ b/configs/base-generic/CONFIG_IPMI_PANIC_EVENT
diff --git a/baseconfig/CONFIG_IPMI_POWEROFF b/configs/base-generic/CONFIG_IPMI_POWEROFF
index e37543efc..e37543efc 100644
--- a/baseconfig/CONFIG_IPMI_POWEROFF
+++ b/configs/base-generic/CONFIG_IPMI_POWEROFF
diff --git a/baseconfig/CONFIG_IPMI_SI b/configs/base-generic/CONFIG_IPMI_SI
index ba6bb31db..ba6bb31db 100644
--- a/baseconfig/CONFIG_IPMI_SI
+++ b/configs/base-generic/CONFIG_IPMI_SI
diff --git a/baseconfig/CONFIG_IPMI_SSIF b/configs/base-generic/CONFIG_IPMI_SSIF
index d563156fb..d563156fb 100644
--- a/baseconfig/CONFIG_IPMI_SSIF
+++ b/configs/base-generic/CONFIG_IPMI_SSIF
diff --git a/baseconfig/CONFIG_IPMI_WATCHDOG b/configs/base-generic/CONFIG_IPMI_WATCHDOG
index 4feb657b8..4feb657b8 100644
--- a/baseconfig/CONFIG_IPMI_WATCHDOG
+++ b/configs/base-generic/CONFIG_IPMI_WATCHDOG
diff --git a/baseconfig/CONFIG_IPPP_FILTER b/configs/base-generic/CONFIG_IPPP_FILTER
index 4f1442ae1..4f1442ae1 100644
--- a/baseconfig/CONFIG_IPPP_FILTER
+++ b/configs/base-generic/CONFIG_IPPP_FILTER
diff --git a/baseconfig/CONFIG_IPV6 b/configs/base-generic/CONFIG_IPV6
index 6450f3493..6450f3493 100644
--- a/baseconfig/CONFIG_IPV6
+++ b/configs/base-generic/CONFIG_IPV6
diff --git a/baseconfig/CONFIG_IPV6_GRE b/configs/base-generic/CONFIG_IPV6_GRE
index d182bc161..d182bc161 100644
--- a/baseconfig/CONFIG_IPV6_GRE
+++ b/configs/base-generic/CONFIG_IPV6_GRE
diff --git a/baseconfig/CONFIG_IPV6_ILA b/configs/base-generic/CONFIG_IPV6_ILA
index 7078045db..7078045db 100644
--- a/baseconfig/CONFIG_IPV6_ILA
+++ b/configs/base-generic/CONFIG_IPV6_ILA
diff --git a/baseconfig/CONFIG_IPV6_MIP6 b/configs/base-generic/CONFIG_IPV6_MIP6
index a62bef1ca..a62bef1ca 100644
--- a/baseconfig/CONFIG_IPV6_MIP6
+++ b/configs/base-generic/CONFIG_IPV6_MIP6
diff --git a/baseconfig/CONFIG_IPV6_MROUTE b/configs/base-generic/CONFIG_IPV6_MROUTE
index 5dcf23403..5dcf23403 100644
--- a/baseconfig/CONFIG_IPV6_MROUTE
+++ b/configs/base-generic/CONFIG_IPV6_MROUTE
diff --git a/baseconfig/CONFIG_IPV6_MROUTE_MULTIPLE_TABLES b/configs/base-generic/CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
index 0e6ac6895..0e6ac6895 100644
--- a/baseconfig/CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
+++ b/configs/base-generic/CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
diff --git a/baseconfig/CONFIG_IPV6_MULTIPLE_TABLES b/configs/base-generic/CONFIG_IPV6_MULTIPLE_TABLES
index 18c565e1b..18c565e1b 100644
--- a/baseconfig/CONFIG_IPV6_MULTIPLE_TABLES
+++ b/configs/base-generic/CONFIG_IPV6_MULTIPLE_TABLES
diff --git a/baseconfig/CONFIG_IPV6_OPTIMISTIC_DAD b/configs/base-generic/CONFIG_IPV6_OPTIMISTIC_DAD
index a60dd2fc2..a60dd2fc2 100644
--- a/baseconfig/CONFIG_IPV6_OPTIMISTIC_DAD
+++ b/configs/base-generic/CONFIG_IPV6_OPTIMISTIC_DAD
diff --git a/baseconfig/CONFIG_IPV6_PIMSM_V2 b/configs/base-generic/CONFIG_IPV6_PIMSM_V2
index f0b066146..f0b066146 100644
--- a/baseconfig/CONFIG_IPV6_PIMSM_V2
+++ b/configs/base-generic/CONFIG_IPV6_PIMSM_V2
diff --git a/baseconfig/CONFIG_IPV6_ROUTER_PREF b/configs/base-generic/CONFIG_IPV6_ROUTER_PREF
index 8f5958c8f..8f5958c8f 100644
--- a/baseconfig/CONFIG_IPV6_ROUTER_PREF
+++ b/configs/base-generic/CONFIG_IPV6_ROUTER_PREF
diff --git a/baseconfig/CONFIG_IPV6_ROUTE_INFO b/configs/base-generic/CONFIG_IPV6_ROUTE_INFO
index 842b4d775..842b4d775 100644
--- a/baseconfig/CONFIG_IPV6_ROUTE_INFO
+++ b/configs/base-generic/CONFIG_IPV6_ROUTE_INFO
diff --git a/baseconfig/CONFIG_IPV6_SEG6_HMAC b/configs/base-generic/CONFIG_IPV6_SEG6_HMAC
index 29e14feae..29e14feae 100644
--- a/baseconfig/CONFIG_IPV6_SEG6_HMAC
+++ b/configs/base-generic/CONFIG_IPV6_SEG6_HMAC
diff --git a/baseconfig/CONFIG_IPV6_SEG6_INLINE b/configs/base-generic/CONFIG_IPV6_SEG6_INLINE
index db06cc599..db06cc599 100644
--- a/baseconfig/CONFIG_IPV6_SEG6_INLINE
+++ b/configs/base-generic/CONFIG_IPV6_SEG6_INLINE
diff --git a/baseconfig/CONFIG_IPV6_SEG6_LWTUNNEL b/configs/base-generic/CONFIG_IPV6_SEG6_LWTUNNEL
index 75a3285a6..75a3285a6 100644
--- a/baseconfig/CONFIG_IPV6_SEG6_LWTUNNEL
+++ b/configs/base-generic/CONFIG_IPV6_SEG6_LWTUNNEL
diff --git a/baseconfig/CONFIG_IPV6_SIT b/configs/base-generic/CONFIG_IPV6_SIT
index af75f60dd..af75f60dd 100644
--- a/baseconfig/CONFIG_IPV6_SIT
+++ b/configs/base-generic/CONFIG_IPV6_SIT
diff --git a/baseconfig/CONFIG_IPV6_SIT_6RD b/configs/base-generic/CONFIG_IPV6_SIT_6RD
index ab337b29b..ab337b29b 100644
--- a/baseconfig/CONFIG_IPV6_SIT_6RD
+++ b/configs/base-generic/CONFIG_IPV6_SIT_6RD
diff --git a/baseconfig/CONFIG_IPV6_SUBTREES b/configs/base-generic/CONFIG_IPV6_SUBTREES
index e79ed9830..e79ed9830 100644
--- a/baseconfig/CONFIG_IPV6_SUBTREES
+++ b/configs/base-generic/CONFIG_IPV6_SUBTREES
diff --git a/baseconfig/CONFIG_IPV6_TUNNEL b/configs/base-generic/CONFIG_IPV6_TUNNEL
index 2665c69ef..2665c69ef 100644
--- a/baseconfig/CONFIG_IPV6_TUNNEL
+++ b/configs/base-generic/CONFIG_IPV6_TUNNEL
diff --git a/baseconfig/CONFIG_IPV6_VTI b/configs/base-generic/CONFIG_IPV6_VTI
index cb7d072de..cb7d072de 100644
--- a/baseconfig/CONFIG_IPV6_VTI
+++ b/configs/base-generic/CONFIG_IPV6_VTI
diff --git a/baseconfig/CONFIG_IPVLAN b/configs/base-generic/CONFIG_IPVLAN
index 792652245..792652245 100644
--- a/baseconfig/CONFIG_IPVLAN
+++ b/configs/base-generic/CONFIG_IPVLAN
diff --git a/baseconfig/CONFIG_IPVTAP b/configs/base-generic/CONFIG_IPVTAP
index 4bb385673..4bb385673 100644
--- a/baseconfig/CONFIG_IPVTAP
+++ b/configs/base-generic/CONFIG_IPVTAP
diff --git a/baseconfig/CONFIG_IPW2100 b/configs/base-generic/CONFIG_IPW2100
index b9f94f283..b9f94f283 100644
--- a/baseconfig/CONFIG_IPW2100
+++ b/configs/base-generic/CONFIG_IPW2100
diff --git a/baseconfig/CONFIG_IPW2100_DEBUG b/configs/base-generic/CONFIG_IPW2100_DEBUG
index 08e06849e..08e06849e 100644
--- a/baseconfig/CONFIG_IPW2100_DEBUG
+++ b/configs/base-generic/CONFIG_IPW2100_DEBUG
diff --git a/baseconfig/CONFIG_IPW2200 b/configs/base-generic/CONFIG_IPW2200
index d1ad73474..d1ad73474 100644
--- a/baseconfig/CONFIG_IPW2200
+++ b/configs/base-generic/CONFIG_IPW2200
diff --git a/baseconfig/CONFIG_IPW2200_DEBUG b/configs/base-generic/CONFIG_IPW2200_DEBUG
index f9a9e8461..f9a9e8461 100644
--- a/baseconfig/CONFIG_IPW2200_DEBUG
+++ b/configs/base-generic/CONFIG_IPW2200_DEBUG
diff --git a/baseconfig/CONFIG_IPWIRELESS b/configs/base-generic/CONFIG_IPWIRELESS
index 9e6c9c413..9e6c9c413 100644
--- a/baseconfig/CONFIG_IPWIRELESS
+++ b/configs/base-generic/CONFIG_IPWIRELESS
diff --git a/baseconfig/CONFIG_IPX b/configs/base-generic/CONFIG_IPX
index 42770d9a6..42770d9a6 100644
--- a/baseconfig/CONFIG_IPX
+++ b/configs/base-generic/CONFIG_IPX
diff --git a/baseconfig/CONFIG_IPX_INTERN b/configs/base-generic/CONFIG_IPX_INTERN
index d409381ce..d409381ce 100644
--- a/baseconfig/CONFIG_IPX_INTERN
+++ b/configs/base-generic/CONFIG_IPX_INTERN
diff --git a/baseconfig/CONFIG_IP_ADVANCED_ROUTER b/configs/base-generic/CONFIG_IP_ADVANCED_ROUTER
index d8f8f5b4e..d8f8f5b4e 100644
--- a/baseconfig/CONFIG_IP_ADVANCED_ROUTER
+++ b/configs/base-generic/CONFIG_IP_ADVANCED_ROUTER
diff --git a/baseconfig/CONFIG_IP_DCCP b/configs/base-generic/CONFIG_IP_DCCP
index 6ecb43a3e..6ecb43a3e 100644
--- a/baseconfig/CONFIG_IP_DCCP
+++ b/configs/base-generic/CONFIG_IP_DCCP
diff --git a/baseconfig/CONFIG_IP_DCCP_CCID2 b/configs/base-generic/CONFIG_IP_DCCP_CCID2
index 35cad404a..35cad404a 100644
--- a/baseconfig/CONFIG_IP_DCCP_CCID2
+++ b/configs/base-generic/CONFIG_IP_DCCP_CCID2
diff --git a/baseconfig/CONFIG_IP_DCCP_CCID2_DEBUG b/configs/base-generic/CONFIG_IP_DCCP_CCID2_DEBUG
index cddfe2944..cddfe2944 100644
--- a/baseconfig/CONFIG_IP_DCCP_CCID2_DEBUG
+++ b/configs/base-generic/CONFIG_IP_DCCP_CCID2_DEBUG
diff --git a/baseconfig/CONFIG_IP_DCCP_CCID3 b/configs/base-generic/CONFIG_IP_DCCP_CCID3
index b7427d311..b7427d311 100644
--- a/baseconfig/CONFIG_IP_DCCP_CCID3
+++ b/configs/base-generic/CONFIG_IP_DCCP_CCID3
diff --git a/baseconfig/CONFIG_IP_DCCP_CCID3_DEBUG b/configs/base-generic/CONFIG_IP_DCCP_CCID3_DEBUG
index b7d849dec..b7d849dec 100644
--- a/baseconfig/CONFIG_IP_DCCP_CCID3_DEBUG
+++ b/configs/base-generic/CONFIG_IP_DCCP_CCID3_DEBUG
diff --git a/baseconfig/CONFIG_IP_DCCP_DEBUG b/configs/base-generic/CONFIG_IP_DCCP_DEBUG
index d62cd2f78..d62cd2f78 100644
--- a/baseconfig/CONFIG_IP_DCCP_DEBUG
+++ b/configs/base-generic/CONFIG_IP_DCCP_DEBUG
diff --git a/baseconfig/CONFIG_IP_FIB_TRIE_STATS b/configs/base-generic/CONFIG_IP_FIB_TRIE_STATS
index c6bc9c42c..c6bc9c42c 100644
--- a/baseconfig/CONFIG_IP_FIB_TRIE_STATS
+++ b/configs/base-generic/CONFIG_IP_FIB_TRIE_STATS
diff --git a/baseconfig/CONFIG_IP_MROUTE b/configs/base-generic/CONFIG_IP_MROUTE
index 56fa1578d..56fa1578d 100644
--- a/baseconfig/CONFIG_IP_MROUTE
+++ b/configs/base-generic/CONFIG_IP_MROUTE
diff --git a/baseconfig/CONFIG_IP_MROUTE_MULTIPLE_TABLES b/configs/base-generic/CONFIG_IP_MROUTE_MULTIPLE_TABLES
index 450a74bd6..450a74bd6 100644
--- a/baseconfig/CONFIG_IP_MROUTE_MULTIPLE_TABLES
+++ b/configs/base-generic/CONFIG_IP_MROUTE_MULTIPLE_TABLES
diff --git a/baseconfig/CONFIG_IP_MULTICAST b/configs/base-generic/CONFIG_IP_MULTICAST
index 15dbdffe1..15dbdffe1 100644
--- a/baseconfig/CONFIG_IP_MULTICAST
+++ b/configs/base-generic/CONFIG_IP_MULTICAST
diff --git a/baseconfig/CONFIG_IP_MULTIPLE_TABLES b/configs/base-generic/CONFIG_IP_MULTIPLE_TABLES
index b68058a30..b68058a30 100644
--- a/baseconfig/CONFIG_IP_MULTIPLE_TABLES
+++ b/configs/base-generic/CONFIG_IP_MULTIPLE_TABLES
diff --git a/baseconfig/CONFIG_IP_NF_ARPFILTER b/configs/base-generic/CONFIG_IP_NF_ARPFILTER
index 06b00645c..06b00645c 100644
--- a/baseconfig/CONFIG_IP_NF_ARPFILTER
+++ b/configs/base-generic/CONFIG_IP_NF_ARPFILTER
diff --git a/baseconfig/CONFIG_IP_NF_ARPTABLES b/configs/base-generic/CONFIG_IP_NF_ARPTABLES
index b4f356ef0..b4f356ef0 100644
--- a/baseconfig/CONFIG_IP_NF_ARPTABLES
+++ b/configs/base-generic/CONFIG_IP_NF_ARPTABLES
diff --git a/baseconfig/CONFIG_IP_NF_ARP_MANGLE b/configs/base-generic/CONFIG_IP_NF_ARP_MANGLE
index 2af015359..2af015359 100644
--- a/baseconfig/CONFIG_IP_NF_ARP_MANGLE
+++ b/configs/base-generic/CONFIG_IP_NF_ARP_MANGLE
diff --git a/baseconfig/CONFIG_IP_NF_FILTER b/configs/base-generic/CONFIG_IP_NF_FILTER
index 25420dc0e..25420dc0e 100644
--- a/baseconfig/CONFIG_IP_NF_FILTER
+++ b/configs/base-generic/CONFIG_IP_NF_FILTER
diff --git a/baseconfig/CONFIG_IP_NF_IPTABLES b/configs/base-generic/CONFIG_IP_NF_IPTABLES
index c8db0b068..c8db0b068 100644
--- a/baseconfig/CONFIG_IP_NF_IPTABLES
+++ b/configs/base-generic/CONFIG_IP_NF_IPTABLES
diff --git a/baseconfig/CONFIG_IP_NF_MANGLE b/configs/base-generic/CONFIG_IP_NF_MANGLE
index f00820888..f00820888 100644
--- a/baseconfig/CONFIG_IP_NF_MANGLE
+++ b/configs/base-generic/CONFIG_IP_NF_MANGLE
diff --git a/baseconfig/CONFIG_IP_NF_MATCH_AH b/configs/base-generic/CONFIG_IP_NF_MATCH_AH
index e9277f2bb..e9277f2bb 100644
--- a/baseconfig/CONFIG_IP_NF_MATCH_AH
+++ b/configs/base-generic/CONFIG_IP_NF_MATCH_AH
diff --git a/baseconfig/CONFIG_IP_NF_MATCH_ECN b/configs/base-generic/CONFIG_IP_NF_MATCH_ECN
index 15cb55578..15cb55578 100644
--- a/baseconfig/CONFIG_IP_NF_MATCH_ECN
+++ b/configs/base-generic/CONFIG_IP_NF_MATCH_ECN
diff --git a/baseconfig/CONFIG_IP_NF_MATCH_RPFILTER b/configs/base-generic/CONFIG_IP_NF_MATCH_RPFILTER
index cce5cf1e4..cce5cf1e4 100644
--- a/baseconfig/CONFIG_IP_NF_MATCH_RPFILTER
+++ b/configs/base-generic/CONFIG_IP_NF_MATCH_RPFILTER
diff --git a/baseconfig/CONFIG_IP_NF_MATCH_TTL b/configs/base-generic/CONFIG_IP_NF_MATCH_TTL
index 82e731606..82e731606 100644
--- a/baseconfig/CONFIG_IP_NF_MATCH_TTL
+++ b/configs/base-generic/CONFIG_IP_NF_MATCH_TTL
diff --git a/baseconfig/CONFIG_IP_NF_NAT b/configs/base-generic/CONFIG_IP_NF_NAT
index d2aa27240..d2aa27240 100644
--- a/baseconfig/CONFIG_IP_NF_NAT
+++ b/configs/base-generic/CONFIG_IP_NF_NAT
diff --git a/baseconfig/CONFIG_IP_NF_RAW b/configs/base-generic/CONFIG_IP_NF_RAW
index dbe34884b..dbe34884b 100644
--- a/baseconfig/CONFIG_IP_NF_RAW
+++ b/configs/base-generic/CONFIG_IP_NF_RAW
diff --git a/baseconfig/CONFIG_IP_NF_SECURITY b/configs/base-generic/CONFIG_IP_NF_SECURITY
index e23a4ded8..e23a4ded8 100644
--- a/baseconfig/CONFIG_IP_NF_SECURITY
+++ b/configs/base-generic/CONFIG_IP_NF_SECURITY
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_CLUSTERIP b/configs/base-generic/CONFIG_IP_NF_TARGET_CLUSTERIP
index 9e3f5a418..9e3f5a418 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_CLUSTERIP
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_CLUSTERIP
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_ECN b/configs/base-generic/CONFIG_IP_NF_TARGET_ECN
index 3f81954ca..3f81954ca 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_ECN
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_ECN
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_MASQUERADE b/configs/base-generic/CONFIG_IP_NF_TARGET_MASQUERADE
index a72c7fad5..a72c7fad5 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_MASQUERADE
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_MASQUERADE
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_NETMAP b/configs/base-generic/CONFIG_IP_NF_TARGET_NETMAP
index 7b44a7a76..7b44a7a76 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_NETMAP
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_NETMAP
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_REDIRECT b/configs/base-generic/CONFIG_IP_NF_TARGET_REDIRECT
index 0f42816a9..0f42816a9 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_REDIRECT
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_REDIRECT
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_REJECT b/configs/base-generic/CONFIG_IP_NF_TARGET_REJECT
index 688d27b6a..688d27b6a 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_REJECT
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_REJECT
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_SYNPROXY b/configs/base-generic/CONFIG_IP_NF_TARGET_SYNPROXY
index 8fc66aff4..8fc66aff4 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_SYNPROXY
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_SYNPROXY
diff --git a/baseconfig/CONFIG_IP_NF_TARGET_TTL b/configs/base-generic/CONFIG_IP_NF_TARGET_TTL
index f45533e02..f45533e02 100644
--- a/baseconfig/CONFIG_IP_NF_TARGET_TTL
+++ b/configs/base-generic/CONFIG_IP_NF_TARGET_TTL
diff --git a/baseconfig/CONFIG_IP_PIMSM_V1 b/configs/base-generic/CONFIG_IP_PIMSM_V1
index 8d52cd2eb..8d52cd2eb 100644
--- a/baseconfig/CONFIG_IP_PIMSM_V1
+++ b/configs/base-generic/CONFIG_IP_PIMSM_V1
diff --git a/baseconfig/CONFIG_IP_PIMSM_V2 b/configs/base-generic/CONFIG_IP_PIMSM_V2
index a475102ea..a475102ea 100644
--- a/baseconfig/CONFIG_IP_PIMSM_V2
+++ b/configs/base-generic/CONFIG_IP_PIMSM_V2
diff --git a/baseconfig/CONFIG_IP_PNP b/configs/base-generic/CONFIG_IP_PNP
index 43f68080b..43f68080b 100644
--- a/baseconfig/CONFIG_IP_PNP
+++ b/configs/base-generic/CONFIG_IP_PNP
diff --git a/baseconfig/CONFIG_IP_ROUTE_MULTIPATH b/configs/base-generic/CONFIG_IP_ROUTE_MULTIPATH
index 9daaed3b6..9daaed3b6 100644
--- a/baseconfig/CONFIG_IP_ROUTE_MULTIPATH
+++ b/configs/base-generic/CONFIG_IP_ROUTE_MULTIPATH
diff --git a/baseconfig/CONFIG_IP_ROUTE_VERBOSE b/configs/base-generic/CONFIG_IP_ROUTE_VERBOSE
index f616d8ad1..f616d8ad1 100644
--- a/baseconfig/CONFIG_IP_ROUTE_VERBOSE
+++ b/configs/base-generic/CONFIG_IP_ROUTE_VERBOSE
diff --git a/baseconfig/CONFIG_IP_SCTP b/configs/base-generic/CONFIG_IP_SCTP
index cf97ee4f7..cf97ee4f7 100644
--- a/baseconfig/CONFIG_IP_SCTP
+++ b/configs/base-generic/CONFIG_IP_SCTP
diff --git a/baseconfig/CONFIG_IP_SET b/configs/base-generic/CONFIG_IP_SET
index e4213b708..e4213b708 100644
--- a/baseconfig/CONFIG_IP_SET
+++ b/configs/base-generic/CONFIG_IP_SET
diff --git a/baseconfig/CONFIG_IP_SET_BITMAP_IP b/configs/base-generic/CONFIG_IP_SET_BITMAP_IP
index 194e715a0..194e715a0 100644
--- a/baseconfig/CONFIG_IP_SET_BITMAP_IP
+++ b/configs/base-generic/CONFIG_IP_SET_BITMAP_IP
diff --git a/baseconfig/CONFIG_IP_SET_BITMAP_IPMAC b/configs/base-generic/CONFIG_IP_SET_BITMAP_IPMAC
index 26361aab6..26361aab6 100644
--- a/baseconfig/CONFIG_IP_SET_BITMAP_IPMAC
+++ b/configs/base-generic/CONFIG_IP_SET_BITMAP_IPMAC
diff --git a/baseconfig/CONFIG_IP_SET_BITMAP_PORT b/configs/base-generic/CONFIG_IP_SET_BITMAP_PORT
index b251fecbf..b251fecbf 100644
--- a/baseconfig/CONFIG_IP_SET_BITMAP_PORT
+++ b/configs/base-generic/CONFIG_IP_SET_BITMAP_PORT
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IP b/configs/base-generic/CONFIG_IP_SET_HASH_IP
index ed55391a0..ed55391a0 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IP
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IP
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IPMAC b/configs/base-generic/CONFIG_IP_SET_HASH_IPMAC
index 5e50cb0d7..5e50cb0d7 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IPMAC
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IPMAC
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IPMARK b/configs/base-generic/CONFIG_IP_SET_HASH_IPMARK
index f93dde914..f93dde914 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IPMARK
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IPMARK
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IPPORT b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORT
index 8f2368eb1..8f2368eb1 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IPPORT
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORT
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IPPORTIP b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORTIP
index ce51dedf7..ce51dedf7 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IPPORTIP
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORTIP
diff --git a/baseconfig/CONFIG_IP_SET_HASH_IPPORTNET b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORTNET
index 755daa4ab..755daa4ab 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_IPPORTNET
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_IPPORTNET
diff --git a/baseconfig/CONFIG_IP_SET_HASH_MAC b/configs/base-generic/CONFIG_IP_SET_HASH_MAC
index f0f2f1eab..f0f2f1eab 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_MAC
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_MAC
diff --git a/baseconfig/CONFIG_IP_SET_HASH_NET b/configs/base-generic/CONFIG_IP_SET_HASH_NET
index 2f1258e6a..2f1258e6a 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_NET
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_NET
diff --git a/baseconfig/CONFIG_IP_SET_HASH_NETIFACE b/configs/base-generic/CONFIG_IP_SET_HASH_NETIFACE
index 3f37e0275..3f37e0275 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_NETIFACE
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_NETIFACE
diff --git a/baseconfig/CONFIG_IP_SET_HASH_NETNET b/configs/base-generic/CONFIG_IP_SET_HASH_NETNET
index c644763e4..c644763e4 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_NETNET
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_NETNET
diff --git a/baseconfig/CONFIG_IP_SET_HASH_NETPORT b/configs/base-generic/CONFIG_IP_SET_HASH_NETPORT
index ad2168816..ad2168816 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_NETPORT
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_NETPORT
diff --git a/baseconfig/CONFIG_IP_SET_HASH_NETPORTNET b/configs/base-generic/CONFIG_IP_SET_HASH_NETPORTNET
index 416de30b8..416de30b8 100644
--- a/baseconfig/CONFIG_IP_SET_HASH_NETPORTNET
+++ b/configs/base-generic/CONFIG_IP_SET_HASH_NETPORTNET
diff --git a/baseconfig/CONFIG_IP_SET_LIST_SET b/configs/base-generic/CONFIG_IP_SET_LIST_SET
index 71cafb46d..71cafb46d 100644
--- a/baseconfig/CONFIG_IP_SET_LIST_SET
+++ b/configs/base-generic/CONFIG_IP_SET_LIST_SET
diff --git a/baseconfig/CONFIG_IP_SET_MAX b/configs/base-generic/CONFIG_IP_SET_MAX
index e1ae2701a..e1ae2701a 100644
--- a/baseconfig/CONFIG_IP_SET_MAX
+++ b/configs/base-generic/CONFIG_IP_SET_MAX
diff --git a/baseconfig/CONFIG_IP_VS b/configs/base-generic/CONFIG_IP_VS
index 5595ef784..5595ef784 100644
--- a/baseconfig/CONFIG_IP_VS
+++ b/configs/base-generic/CONFIG_IP_VS
diff --git a/baseconfig/CONFIG_IP_VS_DEBUG b/configs/base-generic/CONFIG_IP_VS_DEBUG
index 19dd82627..19dd82627 100644
--- a/baseconfig/CONFIG_IP_VS_DEBUG
+++ b/configs/base-generic/CONFIG_IP_VS_DEBUG
diff --git a/baseconfig/CONFIG_IP_VS_DH b/configs/base-generic/CONFIG_IP_VS_DH
index 0740f4f2f..0740f4f2f 100644
--- a/baseconfig/CONFIG_IP_VS_DH
+++ b/configs/base-generic/CONFIG_IP_VS_DH
diff --git a/baseconfig/CONFIG_IP_VS_FO b/configs/base-generic/CONFIG_IP_VS_FO
index 335f1003d..335f1003d 100644
--- a/baseconfig/CONFIG_IP_VS_FO
+++ b/configs/base-generic/CONFIG_IP_VS_FO
diff --git a/baseconfig/CONFIG_IP_VS_FTP b/configs/base-generic/CONFIG_IP_VS_FTP
index 9bea42ef4..9bea42ef4 100644
--- a/baseconfig/CONFIG_IP_VS_FTP
+++ b/configs/base-generic/CONFIG_IP_VS_FTP
diff --git a/baseconfig/CONFIG_IP_VS_IPV6 b/configs/base-generic/CONFIG_IP_VS_IPV6
index 02fb992d6..02fb992d6 100644
--- a/baseconfig/CONFIG_IP_VS_IPV6
+++ b/configs/base-generic/CONFIG_IP_VS_IPV6
diff --git a/baseconfig/CONFIG_IP_VS_LBLC b/configs/base-generic/CONFIG_IP_VS_LBLC
index e2e9dda11..e2e9dda11 100644
--- a/baseconfig/CONFIG_IP_VS_LBLC
+++ b/configs/base-generic/CONFIG_IP_VS_LBLC
diff --git a/baseconfig/CONFIG_IP_VS_LBLCR b/configs/base-generic/CONFIG_IP_VS_LBLCR
index 4e8c22960..4e8c22960 100644
--- a/baseconfig/CONFIG_IP_VS_LBLCR
+++ b/configs/base-generic/CONFIG_IP_VS_LBLCR
diff --git a/baseconfig/CONFIG_IP_VS_LC b/configs/base-generic/CONFIG_IP_VS_LC
index bde490d67..bde490d67 100644
--- a/baseconfig/CONFIG_IP_VS_LC
+++ b/configs/base-generic/CONFIG_IP_VS_LC
diff --git a/baseconfig/CONFIG_IP_VS_NQ b/configs/base-generic/CONFIG_IP_VS_NQ
index 9ac21c3a5..9ac21c3a5 100644
--- a/baseconfig/CONFIG_IP_VS_NQ
+++ b/configs/base-generic/CONFIG_IP_VS_NQ
diff --git a/baseconfig/CONFIG_IP_VS_OVF b/configs/base-generic/CONFIG_IP_VS_OVF
index 1adeebe14..1adeebe14 100644
--- a/baseconfig/CONFIG_IP_VS_OVF
+++ b/configs/base-generic/CONFIG_IP_VS_OVF
diff --git a/baseconfig/CONFIG_IP_VS_PE_SIP b/configs/base-generic/CONFIG_IP_VS_PE_SIP
index 29b770f0f..29b770f0f 100644
--- a/baseconfig/CONFIG_IP_VS_PE_SIP
+++ b/configs/base-generic/CONFIG_IP_VS_PE_SIP
diff --git a/baseconfig/CONFIG_IP_VS_PROTO_AH b/configs/base-generic/CONFIG_IP_VS_PROTO_AH
index 7fd4c9320..7fd4c9320 100644
--- a/baseconfig/CONFIG_IP_VS_PROTO_AH
+++ b/configs/base-generic/CONFIG_IP_VS_PROTO_AH
diff --git a/baseconfig/CONFIG_IP_VS_PROTO_ESP b/configs/base-generic/CONFIG_IP_VS_PROTO_ESP
index 7f109769c..7f109769c 100644
--- a/baseconfig/CONFIG_IP_VS_PROTO_ESP
+++ b/configs/base-generic/CONFIG_IP_VS_PROTO_ESP
diff --git a/baseconfig/CONFIG_IP_VS_PROTO_SCTP b/configs/base-generic/CONFIG_IP_VS_PROTO_SCTP
index 2fae9319d..2fae9319d 100644
--- a/baseconfig/CONFIG_IP_VS_PROTO_SCTP
+++ b/configs/base-generic/CONFIG_IP_VS_PROTO_SCTP
diff --git a/baseconfig/CONFIG_IP_VS_PROTO_TCP b/configs/base-generic/CONFIG_IP_VS_PROTO_TCP
index cd43245e2..cd43245e2 100644
--- a/baseconfig/CONFIG_IP_VS_PROTO_TCP
+++ b/configs/base-generic/CONFIG_IP_VS_PROTO_TCP
diff --git a/baseconfig/CONFIG_IP_VS_PROTO_UDP b/configs/base-generic/CONFIG_IP_VS_PROTO_UDP
index bf6d4c1b1..bf6d4c1b1 100644
--- a/baseconfig/CONFIG_IP_VS_PROTO_UDP
+++ b/configs/base-generic/CONFIG_IP_VS_PROTO_UDP
diff --git a/baseconfig/CONFIG_IP_VS_RR b/configs/base-generic/CONFIG_IP_VS_RR
index 0f146f62e..0f146f62e 100644
--- a/baseconfig/CONFIG_IP_VS_RR
+++ b/configs/base-generic/CONFIG_IP_VS_RR
diff --git a/baseconfig/CONFIG_IP_VS_SED b/configs/base-generic/CONFIG_IP_VS_SED
index 9689e6f0c..9689e6f0c 100644
--- a/baseconfig/CONFIG_IP_VS_SED
+++ b/configs/base-generic/CONFIG_IP_VS_SED
diff --git a/baseconfig/CONFIG_IP_VS_SH b/configs/base-generic/CONFIG_IP_VS_SH
index 17b4fd13e..17b4fd13e 100644
--- a/baseconfig/CONFIG_IP_VS_SH
+++ b/configs/base-generic/CONFIG_IP_VS_SH
diff --git a/baseconfig/CONFIG_IP_VS_SH_TAB_BITS b/configs/base-generic/CONFIG_IP_VS_SH_TAB_BITS
index 0a0f326b8..0a0f326b8 100644
--- a/baseconfig/CONFIG_IP_VS_SH_TAB_BITS
+++ b/configs/base-generic/CONFIG_IP_VS_SH_TAB_BITS
diff --git a/baseconfig/CONFIG_IP_VS_TAB_BITS b/configs/base-generic/CONFIG_IP_VS_TAB_BITS
index b41927ca0..b41927ca0 100644
--- a/baseconfig/CONFIG_IP_VS_TAB_BITS
+++ b/configs/base-generic/CONFIG_IP_VS_TAB_BITS
diff --git a/baseconfig/CONFIG_IP_VS_WLC b/configs/base-generic/CONFIG_IP_VS_WLC
index 79fb718ad..79fb718ad 100644
--- a/baseconfig/CONFIG_IP_VS_WLC
+++ b/configs/base-generic/CONFIG_IP_VS_WLC
diff --git a/baseconfig/CONFIG_IP_VS_WRR b/configs/base-generic/CONFIG_IP_VS_WRR
index 3dabf2db5..3dabf2db5 100644
--- a/baseconfig/CONFIG_IP_VS_WRR
+++ b/configs/base-generic/CONFIG_IP_VS_WRR
diff --git a/baseconfig/CONFIG_IRCOMM b/configs/base-generic/CONFIG_IRCOMM
index ff705e2aa..ff705e2aa 100644
--- a/baseconfig/CONFIG_IRCOMM
+++ b/configs/base-generic/CONFIG_IRCOMM
diff --git a/baseconfig/CONFIG_IRDA b/configs/base-generic/CONFIG_IRDA
index 1df4b8c1b..1df4b8c1b 100644
--- a/baseconfig/CONFIG_IRDA
+++ b/configs/base-generic/CONFIG_IRDA
diff --git a/baseconfig/CONFIG_IRDA_CACHE_LAST_LSAP b/configs/base-generic/CONFIG_IRDA_CACHE_LAST_LSAP
index 111fb584f..111fb584f 100644
--- a/baseconfig/CONFIG_IRDA_CACHE_LAST_LSAP
+++ b/configs/base-generic/CONFIG_IRDA_CACHE_LAST_LSAP
diff --git a/baseconfig/CONFIG_IRDA_DEBUG b/configs/base-generic/CONFIG_IRDA_DEBUG
index c2c9a8911..c2c9a8911 100644
--- a/baseconfig/CONFIG_IRDA_DEBUG
+++ b/configs/base-generic/CONFIG_IRDA_DEBUG
diff --git a/baseconfig/CONFIG_IRDA_FAST_RR b/configs/base-generic/CONFIG_IRDA_FAST_RR
index 01803e322..01803e322 100644
--- a/baseconfig/CONFIG_IRDA_FAST_RR
+++ b/configs/base-generic/CONFIG_IRDA_FAST_RR
diff --git a/baseconfig/CONFIG_IRDA_ULTRA b/configs/base-generic/CONFIG_IRDA_ULTRA
index 7da5a957e..7da5a957e 100644
--- a/baseconfig/CONFIG_IRDA_ULTRA
+++ b/configs/base-generic/CONFIG_IRDA_ULTRA
diff --git a/baseconfig/CONFIG_IRLAN b/configs/base-generic/CONFIG_IRLAN
index ce8f69c7c..ce8f69c7c 100644
--- a/baseconfig/CONFIG_IRLAN
+++ b/configs/base-generic/CONFIG_IRLAN
diff --git a/baseconfig/CONFIG_IRNET b/configs/base-generic/CONFIG_IRNET
index 03ad3739c..03ad3739c 100644
--- a/baseconfig/CONFIG_IRNET
+++ b/configs/base-generic/CONFIG_IRNET
diff --git a/baseconfig/CONFIG_IRQSOFF_TRACER b/configs/base-generic/CONFIG_IRQSOFF_TRACER
index e04443c53..e04443c53 100644
--- a/baseconfig/CONFIG_IRQSOFF_TRACER
+++ b/configs/base-generic/CONFIG_IRQSOFF_TRACER
diff --git a/baseconfig/CONFIG_IRQ_TIME_ACCOUNTING b/configs/base-generic/CONFIG_IRQ_TIME_ACCOUNTING
index e250776e7..e250776e7 100644
--- a/baseconfig/CONFIG_IRQ_TIME_ACCOUNTING
+++ b/configs/base-generic/CONFIG_IRQ_TIME_ACCOUNTING
diff --git a/baseconfig/CONFIG_IRTTY_SIR b/configs/base-generic/CONFIG_IRTTY_SIR
index 530f3c775..530f3c775 100644
--- a/baseconfig/CONFIG_IRTTY_SIR
+++ b/configs/base-generic/CONFIG_IRTTY_SIR
diff --git a/baseconfig/CONFIG_IR_ENE b/configs/base-generic/CONFIG_IR_ENE
index eff4710c0..eff4710c0 100644
--- a/baseconfig/CONFIG_IR_ENE
+++ b/configs/base-generic/CONFIG_IR_ENE
diff --git a/baseconfig/CONFIG_IR_FINTEK b/configs/base-generic/CONFIG_IR_FINTEK
index d0eedcce1..d0eedcce1 100644
--- a/baseconfig/CONFIG_IR_FINTEK
+++ b/configs/base-generic/CONFIG_IR_FINTEK
diff --git a/baseconfig/CONFIG_IR_GPIO_CIR b/configs/base-generic/CONFIG_IR_GPIO_CIR
index 927f0cc1c..927f0cc1c 100644
--- a/baseconfig/CONFIG_IR_GPIO_CIR
+++ b/configs/base-generic/CONFIG_IR_GPIO_CIR
diff --git a/baseconfig/CONFIG_IR_GPIO_TX b/configs/base-generic/CONFIG_IR_GPIO_TX
index 4b6b484bb..4b6b484bb 100644
--- a/baseconfig/CONFIG_IR_GPIO_TX
+++ b/configs/base-generic/CONFIG_IR_GPIO_TX
diff --git a/baseconfig/CONFIG_IR_HIX5HD2 b/configs/base-generic/CONFIG_IR_HIX5HD2
index 5dba7f7fb..5dba7f7fb 100644
--- a/baseconfig/CONFIG_IR_HIX5HD2
+++ b/configs/base-generic/CONFIG_IR_HIX5HD2
diff --git a/baseconfig/CONFIG_IR_IGORPLUGUSB b/configs/base-generic/CONFIG_IR_IGORPLUGUSB
index d7e016f58..d7e016f58 100644
--- a/baseconfig/CONFIG_IR_IGORPLUGUSB
+++ b/configs/base-generic/CONFIG_IR_IGORPLUGUSB
diff --git a/baseconfig/CONFIG_IR_IGUANA b/configs/base-generic/CONFIG_IR_IGUANA
index f07db57bd..f07db57bd 100644
--- a/baseconfig/CONFIG_IR_IGUANA
+++ b/configs/base-generic/CONFIG_IR_IGUANA
diff --git a/baseconfig/CONFIG_IR_IMG b/configs/base-generic/CONFIG_IR_IMG
index 392034a18..392034a18 100644
--- a/baseconfig/CONFIG_IR_IMG
+++ b/configs/base-generic/CONFIG_IR_IMG
diff --git a/baseconfig/CONFIG_IR_IMON b/configs/base-generic/CONFIG_IR_IMON
index 6cf331742..6cf331742 100644
--- a/baseconfig/CONFIG_IR_IMON
+++ b/configs/base-generic/CONFIG_IR_IMON
diff --git a/baseconfig/CONFIG_IR_ITE_CIR b/configs/base-generic/CONFIG_IR_ITE_CIR
index 8bf06f3c9..8bf06f3c9 100644
--- a/baseconfig/CONFIG_IR_ITE_CIR
+++ b/configs/base-generic/CONFIG_IR_ITE_CIR
diff --git a/baseconfig/CONFIG_IR_JVC_DECODER b/configs/base-generic/CONFIG_IR_JVC_DECODER
index 0dad4b65e..0dad4b65e 100644
--- a/baseconfig/CONFIG_IR_JVC_DECODER
+++ b/configs/base-generic/CONFIG_IR_JVC_DECODER
diff --git a/baseconfig/CONFIG_IR_LIRC_CODEC b/configs/base-generic/CONFIG_IR_LIRC_CODEC
index ebad503d1..ebad503d1 100644
--- a/baseconfig/CONFIG_IR_LIRC_CODEC
+++ b/configs/base-generic/CONFIG_IR_LIRC_CODEC
diff --git a/baseconfig/CONFIG_IR_MCEUSB b/configs/base-generic/CONFIG_IR_MCEUSB
index d569f0985..d569f0985 100644
--- a/baseconfig/CONFIG_IR_MCEUSB
+++ b/configs/base-generic/CONFIG_IR_MCEUSB
diff --git a/baseconfig/CONFIG_IR_MCE_KBD_DECODER b/configs/base-generic/CONFIG_IR_MCE_KBD_DECODER
index 60bd7c962..60bd7c962 100644
--- a/baseconfig/CONFIG_IR_MCE_KBD_DECODER
+++ b/configs/base-generic/CONFIG_IR_MCE_KBD_DECODER
diff --git a/baseconfig/CONFIG_IR_NEC_DECODER b/configs/base-generic/CONFIG_IR_NEC_DECODER
index 0d4e6b346..0d4e6b346 100644
--- a/baseconfig/CONFIG_IR_NEC_DECODER
+++ b/configs/base-generic/CONFIG_IR_NEC_DECODER
diff --git a/baseconfig/CONFIG_IR_NUVOTON b/configs/base-generic/CONFIG_IR_NUVOTON
index 667c8cea6..667c8cea6 100644
--- a/baseconfig/CONFIG_IR_NUVOTON
+++ b/configs/base-generic/CONFIG_IR_NUVOTON
diff --git a/baseconfig/CONFIG_IR_PWM_TX b/configs/base-generic/CONFIG_IR_PWM_TX
index 4dfd41870..4dfd41870 100644
--- a/baseconfig/CONFIG_IR_PWM_TX
+++ b/configs/base-generic/CONFIG_IR_PWM_TX
diff --git a/baseconfig/CONFIG_IR_RC5_DECODER b/configs/base-generic/CONFIG_IR_RC5_DECODER
index ef01aaeda..ef01aaeda 100644
--- a/baseconfig/CONFIG_IR_RC5_DECODER
+++ b/configs/base-generic/CONFIG_IR_RC5_DECODER
diff --git a/baseconfig/CONFIG_IR_RC6_DECODER b/configs/base-generic/CONFIG_IR_RC6_DECODER
index 7b02e694a..7b02e694a 100644
--- a/baseconfig/CONFIG_IR_RC6_DECODER
+++ b/configs/base-generic/CONFIG_IR_RC6_DECODER
diff --git a/baseconfig/CONFIG_IR_REDRAT3 b/configs/base-generic/CONFIG_IR_REDRAT3
index a09fb6b6d..a09fb6b6d 100644
--- a/baseconfig/CONFIG_IR_REDRAT3
+++ b/configs/base-generic/CONFIG_IR_REDRAT3
diff --git a/baseconfig/CONFIG_IR_SANYO_DECODER b/configs/base-generic/CONFIG_IR_SANYO_DECODER
index 26864c7d8..26864c7d8 100644
--- a/baseconfig/CONFIG_IR_SANYO_DECODER
+++ b/configs/base-generic/CONFIG_IR_SANYO_DECODER
diff --git a/baseconfig/CONFIG_IR_SERIAL b/configs/base-generic/CONFIG_IR_SERIAL
index 53c7f1d81..53c7f1d81 100644
--- a/baseconfig/CONFIG_IR_SERIAL
+++ b/configs/base-generic/CONFIG_IR_SERIAL
diff --git a/baseconfig/CONFIG_IR_SERIAL_TRANSMITTER b/configs/base-generic/CONFIG_IR_SERIAL_TRANSMITTER
index 8e552a512..8e552a512 100644
--- a/baseconfig/CONFIG_IR_SERIAL_TRANSMITTER
+++ b/configs/base-generic/CONFIG_IR_SERIAL_TRANSMITTER
diff --git a/baseconfig/CONFIG_IR_SHARP_DECODER b/configs/base-generic/CONFIG_IR_SHARP_DECODER
index ecbacc50a..ecbacc50a 100644
--- a/baseconfig/CONFIG_IR_SHARP_DECODER
+++ b/configs/base-generic/CONFIG_IR_SHARP_DECODER
diff --git a/baseconfig/CONFIG_IR_SIR b/configs/base-generic/CONFIG_IR_SIR
index 34ff7a809..34ff7a809 100644
--- a/baseconfig/CONFIG_IR_SIR
+++ b/configs/base-generic/CONFIG_IR_SIR
diff --git a/baseconfig/CONFIG_IR_SONY_DECODER b/configs/base-generic/CONFIG_IR_SONY_DECODER
index 0ee42a3db..0ee42a3db 100644
--- a/baseconfig/CONFIG_IR_SONY_DECODER
+++ b/configs/base-generic/CONFIG_IR_SONY_DECODER
diff --git a/baseconfig/CONFIG_IR_SPI b/configs/base-generic/CONFIG_IR_SPI
index d0e838d38..d0e838d38 100644
--- a/baseconfig/CONFIG_IR_SPI
+++ b/configs/base-generic/CONFIG_IR_SPI
diff --git a/baseconfig/CONFIG_IR_STREAMZAP b/configs/base-generic/CONFIG_IR_STREAMZAP
index 8a2161450..8a2161450 100644
--- a/baseconfig/CONFIG_IR_STREAMZAP
+++ b/configs/base-generic/CONFIG_IR_STREAMZAP
diff --git a/baseconfig/CONFIG_IR_TTUSBIR b/configs/base-generic/CONFIG_IR_TTUSBIR
index d18284cc8..d18284cc8 100644
--- a/baseconfig/CONFIG_IR_TTUSBIR
+++ b/configs/base-generic/CONFIG_IR_TTUSBIR
diff --git a/baseconfig/CONFIG_IR_WINBOND_CIR b/configs/base-generic/CONFIG_IR_WINBOND_CIR
index a8e5cd5e7..a8e5cd5e7 100644
--- a/baseconfig/CONFIG_IR_WINBOND_CIR
+++ b/configs/base-generic/CONFIG_IR_WINBOND_CIR
diff --git a/baseconfig/CONFIG_IR_XMP_DECODER b/configs/base-generic/CONFIG_IR_XMP_DECODER
index e5368826d..e5368826d 100644
--- a/baseconfig/CONFIG_IR_XMP_DECODER
+++ b/configs/base-generic/CONFIG_IR_XMP_DECODER
diff --git a/baseconfig/CONFIG_ISA b/configs/base-generic/CONFIG_ISA
index 6eac92452..6eac92452 100644
--- a/baseconfig/CONFIG_ISA
+++ b/configs/base-generic/CONFIG_ISA
diff --git a/baseconfig/CONFIG_ISCSI_BOOT_SYSFS b/configs/base-generic/CONFIG_ISCSI_BOOT_SYSFS
index 1b9880a01..1b9880a01 100644
--- a/baseconfig/CONFIG_ISCSI_BOOT_SYSFS
+++ b/configs/base-generic/CONFIG_ISCSI_BOOT_SYSFS
diff --git a/baseconfig/CONFIG_ISCSI_TARGET b/configs/base-generic/CONFIG_ISCSI_TARGET
index 78b66a508..78b66a508 100644
--- a/baseconfig/CONFIG_ISCSI_TARGET
+++ b/configs/base-generic/CONFIG_ISCSI_TARGET
diff --git a/baseconfig/CONFIG_ISCSI_TARGET_CXGB4 b/configs/base-generic/CONFIG_ISCSI_TARGET_CXGB4
index 6b68bab41..6b68bab41 100644
--- a/baseconfig/CONFIG_ISCSI_TARGET_CXGB4
+++ b/configs/base-generic/CONFIG_ISCSI_TARGET_CXGB4
diff --git a/baseconfig/CONFIG_ISCSI_TCP b/configs/base-generic/CONFIG_ISCSI_TCP
index fefe32a01..fefe32a01 100644
--- a/baseconfig/CONFIG_ISCSI_TCP
+++ b/configs/base-generic/CONFIG_ISCSI_TCP
diff --git a/baseconfig/CONFIG_ISDN b/configs/base-generic/CONFIG_ISDN
index faddbf9dd..faddbf9dd 100644
--- a/baseconfig/CONFIG_ISDN
+++ b/configs/base-generic/CONFIG_ISDN
diff --git a/baseconfig/CONFIG_ISDN_AUDIO b/configs/base-generic/CONFIG_ISDN_AUDIO
index 70d33d443..70d33d443 100644
--- a/baseconfig/CONFIG_ISDN_AUDIO
+++ b/configs/base-generic/CONFIG_ISDN_AUDIO
diff --git a/baseconfig/CONFIG_ISDN_CAPI b/configs/base-generic/CONFIG_ISDN_CAPI
index 5f60ecb55..5f60ecb55 100644
--- a/baseconfig/CONFIG_ISDN_CAPI
+++ b/configs/base-generic/CONFIG_ISDN_CAPI
diff --git a/baseconfig/CONFIG_ISDN_CAPI_CAPI20 b/configs/base-generic/CONFIG_ISDN_CAPI_CAPI20
index 7aedee222..7aedee222 100644
--- a/baseconfig/CONFIG_ISDN_CAPI_CAPI20
+++ b/configs/base-generic/CONFIG_ISDN_CAPI_CAPI20
diff --git a/baseconfig/CONFIG_ISDN_CAPI_CAPIDRV b/configs/base-generic/CONFIG_ISDN_CAPI_CAPIDRV
index 3866abd30..3866abd30 100644
--- a/baseconfig/CONFIG_ISDN_CAPI_CAPIDRV
+++ b/configs/base-generic/CONFIG_ISDN_CAPI_CAPIDRV
diff --git a/baseconfig/CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE b/configs/base-generic/CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE
index cc2d2a852..cc2d2a852 100644
--- a/baseconfig/CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE
+++ b/configs/base-generic/CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE
diff --git a/baseconfig/CONFIG_ISDN_CAPI_MIDDLEWARE b/configs/base-generic/CONFIG_ISDN_CAPI_MIDDLEWARE
index 759a175f1..759a175f1 100644
--- a/baseconfig/CONFIG_ISDN_CAPI_MIDDLEWARE
+++ b/configs/base-generic/CONFIG_ISDN_CAPI_MIDDLEWARE
diff --git a/baseconfig/CONFIG_ISDN_DIVAS b/configs/base-generic/CONFIG_ISDN_DIVAS
index 20ade7fd7..20ade7fd7 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS
diff --git a/baseconfig/CONFIG_ISDN_DIVAS_BRIPCI b/configs/base-generic/CONFIG_ISDN_DIVAS_BRIPCI
index 5341235cf..5341235cf 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS_BRIPCI
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS_BRIPCI
diff --git a/baseconfig/CONFIG_ISDN_DIVAS_DIVACAPI b/configs/base-generic/CONFIG_ISDN_DIVAS_DIVACAPI
index 66f6d18b6..66f6d18b6 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS_DIVACAPI
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS_DIVACAPI
diff --git a/baseconfig/CONFIG_ISDN_DIVAS_MAINT b/configs/base-generic/CONFIG_ISDN_DIVAS_MAINT
index 48c3e83ec..48c3e83ec 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS_MAINT
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS_MAINT
diff --git a/baseconfig/CONFIG_ISDN_DIVAS_PRIPCI b/configs/base-generic/CONFIG_ISDN_DIVAS_PRIPCI
index 203e7a136..203e7a136 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS_PRIPCI
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS_PRIPCI
diff --git a/baseconfig/CONFIG_ISDN_DIVAS_USERIDI b/configs/base-generic/CONFIG_ISDN_DIVAS_USERIDI
index dfd75f70c..dfd75f70c 100644
--- a/baseconfig/CONFIG_ISDN_DIVAS_USERIDI
+++ b/configs/base-generic/CONFIG_ISDN_DIVAS_USERIDI
diff --git a/baseconfig/CONFIG_ISDN_DIVERSION b/configs/base-generic/CONFIG_ISDN_DIVERSION
index be3875ce5..be3875ce5 100644
--- a/baseconfig/CONFIG_ISDN_DIVERSION
+++ b/configs/base-generic/CONFIG_ISDN_DIVERSION
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_AVM_CS b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_AVM_CS
index 8167d1ae9..8167d1ae9 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_AVM_CS
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_AVM_CS
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCI b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCI
index 8dec97e7e..8dec97e7e 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCI
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCI
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCIV4 b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCIV4
index a37487c50..a37487c50 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCIV4
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCIV4
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCMCIA b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
index d7fda598a..d7fda598a 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_C4 b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_C4
index 0f64f6833..0f64f6833 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_C4
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_C4
diff --git a/baseconfig/CONFIG_ISDN_DRV_AVMB1_T1PCI b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_T1PCI
index 518892779..518892779 100644
--- a/baseconfig/CONFIG_ISDN_DRV_AVMB1_T1PCI
+++ b/configs/base-generic/CONFIG_ISDN_DRV_AVMB1_T1PCI
diff --git a/baseconfig/CONFIG_ISDN_DRV_GIGASET b/configs/base-generic/CONFIG_ISDN_DRV_GIGASET
index e58dd08f8..e58dd08f8 100644
--- a/baseconfig/CONFIG_ISDN_DRV_GIGASET
+++ b/configs/base-generic/CONFIG_ISDN_DRV_GIGASET
diff --git a/baseconfig/CONFIG_ISDN_DRV_HISAX b/configs/base-generic/CONFIG_ISDN_DRV_HISAX
index 7658f915f..7658f915f 100644
--- a/baseconfig/CONFIG_ISDN_DRV_HISAX
+++ b/configs/base-generic/CONFIG_ISDN_DRV_HISAX
diff --git a/baseconfig/CONFIG_ISDN_DRV_LOOP b/configs/base-generic/CONFIG_ISDN_DRV_LOOP
index 3204f2871..3204f2871 100644
--- a/baseconfig/CONFIG_ISDN_DRV_LOOP
+++ b/configs/base-generic/CONFIG_ISDN_DRV_LOOP
diff --git a/baseconfig/CONFIG_ISDN_I4L b/configs/base-generic/CONFIG_ISDN_I4L
index 5e2a1a6c4..5e2a1a6c4 100644
--- a/baseconfig/CONFIG_ISDN_I4L
+++ b/configs/base-generic/CONFIG_ISDN_I4L
diff --git a/baseconfig/CONFIG_ISDN_MPP b/configs/base-generic/CONFIG_ISDN_MPP
index 8ba23072b..8ba23072b 100644
--- a/baseconfig/CONFIG_ISDN_MPP
+++ b/configs/base-generic/CONFIG_ISDN_MPP
diff --git a/baseconfig/CONFIG_ISDN_PPP b/configs/base-generic/CONFIG_ISDN_PPP
index d4fe6905c..d4fe6905c 100644
--- a/baseconfig/CONFIG_ISDN_PPP
+++ b/configs/base-generic/CONFIG_ISDN_PPP
diff --git a/baseconfig/CONFIG_ISDN_PPP_BSDCOMP b/configs/base-generic/CONFIG_ISDN_PPP_BSDCOMP
index 4c2a1ece2..4c2a1ece2 100644
--- a/baseconfig/CONFIG_ISDN_PPP_BSDCOMP
+++ b/configs/base-generic/CONFIG_ISDN_PPP_BSDCOMP
diff --git a/baseconfig/CONFIG_ISDN_PPP_VJ b/configs/base-generic/CONFIG_ISDN_PPP_VJ
index 60652339d..60652339d 100644
--- a/baseconfig/CONFIG_ISDN_PPP_VJ
+++ b/configs/base-generic/CONFIG_ISDN_PPP_VJ
diff --git a/baseconfig/CONFIG_ISDN_TTY_FAX b/configs/base-generic/CONFIG_ISDN_TTY_FAX
index 918561f04..918561f04 100644
--- a/baseconfig/CONFIG_ISDN_TTY_FAX
+++ b/configs/base-generic/CONFIG_ISDN_TTY_FAX
diff --git a/baseconfig/CONFIG_ISI b/configs/base-generic/CONFIG_ISI
index b71d8114b..b71d8114b 100644
--- a/baseconfig/CONFIG_ISI
+++ b/configs/base-generic/CONFIG_ISI
diff --git a/baseconfig/CONFIG_ISL29003 b/configs/base-generic/CONFIG_ISL29003
index 106e426e4..106e426e4 100644
--- a/baseconfig/CONFIG_ISL29003
+++ b/configs/base-generic/CONFIG_ISL29003
diff --git a/baseconfig/CONFIG_ISL29020 b/configs/base-generic/CONFIG_ISL29020
index a441bf00f..a441bf00f 100644
--- a/baseconfig/CONFIG_ISL29020
+++ b/configs/base-generic/CONFIG_ISL29020
diff --git a/baseconfig/CONFIG_ISL29125 b/configs/base-generic/CONFIG_ISL29125
index 53ed90a59..53ed90a59 100644
--- a/baseconfig/CONFIG_ISL29125
+++ b/configs/base-generic/CONFIG_ISL29125
diff --git a/baseconfig/CONFIG_ISO9660_FS b/configs/base-generic/CONFIG_ISO9660_FS
index 379622f04..379622f04 100644
--- a/baseconfig/CONFIG_ISO9660_FS
+++ b/configs/base-generic/CONFIG_ISO9660_FS
diff --git a/baseconfig/CONFIG_IT8712F_WDT b/configs/base-generic/CONFIG_IT8712F_WDT
index 0b3b587bd..0b3b587bd 100644
--- a/baseconfig/CONFIG_IT8712F_WDT
+++ b/configs/base-generic/CONFIG_IT8712F_WDT
diff --git a/baseconfig/CONFIG_IT87_WDT b/configs/base-generic/CONFIG_IT87_WDT
index 7c21af517..7c21af517 100644
--- a/baseconfig/CONFIG_IT87_WDT
+++ b/configs/base-generic/CONFIG_IT87_WDT
diff --git a/baseconfig/CONFIG_ITCO_VENDOR_SUPPORT b/configs/base-generic/CONFIG_ITCO_VENDOR_SUPPORT
index f563e52c7..f563e52c7 100644
--- a/baseconfig/CONFIG_ITCO_VENDOR_SUPPORT
+++ b/configs/base-generic/CONFIG_ITCO_VENDOR_SUPPORT
diff --git a/baseconfig/CONFIG_ITCO_WDT b/configs/base-generic/CONFIG_ITCO_WDT
index c18e387e3..c18e387e3 100644
--- a/baseconfig/CONFIG_ITCO_WDT
+++ b/configs/base-generic/CONFIG_ITCO_WDT
diff --git a/baseconfig/CONFIG_ITG3200 b/configs/base-generic/CONFIG_ITG3200
index 3ce7a97af..3ce7a97af 100644
--- a/baseconfig/CONFIG_ITG3200
+++ b/configs/base-generic/CONFIG_ITG3200
diff --git a/baseconfig/CONFIG_IWL3945 b/configs/base-generic/CONFIG_IWL3945
index cc914a5f6..cc914a5f6 100644
--- a/baseconfig/CONFIG_IWL3945
+++ b/configs/base-generic/CONFIG_IWL3945
diff --git a/baseconfig/CONFIG_IWL4965 b/configs/base-generic/CONFIG_IWL4965
index 0b012dbc1..0b012dbc1 100644
--- a/baseconfig/CONFIG_IWL4965
+++ b/configs/base-generic/CONFIG_IWL4965
diff --git a/baseconfig/CONFIG_IWLDVM b/configs/base-generic/CONFIG_IWLDVM
index 3e6af8790..3e6af8790 100644
--- a/baseconfig/CONFIG_IWLDVM
+++ b/configs/base-generic/CONFIG_IWLDVM
diff --git a/baseconfig/CONFIG_IWLEGACY b/configs/base-generic/CONFIG_IWLEGACY
index 782689387..782689387 100644
--- a/baseconfig/CONFIG_IWLEGACY
+++ b/configs/base-generic/CONFIG_IWLEGACY
diff --git a/baseconfig/CONFIG_IWLEGACY_DEBUG b/configs/base-generic/CONFIG_IWLEGACY_DEBUG
index 038aa7b2e..038aa7b2e 100644
--- a/baseconfig/CONFIG_IWLEGACY_DEBUG
+++ b/configs/base-generic/CONFIG_IWLEGACY_DEBUG
diff --git a/baseconfig/CONFIG_IWLEGACY_DEBUGFS b/configs/base-generic/CONFIG_IWLEGACY_DEBUGFS
index 918899b64..918899b64 100644
--- a/baseconfig/CONFIG_IWLEGACY_DEBUGFS
+++ b/configs/base-generic/CONFIG_IWLEGACY_DEBUGFS
diff --git a/baseconfig/CONFIG_IWLMVM b/configs/base-generic/CONFIG_IWLMVM
index c22d966fa..c22d966fa 100644
--- a/baseconfig/CONFIG_IWLMVM
+++ b/configs/base-generic/CONFIG_IWLMVM
diff --git a/baseconfig/CONFIG_IWLWIFI b/configs/base-generic/CONFIG_IWLWIFI
index 485244aec..485244aec 100644
--- a/baseconfig/CONFIG_IWLWIFI
+++ b/configs/base-generic/CONFIG_IWLWIFI
diff --git a/baseconfig/CONFIG_IWLWIFI_BCAST_FILTERING b/configs/base-generic/CONFIG_IWLWIFI_BCAST_FILTERING
index 93949c489..93949c489 100644
--- a/baseconfig/CONFIG_IWLWIFI_BCAST_FILTERING
+++ b/configs/base-generic/CONFIG_IWLWIFI_BCAST_FILTERING
diff --git a/baseconfig/CONFIG_IWLWIFI_DEBUG b/configs/base-generic/CONFIG_IWLWIFI_DEBUG
index 7ee54d7ed..7ee54d7ed 100644
--- a/baseconfig/CONFIG_IWLWIFI_DEBUG
+++ b/configs/base-generic/CONFIG_IWLWIFI_DEBUG
diff --git a/baseconfig/CONFIG_IWLWIFI_DEBUGFS b/configs/base-generic/CONFIG_IWLWIFI_DEBUGFS
index 2429b837b..2429b837b 100644
--- a/baseconfig/CONFIG_IWLWIFI_DEBUGFS
+++ b/configs/base-generic/CONFIG_IWLWIFI_DEBUGFS
diff --git a/baseconfig/CONFIG_IWLWIFI_DEVICE_TRACING b/configs/base-generic/CONFIG_IWLWIFI_DEVICE_TRACING
index 31442f898..31442f898 100644
--- a/baseconfig/CONFIG_IWLWIFI_DEVICE_TRACING
+++ b/configs/base-generic/CONFIG_IWLWIFI_DEVICE_TRACING
diff --git a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM b/configs/base-generic/CONFIG_IWLWIFI_PCIE_RTPM
index 4e3c83368..4e3c83368 100644
--- a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
+++ b/configs/base-generic/CONFIG_IWLWIFI_PCIE_RTPM
diff --git a/baseconfig/CONFIG_IWM b/configs/base-generic/CONFIG_IWM
index 66d288ac8..66d288ac8 100644
--- a/baseconfig/CONFIG_IWM
+++ b/configs/base-generic/CONFIG_IWM
diff --git a/baseconfig/CONFIG_IXGB b/configs/base-generic/CONFIG_IXGB
index ad48a5205..ad48a5205 100644
--- a/baseconfig/CONFIG_IXGB
+++ b/configs/base-generic/CONFIG_IXGB
diff --git a/baseconfig/CONFIG_IXGBE b/configs/base-generic/CONFIG_IXGBE
index a31939ee0..a31939ee0 100644
--- a/baseconfig/CONFIG_IXGBE
+++ b/configs/base-generic/CONFIG_IXGBE
diff --git a/baseconfig/CONFIG_IXGBEVF b/configs/base-generic/CONFIG_IXGBEVF
index ee2e70d6e..ee2e70d6e 100644
--- a/baseconfig/CONFIG_IXGBEVF
+++ b/configs/base-generic/CONFIG_IXGBEVF
diff --git a/baseconfig/CONFIG_IXGBE_DCA b/configs/base-generic/CONFIG_IXGBE_DCA
index 36c6076d3..36c6076d3 100644
--- a/baseconfig/CONFIG_IXGBE_DCA
+++ b/configs/base-generic/CONFIG_IXGBE_DCA
diff --git a/baseconfig/CONFIG_IXGBE_DCB b/configs/base-generic/CONFIG_IXGBE_DCB
index aacb4453a..aacb4453a 100644
--- a/baseconfig/CONFIG_IXGBE_DCB
+++ b/configs/base-generic/CONFIG_IXGBE_DCB
diff --git a/baseconfig/CONFIG_IXGBE_HWMON b/configs/base-generic/CONFIG_IXGBE_HWMON
index 27194b4ae..27194b4ae 100644
--- a/baseconfig/CONFIG_IXGBE_HWMON
+++ b/configs/base-generic/CONFIG_IXGBE_HWMON
diff --git a/baseconfig/CONFIG_JBD2 b/configs/base-generic/CONFIG_JBD2
index 8cfd98f3b..8cfd98f3b 100644
--- a/baseconfig/CONFIG_JBD2
+++ b/configs/base-generic/CONFIG_JBD2
diff --git a/baseconfig/CONFIG_JBD2_DEBUG b/configs/base-generic/CONFIG_JBD2_DEBUG
index bce5ddaf2..bce5ddaf2 100644
--- a/baseconfig/CONFIG_JBD2_DEBUG
+++ b/configs/base-generic/CONFIG_JBD2_DEBUG
diff --git a/baseconfig/CONFIG_JFFS2_FS b/configs/base-generic/CONFIG_JFFS2_FS
index 1093b2329..1093b2329 100644
--- a/baseconfig/CONFIG_JFFS2_FS
+++ b/configs/base-generic/CONFIG_JFFS2_FS
diff --git a/baseconfig/CONFIG_JFS_DEBUG b/configs/base-generic/CONFIG_JFS_DEBUG
index dc38284b1..dc38284b1 100644
--- a/baseconfig/CONFIG_JFS_DEBUG
+++ b/configs/base-generic/CONFIG_JFS_DEBUG
diff --git a/baseconfig/CONFIG_JFS_FS b/configs/base-generic/CONFIG_JFS_FS
index 03cdac1a7..03cdac1a7 100644
--- a/baseconfig/CONFIG_JFS_FS
+++ b/configs/base-generic/CONFIG_JFS_FS
diff --git a/baseconfig/CONFIG_JFS_POSIX_ACL b/configs/base-generic/CONFIG_JFS_POSIX_ACL
index 126c75dbc..126c75dbc 100644
--- a/baseconfig/CONFIG_JFS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_JFS_POSIX_ACL
diff --git a/baseconfig/CONFIG_JFS_SECURITY b/configs/base-generic/CONFIG_JFS_SECURITY
index 58812e24f..58812e24f 100644
--- a/baseconfig/CONFIG_JFS_SECURITY
+++ b/configs/base-generic/CONFIG_JFS_SECURITY
diff --git a/baseconfig/CONFIG_JFS_STATISTICS b/configs/base-generic/CONFIG_JFS_STATISTICS
index 7c10ab6a3..7c10ab6a3 100644
--- a/baseconfig/CONFIG_JFS_STATISTICS
+++ b/configs/base-generic/CONFIG_JFS_STATISTICS
diff --git a/baseconfig/CONFIG_JME b/configs/base-generic/CONFIG_JME
index b834d4aff..b834d4aff 100644
--- a/baseconfig/CONFIG_JME
+++ b/configs/base-generic/CONFIG_JME
diff --git a/baseconfig/CONFIG_JOLIET b/configs/base-generic/CONFIG_JOLIET
index 4a9f8fd47..4a9f8fd47 100644
--- a/baseconfig/CONFIG_JOLIET
+++ b/configs/base-generic/CONFIG_JOLIET
diff --git a/baseconfig/CONFIG_JOYSTICK_A3D b/configs/base-generic/CONFIG_JOYSTICK_A3D
index da4133114..da4133114 100644
--- a/baseconfig/CONFIG_JOYSTICK_A3D
+++ b/configs/base-generic/CONFIG_JOYSTICK_A3D
diff --git a/baseconfig/CONFIG_JOYSTICK_ADI b/configs/base-generic/CONFIG_JOYSTICK_ADI
index 70b3ac1b2..70b3ac1b2 100644
--- a/baseconfig/CONFIG_JOYSTICK_ADI
+++ b/configs/base-generic/CONFIG_JOYSTICK_ADI
diff --git a/baseconfig/CONFIG_JOYSTICK_ANALOG b/configs/base-generic/CONFIG_JOYSTICK_ANALOG
index 0cd1a09fc..0cd1a09fc 100644
--- a/baseconfig/CONFIG_JOYSTICK_ANALOG
+++ b/configs/base-generic/CONFIG_JOYSTICK_ANALOG
diff --git a/baseconfig/CONFIG_JOYSTICK_AS5011 b/configs/base-generic/CONFIG_JOYSTICK_AS5011
index 1500ee6dc..1500ee6dc 100644
--- a/baseconfig/CONFIG_JOYSTICK_AS5011
+++ b/configs/base-generic/CONFIG_JOYSTICK_AS5011
diff --git a/baseconfig/CONFIG_JOYSTICK_COBRA b/configs/base-generic/CONFIG_JOYSTICK_COBRA
index cf4a7edd1..cf4a7edd1 100644
--- a/baseconfig/CONFIG_JOYSTICK_COBRA
+++ b/configs/base-generic/CONFIG_JOYSTICK_COBRA
diff --git a/baseconfig/CONFIG_JOYSTICK_DB9 b/configs/base-generic/CONFIG_JOYSTICK_DB9
index df156a653..df156a653 100644
--- a/baseconfig/CONFIG_JOYSTICK_DB9
+++ b/configs/base-generic/CONFIG_JOYSTICK_DB9
diff --git a/baseconfig/CONFIG_JOYSTICK_GAMECON b/configs/base-generic/CONFIG_JOYSTICK_GAMECON
index 48e8c9e1f..48e8c9e1f 100644
--- a/baseconfig/CONFIG_JOYSTICK_GAMECON
+++ b/configs/base-generic/CONFIG_JOYSTICK_GAMECON
diff --git a/baseconfig/CONFIG_JOYSTICK_GF2K b/configs/base-generic/CONFIG_JOYSTICK_GF2K
index d520aa40b..d520aa40b 100644
--- a/baseconfig/CONFIG_JOYSTICK_GF2K
+++ b/configs/base-generic/CONFIG_JOYSTICK_GF2K
diff --git a/baseconfig/CONFIG_JOYSTICK_GRIP b/configs/base-generic/CONFIG_JOYSTICK_GRIP
index ae004c126..ae004c126 100644
--- a/baseconfig/CONFIG_JOYSTICK_GRIP
+++ b/configs/base-generic/CONFIG_JOYSTICK_GRIP
diff --git a/baseconfig/CONFIG_JOYSTICK_GRIP_MP b/configs/base-generic/CONFIG_JOYSTICK_GRIP_MP
index e2adb1253..e2adb1253 100644
--- a/baseconfig/CONFIG_JOYSTICK_GRIP_MP
+++ b/configs/base-generic/CONFIG_JOYSTICK_GRIP_MP
diff --git a/baseconfig/CONFIG_JOYSTICK_GUILLEMOT b/configs/base-generic/CONFIG_JOYSTICK_GUILLEMOT
index 47de4f982..47de4f982 100644
--- a/baseconfig/CONFIG_JOYSTICK_GUILLEMOT
+++ b/configs/base-generic/CONFIG_JOYSTICK_GUILLEMOT
diff --git a/baseconfig/CONFIG_JOYSTICK_IFORCE b/configs/base-generic/CONFIG_JOYSTICK_IFORCE
index 764ce01fc..764ce01fc 100644
--- a/baseconfig/CONFIG_JOYSTICK_IFORCE
+++ b/configs/base-generic/CONFIG_JOYSTICK_IFORCE
diff --git a/baseconfig/CONFIG_JOYSTICK_IFORCE_232 b/configs/base-generic/CONFIG_JOYSTICK_IFORCE_232
index 6c06bd14f..6c06bd14f 100644
--- a/baseconfig/CONFIG_JOYSTICK_IFORCE_232
+++ b/configs/base-generic/CONFIG_JOYSTICK_IFORCE_232
diff --git a/baseconfig/CONFIG_JOYSTICK_IFORCE_USB b/configs/base-generic/CONFIG_JOYSTICK_IFORCE_USB
index 294e8e8ac..294e8e8ac 100644
--- a/baseconfig/CONFIG_JOYSTICK_IFORCE_USB
+++ b/configs/base-generic/CONFIG_JOYSTICK_IFORCE_USB
diff --git a/baseconfig/CONFIG_JOYSTICK_INTERACT b/configs/base-generic/CONFIG_JOYSTICK_INTERACT
index 93d8a1c46..93d8a1c46 100644
--- a/baseconfig/CONFIG_JOYSTICK_INTERACT
+++ b/configs/base-generic/CONFIG_JOYSTICK_INTERACT
diff --git a/baseconfig/CONFIG_JOYSTICK_JOYDUMP b/configs/base-generic/CONFIG_JOYSTICK_JOYDUMP
index 8c38a20b0..8c38a20b0 100644
--- a/baseconfig/CONFIG_JOYSTICK_JOYDUMP
+++ b/configs/base-generic/CONFIG_JOYSTICK_JOYDUMP
diff --git a/baseconfig/CONFIG_JOYSTICK_MAGELLAN b/configs/base-generic/CONFIG_JOYSTICK_MAGELLAN
index 4a6b179e7..4a6b179e7 100644
--- a/baseconfig/CONFIG_JOYSTICK_MAGELLAN
+++ b/configs/base-generic/CONFIG_JOYSTICK_MAGELLAN
diff --git a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI b/configs/base-generic/CONFIG_JOYSTICK_PSXPAD_SPI
index d66d2b113..d66d2b113 100644
--- a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI
+++ b/configs/base-generic/CONFIG_JOYSTICK_PSXPAD_SPI
diff --git a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI_FF b/configs/base-generic/CONFIG_JOYSTICK_PSXPAD_SPI_FF
index c534b358b..c534b358b 100644
--- a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI_FF
+++ b/configs/base-generic/CONFIG_JOYSTICK_PSXPAD_SPI_FF
diff --git a/baseconfig/CONFIG_JOYSTICK_SIDEWINDER b/configs/base-generic/CONFIG_JOYSTICK_SIDEWINDER
index fdebed535..fdebed535 100644
--- a/baseconfig/CONFIG_JOYSTICK_SIDEWINDER
+++ b/configs/base-generic/CONFIG_JOYSTICK_SIDEWINDER
diff --git a/baseconfig/CONFIG_JOYSTICK_SPACEBALL b/configs/base-generic/CONFIG_JOYSTICK_SPACEBALL
index 48ac84114..48ac84114 100644
--- a/baseconfig/CONFIG_JOYSTICK_SPACEBALL
+++ b/configs/base-generic/CONFIG_JOYSTICK_SPACEBALL
diff --git a/baseconfig/CONFIG_JOYSTICK_SPACEORB b/configs/base-generic/CONFIG_JOYSTICK_SPACEORB
index 76e0cd48d..76e0cd48d 100644
--- a/baseconfig/CONFIG_JOYSTICK_SPACEORB
+++ b/configs/base-generic/CONFIG_JOYSTICK_SPACEORB
diff --git a/baseconfig/CONFIG_JOYSTICK_STINGER b/configs/base-generic/CONFIG_JOYSTICK_STINGER
index faa09de24..faa09de24 100644
--- a/baseconfig/CONFIG_JOYSTICK_STINGER
+++ b/configs/base-generic/CONFIG_JOYSTICK_STINGER
diff --git a/baseconfig/CONFIG_JOYSTICK_TMDC b/configs/base-generic/CONFIG_JOYSTICK_TMDC
index 15d7f2fe4..15d7f2fe4 100644
--- a/baseconfig/CONFIG_JOYSTICK_TMDC
+++ b/configs/base-generic/CONFIG_JOYSTICK_TMDC
diff --git a/baseconfig/CONFIG_JOYSTICK_TURBOGRAFX b/configs/base-generic/CONFIG_JOYSTICK_TURBOGRAFX
index 521bc6cd3..521bc6cd3 100644
--- a/baseconfig/CONFIG_JOYSTICK_TURBOGRAFX
+++ b/configs/base-generic/CONFIG_JOYSTICK_TURBOGRAFX
diff --git a/baseconfig/CONFIG_JOYSTICK_TWIDJOY b/configs/base-generic/CONFIG_JOYSTICK_TWIDJOY
index 631f0c1a8..631f0c1a8 100644
--- a/baseconfig/CONFIG_JOYSTICK_TWIDJOY
+++ b/configs/base-generic/CONFIG_JOYSTICK_TWIDJOY
diff --git a/baseconfig/CONFIG_JOYSTICK_WALKERA0701 b/configs/base-generic/CONFIG_JOYSTICK_WALKERA0701
index fea286f5a..fea286f5a 100644
--- a/baseconfig/CONFIG_JOYSTICK_WALKERA0701
+++ b/configs/base-generic/CONFIG_JOYSTICK_WALKERA0701
diff --git a/baseconfig/CONFIG_JOYSTICK_WARRIOR b/configs/base-generic/CONFIG_JOYSTICK_WARRIOR
index 2e5b1e25f..2e5b1e25f 100644
--- a/baseconfig/CONFIG_JOYSTICK_WARRIOR
+++ b/configs/base-generic/CONFIG_JOYSTICK_WARRIOR
diff --git a/baseconfig/CONFIG_JOYSTICK_XPAD b/configs/base-generic/CONFIG_JOYSTICK_XPAD
index 029c3ecbd..029c3ecbd 100644
--- a/baseconfig/CONFIG_JOYSTICK_XPAD
+++ b/configs/base-generic/CONFIG_JOYSTICK_XPAD
diff --git a/baseconfig/CONFIG_JOYSTICK_XPAD_FF b/configs/base-generic/CONFIG_JOYSTICK_XPAD_FF
index 07324742e..07324742e 100644
--- a/baseconfig/CONFIG_JOYSTICK_XPAD_FF
+++ b/configs/base-generic/CONFIG_JOYSTICK_XPAD_FF
diff --git a/baseconfig/CONFIG_JOYSTICK_XPAD_LEDS b/configs/base-generic/CONFIG_JOYSTICK_XPAD_LEDS
index 322187d34..322187d34 100644
--- a/baseconfig/CONFIG_JOYSTICK_XPAD_LEDS
+++ b/configs/base-generic/CONFIG_JOYSTICK_XPAD_LEDS
diff --git a/baseconfig/CONFIG_JOYSTICK_ZHENHUA b/configs/base-generic/CONFIG_JOYSTICK_ZHENHUA
index 06ef09eec..06ef09eec 100644
--- a/baseconfig/CONFIG_JOYSTICK_ZHENHUA
+++ b/configs/base-generic/CONFIG_JOYSTICK_ZHENHUA
diff --git a/baseconfig/CONFIG_JSA1212 b/configs/base-generic/CONFIG_JSA1212
index 2b65eeb38..2b65eeb38 100644
--- a/baseconfig/CONFIG_JSA1212
+++ b/configs/base-generic/CONFIG_JSA1212
diff --git a/baseconfig/CONFIG_JUMP_LABEL b/configs/base-generic/CONFIG_JUMP_LABEL
index 8371ec067..8371ec067 100644
--- a/baseconfig/CONFIG_JUMP_LABEL
+++ b/configs/base-generic/CONFIG_JUMP_LABEL
diff --git a/baseconfig/CONFIG_KALLSYMS b/configs/base-generic/CONFIG_KALLSYMS
index 4701e4fa6..4701e4fa6 100644
--- a/baseconfig/CONFIG_KALLSYMS
+++ b/configs/base-generic/CONFIG_KALLSYMS
diff --git a/baseconfig/CONFIG_KALLSYMS_ALL b/configs/base-generic/CONFIG_KALLSYMS_ALL
index e5f6b9c69..e5f6b9c69 100644
--- a/baseconfig/CONFIG_KALLSYMS_ALL
+++ b/configs/base-generic/CONFIG_KALLSYMS_ALL
diff --git a/baseconfig/CONFIG_KARMA_PARTITION b/configs/base-generic/CONFIG_KARMA_PARTITION
index 32e78cf39..32e78cf39 100644
--- a/baseconfig/CONFIG_KARMA_PARTITION
+++ b/configs/base-generic/CONFIG_KARMA_PARTITION
diff --git a/baseconfig/CONFIG_KASAN b/configs/base-generic/CONFIG_KASAN
index 31767b1fe..31767b1fe 100644
--- a/baseconfig/CONFIG_KASAN
+++ b/configs/base-generic/CONFIG_KASAN
diff --git a/baseconfig/CONFIG_KCOV b/configs/base-generic/CONFIG_KCOV
index 736eb752a..736eb752a 100644
--- a/baseconfig/CONFIG_KCOV
+++ b/configs/base-generic/CONFIG_KCOV
diff --git a/baseconfig/CONFIG_KDB_CONTINUE_CATASTROPHIC b/configs/base-generic/CONFIG_KDB_CONTINUE_CATASTROPHIC
index 47466928f..47466928f 100644
--- a/baseconfig/CONFIG_KDB_CONTINUE_CATASTROPHIC
+++ b/configs/base-generic/CONFIG_KDB_CONTINUE_CATASTROPHIC
diff --git a/baseconfig/CONFIG_KERNEL_BZIP2 b/configs/base-generic/CONFIG_KERNEL_BZIP2
index 8beb2ec34..8beb2ec34 100644
--- a/baseconfig/CONFIG_KERNEL_BZIP2
+++ b/configs/base-generic/CONFIG_KERNEL_BZIP2
diff --git a/baseconfig/CONFIG_KERNEL_GZIP b/configs/base-generic/CONFIG_KERNEL_GZIP
index ad9ed5715..ad9ed5715 100644
--- a/baseconfig/CONFIG_KERNEL_GZIP
+++ b/configs/base-generic/CONFIG_KERNEL_GZIP
diff --git a/baseconfig/CONFIG_KERNEL_LZMA b/configs/base-generic/CONFIG_KERNEL_LZMA
index 149abd495..149abd495 100644
--- a/baseconfig/CONFIG_KERNEL_LZMA
+++ b/configs/base-generic/CONFIG_KERNEL_LZMA
diff --git a/baseconfig/CONFIG_KERNEL_LZO b/configs/base-generic/CONFIG_KERNEL_LZO
index 5810f4138..5810f4138 100644
--- a/baseconfig/CONFIG_KERNEL_LZO
+++ b/configs/base-generic/CONFIG_KERNEL_LZO
diff --git a/baseconfig/CONFIG_KEXEC b/configs/base-generic/CONFIG_KEXEC
index b45488dbb..b45488dbb 100644
--- a/baseconfig/CONFIG_KEXEC
+++ b/configs/base-generic/CONFIG_KEXEC
diff --git a/baseconfig/CONFIG_KEXEC_FILE b/configs/base-generic/CONFIG_KEXEC_FILE
index 440f1de47..440f1de47 100644
--- a/baseconfig/CONFIG_KEXEC_FILE
+++ b/configs/base-generic/CONFIG_KEXEC_FILE
diff --git a/baseconfig/CONFIG_KEYBOARD_ADC b/configs/base-generic/CONFIG_KEYBOARD_ADC
index be5cd27d6..be5cd27d6 100644
--- a/baseconfig/CONFIG_KEYBOARD_ADC
+++ b/configs/base-generic/CONFIG_KEYBOARD_ADC
diff --git a/baseconfig/CONFIG_KEYBOARD_ADP5588 b/configs/base-generic/CONFIG_KEYBOARD_ADP5588
index 8249429fa..8249429fa 100644
--- a/baseconfig/CONFIG_KEYBOARD_ADP5588
+++ b/configs/base-generic/CONFIG_KEYBOARD_ADP5588
diff --git a/baseconfig/CONFIG_KEYBOARD_ADP5589 b/configs/base-generic/CONFIG_KEYBOARD_ADP5589
index d4c770f47..d4c770f47 100644
--- a/baseconfig/CONFIG_KEYBOARD_ADP5589
+++ b/configs/base-generic/CONFIG_KEYBOARD_ADP5589
diff --git a/baseconfig/CONFIG_KEYBOARD_ATKBD b/configs/base-generic/CONFIG_KEYBOARD_ATKBD
index 54a1bd12b..54a1bd12b 100644
--- a/baseconfig/CONFIG_KEYBOARD_ATKBD
+++ b/configs/base-generic/CONFIG_KEYBOARD_ATKBD
diff --git a/baseconfig/CONFIG_KEYBOARD_CAP11XX b/configs/base-generic/CONFIG_KEYBOARD_CAP11XX
index add2537e2..add2537e2 100644
--- a/baseconfig/CONFIG_KEYBOARD_CAP11XX
+++ b/configs/base-generic/CONFIG_KEYBOARD_CAP11XX
diff --git a/baseconfig/CONFIG_KEYBOARD_DLINK_DIR685 b/configs/base-generic/CONFIG_KEYBOARD_DLINK_DIR685
index 9f273ca53..9f273ca53 100644
--- a/baseconfig/CONFIG_KEYBOARD_DLINK_DIR685
+++ b/configs/base-generic/CONFIG_KEYBOARD_DLINK_DIR685
diff --git a/baseconfig/CONFIG_KEYBOARD_GPIO b/configs/base-generic/CONFIG_KEYBOARD_GPIO
index d31079cd6..d31079cd6 100644
--- a/baseconfig/CONFIG_KEYBOARD_GPIO
+++ b/configs/base-generic/CONFIG_KEYBOARD_GPIO
diff --git a/baseconfig/CONFIG_KEYBOARD_GPIO_POLLED b/configs/base-generic/CONFIG_KEYBOARD_GPIO_POLLED
index 33c4b140d..33c4b140d 100644
--- a/baseconfig/CONFIG_KEYBOARD_GPIO_POLLED
+++ b/configs/base-generic/CONFIG_KEYBOARD_GPIO_POLLED
diff --git a/baseconfig/CONFIG_KEYBOARD_LKKBD b/configs/base-generic/CONFIG_KEYBOARD_LKKBD
index 2f71c1a03..2f71c1a03 100644
--- a/baseconfig/CONFIG_KEYBOARD_LKKBD
+++ b/configs/base-generic/CONFIG_KEYBOARD_LKKBD
diff --git a/baseconfig/CONFIG_KEYBOARD_LM8323 b/configs/base-generic/CONFIG_KEYBOARD_LM8323
index be40c9e2c..be40c9e2c 100644
--- a/baseconfig/CONFIG_KEYBOARD_LM8323
+++ b/configs/base-generic/CONFIG_KEYBOARD_LM8323
diff --git a/baseconfig/CONFIG_KEYBOARD_LM8333 b/configs/base-generic/CONFIG_KEYBOARD_LM8333
index 0c8d88d48..0c8d88d48 100644
--- a/baseconfig/CONFIG_KEYBOARD_LM8333
+++ b/configs/base-generic/CONFIG_KEYBOARD_LM8333
diff --git a/baseconfig/CONFIG_KEYBOARD_MATRIX b/configs/base-generic/CONFIG_KEYBOARD_MATRIX
index 47a15a463..47a15a463 100644
--- a/baseconfig/CONFIG_KEYBOARD_MATRIX
+++ b/configs/base-generic/CONFIG_KEYBOARD_MATRIX
diff --git a/baseconfig/CONFIG_KEYBOARD_MAX7359 b/configs/base-generic/CONFIG_KEYBOARD_MAX7359
index c2ac1e60a..c2ac1e60a 100644
--- a/baseconfig/CONFIG_KEYBOARD_MAX7359
+++ b/configs/base-generic/CONFIG_KEYBOARD_MAX7359
diff --git a/baseconfig/CONFIG_KEYBOARD_MCS b/configs/base-generic/CONFIG_KEYBOARD_MCS
index ea7fe67f8..ea7fe67f8 100644
--- a/baseconfig/CONFIG_KEYBOARD_MCS
+++ b/configs/base-generic/CONFIG_KEYBOARD_MCS
diff --git a/baseconfig/CONFIG_KEYBOARD_MPR121 b/configs/base-generic/CONFIG_KEYBOARD_MPR121
index 7f335d05f..7f335d05f 100644
--- a/baseconfig/CONFIG_KEYBOARD_MPR121
+++ b/configs/base-generic/CONFIG_KEYBOARD_MPR121
diff --git a/baseconfig/CONFIG_KEYBOARD_NEWTON b/configs/base-generic/CONFIG_KEYBOARD_NEWTON
index 3f4e65208..3f4e65208 100644
--- a/baseconfig/CONFIG_KEYBOARD_NEWTON
+++ b/configs/base-generic/CONFIG_KEYBOARD_NEWTON
diff --git a/baseconfig/CONFIG_KEYBOARD_OMAP4 b/configs/base-generic/CONFIG_KEYBOARD_OMAP4
index e3ce3f315..e3ce3f315 100644
--- a/baseconfig/CONFIG_KEYBOARD_OMAP4
+++ b/configs/base-generic/CONFIG_KEYBOARD_OMAP4
diff --git a/baseconfig/CONFIG_KEYBOARD_OPENCORES b/configs/base-generic/CONFIG_KEYBOARD_OPENCORES
index 36e0f18f2..36e0f18f2 100644
--- a/baseconfig/CONFIG_KEYBOARD_OPENCORES
+++ b/configs/base-generic/CONFIG_KEYBOARD_OPENCORES
diff --git a/baseconfig/CONFIG_KEYBOARD_PMIC8XXX b/configs/base-generic/CONFIG_KEYBOARD_PMIC8XXX
index 6f1ac5483..6f1ac5483 100644
--- a/baseconfig/CONFIG_KEYBOARD_PMIC8XXX
+++ b/configs/base-generic/CONFIG_KEYBOARD_PMIC8XXX
diff --git a/baseconfig/CONFIG_KEYBOARD_QT1070 b/configs/base-generic/CONFIG_KEYBOARD_QT1070
index f9f0b0a84..f9f0b0a84 100644
--- a/baseconfig/CONFIG_KEYBOARD_QT1070
+++ b/configs/base-generic/CONFIG_KEYBOARD_QT1070
diff --git a/baseconfig/CONFIG_KEYBOARD_QT2160 b/configs/base-generic/CONFIG_KEYBOARD_QT2160
index 4a7aaa493..4a7aaa493 100644
--- a/baseconfig/CONFIG_KEYBOARD_QT2160
+++ b/configs/base-generic/CONFIG_KEYBOARD_QT2160
diff --git a/baseconfig/CONFIG_KEYBOARD_SAMSUNG b/configs/base-generic/CONFIG_KEYBOARD_SAMSUNG
index 591faaee0..591faaee0 100644
--- a/baseconfig/CONFIG_KEYBOARD_SAMSUNG
+++ b/configs/base-generic/CONFIG_KEYBOARD_SAMSUNG
diff --git a/baseconfig/CONFIG_KEYBOARD_SH_KEYSC b/configs/base-generic/CONFIG_KEYBOARD_SH_KEYSC
index d88127fb8..d88127fb8 100644
--- a/baseconfig/CONFIG_KEYBOARD_SH_KEYSC
+++ b/configs/base-generic/CONFIG_KEYBOARD_SH_KEYSC
diff --git a/baseconfig/CONFIG_KEYBOARD_STOWAWAY b/configs/base-generic/CONFIG_KEYBOARD_STOWAWAY
index 1b8d883b9..1b8d883b9 100644
--- a/baseconfig/CONFIG_KEYBOARD_STOWAWAY
+++ b/configs/base-generic/CONFIG_KEYBOARD_STOWAWAY
diff --git a/baseconfig/CONFIG_KEYBOARD_SUNKBD b/configs/base-generic/CONFIG_KEYBOARD_SUNKBD
index 7ace2dc53..7ace2dc53 100644
--- a/baseconfig/CONFIG_KEYBOARD_SUNKBD
+++ b/configs/base-generic/CONFIG_KEYBOARD_SUNKBD
diff --git a/baseconfig/CONFIG_KEYBOARD_TCA6416 b/configs/base-generic/CONFIG_KEYBOARD_TCA6416
index f2db3acca..f2db3acca 100644
--- a/baseconfig/CONFIG_KEYBOARD_TCA6416
+++ b/configs/base-generic/CONFIG_KEYBOARD_TCA6416
diff --git a/baseconfig/CONFIG_KEYBOARD_TCA8418 b/configs/base-generic/CONFIG_KEYBOARD_TCA8418
index b853fc9da..b853fc9da 100644
--- a/baseconfig/CONFIG_KEYBOARD_TCA8418
+++ b/configs/base-generic/CONFIG_KEYBOARD_TCA8418
diff --git a/baseconfig/CONFIG_KEYBOARD_TM2_TOUCHKEY b/configs/base-generic/CONFIG_KEYBOARD_TM2_TOUCHKEY
index e1d0c2b26..e1d0c2b26 100644
--- a/baseconfig/CONFIG_KEYBOARD_TM2_TOUCHKEY
+++ b/configs/base-generic/CONFIG_KEYBOARD_TM2_TOUCHKEY
diff --git a/baseconfig/CONFIG_KEYBOARD_XTKBD b/configs/base-generic/CONFIG_KEYBOARD_XTKBD
index 5e70361bc..5e70361bc 100644
--- a/baseconfig/CONFIG_KEYBOARD_XTKBD
+++ b/configs/base-generic/CONFIG_KEYBOARD_XTKBD
diff --git a/baseconfig/CONFIG_KEYS b/configs/base-generic/CONFIG_KEYS
index 957ee122d..957ee122d 100644
--- a/baseconfig/CONFIG_KEYS
+++ b/configs/base-generic/CONFIG_KEYS
diff --git a/baseconfig/CONFIG_KEY_DH_OPERATIONS b/configs/base-generic/CONFIG_KEY_DH_OPERATIONS
index b1aa7dddc..b1aa7dddc 100644
--- a/baseconfig/CONFIG_KEY_DH_OPERATIONS
+++ b/configs/base-generic/CONFIG_KEY_DH_OPERATIONS
diff --git a/baseconfig/CONFIG_KGDB b/configs/base-generic/CONFIG_KGDB
index 64b6ebfb4..64b6ebfb4 100644
--- a/baseconfig/CONFIG_KGDB
+++ b/configs/base-generic/CONFIG_KGDB
diff --git a/baseconfig/CONFIG_KGDB_KDB b/configs/base-generic/CONFIG_KGDB_KDB
index 8488f1932..8488f1932 100644
--- a/baseconfig/CONFIG_KGDB_KDB
+++ b/configs/base-generic/CONFIG_KGDB_KDB
diff --git a/baseconfig/CONFIG_KGDB_LOW_LEVEL_TRAP b/configs/base-generic/CONFIG_KGDB_LOW_LEVEL_TRAP
index 18fdda197..18fdda197 100644
--- a/baseconfig/CONFIG_KGDB_LOW_LEVEL_TRAP
+++ b/configs/base-generic/CONFIG_KGDB_LOW_LEVEL_TRAP
diff --git a/baseconfig/CONFIG_KGDB_SERIAL_CONSOLE b/configs/base-generic/CONFIG_KGDB_SERIAL_CONSOLE
index 26a6aac70..26a6aac70 100644
--- a/baseconfig/CONFIG_KGDB_SERIAL_CONSOLE
+++ b/configs/base-generic/CONFIG_KGDB_SERIAL_CONSOLE
diff --git a/baseconfig/CONFIG_KGDB_TESTS b/configs/base-generic/CONFIG_KGDB_TESTS
index 2defea72e..2defea72e 100644
--- a/baseconfig/CONFIG_KGDB_TESTS
+++ b/configs/base-generic/CONFIG_KGDB_TESTS
diff --git a/baseconfig/CONFIG_KGDB_TESTS_ON_BOOT b/configs/base-generic/CONFIG_KGDB_TESTS_ON_BOOT
index 731febb62..731febb62 100644
--- a/baseconfig/CONFIG_KGDB_TESTS_ON_BOOT
+++ b/configs/base-generic/CONFIG_KGDB_TESTS_ON_BOOT
diff --git a/baseconfig/CONFIG_KINGSUN_DONGLE b/configs/base-generic/CONFIG_KINGSUN_DONGLE
index b3a114f5c..b3a114f5c 100644
--- a/baseconfig/CONFIG_KINGSUN_DONGLE
+++ b/configs/base-generic/CONFIG_KINGSUN_DONGLE
diff --git a/baseconfig/CONFIG_KMX61 b/configs/base-generic/CONFIG_KMX61
index 5e4362ad9..5e4362ad9 100644
--- a/baseconfig/CONFIG_KMX61
+++ b/configs/base-generic/CONFIG_KMX61
diff --git a/baseconfig/CONFIG_KPROBES b/configs/base-generic/CONFIG_KPROBES
index e24be2770..e24be2770 100644
--- a/baseconfig/CONFIG_KPROBES
+++ b/configs/base-generic/CONFIG_KPROBES
diff --git a/baseconfig/CONFIG_KPROBES_SANITY_TEST b/configs/base-generic/CONFIG_KPROBES_SANITY_TEST
index 51f51baf7..51f51baf7 100644
--- a/baseconfig/CONFIG_KPROBES_SANITY_TEST
+++ b/configs/base-generic/CONFIG_KPROBES_SANITY_TEST
diff --git a/baseconfig/CONFIG_KPROBE_EVENTS b/configs/base-generic/CONFIG_KPROBE_EVENTS
index 2111c5d1a..2111c5d1a 100644
--- a/baseconfig/CONFIG_KPROBE_EVENTS
+++ b/configs/base-generic/CONFIG_KPROBE_EVENTS
diff --git a/baseconfig/CONFIG_KS0108 b/configs/base-generic/CONFIG_KS0108
index f93df735f..f93df735f 100644
--- a/baseconfig/CONFIG_KS0108
+++ b/configs/base-generic/CONFIG_KS0108
diff --git a/baseconfig/CONFIG_KS0108_DELAY b/configs/base-generic/CONFIG_KS0108_DELAY
index 0d26c17ef..0d26c17ef 100644
--- a/baseconfig/CONFIG_KS0108_DELAY
+++ b/configs/base-generic/CONFIG_KS0108_DELAY
diff --git a/baseconfig/CONFIG_KS0108_PORT b/configs/base-generic/CONFIG_KS0108_PORT
index e56a9f921..e56a9f921 100644
--- a/baseconfig/CONFIG_KS0108_PORT
+++ b/configs/base-generic/CONFIG_KS0108_PORT
diff --git a/baseconfig/CONFIG_KS7010 b/configs/base-generic/CONFIG_KS7010
index 169ffed69..169ffed69 100644
--- a/baseconfig/CONFIG_KS7010
+++ b/configs/base-generic/CONFIG_KS7010
diff --git a/baseconfig/CONFIG_KS8842 b/configs/base-generic/CONFIG_KS8842
index a2bab5808..a2bab5808 100644
--- a/baseconfig/CONFIG_KS8842
+++ b/configs/base-generic/CONFIG_KS8842
diff --git a/baseconfig/CONFIG_KS8851 b/configs/base-generic/CONFIG_KS8851
index 353f91d0a..353f91d0a 100644
--- a/baseconfig/CONFIG_KS8851
+++ b/configs/base-generic/CONFIG_KS8851
diff --git a/baseconfig/CONFIG_KS8851_MLL b/configs/base-generic/CONFIG_KS8851_MLL
index a2c0fd259..a2c0fd259 100644
--- a/baseconfig/CONFIG_KS8851_MLL
+++ b/configs/base-generic/CONFIG_KS8851_MLL
diff --git a/baseconfig/CONFIG_KS959_DONGLE b/configs/base-generic/CONFIG_KS959_DONGLE
index e89a9e0c6..e89a9e0c6 100644
--- a/baseconfig/CONFIG_KS959_DONGLE
+++ b/configs/base-generic/CONFIG_KS959_DONGLE
diff --git a/baseconfig/CONFIG_KSDAZZLE_DONGLE b/configs/base-generic/CONFIG_KSDAZZLE_DONGLE
index 22be27940..22be27940 100644
--- a/baseconfig/CONFIG_KSDAZZLE_DONGLE
+++ b/configs/base-generic/CONFIG_KSDAZZLE_DONGLE
diff --git a/baseconfig/CONFIG_KSM b/configs/base-generic/CONFIG_KSM
index 757efcb90..757efcb90 100644
--- a/baseconfig/CONFIG_KSM
+++ b/configs/base-generic/CONFIG_KSM
diff --git a/baseconfig/CONFIG_KSZ884X_PCI b/configs/base-generic/CONFIG_KSZ884X_PCI
index 2b92edab3..2b92edab3 100644
--- a/baseconfig/CONFIG_KSZ884X_PCI
+++ b/configs/base-generic/CONFIG_KSZ884X_PCI
diff --git a/baseconfig/CONFIG_KXCJK1013 b/configs/base-generic/CONFIG_KXCJK1013
index 8ba1c0ea8..8ba1c0ea8 100644
--- a/baseconfig/CONFIG_KXCJK1013
+++ b/configs/base-generic/CONFIG_KXCJK1013
diff --git a/baseconfig/CONFIG_KXSD9 b/configs/base-generic/CONFIG_KXSD9
index ea0cfd36c..ea0cfd36c 100644
--- a/baseconfig/CONFIG_KXSD9
+++ b/configs/base-generic/CONFIG_KXSD9
diff --git a/baseconfig/CONFIG_L2TP b/configs/base-generic/CONFIG_L2TP
index 04ed67531..04ed67531 100644
--- a/baseconfig/CONFIG_L2TP
+++ b/configs/base-generic/CONFIG_L2TP
diff --git a/baseconfig/CONFIG_L2TP_DEBUGFS b/configs/base-generic/CONFIG_L2TP_DEBUGFS
index 776213a3b..776213a3b 100644
--- a/baseconfig/CONFIG_L2TP_DEBUGFS
+++ b/configs/base-generic/CONFIG_L2TP_DEBUGFS
diff --git a/baseconfig/CONFIG_L2TP_ETH b/configs/base-generic/CONFIG_L2TP_ETH
index ecca78c0d..ecca78c0d 100644
--- a/baseconfig/CONFIG_L2TP_ETH
+++ b/configs/base-generic/CONFIG_L2TP_ETH
diff --git a/baseconfig/CONFIG_L2TP_IP b/configs/base-generic/CONFIG_L2TP_IP
index 00bcedf83..00bcedf83 100644
--- a/baseconfig/CONFIG_L2TP_IP
+++ b/configs/base-generic/CONFIG_L2TP_IP
diff --git a/baseconfig/CONFIG_L2TP_V3 b/configs/base-generic/CONFIG_L2TP_V3
index aaa7e44e9..aaa7e44e9 100644
--- a/baseconfig/CONFIG_L2TP_V3
+++ b/configs/base-generic/CONFIG_L2TP_V3
diff --git a/baseconfig/CONFIG_LAPB b/configs/base-generic/CONFIG_LAPB
index 4279431a3..4279431a3 100644
--- a/baseconfig/CONFIG_LAPB
+++ b/configs/base-generic/CONFIG_LAPB
diff --git a/baseconfig/CONFIG_LATENCYTOP b/configs/base-generic/CONFIG_LATENCYTOP
index 0a4269424..0a4269424 100644
--- a/baseconfig/CONFIG_LATENCYTOP
+++ b/configs/base-generic/CONFIG_LATENCYTOP
diff --git a/baseconfig/CONFIG_LATTICE_ECP3_CONFIG b/configs/base-generic/CONFIG_LATTICE_ECP3_CONFIG
index 7212e8899..7212e8899 100644
--- a/baseconfig/CONFIG_LATTICE_ECP3_CONFIG
+++ b/configs/base-generic/CONFIG_LATTICE_ECP3_CONFIG
diff --git a/baseconfig/CONFIG_LCD_AMS369FG06 b/configs/base-generic/CONFIG_LCD_AMS369FG06
index 9fdcb8e36..9fdcb8e36 100644
--- a/baseconfig/CONFIG_LCD_AMS369FG06
+++ b/configs/base-generic/CONFIG_LCD_AMS369FG06
diff --git a/baseconfig/CONFIG_LCD_CLASS_DEVICE b/configs/base-generic/CONFIG_LCD_CLASS_DEVICE
index b558d0999..b558d0999 100644
--- a/baseconfig/CONFIG_LCD_CLASS_DEVICE
+++ b/configs/base-generic/CONFIG_LCD_CLASS_DEVICE
diff --git a/baseconfig/CONFIG_LCD_HX8357 b/configs/base-generic/CONFIG_LCD_HX8357
index 26e062064..26e062064 100644
--- a/baseconfig/CONFIG_LCD_HX8357
+++ b/configs/base-generic/CONFIG_LCD_HX8357
diff --git a/baseconfig/CONFIG_LCD_ILI922X b/configs/base-generic/CONFIG_LCD_ILI922X
index 540e27d99..540e27d99 100644
--- a/baseconfig/CONFIG_LCD_ILI922X
+++ b/configs/base-generic/CONFIG_LCD_ILI922X
diff --git a/baseconfig/CONFIG_LCD_ILI9320 b/configs/base-generic/CONFIG_LCD_ILI9320
index a3beda73c..a3beda73c 100644
--- a/baseconfig/CONFIG_LCD_ILI9320
+++ b/configs/base-generic/CONFIG_LCD_ILI9320
diff --git a/baseconfig/CONFIG_LCD_L4F00242T03 b/configs/base-generic/CONFIG_LCD_L4F00242T03
index 393941bfa..393941bfa 100644
--- a/baseconfig/CONFIG_LCD_L4F00242T03
+++ b/configs/base-generic/CONFIG_LCD_L4F00242T03
diff --git a/baseconfig/CONFIG_LCD_LD9040 b/configs/base-generic/CONFIG_LCD_LD9040
index 42d731c1b..42d731c1b 100644
--- a/baseconfig/CONFIG_LCD_LD9040
+++ b/configs/base-generic/CONFIG_LCD_LD9040
diff --git a/baseconfig/CONFIG_LCD_LMS283GF05 b/configs/base-generic/CONFIG_LCD_LMS283GF05
index dd444aac3..dd444aac3 100644
--- a/baseconfig/CONFIG_LCD_LMS283GF05
+++ b/configs/base-generic/CONFIG_LCD_LMS283GF05
diff --git a/baseconfig/CONFIG_LCD_LMS501KF03 b/configs/base-generic/CONFIG_LCD_LMS501KF03
index 1daabfaef..1daabfaef 100644
--- a/baseconfig/CONFIG_LCD_LMS501KF03
+++ b/configs/base-generic/CONFIG_LCD_LMS501KF03
diff --git a/baseconfig/CONFIG_LCD_LTV350QV b/configs/base-generic/CONFIG_LCD_LTV350QV
index d6b328870..d6b328870 100644
--- a/baseconfig/CONFIG_LCD_LTV350QV
+++ b/configs/base-generic/CONFIG_LCD_LTV350QV
diff --git a/baseconfig/CONFIG_LCD_PLATFORM b/configs/base-generic/CONFIG_LCD_PLATFORM
index b607ce508..b607ce508 100644
--- a/baseconfig/CONFIG_LCD_PLATFORM
+++ b/configs/base-generic/CONFIG_LCD_PLATFORM
diff --git a/baseconfig/CONFIG_LCD_S6E63M0 b/configs/base-generic/CONFIG_LCD_S6E63M0
index e2c3a22a8..e2c3a22a8 100644
--- a/baseconfig/CONFIG_LCD_S6E63M0
+++ b/configs/base-generic/CONFIG_LCD_S6E63M0
diff --git a/baseconfig/CONFIG_LCD_TDO24M b/configs/base-generic/CONFIG_LCD_TDO24M
index d75934134..d75934134 100644
--- a/baseconfig/CONFIG_LCD_TDO24M
+++ b/configs/base-generic/CONFIG_LCD_TDO24M
diff --git a/baseconfig/CONFIG_LCD_VGG2432A4 b/configs/base-generic/CONFIG_LCD_VGG2432A4
index 812eb1cf3..812eb1cf3 100644
--- a/baseconfig/CONFIG_LCD_VGG2432A4
+++ b/configs/base-generic/CONFIG_LCD_VGG2432A4
diff --git a/baseconfig/CONFIG_LDM_DEBUG b/configs/base-generic/CONFIG_LDM_DEBUG
index 05c6ad558..05c6ad558 100644
--- a/baseconfig/CONFIG_LDM_DEBUG
+++ b/configs/base-generic/CONFIG_LDM_DEBUG
diff --git a/baseconfig/CONFIG_LDM_PARTITION b/configs/base-generic/CONFIG_LDM_PARTITION
index a292965be..a292965be 100644
--- a/baseconfig/CONFIG_LDM_PARTITION
+++ b/configs/base-generic/CONFIG_LDM_PARTITION
diff --git a/baseconfig/CONFIG_LEDS_AAT1290 b/configs/base-generic/CONFIG_LEDS_AAT1290
index ab2a5b89a..ab2a5b89a 100644
--- a/baseconfig/CONFIG_LEDS_AAT1290
+++ b/configs/base-generic/CONFIG_LEDS_AAT1290
diff --git a/baseconfig/CONFIG_LEDS_AS3645A b/configs/base-generic/CONFIG_LEDS_AS3645A
index 25d6f9f10..25d6f9f10 100644
--- a/baseconfig/CONFIG_LEDS_AS3645A
+++ b/configs/base-generic/CONFIG_LEDS_AS3645A
diff --git a/baseconfig/CONFIG_LEDS_BCM6328 b/configs/base-generic/CONFIG_LEDS_BCM6328
index b4c1a1e36..b4c1a1e36 100644
--- a/baseconfig/CONFIG_LEDS_BCM6328
+++ b/configs/base-generic/CONFIG_LEDS_BCM6328
diff --git a/baseconfig/CONFIG_LEDS_BCM6358 b/configs/base-generic/CONFIG_LEDS_BCM6358
index 98e396e48..98e396e48 100644
--- a/baseconfig/CONFIG_LEDS_BCM6358
+++ b/configs/base-generic/CONFIG_LEDS_BCM6358
diff --git a/baseconfig/CONFIG_LEDS_BD2802 b/configs/base-generic/CONFIG_LEDS_BD2802
index e8bc68ba9..e8bc68ba9 100644
--- a/baseconfig/CONFIG_LEDS_BD2802
+++ b/configs/base-generic/CONFIG_LEDS_BD2802
diff --git a/baseconfig/CONFIG_LEDS_BLINKM b/configs/base-generic/CONFIG_LEDS_BLINKM
index 31e5d7658..31e5d7658 100644
--- a/baseconfig/CONFIG_LEDS_BLINKM
+++ b/configs/base-generic/CONFIG_LEDS_BLINKM
diff --git a/baseconfig/CONFIG_LEDS_BRIGHTNESS_HW_CHANGED b/configs/base-generic/CONFIG_LEDS_BRIGHTNESS_HW_CHANGED
index 4ab759066..4ab759066 100644
--- a/baseconfig/CONFIG_LEDS_BRIGHTNESS_HW_CHANGED
+++ b/configs/base-generic/CONFIG_LEDS_BRIGHTNESS_HW_CHANGED
diff --git a/baseconfig/CONFIG_LEDS_CLASS b/configs/base-generic/CONFIG_LEDS_CLASS
index 6ab3be8d5..6ab3be8d5 100644
--- a/baseconfig/CONFIG_LEDS_CLASS
+++ b/configs/base-generic/CONFIG_LEDS_CLASS
diff --git a/baseconfig/CONFIG_LEDS_CLASS_FLASH b/configs/base-generic/CONFIG_LEDS_CLASS_FLASH
index fef225ff2..fef225ff2 100644
--- a/baseconfig/CONFIG_LEDS_CLASS_FLASH
+++ b/configs/base-generic/CONFIG_LEDS_CLASS_FLASH
diff --git a/baseconfig/CONFIG_LEDS_CLEVO_MAIL b/configs/base-generic/CONFIG_LEDS_CLEVO_MAIL
index c5d31fc17..c5d31fc17 100644
--- a/baseconfig/CONFIG_LEDS_CLEVO_MAIL
+++ b/configs/base-generic/CONFIG_LEDS_CLEVO_MAIL
diff --git a/baseconfig/CONFIG_LEDS_DAC124S085 b/configs/base-generic/CONFIG_LEDS_DAC124S085
index a26e77d7f..a26e77d7f 100644
--- a/baseconfig/CONFIG_LEDS_DAC124S085
+++ b/configs/base-generic/CONFIG_LEDS_DAC124S085
diff --git a/baseconfig/CONFIG_LEDS_GPIO b/configs/base-generic/CONFIG_LEDS_GPIO
index f7c11aa94..f7c11aa94 100644
--- a/baseconfig/CONFIG_LEDS_GPIO
+++ b/configs/base-generic/CONFIG_LEDS_GPIO
diff --git a/baseconfig/CONFIG_LEDS_IS31FL319X b/configs/base-generic/CONFIG_LEDS_IS31FL319X
index 1fa853d1c..1fa853d1c 100644
--- a/baseconfig/CONFIG_LEDS_IS31FL319X
+++ b/configs/base-generic/CONFIG_LEDS_IS31FL319X
diff --git a/baseconfig/CONFIG_LEDS_IS31FL32XX b/configs/base-generic/CONFIG_LEDS_IS31FL32XX
index 343dc4dd8..343dc4dd8 100644
--- a/baseconfig/CONFIG_LEDS_IS31FL32XX
+++ b/configs/base-generic/CONFIG_LEDS_IS31FL32XX
diff --git a/baseconfig/CONFIG_LEDS_KTD2692 b/configs/base-generic/CONFIG_LEDS_KTD2692
index 69f589926..69f589926 100644
--- a/baseconfig/CONFIG_LEDS_KTD2692
+++ b/configs/base-generic/CONFIG_LEDS_KTD2692
diff --git a/baseconfig/CONFIG_LEDS_LM3530 b/configs/base-generic/CONFIG_LEDS_LM3530
index 4ecc73b34..4ecc73b34 100644
--- a/baseconfig/CONFIG_LEDS_LM3530
+++ b/configs/base-generic/CONFIG_LEDS_LM3530
diff --git a/baseconfig/CONFIG_LEDS_LM355x b/configs/base-generic/CONFIG_LEDS_LM355x
index 4824c7640..4824c7640 100644
--- a/baseconfig/CONFIG_LEDS_LM355x
+++ b/configs/base-generic/CONFIG_LEDS_LM355x
diff --git a/baseconfig/CONFIG_LEDS_LM3642 b/configs/base-generic/CONFIG_LEDS_LM3642
index 0d6f2ea9a..0d6f2ea9a 100644
--- a/baseconfig/CONFIG_LEDS_LM3642
+++ b/configs/base-generic/CONFIG_LEDS_LM3642
diff --git a/baseconfig/CONFIG_LEDS_LOCOMO b/configs/base-generic/CONFIG_LEDS_LOCOMO
index e61c0c96e..e61c0c96e 100644
--- a/baseconfig/CONFIG_LEDS_LOCOMO
+++ b/configs/base-generic/CONFIG_LEDS_LOCOMO
diff --git a/baseconfig/CONFIG_LEDS_LP3944 b/configs/base-generic/CONFIG_LEDS_LP3944
index 25af77862..25af77862 100644
--- a/baseconfig/CONFIG_LEDS_LP3944
+++ b/configs/base-generic/CONFIG_LEDS_LP3944
diff --git a/baseconfig/CONFIG_LEDS_LP3952 b/configs/base-generic/CONFIG_LEDS_LP3952
index b428268ac..b428268ac 100644
--- a/baseconfig/CONFIG_LEDS_LP3952
+++ b/configs/base-generic/CONFIG_LEDS_LP3952
diff --git a/baseconfig/CONFIG_LEDS_LP5521 b/configs/base-generic/CONFIG_LEDS_LP5521
index d8f3f05dc..d8f3f05dc 100644
--- a/baseconfig/CONFIG_LEDS_LP5521
+++ b/configs/base-generic/CONFIG_LEDS_LP5521
diff --git a/baseconfig/CONFIG_LEDS_LP5523 b/configs/base-generic/CONFIG_LEDS_LP5523
index b6176a9bd..b6176a9bd 100644
--- a/baseconfig/CONFIG_LEDS_LP5523
+++ b/configs/base-generic/CONFIG_LEDS_LP5523
diff --git a/baseconfig/CONFIG_LEDS_LP5562 b/configs/base-generic/CONFIG_LEDS_LP5562
index 2765810d1..2765810d1 100644
--- a/baseconfig/CONFIG_LEDS_LP5562
+++ b/configs/base-generic/CONFIG_LEDS_LP5562
diff --git a/baseconfig/CONFIG_LEDS_LP55XX_COMMON b/configs/base-generic/CONFIG_LEDS_LP55XX_COMMON
index a90d7885b..a90d7885b 100644
--- a/baseconfig/CONFIG_LEDS_LP55XX_COMMON
+++ b/configs/base-generic/CONFIG_LEDS_LP55XX_COMMON
diff --git a/baseconfig/CONFIG_LEDS_LP8501 b/configs/base-generic/CONFIG_LEDS_LP8501
index 4f96f782b..4f96f782b 100644
--- a/baseconfig/CONFIG_LEDS_LP8501
+++ b/configs/base-generic/CONFIG_LEDS_LP8501
diff --git a/baseconfig/CONFIG_LEDS_LP8860 b/configs/base-generic/CONFIG_LEDS_LP8860
index cc362679d..cc362679d 100644
--- a/baseconfig/CONFIG_LEDS_LP8860
+++ b/configs/base-generic/CONFIG_LEDS_LP8860
diff --git a/baseconfig/CONFIG_LEDS_LT3593 b/configs/base-generic/CONFIG_LEDS_LT3593
index 50bf0613f..50bf0613f 100644
--- a/baseconfig/CONFIG_LEDS_LT3593
+++ b/configs/base-generic/CONFIG_LEDS_LT3593
diff --git a/baseconfig/CONFIG_LEDS_MLXCPLD b/configs/base-generic/CONFIG_LEDS_MLXCPLD
index 0bef0da2f..0bef0da2f 100644
--- a/baseconfig/CONFIG_LEDS_MLXCPLD
+++ b/configs/base-generic/CONFIG_LEDS_MLXCPLD
diff --git a/baseconfig/CONFIG_LEDS_NET48XX b/configs/base-generic/CONFIG_LEDS_NET48XX
index dd89f1353..dd89f1353 100644
--- a/baseconfig/CONFIG_LEDS_NET48XX
+++ b/configs/base-generic/CONFIG_LEDS_NET48XX
diff --git a/baseconfig/CONFIG_LEDS_NIC78BX b/configs/base-generic/CONFIG_LEDS_NIC78BX
index 40b1f7bc2..40b1f7bc2 100644
--- a/baseconfig/CONFIG_LEDS_NIC78BX
+++ b/configs/base-generic/CONFIG_LEDS_NIC78BX
diff --git a/baseconfig/CONFIG_LEDS_OT200 b/configs/base-generic/CONFIG_LEDS_OT200
index fe24498b2..fe24498b2 100644
--- a/baseconfig/CONFIG_LEDS_OT200
+++ b/configs/base-generic/CONFIG_LEDS_OT200
diff --git a/baseconfig/CONFIG_LEDS_PCA9532 b/configs/base-generic/CONFIG_LEDS_PCA9532
index 1c43dff33..1c43dff33 100644
--- a/baseconfig/CONFIG_LEDS_PCA9532
+++ b/configs/base-generic/CONFIG_LEDS_PCA9532
diff --git a/baseconfig/CONFIG_LEDS_PCA955X b/configs/base-generic/CONFIG_LEDS_PCA955X
index 7660d64c1..7660d64c1 100644
--- a/baseconfig/CONFIG_LEDS_PCA955X
+++ b/configs/base-generic/CONFIG_LEDS_PCA955X
diff --git a/baseconfig/CONFIG_LEDS_PCA963X b/configs/base-generic/CONFIG_LEDS_PCA963X
index 4e351d654..4e351d654 100644
--- a/baseconfig/CONFIG_LEDS_PCA963X
+++ b/configs/base-generic/CONFIG_LEDS_PCA963X
diff --git a/baseconfig/CONFIG_LEDS_PWM b/configs/base-generic/CONFIG_LEDS_PWM
index da45a39e0..da45a39e0 100644
--- a/baseconfig/CONFIG_LEDS_PWM
+++ b/configs/base-generic/CONFIG_LEDS_PWM
diff --git a/baseconfig/CONFIG_LEDS_REGULATOR b/configs/base-generic/CONFIG_LEDS_REGULATOR
index 48d944c38..48d944c38 100644
--- a/baseconfig/CONFIG_LEDS_REGULATOR
+++ b/configs/base-generic/CONFIG_LEDS_REGULATOR
diff --git a/baseconfig/CONFIG_LEDS_S3C24XX b/configs/base-generic/CONFIG_LEDS_S3C24XX
index 0ebd67610..0ebd67610 100644
--- a/baseconfig/CONFIG_LEDS_S3C24XX
+++ b/configs/base-generic/CONFIG_LEDS_S3C24XX
diff --git a/baseconfig/CONFIG_LEDS_SYSCON b/configs/base-generic/CONFIG_LEDS_SYSCON
index cc80700c5..cc80700c5 100644
--- a/baseconfig/CONFIG_LEDS_SYSCON
+++ b/configs/base-generic/CONFIG_LEDS_SYSCON
diff --git a/baseconfig/CONFIG_LEDS_TCA6507 b/configs/base-generic/CONFIG_LEDS_TCA6507
index 074d795d8..074d795d8 100644
--- a/baseconfig/CONFIG_LEDS_TCA6507
+++ b/configs/base-generic/CONFIG_LEDS_TCA6507
diff --git a/baseconfig/CONFIG_LEDS_TLC591XX b/configs/base-generic/CONFIG_LEDS_TLC591XX
index 31a66a3fc..31a66a3fc 100644
--- a/baseconfig/CONFIG_LEDS_TLC591XX
+++ b/configs/base-generic/CONFIG_LEDS_TLC591XX
diff --git a/baseconfig/CONFIG_LEDS_TRIGGERS b/configs/base-generic/CONFIG_LEDS_TRIGGERS
index 5793ba354..5793ba354 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGERS
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGERS
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_BACKLIGHT b/configs/base-generic/CONFIG_LEDS_TRIGGER_BACKLIGHT
index 714cf78df..714cf78df 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_BACKLIGHT
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_BACKLIGHT
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_CAMERA b/configs/base-generic/CONFIG_LEDS_TRIGGER_CAMERA
index 09cfe4e9d..09cfe4e9d 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_CAMERA
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_CAMERA
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_CPU b/configs/base-generic/CONFIG_LEDS_TRIGGER_CPU
index de9ab8230..de9ab8230 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_CPU
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_CPU
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_DEFAULT_ON b/configs/base-generic/CONFIG_LEDS_TRIGGER_DEFAULT_ON
index 28cf72daa..28cf72daa 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_DEFAULT_ON
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_DEFAULT_ON
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_DISK b/configs/base-generic/CONFIG_LEDS_TRIGGER_DISK
index 65230ad6b..65230ad6b 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_DISK
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_DISK
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_GPIO b/configs/base-generic/CONFIG_LEDS_TRIGGER_GPIO
index c45d222a9..c45d222a9 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_GPIO
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_GPIO
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_HEARTBEAT b/configs/base-generic/CONFIG_LEDS_TRIGGER_HEARTBEAT
index f1aa15726..f1aa15726 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_HEARTBEAT
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_HEARTBEAT
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_MTD b/configs/base-generic/CONFIG_LEDS_TRIGGER_MTD
index 5d56f3fe7..5d56f3fe7 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_MTD
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_MTD
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_ONESHOT b/configs/base-generic/CONFIG_LEDS_TRIGGER_ONESHOT
index 5f108ca76..5f108ca76 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_ONESHOT
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_ONESHOT
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_PANIC b/configs/base-generic/CONFIG_LEDS_TRIGGER_PANIC
index d60c258e0..d60c258e0 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_PANIC
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_PANIC
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_TIMER b/configs/base-generic/CONFIG_LEDS_TRIGGER_TIMER
index b274bc418..b274bc418 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_TIMER
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_TIMER
diff --git a/baseconfig/CONFIG_LEDS_TRIGGER_TRANSIENT b/configs/base-generic/CONFIG_LEDS_TRIGGER_TRANSIENT
index 0fb49a106..0fb49a106 100644
--- a/baseconfig/CONFIG_LEDS_TRIGGER_TRANSIENT
+++ b/configs/base-generic/CONFIG_LEDS_TRIGGER_TRANSIENT
diff --git a/baseconfig/CONFIG_LEDS_USER b/configs/base-generic/CONFIG_LEDS_USER
index 04615335c..04615335c 100644
--- a/baseconfig/CONFIG_LEDS_USER
+++ b/configs/base-generic/CONFIG_LEDS_USER
diff --git a/baseconfig/CONFIG_LEDS_WM831X_STATUS b/configs/base-generic/CONFIG_LEDS_WM831X_STATUS
index 32f126f10..32f126f10 100644
--- a/baseconfig/CONFIG_LEDS_WM831X_STATUS
+++ b/configs/base-generic/CONFIG_LEDS_WM831X_STATUS
diff --git a/baseconfig/CONFIG_LEDS_WM8350 b/configs/base-generic/CONFIG_LEDS_WM8350
index ad6497920..ad6497920 100644
--- a/baseconfig/CONFIG_LEDS_WM8350
+++ b/configs/base-generic/CONFIG_LEDS_WM8350
diff --git a/baseconfig/CONFIG_LED_TRIGGER_PHY b/configs/base-generic/CONFIG_LED_TRIGGER_PHY
index fb63bf4f8..fb63bf4f8 100644
--- a/baseconfig/CONFIG_LED_TRIGGER_PHY
+++ b/configs/base-generic/CONFIG_LED_TRIGGER_PHY
diff --git a/baseconfig/CONFIG_LEGACY_PTYS b/configs/base-generic/CONFIG_LEGACY_PTYS
index ddc9171d6..ddc9171d6 100644
--- a/baseconfig/CONFIG_LEGACY_PTYS
+++ b/configs/base-generic/CONFIG_LEGACY_PTYS
diff --git a/baseconfig/CONFIG_LIB80211 b/configs/base-generic/CONFIG_LIB80211
index b4e5759e6..b4e5759e6 100644
--- a/baseconfig/CONFIG_LIB80211
+++ b/configs/base-generic/CONFIG_LIB80211
diff --git a/baseconfig/CONFIG_LIB80211_CRYPT_CCMP b/configs/base-generic/CONFIG_LIB80211_CRYPT_CCMP
index 982937cd7..982937cd7 100644
--- a/baseconfig/CONFIG_LIB80211_CRYPT_CCMP
+++ b/configs/base-generic/CONFIG_LIB80211_CRYPT_CCMP
diff --git a/baseconfig/CONFIG_LIB80211_CRYPT_TKIP b/configs/base-generic/CONFIG_LIB80211_CRYPT_TKIP
index 7b2fb06be..7b2fb06be 100644
--- a/baseconfig/CONFIG_LIB80211_CRYPT_TKIP
+++ b/configs/base-generic/CONFIG_LIB80211_CRYPT_TKIP
diff --git a/baseconfig/CONFIG_LIB80211_CRYPT_WEP b/configs/base-generic/CONFIG_LIB80211_CRYPT_WEP
index 7f9c38275..7f9c38275 100644
--- a/baseconfig/CONFIG_LIB80211_CRYPT_WEP
+++ b/configs/base-generic/CONFIG_LIB80211_CRYPT_WEP
diff --git a/baseconfig/CONFIG_LIB80211_DEBUG b/configs/base-generic/CONFIG_LIB80211_DEBUG
index 28f2c9ce8..28f2c9ce8 100644
--- a/baseconfig/CONFIG_LIB80211_DEBUG
+++ b/configs/base-generic/CONFIG_LIB80211_DEBUG
diff --git a/baseconfig/CONFIG_LIBCRC32C b/configs/base-generic/CONFIG_LIBCRC32C
index ed0c7dfc7..ed0c7dfc7 100644
--- a/baseconfig/CONFIG_LIBCRC32C
+++ b/configs/base-generic/CONFIG_LIBCRC32C
diff --git a/baseconfig/CONFIG_LIBERTAS b/configs/base-generic/CONFIG_LIBERTAS
index 527fd0153..527fd0153 100644
--- a/baseconfig/CONFIG_LIBERTAS
+++ b/configs/base-generic/CONFIG_LIBERTAS
diff --git a/baseconfig/CONFIG_LIBERTAS_CS b/configs/base-generic/CONFIG_LIBERTAS_CS
index 1441f7c2c..1441f7c2c 100644
--- a/baseconfig/CONFIG_LIBERTAS_CS
+++ b/configs/base-generic/CONFIG_LIBERTAS_CS
diff --git a/baseconfig/CONFIG_LIBERTAS_DEBUG b/configs/base-generic/CONFIG_LIBERTAS_DEBUG
index 964b3d7f7..964b3d7f7 100644
--- a/baseconfig/CONFIG_LIBERTAS_DEBUG
+++ b/configs/base-generic/CONFIG_LIBERTAS_DEBUG
diff --git a/baseconfig/CONFIG_LIBERTAS_MESH b/configs/base-generic/CONFIG_LIBERTAS_MESH
index 778d6b8c3..778d6b8c3 100644
--- a/baseconfig/CONFIG_LIBERTAS_MESH
+++ b/configs/base-generic/CONFIG_LIBERTAS_MESH
diff --git a/baseconfig/CONFIG_LIBERTAS_SDIO b/configs/base-generic/CONFIG_LIBERTAS_SDIO
index 5f2a5842e..5f2a5842e 100644
--- a/baseconfig/CONFIG_LIBERTAS_SDIO
+++ b/configs/base-generic/CONFIG_LIBERTAS_SDIO
diff --git a/baseconfig/CONFIG_LIBERTAS_SPI b/configs/base-generic/CONFIG_LIBERTAS_SPI
index e6020cc38..e6020cc38 100644
--- a/baseconfig/CONFIG_LIBERTAS_SPI
+++ b/configs/base-generic/CONFIG_LIBERTAS_SPI
diff --git a/baseconfig/CONFIG_LIBERTAS_THINFIRM b/configs/base-generic/CONFIG_LIBERTAS_THINFIRM
index 7e611e155..7e611e155 100644
--- a/baseconfig/CONFIG_LIBERTAS_THINFIRM
+++ b/configs/base-generic/CONFIG_LIBERTAS_THINFIRM
diff --git a/baseconfig/CONFIG_LIBERTAS_USB b/configs/base-generic/CONFIG_LIBERTAS_USB
index 123fb7573..123fb7573 100644
--- a/baseconfig/CONFIG_LIBERTAS_USB
+++ b/configs/base-generic/CONFIG_LIBERTAS_USB
diff --git a/baseconfig/CONFIG_LIBFC b/configs/base-generic/CONFIG_LIBFC
index af692f8d7..af692f8d7 100644
--- a/baseconfig/CONFIG_LIBFC
+++ b/configs/base-generic/CONFIG_LIBFC
diff --git a/baseconfig/CONFIG_LIBFCOE b/configs/base-generic/CONFIG_LIBFCOE
index 8c693951b..8c693951b 100644
--- a/baseconfig/CONFIG_LIBFCOE
+++ b/configs/base-generic/CONFIG_LIBFCOE
diff --git a/baseconfig/CONFIG_LIBIPW_DEBUG b/configs/base-generic/CONFIG_LIBIPW_DEBUG
index f74370177..f74370177 100644
--- a/baseconfig/CONFIG_LIBIPW_DEBUG
+++ b/configs/base-generic/CONFIG_LIBIPW_DEBUG
diff --git a/baseconfig/CONFIG_LIBNVDIMM b/configs/base-generic/CONFIG_LIBNVDIMM
index 8c883cc6e..8c883cc6e 100644
--- a/baseconfig/CONFIG_LIBNVDIMM
+++ b/configs/base-generic/CONFIG_LIBNVDIMM
diff --git a/baseconfig/CONFIG_LIDAR_LITE_V2 b/configs/base-generic/CONFIG_LIDAR_LITE_V2
index 731a43442..731a43442 100644
--- a/baseconfig/CONFIG_LIDAR_LITE_V2
+++ b/configs/base-generic/CONFIG_LIDAR_LITE_V2
diff --git a/baseconfig/CONFIG_LIQUIDIO_VF b/configs/base-generic/CONFIG_LIQUIDIO_VF
index c32f5e60c..c32f5e60c 100644
--- a/baseconfig/CONFIG_LIQUIDIO_VF
+++ b/configs/base-generic/CONFIG_LIQUIDIO_VF
diff --git a/baseconfig/CONFIG_LIRC b/configs/base-generic/CONFIG_LIRC
index e1049c6ea..e1049c6ea 100644
--- a/baseconfig/CONFIG_LIRC
+++ b/configs/base-generic/CONFIG_LIRC
diff --git a/baseconfig/CONFIG_LIRC_BT829 b/configs/base-generic/CONFIG_LIRC_BT829
index 1ad9c192c..1ad9c192c 100644
--- a/baseconfig/CONFIG_LIRC_BT829
+++ b/configs/base-generic/CONFIG_LIRC_BT829
diff --git a/baseconfig/CONFIG_LIRC_IMON b/configs/base-generic/CONFIG_LIRC_IMON
index fa92e9734..fa92e9734 100644
--- a/baseconfig/CONFIG_LIRC_IMON
+++ b/configs/base-generic/CONFIG_LIRC_IMON
diff --git a/baseconfig/CONFIG_LIRC_PARALLEL b/configs/base-generic/CONFIG_LIRC_PARALLEL
index ec6481656..ec6481656 100644
--- a/baseconfig/CONFIG_LIRC_PARALLEL
+++ b/configs/base-generic/CONFIG_LIRC_PARALLEL
diff --git a/baseconfig/CONFIG_LIRC_SERIAL b/configs/base-generic/CONFIG_LIRC_SERIAL
index f579872a8..f579872a8 100644
--- a/baseconfig/CONFIG_LIRC_SERIAL
+++ b/configs/base-generic/CONFIG_LIRC_SERIAL
diff --git a/baseconfig/CONFIG_LIRC_SERIAL_TRANSMITTER b/configs/base-generic/CONFIG_LIRC_SERIAL_TRANSMITTER
index 7c7ba0e08..7c7ba0e08 100644
--- a/baseconfig/CONFIG_LIRC_SERIAL_TRANSMITTER
+++ b/configs/base-generic/CONFIG_LIRC_SERIAL_TRANSMITTER
diff --git a/baseconfig/CONFIG_LIRC_SIR b/configs/base-generic/CONFIG_LIRC_SIR
index 8b3414e95..8b3414e95 100644
--- a/baseconfig/CONFIG_LIRC_SIR
+++ b/configs/base-generic/CONFIG_LIRC_SIR
diff --git a/baseconfig/CONFIG_LIRC_STAGING b/configs/base-generic/CONFIG_LIRC_STAGING
index ced4aca6e..ced4aca6e 100644
--- a/baseconfig/CONFIG_LIRC_STAGING
+++ b/configs/base-generic/CONFIG_LIRC_STAGING
diff --git a/baseconfig/CONFIG_LIRC_ZILOG b/configs/base-generic/CONFIG_LIRC_ZILOG
index 18972b317..18972b317 100644
--- a/baseconfig/CONFIG_LIRC_ZILOG
+++ b/configs/base-generic/CONFIG_LIRC_ZILOG
diff --git a/baseconfig/CONFIG_LITELINK_DONGLE b/configs/base-generic/CONFIG_LITELINK_DONGLE
index 0695e018d..0695e018d 100644
--- a/baseconfig/CONFIG_LITELINK_DONGLE
+++ b/configs/base-generic/CONFIG_LITELINK_DONGLE
diff --git a/baseconfig/CONFIG_LIVEPATCH b/configs/base-generic/CONFIG_LIVEPATCH
index 6f147cf26..6f147cf26 100644
--- a/baseconfig/CONFIG_LIVEPATCH
+++ b/configs/base-generic/CONFIG_LIVEPATCH
diff --git a/baseconfig/CONFIG_LKDTM b/configs/base-generic/CONFIG_LKDTM
index 5ac6135a9..5ac6135a9 100644
--- a/baseconfig/CONFIG_LKDTM
+++ b/configs/base-generic/CONFIG_LKDTM
diff --git a/baseconfig/CONFIG_LLC b/configs/base-generic/CONFIG_LLC
index 1e58a6325..1e58a6325 100644
--- a/baseconfig/CONFIG_LLC
+++ b/configs/base-generic/CONFIG_LLC
diff --git a/baseconfig/CONFIG_LLC2 b/configs/base-generic/CONFIG_LLC2
index 7b1143ffc..7b1143ffc 100644
--- a/baseconfig/CONFIG_LLC2
+++ b/configs/base-generic/CONFIG_LLC2
diff --git a/baseconfig/CONFIG_LMP91000 b/configs/base-generic/CONFIG_LMP91000
index e8bf3de70..e8bf3de70 100644
--- a/baseconfig/CONFIG_LMP91000
+++ b/configs/base-generic/CONFIG_LMP91000
diff --git a/baseconfig/CONFIG_LNET b/configs/base-generic/CONFIG_LNET
index b9bb072c4..b9bb072c4 100644
--- a/baseconfig/CONFIG_LNET
+++ b/configs/base-generic/CONFIG_LNET
diff --git a/baseconfig/CONFIG_LOAD_UEFI_KEYS b/configs/base-generic/CONFIG_LOAD_UEFI_KEYS
index de1de5c25..de1de5c25 100644
--- a/baseconfig/CONFIG_LOAD_UEFI_KEYS
+++ b/configs/base-generic/CONFIG_LOAD_UEFI_KEYS
diff --git a/baseconfig/CONFIG_LOCALVERSION b/configs/base-generic/CONFIG_LOCALVERSION
index 22833e328..22833e328 100644
--- a/baseconfig/CONFIG_LOCALVERSION
+++ b/configs/base-generic/CONFIG_LOCALVERSION
diff --git a/baseconfig/CONFIG_LOCALVERSION_AUTO b/configs/base-generic/CONFIG_LOCALVERSION_AUTO
index 3addafb9e..3addafb9e 100644
--- a/baseconfig/CONFIG_LOCALVERSION_AUTO
+++ b/configs/base-generic/CONFIG_LOCALVERSION_AUTO
diff --git a/baseconfig/CONFIG_LOCKD b/configs/base-generic/CONFIG_LOCKD
index f4ae16706..f4ae16706 100644
--- a/baseconfig/CONFIG_LOCKD
+++ b/configs/base-generic/CONFIG_LOCKD
diff --git a/baseconfig/CONFIG_LOCKD_V4 b/configs/base-generic/CONFIG_LOCKD_V4
index 0740609a2..0740609a2 100644
--- a/baseconfig/CONFIG_LOCKD_V4
+++ b/configs/base-generic/CONFIG_LOCKD_V4
diff --git a/baseconfig/CONFIG_LOCKUP_DETECTOR b/configs/base-generic/CONFIG_LOCKUP_DETECTOR
index 3a80a4e1b..3a80a4e1b 100644
--- a/baseconfig/CONFIG_LOCKUP_DETECTOR
+++ b/configs/base-generic/CONFIG_LOCKUP_DETECTOR
diff --git a/baseconfig/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT b/configs/base-generic/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
index 336528547..336528547 100644
--- a/baseconfig/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
+++ b/configs/base-generic/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
diff --git a/baseconfig/CONFIG_LOCK_DOWN_KERNEL b/configs/base-generic/CONFIG_LOCK_DOWN_KERNEL
index c22c35ff2..c22c35ff2 100644
--- a/baseconfig/CONFIG_LOCK_DOWN_KERNEL
+++ b/configs/base-generic/CONFIG_LOCK_DOWN_KERNEL
diff --git a/baseconfig/arm/CONFIG_LOCK_STAT b/configs/base-generic/CONFIG_LOCK_STAT
index ab733ddc2..ab733ddc2 100644
--- a/baseconfig/arm/CONFIG_LOCK_STAT
+++ b/configs/base-generic/CONFIG_LOCK_STAT
diff --git a/baseconfig/CONFIG_LOCK_TORTURE_TEST b/configs/base-generic/CONFIG_LOCK_TORTURE_TEST
index 8d2ede5fb..8d2ede5fb 100644
--- a/baseconfig/CONFIG_LOCK_TORTURE_TEST
+++ b/configs/base-generic/CONFIG_LOCK_TORTURE_TEST
diff --git a/baseconfig/CONFIG_LOGFS b/configs/base-generic/CONFIG_LOGFS
index 666054bf2..666054bf2 100644
--- a/baseconfig/CONFIG_LOGFS
+++ b/configs/base-generic/CONFIG_LOGFS
diff --git a/baseconfig/CONFIG_LOGIG940_FF b/configs/base-generic/CONFIG_LOGIG940_FF
index b32c3c7d6..b32c3c7d6 100644
--- a/baseconfig/CONFIG_LOGIG940_FF
+++ b/configs/base-generic/CONFIG_LOGIG940_FF
diff --git a/baseconfig/CONFIG_LOGIRUMBLEPAD2_FF b/configs/base-generic/CONFIG_LOGIRUMBLEPAD2_FF
index 805269e4c..805269e4c 100644
--- a/baseconfig/CONFIG_LOGIRUMBLEPAD2_FF
+++ b/configs/base-generic/CONFIG_LOGIRUMBLEPAD2_FF
diff --git a/baseconfig/CONFIG_LOGITECH_FF b/configs/base-generic/CONFIG_LOGITECH_FF
index d0b27769f..d0b27769f 100644
--- a/baseconfig/CONFIG_LOGITECH_FF
+++ b/configs/base-generic/CONFIG_LOGITECH_FF
diff --git a/baseconfig/CONFIG_LOGIWHEELS_FF b/configs/base-generic/CONFIG_LOGIWHEELS_FF
index 1f89bd610..1f89bd610 100644
--- a/baseconfig/CONFIG_LOGIWHEELS_FF
+++ b/configs/base-generic/CONFIG_LOGIWHEELS_FF
diff --git a/baseconfig/CONFIG_LOGO b/configs/base-generic/CONFIG_LOGO
index 9772c12e8..9772c12e8 100644
--- a/baseconfig/CONFIG_LOGO
+++ b/configs/base-generic/CONFIG_LOGO
diff --git a/baseconfig/CONFIG_LOGO_LINUX_CLUT224 b/configs/base-generic/CONFIG_LOGO_LINUX_CLUT224
index 53fbc2986..53fbc2986 100644
--- a/baseconfig/CONFIG_LOGO_LINUX_CLUT224
+++ b/configs/base-generic/CONFIG_LOGO_LINUX_CLUT224
diff --git a/baseconfig/CONFIG_LOGO_LINUX_MONO b/configs/base-generic/CONFIG_LOGO_LINUX_MONO
index 98033fe35..98033fe35 100644
--- a/baseconfig/CONFIG_LOGO_LINUX_MONO
+++ b/configs/base-generic/CONFIG_LOGO_LINUX_MONO
diff --git a/baseconfig/CONFIG_LOGO_LINUX_VGA16 b/configs/base-generic/CONFIG_LOGO_LINUX_VGA16
index 28fc94e9b..28fc94e9b 100644
--- a/baseconfig/CONFIG_LOGO_LINUX_VGA16
+++ b/configs/base-generic/CONFIG_LOGO_LINUX_VGA16
diff --git a/baseconfig/CONFIG_LOG_BUF_SHIFT b/configs/base-generic/CONFIG_LOG_BUF_SHIFT
index f232498c0..f232498c0 100644
--- a/baseconfig/CONFIG_LOG_BUF_SHIFT
+++ b/configs/base-generic/CONFIG_LOG_BUF_SHIFT
diff --git a/baseconfig/CONFIG_LOG_CPU_MAX_BUF_SHIFT b/configs/base-generic/CONFIG_LOG_CPU_MAX_BUF_SHIFT
index a3c44ae92..a3c44ae92 100644
--- a/baseconfig/CONFIG_LOG_CPU_MAX_BUF_SHIFT
+++ b/configs/base-generic/CONFIG_LOG_CPU_MAX_BUF_SHIFT
diff --git a/baseconfig/CONFIG_LOOPBACK_TARGET b/configs/base-generic/CONFIG_LOOPBACK_TARGET
index 8d0415cbf..8d0415cbf 100644
--- a/baseconfig/CONFIG_LOOPBACK_TARGET
+++ b/configs/base-generic/CONFIG_LOOPBACK_TARGET
diff --git a/baseconfig/CONFIG_LPC_ICH b/configs/base-generic/CONFIG_LPC_ICH
index 117d89d78..117d89d78 100644
--- a/baseconfig/CONFIG_LPC_ICH
+++ b/configs/base-generic/CONFIG_LPC_ICH
diff --git a/baseconfig/CONFIG_LPC_SCH b/configs/base-generic/CONFIG_LPC_SCH
index 13ca80491..13ca80491 100644
--- a/baseconfig/CONFIG_LPC_SCH
+++ b/configs/base-generic/CONFIG_LPC_SCH
diff --git a/baseconfig/CONFIG_LPFC_NVME_INITIATOR b/configs/base-generic/CONFIG_LPFC_NVME_INITIATOR
index cfa87b693..cfa87b693 100644
--- a/baseconfig/CONFIG_LPFC_NVME_INITIATOR
+++ b/configs/base-generic/CONFIG_LPFC_NVME_INITIATOR
diff --git a/baseconfig/CONFIG_LPFC_NVME_TARGET b/configs/base-generic/CONFIG_LPFC_NVME_TARGET
index ebf8bd16d..ebf8bd16d 100644
--- a/baseconfig/CONFIG_LPFC_NVME_TARGET
+++ b/configs/base-generic/CONFIG_LPFC_NVME_TARGET
diff --git a/baseconfig/CONFIG_LP_CONSOLE b/configs/base-generic/CONFIG_LP_CONSOLE
index dd0497c84..dd0497c84 100644
--- a/baseconfig/CONFIG_LP_CONSOLE
+++ b/configs/base-generic/CONFIG_LP_CONSOLE
diff --git a/baseconfig/CONFIG_LSI_ET1011C_PHY b/configs/base-generic/CONFIG_LSI_ET1011C_PHY
index d1c03f3a1..d1c03f3a1 100644
--- a/baseconfig/CONFIG_LSI_ET1011C_PHY
+++ b/configs/base-generic/CONFIG_LSI_ET1011C_PHY
diff --git a/baseconfig/CONFIG_LSM_MMAP_MIN_ADDR b/configs/base-generic/CONFIG_LSM_MMAP_MIN_ADDR
index 0aad76058..0aad76058 100644
--- a/baseconfig/CONFIG_LSM_MMAP_MIN_ADDR
+++ b/configs/base-generic/CONFIG_LSM_MMAP_MIN_ADDR
diff --git a/baseconfig/CONFIG_LTC2471 b/configs/base-generic/CONFIG_LTC2471
index 5d272ac29..5d272ac29 100644
--- a/baseconfig/CONFIG_LTC2471
+++ b/configs/base-generic/CONFIG_LTC2471
diff --git a/baseconfig/CONFIG_LTC2485 b/configs/base-generic/CONFIG_LTC2485
index 09a531e8b..09a531e8b 100644
--- a/baseconfig/CONFIG_LTC2485
+++ b/configs/base-generic/CONFIG_LTC2485
diff --git a/baseconfig/CONFIG_LTC2497 b/configs/base-generic/CONFIG_LTC2497
index 312f3db17..312f3db17 100644
--- a/baseconfig/CONFIG_LTC2497
+++ b/configs/base-generic/CONFIG_LTC2497
diff --git a/baseconfig/CONFIG_LTC2632 b/configs/base-generic/CONFIG_LTC2632
index 8bc2b8bc4..8bc2b8bc4 100644
--- a/baseconfig/CONFIG_LTC2632
+++ b/configs/base-generic/CONFIG_LTC2632
diff --git a/baseconfig/CONFIG_LTE_GDM724X b/configs/base-generic/CONFIG_LTE_GDM724X
index ae10a4a61..ae10a4a61 100644
--- a/baseconfig/CONFIG_LTE_GDM724X
+++ b/configs/base-generic/CONFIG_LTE_GDM724X
diff --git a/baseconfig/CONFIG_LTR501 b/configs/base-generic/CONFIG_LTR501
index 04512139d..04512139d 100644
--- a/baseconfig/CONFIG_LTR501
+++ b/configs/base-generic/CONFIG_LTR501
diff --git a/baseconfig/CONFIG_LUSTRE_FS b/configs/base-generic/CONFIG_LUSTRE_FS
index 5dec22e1b..5dec22e1b 100644
--- a/baseconfig/CONFIG_LUSTRE_FS
+++ b/configs/base-generic/CONFIG_LUSTRE_FS
diff --git a/baseconfig/CONFIG_LWTUNNEL b/configs/base-generic/CONFIG_LWTUNNEL
index 1bd2e1c28..1bd2e1c28 100644
--- a/baseconfig/CONFIG_LWTUNNEL
+++ b/configs/base-generic/CONFIG_LWTUNNEL
diff --git a/baseconfig/CONFIG_LWTUNNEL_BPF b/configs/base-generic/CONFIG_LWTUNNEL_BPF
index ecd9c79a2..ecd9c79a2 100644
--- a/baseconfig/CONFIG_LWTUNNEL_BPF
+++ b/configs/base-generic/CONFIG_LWTUNNEL_BPF
diff --git a/baseconfig/CONFIG_LXT_PHY b/configs/base-generic/CONFIG_LXT_PHY
index 11a8eb8d2..11a8eb8d2 100644
--- a/baseconfig/CONFIG_LXT_PHY
+++ b/configs/base-generic/CONFIG_LXT_PHY
diff --git a/baseconfig/CONFIG_M62332 b/configs/base-generic/CONFIG_M62332
index 5b8b668ec..5b8b668ec 100644
--- a/baseconfig/CONFIG_M62332
+++ b/configs/base-generic/CONFIG_M62332
diff --git a/baseconfig/CONFIG_MA600_DONGLE b/configs/base-generic/CONFIG_MA600_DONGLE
index d32eaff57..d32eaff57 100644
--- a/baseconfig/CONFIG_MA600_DONGLE
+++ b/configs/base-generic/CONFIG_MA600_DONGLE
diff --git a/baseconfig/CONFIG_MAC80211 b/configs/base-generic/CONFIG_MAC80211
index eaf312410..eaf312410 100644
--- a/baseconfig/CONFIG_MAC80211
+++ b/configs/base-generic/CONFIG_MAC80211
diff --git a/baseconfig/CONFIG_MAC80211_DEBUGFS b/configs/base-generic/CONFIG_MAC80211_DEBUGFS
index 704e88c8b..704e88c8b 100644
--- a/baseconfig/CONFIG_MAC80211_DEBUGFS
+++ b/configs/base-generic/CONFIG_MAC80211_DEBUGFS
diff --git a/baseconfig/CONFIG_MAC80211_DEBUG_MENU b/configs/base-generic/CONFIG_MAC80211_DEBUG_MENU
index 3d7fd5e3c..3d7fd5e3c 100644
--- a/baseconfig/CONFIG_MAC80211_DEBUG_MENU
+++ b/configs/base-generic/CONFIG_MAC80211_DEBUG_MENU
diff --git a/baseconfig/CONFIG_MAC80211_HWSIM b/configs/base-generic/CONFIG_MAC80211_HWSIM
index 274bf1d92..274bf1d92 100644
--- a/baseconfig/CONFIG_MAC80211_HWSIM
+++ b/configs/base-generic/CONFIG_MAC80211_HWSIM
diff --git a/baseconfig/CONFIG_MAC80211_LEDS b/configs/base-generic/CONFIG_MAC80211_LEDS
index d4e90cabc..d4e90cabc 100644
--- a/baseconfig/CONFIG_MAC80211_LEDS
+++ b/configs/base-generic/CONFIG_MAC80211_LEDS
diff --git a/baseconfig/CONFIG_MAC80211_MESH b/configs/base-generic/CONFIG_MAC80211_MESH
index cfbdbd5f5..cfbdbd5f5 100644
--- a/baseconfig/CONFIG_MAC80211_MESH
+++ b/configs/base-generic/CONFIG_MAC80211_MESH
diff --git a/baseconfig/CONFIG_MAC80211_MESSAGE_TRACING b/configs/base-generic/CONFIG_MAC80211_MESSAGE_TRACING
index 5e52e182b..5e52e182b 100644
--- a/baseconfig/CONFIG_MAC80211_MESSAGE_TRACING
+++ b/configs/base-generic/CONFIG_MAC80211_MESSAGE_TRACING
diff --git a/baseconfig/CONFIG_MAC80211_RC_DEFAULT b/configs/base-generic/CONFIG_MAC80211_RC_DEFAULT
index e0c92ab2c..e0c92ab2c 100644
--- a/baseconfig/CONFIG_MAC80211_RC_DEFAULT
+++ b/configs/base-generic/CONFIG_MAC80211_RC_DEFAULT
diff --git a/baseconfig/CONFIG_MAC80211_RC_DEFAULT_MINSTREL b/configs/base-generic/CONFIG_MAC80211_RC_DEFAULT_MINSTREL
index 62bbca761..62bbca761 100644
--- a/baseconfig/CONFIG_MAC80211_RC_DEFAULT_MINSTREL
+++ b/configs/base-generic/CONFIG_MAC80211_RC_DEFAULT_MINSTREL
diff --git a/baseconfig/CONFIG_MAC80211_RC_MINSTREL b/configs/base-generic/CONFIG_MAC80211_RC_MINSTREL
index 99bb0c835..99bb0c835 100644
--- a/baseconfig/CONFIG_MAC80211_RC_MINSTREL
+++ b/configs/base-generic/CONFIG_MAC80211_RC_MINSTREL
diff --git a/baseconfig/CONFIG_MAC802154 b/configs/base-generic/CONFIG_MAC802154
index d63984cd5..d63984cd5 100644
--- a/baseconfig/CONFIG_MAC802154
+++ b/configs/base-generic/CONFIG_MAC802154
diff --git a/baseconfig/CONFIG_MACB b/configs/base-generic/CONFIG_MACB
index bc6051899..bc6051899 100644
--- a/baseconfig/CONFIG_MACB
+++ b/configs/base-generic/CONFIG_MACB
diff --git a/baseconfig/CONFIG_MACB_PCI b/configs/base-generic/CONFIG_MACB_PCI
index 32aeda0e5..32aeda0e5 100644
--- a/baseconfig/CONFIG_MACB_PCI
+++ b/configs/base-generic/CONFIG_MACB_PCI
diff --git a/baseconfig/CONFIG_MACB_USE_HWSTAMP b/configs/base-generic/CONFIG_MACB_USE_HWSTAMP
index ab817484b..ab817484b 100644
--- a/baseconfig/CONFIG_MACB_USE_HWSTAMP
+++ b/configs/base-generic/CONFIG_MACB_USE_HWSTAMP
diff --git a/baseconfig/CONFIG_MACHZ_WDT b/configs/base-generic/CONFIG_MACHZ_WDT
index 554b4e91a..554b4e91a 100644
--- a/baseconfig/CONFIG_MACHZ_WDT
+++ b/configs/base-generic/CONFIG_MACHZ_WDT
diff --git a/baseconfig/CONFIG_MACSEC b/configs/base-generic/CONFIG_MACSEC
index 678c117d0..678c117d0 100644
--- a/baseconfig/CONFIG_MACSEC
+++ b/configs/base-generic/CONFIG_MACSEC
diff --git a/baseconfig/CONFIG_MACVLAN b/configs/base-generic/CONFIG_MACVLAN
index 76ead6685..76ead6685 100644
--- a/baseconfig/CONFIG_MACVLAN
+++ b/configs/base-generic/CONFIG_MACVLAN
diff --git a/baseconfig/CONFIG_MACVTAP b/configs/base-generic/CONFIG_MACVTAP
index ee7d8996d..ee7d8996d 100644
--- a/baseconfig/CONFIG_MACVTAP
+++ b/configs/base-generic/CONFIG_MACVTAP
diff --git a/baseconfig/CONFIG_MAC_EMUMOUSEBTN b/configs/base-generic/CONFIG_MAC_EMUMOUSEBTN
index 76b30caa5..76b30caa5 100644
--- a/baseconfig/CONFIG_MAC_EMUMOUSEBTN
+++ b/configs/base-generic/CONFIG_MAC_EMUMOUSEBTN
diff --git a/baseconfig/CONFIG_MAC_PARTITION b/configs/base-generic/CONFIG_MAC_PARTITION
index 66fca5aef..66fca5aef 100644
--- a/baseconfig/CONFIG_MAC_PARTITION
+++ b/configs/base-generic/CONFIG_MAC_PARTITION
diff --git a/baseconfig/CONFIG_MAG3110 b/configs/base-generic/CONFIG_MAG3110
index 2db4f0a85..2db4f0a85 100644
--- a/baseconfig/CONFIG_MAG3110
+++ b/configs/base-generic/CONFIG_MAG3110
diff --git a/baseconfig/CONFIG_MAGIC_SYSRQ b/configs/base-generic/CONFIG_MAGIC_SYSRQ
index 3a3a7285a..3a3a7285a 100644
--- a/baseconfig/CONFIG_MAGIC_SYSRQ
+++ b/configs/base-generic/CONFIG_MAGIC_SYSRQ
diff --git a/baseconfig/CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE b/configs/base-generic/CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE
index b6ff66d36..b6ff66d36 100644
--- a/baseconfig/CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE
+++ b/configs/base-generic/CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE
diff --git a/baseconfig/CONFIG_MAGIC_SYSRQ_SERIAL b/configs/base-generic/CONFIG_MAGIC_SYSRQ_SERIAL
index 649399011..649399011 100644
--- a/baseconfig/CONFIG_MAGIC_SYSRQ_SERIAL
+++ b/configs/base-generic/CONFIG_MAGIC_SYSRQ_SERIAL
diff --git a/baseconfig/CONFIG_MAILBOX b/configs/base-generic/CONFIG_MAILBOX
index a72f087f9..a72f087f9 100644
--- a/baseconfig/CONFIG_MAILBOX
+++ b/configs/base-generic/CONFIG_MAILBOX
diff --git a/baseconfig/CONFIG_MAILBOX_TEST b/configs/base-generic/CONFIG_MAILBOX_TEST
index 6b2b9888d..6b2b9888d 100644
--- a/baseconfig/CONFIG_MAILBOX_TEST
+++ b/configs/base-generic/CONFIG_MAILBOX_TEST
diff --git a/baseconfig/CONFIG_MANDATORY_FILE_LOCKING b/configs/base-generic/CONFIG_MANDATORY_FILE_LOCKING
index aae473679..aae473679 100644
--- a/baseconfig/CONFIG_MANDATORY_FILE_LOCKING
+++ b/configs/base-generic/CONFIG_MANDATORY_FILE_LOCKING
diff --git a/baseconfig/CONFIG_MANTIS_CORE b/configs/base-generic/CONFIG_MANTIS_CORE
index 13a37a655..13a37a655 100644
--- a/baseconfig/CONFIG_MANTIS_CORE
+++ b/configs/base-generic/CONFIG_MANTIS_CORE
diff --git a/baseconfig/CONFIG_MARVELL_10G_PHY b/configs/base-generic/CONFIG_MARVELL_10G_PHY
index 6dadd98ff..6dadd98ff 100644
--- a/baseconfig/CONFIG_MARVELL_10G_PHY
+++ b/configs/base-generic/CONFIG_MARVELL_10G_PHY
diff --git a/baseconfig/CONFIG_MARVELL_PHY b/configs/base-generic/CONFIG_MARVELL_PHY
index e6aeb4de1..e6aeb4de1 100644
--- a/baseconfig/CONFIG_MARVELL_PHY
+++ b/configs/base-generic/CONFIG_MARVELL_PHY
diff --git a/baseconfig/CONFIG_MAX1027 b/configs/base-generic/CONFIG_MAX1027
index 579a537aa..579a537aa 100644
--- a/baseconfig/CONFIG_MAX1027
+++ b/configs/base-generic/CONFIG_MAX1027
diff --git a/baseconfig/CONFIG_MAX11100 b/configs/base-generic/CONFIG_MAX11100
index 90819abc8..90819abc8 100644
--- a/baseconfig/CONFIG_MAX11100
+++ b/configs/base-generic/CONFIG_MAX11100
diff --git a/baseconfig/CONFIG_MAX1118 b/configs/base-generic/CONFIG_MAX1118
index 615bda2e2..615bda2e2 100644
--- a/baseconfig/CONFIG_MAX1118
+++ b/configs/base-generic/CONFIG_MAX1118
diff --git a/baseconfig/CONFIG_MAX1363 b/configs/base-generic/CONFIG_MAX1363
index 08e944fb7..08e944fb7 100644
--- a/baseconfig/CONFIG_MAX1363
+++ b/configs/base-generic/CONFIG_MAX1363
diff --git a/baseconfig/CONFIG_MAX30100 b/configs/base-generic/CONFIG_MAX30100
index cf145325f..cf145325f 100644
--- a/baseconfig/CONFIG_MAX30100
+++ b/configs/base-generic/CONFIG_MAX30100
diff --git a/baseconfig/CONFIG_MAX30102 b/configs/base-generic/CONFIG_MAX30102
index 5b4aacf3d..5b4aacf3d 100644
--- a/baseconfig/CONFIG_MAX30102
+++ b/configs/base-generic/CONFIG_MAX30102
diff --git a/baseconfig/CONFIG_MAX44000 b/configs/base-generic/CONFIG_MAX44000
index d41f59c30..d41f59c30 100644
--- a/baseconfig/CONFIG_MAX44000
+++ b/configs/base-generic/CONFIG_MAX44000
diff --git a/baseconfig/CONFIG_MAX517 b/configs/base-generic/CONFIG_MAX517
index 5b3bda9c0..5b3bda9c0 100644
--- a/baseconfig/CONFIG_MAX517
+++ b/configs/base-generic/CONFIG_MAX517
diff --git a/baseconfig/CONFIG_MAX5481 b/configs/base-generic/CONFIG_MAX5481
index 36b3781d6..36b3781d6 100644
--- a/baseconfig/CONFIG_MAX5481
+++ b/configs/base-generic/CONFIG_MAX5481
diff --git a/baseconfig/CONFIG_MAX5487 b/configs/base-generic/CONFIG_MAX5487
index 4ac669fe2..4ac669fe2 100644
--- a/baseconfig/CONFIG_MAX5487
+++ b/configs/base-generic/CONFIG_MAX5487
diff --git a/baseconfig/CONFIG_MAX5821 b/configs/base-generic/CONFIG_MAX5821
index a308172ed..a308172ed 100644
--- a/baseconfig/CONFIG_MAX5821
+++ b/configs/base-generic/CONFIG_MAX5821
diff --git a/baseconfig/CONFIG_MAX63XX_WATCHDOG b/configs/base-generic/CONFIG_MAX63XX_WATCHDOG
index cb71a58bd..cb71a58bd 100644
--- a/baseconfig/CONFIG_MAX63XX_WATCHDOG
+++ b/configs/base-generic/CONFIG_MAX63XX_WATCHDOG
diff --git a/baseconfig/CONFIG_MAX9611 b/configs/base-generic/CONFIG_MAX9611
index 1cbc674e0..1cbc674e0 100644
--- a/baseconfig/CONFIG_MAX9611
+++ b/configs/base-generic/CONFIG_MAX9611
diff --git a/baseconfig/CONFIG_MAXIM_THERMOCOUPLE b/configs/base-generic/CONFIG_MAXIM_THERMOCOUPLE
index 442d4efa6..442d4efa6 100644
--- a/baseconfig/CONFIG_MAXIM_THERMOCOUPLE
+++ b/configs/base-generic/CONFIG_MAXIM_THERMOCOUPLE
diff --git a/baseconfig/CONFIG_MAX_RAW_DEVS b/configs/base-generic/CONFIG_MAX_RAW_DEVS
index 762272176..762272176 100644
--- a/baseconfig/CONFIG_MAX_RAW_DEVS
+++ b/configs/base-generic/CONFIG_MAX_RAW_DEVS
diff --git a/baseconfig/CONFIG_MC3230 b/configs/base-generic/CONFIG_MC3230
index e06bd44e2..e06bd44e2 100644
--- a/baseconfig/CONFIG_MC3230
+++ b/configs/base-generic/CONFIG_MC3230
diff --git a/baseconfig/CONFIG_MCB b/configs/base-generic/CONFIG_MCB
index 775421e96..775421e96 100644
--- a/baseconfig/CONFIG_MCB
+++ b/configs/base-generic/CONFIG_MCB
diff --git a/baseconfig/CONFIG_MCE_AMD_INJ b/configs/base-generic/CONFIG_MCE_AMD_INJ
index 7b08b9eab..7b08b9eab 100644
--- a/baseconfig/CONFIG_MCE_AMD_INJ
+++ b/configs/base-generic/CONFIG_MCE_AMD_INJ
diff --git a/baseconfig/CONFIG_MCP2120_DONGLE b/configs/base-generic/CONFIG_MCP2120_DONGLE
index ca4f23a8a..ca4f23a8a 100644
--- a/baseconfig/CONFIG_MCP2120_DONGLE
+++ b/configs/base-generic/CONFIG_MCP2120_DONGLE
diff --git a/baseconfig/CONFIG_MCP320X b/configs/base-generic/CONFIG_MCP320X
index da2f99aaf..da2f99aaf 100644
--- a/baseconfig/CONFIG_MCP320X
+++ b/configs/base-generic/CONFIG_MCP320X
diff --git a/baseconfig/CONFIG_MCP3422 b/configs/base-generic/CONFIG_MCP3422
index 0f00863b4..0f00863b4 100644
--- a/baseconfig/CONFIG_MCP3422
+++ b/configs/base-generic/CONFIG_MCP3422
diff --git a/baseconfig/CONFIG_MCP4131 b/configs/base-generic/CONFIG_MCP4131
index 62d46e619..62d46e619 100644
--- a/baseconfig/CONFIG_MCP4131
+++ b/configs/base-generic/CONFIG_MCP4131
diff --git a/baseconfig/CONFIG_MCP4531 b/configs/base-generic/CONFIG_MCP4531
index cd27ab521..cd27ab521 100644
--- a/baseconfig/CONFIG_MCP4531
+++ b/configs/base-generic/CONFIG_MCP4531
diff --git a/baseconfig/CONFIG_MCP4725 b/configs/base-generic/CONFIG_MCP4725
index c88886b21..c88886b21 100644
--- a/baseconfig/CONFIG_MCP4725
+++ b/configs/base-generic/CONFIG_MCP4725
diff --git a/baseconfig/CONFIG_MCP4922 b/configs/base-generic/CONFIG_MCP4922
index a78c7a7d1..a78c7a7d1 100644
--- a/baseconfig/CONFIG_MCP4922
+++ b/configs/base-generic/CONFIG_MCP4922
diff --git a/baseconfig/CONFIG_MCS_FIR b/configs/base-generic/CONFIG_MCS_FIR
index bb7384a2b..bb7384a2b 100644
--- a/baseconfig/CONFIG_MCS_FIR
+++ b/configs/base-generic/CONFIG_MCS_FIR
diff --git a/baseconfig/CONFIG_MD b/configs/base-generic/CONFIG_MD
index a11629d79..a11629d79 100644
--- a/baseconfig/CONFIG_MD
+++ b/configs/base-generic/CONFIG_MD
diff --git a/baseconfig/CONFIG_MDIO_BCM_UNIMAC b/configs/base-generic/CONFIG_MDIO_BCM_UNIMAC
index a0c92ceeb..a0c92ceeb 100644
--- a/baseconfig/CONFIG_MDIO_BCM_UNIMAC
+++ b/configs/base-generic/CONFIG_MDIO_BCM_UNIMAC
diff --git a/baseconfig/CONFIG_MDIO_BITBANG b/configs/base-generic/CONFIG_MDIO_BITBANG
index 06f4ddebc..06f4ddebc 100644
--- a/baseconfig/CONFIG_MDIO_BITBANG
+++ b/configs/base-generic/CONFIG_MDIO_BITBANG
diff --git a/baseconfig/CONFIG_MDIO_BUS_MUX b/configs/base-generic/CONFIG_MDIO_BUS_MUX
index 0d74f0500..0d74f0500 100644
--- a/baseconfig/CONFIG_MDIO_BUS_MUX
+++ b/configs/base-generic/CONFIG_MDIO_BUS_MUX
diff --git a/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO b/configs/base-generic/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..27b93466f 100644
--- a/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/configs/base-generic/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG b/configs/base-generic/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..4d738fd98 100644
--- a/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/configs/base-generic/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/CONFIG_MDIO_GPIO b/configs/base-generic/CONFIG_MDIO_GPIO
index 9ae978356..9ae978356 100644
--- a/baseconfig/CONFIG_MDIO_GPIO
+++ b/configs/base-generic/CONFIG_MDIO_GPIO
diff --git a/baseconfig/CONFIG_MDIO_HISI_FEMAC b/configs/base-generic/CONFIG_MDIO_HISI_FEMAC
index f90f40ce7..f90f40ce7 100644
--- a/baseconfig/CONFIG_MDIO_HISI_FEMAC
+++ b/configs/base-generic/CONFIG_MDIO_HISI_FEMAC
diff --git a/baseconfig/CONFIG_MDIO_I2C b/configs/base-generic/CONFIG_MDIO_I2C
index df7d9e025..df7d9e025 100644
--- a/baseconfig/CONFIG_MDIO_I2C
+++ b/configs/base-generic/CONFIG_MDIO_I2C
diff --git a/baseconfig/CONFIG_MDIO_OCTEON b/configs/base-generic/CONFIG_MDIO_OCTEON
index e14c4b041..e14c4b041 100644
--- a/baseconfig/CONFIG_MDIO_OCTEON
+++ b/configs/base-generic/CONFIG_MDIO_OCTEON
diff --git a/baseconfig/CONFIG_MDIO_THUNDER b/configs/base-generic/CONFIG_MDIO_THUNDER
index b83d577f6..b83d577f6 100644
--- a/baseconfig/CONFIG_MDIO_THUNDER
+++ b/configs/base-generic/CONFIG_MDIO_THUNDER
diff --git a/baseconfig/CONFIG_MD_AUTODETECT b/configs/base-generic/CONFIG_MD_AUTODETECT
index 29191f7e1..29191f7e1 100644
--- a/baseconfig/CONFIG_MD_AUTODETECT
+++ b/configs/base-generic/CONFIG_MD_AUTODETECT
diff --git a/baseconfig/CONFIG_MD_CLUSTER b/configs/base-generic/CONFIG_MD_CLUSTER
index 4fc11b352..4fc11b352 100644
--- a/baseconfig/CONFIG_MD_CLUSTER
+++ b/configs/base-generic/CONFIG_MD_CLUSTER
diff --git a/baseconfig/CONFIG_MD_FAULTY b/configs/base-generic/CONFIG_MD_FAULTY
index d332a7499..d332a7499 100644
--- a/baseconfig/CONFIG_MD_FAULTY
+++ b/configs/base-generic/CONFIG_MD_FAULTY
diff --git a/baseconfig/CONFIG_MD_LINEAR b/configs/base-generic/CONFIG_MD_LINEAR
index 7ea8e58fb..7ea8e58fb 100644
--- a/baseconfig/CONFIG_MD_LINEAR
+++ b/configs/base-generic/CONFIG_MD_LINEAR
diff --git a/baseconfig/CONFIG_MD_MULTIPATH b/configs/base-generic/CONFIG_MD_MULTIPATH
index de437b3f1..de437b3f1 100644
--- a/baseconfig/CONFIG_MD_MULTIPATH
+++ b/configs/base-generic/CONFIG_MD_MULTIPATH
diff --git a/baseconfig/CONFIG_MD_RAID0 b/configs/base-generic/CONFIG_MD_RAID0
index bc197d6db..bc197d6db 100644
--- a/baseconfig/CONFIG_MD_RAID0
+++ b/configs/base-generic/CONFIG_MD_RAID0
diff --git a/baseconfig/CONFIG_MD_RAID1 b/configs/base-generic/CONFIG_MD_RAID1
index b54611532..b54611532 100644
--- a/baseconfig/CONFIG_MD_RAID1
+++ b/configs/base-generic/CONFIG_MD_RAID1
diff --git a/baseconfig/CONFIG_MD_RAID10 b/configs/base-generic/CONFIG_MD_RAID10
index fbfc46670..fbfc46670 100644
--- a/baseconfig/CONFIG_MD_RAID10
+++ b/configs/base-generic/CONFIG_MD_RAID10
diff --git a/baseconfig/CONFIG_MD_RAID456 b/configs/base-generic/CONFIG_MD_RAID456
index f5f9b93e1..f5f9b93e1 100644
--- a/baseconfig/CONFIG_MD_RAID456
+++ b/configs/base-generic/CONFIG_MD_RAID456
diff --git a/baseconfig/CONFIG_MEDIA_ALTERA_CI b/configs/base-generic/CONFIG_MEDIA_ALTERA_CI
index a75411a2a..a75411a2a 100644
--- a/baseconfig/CONFIG_MEDIA_ALTERA_CI
+++ b/configs/base-generic/CONFIG_MEDIA_ALTERA_CI
diff --git a/baseconfig/CONFIG_MEDIA_ANALOG_TV_SUPPORT b/configs/base-generic/CONFIG_MEDIA_ANALOG_TV_SUPPORT
index bde0e1fee..bde0e1fee 100644
--- a/baseconfig/CONFIG_MEDIA_ANALOG_TV_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_ANALOG_TV_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_ATTACH b/configs/base-generic/CONFIG_MEDIA_ATTACH
index deb2a21dc..deb2a21dc 100644
--- a/baseconfig/CONFIG_MEDIA_ATTACH
+++ b/configs/base-generic/CONFIG_MEDIA_ATTACH
diff --git a/baseconfig/CONFIG_MEDIA_CAMERA_SUPPORT b/configs/base-generic/CONFIG_MEDIA_CAMERA_SUPPORT
index 51ed6956f..51ed6956f 100644
--- a/baseconfig/CONFIG_MEDIA_CAMERA_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_CAMERA_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_CEC_DEBUG b/configs/base-generic/CONFIG_MEDIA_CEC_DEBUG
index b2fe2736b..b2fe2736b 100644
--- a/baseconfig/CONFIG_MEDIA_CEC_DEBUG
+++ b/configs/base-generic/CONFIG_MEDIA_CEC_DEBUG
diff --git a/baseconfig/CONFIG_MEDIA_CEC_RC b/configs/base-generic/CONFIG_MEDIA_CEC_RC
index 1531c4b09..1531c4b09 100644
--- a/baseconfig/CONFIG_MEDIA_CEC_RC
+++ b/configs/base-generic/CONFIG_MEDIA_CEC_RC
diff --git a/baseconfig/CONFIG_MEDIA_CEC_SUPPORT b/configs/base-generic/CONFIG_MEDIA_CEC_SUPPORT
index c23046c74..c23046c74 100644
--- a/baseconfig/CONFIG_MEDIA_CEC_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_CEC_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_CONTROLLER b/configs/base-generic/CONFIG_MEDIA_CONTROLLER
index 5e3084377..5e3084377 100644
--- a/baseconfig/CONFIG_MEDIA_CONTROLLER
+++ b/configs/base-generic/CONFIG_MEDIA_CONTROLLER
diff --git a/baseconfig/CONFIG_MEDIA_CONTROLLER_DVB b/configs/base-generic/CONFIG_MEDIA_CONTROLLER_DVB
index a0cac6714..a0cac6714 100644
--- a/baseconfig/CONFIG_MEDIA_CONTROLLER_DVB
+++ b/configs/base-generic/CONFIG_MEDIA_CONTROLLER_DVB
diff --git a/baseconfig/CONFIG_MEDIA_DIGITAL_TV_SUPPORT b/configs/base-generic/CONFIG_MEDIA_DIGITAL_TV_SUPPORT
index ff10d0bda..ff10d0bda 100644
--- a/baseconfig/CONFIG_MEDIA_DIGITAL_TV_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_DIGITAL_TV_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_PCI_SUPPORT b/configs/base-generic/CONFIG_MEDIA_PCI_SUPPORT
index 74a075157..74a075157 100644
--- a/baseconfig/CONFIG_MEDIA_PCI_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_PCI_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_RADIO_SUPPORT b/configs/base-generic/CONFIG_MEDIA_RADIO_SUPPORT
index 95ea5e9b5..95ea5e9b5 100644
--- a/baseconfig/CONFIG_MEDIA_RADIO_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_RADIO_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_RC_SUPPORT b/configs/base-generic/CONFIG_MEDIA_RC_SUPPORT
index 5b245bf23..5b245bf23 100644
--- a/baseconfig/CONFIG_MEDIA_RC_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_RC_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_SDR_SUPPORT b/configs/base-generic/CONFIG_MEDIA_SDR_SUPPORT
index e75136efa..e75136efa 100644
--- a/baseconfig/CONFIG_MEDIA_SDR_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_SDR_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_SUBDRV_AUTOSELECT b/configs/base-generic/CONFIG_MEDIA_SUBDRV_AUTOSELECT
index 096cc99ca..096cc99ca 100644
--- a/baseconfig/CONFIG_MEDIA_SUBDRV_AUTOSELECT
+++ b/configs/base-generic/CONFIG_MEDIA_SUBDRV_AUTOSELECT
diff --git a/baseconfig/CONFIG_MEDIA_SUPPORT b/configs/base-generic/CONFIG_MEDIA_SUPPORT
index 518972fe8..518972fe8 100644
--- a/baseconfig/CONFIG_MEDIA_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_SUPPORT
diff --git a/baseconfig/CONFIG_MEDIA_TUNER_MSI001 b/configs/base-generic/CONFIG_MEDIA_TUNER_MSI001
index 58599a679..58599a679 100644
--- a/baseconfig/CONFIG_MEDIA_TUNER_MSI001
+++ b/configs/base-generic/CONFIG_MEDIA_TUNER_MSI001
diff --git a/baseconfig/CONFIG_MEDIA_USB_SUPPORT b/configs/base-generic/CONFIG_MEDIA_USB_SUPPORT
index 49ea6a0ae..49ea6a0ae 100644
--- a/baseconfig/CONFIG_MEDIA_USB_SUPPORT
+++ b/configs/base-generic/CONFIG_MEDIA_USB_SUPPORT
diff --git a/baseconfig/CONFIG_MEGARAID_LEGACY b/configs/base-generic/CONFIG_MEGARAID_LEGACY
index 19e822be4..19e822be4 100644
--- a/baseconfig/CONFIG_MEGARAID_LEGACY
+++ b/configs/base-generic/CONFIG_MEGARAID_LEGACY
diff --git a/baseconfig/CONFIG_MEGARAID_MAILBOX b/configs/base-generic/CONFIG_MEGARAID_MAILBOX
index 43a36cceb..43a36cceb 100644
--- a/baseconfig/CONFIG_MEGARAID_MAILBOX
+++ b/configs/base-generic/CONFIG_MEGARAID_MAILBOX
diff --git a/baseconfig/CONFIG_MEGARAID_MM b/configs/base-generic/CONFIG_MEGARAID_MM
index 1b40f75cb..1b40f75cb 100644
--- a/baseconfig/CONFIG_MEGARAID_MM
+++ b/configs/base-generic/CONFIG_MEGARAID_MM
diff --git a/baseconfig/CONFIG_MEGARAID_NEWGEN b/configs/base-generic/CONFIG_MEGARAID_NEWGEN
index 06d505168..06d505168 100644
--- a/baseconfig/CONFIG_MEGARAID_NEWGEN
+++ b/configs/base-generic/CONFIG_MEGARAID_NEWGEN
diff --git a/baseconfig/CONFIG_MEGARAID_SAS b/configs/base-generic/CONFIG_MEGARAID_SAS
index c32b82a35..c32b82a35 100644
--- a/baseconfig/CONFIG_MEGARAID_SAS
+++ b/configs/base-generic/CONFIG_MEGARAID_SAS
diff --git a/baseconfig/CONFIG_MEMCG b/configs/base-generic/CONFIG_MEMCG
index 100384ba8..100384ba8 100644
--- a/baseconfig/CONFIG_MEMCG
+++ b/configs/base-generic/CONFIG_MEMCG
diff --git a/baseconfig/CONFIG_MEMCG_SWAP b/configs/base-generic/CONFIG_MEMCG_SWAP
index f9182cdd8..f9182cdd8 100644
--- a/baseconfig/CONFIG_MEMCG_SWAP
+++ b/configs/base-generic/CONFIG_MEMCG_SWAP
diff --git a/baseconfig/CONFIG_MEMCG_SWAP_ENABLED b/configs/base-generic/CONFIG_MEMCG_SWAP_ENABLED
index 0515315a8..0515315a8 100644
--- a/baseconfig/CONFIG_MEMCG_SWAP_ENABLED
+++ b/configs/base-generic/CONFIG_MEMCG_SWAP_ENABLED
diff --git a/baseconfig/CONFIG_MEMORY b/configs/base-generic/CONFIG_MEMORY
index 0e3aceb95..0e3aceb95 100644
--- a/baseconfig/CONFIG_MEMORY
+++ b/configs/base-generic/CONFIG_MEMORY
diff --git a/baseconfig/CONFIG_MEMORY_FAILURE b/configs/base-generic/CONFIG_MEMORY_FAILURE
index af716b05c..af716b05c 100644
--- a/baseconfig/CONFIG_MEMORY_FAILURE
+++ b/configs/base-generic/CONFIG_MEMORY_FAILURE
diff --git a/baseconfig/CONFIG_MEMSTICK b/configs/base-generic/CONFIG_MEMSTICK
index 9ed5ed5f5..9ed5ed5f5 100644
--- a/baseconfig/CONFIG_MEMSTICK
+++ b/configs/base-generic/CONFIG_MEMSTICK
diff --git a/baseconfig/CONFIG_MEMSTICK_DEBUG b/configs/base-generic/CONFIG_MEMSTICK_DEBUG
index 31f989fb9..31f989fb9 100644
--- a/baseconfig/CONFIG_MEMSTICK_DEBUG
+++ b/configs/base-generic/CONFIG_MEMSTICK_DEBUG
diff --git a/baseconfig/CONFIG_MEMSTICK_JMICRON_38X b/configs/base-generic/CONFIG_MEMSTICK_JMICRON_38X
index 15743ca31..15743ca31 100644
--- a/baseconfig/CONFIG_MEMSTICK_JMICRON_38X
+++ b/configs/base-generic/CONFIG_MEMSTICK_JMICRON_38X
diff --git a/baseconfig/CONFIG_MEMSTICK_R592 b/configs/base-generic/CONFIG_MEMSTICK_R592
index 8aec8b70b..8aec8b70b 100644
--- a/baseconfig/CONFIG_MEMSTICK_R592
+++ b/configs/base-generic/CONFIG_MEMSTICK_R592
diff --git a/baseconfig/CONFIG_MEMSTICK_REALTEK_PCI b/configs/base-generic/CONFIG_MEMSTICK_REALTEK_PCI
index ad0265810..ad0265810 100644
--- a/baseconfig/CONFIG_MEMSTICK_REALTEK_PCI
+++ b/configs/base-generic/CONFIG_MEMSTICK_REALTEK_PCI
diff --git a/baseconfig/CONFIG_MEMSTICK_REALTEK_USB b/configs/base-generic/CONFIG_MEMSTICK_REALTEK_USB
index 8792e797c..8792e797c 100644
--- a/baseconfig/CONFIG_MEMSTICK_REALTEK_USB
+++ b/configs/base-generic/CONFIG_MEMSTICK_REALTEK_USB
diff --git a/baseconfig/CONFIG_MEMSTICK_TIFM_MS b/configs/base-generic/CONFIG_MEMSTICK_TIFM_MS
index d6757770a..d6757770a 100644
--- a/baseconfig/CONFIG_MEMSTICK_TIFM_MS
+++ b/configs/base-generic/CONFIG_MEMSTICK_TIFM_MS
diff --git a/baseconfig/CONFIG_MEMSTICK_UNSAFE_RESUME b/configs/base-generic/CONFIG_MEMSTICK_UNSAFE_RESUME
index 940b4c5a6..940b4c5a6 100644
--- a/baseconfig/CONFIG_MEMSTICK_UNSAFE_RESUME
+++ b/configs/base-generic/CONFIG_MEMSTICK_UNSAFE_RESUME
diff --git a/baseconfig/CONFIG_MEMTEST b/configs/base-generic/CONFIG_MEMTEST
index 27d7daee6..27d7daee6 100644
--- a/baseconfig/CONFIG_MEMTEST
+++ b/configs/base-generic/CONFIG_MEMTEST
diff --git a/baseconfig/CONFIG_MEN_A21_WDT b/configs/base-generic/CONFIG_MEN_A21_WDT
index bc360bfab..bc360bfab 100644
--- a/baseconfig/CONFIG_MEN_A21_WDT
+++ b/configs/base-generic/CONFIG_MEN_A21_WDT
diff --git a/baseconfig/CONFIG_MESSAGE_LOGLEVEL_DEFAULT b/configs/base-generic/CONFIG_MESSAGE_LOGLEVEL_DEFAULT
index ca39b7f7a..ca39b7f7a 100644
--- a/baseconfig/CONFIG_MESSAGE_LOGLEVEL_DEFAULT
+++ b/configs/base-generic/CONFIG_MESSAGE_LOGLEVEL_DEFAULT
diff --git a/baseconfig/CONFIG_MFD_88PM800 b/configs/base-generic/CONFIG_MFD_88PM800
index 858dc2db1..858dc2db1 100644
--- a/baseconfig/CONFIG_MFD_88PM800
+++ b/configs/base-generic/CONFIG_MFD_88PM800
diff --git a/baseconfig/CONFIG_MFD_88PM805 b/configs/base-generic/CONFIG_MFD_88PM805
index f3cd46c90..f3cd46c90 100644
--- a/baseconfig/CONFIG_MFD_88PM805
+++ b/configs/base-generic/CONFIG_MFD_88PM805
diff --git a/baseconfig/CONFIG_MFD_88PM860X b/configs/base-generic/CONFIG_MFD_88PM860X
index 859128371..859128371 100644
--- a/baseconfig/CONFIG_MFD_88PM860X
+++ b/configs/base-generic/CONFIG_MFD_88PM860X
diff --git a/baseconfig/CONFIG_MFD_AAT2870_CORE b/configs/base-generic/CONFIG_MFD_AAT2870_CORE
index 9d4cf9056..9d4cf9056 100644
--- a/baseconfig/CONFIG_MFD_AAT2870_CORE
+++ b/configs/base-generic/CONFIG_MFD_AAT2870_CORE
diff --git a/baseconfig/CONFIG_MFD_ACT8945A b/configs/base-generic/CONFIG_MFD_ACT8945A
index d13164db6..d13164db6 100644
--- a/baseconfig/CONFIG_MFD_ACT8945A
+++ b/configs/base-generic/CONFIG_MFD_ACT8945A
diff --git a/baseconfig/CONFIG_MFD_ARIZONA b/configs/base-generic/CONFIG_MFD_ARIZONA
index 78b6816f8..78b6816f8 100644
--- a/baseconfig/CONFIG_MFD_ARIZONA
+++ b/configs/base-generic/CONFIG_MFD_ARIZONA
diff --git a/baseconfig/CONFIG_MFD_ARIZONA_I2C b/configs/base-generic/CONFIG_MFD_ARIZONA_I2C
index 63be91cb3..63be91cb3 100644
--- a/baseconfig/CONFIG_MFD_ARIZONA_I2C
+++ b/configs/base-generic/CONFIG_MFD_ARIZONA_I2C
diff --git a/baseconfig/CONFIG_MFD_ARIZONA_SPI b/configs/base-generic/CONFIG_MFD_ARIZONA_SPI
index e3e9c6758..e3e9c6758 100644
--- a/baseconfig/CONFIG_MFD_ARIZONA_SPI
+++ b/configs/base-generic/CONFIG_MFD_ARIZONA_SPI
diff --git a/baseconfig/CONFIG_MFD_AS3711 b/configs/base-generic/CONFIG_MFD_AS3711
index 53b3b04f1..53b3b04f1 100644
--- a/baseconfig/CONFIG_MFD_AS3711
+++ b/configs/base-generic/CONFIG_MFD_AS3711
diff --git a/baseconfig/CONFIG_MFD_AS3722 b/configs/base-generic/CONFIG_MFD_AS3722
index eeaa8ff75..eeaa8ff75 100644
--- a/baseconfig/CONFIG_MFD_AS3722
+++ b/configs/base-generic/CONFIG_MFD_AS3722
diff --git a/baseconfig/CONFIG_MFD_ASIC3 b/configs/base-generic/CONFIG_MFD_ASIC3
index 7ca0a193d..7ca0a193d 100644
--- a/baseconfig/CONFIG_MFD_ASIC3
+++ b/configs/base-generic/CONFIG_MFD_ASIC3
diff --git a/baseconfig/CONFIG_MFD_ATMEL_FLEXCOM b/configs/base-generic/CONFIG_MFD_ATMEL_FLEXCOM
index e41ced062..e41ced062 100644
--- a/baseconfig/CONFIG_MFD_ATMEL_FLEXCOM
+++ b/configs/base-generic/CONFIG_MFD_ATMEL_FLEXCOM
diff --git a/baseconfig/CONFIG_MFD_ATMEL_HLCDC b/configs/base-generic/CONFIG_MFD_ATMEL_HLCDC
index cfd9b42ae..cfd9b42ae 100644
--- a/baseconfig/CONFIG_MFD_ATMEL_HLCDC
+++ b/configs/base-generic/CONFIG_MFD_ATMEL_HLCDC
diff --git a/baseconfig/CONFIG_MFD_AXP20X b/configs/base-generic/CONFIG_MFD_AXP20X
index 1d658245a..1d658245a 100644
--- a/baseconfig/CONFIG_MFD_AXP20X
+++ b/configs/base-generic/CONFIG_MFD_AXP20X
diff --git a/baseconfig/CONFIG_MFD_AXP20X_I2C b/configs/base-generic/CONFIG_MFD_AXP20X_I2C
index e9bcb19b1..e9bcb19b1 100644
--- a/baseconfig/CONFIG_MFD_AXP20X_I2C
+++ b/configs/base-generic/CONFIG_MFD_AXP20X_I2C
diff --git a/baseconfig/CONFIG_MFD_BCM590XX b/configs/base-generic/CONFIG_MFD_BCM590XX
index 104736d38..104736d38 100644
--- a/baseconfig/CONFIG_MFD_BCM590XX
+++ b/configs/base-generic/CONFIG_MFD_BCM590XX
diff --git a/baseconfig/CONFIG_MFD_BD9571MWV b/configs/base-generic/CONFIG_MFD_BD9571MWV
index 28d27a0e5..28d27a0e5 100644
--- a/baseconfig/CONFIG_MFD_BD9571MWV
+++ b/configs/base-generic/CONFIG_MFD_BD9571MWV
diff --git a/baseconfig/CONFIG_MFD_CORE b/configs/base-generic/CONFIG_MFD_CORE
index 0282448d0..0282448d0 100644
--- a/baseconfig/CONFIG_MFD_CORE
+++ b/configs/base-generic/CONFIG_MFD_CORE
diff --git a/baseconfig/CONFIG_MFD_CPCAP b/configs/base-generic/CONFIG_MFD_CPCAP
index 0f0408181..0f0408181 100644
--- a/baseconfig/CONFIG_MFD_CPCAP
+++ b/configs/base-generic/CONFIG_MFD_CPCAP
diff --git a/baseconfig/CONFIG_MFD_CROS_EC b/configs/base-generic/CONFIG_MFD_CROS_EC
index bf5468436..bf5468436 100644
--- a/baseconfig/CONFIG_MFD_CROS_EC
+++ b/configs/base-generic/CONFIG_MFD_CROS_EC
diff --git a/baseconfig/CONFIG_MFD_CS5535 b/configs/base-generic/CONFIG_MFD_CS5535
index c95b30f07..c95b30f07 100644
--- a/baseconfig/CONFIG_MFD_CS5535
+++ b/configs/base-generic/CONFIG_MFD_CS5535
diff --git a/baseconfig/CONFIG_MFD_DA9052_I2C b/configs/base-generic/CONFIG_MFD_DA9052_I2C
index c294bc24d..c294bc24d 100644
--- a/baseconfig/CONFIG_MFD_DA9052_I2C
+++ b/configs/base-generic/CONFIG_MFD_DA9052_I2C
diff --git a/baseconfig/CONFIG_MFD_DA9052_SPI b/configs/base-generic/CONFIG_MFD_DA9052_SPI
index 095062683..095062683 100644
--- a/baseconfig/CONFIG_MFD_DA9052_SPI
+++ b/configs/base-generic/CONFIG_MFD_DA9052_SPI
diff --git a/baseconfig/CONFIG_MFD_DA9055 b/configs/base-generic/CONFIG_MFD_DA9055
index 3f7ae6423..3f7ae6423 100644
--- a/baseconfig/CONFIG_MFD_DA9055
+++ b/configs/base-generic/CONFIG_MFD_DA9055
diff --git a/baseconfig/CONFIG_MFD_DA9062 b/configs/base-generic/CONFIG_MFD_DA9062
index d605877c7..d605877c7 100644
--- a/baseconfig/CONFIG_MFD_DA9062
+++ b/configs/base-generic/CONFIG_MFD_DA9062
diff --git a/baseconfig/CONFIG_MFD_DA9063 b/configs/base-generic/CONFIG_MFD_DA9063
index ba3cfa7cb..ba3cfa7cb 100644
--- a/baseconfig/CONFIG_MFD_DA9063
+++ b/configs/base-generic/CONFIG_MFD_DA9063
diff --git a/baseconfig/CONFIG_MFD_DA9150 b/configs/base-generic/CONFIG_MFD_DA9150
index 33d4eb529..33d4eb529 100644
--- a/baseconfig/CONFIG_MFD_DA9150
+++ b/configs/base-generic/CONFIG_MFD_DA9150
diff --git a/baseconfig/CONFIG_MFD_DLN2 b/configs/base-generic/CONFIG_MFD_DLN2
index b0c8ca366..b0c8ca366 100644
--- a/baseconfig/CONFIG_MFD_DLN2
+++ b/configs/base-generic/CONFIG_MFD_DLN2
diff --git a/baseconfig/CONFIG_MFD_HI6421_PMIC b/configs/base-generic/CONFIG_MFD_HI6421_PMIC
index 5b380187f..5b380187f 100644
--- a/baseconfig/CONFIG_MFD_HI6421_PMIC
+++ b/configs/base-generic/CONFIG_MFD_HI6421_PMIC
diff --git a/baseconfig/CONFIG_MFD_JANZ_CMODIO b/configs/base-generic/CONFIG_MFD_JANZ_CMODIO
index c6926b841..c6926b841 100644
--- a/baseconfig/CONFIG_MFD_JANZ_CMODIO
+++ b/configs/base-generic/CONFIG_MFD_JANZ_CMODIO
diff --git a/baseconfig/CONFIG_MFD_KEMPLD b/configs/base-generic/CONFIG_MFD_KEMPLD
index a94ded357..a94ded357 100644
--- a/baseconfig/CONFIG_MFD_KEMPLD
+++ b/configs/base-generic/CONFIG_MFD_KEMPLD
diff --git a/baseconfig/CONFIG_MFD_LM3533 b/configs/base-generic/CONFIG_MFD_LM3533
index 0ab890140..0ab890140 100644
--- a/baseconfig/CONFIG_MFD_LM3533
+++ b/configs/base-generic/CONFIG_MFD_LM3533
diff --git a/baseconfig/CONFIG_MFD_LP3943 b/configs/base-generic/CONFIG_MFD_LP3943
index de711a681..de711a681 100644
--- a/baseconfig/CONFIG_MFD_LP3943
+++ b/configs/base-generic/CONFIG_MFD_LP3943
diff --git a/baseconfig/CONFIG_MFD_LP8788 b/configs/base-generic/CONFIG_MFD_LP8788
index 4600a154f..4600a154f 100644
--- a/baseconfig/CONFIG_MFD_LP8788
+++ b/configs/base-generic/CONFIG_MFD_LP8788
diff --git a/baseconfig/CONFIG_MFD_MAX14577 b/configs/base-generic/CONFIG_MFD_MAX14577
index ebbae1997..ebbae1997 100644
--- a/baseconfig/CONFIG_MFD_MAX14577
+++ b/configs/base-generic/CONFIG_MFD_MAX14577
diff --git a/baseconfig/CONFIG_MFD_MAX77620 b/configs/base-generic/CONFIG_MFD_MAX77620
index a4fa3073f..a4fa3073f 100644
--- a/baseconfig/CONFIG_MFD_MAX77620
+++ b/configs/base-generic/CONFIG_MFD_MAX77620
diff --git a/baseconfig/CONFIG_MFD_MAX77686 b/configs/base-generic/CONFIG_MFD_MAX77686
index 9cf9bc1ee..9cf9bc1ee 100644
--- a/baseconfig/CONFIG_MFD_MAX77686
+++ b/configs/base-generic/CONFIG_MFD_MAX77686
diff --git a/baseconfig/CONFIG_MFD_MAX77693 b/configs/base-generic/CONFIG_MFD_MAX77693
index 35769bd83..35769bd83 100644
--- a/baseconfig/CONFIG_MFD_MAX77693
+++ b/configs/base-generic/CONFIG_MFD_MAX77693
diff --git a/baseconfig/CONFIG_MFD_MAX77843 b/configs/base-generic/CONFIG_MFD_MAX77843
index 487219b46..487219b46 100644
--- a/baseconfig/CONFIG_MFD_MAX77843
+++ b/configs/base-generic/CONFIG_MFD_MAX77843
diff --git a/baseconfig/CONFIG_MFD_MAX8907 b/configs/base-generic/CONFIG_MFD_MAX8907
index 7921e7b73..7921e7b73 100644
--- a/baseconfig/CONFIG_MFD_MAX8907
+++ b/configs/base-generic/CONFIG_MFD_MAX8907
diff --git a/baseconfig/CONFIG_MFD_MAX8925 b/configs/base-generic/CONFIG_MFD_MAX8925
index 302fe8314..302fe8314 100644
--- a/baseconfig/CONFIG_MFD_MAX8925
+++ b/configs/base-generic/CONFIG_MFD_MAX8925
diff --git a/baseconfig/CONFIG_MFD_MAX8997 b/configs/base-generic/CONFIG_MFD_MAX8997
index bb749db32..bb749db32 100644
--- a/baseconfig/CONFIG_MFD_MAX8997
+++ b/configs/base-generic/CONFIG_MFD_MAX8997
diff --git a/baseconfig/CONFIG_MFD_MAX8998 b/configs/base-generic/CONFIG_MFD_MAX8998
index 9478aeba0..9478aeba0 100644
--- a/baseconfig/CONFIG_MFD_MAX8998
+++ b/configs/base-generic/CONFIG_MFD_MAX8998
diff --git a/baseconfig/CONFIG_MFD_MC13XXX_I2C b/configs/base-generic/CONFIG_MFD_MC13XXX_I2C
index cf8c1df5c..cf8c1df5c 100644
--- a/baseconfig/CONFIG_MFD_MC13XXX_I2C
+++ b/configs/base-generic/CONFIG_MFD_MC13XXX_I2C
diff --git a/baseconfig/CONFIG_MFD_MC13XXX_SPI b/configs/base-generic/CONFIG_MFD_MC13XXX_SPI
index a368bc8e6..a368bc8e6 100644
--- a/baseconfig/CONFIG_MFD_MC13XXX_SPI
+++ b/configs/base-generic/CONFIG_MFD_MC13XXX_SPI
diff --git a/baseconfig/CONFIG_MFD_MENF21BMC b/configs/base-generic/CONFIG_MFD_MENF21BMC
index 378b77170..378b77170 100644
--- a/baseconfig/CONFIG_MFD_MENF21BMC
+++ b/configs/base-generic/CONFIG_MFD_MENF21BMC
diff --git a/baseconfig/CONFIG_MFD_MT6397 b/configs/base-generic/CONFIG_MFD_MT6397
index 312fa668f..312fa668f 100644
--- a/baseconfig/CONFIG_MFD_MT6397
+++ b/configs/base-generic/CONFIG_MFD_MT6397
diff --git a/baseconfig/CONFIG_MFD_PALMAS b/configs/base-generic/CONFIG_MFD_PALMAS
index e09bcbf18..e09bcbf18 100644
--- a/baseconfig/CONFIG_MFD_PALMAS
+++ b/configs/base-generic/CONFIG_MFD_PALMAS
diff --git a/baseconfig/CONFIG_MFD_PCF50633 b/configs/base-generic/CONFIG_MFD_PCF50633
index d79315e31..d79315e31 100644
--- a/baseconfig/CONFIG_MFD_PCF50633
+++ b/configs/base-generic/CONFIG_MFD_PCF50633
diff --git a/baseconfig/CONFIG_MFD_RC5T583 b/configs/base-generic/CONFIG_MFD_RC5T583
index f3976be09..f3976be09 100644
--- a/baseconfig/CONFIG_MFD_RC5T583
+++ b/configs/base-generic/CONFIG_MFD_RC5T583
diff --git a/baseconfig/CONFIG_MFD_RDC321X b/configs/base-generic/CONFIG_MFD_RDC321X
index 000bbf18d..000bbf18d 100644
--- a/baseconfig/CONFIG_MFD_RDC321X
+++ b/configs/base-generic/CONFIG_MFD_RDC321X
diff --git a/baseconfig/CONFIG_MFD_RETU b/configs/base-generic/CONFIG_MFD_RETU
index bc6621f33..bc6621f33 100644
--- a/baseconfig/CONFIG_MFD_RETU
+++ b/configs/base-generic/CONFIG_MFD_RETU
diff --git a/baseconfig/CONFIG_MFD_RK808 b/configs/base-generic/CONFIG_MFD_RK808
index ea9d13e39..ea9d13e39 100644
--- a/baseconfig/CONFIG_MFD_RK808
+++ b/configs/base-generic/CONFIG_MFD_RK808
diff --git a/baseconfig/CONFIG_MFD_RN5T618 b/configs/base-generic/CONFIG_MFD_RN5T618
index 752630240..752630240 100644
--- a/baseconfig/CONFIG_MFD_RN5T618
+++ b/configs/base-generic/CONFIG_MFD_RN5T618
diff --git a/baseconfig/CONFIG_MFD_RT5033 b/configs/base-generic/CONFIG_MFD_RT5033
index 6e156c85b..6e156c85b 100644
--- a/baseconfig/CONFIG_MFD_RT5033
+++ b/configs/base-generic/CONFIG_MFD_RT5033
diff --git a/baseconfig/CONFIG_MFD_RTSX_PCI b/configs/base-generic/CONFIG_MFD_RTSX_PCI
index 161c0e2c2..161c0e2c2 100644
--- a/baseconfig/CONFIG_MFD_RTSX_PCI
+++ b/configs/base-generic/CONFIG_MFD_RTSX_PCI
diff --git a/baseconfig/CONFIG_MFD_RTSX_USB b/configs/base-generic/CONFIG_MFD_RTSX_USB
index 1ec59a181..1ec59a181 100644
--- a/baseconfig/CONFIG_MFD_RTSX_USB
+++ b/configs/base-generic/CONFIG_MFD_RTSX_USB
diff --git a/baseconfig/CONFIG_MFD_SEC_CORE b/configs/base-generic/CONFIG_MFD_SEC_CORE
index d6bc4de4d..d6bc4de4d 100644
--- a/baseconfig/CONFIG_MFD_SEC_CORE
+++ b/configs/base-generic/CONFIG_MFD_SEC_CORE
diff --git a/baseconfig/CONFIG_MFD_SI476X_CORE b/configs/base-generic/CONFIG_MFD_SI476X_CORE
index 677f70898..677f70898 100644
--- a/baseconfig/CONFIG_MFD_SI476X_CORE
+++ b/configs/base-generic/CONFIG_MFD_SI476X_CORE
diff --git a/baseconfig/CONFIG_MFD_SKY81452 b/configs/base-generic/CONFIG_MFD_SKY81452
index 37cbb32d4..37cbb32d4 100644
--- a/baseconfig/CONFIG_MFD_SKY81452
+++ b/configs/base-generic/CONFIG_MFD_SKY81452
diff --git a/baseconfig/CONFIG_MFD_SM501 b/configs/base-generic/CONFIG_MFD_SM501
index d056f1aad..d056f1aad 100644
--- a/baseconfig/CONFIG_MFD_SM501
+++ b/configs/base-generic/CONFIG_MFD_SM501
diff --git a/baseconfig/CONFIG_MFD_SM501_GPIO b/configs/base-generic/CONFIG_MFD_SM501_GPIO
index 2fffb094a..2fffb094a 100644
--- a/baseconfig/CONFIG_MFD_SM501_GPIO
+++ b/configs/base-generic/CONFIG_MFD_SM501_GPIO
diff --git a/baseconfig/CONFIG_MFD_SMSC b/configs/base-generic/CONFIG_MFD_SMSC
index 998701017..998701017 100644
--- a/baseconfig/CONFIG_MFD_SMSC
+++ b/configs/base-generic/CONFIG_MFD_SMSC
diff --git a/baseconfig/CONFIG_MFD_STMPE b/configs/base-generic/CONFIG_MFD_STMPE
index a0f173353..a0f173353 100644
--- a/baseconfig/CONFIG_MFD_STMPE
+++ b/configs/base-generic/CONFIG_MFD_STMPE
diff --git a/baseconfig/CONFIG_MFD_SYSCON b/configs/base-generic/CONFIG_MFD_SYSCON
index cab0ef0b7..cab0ef0b7 100644
--- a/baseconfig/CONFIG_MFD_SYSCON
+++ b/configs/base-generic/CONFIG_MFD_SYSCON
diff --git a/baseconfig/CONFIG_MFD_TC3589X b/configs/base-generic/CONFIG_MFD_TC3589X
index a11f656fc..a11f656fc 100644
--- a/baseconfig/CONFIG_MFD_TC3589X
+++ b/configs/base-generic/CONFIG_MFD_TC3589X
diff --git a/baseconfig/CONFIG_MFD_TC6393XB b/configs/base-generic/CONFIG_MFD_TC6393XB
index 8db408879..8db408879 100644
--- a/baseconfig/CONFIG_MFD_TC6393XB
+++ b/configs/base-generic/CONFIG_MFD_TC6393XB
diff --git a/baseconfig/CONFIG_MFD_TIMBERDALE b/configs/base-generic/CONFIG_MFD_TIMBERDALE
index 55939b947..55939b947 100644
--- a/baseconfig/CONFIG_MFD_TIMBERDALE
+++ b/configs/base-generic/CONFIG_MFD_TIMBERDALE
diff --git a/baseconfig/CONFIG_MFD_TI_AM335X_TSCADC b/configs/base-generic/CONFIG_MFD_TI_AM335X_TSCADC
index 12d21f143..12d21f143 100644
--- a/baseconfig/CONFIG_MFD_TI_AM335X_TSCADC
+++ b/configs/base-generic/CONFIG_MFD_TI_AM335X_TSCADC
diff --git a/baseconfig/CONFIG_MFD_TI_LMU b/configs/base-generic/CONFIG_MFD_TI_LMU
index 4a84e3fd0..4a84e3fd0 100644
--- a/baseconfig/CONFIG_MFD_TI_LMU
+++ b/configs/base-generic/CONFIG_MFD_TI_LMU
diff --git a/baseconfig/CONFIG_MFD_TI_LP873X b/configs/base-generic/CONFIG_MFD_TI_LP873X
index 55cab8a6a..55cab8a6a 100644
--- a/baseconfig/CONFIG_MFD_TI_LP873X
+++ b/configs/base-generic/CONFIG_MFD_TI_LP873X
diff --git a/baseconfig/CONFIG_MFD_TI_LP87565 b/configs/base-generic/CONFIG_MFD_TI_LP87565
index 112b4154b..112b4154b 100644
--- a/baseconfig/CONFIG_MFD_TI_LP87565
+++ b/configs/base-generic/CONFIG_MFD_TI_LP87565
diff --git a/baseconfig/CONFIG_MFD_TPS65086 b/configs/base-generic/CONFIG_MFD_TPS65086
index 8257e0076..8257e0076 100644
--- a/baseconfig/CONFIG_MFD_TPS65086
+++ b/configs/base-generic/CONFIG_MFD_TPS65086
diff --git a/baseconfig/CONFIG_MFD_TPS65090 b/configs/base-generic/CONFIG_MFD_TPS65090
index 50e4f86da..50e4f86da 100644
--- a/baseconfig/CONFIG_MFD_TPS65090
+++ b/configs/base-generic/CONFIG_MFD_TPS65090
diff --git a/baseconfig/CONFIG_MFD_TPS65217 b/configs/base-generic/CONFIG_MFD_TPS65217
index 2b2ee453f..2b2ee453f 100644
--- a/baseconfig/CONFIG_MFD_TPS65217
+++ b/configs/base-generic/CONFIG_MFD_TPS65217
diff --git a/baseconfig/CONFIG_MFD_TPS65218 b/configs/base-generic/CONFIG_MFD_TPS65218
index ebc4bf3c0..ebc4bf3c0 100644
--- a/baseconfig/CONFIG_MFD_TPS65218
+++ b/configs/base-generic/CONFIG_MFD_TPS65218
diff --git a/baseconfig/CONFIG_MFD_TPS6586X b/configs/base-generic/CONFIG_MFD_TPS6586X
index 142ccf9dd..142ccf9dd 100644
--- a/baseconfig/CONFIG_MFD_TPS6586X
+++ b/configs/base-generic/CONFIG_MFD_TPS6586X
diff --git a/baseconfig/CONFIG_MFD_TPS65910 b/configs/base-generic/CONFIG_MFD_TPS65910
index d4a3d0091..d4a3d0091 100644
--- a/baseconfig/CONFIG_MFD_TPS65910
+++ b/configs/base-generic/CONFIG_MFD_TPS65910
diff --git a/baseconfig/CONFIG_MFD_TPS65912 b/configs/base-generic/CONFIG_MFD_TPS65912
index 387c18816..387c18816 100644
--- a/baseconfig/CONFIG_MFD_TPS65912
+++ b/configs/base-generic/CONFIG_MFD_TPS65912
diff --git a/baseconfig/CONFIG_MFD_TPS65912_I2C b/configs/base-generic/CONFIG_MFD_TPS65912_I2C
index a5cb98430..a5cb98430 100644
--- a/baseconfig/CONFIG_MFD_TPS65912_I2C
+++ b/configs/base-generic/CONFIG_MFD_TPS65912_I2C
diff --git a/baseconfig/CONFIG_MFD_TPS65912_SPI b/configs/base-generic/CONFIG_MFD_TPS65912_SPI
index 99856458b..99856458b 100644
--- a/baseconfig/CONFIG_MFD_TPS65912_SPI
+++ b/configs/base-generic/CONFIG_MFD_TPS65912_SPI
diff --git a/baseconfig/CONFIG_MFD_TPS68470 b/configs/base-generic/CONFIG_MFD_TPS68470
index 10fd40465..10fd40465 100644
--- a/baseconfig/CONFIG_MFD_TPS68470
+++ b/configs/base-generic/CONFIG_MFD_TPS68470
diff --git a/baseconfig/CONFIG_MFD_TPS80031 b/configs/base-generic/CONFIG_MFD_TPS80031
index be3acd867..be3acd867 100644
--- a/baseconfig/CONFIG_MFD_TPS80031
+++ b/configs/base-generic/CONFIG_MFD_TPS80031
diff --git a/baseconfig/CONFIG_MFD_VIPERBOARD b/configs/base-generic/CONFIG_MFD_VIPERBOARD
index 1b26e164d..1b26e164d 100644
--- a/baseconfig/CONFIG_MFD_VIPERBOARD
+++ b/configs/base-generic/CONFIG_MFD_VIPERBOARD
diff --git a/baseconfig/CONFIG_MFD_VX855 b/configs/base-generic/CONFIG_MFD_VX855
index 560a3284f..560a3284f 100644
--- a/baseconfig/CONFIG_MFD_VX855
+++ b/configs/base-generic/CONFIG_MFD_VX855
diff --git a/baseconfig/CONFIG_MFD_WL1273_CORE b/configs/base-generic/CONFIG_MFD_WL1273_CORE
index ed64c199e..ed64c199e 100644
--- a/baseconfig/CONFIG_MFD_WL1273_CORE
+++ b/configs/base-generic/CONFIG_MFD_WL1273_CORE
diff --git a/baseconfig/CONFIG_MFD_WM831X b/configs/base-generic/CONFIG_MFD_WM831X
index 9a13300f7..9a13300f7 100644
--- a/baseconfig/CONFIG_MFD_WM831X
+++ b/configs/base-generic/CONFIG_MFD_WM831X
diff --git a/baseconfig/CONFIG_MFD_WM831X_I2C b/configs/base-generic/CONFIG_MFD_WM831X_I2C
index 5134deeb3..5134deeb3 100644
--- a/baseconfig/CONFIG_MFD_WM831X_I2C
+++ b/configs/base-generic/CONFIG_MFD_WM831X_I2C
diff --git a/baseconfig/CONFIG_MFD_WM831X_SPI b/configs/base-generic/CONFIG_MFD_WM831X_SPI
index 443939c2d..443939c2d 100644
--- a/baseconfig/CONFIG_MFD_WM831X_SPI
+++ b/configs/base-generic/CONFIG_MFD_WM831X_SPI
diff --git a/baseconfig/CONFIG_MFD_WM8350 b/configs/base-generic/CONFIG_MFD_WM8350
index 696e918c7..696e918c7 100644
--- a/baseconfig/CONFIG_MFD_WM8350
+++ b/configs/base-generic/CONFIG_MFD_WM8350
diff --git a/baseconfig/CONFIG_MFD_WM8350_I2C b/configs/base-generic/CONFIG_MFD_WM8350_I2C
index 9da9a94d8..9da9a94d8 100644
--- a/baseconfig/CONFIG_MFD_WM8350_I2C
+++ b/configs/base-generic/CONFIG_MFD_WM8350_I2C
diff --git a/baseconfig/CONFIG_MFD_WM8400 b/configs/base-generic/CONFIG_MFD_WM8400
index 555799f97..555799f97 100644
--- a/baseconfig/CONFIG_MFD_WM8400
+++ b/configs/base-generic/CONFIG_MFD_WM8400
diff --git a/baseconfig/CONFIG_MFD_WM8994 b/configs/base-generic/CONFIG_MFD_WM8994
index 678e15d01..678e15d01 100644
--- a/baseconfig/CONFIG_MFD_WM8994
+++ b/configs/base-generic/CONFIG_MFD_WM8994
diff --git a/baseconfig/CONFIG_MICREL_KS8995MA b/configs/base-generic/CONFIG_MICREL_KS8995MA
index 70b358914..70b358914 100644
--- a/baseconfig/CONFIG_MICREL_KS8995MA
+++ b/configs/base-generic/CONFIG_MICREL_KS8995MA
diff --git a/baseconfig/CONFIG_MICREL_PHY b/configs/base-generic/CONFIG_MICREL_PHY
index f82ae9184..f82ae9184 100644
--- a/baseconfig/CONFIG_MICREL_PHY
+++ b/configs/base-generic/CONFIG_MICREL_PHY
diff --git a/baseconfig/CONFIG_MICROCHIP_KSZ b/configs/base-generic/CONFIG_MICROCHIP_KSZ
index 83147cf6f..83147cf6f 100644
--- a/baseconfig/CONFIG_MICROCHIP_KSZ
+++ b/configs/base-generic/CONFIG_MICROCHIP_KSZ
diff --git a/baseconfig/CONFIG_MICROCHIP_KSZ_SPI_DRIVER b/configs/base-generic/CONFIG_MICROCHIP_KSZ_SPI_DRIVER
index f5a713178..f5a713178 100644
--- a/baseconfig/CONFIG_MICROCHIP_KSZ_SPI_DRIVER
+++ b/configs/base-generic/CONFIG_MICROCHIP_KSZ_SPI_DRIVER
diff --git a/baseconfig/CONFIG_MICROCHIP_PHY b/configs/base-generic/CONFIG_MICROCHIP_PHY
index 6b800d4d4..6b800d4d4 100644
--- a/baseconfig/CONFIG_MICROCHIP_PHY
+++ b/configs/base-generic/CONFIG_MICROCHIP_PHY
diff --git a/baseconfig/CONFIG_MICROSEMI_PHY b/configs/base-generic/CONFIG_MICROSEMI_PHY
index 0e171f614..0e171f614 100644
--- a/baseconfig/CONFIG_MICROSEMI_PHY
+++ b/configs/base-generic/CONFIG_MICROSEMI_PHY
diff --git a/baseconfig/CONFIG_MIGRATION b/configs/base-generic/CONFIG_MIGRATION
index 83a9d97c4..83a9d97c4 100644
--- a/baseconfig/CONFIG_MIGRATION
+++ b/configs/base-generic/CONFIG_MIGRATION
diff --git a/baseconfig/CONFIG_MII b/configs/base-generic/CONFIG_MII
index b7d4f657c..b7d4f657c 100644
--- a/baseconfig/CONFIG_MII
+++ b/configs/base-generic/CONFIG_MII
diff --git a/baseconfig/CONFIG_MINIX_FS b/configs/base-generic/CONFIG_MINIX_FS
index d60f0566e..d60f0566e 100644
--- a/baseconfig/CONFIG_MINIX_FS
+++ b/configs/base-generic/CONFIG_MINIX_FS
diff --git a/baseconfig/CONFIG_MINIX_SUBPARTITION b/configs/base-generic/CONFIG_MINIX_SUBPARTITION
index 65cb50d6b..65cb50d6b 100644
--- a/baseconfig/CONFIG_MINIX_SUBPARTITION
+++ b/configs/base-generic/CONFIG_MINIX_SUBPARTITION
diff --git a/baseconfig/CONFIG_MISC_FILESYSTEMS b/configs/base-generic/CONFIG_MISC_FILESYSTEMS
index a82849e39..a82849e39 100644
--- a/baseconfig/CONFIG_MISC_FILESYSTEMS
+++ b/configs/base-generic/CONFIG_MISC_FILESYSTEMS
diff --git a/baseconfig/CONFIG_MISDN b/configs/base-generic/CONFIG_MISDN
index b1a677594..b1a677594 100644
--- a/baseconfig/CONFIG_MISDN
+++ b/configs/base-generic/CONFIG_MISDN
diff --git a/baseconfig/CONFIG_MISDN_AVMFRITZ b/configs/base-generic/CONFIG_MISDN_AVMFRITZ
index c461708cd..c461708cd 100644
--- a/baseconfig/CONFIG_MISDN_AVMFRITZ
+++ b/configs/base-generic/CONFIG_MISDN_AVMFRITZ
diff --git a/baseconfig/CONFIG_MISDN_DSP b/configs/base-generic/CONFIG_MISDN_DSP
index 897e3c7ea..897e3c7ea 100644
--- a/baseconfig/CONFIG_MISDN_DSP
+++ b/configs/base-generic/CONFIG_MISDN_DSP
diff --git a/baseconfig/CONFIG_MISDN_HFCMULTI b/configs/base-generic/CONFIG_MISDN_HFCMULTI
index 61c2917c9..61c2917c9 100644
--- a/baseconfig/CONFIG_MISDN_HFCMULTI
+++ b/configs/base-generic/CONFIG_MISDN_HFCMULTI
diff --git a/baseconfig/CONFIG_MISDN_HFCPCI b/configs/base-generic/CONFIG_MISDN_HFCPCI
index f9d759bf6..f9d759bf6 100644
--- a/baseconfig/CONFIG_MISDN_HFCPCI
+++ b/configs/base-generic/CONFIG_MISDN_HFCPCI
diff --git a/baseconfig/CONFIG_MISDN_HFCUSB b/configs/base-generic/CONFIG_MISDN_HFCUSB
index 5bf22217b..5bf22217b 100644
--- a/baseconfig/CONFIG_MISDN_HFCUSB
+++ b/configs/base-generic/CONFIG_MISDN_HFCUSB
diff --git a/baseconfig/CONFIG_MISDN_INFINEON b/configs/base-generic/CONFIG_MISDN_INFINEON
index ccb4360c4..ccb4360c4 100644
--- a/baseconfig/CONFIG_MISDN_INFINEON
+++ b/configs/base-generic/CONFIG_MISDN_INFINEON
diff --git a/baseconfig/CONFIG_MISDN_L1OIP b/configs/base-generic/CONFIG_MISDN_L1OIP
index 3cde6368d..3cde6368d 100644
--- a/baseconfig/CONFIG_MISDN_L1OIP
+++ b/configs/base-generic/CONFIG_MISDN_L1OIP
diff --git a/baseconfig/CONFIG_MISDN_NETJET b/configs/base-generic/CONFIG_MISDN_NETJET
index 379062a8b..379062a8b 100644
--- a/baseconfig/CONFIG_MISDN_NETJET
+++ b/configs/base-generic/CONFIG_MISDN_NETJET
diff --git a/baseconfig/CONFIG_MISDN_SPEEDFAX b/configs/base-generic/CONFIG_MISDN_SPEEDFAX
index bd52af29d..bd52af29d 100644
--- a/baseconfig/CONFIG_MISDN_SPEEDFAX
+++ b/configs/base-generic/CONFIG_MISDN_SPEEDFAX
diff --git a/baseconfig/CONFIG_MISDN_W6692 b/configs/base-generic/CONFIG_MISDN_W6692
index 9b0b1d892..9b0b1d892 100644
--- a/baseconfig/CONFIG_MISDN_W6692
+++ b/configs/base-generic/CONFIG_MISDN_W6692
diff --git a/baseconfig/CONFIG_MKISS b/configs/base-generic/CONFIG_MKISS
index 2f687b370..2f687b370 100644
--- a/baseconfig/CONFIG_MKISS
+++ b/configs/base-generic/CONFIG_MKISS
diff --git a/baseconfig/CONFIG_MLX4_CORE b/configs/base-generic/CONFIG_MLX4_CORE
index 1b4c55bdd..1b4c55bdd 100644
--- a/baseconfig/CONFIG_MLX4_CORE
+++ b/configs/base-generic/CONFIG_MLX4_CORE
diff --git a/baseconfig/CONFIG_MLX4_EN b/configs/base-generic/CONFIG_MLX4_EN
index 0a147ed38..0a147ed38 100644
--- a/baseconfig/CONFIG_MLX4_EN
+++ b/configs/base-generic/CONFIG_MLX4_EN
diff --git a/baseconfig/CONFIG_MLX4_EN_DCB b/configs/base-generic/CONFIG_MLX4_EN_DCB
index 33382c1ac..33382c1ac 100644
--- a/baseconfig/CONFIG_MLX4_EN_DCB
+++ b/configs/base-generic/CONFIG_MLX4_EN_DCB
diff --git a/baseconfig/CONFIG_MLX4_INFINIBAND b/configs/base-generic/CONFIG_MLX4_INFINIBAND
index 4f7e86412..4f7e86412 100644
--- a/baseconfig/CONFIG_MLX4_INFINIBAND
+++ b/configs/base-generic/CONFIG_MLX4_INFINIBAND
diff --git a/baseconfig/CONFIG_MLX5_CORE b/configs/base-generic/CONFIG_MLX5_CORE
index f81faa5f3..f81faa5f3 100644
--- a/baseconfig/CONFIG_MLX5_CORE
+++ b/configs/base-generic/CONFIG_MLX5_CORE
diff --git a/baseconfig/CONFIG_MLX5_CORE_EN b/configs/base-generic/CONFIG_MLX5_CORE_EN
index e55da7520..e55da7520 100644
--- a/baseconfig/CONFIG_MLX5_CORE_EN
+++ b/configs/base-generic/CONFIG_MLX5_CORE_EN
diff --git a/baseconfig/CONFIG_MLX5_CORE_EN_DCB b/configs/base-generic/CONFIG_MLX5_CORE_EN_DCB
index 6607070b8..6607070b8 100644
--- a/baseconfig/CONFIG_MLX5_CORE_EN_DCB
+++ b/configs/base-generic/CONFIG_MLX5_CORE_EN_DCB
diff --git a/baseconfig/CONFIG_MLX5_CORE_IPOIB b/configs/base-generic/CONFIG_MLX5_CORE_IPOIB
index d78d82d65..d78d82d65 100644
--- a/baseconfig/CONFIG_MLX5_CORE_IPOIB
+++ b/configs/base-generic/CONFIG_MLX5_CORE_IPOIB
diff --git a/baseconfig/CONFIG_MLX5_EN_IPSEC b/configs/base-generic/CONFIG_MLX5_EN_IPSEC
index ba2658e5a..ba2658e5a 100644
--- a/baseconfig/CONFIG_MLX5_EN_IPSEC
+++ b/configs/base-generic/CONFIG_MLX5_EN_IPSEC
diff --git a/baseconfig/CONFIG_MLX5_ESWITCH b/configs/base-generic/CONFIG_MLX5_ESWITCH
index 8a69e0671..8a69e0671 100644
--- a/baseconfig/CONFIG_MLX5_ESWITCH
+++ b/configs/base-generic/CONFIG_MLX5_ESWITCH
diff --git a/baseconfig/CONFIG_MLX5_FPGA b/configs/base-generic/CONFIG_MLX5_FPGA
index 544f7b4f6..544f7b4f6 100644
--- a/baseconfig/CONFIG_MLX5_FPGA
+++ b/configs/base-generic/CONFIG_MLX5_FPGA
diff --git a/baseconfig/CONFIG_MLX5_INFINIBAND b/configs/base-generic/CONFIG_MLX5_INFINIBAND
index a81a552d1..a81a552d1 100644
--- a/baseconfig/CONFIG_MLX5_INFINIBAND
+++ b/configs/base-generic/CONFIG_MLX5_INFINIBAND
diff --git a/baseconfig/CONFIG_MLX5_MPFS b/configs/base-generic/CONFIG_MLX5_MPFS
index 6799ed484..6799ed484 100644
--- a/baseconfig/CONFIG_MLX5_MPFS
+++ b/configs/base-generic/CONFIG_MLX5_MPFS
diff --git a/baseconfig/CONFIG_MLX90614 b/configs/base-generic/CONFIG_MLX90614
index 886455c5d..886455c5d 100644
--- a/baseconfig/CONFIG_MLX90614
+++ b/configs/base-generic/CONFIG_MLX90614
diff --git a/baseconfig/CONFIG_MLXFW b/configs/base-generic/CONFIG_MLXFW
index 5b4751806..5b4751806 100644
--- a/baseconfig/CONFIG_MLXFW
+++ b/configs/base-generic/CONFIG_MLXFW
diff --git a/baseconfig/CONFIG_MLXSW_CORE b/configs/base-generic/CONFIG_MLXSW_CORE
index 2a06bb59c..2a06bb59c 100644
--- a/baseconfig/CONFIG_MLXSW_CORE
+++ b/configs/base-generic/CONFIG_MLXSW_CORE
diff --git a/baseconfig/CONFIG_MLXSW_CORE_HWMON b/configs/base-generic/CONFIG_MLXSW_CORE_HWMON
index a0a37fc52..a0a37fc52 100644
--- a/baseconfig/CONFIG_MLXSW_CORE_HWMON
+++ b/configs/base-generic/CONFIG_MLXSW_CORE_HWMON
diff --git a/baseconfig/CONFIG_MLXSW_CORE_THERMAL b/configs/base-generic/CONFIG_MLXSW_CORE_THERMAL
index b3b3b2fc5..b3b3b2fc5 100644
--- a/baseconfig/CONFIG_MLXSW_CORE_THERMAL
+++ b/configs/base-generic/CONFIG_MLXSW_CORE_THERMAL
diff --git a/baseconfig/CONFIG_MLXSW_I2C b/configs/base-generic/CONFIG_MLXSW_I2C
index 57927c23e..57927c23e 100644
--- a/baseconfig/CONFIG_MLXSW_I2C
+++ b/configs/base-generic/CONFIG_MLXSW_I2C
diff --git a/baseconfig/CONFIG_MLXSW_MINIMAL b/configs/base-generic/CONFIG_MLXSW_MINIMAL
index 5cc296afc..5cc296afc 100644
--- a/baseconfig/CONFIG_MLXSW_MINIMAL
+++ b/configs/base-generic/CONFIG_MLXSW_MINIMAL
diff --git a/baseconfig/CONFIG_MLXSW_PCI b/configs/base-generic/CONFIG_MLXSW_PCI
index f1cbb9173..f1cbb9173 100644
--- a/baseconfig/CONFIG_MLXSW_PCI
+++ b/configs/base-generic/CONFIG_MLXSW_PCI
diff --git a/baseconfig/CONFIG_MLXSW_SPECTRUM b/configs/base-generic/CONFIG_MLXSW_SPECTRUM
index 0bdac0c19..0bdac0c19 100644
--- a/baseconfig/CONFIG_MLXSW_SPECTRUM
+++ b/configs/base-generic/CONFIG_MLXSW_SPECTRUM
diff --git a/baseconfig/CONFIG_MLXSW_SPECTRUM_DCB b/configs/base-generic/CONFIG_MLXSW_SPECTRUM_DCB
index 3c8c38d0b..3c8c38d0b 100644
--- a/baseconfig/CONFIG_MLXSW_SPECTRUM_DCB
+++ b/configs/base-generic/CONFIG_MLXSW_SPECTRUM_DCB
diff --git a/baseconfig/CONFIG_MLXSW_SWITCHIB b/configs/base-generic/CONFIG_MLXSW_SWITCHIB
index 9c8ea29a9..9c8ea29a9 100644
--- a/baseconfig/CONFIG_MLXSW_SWITCHIB
+++ b/configs/base-generic/CONFIG_MLXSW_SWITCHIB
diff --git a/baseconfig/CONFIG_MLXSW_SWITCHX2 b/configs/base-generic/CONFIG_MLXSW_SWITCHX2
index 7fc8b0104..7fc8b0104 100644
--- a/baseconfig/CONFIG_MLXSW_SWITCHX2
+++ b/configs/base-generic/CONFIG_MLXSW_SWITCHX2
diff --git a/baseconfig/CONFIG_MLX_CPLD_PLATFORM b/configs/base-generic/CONFIG_MLX_CPLD_PLATFORM
index ddc850e51..ddc850e51 100644
--- a/baseconfig/CONFIG_MLX_CPLD_PLATFORM
+++ b/configs/base-generic/CONFIG_MLX_CPLD_PLATFORM
diff --git a/baseconfig/CONFIG_MMA7455_I2C b/configs/base-generic/CONFIG_MMA7455_I2C
index ba1a64705..ba1a64705 100644
--- a/baseconfig/CONFIG_MMA7455_I2C
+++ b/configs/base-generic/CONFIG_MMA7455_I2C
diff --git a/baseconfig/CONFIG_MMA7455_SPI b/configs/base-generic/CONFIG_MMA7455_SPI
index 5cb36e546..5cb36e546 100644
--- a/baseconfig/CONFIG_MMA7455_SPI
+++ b/configs/base-generic/CONFIG_MMA7455_SPI
diff --git a/baseconfig/CONFIG_MMA7660 b/configs/base-generic/CONFIG_MMA7660
index 256131229..256131229 100644
--- a/baseconfig/CONFIG_MMA7660
+++ b/configs/base-generic/CONFIG_MMA7660
diff --git a/baseconfig/CONFIG_MMA8452 b/configs/base-generic/CONFIG_MMA8452
index ef5caa02a..ef5caa02a 100644
--- a/baseconfig/CONFIG_MMA8452
+++ b/configs/base-generic/CONFIG_MMA8452
diff --git a/baseconfig/CONFIG_MMA9551 b/configs/base-generic/CONFIG_MMA9551
index 116e8e246..116e8e246 100644
--- a/baseconfig/CONFIG_MMA9551
+++ b/configs/base-generic/CONFIG_MMA9551
diff --git a/baseconfig/CONFIG_MMA9553 b/configs/base-generic/CONFIG_MMA9553
index a1a7373f2..a1a7373f2 100644
--- a/baseconfig/CONFIG_MMA9553
+++ b/configs/base-generic/CONFIG_MMA9553
diff --git a/baseconfig/CONFIG_MMC b/configs/base-generic/CONFIG_MMC
index af952ae65..af952ae65 100644
--- a/baseconfig/CONFIG_MMC
+++ b/configs/base-generic/CONFIG_MMC
diff --git a/baseconfig/CONFIG_MMC35240 b/configs/base-generic/CONFIG_MMC35240
index 9e1cf1c4b..9e1cf1c4b 100644
--- a/baseconfig/CONFIG_MMC35240
+++ b/configs/base-generic/CONFIG_MMC35240
diff --git a/baseconfig/CONFIG_MMC_BLOCK b/configs/base-generic/CONFIG_MMC_BLOCK
index c89e86066..c89e86066 100644
--- a/baseconfig/CONFIG_MMC_BLOCK
+++ b/configs/base-generic/CONFIG_MMC_BLOCK
diff --git a/baseconfig/CONFIG_MMC_BLOCK_MINORS b/configs/base-generic/CONFIG_MMC_BLOCK_MINORS
index 9aad9741a..9aad9741a 100644
--- a/baseconfig/CONFIG_MMC_BLOCK_MINORS
+++ b/configs/base-generic/CONFIG_MMC_BLOCK_MINORS
diff --git a/baseconfig/CONFIG_MMC_CB710 b/configs/base-generic/CONFIG_MMC_CB710
index b315628e4..b315628e4 100644
--- a/baseconfig/CONFIG_MMC_CB710
+++ b/configs/base-generic/CONFIG_MMC_CB710
diff --git a/baseconfig/CONFIG_MMC_DEBUG b/configs/base-generic/CONFIG_MMC_DEBUG
index 678bd75ed..678bd75ed 100644
--- a/baseconfig/CONFIG_MMC_DEBUG
+++ b/configs/base-generic/CONFIG_MMC_DEBUG
diff --git a/baseconfig/CONFIG_MMC_MTK b/configs/base-generic/CONFIG_MMC_MTK
index d92a9072c..d92a9072c 100644
--- a/baseconfig/CONFIG_MMC_MTK
+++ b/configs/base-generic/CONFIG_MMC_MTK
diff --git a/baseconfig/CONFIG_MMC_REALTEK_PCI b/configs/base-generic/CONFIG_MMC_REALTEK_PCI
index 90687a235..90687a235 100644
--- a/baseconfig/CONFIG_MMC_REALTEK_PCI
+++ b/configs/base-generic/CONFIG_MMC_REALTEK_PCI
diff --git a/baseconfig/CONFIG_MMC_REALTEK_USB b/configs/base-generic/CONFIG_MMC_REALTEK_USB
index 7268a312e..7268a312e 100644
--- a/baseconfig/CONFIG_MMC_REALTEK_USB
+++ b/configs/base-generic/CONFIG_MMC_REALTEK_USB
diff --git a/baseconfig/CONFIG_MMC_RICOH_MMC b/configs/base-generic/CONFIG_MMC_RICOH_MMC
index 1899ff9a0..1899ff9a0 100644
--- a/baseconfig/CONFIG_MMC_RICOH_MMC
+++ b/configs/base-generic/CONFIG_MMC_RICOH_MMC
diff --git a/baseconfig/CONFIG_MMC_SDHCI b/configs/base-generic/CONFIG_MMC_SDHCI
index dd2edd0c6..dd2edd0c6 100644
--- a/baseconfig/CONFIG_MMC_SDHCI
+++ b/configs/base-generic/CONFIG_MMC_SDHCI
diff --git a/baseconfig/CONFIG_MMC_SDHCI_ACPI b/configs/base-generic/CONFIG_MMC_SDHCI_ACPI
index 065143892..065143892 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_ACPI
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_ACPI
diff --git a/baseconfig/CONFIG_MMC_SDHCI_CADENCE b/configs/base-generic/CONFIG_MMC_SDHCI_CADENCE
index a73c6b8f9..a73c6b8f9 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_CADENCE
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_CADENCE
diff --git a/baseconfig/CONFIG_MMC_SDHCI_F_SDH30 b/configs/base-generic/CONFIG_MMC_SDHCI_F_SDH30
index 00c6ab2f5..00c6ab2f5 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_F_SDH30
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_F_SDH30
diff --git a/baseconfig/CONFIG_MMC_SDHCI_OF_ARASAN b/configs/base-generic/CONFIG_MMC_SDHCI_OF_ARASAN
index c8021b008..c8021b008 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_OF_ARASAN
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_OF_ARASAN
diff --git a/baseconfig/CONFIG_MMC_SDHCI_OF_AT91 b/configs/base-generic/CONFIG_MMC_SDHCI_OF_AT91
index 933195ce7..933195ce7 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_OF_AT91
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_OF_AT91
diff --git a/baseconfig/CONFIG_MMC_SDHCI_OF_ESDHC b/configs/base-generic/CONFIG_MMC_SDHCI_OF_ESDHC
index a57da56dc..a57da56dc 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_OF_ESDHC
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_OF_ESDHC
diff --git a/baseconfig/CONFIG_MMC_SDHCI_PCI b/configs/base-generic/CONFIG_MMC_SDHCI_PCI
index 8800540d3..8800540d3 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_PCI
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_PCI
diff --git a/baseconfig/CONFIG_MMC_SDHCI_PLTFM b/configs/base-generic/CONFIG_MMC_SDHCI_PLTFM
index 59c122bf5..59c122bf5 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_PLTFM
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_PLTFM
diff --git a/baseconfig/CONFIG_MMC_SDHCI_XENON b/configs/base-generic/CONFIG_MMC_SDHCI_XENON
index 7ced7b045..7ced7b045 100644
--- a/baseconfig/CONFIG_MMC_SDHCI_XENON
+++ b/configs/base-generic/CONFIG_MMC_SDHCI_XENON
diff --git a/baseconfig/CONFIG_MMC_SDRICOH_CS b/configs/base-generic/CONFIG_MMC_SDRICOH_CS
index 2899b80b2..2899b80b2 100644
--- a/baseconfig/CONFIG_MMC_SDRICOH_CS
+++ b/configs/base-generic/CONFIG_MMC_SDRICOH_CS
diff --git a/baseconfig/CONFIG_MMC_SPI b/configs/base-generic/CONFIG_MMC_SPI
index 30837d93e..30837d93e 100644
--- a/baseconfig/CONFIG_MMC_SPI
+++ b/configs/base-generic/CONFIG_MMC_SPI
diff --git a/baseconfig/CONFIG_MMC_TEST b/configs/base-generic/CONFIG_MMC_TEST
index 6032d28f9..6032d28f9 100644
--- a/baseconfig/CONFIG_MMC_TEST
+++ b/configs/base-generic/CONFIG_MMC_TEST
diff --git a/baseconfig/CONFIG_MMC_TIFM_SD b/configs/base-generic/CONFIG_MMC_TIFM_SD
index 6e0f4ae1e..6e0f4ae1e 100644
--- a/baseconfig/CONFIG_MMC_TIFM_SD
+++ b/configs/base-generic/CONFIG_MMC_TIFM_SD
diff --git a/baseconfig/CONFIG_MMC_TOSHIBA_PCI b/configs/base-generic/CONFIG_MMC_TOSHIBA_PCI
index 2ae27a7ef..2ae27a7ef 100644
--- a/baseconfig/CONFIG_MMC_TOSHIBA_PCI
+++ b/configs/base-generic/CONFIG_MMC_TOSHIBA_PCI
diff --git a/baseconfig/CONFIG_MMC_USDHI6ROL0 b/configs/base-generic/CONFIG_MMC_USDHI6ROL0
index 94d6a4139..94d6a4139 100644
--- a/baseconfig/CONFIG_MMC_USDHI6ROL0
+++ b/configs/base-generic/CONFIG_MMC_USDHI6ROL0
diff --git a/baseconfig/CONFIG_MMC_USHC b/configs/base-generic/CONFIG_MMC_USHC
index 1baab6557..1baab6557 100644
--- a/baseconfig/CONFIG_MMC_USHC
+++ b/configs/base-generic/CONFIG_MMC_USHC
diff --git a/baseconfig/CONFIG_MMC_VIA_SDMMC b/configs/base-generic/CONFIG_MMC_VIA_SDMMC
index 88b7c20e7..88b7c20e7 100644
--- a/baseconfig/CONFIG_MMC_VIA_SDMMC
+++ b/configs/base-generic/CONFIG_MMC_VIA_SDMMC
diff --git a/baseconfig/CONFIG_MMC_VUB300 b/configs/base-generic/CONFIG_MMC_VUB300
index 72839ca5f..72839ca5f 100644
--- a/baseconfig/CONFIG_MMC_VUB300
+++ b/configs/base-generic/CONFIG_MMC_VUB300
diff --git a/baseconfig/CONFIG_MMC_WBSD b/configs/base-generic/CONFIG_MMC_WBSD
index 53d253f3b..53d253f3b 100644
--- a/baseconfig/CONFIG_MMC_WBSD
+++ b/configs/base-generic/CONFIG_MMC_WBSD
diff --git a/baseconfig/CONFIG_MMU b/configs/base-generic/CONFIG_MMU
index 3dec29630..3dec29630 100644
--- a/baseconfig/CONFIG_MMU
+++ b/configs/base-generic/CONFIG_MMU
diff --git a/baseconfig/CONFIG_MODULES b/configs/base-generic/CONFIG_MODULES
index a83bb6e6b..a83bb6e6b 100644
--- a/baseconfig/CONFIG_MODULES
+++ b/configs/base-generic/CONFIG_MODULES
diff --git a/baseconfig/CONFIG_MODULE_COMPRESS b/configs/base-generic/CONFIG_MODULE_COMPRESS
index 26d29a083..26d29a083 100644
--- a/baseconfig/CONFIG_MODULE_COMPRESS
+++ b/configs/base-generic/CONFIG_MODULE_COMPRESS
diff --git a/baseconfig/CONFIG_MODULE_FORCE_LOAD b/configs/base-generic/CONFIG_MODULE_FORCE_LOAD
index 3180add4f..3180add4f 100644
--- a/baseconfig/CONFIG_MODULE_FORCE_LOAD
+++ b/configs/base-generic/CONFIG_MODULE_FORCE_LOAD
diff --git a/baseconfig/CONFIG_MODULE_FORCE_UNLOAD b/configs/base-generic/CONFIG_MODULE_FORCE_UNLOAD
index 757f81d34..757f81d34 100644
--- a/baseconfig/CONFIG_MODULE_FORCE_UNLOAD
+++ b/configs/base-generic/CONFIG_MODULE_FORCE_UNLOAD
diff --git a/baseconfig/CONFIG_MODULE_SIG b/configs/base-generic/CONFIG_MODULE_SIG
index 53288b393..53288b393 100644
--- a/baseconfig/CONFIG_MODULE_SIG
+++ b/configs/base-generic/CONFIG_MODULE_SIG
diff --git a/baseconfig/CONFIG_MODULE_SIG_ALL b/configs/base-generic/CONFIG_MODULE_SIG_ALL
index 903de5c08..903de5c08 100644
--- a/baseconfig/CONFIG_MODULE_SIG_ALL
+++ b/configs/base-generic/CONFIG_MODULE_SIG_ALL
diff --git a/baseconfig/CONFIG_MODULE_SIG_FORCE b/configs/base-generic/CONFIG_MODULE_SIG_FORCE
index 80b1d0c4b..80b1d0c4b 100644
--- a/baseconfig/CONFIG_MODULE_SIG_FORCE
+++ b/configs/base-generic/CONFIG_MODULE_SIG_FORCE
diff --git a/baseconfig/CONFIG_MODULE_SIG_KEY b/configs/base-generic/CONFIG_MODULE_SIG_KEY
index 80339e342..80339e342 100644
--- a/baseconfig/CONFIG_MODULE_SIG_KEY
+++ b/configs/base-generic/CONFIG_MODULE_SIG_KEY
diff --git a/baseconfig/CONFIG_MODULE_SIG_SHA1 b/configs/base-generic/CONFIG_MODULE_SIG_SHA1
index d96584a87..d96584a87 100644
--- a/baseconfig/CONFIG_MODULE_SIG_SHA1
+++ b/configs/base-generic/CONFIG_MODULE_SIG_SHA1
diff --git a/baseconfig/CONFIG_MODULE_SIG_SHA256 b/configs/base-generic/CONFIG_MODULE_SIG_SHA256
index b350aa05a..b350aa05a 100644
--- a/baseconfig/CONFIG_MODULE_SIG_SHA256
+++ b/configs/base-generic/CONFIG_MODULE_SIG_SHA256
diff --git a/baseconfig/CONFIG_MODULE_SRCVERSION_ALL b/configs/base-generic/CONFIG_MODULE_SRCVERSION_ALL
index d1249bfec..d1249bfec 100644
--- a/baseconfig/CONFIG_MODULE_SRCVERSION_ALL
+++ b/configs/base-generic/CONFIG_MODULE_SRCVERSION_ALL
diff --git a/baseconfig/CONFIG_MODULE_UNLOAD b/configs/base-generic/CONFIG_MODULE_UNLOAD
index 4e6976174..4e6976174 100644
--- a/baseconfig/CONFIG_MODULE_UNLOAD
+++ b/configs/base-generic/CONFIG_MODULE_UNLOAD
diff --git a/baseconfig/CONFIG_MODVERSIONS b/configs/base-generic/CONFIG_MODVERSIONS
index d2a0d432b..d2a0d432b 100644
--- a/baseconfig/CONFIG_MODVERSIONS
+++ b/configs/base-generic/CONFIG_MODVERSIONS
diff --git a/baseconfig/CONFIG_MOST b/configs/base-generic/CONFIG_MOST
index db207dfc5..db207dfc5 100644
--- a/baseconfig/CONFIG_MOST
+++ b/configs/base-generic/CONFIG_MOST
diff --git a/baseconfig/CONFIG_MOUSE_APPLETOUCH b/configs/base-generic/CONFIG_MOUSE_APPLETOUCH
index 2aa5a2df7..2aa5a2df7 100644
--- a/baseconfig/CONFIG_MOUSE_APPLETOUCH
+++ b/configs/base-generic/CONFIG_MOUSE_APPLETOUCH
diff --git a/baseconfig/CONFIG_MOUSE_ATIXL b/configs/base-generic/CONFIG_MOUSE_ATIXL
index 3ae23c7e4..3ae23c7e4 100644
--- a/baseconfig/CONFIG_MOUSE_ATIXL
+++ b/configs/base-generic/CONFIG_MOUSE_ATIXL
diff --git a/baseconfig/CONFIG_MOUSE_BCM5974 b/configs/base-generic/CONFIG_MOUSE_BCM5974
index 797189442..797189442 100644
--- a/baseconfig/CONFIG_MOUSE_BCM5974
+++ b/configs/base-generic/CONFIG_MOUSE_BCM5974
diff --git a/baseconfig/CONFIG_MOUSE_CYAPA b/configs/base-generic/CONFIG_MOUSE_CYAPA
index b0a9d8581..b0a9d8581 100644
--- a/baseconfig/CONFIG_MOUSE_CYAPA
+++ b/configs/base-generic/CONFIG_MOUSE_CYAPA
diff --git a/baseconfig/CONFIG_MOUSE_ELAN_I2C b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C
index cab50daec..cab50daec 100644
--- a/baseconfig/CONFIG_MOUSE_ELAN_I2C
+++ b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C
diff --git a/baseconfig/CONFIG_MOUSE_ELAN_I2C_I2C b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C_I2C
index 3bfdd5743..3bfdd5743 100644
--- a/baseconfig/CONFIG_MOUSE_ELAN_I2C_I2C
+++ b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C_I2C
diff --git a/baseconfig/CONFIG_MOUSE_ELAN_I2C_SMBUS b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C_SMBUS
index 14ce73f75..14ce73f75 100644
--- a/baseconfig/CONFIG_MOUSE_ELAN_I2C_SMBUS
+++ b/configs/base-generic/CONFIG_MOUSE_ELAN_I2C_SMBUS
diff --git a/baseconfig/CONFIG_MOUSE_GPIO b/configs/base-generic/CONFIG_MOUSE_GPIO
index 9aefee3c8..9aefee3c8 100644
--- a/baseconfig/CONFIG_MOUSE_GPIO
+++ b/configs/base-generic/CONFIG_MOUSE_GPIO
diff --git a/baseconfig/CONFIG_MOUSE_PS2 b/configs/base-generic/CONFIG_MOUSE_PS2
index ed68613be..ed68613be 100644
--- a/baseconfig/CONFIG_MOUSE_PS2
+++ b/configs/base-generic/CONFIG_MOUSE_PS2
diff --git a/baseconfig/CONFIG_MOUSE_PS2_ELANTECH b/configs/base-generic/CONFIG_MOUSE_PS2_ELANTECH
index 15c77ec5c..15c77ec5c 100644
--- a/baseconfig/CONFIG_MOUSE_PS2_ELANTECH
+++ b/configs/base-generic/CONFIG_MOUSE_PS2_ELANTECH
diff --git a/baseconfig/CONFIG_MOUSE_PS2_SENTELIC b/configs/base-generic/CONFIG_MOUSE_PS2_SENTELIC
index 14079ba62..14079ba62 100644
--- a/baseconfig/CONFIG_MOUSE_PS2_SENTELIC
+++ b/configs/base-generic/CONFIG_MOUSE_PS2_SENTELIC
diff --git a/baseconfig/CONFIG_MOUSE_PS2_TOUCHKIT b/configs/base-generic/CONFIG_MOUSE_PS2_TOUCHKIT
index 10b1f05ac..10b1f05ac 100644
--- a/baseconfig/CONFIG_MOUSE_PS2_TOUCHKIT
+++ b/configs/base-generic/CONFIG_MOUSE_PS2_TOUCHKIT
diff --git a/baseconfig/CONFIG_MOUSE_SERIAL b/configs/base-generic/CONFIG_MOUSE_SERIAL
index b98a70fa6..b98a70fa6 100644
--- a/baseconfig/CONFIG_MOUSE_SERIAL
+++ b/configs/base-generic/CONFIG_MOUSE_SERIAL
diff --git a/baseconfig/CONFIG_MOUSE_SYNAPTICS_I2C b/configs/base-generic/CONFIG_MOUSE_SYNAPTICS_I2C
index 7368088e6..7368088e6 100644
--- a/baseconfig/CONFIG_MOUSE_SYNAPTICS_I2C
+++ b/configs/base-generic/CONFIG_MOUSE_SYNAPTICS_I2C
diff --git a/baseconfig/CONFIG_MOUSE_SYNAPTICS_USB b/configs/base-generic/CONFIG_MOUSE_SYNAPTICS_USB
index 175daf737..175daf737 100644
--- a/baseconfig/CONFIG_MOUSE_SYNAPTICS_USB
+++ b/configs/base-generic/CONFIG_MOUSE_SYNAPTICS_USB
diff --git a/baseconfig/CONFIG_MOUSE_VSXXXAA b/configs/base-generic/CONFIG_MOUSE_VSXXXAA
index 1c962b695..1c962b695 100644
--- a/baseconfig/CONFIG_MOUSE_VSXXXAA
+++ b/configs/base-generic/CONFIG_MOUSE_VSXXXAA
diff --git a/baseconfig/CONFIG_MOVABLE_NODE b/configs/base-generic/CONFIG_MOVABLE_NODE
index 6d0669d21..6d0669d21 100644
--- a/baseconfig/CONFIG_MOVABLE_NODE
+++ b/configs/base-generic/CONFIG_MOVABLE_NODE
diff --git a/baseconfig/CONFIG_MOXA_INTELLIO b/configs/base-generic/CONFIG_MOXA_INTELLIO
index cad28e8d1..cad28e8d1 100644
--- a/baseconfig/CONFIG_MOXA_INTELLIO
+++ b/configs/base-generic/CONFIG_MOXA_INTELLIO
diff --git a/baseconfig/CONFIG_MOXA_SMARTIO b/configs/base-generic/CONFIG_MOXA_SMARTIO
index cd82be48c..cd82be48c 100644
--- a/baseconfig/CONFIG_MOXA_SMARTIO
+++ b/configs/base-generic/CONFIG_MOXA_SMARTIO
diff --git a/baseconfig/CONFIG_MPL115 b/configs/base-generic/CONFIG_MPL115
index c249421eb..c249421eb 100644
--- a/baseconfig/CONFIG_MPL115
+++ b/configs/base-generic/CONFIG_MPL115
diff --git a/baseconfig/CONFIG_MPL115_I2C b/configs/base-generic/CONFIG_MPL115_I2C
index 627567714..627567714 100644
--- a/baseconfig/CONFIG_MPL115_I2C
+++ b/configs/base-generic/CONFIG_MPL115_I2C
diff --git a/baseconfig/CONFIG_MPL115_SPI b/configs/base-generic/CONFIG_MPL115_SPI
index a4be2fc22..a4be2fc22 100644
--- a/baseconfig/CONFIG_MPL115_SPI
+++ b/configs/base-generic/CONFIG_MPL115_SPI
diff --git a/baseconfig/CONFIG_MPL3115 b/configs/base-generic/CONFIG_MPL3115
index 36eb331ab..36eb331ab 100644
--- a/baseconfig/CONFIG_MPL3115
+++ b/configs/base-generic/CONFIG_MPL3115
diff --git a/baseconfig/CONFIG_MPLS_IPTUNNEL b/configs/base-generic/CONFIG_MPLS_IPTUNNEL
index 229af61b8..229af61b8 100644
--- a/baseconfig/CONFIG_MPLS_IPTUNNEL
+++ b/configs/base-generic/CONFIG_MPLS_IPTUNNEL
diff --git a/baseconfig/CONFIG_MPLS_ROUTING b/configs/base-generic/CONFIG_MPLS_ROUTING
index 50248380e..50248380e 100644
--- a/baseconfig/CONFIG_MPLS_ROUTING
+++ b/configs/base-generic/CONFIG_MPLS_ROUTING
diff --git a/baseconfig/CONFIG_MPU3050_I2C b/configs/base-generic/CONFIG_MPU3050_I2C
index 2e9c7cc45..2e9c7cc45 100644
--- a/baseconfig/CONFIG_MPU3050_I2C
+++ b/configs/base-generic/CONFIG_MPU3050_I2C
diff --git a/baseconfig/CONFIG_MQ_IOSCHED_DEADLINE b/configs/base-generic/CONFIG_MQ_IOSCHED_DEADLINE
index ad5c7700b..ad5c7700b 100644
--- a/baseconfig/CONFIG_MQ_IOSCHED_DEADLINE
+++ b/configs/base-generic/CONFIG_MQ_IOSCHED_DEADLINE
diff --git a/baseconfig/CONFIG_MQ_IOSCHED_KYBER b/configs/base-generic/CONFIG_MQ_IOSCHED_KYBER
index 939264da2..939264da2 100644
--- a/baseconfig/CONFIG_MQ_IOSCHED_KYBER
+++ b/configs/base-generic/CONFIG_MQ_IOSCHED_KYBER
diff --git a/baseconfig/CONFIG_MS5611 b/configs/base-generic/CONFIG_MS5611
index 0bf359705..0bf359705 100644
--- a/baseconfig/CONFIG_MS5611
+++ b/configs/base-generic/CONFIG_MS5611
diff --git a/baseconfig/CONFIG_MS5637 b/configs/base-generic/CONFIG_MS5637
index 867af2e87..867af2e87 100644
--- a/baseconfig/CONFIG_MS5637
+++ b/configs/base-generic/CONFIG_MS5637
diff --git a/baseconfig/CONFIG_MSDOS_FS b/configs/base-generic/CONFIG_MSDOS_FS
index 841afeb52..841afeb52 100644
--- a/baseconfig/CONFIG_MSDOS_FS
+++ b/configs/base-generic/CONFIG_MSDOS_FS
diff --git a/baseconfig/CONFIG_MSDOS_PARTITION b/configs/base-generic/CONFIG_MSDOS_PARTITION
index dda339291..dda339291 100644
--- a/baseconfig/CONFIG_MSDOS_PARTITION
+++ b/configs/base-generic/CONFIG_MSDOS_PARTITION
diff --git a/baseconfig/CONFIG_MSM_GCC_8994 b/configs/base-generic/CONFIG_MSM_GCC_8994
index b4515acea..b4515acea 100644
--- a/baseconfig/CONFIG_MSM_GCC_8994
+++ b/configs/base-generic/CONFIG_MSM_GCC_8994
diff --git a/baseconfig/CONFIG_MSPRO_BLOCK b/configs/base-generic/CONFIG_MSPRO_BLOCK
index 94c242c79..94c242c79 100644
--- a/baseconfig/CONFIG_MSPRO_BLOCK
+++ b/configs/base-generic/CONFIG_MSPRO_BLOCK
diff --git a/baseconfig/CONFIG_MS_BLOCK b/configs/base-generic/CONFIG_MS_BLOCK
index 5628a82fc..5628a82fc 100644
--- a/baseconfig/CONFIG_MS_BLOCK
+++ b/configs/base-generic/CONFIG_MS_BLOCK
diff --git a/baseconfig/CONFIG_MT7601U b/configs/base-generic/CONFIG_MT7601U
index cd5368ee4..cd5368ee4 100644
--- a/baseconfig/CONFIG_MT7601U
+++ b/configs/base-generic/CONFIG_MT7601U
diff --git a/baseconfig/CONFIG_MTD b/configs/base-generic/CONFIG_MTD
index 5a861e745..5a861e745 100644
--- a/baseconfig/CONFIG_MTD
+++ b/configs/base-generic/CONFIG_MTD
diff --git a/baseconfig/CONFIG_MTD_ABSENT b/configs/base-generic/CONFIG_MTD_ABSENT
index 243168a34..243168a34 100644
--- a/baseconfig/CONFIG_MTD_ABSENT
+++ b/configs/base-generic/CONFIG_MTD_ABSENT
diff --git a/baseconfig/CONFIG_MTD_AR7_PARTS b/configs/base-generic/CONFIG_MTD_AR7_PARTS
index a9369c2a1..a9369c2a1 100644
--- a/baseconfig/CONFIG_MTD_AR7_PARTS
+++ b/configs/base-generic/CONFIG_MTD_AR7_PARTS
diff --git a/baseconfig/CONFIG_MTD_BLKDEVS b/configs/base-generic/CONFIG_MTD_BLKDEVS
index 614ea5313..614ea5313 100644
--- a/baseconfig/CONFIG_MTD_BLKDEVS
+++ b/configs/base-generic/CONFIG_MTD_BLKDEVS
diff --git a/baseconfig/CONFIG_MTD_BLOCK b/configs/base-generic/CONFIG_MTD_BLOCK
index 033247294..033247294 100644
--- a/baseconfig/CONFIG_MTD_BLOCK
+++ b/configs/base-generic/CONFIG_MTD_BLOCK
diff --git a/baseconfig/CONFIG_MTD_BLOCK2MTD b/configs/base-generic/CONFIG_MTD_BLOCK2MTD
index 4a942ccb5..4a942ccb5 100644
--- a/baseconfig/CONFIG_MTD_BLOCK2MTD
+++ b/configs/base-generic/CONFIG_MTD_BLOCK2MTD
diff --git a/baseconfig/CONFIG_MTD_BLOCK_RO b/configs/base-generic/CONFIG_MTD_BLOCK_RO
index d49910a27..d49910a27 100644
--- a/baseconfig/CONFIG_MTD_BLOCK_RO
+++ b/configs/base-generic/CONFIG_MTD_BLOCK_RO
diff --git a/baseconfig/CONFIG_MTD_CFI b/configs/base-generic/CONFIG_MTD_CFI
index 67915c663..67915c663 100644
--- a/baseconfig/CONFIG_MTD_CFI
+++ b/configs/base-generic/CONFIG_MTD_CFI
diff --git a/baseconfig/CONFIG_MTD_CFI_I1 b/configs/base-generic/CONFIG_MTD_CFI_I1
index 8976f930f..8976f930f 100644
--- a/baseconfig/CONFIG_MTD_CFI_I1
+++ b/configs/base-generic/CONFIG_MTD_CFI_I1
diff --git a/baseconfig/CONFIG_MTD_CFI_I2 b/configs/base-generic/CONFIG_MTD_CFI_I2
index 24fdbdfe2..24fdbdfe2 100644
--- a/baseconfig/CONFIG_MTD_CFI_I2
+++ b/configs/base-generic/CONFIG_MTD_CFI_I2
diff --git a/baseconfig/CONFIG_MTD_CFI_I4 b/configs/base-generic/CONFIG_MTD_CFI_I4
index f29135912..f29135912 100644
--- a/baseconfig/CONFIG_MTD_CFI_I4
+++ b/configs/base-generic/CONFIG_MTD_CFI_I4
diff --git a/baseconfig/CONFIG_MTD_CFI_I8 b/configs/base-generic/CONFIG_MTD_CFI_I8
index d00104a93..d00104a93 100644
--- a/baseconfig/CONFIG_MTD_CFI_I8
+++ b/configs/base-generic/CONFIG_MTD_CFI_I8
diff --git a/baseconfig/CONFIG_MTD_CMDLINE_PARTS b/configs/base-generic/CONFIG_MTD_CMDLINE_PARTS
index 63ac9245b..63ac9245b 100644
--- a/baseconfig/CONFIG_MTD_CMDLINE_PARTS
+++ b/configs/base-generic/CONFIG_MTD_CMDLINE_PARTS
diff --git a/baseconfig/CONFIG_MTD_COMPLEX_MAPPINGS b/configs/base-generic/CONFIG_MTD_COMPLEX_MAPPINGS
index 650cf2c1e..650cf2c1e 100644
--- a/baseconfig/CONFIG_MTD_COMPLEX_MAPPINGS
+++ b/configs/base-generic/CONFIG_MTD_COMPLEX_MAPPINGS
diff --git a/baseconfig/CONFIG_MTD_DATAFLASH b/configs/base-generic/CONFIG_MTD_DATAFLASH
index c31b6910b..c31b6910b 100644
--- a/baseconfig/CONFIG_MTD_DATAFLASH
+++ b/configs/base-generic/CONFIG_MTD_DATAFLASH
diff --git a/baseconfig/CONFIG_MTD_DOCG3 b/configs/base-generic/CONFIG_MTD_DOCG3
index 4e4b41f4a..4e4b41f4a 100644
--- a/baseconfig/CONFIG_MTD_DOCG3
+++ b/configs/base-generic/CONFIG_MTD_DOCG3
diff --git a/baseconfig/CONFIG_MTD_INTEL_VR_NOR b/configs/base-generic/CONFIG_MTD_INTEL_VR_NOR
index 7099c7895..7099c7895 100644
--- a/baseconfig/CONFIG_MTD_INTEL_VR_NOR
+++ b/configs/base-generic/CONFIG_MTD_INTEL_VR_NOR
diff --git a/baseconfig/CONFIG_MTD_JEDECPROBE b/configs/base-generic/CONFIG_MTD_JEDECPROBE
index 1af3e1262..1af3e1262 100644
--- a/baseconfig/CONFIG_MTD_JEDECPROBE
+++ b/configs/base-generic/CONFIG_MTD_JEDECPROBE
diff --git a/baseconfig/CONFIG_MTD_LPDDR b/configs/base-generic/CONFIG_MTD_LPDDR
index eebb90ae3..eebb90ae3 100644
--- a/baseconfig/CONFIG_MTD_LPDDR
+++ b/configs/base-generic/CONFIG_MTD_LPDDR
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_1 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_1
index bcfdd7b7a..bcfdd7b7a 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_1
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_1
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_16 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_16
index 4245f0138..4245f0138 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_16
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_16
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_2 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_2
index 21d0f95b2..21d0f95b2 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_2
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_2
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_32 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_32
index 0286e094b..0286e094b 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_32
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_32
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_4 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_4
index e98e1687e..e98e1687e 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_4
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_4
diff --git a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_8 b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_8
index a4f9a3951..a4f9a3951 100644
--- a/baseconfig/CONFIG_MTD_MAP_BANK_WIDTH_8
+++ b/configs/base-generic/CONFIG_MTD_MAP_BANK_WIDTH_8
diff --git a/baseconfig/CONFIG_MTD_MCHP23K256 b/configs/base-generic/CONFIG_MTD_MCHP23K256
index ed6627e35..ed6627e35 100644
--- a/baseconfig/CONFIG_MTD_MCHP23K256
+++ b/configs/base-generic/CONFIG_MTD_MCHP23K256
diff --git a/baseconfig/CONFIG_MTD_MTDRAM b/configs/base-generic/CONFIG_MTD_MTDRAM
index 70da5d08c..70da5d08c 100644
--- a/baseconfig/CONFIG_MTD_MTDRAM
+++ b/configs/base-generic/CONFIG_MTD_MTDRAM
diff --git a/baseconfig/CONFIG_MTD_NAND b/configs/base-generic/CONFIG_MTD_NAND
index 92a3e729b..92a3e729b 100644
--- a/baseconfig/CONFIG_MTD_NAND
+++ b/configs/base-generic/CONFIG_MTD_NAND
diff --git a/baseconfig/CONFIG_MTD_NAND_DENALI_DT b/configs/base-generic/CONFIG_MTD_NAND_DENALI_DT
index e278206f7..e278206f7 100644
--- a/baseconfig/CONFIG_MTD_NAND_DENALI_DT
+++ b/configs/base-generic/CONFIG_MTD_NAND_DENALI_DT
diff --git a/baseconfig/CONFIG_MTD_NAND_DENALI_PCI b/configs/base-generic/CONFIG_MTD_NAND_DENALI_PCI
index f47cf2ea9..f47cf2ea9 100644
--- a/baseconfig/CONFIG_MTD_NAND_DENALI_PCI
+++ b/configs/base-generic/CONFIG_MTD_NAND_DENALI_PCI
diff --git a/baseconfig/CONFIG_MTD_NAND_DISKONCHIP b/configs/base-generic/CONFIG_MTD_NAND_DISKONCHIP
index 3740b2c6d..3740b2c6d 100644
--- a/baseconfig/CONFIG_MTD_NAND_DISKONCHIP
+++ b/configs/base-generic/CONFIG_MTD_NAND_DISKONCHIP
diff --git a/baseconfig/CONFIG_MTD_NAND_ECC_BCH b/configs/base-generic/CONFIG_MTD_NAND_ECC_BCH
index fa4e88929..fa4e88929 100644
--- a/baseconfig/CONFIG_MTD_NAND_ECC_BCH
+++ b/configs/base-generic/CONFIG_MTD_NAND_ECC_BCH
diff --git a/baseconfig/CONFIG_MTD_NAND_HISI504 b/configs/base-generic/CONFIG_MTD_NAND_HISI504
index 60bf69e4b..60bf69e4b 100644
--- a/baseconfig/CONFIG_MTD_NAND_HISI504
+++ b/configs/base-generic/CONFIG_MTD_NAND_HISI504
diff --git a/baseconfig/CONFIG_MTD_NAND_OMAP2 b/configs/base-generic/CONFIG_MTD_NAND_OMAP2
index e1194c0f0..e1194c0f0 100644
--- a/baseconfig/CONFIG_MTD_NAND_OMAP2
+++ b/configs/base-generic/CONFIG_MTD_NAND_OMAP2
diff --git a/baseconfig/CONFIG_MTD_NAND_OXNAS b/configs/base-generic/CONFIG_MTD_NAND_OXNAS
index 5f2d6440a..5f2d6440a 100644
--- a/baseconfig/CONFIG_MTD_NAND_OXNAS
+++ b/configs/base-generic/CONFIG_MTD_NAND_OXNAS
diff --git a/baseconfig/CONFIG_MTD_ONENAND b/configs/base-generic/CONFIG_MTD_ONENAND
index 7f0bdb85a..7f0bdb85a 100644
--- a/baseconfig/CONFIG_MTD_ONENAND
+++ b/configs/base-generic/CONFIG_MTD_ONENAND
diff --git a/baseconfig/CONFIG_MTD_OOPS b/configs/base-generic/CONFIG_MTD_OOPS
index b6c42a73a..b6c42a73a 100644
--- a/baseconfig/CONFIG_MTD_OOPS
+++ b/configs/base-generic/CONFIG_MTD_OOPS
diff --git a/baseconfig/CONFIG_MTD_PARTITIONED_MASTER b/configs/base-generic/CONFIG_MTD_PARTITIONED_MASTER
index 118d5ecd7..118d5ecd7 100644
--- a/baseconfig/CONFIG_MTD_PARTITIONED_MASTER
+++ b/configs/base-generic/CONFIG_MTD_PARTITIONED_MASTER
diff --git a/baseconfig/CONFIG_MTD_PHRAM b/configs/base-generic/CONFIG_MTD_PHRAM
index 5ce19c74d..5ce19c74d 100644
--- a/baseconfig/CONFIG_MTD_PHRAM
+++ b/configs/base-generic/CONFIG_MTD_PHRAM
diff --git a/baseconfig/CONFIG_MTD_PLATRAM b/configs/base-generic/CONFIG_MTD_PLATRAM
index dd004c169..dd004c169 100644
--- a/baseconfig/CONFIG_MTD_PLATRAM
+++ b/configs/base-generic/CONFIG_MTD_PLATRAM
diff --git a/baseconfig/CONFIG_MTD_PMC551 b/configs/base-generic/CONFIG_MTD_PMC551
index 6bf4ad0b5..6bf4ad0b5 100644
--- a/baseconfig/CONFIG_MTD_PMC551
+++ b/configs/base-generic/CONFIG_MTD_PMC551
diff --git a/baseconfig/CONFIG_MTD_RAM b/configs/base-generic/CONFIG_MTD_RAM
index 151de3c52..151de3c52 100644
--- a/baseconfig/CONFIG_MTD_RAM
+++ b/configs/base-generic/CONFIG_MTD_RAM
diff --git a/baseconfig/CONFIG_MTD_REDBOOT_PARTS b/configs/base-generic/CONFIG_MTD_REDBOOT_PARTS
index 8e87e0d6f..8e87e0d6f 100644
--- a/baseconfig/CONFIG_MTD_REDBOOT_PARTS
+++ b/configs/base-generic/CONFIG_MTD_REDBOOT_PARTS
diff --git a/baseconfig/CONFIG_MTD_ROM b/configs/base-generic/CONFIG_MTD_ROM
index 1efb84d75..1efb84d75 100644
--- a/baseconfig/CONFIG_MTD_ROM
+++ b/configs/base-generic/CONFIG_MTD_ROM
diff --git a/baseconfig/CONFIG_MTD_SLRAM b/configs/base-generic/CONFIG_MTD_SLRAM
index 09db4e8e7..09db4e8e7 100644
--- a/baseconfig/CONFIG_MTD_SLRAM
+++ b/configs/base-generic/CONFIG_MTD_SLRAM
diff --git a/baseconfig/CONFIG_MTD_SPI_NOR b/configs/base-generic/CONFIG_MTD_SPI_NOR
index 7d0f3cae3..7d0f3cae3 100644
--- a/baseconfig/CONFIG_MTD_SPI_NOR
+++ b/configs/base-generic/CONFIG_MTD_SPI_NOR
diff --git a/baseconfig/CONFIG_MTD_SST25L b/configs/base-generic/CONFIG_MTD_SST25L
index 0a42bba26..0a42bba26 100644
--- a/baseconfig/CONFIG_MTD_SST25L
+++ b/configs/base-generic/CONFIG_MTD_SST25L
diff --git a/baseconfig/CONFIG_MTD_SWAP b/configs/base-generic/CONFIG_MTD_SWAP
index d5892dbb7..d5892dbb7 100644
--- a/baseconfig/CONFIG_MTD_SWAP
+++ b/configs/base-generic/CONFIG_MTD_SWAP
diff --git a/baseconfig/CONFIG_MTD_TESTS b/configs/base-generic/CONFIG_MTD_TESTS
index bca68acd6..bca68acd6 100644
--- a/baseconfig/CONFIG_MTD_TESTS
+++ b/configs/base-generic/CONFIG_MTD_TESTS
diff --git a/baseconfig/CONFIG_MTD_TS5500 b/configs/base-generic/CONFIG_MTD_TS5500
index a49345f8f..a49345f8f 100644
--- a/baseconfig/CONFIG_MTD_TS5500
+++ b/configs/base-generic/CONFIG_MTD_TS5500
diff --git a/baseconfig/CONFIG_MTD_UBI b/configs/base-generic/CONFIG_MTD_UBI
index d610c466a..d610c466a 100644
--- a/baseconfig/CONFIG_MTD_UBI
+++ b/configs/base-generic/CONFIG_MTD_UBI
diff --git a/baseconfig/CONFIG_MTD_UBI_BEB_LIMIT b/configs/base-generic/CONFIG_MTD_UBI_BEB_LIMIT
index 69372005c..69372005c 100644
--- a/baseconfig/CONFIG_MTD_UBI_BEB_LIMIT
+++ b/configs/base-generic/CONFIG_MTD_UBI_BEB_LIMIT
diff --git a/baseconfig/CONFIG_MTD_UBI_BLOCK b/configs/base-generic/CONFIG_MTD_UBI_BLOCK
index 3b7526c29..3b7526c29 100644
--- a/baseconfig/CONFIG_MTD_UBI_BLOCK
+++ b/configs/base-generic/CONFIG_MTD_UBI_BLOCK
diff --git a/baseconfig/CONFIG_MTD_UBI_FASTMAP b/configs/base-generic/CONFIG_MTD_UBI_FASTMAP
index f7a8769e7..f7a8769e7 100644
--- a/baseconfig/CONFIG_MTD_UBI_FASTMAP
+++ b/configs/base-generic/CONFIG_MTD_UBI_FASTMAP
diff --git a/baseconfig/CONFIG_MTD_UBI_GLUEBI b/configs/base-generic/CONFIG_MTD_UBI_GLUEBI
index 8b3dd1030..8b3dd1030 100644
--- a/baseconfig/CONFIG_MTD_UBI_GLUEBI
+++ b/configs/base-generic/CONFIG_MTD_UBI_GLUEBI
diff --git a/baseconfig/CONFIG_MTD_UBI_WL_THRESHOLD b/configs/base-generic/CONFIG_MTD_UBI_WL_THRESHOLD
index 184d7026d..184d7026d 100644
--- a/baseconfig/CONFIG_MTD_UBI_WL_THRESHOLD
+++ b/configs/base-generic/CONFIG_MTD_UBI_WL_THRESHOLD
diff --git a/baseconfig/CONFIG_MULTIPLEXER b/configs/base-generic/CONFIG_MULTIPLEXER
index fac2813b4..fac2813b4 100644
--- a/baseconfig/CONFIG_MULTIPLEXER
+++ b/configs/base-generic/CONFIG_MULTIPLEXER
diff --git a/baseconfig/CONFIG_MUX_ADG792A b/configs/base-generic/CONFIG_MUX_ADG792A
index fd85e4965..fd85e4965 100644
--- a/baseconfig/CONFIG_MUX_ADG792A
+++ b/configs/base-generic/CONFIG_MUX_ADG792A
diff --git a/baseconfig/CONFIG_MUX_GPIO b/configs/base-generic/CONFIG_MUX_GPIO
index e5a7a8282..e5a7a8282 100644
--- a/baseconfig/CONFIG_MUX_GPIO
+++ b/configs/base-generic/CONFIG_MUX_GPIO
diff --git a/baseconfig/CONFIG_MUX_MMIO b/configs/base-generic/CONFIG_MUX_MMIO
index 2d0328a73..2d0328a73 100644
--- a/baseconfig/CONFIG_MUX_MMIO
+++ b/configs/base-generic/CONFIG_MUX_MMIO
diff --git a/baseconfig/CONFIG_MVMDIO b/configs/base-generic/CONFIG_MVMDIO
index 3dd1f92ef..3dd1f92ef 100644
--- a/baseconfig/CONFIG_MVMDIO
+++ b/configs/base-generic/CONFIG_MVMDIO
diff --git a/baseconfig/CONFIG_MWAVE b/configs/base-generic/CONFIG_MWAVE
index ce88714c1..ce88714c1 100644
--- a/baseconfig/CONFIG_MWAVE
+++ b/configs/base-generic/CONFIG_MWAVE
diff --git a/baseconfig/CONFIG_MWIFIEX b/configs/base-generic/CONFIG_MWIFIEX
index d7d641671..d7d641671 100644
--- a/baseconfig/CONFIG_MWIFIEX
+++ b/configs/base-generic/CONFIG_MWIFIEX
diff --git a/baseconfig/CONFIG_MWIFIEX_PCIE b/configs/base-generic/CONFIG_MWIFIEX_PCIE
index 80dd05958..80dd05958 100644
--- a/baseconfig/CONFIG_MWIFIEX_PCIE
+++ b/configs/base-generic/CONFIG_MWIFIEX_PCIE
diff --git a/baseconfig/CONFIG_MWIFIEX_SDIO b/configs/base-generic/CONFIG_MWIFIEX_SDIO
index fa88327f3..fa88327f3 100644
--- a/baseconfig/CONFIG_MWIFIEX_SDIO
+++ b/configs/base-generic/CONFIG_MWIFIEX_SDIO
diff --git a/baseconfig/CONFIG_MWIFIEX_USB b/configs/base-generic/CONFIG_MWIFIEX_USB
index fac2cb3d2..fac2cb3d2 100644
--- a/baseconfig/CONFIG_MWIFIEX_USB
+++ b/configs/base-generic/CONFIG_MWIFIEX_USB
diff --git a/baseconfig/CONFIG_MWL8K b/configs/base-generic/CONFIG_MWL8K
index 7fd016a45..7fd016a45 100644
--- a/baseconfig/CONFIG_MWL8K
+++ b/configs/base-generic/CONFIG_MWL8K
diff --git a/baseconfig/CONFIG_MXC4005 b/configs/base-generic/CONFIG_MXC4005
index 609438732..609438732 100644
--- a/baseconfig/CONFIG_MXC4005
+++ b/configs/base-generic/CONFIG_MXC4005
diff --git a/baseconfig/CONFIG_MXC6255 b/configs/base-generic/CONFIG_MXC6255
index e834351d7..e834351d7 100644
--- a/baseconfig/CONFIG_MXC6255
+++ b/configs/base-generic/CONFIG_MXC6255
diff --git a/baseconfig/CONFIG_MYRI10GE b/configs/base-generic/CONFIG_MYRI10GE
index a3b2d57f5..a3b2d57f5 100644
--- a/baseconfig/CONFIG_MYRI10GE
+++ b/configs/base-generic/CONFIG_MYRI10GE
diff --git a/baseconfig/CONFIG_MYRI10GE_DCA b/configs/base-generic/CONFIG_MYRI10GE_DCA
index 7b5904a76..7b5904a76 100644
--- a/baseconfig/CONFIG_MYRI10GE_DCA
+++ b/configs/base-generic/CONFIG_MYRI10GE_DCA
diff --git a/baseconfig/CONFIG_NAMESPACES b/configs/base-generic/CONFIG_NAMESPACES
index 6c6db9d25..6c6db9d25 100644
--- a/baseconfig/CONFIG_NAMESPACES
+++ b/configs/base-generic/CONFIG_NAMESPACES
diff --git a/baseconfig/CONFIG_NATIONAL_PHY b/configs/base-generic/CONFIG_NATIONAL_PHY
index 7bd6621d8..7bd6621d8 100644
--- a/baseconfig/CONFIG_NATIONAL_PHY
+++ b/configs/base-generic/CONFIG_NATIONAL_PHY
diff --git a/baseconfig/CONFIG_NATSEMI b/configs/base-generic/CONFIG_NATSEMI
index dfc76543c..dfc76543c 100644
--- a/baseconfig/CONFIG_NATSEMI
+++ b/configs/base-generic/CONFIG_NATSEMI
diff --git a/baseconfig/CONFIG_NAU7802 b/configs/base-generic/CONFIG_NAU7802
index 2bff4c70a..2bff4c70a 100644
--- a/baseconfig/CONFIG_NAU7802
+++ b/configs/base-generic/CONFIG_NAU7802
diff --git a/baseconfig/CONFIG_NBPFAXI_DMA b/configs/base-generic/CONFIG_NBPFAXI_DMA
index 7dbd7d589..7dbd7d589 100644
--- a/baseconfig/CONFIG_NBPFAXI_DMA
+++ b/configs/base-generic/CONFIG_NBPFAXI_DMA
diff --git a/baseconfig/CONFIG_NCPFS_EXTRAS b/configs/base-generic/CONFIG_NCPFS_EXTRAS
index 53bf4bb9f..53bf4bb9f 100644
--- a/baseconfig/CONFIG_NCPFS_EXTRAS
+++ b/configs/base-generic/CONFIG_NCPFS_EXTRAS
diff --git a/baseconfig/CONFIG_NCPFS_IOCTL_LOCKING b/configs/base-generic/CONFIG_NCPFS_IOCTL_LOCKING
index 4d1f92783..4d1f92783 100644
--- a/baseconfig/CONFIG_NCPFS_IOCTL_LOCKING
+++ b/configs/base-generic/CONFIG_NCPFS_IOCTL_LOCKING
diff --git a/baseconfig/CONFIG_NCPFS_NFS_NS b/configs/base-generic/CONFIG_NCPFS_NFS_NS
index 5259e73e5..5259e73e5 100644
--- a/baseconfig/CONFIG_NCPFS_NFS_NS
+++ b/configs/base-generic/CONFIG_NCPFS_NFS_NS
diff --git a/baseconfig/CONFIG_NCPFS_NLS b/configs/base-generic/CONFIG_NCPFS_NLS
index 61ae7e28e..61ae7e28e 100644
--- a/baseconfig/CONFIG_NCPFS_NLS
+++ b/configs/base-generic/CONFIG_NCPFS_NLS
diff --git a/baseconfig/CONFIG_NCPFS_OS2_NS b/configs/base-generic/CONFIG_NCPFS_OS2_NS
index dcc775a1d..dcc775a1d 100644
--- a/baseconfig/CONFIG_NCPFS_OS2_NS
+++ b/configs/base-generic/CONFIG_NCPFS_OS2_NS
diff --git a/baseconfig/CONFIG_NCPFS_PACKET_SIGNING b/configs/base-generic/CONFIG_NCPFS_PACKET_SIGNING
index 8a8915b01..8a8915b01 100644
--- a/baseconfig/CONFIG_NCPFS_PACKET_SIGNING
+++ b/configs/base-generic/CONFIG_NCPFS_PACKET_SIGNING
diff --git a/baseconfig/CONFIG_NCPFS_SMALLDOS b/configs/base-generic/CONFIG_NCPFS_SMALLDOS
index f66a269ec..f66a269ec 100644
--- a/baseconfig/CONFIG_NCPFS_SMALLDOS
+++ b/configs/base-generic/CONFIG_NCPFS_SMALLDOS
diff --git a/baseconfig/CONFIG_NCPFS_STRONG b/configs/base-generic/CONFIG_NCPFS_STRONG
index 62ad205ea..62ad205ea 100644
--- a/baseconfig/CONFIG_NCPFS_STRONG
+++ b/configs/base-generic/CONFIG_NCPFS_STRONG
diff --git a/baseconfig/CONFIG_NCP_FS b/configs/base-generic/CONFIG_NCP_FS
index 520727796..520727796 100644
--- a/baseconfig/CONFIG_NCP_FS
+++ b/configs/base-generic/CONFIG_NCP_FS
diff --git a/baseconfig/CONFIG_ND_BLK b/configs/base-generic/CONFIG_ND_BLK
index 5668bfc3a..5668bfc3a 100644
--- a/baseconfig/CONFIG_ND_BLK
+++ b/configs/base-generic/CONFIG_ND_BLK
diff --git a/baseconfig/CONFIG_NE2K_PCI b/configs/base-generic/CONFIG_NE2K_PCI
index 9b8f70323..9b8f70323 100644
--- a/baseconfig/CONFIG_NE2K_PCI
+++ b/configs/base-generic/CONFIG_NE2K_PCI
diff --git a/baseconfig/CONFIG_NET b/configs/base-generic/CONFIG_NET
index bb0276068..bb0276068 100644
--- a/baseconfig/CONFIG_NET
+++ b/configs/base-generic/CONFIG_NET
diff --git a/baseconfig/CONFIG_NETCONSOLE b/configs/base-generic/CONFIG_NETCONSOLE
index 37ec75b06..37ec75b06 100644
--- a/baseconfig/CONFIG_NETCONSOLE
+++ b/configs/base-generic/CONFIG_NETCONSOLE
diff --git a/baseconfig/CONFIG_NETCONSOLE_DYNAMIC b/configs/base-generic/CONFIG_NETCONSOLE_DYNAMIC
index 764af964b..764af964b 100644
--- a/baseconfig/CONFIG_NETCONSOLE_DYNAMIC
+++ b/configs/base-generic/CONFIG_NETCONSOLE_DYNAMIC
diff --git a/baseconfig/CONFIG_NETDEVICES b/configs/base-generic/CONFIG_NETDEVICES
index c12b1f36a..c12b1f36a 100644
--- a/baseconfig/CONFIG_NETDEVICES
+++ b/configs/base-generic/CONFIG_NETDEVICES
diff --git a/baseconfig/CONFIG_NETFILTER b/configs/base-generic/CONFIG_NETFILTER
index 7e722d1a8..7e722d1a8 100644
--- a/baseconfig/CONFIG_NETFILTER
+++ b/configs/base-generic/CONFIG_NETFILTER
diff --git a/baseconfig/CONFIG_NETFILTER_ADVANCED b/configs/base-generic/CONFIG_NETFILTER_ADVANCED
index c24a71207..c24a71207 100644
--- a/baseconfig/CONFIG_NETFILTER_ADVANCED
+++ b/configs/base-generic/CONFIG_NETFILTER_ADVANCED
diff --git a/baseconfig/CONFIG_NETFILTER_DEBUG b/configs/base-generic/CONFIG_NETFILTER_DEBUG
index 89a03594c..89a03594c 100644
--- a/baseconfig/CONFIG_NETFILTER_DEBUG
+++ b/configs/base-generic/CONFIG_NETFILTER_DEBUG
diff --git a/baseconfig/CONFIG_NETFILTER_INGRESS b/configs/base-generic/CONFIG_NETFILTER_INGRESS
index d9ad7389f..d9ad7389f 100644
--- a/baseconfig/CONFIG_NETFILTER_INGRESS
+++ b/configs/base-generic/CONFIG_NETFILTER_INGRESS
diff --git a/baseconfig/CONFIG_NETFILTER_NETLINK b/configs/base-generic/CONFIG_NETFILTER_NETLINK
index cb5690897..cb5690897 100644
--- a/baseconfig/CONFIG_NETFILTER_NETLINK
+++ b/configs/base-generic/CONFIG_NETFILTER_NETLINK
diff --git a/baseconfig/CONFIG_NETFILTER_NETLINK_ACCT b/configs/base-generic/CONFIG_NETFILTER_NETLINK_ACCT
index 2ad7ea565..2ad7ea565 100644
--- a/baseconfig/CONFIG_NETFILTER_NETLINK_ACCT
+++ b/configs/base-generic/CONFIG_NETFILTER_NETLINK_ACCT
diff --git a/baseconfig/CONFIG_NETFILTER_NETLINK_GLUE_CT b/configs/base-generic/CONFIG_NETFILTER_NETLINK_GLUE_CT
index 61f35483a..61f35483a 100644
--- a/baseconfig/CONFIG_NETFILTER_NETLINK_GLUE_CT
+++ b/configs/base-generic/CONFIG_NETFILTER_NETLINK_GLUE_CT
diff --git a/baseconfig/CONFIG_NETFILTER_NETLINK_LOG b/configs/base-generic/CONFIG_NETFILTER_NETLINK_LOG
index 3f8d3d07c..3f8d3d07c 100644
--- a/baseconfig/CONFIG_NETFILTER_NETLINK_LOG
+++ b/configs/base-generic/CONFIG_NETFILTER_NETLINK_LOG
diff --git a/baseconfig/CONFIG_NETFILTER_NETLINK_QUEUE b/configs/base-generic/CONFIG_NETFILTER_NETLINK_QUEUE
index c31c5b848..c31c5b848 100644
--- a/baseconfig/CONFIG_NETFILTER_NETLINK_QUEUE
+++ b/configs/base-generic/CONFIG_NETFILTER_NETLINK_QUEUE
diff --git a/baseconfig/CONFIG_NETFILTER_XTABLES b/configs/base-generic/CONFIG_NETFILTER_XTABLES
index a97d971dc..a97d971dc 100644
--- a/baseconfig/CONFIG_NETFILTER_XTABLES
+++ b/configs/base-generic/CONFIG_NETFILTER_XTABLES
diff --git a/baseconfig/CONFIG_NETFILTER_XT_CONNMARK b/configs/base-generic/CONFIG_NETFILTER_XT_CONNMARK
index 5a7391f6b..5a7391f6b 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_CONNMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_CONNMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MARK b/configs/base-generic/CONFIG_NETFILTER_XT_MARK
index a65aee77e..a65aee77e 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ADDRTYPE b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ADDRTYPE
index d0ebb666a..d0ebb666a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ADDRTYPE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ADDRTYPE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_BPF b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_BPF
index dd51452a8..dd51452a8 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_BPF
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_BPF
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CGROUP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CGROUP
index d8a9d8646..d8a9d8646 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CGROUP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CGROUP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CLUSTER b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CLUSTER
index 020fa47f4..020fa47f4 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CLUSTER
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CLUSTER
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_COMMENT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_COMMENT
index a3c59620f..a3c59620f 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_COMMENT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_COMMENT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNBYTES b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNBYTES
index 9b3a056b7..9b3a056b7 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNBYTES
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNBYTES
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNLABEL b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNLABEL
index 29f343313..29f343313 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNLABEL
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNLABEL
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNLIMIT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNLIMIT
index ee136fa46..ee136fa46 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNLIMIT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNLIMIT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNMARK b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNMARK
index 8ad133639..8ad133639 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNTRACK b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNTRACK
index 45db821ff..45db821ff 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CONNTRACK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CONNTRACK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CPU b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CPU
index 556ebfac9..556ebfac9 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_CPU
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_CPU
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DCCP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DCCP
index 8b4224d8c..8b4224d8c 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DCCP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DCCP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DEVGROUP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DEVGROUP
index 2f50c144f..2f50c144f 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DEVGROUP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DEVGROUP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DSCP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DSCP
index d4f55cb4f..d4f55cb4f 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_DSCP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_DSCP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ECN b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ECN
index 3ac23e5f8..3ac23e5f8 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ECN
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ECN
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ESP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ESP
index 16ce1ab2e..16ce1ab2e 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_ESP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_ESP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HASHLIMIT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HASHLIMIT
index 3112cfca2..3112cfca2 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HASHLIMIT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HASHLIMIT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HELPER b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HELPER
index 1c79d125a..1c79d125a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HELPER
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HELPER
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HL b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HL
index fe60ffc56..fe60ffc56 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_HL
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_HL
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPCOMP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPCOMP
index 5df60f906..5df60f906 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPCOMP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPCOMP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPRANGE b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPRANGE
index 42bf14df3..42bf14df3 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPRANGE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPRANGE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPVS b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPVS
index db117714a..db117714a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_IPVS
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_IPVS
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_L2TP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_L2TP
index b11158253..b11158253 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_L2TP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_L2TP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_LENGTH b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_LENGTH
index 22f3920af..22f3920af 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_LENGTH
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_LENGTH
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_LIMIT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_LIMIT
index 69d2d65dc..69d2d65dc 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_LIMIT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_LIMIT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MAC b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MAC
index 2175aa582..2175aa582 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MAC
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MAC
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MARK b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MARK
index 6c20543fb..6c20543fb 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MULTIPORT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MULTIPORT
index c3d9c38a6..c3d9c38a6 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_MULTIPORT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_MULTIPORT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_NFACCT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_NFACCT
index 81ec63eb6..81ec63eb6 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_NFACCT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_NFACCT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_OSF b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_OSF
index fc51bc986..fc51bc986 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_OSF
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_OSF
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_OWNER b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_OWNER
index 34be704c1..34be704c1 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_OWNER
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_OWNER
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_PHYSDEV b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_PHYSDEV
index 756371f03..756371f03 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_PHYSDEV
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_PHYSDEV
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_PKTTYPE b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_PKTTYPE
index d1412b2ac..d1412b2ac 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_PKTTYPE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_PKTTYPE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_POLICY b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_POLICY
index 05e378a49..05e378a49 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_POLICY
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_POLICY
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_QUOTA b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_QUOTA
index 5977d4d97..5977d4d97 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_QUOTA
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_QUOTA
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_RATEEST b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_RATEEST
index a7bec3652..a7bec3652 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_RATEEST
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_RATEEST
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_REALM b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_REALM
index e7ce1f51a..e7ce1f51a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_REALM
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_REALM
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_RECENT b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_RECENT
index 0f092d603..0f092d603 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_RECENT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_RECENT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_SCTP b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_SCTP
index 61a248594..61a248594 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_SCTP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_SCTP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_SOCKET b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_SOCKET
index ec4886c06..ec4886c06 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_SOCKET
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_SOCKET
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STATE b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STATE
index 87f0e3fe7..87f0e3fe7 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STATE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STATE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STATISTIC b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STATISTIC
index 79f06effb..79f06effb 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STATISTIC
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STATISTIC
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STRING b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STRING
index b7bf31333..b7bf31333 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_STRING
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_STRING
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_TCPMSS b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_TCPMSS
index abc5cdb59..abc5cdb59 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_TCPMSS
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_TCPMSS
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_TIME b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_TIME
index d4eb9fcb2..d4eb9fcb2 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_TIME
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_TIME
diff --git a/baseconfig/CONFIG_NETFILTER_XT_MATCH_U32 b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_U32
index 3033733e5..3033733e5 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_MATCH_U32
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_MATCH_U32
diff --git a/baseconfig/CONFIG_NETFILTER_XT_NAT b/configs/base-generic/CONFIG_NETFILTER_XT_NAT
index 797733334..797733334 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_NAT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_NAT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_SET b/configs/base-generic/CONFIG_NETFILTER_XT_SET
index 422aad468..422aad468 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_SET
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_SET
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_AUDIT b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_AUDIT
index 9b8ef0d6d..9b8ef0d6d 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_AUDIT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_AUDIT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CHECKSUM b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CHECKSUM
index 58afbff6d..58afbff6d 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CHECKSUM
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CHECKSUM
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CLASSIFY b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CLASSIFY
index 595deedce..595deedce 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CLASSIFY
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CLASSIFY
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CONNMARK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CONNMARK
index b64202c15..b64202c15 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CONNMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CONNMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CONNSECMARK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CONNSECMARK
index 6cd3b71b7..6cd3b71b7 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CONNSECMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CONNSECMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CT b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CT
index e777799b0..e777799b0 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_CT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_CT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_DSCP b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_DSCP
index 2b7b21772..2b7b21772 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_DSCP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_DSCP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_HMARK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_HMARK
index e75e82b04..e75e82b04 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_HMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_HMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_IDLETIMER b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_IDLETIMER
index ecb2856c0..ecb2856c0 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_IDLETIMER
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_IDLETIMER
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_LED b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_LED
index 819ec668c..819ec668c 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_LED
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_LED
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_LOG b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_LOG
index a4e073d6f..a4e073d6f 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_LOG
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_LOG
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_MARK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_MARK
index 077ea5295..077ea5295 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_MARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_MARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NETMAP b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NETMAP
index ca635aa2a..ca635aa2a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NETMAP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NETMAP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NFLOG b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NFLOG
index c4c331a56..c4c331a56 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NFLOG
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NFLOG
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NFQUEUE b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NFQUEUE
index 9885488c8..9885488c8 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NFQUEUE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NFQUEUE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NOTRACK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NOTRACK
index 2c0abc17f..2c0abc17f 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_NOTRACK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_NOTRACK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_RATEEST b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_RATEEST
index 140be4a02..140be4a02 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_RATEEST
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_RATEEST
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_REDIRECT b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_REDIRECT
index e31cca97a..e31cca97a 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_REDIRECT
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_REDIRECT
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_SECMARK b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_SECMARK
index 4d6dd7ff4..4d6dd7ff4 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_SECMARK
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_SECMARK
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TCPMSS b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TCPMSS
index fa3ac174d..fa3ac174d 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TCPMSS
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TCPMSS
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP
index 72c208d32..72c208d32 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TEE b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TEE
index 1ed57ae51..1ed57ae51 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TEE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TEE
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TPROXY b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TPROXY
index 89f3b7d2b..89f3b7d2b 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TPROXY
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TPROXY
diff --git a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TRACE b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TRACE
index dc5f43fb3..dc5f43fb3 100644
--- a/baseconfig/CONFIG_NETFILTER_XT_TARGET_TRACE
+++ b/configs/base-generic/CONFIG_NETFILTER_XT_TARGET_TRACE
diff --git a/baseconfig/CONFIG_NETLABEL b/configs/base-generic/CONFIG_NETLABEL
index b6e2bb090..b6e2bb090 100644
--- a/baseconfig/CONFIG_NETLABEL
+++ b/configs/base-generic/CONFIG_NETLABEL
diff --git a/baseconfig/CONFIG_NETLINK_DIAG b/configs/base-generic/CONFIG_NETLINK_DIAG
index 0c5dc1806..0c5dc1806 100644
--- a/baseconfig/CONFIG_NETLINK_DIAG
+++ b/configs/base-generic/CONFIG_NETLINK_DIAG
diff --git a/baseconfig/CONFIG_NETROM b/configs/base-generic/CONFIG_NETROM
index ab7245953..ab7245953 100644
--- a/baseconfig/CONFIG_NETROM
+++ b/configs/base-generic/CONFIG_NETROM
diff --git a/baseconfig/CONFIG_NETWORK_FILESYSTEMS b/configs/base-generic/CONFIG_NETWORK_FILESYSTEMS
index 55e644969..55e644969 100644
--- a/baseconfig/CONFIG_NETWORK_FILESYSTEMS
+++ b/configs/base-generic/CONFIG_NETWORK_FILESYSTEMS
diff --git a/baseconfig/CONFIG_NETWORK_PHY_TIMESTAMPING b/configs/base-generic/CONFIG_NETWORK_PHY_TIMESTAMPING
index 3ef3fad28..3ef3fad28 100644
--- a/baseconfig/CONFIG_NETWORK_PHY_TIMESTAMPING
+++ b/configs/base-generic/CONFIG_NETWORK_PHY_TIMESTAMPING
diff --git a/baseconfig/CONFIG_NETXEN_NIC b/configs/base-generic/CONFIG_NETXEN_NIC
index 0ecefb663..0ecefb663 100644
--- a/baseconfig/CONFIG_NETXEN_NIC
+++ b/configs/base-generic/CONFIG_NETXEN_NIC
diff --git a/baseconfig/CONFIG_NET_9P b/configs/base-generic/CONFIG_NET_9P
index c2a0d8dc5..c2a0d8dc5 100644
--- a/baseconfig/CONFIG_NET_9P
+++ b/configs/base-generic/CONFIG_NET_9P
diff --git a/baseconfig/CONFIG_NET_9P_DEBUG b/configs/base-generic/CONFIG_NET_9P_DEBUG
index b94dc3d08..b94dc3d08 100644
--- a/baseconfig/CONFIG_NET_9P_DEBUG
+++ b/configs/base-generic/CONFIG_NET_9P_DEBUG
diff --git a/baseconfig/CONFIG_NET_9P_RDMA b/configs/base-generic/CONFIG_NET_9P_RDMA
index 6704c4c59..6704c4c59 100644
--- a/baseconfig/CONFIG_NET_9P_RDMA
+++ b/configs/base-generic/CONFIG_NET_9P_RDMA
diff --git a/baseconfig/CONFIG_NET_9P_VIRTIO b/configs/base-generic/CONFIG_NET_9P_VIRTIO
index ce9e8b4ec..ce9e8b4ec 100644
--- a/baseconfig/CONFIG_NET_9P_VIRTIO
+++ b/configs/base-generic/CONFIG_NET_9P_VIRTIO
diff --git a/baseconfig/CONFIG_NET_9P_XEN b/configs/base-generic/CONFIG_NET_9P_XEN
index d2565ede3..d2565ede3 100644
--- a/baseconfig/CONFIG_NET_9P_XEN
+++ b/configs/base-generic/CONFIG_NET_9P_XEN
diff --git a/baseconfig/CONFIG_NET_ACT_BPF b/configs/base-generic/CONFIG_NET_ACT_BPF
index b66cfa276..b66cfa276 100644
--- a/baseconfig/CONFIG_NET_ACT_BPF
+++ b/configs/base-generic/CONFIG_NET_ACT_BPF
diff --git a/baseconfig/CONFIG_NET_ACT_CONNMARK b/configs/base-generic/CONFIG_NET_ACT_CONNMARK
index 2bd23ac62..2bd23ac62 100644
--- a/baseconfig/CONFIG_NET_ACT_CONNMARK
+++ b/configs/base-generic/CONFIG_NET_ACT_CONNMARK
diff --git a/baseconfig/CONFIG_NET_ACT_CSUM b/configs/base-generic/CONFIG_NET_ACT_CSUM
index 4e9409406..4e9409406 100644
--- a/baseconfig/CONFIG_NET_ACT_CSUM
+++ b/configs/base-generic/CONFIG_NET_ACT_CSUM
diff --git a/baseconfig/CONFIG_NET_ACT_GACT b/configs/base-generic/CONFIG_NET_ACT_GACT
index 0ae15de6b..0ae15de6b 100644
--- a/baseconfig/CONFIG_NET_ACT_GACT
+++ b/configs/base-generic/CONFIG_NET_ACT_GACT
diff --git a/baseconfig/CONFIG_NET_ACT_IFE b/configs/base-generic/CONFIG_NET_ACT_IFE
index 5552e2b03..5552e2b03 100644
--- a/baseconfig/CONFIG_NET_ACT_IFE
+++ b/configs/base-generic/CONFIG_NET_ACT_IFE
diff --git a/baseconfig/CONFIG_NET_ACT_IPT b/configs/base-generic/CONFIG_NET_ACT_IPT
index 3b03e8356..3b03e8356 100644
--- a/baseconfig/CONFIG_NET_ACT_IPT
+++ b/configs/base-generic/CONFIG_NET_ACT_IPT
diff --git a/baseconfig/CONFIG_NET_ACT_MIRRED b/configs/base-generic/CONFIG_NET_ACT_MIRRED
index e16b33a22..e16b33a22 100644
--- a/baseconfig/CONFIG_NET_ACT_MIRRED
+++ b/configs/base-generic/CONFIG_NET_ACT_MIRRED
diff --git a/baseconfig/CONFIG_NET_ACT_NAT b/configs/base-generic/CONFIG_NET_ACT_NAT
index e6812fbdc..e6812fbdc 100644
--- a/baseconfig/CONFIG_NET_ACT_NAT
+++ b/configs/base-generic/CONFIG_NET_ACT_NAT
diff --git a/baseconfig/CONFIG_NET_ACT_PEDIT b/configs/base-generic/CONFIG_NET_ACT_PEDIT
index 8ac1123aa..8ac1123aa 100644
--- a/baseconfig/CONFIG_NET_ACT_PEDIT
+++ b/configs/base-generic/CONFIG_NET_ACT_PEDIT
diff --git a/baseconfig/CONFIG_NET_ACT_POLICE b/configs/base-generic/CONFIG_NET_ACT_POLICE
index f0b4560c2..f0b4560c2 100644
--- a/baseconfig/CONFIG_NET_ACT_POLICE
+++ b/configs/base-generic/CONFIG_NET_ACT_POLICE
diff --git a/baseconfig/CONFIG_NET_ACT_SAMPLE b/configs/base-generic/CONFIG_NET_ACT_SAMPLE
index 4582be19d..4582be19d 100644
--- a/baseconfig/CONFIG_NET_ACT_SAMPLE
+++ b/configs/base-generic/CONFIG_NET_ACT_SAMPLE
diff --git a/baseconfig/CONFIG_NET_ACT_SIMP b/configs/base-generic/CONFIG_NET_ACT_SIMP
index 7203e8d68..7203e8d68 100644
--- a/baseconfig/CONFIG_NET_ACT_SIMP
+++ b/configs/base-generic/CONFIG_NET_ACT_SIMP
diff --git a/baseconfig/CONFIG_NET_ACT_SKBEDIT b/configs/base-generic/CONFIG_NET_ACT_SKBEDIT
index f3da96aa3..f3da96aa3 100644
--- a/baseconfig/CONFIG_NET_ACT_SKBEDIT
+++ b/configs/base-generic/CONFIG_NET_ACT_SKBEDIT
diff --git a/baseconfig/CONFIG_NET_ACT_SKBMOD b/configs/base-generic/CONFIG_NET_ACT_SKBMOD
index 90fa73044..90fa73044 100644
--- a/baseconfig/CONFIG_NET_ACT_SKBMOD
+++ b/configs/base-generic/CONFIG_NET_ACT_SKBMOD
diff --git a/baseconfig/CONFIG_NET_ACT_TUNNEL_KEY b/configs/base-generic/CONFIG_NET_ACT_TUNNEL_KEY
index a03041955..a03041955 100644
--- a/baseconfig/CONFIG_NET_ACT_TUNNEL_KEY
+++ b/configs/base-generic/CONFIG_NET_ACT_TUNNEL_KEY
diff --git a/baseconfig/CONFIG_NET_ACT_VLAN b/configs/base-generic/CONFIG_NET_ACT_VLAN
index b47e5e427..b47e5e427 100644
--- a/baseconfig/CONFIG_NET_ACT_VLAN
+++ b/configs/base-generic/CONFIG_NET_ACT_VLAN
diff --git a/baseconfig/CONFIG_NET_CADENCE b/configs/base-generic/CONFIG_NET_CADENCE
index 38ff44b0f..38ff44b0f 100644
--- a/baseconfig/CONFIG_NET_CADENCE
+++ b/configs/base-generic/CONFIG_NET_CADENCE
diff --git a/baseconfig/CONFIG_NET_CALXEDA_XGMAC b/configs/base-generic/CONFIG_NET_CALXEDA_XGMAC
index 66a3b2c8b..66a3b2c8b 100644
--- a/baseconfig/CONFIG_NET_CALXEDA_XGMAC
+++ b/configs/base-generic/CONFIG_NET_CALXEDA_XGMAC
diff --git a/baseconfig/CONFIG_NET_CLS b/configs/base-generic/CONFIG_NET_CLS
index f2125c41e..f2125c41e 100644
--- a/baseconfig/CONFIG_NET_CLS
+++ b/configs/base-generic/CONFIG_NET_CLS
diff --git a/baseconfig/CONFIG_NET_CLS_ACT b/configs/base-generic/CONFIG_NET_CLS_ACT
index 3f248b913..3f248b913 100644
--- a/baseconfig/CONFIG_NET_CLS_ACT
+++ b/configs/base-generic/CONFIG_NET_CLS_ACT
diff --git a/baseconfig/CONFIG_NET_CLS_BASIC b/configs/base-generic/CONFIG_NET_CLS_BASIC
index 9f9628713..9f9628713 100644
--- a/baseconfig/CONFIG_NET_CLS_BASIC
+++ b/configs/base-generic/CONFIG_NET_CLS_BASIC
diff --git a/baseconfig/CONFIG_NET_CLS_BPF b/configs/base-generic/CONFIG_NET_CLS_BPF
index 5645a27b5..5645a27b5 100644
--- a/baseconfig/CONFIG_NET_CLS_BPF
+++ b/configs/base-generic/CONFIG_NET_CLS_BPF
diff --git a/baseconfig/CONFIG_NET_CLS_CGROUP b/configs/base-generic/CONFIG_NET_CLS_CGROUP
index 43802195c..43802195c 100644
--- a/baseconfig/CONFIG_NET_CLS_CGROUP
+++ b/configs/base-generic/CONFIG_NET_CLS_CGROUP
diff --git a/baseconfig/CONFIG_NET_CLS_FLOW b/configs/base-generic/CONFIG_NET_CLS_FLOW
index 0f3fee089..0f3fee089 100644
--- a/baseconfig/CONFIG_NET_CLS_FLOW
+++ b/configs/base-generic/CONFIG_NET_CLS_FLOW
diff --git a/baseconfig/CONFIG_NET_CLS_FLOWER b/configs/base-generic/CONFIG_NET_CLS_FLOWER
index d26b4ef82..d26b4ef82 100644
--- a/baseconfig/CONFIG_NET_CLS_FLOWER
+++ b/configs/base-generic/CONFIG_NET_CLS_FLOWER
diff --git a/baseconfig/CONFIG_NET_CLS_FW b/configs/base-generic/CONFIG_NET_CLS_FW
index fb88679bb..fb88679bb 100644
--- a/baseconfig/CONFIG_NET_CLS_FW
+++ b/configs/base-generic/CONFIG_NET_CLS_FW
diff --git a/baseconfig/CONFIG_NET_CLS_IND b/configs/base-generic/CONFIG_NET_CLS_IND
index 27306e723..27306e723 100644
--- a/baseconfig/CONFIG_NET_CLS_IND
+++ b/configs/base-generic/CONFIG_NET_CLS_IND
diff --git a/baseconfig/CONFIG_NET_CLS_MATCHALL b/configs/base-generic/CONFIG_NET_CLS_MATCHALL
index a365ce870..a365ce870 100644
--- a/baseconfig/CONFIG_NET_CLS_MATCHALL
+++ b/configs/base-generic/CONFIG_NET_CLS_MATCHALL
diff --git a/baseconfig/CONFIG_NET_CLS_ROUTE b/configs/base-generic/CONFIG_NET_CLS_ROUTE
index 33bc69df2..33bc69df2 100644
--- a/baseconfig/CONFIG_NET_CLS_ROUTE
+++ b/configs/base-generic/CONFIG_NET_CLS_ROUTE
diff --git a/baseconfig/CONFIG_NET_CLS_ROUTE4 b/configs/base-generic/CONFIG_NET_CLS_ROUTE4
index 1260f8c9a..1260f8c9a 100644
--- a/baseconfig/CONFIG_NET_CLS_ROUTE4
+++ b/configs/base-generic/CONFIG_NET_CLS_ROUTE4
diff --git a/baseconfig/CONFIG_NET_CLS_RSVP b/configs/base-generic/CONFIG_NET_CLS_RSVP
index 0dd4d82e8..0dd4d82e8 100644
--- a/baseconfig/CONFIG_NET_CLS_RSVP
+++ b/configs/base-generic/CONFIG_NET_CLS_RSVP
diff --git a/baseconfig/CONFIG_NET_CLS_RSVP6 b/configs/base-generic/CONFIG_NET_CLS_RSVP6
index 7eac7cedc..7eac7cedc 100644
--- a/baseconfig/CONFIG_NET_CLS_RSVP6
+++ b/configs/base-generic/CONFIG_NET_CLS_RSVP6
diff --git a/baseconfig/CONFIG_NET_CLS_TCINDEX b/configs/base-generic/CONFIG_NET_CLS_TCINDEX
index b6e271d01..b6e271d01 100644
--- a/baseconfig/CONFIG_NET_CLS_TCINDEX
+++ b/configs/base-generic/CONFIG_NET_CLS_TCINDEX
diff --git a/baseconfig/CONFIG_NET_CLS_U32 b/configs/base-generic/CONFIG_NET_CLS_U32
index ebbda2496..ebbda2496 100644
--- a/baseconfig/CONFIG_NET_CLS_U32
+++ b/configs/base-generic/CONFIG_NET_CLS_U32
diff --git a/baseconfig/CONFIG_NET_CORE b/configs/base-generic/CONFIG_NET_CORE
index 104f6aed8..104f6aed8 100644
--- a/baseconfig/CONFIG_NET_CORE
+++ b/configs/base-generic/CONFIG_NET_CORE
diff --git a/baseconfig/CONFIG_NET_DCCPPROBE b/configs/base-generic/CONFIG_NET_DCCPPROBE
index 4b72560e3..4b72560e3 100644
--- a/baseconfig/CONFIG_NET_DCCPPROBE
+++ b/configs/base-generic/CONFIG_NET_DCCPPROBE
diff --git a/baseconfig/CONFIG_NET_DEVLINK b/configs/base-generic/CONFIG_NET_DEVLINK
index 175ec12ca..175ec12ca 100644
--- a/baseconfig/CONFIG_NET_DEVLINK
+++ b/configs/base-generic/CONFIG_NET_DEVLINK
diff --git a/baseconfig/CONFIG_NET_DROP_MONITOR b/configs/base-generic/CONFIG_NET_DROP_MONITOR
index 9c5a23a5f..9c5a23a5f 100644
--- a/baseconfig/CONFIG_NET_DROP_MONITOR
+++ b/configs/base-generic/CONFIG_NET_DROP_MONITOR
diff --git a/baseconfig/CONFIG_NET_DSA b/configs/base-generic/CONFIG_NET_DSA
index b0a00cb9b..b0a00cb9b 100644
--- a/baseconfig/CONFIG_NET_DSA
+++ b/configs/base-generic/CONFIG_NET_DSA
diff --git a/baseconfig/CONFIG_NET_DSA_BCM_SF2 b/configs/base-generic/CONFIG_NET_DSA_BCM_SF2
index 230b2432c..230b2432c 100644
--- a/baseconfig/CONFIG_NET_DSA_BCM_SF2
+++ b/configs/base-generic/CONFIG_NET_DSA_BCM_SF2
diff --git a/baseconfig/CONFIG_NET_DSA_HWMON b/configs/base-generic/CONFIG_NET_DSA_HWMON
index a1058a311..a1058a311 100644
--- a/baseconfig/CONFIG_NET_DSA_HWMON
+++ b/configs/base-generic/CONFIG_NET_DSA_HWMON
diff --git a/baseconfig/CONFIG_NET_DSA_LOOP b/configs/base-generic/CONFIG_NET_DSA_LOOP
index 08b25de7c..08b25de7c 100644
--- a/baseconfig/CONFIG_NET_DSA_LOOP
+++ b/configs/base-generic/CONFIG_NET_DSA_LOOP
diff --git a/baseconfig/CONFIG_NET_DSA_MT7530 b/configs/base-generic/CONFIG_NET_DSA_MT7530
index 722095c89..722095c89 100644
--- a/baseconfig/CONFIG_NET_DSA_MT7530
+++ b/configs/base-generic/CONFIG_NET_DSA_MT7530
diff --git a/baseconfig/CONFIG_NET_DSA_MV88E6060 b/configs/base-generic/CONFIG_NET_DSA_MV88E6060
index f5e8187c4..f5e8187c4 100644
--- a/baseconfig/CONFIG_NET_DSA_MV88E6060
+++ b/configs/base-generic/CONFIG_NET_DSA_MV88E6060
diff --git a/baseconfig/CONFIG_NET_DSA_MV88E6XXX b/configs/base-generic/CONFIG_NET_DSA_MV88E6XXX
index d99a2ece4..d99a2ece4 100644
--- a/baseconfig/CONFIG_NET_DSA_MV88E6XXX
+++ b/configs/base-generic/CONFIG_NET_DSA_MV88E6XXX
diff --git a/baseconfig/CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 b/configs/base-generic/CONFIG_NET_DSA_MV88E6XXX_GLOBAL2
index a87083dfa..a87083dfa 100644
--- a/baseconfig/CONFIG_NET_DSA_MV88E6XXX_GLOBAL2
+++ b/configs/base-generic/CONFIG_NET_DSA_MV88E6XXX_GLOBAL2
diff --git a/baseconfig/CONFIG_NET_DSA_QCA8K b/configs/base-generic/CONFIG_NET_DSA_QCA8K
index 5b28c3b7e..5b28c3b7e 100644
--- a/baseconfig/CONFIG_NET_DSA_QCA8K
+++ b/configs/base-generic/CONFIG_NET_DSA_QCA8K
diff --git a/baseconfig/CONFIG_NET_DSA_SMSC_LAN9303_I2C b/configs/base-generic/CONFIG_NET_DSA_SMSC_LAN9303_I2C
index 7c738fff2..7c738fff2 100644
--- a/baseconfig/CONFIG_NET_DSA_SMSC_LAN9303_I2C
+++ b/configs/base-generic/CONFIG_NET_DSA_SMSC_LAN9303_I2C
diff --git a/baseconfig/CONFIG_NET_DSA_SMSC_LAN9303_MDIO b/configs/base-generic/CONFIG_NET_DSA_SMSC_LAN9303_MDIO
index d7f1987e2..d7f1987e2 100644
--- a/baseconfig/CONFIG_NET_DSA_SMSC_LAN9303_MDIO
+++ b/configs/base-generic/CONFIG_NET_DSA_SMSC_LAN9303_MDIO
diff --git a/baseconfig/CONFIG_NET_EMATCH b/configs/base-generic/CONFIG_NET_EMATCH
index f6171a72f..f6171a72f 100644
--- a/baseconfig/CONFIG_NET_EMATCH
+++ b/configs/base-generic/CONFIG_NET_EMATCH
diff --git a/baseconfig/CONFIG_NET_EMATCH_CANID b/configs/base-generic/CONFIG_NET_EMATCH_CANID
index c13963d24..c13963d24 100644
--- a/baseconfig/CONFIG_NET_EMATCH_CANID
+++ b/configs/base-generic/CONFIG_NET_EMATCH_CANID
diff --git a/baseconfig/CONFIG_NET_EMATCH_CMP b/configs/base-generic/CONFIG_NET_EMATCH_CMP
index 086dbaf24..086dbaf24 100644
--- a/baseconfig/CONFIG_NET_EMATCH_CMP
+++ b/configs/base-generic/CONFIG_NET_EMATCH_CMP
diff --git a/baseconfig/CONFIG_NET_EMATCH_IPSET b/configs/base-generic/CONFIG_NET_EMATCH_IPSET
index 2b0a70570..2b0a70570 100644
--- a/baseconfig/CONFIG_NET_EMATCH_IPSET
+++ b/configs/base-generic/CONFIG_NET_EMATCH_IPSET
diff --git a/baseconfig/CONFIG_NET_EMATCH_META b/configs/base-generic/CONFIG_NET_EMATCH_META
index 0b395db76..0b395db76 100644
--- a/baseconfig/CONFIG_NET_EMATCH_META
+++ b/configs/base-generic/CONFIG_NET_EMATCH_META
diff --git a/baseconfig/CONFIG_NET_EMATCH_NBYTE b/configs/base-generic/CONFIG_NET_EMATCH_NBYTE
index 4567128fc..4567128fc 100644
--- a/baseconfig/CONFIG_NET_EMATCH_NBYTE
+++ b/configs/base-generic/CONFIG_NET_EMATCH_NBYTE
diff --git a/baseconfig/CONFIG_NET_EMATCH_STACK b/configs/base-generic/CONFIG_NET_EMATCH_STACK
index e37337192..e37337192 100644
--- a/baseconfig/CONFIG_NET_EMATCH_STACK
+++ b/configs/base-generic/CONFIG_NET_EMATCH_STACK
diff --git a/baseconfig/CONFIG_NET_EMATCH_TEXT b/configs/base-generic/CONFIG_NET_EMATCH_TEXT
index 6fd472736..6fd472736 100644
--- a/baseconfig/CONFIG_NET_EMATCH_TEXT
+++ b/configs/base-generic/CONFIG_NET_EMATCH_TEXT
diff --git a/baseconfig/CONFIG_NET_EMATCH_U32 b/configs/base-generic/CONFIG_NET_EMATCH_U32
index 4bdebd3ee..4bdebd3ee 100644
--- a/baseconfig/CONFIG_NET_EMATCH_U32
+++ b/configs/base-generic/CONFIG_NET_EMATCH_U32
diff --git a/baseconfig/CONFIG_NET_FC b/configs/base-generic/CONFIG_NET_FC
index e232d912f..e232d912f 100644
--- a/baseconfig/CONFIG_NET_FC
+++ b/configs/base-generic/CONFIG_NET_FC
diff --git a/baseconfig/CONFIG_NET_FOU b/configs/base-generic/CONFIG_NET_FOU
index f78ee6d87..f78ee6d87 100644
--- a/baseconfig/CONFIG_NET_FOU
+++ b/configs/base-generic/CONFIG_NET_FOU
diff --git a/baseconfig/CONFIG_NET_FOU_IP_TUNNELS b/configs/base-generic/CONFIG_NET_FOU_IP_TUNNELS
index 7d89b7659..7d89b7659 100644
--- a/baseconfig/CONFIG_NET_FOU_IP_TUNNELS
+++ b/configs/base-generic/CONFIG_NET_FOU_IP_TUNNELS
diff --git a/baseconfig/CONFIG_NET_IFE b/configs/base-generic/CONFIG_NET_IFE
index eea504e0c..eea504e0c 100644
--- a/baseconfig/CONFIG_NET_IFE
+++ b/configs/base-generic/CONFIG_NET_IFE
diff --git a/baseconfig/CONFIG_NET_IFE_SKBMARK b/configs/base-generic/CONFIG_NET_IFE_SKBMARK
index 0671b87d0..0671b87d0 100644
--- a/baseconfig/CONFIG_NET_IFE_SKBMARK
+++ b/configs/base-generic/CONFIG_NET_IFE_SKBMARK
diff --git a/baseconfig/CONFIG_NET_IFE_SKBPRIO b/configs/base-generic/CONFIG_NET_IFE_SKBPRIO
index a11a0b555..a11a0b555 100644
--- a/baseconfig/CONFIG_NET_IFE_SKBPRIO
+++ b/configs/base-generic/CONFIG_NET_IFE_SKBPRIO
diff --git a/baseconfig/CONFIG_NET_IFE_SKBTCINDEX b/configs/base-generic/CONFIG_NET_IFE_SKBTCINDEX
index 7573b5f63..7573b5f63 100644
--- a/baseconfig/CONFIG_NET_IFE_SKBTCINDEX
+++ b/configs/base-generic/CONFIG_NET_IFE_SKBTCINDEX
diff --git a/baseconfig/CONFIG_NET_IPGRE b/configs/base-generic/CONFIG_NET_IPGRE
index ad527835c..ad527835c 100644
--- a/baseconfig/CONFIG_NET_IPGRE
+++ b/configs/base-generic/CONFIG_NET_IPGRE
diff --git a/baseconfig/CONFIG_NET_IPGRE_BROADCAST b/configs/base-generic/CONFIG_NET_IPGRE_BROADCAST
index dfb259c45..dfb259c45 100644
--- a/baseconfig/CONFIG_NET_IPGRE_BROADCAST
+++ b/configs/base-generic/CONFIG_NET_IPGRE_BROADCAST
diff --git a/baseconfig/CONFIG_NET_IPGRE_DEMUX b/configs/base-generic/CONFIG_NET_IPGRE_DEMUX
index 787db5263..787db5263 100644
--- a/baseconfig/CONFIG_NET_IPGRE_DEMUX
+++ b/configs/base-generic/CONFIG_NET_IPGRE_DEMUX
diff --git a/baseconfig/CONFIG_NET_IPIP b/configs/base-generic/CONFIG_NET_IPIP
index 3f1247bfc..3f1247bfc 100644
--- a/baseconfig/CONFIG_NET_IPIP
+++ b/configs/base-generic/CONFIG_NET_IPIP
diff --git a/baseconfig/CONFIG_NET_IPVTI b/configs/base-generic/CONFIG_NET_IPVTI
index e6268e22d..e6268e22d 100644
--- a/baseconfig/CONFIG_NET_IPVTI
+++ b/configs/base-generic/CONFIG_NET_IPVTI
diff --git a/baseconfig/CONFIG_NET_KEY b/configs/base-generic/CONFIG_NET_KEY
index d823a2fa3..d823a2fa3 100644
--- a/baseconfig/CONFIG_NET_KEY
+++ b/configs/base-generic/CONFIG_NET_KEY
diff --git a/baseconfig/CONFIG_NET_KEY_MIGRATE b/configs/base-generic/CONFIG_NET_KEY_MIGRATE
index 2168c1a29..2168c1a29 100644
--- a/baseconfig/CONFIG_NET_KEY_MIGRATE
+++ b/configs/base-generic/CONFIG_NET_KEY_MIGRATE
diff --git a/baseconfig/CONFIG_NET_L3_MASTER_DEV b/configs/base-generic/CONFIG_NET_L3_MASTER_DEV
index bdf39009e..bdf39009e 100644
--- a/baseconfig/CONFIG_NET_L3_MASTER_DEV
+++ b/configs/base-generic/CONFIG_NET_L3_MASTER_DEV
diff --git a/baseconfig/CONFIG_NET_MPLS_GSO b/configs/base-generic/CONFIG_NET_MPLS_GSO
index afbc29c45..afbc29c45 100644
--- a/baseconfig/CONFIG_NET_MPLS_GSO
+++ b/configs/base-generic/CONFIG_NET_MPLS_GSO
diff --git a/baseconfig/CONFIG_NET_NCSI b/configs/base-generic/CONFIG_NET_NCSI
index 7c8a38ab2..7c8a38ab2 100644
--- a/baseconfig/CONFIG_NET_NCSI
+++ b/configs/base-generic/CONFIG_NET_NCSI
diff --git a/baseconfig/CONFIG_NET_NS b/configs/base-generic/CONFIG_NET_NS
index 6c95e6942..6c95e6942 100644
--- a/baseconfig/CONFIG_NET_NS
+++ b/configs/base-generic/CONFIG_NET_NS
diff --git a/baseconfig/CONFIG_NET_NSH b/configs/base-generic/CONFIG_NET_NSH
index 2a9a24e04..2a9a24e04 100644
--- a/baseconfig/CONFIG_NET_NSH
+++ b/configs/base-generic/CONFIG_NET_NSH
diff --git a/baseconfig/CONFIG_NET_PACKET_ENGINE b/configs/base-generic/CONFIG_NET_PACKET_ENGINE
index 5c79cc527..5c79cc527 100644
--- a/baseconfig/CONFIG_NET_PACKET_ENGINE
+++ b/configs/base-generic/CONFIG_NET_PACKET_ENGINE
diff --git a/baseconfig/CONFIG_NET_PKTGEN b/configs/base-generic/CONFIG_NET_PKTGEN
index b12bf03e9..b12bf03e9 100644
--- a/baseconfig/CONFIG_NET_PKTGEN
+++ b/configs/base-generic/CONFIG_NET_PKTGEN
diff --git a/baseconfig/CONFIG_NET_POLL_CONTROLLER b/configs/base-generic/CONFIG_NET_POLL_CONTROLLER
index 681844676..681844676 100644
--- a/baseconfig/CONFIG_NET_POLL_CONTROLLER
+++ b/configs/base-generic/CONFIG_NET_POLL_CONTROLLER
diff --git a/baseconfig/CONFIG_NET_SCHED b/configs/base-generic/CONFIG_NET_SCHED
index 32758b597..32758b597 100644
--- a/baseconfig/CONFIG_NET_SCHED
+++ b/configs/base-generic/CONFIG_NET_SCHED
diff --git a/baseconfig/CONFIG_NET_SCH_ATM b/configs/base-generic/CONFIG_NET_SCH_ATM
index 0c1b9a13e..0c1b9a13e 100644
--- a/baseconfig/CONFIG_NET_SCH_ATM
+++ b/configs/base-generic/CONFIG_NET_SCH_ATM
diff --git a/baseconfig/CONFIG_NET_SCH_CBQ b/configs/base-generic/CONFIG_NET_SCH_CBQ
index 475f80e1d..475f80e1d 100644
--- a/baseconfig/CONFIG_NET_SCH_CBQ
+++ b/configs/base-generic/CONFIG_NET_SCH_CBQ
diff --git a/baseconfig/CONFIG_NET_SCH_CHOKE b/configs/base-generic/CONFIG_NET_SCH_CHOKE
index 6ab0baf14..6ab0baf14 100644
--- a/baseconfig/CONFIG_NET_SCH_CHOKE
+++ b/configs/base-generic/CONFIG_NET_SCH_CHOKE
diff --git a/baseconfig/CONFIG_NET_SCH_CODEL b/configs/base-generic/CONFIG_NET_SCH_CODEL
index 817865e08..817865e08 100644
--- a/baseconfig/CONFIG_NET_SCH_CODEL
+++ b/configs/base-generic/CONFIG_NET_SCH_CODEL
diff --git a/baseconfig/CONFIG_NET_SCH_DEFAULT b/configs/base-generic/CONFIG_NET_SCH_DEFAULT
index a4c53d281..a4c53d281 100644
--- a/baseconfig/CONFIG_NET_SCH_DEFAULT
+++ b/configs/base-generic/CONFIG_NET_SCH_DEFAULT
diff --git a/baseconfig/CONFIG_NET_SCH_DRR b/configs/base-generic/CONFIG_NET_SCH_DRR
index 4577d1602..4577d1602 100644
--- a/baseconfig/CONFIG_NET_SCH_DRR
+++ b/configs/base-generic/CONFIG_NET_SCH_DRR
diff --git a/baseconfig/CONFIG_NET_SCH_DSMARK b/configs/base-generic/CONFIG_NET_SCH_DSMARK
index dc6076bbf..dc6076bbf 100644
--- a/baseconfig/CONFIG_NET_SCH_DSMARK
+++ b/configs/base-generic/CONFIG_NET_SCH_DSMARK
diff --git a/baseconfig/CONFIG_NET_SCH_FQ b/configs/base-generic/CONFIG_NET_SCH_FQ
index a8feeea07..a8feeea07 100644
--- a/baseconfig/CONFIG_NET_SCH_FQ
+++ b/configs/base-generic/CONFIG_NET_SCH_FQ
diff --git a/baseconfig/CONFIG_NET_SCH_FQ_CODEL b/configs/base-generic/CONFIG_NET_SCH_FQ_CODEL
index 1a0f8aa77..1a0f8aa77 100644
--- a/baseconfig/CONFIG_NET_SCH_FQ_CODEL
+++ b/configs/base-generic/CONFIG_NET_SCH_FQ_CODEL
diff --git a/baseconfig/CONFIG_NET_SCH_GRED b/configs/base-generic/CONFIG_NET_SCH_GRED
index 6c050d770..6c050d770 100644
--- a/baseconfig/CONFIG_NET_SCH_GRED
+++ b/configs/base-generic/CONFIG_NET_SCH_GRED
diff --git a/baseconfig/CONFIG_NET_SCH_HFSC b/configs/base-generic/CONFIG_NET_SCH_HFSC
index 6c5361abd..6c5361abd 100644
--- a/baseconfig/CONFIG_NET_SCH_HFSC
+++ b/configs/base-generic/CONFIG_NET_SCH_HFSC
diff --git a/baseconfig/CONFIG_NET_SCH_HHF b/configs/base-generic/CONFIG_NET_SCH_HHF
index 784312a46..784312a46 100644
--- a/baseconfig/CONFIG_NET_SCH_HHF
+++ b/configs/base-generic/CONFIG_NET_SCH_HHF
diff --git a/baseconfig/CONFIG_NET_SCH_HTB b/configs/base-generic/CONFIG_NET_SCH_HTB
index 046d4d9fb..046d4d9fb 100644
--- a/baseconfig/CONFIG_NET_SCH_HTB
+++ b/configs/base-generic/CONFIG_NET_SCH_HTB
diff --git a/baseconfig/CONFIG_NET_SCH_INGRESS b/configs/base-generic/CONFIG_NET_SCH_INGRESS
index 7cee4bc28..7cee4bc28 100644
--- a/baseconfig/CONFIG_NET_SCH_INGRESS
+++ b/configs/base-generic/CONFIG_NET_SCH_INGRESS
diff --git a/baseconfig/CONFIG_NET_SCH_MQPRIO b/configs/base-generic/CONFIG_NET_SCH_MQPRIO
index 4acab8915..4acab8915 100644
--- a/baseconfig/CONFIG_NET_SCH_MQPRIO
+++ b/configs/base-generic/CONFIG_NET_SCH_MQPRIO
diff --git a/baseconfig/CONFIG_NET_SCH_MULTIQ b/configs/base-generic/CONFIG_NET_SCH_MULTIQ
index 118b13e09..118b13e09 100644
--- a/baseconfig/CONFIG_NET_SCH_MULTIQ
+++ b/configs/base-generic/CONFIG_NET_SCH_MULTIQ
diff --git a/baseconfig/CONFIG_NET_SCH_NETEM b/configs/base-generic/CONFIG_NET_SCH_NETEM
index 37799e653..37799e653 100644
--- a/baseconfig/CONFIG_NET_SCH_NETEM
+++ b/configs/base-generic/CONFIG_NET_SCH_NETEM
diff --git a/baseconfig/CONFIG_NET_SCH_PIE b/configs/base-generic/CONFIG_NET_SCH_PIE
index dc9f48fe5..dc9f48fe5 100644
--- a/baseconfig/CONFIG_NET_SCH_PIE
+++ b/configs/base-generic/CONFIG_NET_SCH_PIE
diff --git a/baseconfig/CONFIG_NET_SCH_PLUG b/configs/base-generic/CONFIG_NET_SCH_PLUG
index b27bf6ac0..b27bf6ac0 100644
--- a/baseconfig/CONFIG_NET_SCH_PLUG
+++ b/configs/base-generic/CONFIG_NET_SCH_PLUG
diff --git a/baseconfig/CONFIG_NET_SCH_PRIO b/configs/base-generic/CONFIG_NET_SCH_PRIO
index d7c3ad33d..d7c3ad33d 100644
--- a/baseconfig/CONFIG_NET_SCH_PRIO
+++ b/configs/base-generic/CONFIG_NET_SCH_PRIO
diff --git a/baseconfig/CONFIG_NET_SCH_QFQ b/configs/base-generic/CONFIG_NET_SCH_QFQ
index a4000beb9..a4000beb9 100644
--- a/baseconfig/CONFIG_NET_SCH_QFQ
+++ b/configs/base-generic/CONFIG_NET_SCH_QFQ
diff --git a/baseconfig/CONFIG_NET_SCH_RED b/configs/base-generic/CONFIG_NET_SCH_RED
index c08d04d94..c08d04d94 100644
--- a/baseconfig/CONFIG_NET_SCH_RED
+++ b/configs/base-generic/CONFIG_NET_SCH_RED
diff --git a/baseconfig/CONFIG_NET_SCH_SFB b/configs/base-generic/CONFIG_NET_SCH_SFB
index 72985ce86..72985ce86 100644
--- a/baseconfig/CONFIG_NET_SCH_SFB
+++ b/configs/base-generic/CONFIG_NET_SCH_SFB
diff --git a/baseconfig/CONFIG_NET_SCH_SFQ b/configs/base-generic/CONFIG_NET_SCH_SFQ
index 66b3ebbae..66b3ebbae 100644
--- a/baseconfig/CONFIG_NET_SCH_SFQ
+++ b/configs/base-generic/CONFIG_NET_SCH_SFQ
diff --git a/baseconfig/CONFIG_NET_SCH_TBF b/configs/base-generic/CONFIG_NET_SCH_TBF
index b45dd0213..b45dd0213 100644
--- a/baseconfig/CONFIG_NET_SCH_TBF
+++ b/configs/base-generic/CONFIG_NET_SCH_TBF
diff --git a/baseconfig/CONFIG_NET_SCH_TEQL b/configs/base-generic/CONFIG_NET_SCH_TEQL
index 2c7a73b04..2c7a73b04 100644
--- a/baseconfig/CONFIG_NET_SCH_TEQL
+++ b/configs/base-generic/CONFIG_NET_SCH_TEQL
diff --git a/baseconfig/CONFIG_NET_SCTPPROBE b/configs/base-generic/CONFIG_NET_SCTPPROBE
index 784449997..784449997 100644
--- a/baseconfig/CONFIG_NET_SCTPPROBE
+++ b/configs/base-generic/CONFIG_NET_SCTPPROBE
diff --git a/baseconfig/CONFIG_NET_SWITCHDEV b/configs/base-generic/CONFIG_NET_SWITCHDEV
index f4f578e75..f4f578e75 100644
--- a/baseconfig/CONFIG_NET_SWITCHDEV
+++ b/configs/base-generic/CONFIG_NET_SWITCHDEV
diff --git a/baseconfig/CONFIG_NET_TCPPROBE b/configs/base-generic/CONFIG_NET_TCPPROBE
index 9fe41d11c..9fe41d11c 100644
--- a/baseconfig/CONFIG_NET_TCPPROBE
+++ b/configs/base-generic/CONFIG_NET_TCPPROBE
diff --git a/baseconfig/CONFIG_NET_TEAM b/configs/base-generic/CONFIG_NET_TEAM
index 1577c67e3..1577c67e3 100644
--- a/baseconfig/CONFIG_NET_TEAM
+++ b/configs/base-generic/CONFIG_NET_TEAM
diff --git a/baseconfig/CONFIG_NET_TEAM_MODE_ACTIVEBACKUP b/configs/base-generic/CONFIG_NET_TEAM_MODE_ACTIVEBACKUP
index bcfc4d09f..bcfc4d09f 100644
--- a/baseconfig/CONFIG_NET_TEAM_MODE_ACTIVEBACKUP
+++ b/configs/base-generic/CONFIG_NET_TEAM_MODE_ACTIVEBACKUP
diff --git a/baseconfig/CONFIG_NET_TEAM_MODE_BROADCAST b/configs/base-generic/CONFIG_NET_TEAM_MODE_BROADCAST
index ec786b431..ec786b431 100644
--- a/baseconfig/CONFIG_NET_TEAM_MODE_BROADCAST
+++ b/configs/base-generic/CONFIG_NET_TEAM_MODE_BROADCAST
diff --git a/baseconfig/CONFIG_NET_TEAM_MODE_LOADBALANCE b/configs/base-generic/CONFIG_NET_TEAM_MODE_LOADBALANCE
index 018ec31ed..018ec31ed 100644
--- a/baseconfig/CONFIG_NET_TEAM_MODE_LOADBALANCE
+++ b/configs/base-generic/CONFIG_NET_TEAM_MODE_LOADBALANCE
diff --git a/baseconfig/CONFIG_NET_TEAM_MODE_RANDOM b/configs/base-generic/CONFIG_NET_TEAM_MODE_RANDOM
index f4ed7452e..f4ed7452e 100644
--- a/baseconfig/CONFIG_NET_TEAM_MODE_RANDOM
+++ b/configs/base-generic/CONFIG_NET_TEAM_MODE_RANDOM
diff --git a/baseconfig/CONFIG_NET_TEAM_MODE_ROUNDROBIN b/configs/base-generic/CONFIG_NET_TEAM_MODE_ROUNDROBIN
index c7d4ad7ae..c7d4ad7ae 100644
--- a/baseconfig/CONFIG_NET_TEAM_MODE_ROUNDROBIN
+++ b/configs/base-generic/CONFIG_NET_TEAM_MODE_ROUNDROBIN
diff --git a/baseconfig/CONFIG_NET_TULIP b/configs/base-generic/CONFIG_NET_TULIP
index 1191c3853..1191c3853 100644
--- a/baseconfig/CONFIG_NET_TULIP
+++ b/configs/base-generic/CONFIG_NET_TULIP
diff --git a/baseconfig/CONFIG_NET_VENDOR_3COM b/configs/base-generic/CONFIG_NET_VENDOR_3COM
index d14d2037d..d14d2037d 100644
--- a/baseconfig/CONFIG_NET_VENDOR_3COM
+++ b/configs/base-generic/CONFIG_NET_VENDOR_3COM
diff --git a/baseconfig/CONFIG_NET_VENDOR_8390 b/configs/base-generic/CONFIG_NET_VENDOR_8390
index 231c69a89..231c69a89 100644
--- a/baseconfig/CONFIG_NET_VENDOR_8390
+++ b/configs/base-generic/CONFIG_NET_VENDOR_8390
diff --git a/baseconfig/CONFIG_NET_VENDOR_ADAPTEC b/configs/base-generic/CONFIG_NET_VENDOR_ADAPTEC
index 6bd9f17d2..6bd9f17d2 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ADAPTEC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ADAPTEC
diff --git a/baseconfig/CONFIG_NET_VENDOR_AGERE b/configs/base-generic/CONFIG_NET_VENDOR_AGERE
index b732cef19..b732cef19 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AGERE
+++ b/configs/base-generic/CONFIG_NET_VENDOR_AGERE
diff --git a/baseconfig/CONFIG_NET_VENDOR_ALACRITECH b/configs/base-generic/CONFIG_NET_VENDOR_ALACRITECH
index f1a98f8bb..f1a98f8bb 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ALACRITECH
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ALACRITECH
diff --git a/baseconfig/CONFIG_NET_VENDOR_ALTEON b/configs/base-generic/CONFIG_NET_VENDOR_ALTEON
index 7d8ebc94a..7d8ebc94a 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ALTEON
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ALTEON
diff --git a/baseconfig/CONFIG_NET_VENDOR_AMAZON b/configs/base-generic/CONFIG_NET_VENDOR_AMAZON
index 71e03d079..71e03d079 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AMAZON
+++ b/configs/base-generic/CONFIG_NET_VENDOR_AMAZON
diff --git a/baseconfig/CONFIG_NET_VENDOR_AMD b/configs/base-generic/CONFIG_NET_VENDOR_AMD
index f67eb8fad..f67eb8fad 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AMD
+++ b/configs/base-generic/CONFIG_NET_VENDOR_AMD
diff --git a/baseconfig/CONFIG_NET_VENDOR_AQUANTIA b/configs/base-generic/CONFIG_NET_VENDOR_AQUANTIA
index f8ae0ca05..f8ae0ca05 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AQUANTIA
+++ b/configs/base-generic/CONFIG_NET_VENDOR_AQUANTIA
diff --git a/baseconfig/CONFIG_NET_VENDOR_ARC b/configs/base-generic/CONFIG_NET_VENDOR_ARC
index 3f9c82b74..3f9c82b74 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ARC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ARC
diff --git a/baseconfig/CONFIG_NET_VENDOR_ATHEROS b/configs/base-generic/CONFIG_NET_VENDOR_ATHEROS
index 96c98bc6a..96c98bc6a 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ATHEROS
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ATHEROS
diff --git a/baseconfig/CONFIG_NET_VENDOR_AURORA b/configs/base-generic/CONFIG_NET_VENDOR_AURORA
index 1192277f7..1192277f7 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AURORA
+++ b/configs/base-generic/CONFIG_NET_VENDOR_AURORA
diff --git a/baseconfig/CONFIG_NET_VENDOR_BROADCOM b/configs/base-generic/CONFIG_NET_VENDOR_BROADCOM
index 32cb66765..32cb66765 100644
--- a/baseconfig/CONFIG_NET_VENDOR_BROADCOM
+++ b/configs/base-generic/CONFIG_NET_VENDOR_BROADCOM
diff --git a/baseconfig/CONFIG_NET_VENDOR_BROCADE b/configs/base-generic/CONFIG_NET_VENDOR_BROCADE
index 5ca46d872..5ca46d872 100644
--- a/baseconfig/CONFIG_NET_VENDOR_BROCADE
+++ b/configs/base-generic/CONFIG_NET_VENDOR_BROCADE
diff --git a/baseconfig/CONFIG_NET_VENDOR_CAVIUM b/configs/base-generic/CONFIG_NET_VENDOR_CAVIUM
index 8ce9d7b5c..8ce9d7b5c 100644
--- a/baseconfig/CONFIG_NET_VENDOR_CAVIUM
+++ b/configs/base-generic/CONFIG_NET_VENDOR_CAVIUM
diff --git a/baseconfig/CONFIG_NET_VENDOR_CHELSIO b/configs/base-generic/CONFIG_NET_VENDOR_CHELSIO
index b039e40c2..b039e40c2 100644
--- a/baseconfig/CONFIG_NET_VENDOR_CHELSIO
+++ b/configs/base-generic/CONFIG_NET_VENDOR_CHELSIO
diff --git a/baseconfig/CONFIG_NET_VENDOR_CISCO b/configs/base-generic/CONFIG_NET_VENDOR_CISCO
index 0c803ecf2..0c803ecf2 100644
--- a/baseconfig/CONFIG_NET_VENDOR_CISCO
+++ b/configs/base-generic/CONFIG_NET_VENDOR_CISCO
diff --git a/baseconfig/CONFIG_NET_VENDOR_DEC b/configs/base-generic/CONFIG_NET_VENDOR_DEC
index 5d2f9d54c..5d2f9d54c 100644
--- a/baseconfig/CONFIG_NET_VENDOR_DEC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_DEC
diff --git a/baseconfig/CONFIG_NET_VENDOR_DLINK b/configs/base-generic/CONFIG_NET_VENDOR_DLINK
index 0e8b2540d..0e8b2540d 100644
--- a/baseconfig/CONFIG_NET_VENDOR_DLINK
+++ b/configs/base-generic/CONFIG_NET_VENDOR_DLINK
diff --git a/baseconfig/CONFIG_NET_VENDOR_EMULEX b/configs/base-generic/CONFIG_NET_VENDOR_EMULEX
index 8751238f9..8751238f9 100644
--- a/baseconfig/CONFIG_NET_VENDOR_EMULEX
+++ b/configs/base-generic/CONFIG_NET_VENDOR_EMULEX
diff --git a/baseconfig/CONFIG_NET_VENDOR_EXAR b/configs/base-generic/CONFIG_NET_VENDOR_EXAR
index a484e40b1..a484e40b1 100644
--- a/baseconfig/CONFIG_NET_VENDOR_EXAR
+++ b/configs/base-generic/CONFIG_NET_VENDOR_EXAR
diff --git a/baseconfig/CONFIG_NET_VENDOR_EZCHIP b/configs/base-generic/CONFIG_NET_VENDOR_EZCHIP
index 6b7cb9892..6b7cb9892 100644
--- a/baseconfig/CONFIG_NET_VENDOR_EZCHIP
+++ b/configs/base-generic/CONFIG_NET_VENDOR_EZCHIP
diff --git a/baseconfig/CONFIG_NET_VENDOR_FARADAY b/configs/base-generic/CONFIG_NET_VENDOR_FARADAY
index 17b197ef4..17b197ef4 100644
--- a/baseconfig/CONFIG_NET_VENDOR_FARADAY
+++ b/configs/base-generic/CONFIG_NET_VENDOR_FARADAY
diff --git a/baseconfig/CONFIG_NET_VENDOR_FUJITSU b/configs/base-generic/CONFIG_NET_VENDOR_FUJITSU
index 565607493..565607493 100644
--- a/baseconfig/CONFIG_NET_VENDOR_FUJITSU
+++ b/configs/base-generic/CONFIG_NET_VENDOR_FUJITSU
diff --git a/baseconfig/CONFIG_NET_VENDOR_HISILICON b/configs/base-generic/CONFIG_NET_VENDOR_HISILICON
index 498c46706..498c46706 100644
--- a/baseconfig/CONFIG_NET_VENDOR_HISILICON
+++ b/configs/base-generic/CONFIG_NET_VENDOR_HISILICON
diff --git a/baseconfig/CONFIG_NET_VENDOR_HP b/configs/base-generic/CONFIG_NET_VENDOR_HP
index 30f3b4050..30f3b4050 100644
--- a/baseconfig/CONFIG_NET_VENDOR_HP
+++ b/configs/base-generic/CONFIG_NET_VENDOR_HP
diff --git a/baseconfig/CONFIG_NET_VENDOR_HUAWEI b/configs/base-generic/CONFIG_NET_VENDOR_HUAWEI
index ae01b9160..ae01b9160 100644
--- a/baseconfig/CONFIG_NET_VENDOR_HUAWEI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_HUAWEI
diff --git a/baseconfig/CONFIG_NET_VENDOR_I825XX b/configs/base-generic/CONFIG_NET_VENDOR_I825XX
index 0647bca02..0647bca02 100644
--- a/baseconfig/CONFIG_NET_VENDOR_I825XX
+++ b/configs/base-generic/CONFIG_NET_VENDOR_I825XX
diff --git a/baseconfig/CONFIG_NET_VENDOR_INTEL b/configs/base-generic/CONFIG_NET_VENDOR_INTEL
index 00321eadb..00321eadb 100644
--- a/baseconfig/CONFIG_NET_VENDOR_INTEL
+++ b/configs/base-generic/CONFIG_NET_VENDOR_INTEL
diff --git a/baseconfig/CONFIG_NET_VENDOR_MARVELL b/configs/base-generic/CONFIG_NET_VENDOR_MARVELL
index e0289550e..e0289550e 100644
--- a/baseconfig/CONFIG_NET_VENDOR_MARVELL
+++ b/configs/base-generic/CONFIG_NET_VENDOR_MARVELL
diff --git a/baseconfig/CONFIG_NET_VENDOR_MICREL b/configs/base-generic/CONFIG_NET_VENDOR_MICREL
index 3e153e928..3e153e928 100644
--- a/baseconfig/CONFIG_NET_VENDOR_MICREL
+++ b/configs/base-generic/CONFIG_NET_VENDOR_MICREL
diff --git a/baseconfig/CONFIG_NET_VENDOR_MICROCHIP b/configs/base-generic/CONFIG_NET_VENDOR_MICROCHIP
index 8a7b69b77..8a7b69b77 100644
--- a/baseconfig/CONFIG_NET_VENDOR_MICROCHIP
+++ b/configs/base-generic/CONFIG_NET_VENDOR_MICROCHIP
diff --git a/baseconfig/CONFIG_NET_VENDOR_MYRI b/configs/base-generic/CONFIG_NET_VENDOR_MYRI
index 9a7d24c54..9a7d24c54 100644
--- a/baseconfig/CONFIG_NET_VENDOR_MYRI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_MYRI
diff --git a/baseconfig/CONFIG_NET_VENDOR_NATSEMI b/configs/base-generic/CONFIG_NET_VENDOR_NATSEMI
index ff63771ee..ff63771ee 100644
--- a/baseconfig/CONFIG_NET_VENDOR_NATSEMI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_NATSEMI
diff --git a/baseconfig/CONFIG_NET_VENDOR_NETRONOME b/configs/base-generic/CONFIG_NET_VENDOR_NETRONOME
index fc775de95..fc775de95 100644
--- a/baseconfig/CONFIG_NET_VENDOR_NETRONOME
+++ b/configs/base-generic/CONFIG_NET_VENDOR_NETRONOME
diff --git a/baseconfig/CONFIG_NET_VENDOR_NVIDIA b/configs/base-generic/CONFIG_NET_VENDOR_NVIDIA
index b15ee2759..b15ee2759 100644
--- a/baseconfig/CONFIG_NET_VENDOR_NVIDIA
+++ b/configs/base-generic/CONFIG_NET_VENDOR_NVIDIA
diff --git a/baseconfig/CONFIG_NET_VENDOR_OKI b/configs/base-generic/CONFIG_NET_VENDOR_OKI
index e5b745dc6..e5b745dc6 100644
--- a/baseconfig/CONFIG_NET_VENDOR_OKI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_OKI
diff --git a/baseconfig/CONFIG_NET_VENDOR_QLOGIC b/configs/base-generic/CONFIG_NET_VENDOR_QLOGIC
index 868b452ab..868b452ab 100644
--- a/baseconfig/CONFIG_NET_VENDOR_QLOGIC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_QLOGIC
diff --git a/baseconfig/CONFIG_NET_VENDOR_QUALCOMM b/configs/base-generic/CONFIG_NET_VENDOR_QUALCOMM
index 585724f65..585724f65 100644
--- a/baseconfig/CONFIG_NET_VENDOR_QUALCOMM
+++ b/configs/base-generic/CONFIG_NET_VENDOR_QUALCOMM
diff --git a/baseconfig/CONFIG_NET_VENDOR_RDC b/configs/base-generic/CONFIG_NET_VENDOR_RDC
index f2d85c8cf..f2d85c8cf 100644
--- a/baseconfig/CONFIG_NET_VENDOR_RDC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_RDC
diff --git a/baseconfig/CONFIG_NET_VENDOR_REALTEK b/configs/base-generic/CONFIG_NET_VENDOR_REALTEK
index 1e65bbda6..1e65bbda6 100644
--- a/baseconfig/CONFIG_NET_VENDOR_REALTEK
+++ b/configs/base-generic/CONFIG_NET_VENDOR_REALTEK
diff --git a/baseconfig/CONFIG_NET_VENDOR_RENESAS b/configs/base-generic/CONFIG_NET_VENDOR_RENESAS
index c19089109..c19089109 100644
--- a/baseconfig/CONFIG_NET_VENDOR_RENESAS
+++ b/configs/base-generic/CONFIG_NET_VENDOR_RENESAS
diff --git a/baseconfig/CONFIG_NET_VENDOR_ROCKER b/configs/base-generic/CONFIG_NET_VENDOR_ROCKER
index c946a8575..c946a8575 100644
--- a/baseconfig/CONFIG_NET_VENDOR_ROCKER
+++ b/configs/base-generic/CONFIG_NET_VENDOR_ROCKER
diff --git a/baseconfig/CONFIG_NET_VENDOR_SAMSUNG b/configs/base-generic/CONFIG_NET_VENDOR_SAMSUNG
index 2542b3e88..2542b3e88 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SAMSUNG
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SAMSUNG
diff --git a/baseconfig/CONFIG_NET_VENDOR_SEEQ b/configs/base-generic/CONFIG_NET_VENDOR_SEEQ
index 6fe8245eb..6fe8245eb 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SEEQ
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SEEQ
diff --git a/baseconfig/CONFIG_NET_VENDOR_SILAN b/configs/base-generic/CONFIG_NET_VENDOR_SILAN
index ad95e3c88..ad95e3c88 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SILAN
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SILAN
diff --git a/baseconfig/CONFIG_NET_VENDOR_SIS b/configs/base-generic/CONFIG_NET_VENDOR_SIS
index 7002b4e69..7002b4e69 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SIS
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SIS
diff --git a/baseconfig/CONFIG_NET_VENDOR_SMSC b/configs/base-generic/CONFIG_NET_VENDOR_SMSC
index 995e3f28f..995e3f28f 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SMSC
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SMSC
diff --git a/baseconfig/CONFIG_NET_VENDOR_SNI b/configs/base-generic/CONFIG_NET_VENDOR_SNI
index 4f301f9ba..4f301f9ba 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SNI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SNI
diff --git a/baseconfig/CONFIG_NET_VENDOR_SOLARFLARE b/configs/base-generic/CONFIG_NET_VENDOR_SOLARFLARE
index 7b1c5d291..7b1c5d291 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SOLARFLARE
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SOLARFLARE
diff --git a/baseconfig/CONFIG_NET_VENDOR_STMICRO b/configs/base-generic/CONFIG_NET_VENDOR_STMICRO
index bb8c1823a..bb8c1823a 100644
--- a/baseconfig/CONFIG_NET_VENDOR_STMICRO
+++ b/configs/base-generic/CONFIG_NET_VENDOR_STMICRO
diff --git a/baseconfig/CONFIG_NET_VENDOR_SUN b/configs/base-generic/CONFIG_NET_VENDOR_SUN
index 802a79924..802a79924 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SUN
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SUN
diff --git a/baseconfig/CONFIG_NET_VENDOR_SYNOPSYS b/configs/base-generic/CONFIG_NET_VENDOR_SYNOPSYS
index 979e832d6..979e832d6 100644
--- a/baseconfig/CONFIG_NET_VENDOR_SYNOPSYS
+++ b/configs/base-generic/CONFIG_NET_VENDOR_SYNOPSYS
diff --git a/baseconfig/CONFIG_NET_VENDOR_TEHUTI b/configs/base-generic/CONFIG_NET_VENDOR_TEHUTI
index 18f4d0edb..18f4d0edb 100644
--- a/baseconfig/CONFIG_NET_VENDOR_TEHUTI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_TEHUTI
diff --git a/baseconfig/CONFIG_NET_VENDOR_TI b/configs/base-generic/CONFIG_NET_VENDOR_TI
index e52d07209..e52d07209 100644
--- a/baseconfig/CONFIG_NET_VENDOR_TI
+++ b/configs/base-generic/CONFIG_NET_VENDOR_TI
diff --git a/baseconfig/CONFIG_NET_VENDOR_VIA b/configs/base-generic/CONFIG_NET_VENDOR_VIA
index b9ac3ae1d..b9ac3ae1d 100644
--- a/baseconfig/CONFIG_NET_VENDOR_VIA
+++ b/configs/base-generic/CONFIG_NET_VENDOR_VIA
diff --git a/baseconfig/CONFIG_NET_VENDOR_WIZNET b/configs/base-generic/CONFIG_NET_VENDOR_WIZNET
index 85be3f157..85be3f157 100644
--- a/baseconfig/CONFIG_NET_VENDOR_WIZNET
+++ b/configs/base-generic/CONFIG_NET_VENDOR_WIZNET
diff --git a/baseconfig/CONFIG_NET_VENDOR_XIRCOM b/configs/base-generic/CONFIG_NET_VENDOR_XIRCOM
index 891386e82..891386e82 100644
--- a/baseconfig/CONFIG_NET_VENDOR_XIRCOM
+++ b/configs/base-generic/CONFIG_NET_VENDOR_XIRCOM
diff --git a/baseconfig/CONFIG_NET_VRF b/configs/base-generic/CONFIG_NET_VRF
index 8c9e84feb..8c9e84feb 100644
--- a/baseconfig/CONFIG_NET_VRF
+++ b/configs/base-generic/CONFIG_NET_VRF
diff --git a/baseconfig/CONFIG_NEW_LEDS b/configs/base-generic/CONFIG_NEW_LEDS
index a5eb3c0a2..a5eb3c0a2 100644
--- a/baseconfig/CONFIG_NEW_LEDS
+++ b/configs/base-generic/CONFIG_NEW_LEDS
diff --git a/baseconfig/CONFIG_NFC b/configs/base-generic/CONFIG_NFC
index 63fd0732a..63fd0732a 100644
--- a/baseconfig/CONFIG_NFC
+++ b/configs/base-generic/CONFIG_NFC
diff --git a/baseconfig/CONFIG_NFC_DIGITAL b/configs/base-generic/CONFIG_NFC_DIGITAL
index f8237bda1..f8237bda1 100644
--- a/baseconfig/CONFIG_NFC_DIGITAL
+++ b/configs/base-generic/CONFIG_NFC_DIGITAL
diff --git a/baseconfig/CONFIG_NFC_FDP b/configs/base-generic/CONFIG_NFC_FDP
index 94c65f701..94c65f701 100644
--- a/baseconfig/CONFIG_NFC_FDP
+++ b/configs/base-generic/CONFIG_NFC_FDP
diff --git a/baseconfig/CONFIG_NFC_HCI b/configs/base-generic/CONFIG_NFC_HCI
index e733c4cb5..e733c4cb5 100644
--- a/baseconfig/CONFIG_NFC_HCI
+++ b/configs/base-generic/CONFIG_NFC_HCI
diff --git a/baseconfig/CONFIG_NFC_MICROREAD b/configs/base-generic/CONFIG_NFC_MICROREAD
index 9e9c244b8..9e9c244b8 100644
--- a/baseconfig/CONFIG_NFC_MICROREAD
+++ b/configs/base-generic/CONFIG_NFC_MICROREAD
diff --git a/baseconfig/CONFIG_NFC_MICROREAD_I2C b/configs/base-generic/CONFIG_NFC_MICROREAD_I2C
index 7b4e78652..7b4e78652 100644
--- a/baseconfig/CONFIG_NFC_MICROREAD_I2C
+++ b/configs/base-generic/CONFIG_NFC_MICROREAD_I2C
diff --git a/baseconfig/CONFIG_NFC_MRVL b/configs/base-generic/CONFIG_NFC_MRVL
index ee4143e40..ee4143e40 100644
--- a/baseconfig/CONFIG_NFC_MRVL
+++ b/configs/base-generic/CONFIG_NFC_MRVL
diff --git a/baseconfig/CONFIG_NFC_MRVL_I2C b/configs/base-generic/CONFIG_NFC_MRVL_I2C
index 6ab4093c1..6ab4093c1 100644
--- a/baseconfig/CONFIG_NFC_MRVL_I2C
+++ b/configs/base-generic/CONFIG_NFC_MRVL_I2C
diff --git a/baseconfig/CONFIG_NFC_MRVL_SPI b/configs/base-generic/CONFIG_NFC_MRVL_SPI
index ef37ebfba..ef37ebfba 100644
--- a/baseconfig/CONFIG_NFC_MRVL_SPI
+++ b/configs/base-generic/CONFIG_NFC_MRVL_SPI
diff --git a/baseconfig/CONFIG_NFC_MRVL_USB b/configs/base-generic/CONFIG_NFC_MRVL_USB
index cc5323157..cc5323157 100644
--- a/baseconfig/CONFIG_NFC_MRVL_USB
+++ b/configs/base-generic/CONFIG_NFC_MRVL_USB
diff --git a/baseconfig/CONFIG_NFC_NCI b/configs/base-generic/CONFIG_NFC_NCI
index 490717e30..490717e30 100644
--- a/baseconfig/CONFIG_NFC_NCI
+++ b/configs/base-generic/CONFIG_NFC_NCI
diff --git a/baseconfig/CONFIG_NFC_NCI_SPI b/configs/base-generic/CONFIG_NFC_NCI_SPI
index 231914c6a..231914c6a 100644
--- a/baseconfig/CONFIG_NFC_NCI_SPI
+++ b/configs/base-generic/CONFIG_NFC_NCI_SPI
diff --git a/baseconfig/CONFIG_NFC_NCI_UART b/configs/base-generic/CONFIG_NFC_NCI_UART
index fa31bbfdc..fa31bbfdc 100644
--- a/baseconfig/CONFIG_NFC_NCI_UART
+++ b/configs/base-generic/CONFIG_NFC_NCI_UART
diff --git a/baseconfig/CONFIG_NFC_NXP_NCI b/configs/base-generic/CONFIG_NFC_NXP_NCI
index cbdaabdd7..cbdaabdd7 100644
--- a/baseconfig/CONFIG_NFC_NXP_NCI
+++ b/configs/base-generic/CONFIG_NFC_NXP_NCI
diff --git a/baseconfig/CONFIG_NFC_NXP_NCI_I2C b/configs/base-generic/CONFIG_NFC_NXP_NCI_I2C
index a889b360d..a889b360d 100644
--- a/baseconfig/CONFIG_NFC_NXP_NCI_I2C
+++ b/configs/base-generic/CONFIG_NFC_NXP_NCI_I2C
diff --git a/baseconfig/CONFIG_NFC_PN533 b/configs/base-generic/CONFIG_NFC_PN533
index e075663ed..e075663ed 100644
--- a/baseconfig/CONFIG_NFC_PN533
+++ b/configs/base-generic/CONFIG_NFC_PN533
diff --git a/baseconfig/CONFIG_NFC_PN533_I2C b/configs/base-generic/CONFIG_NFC_PN533_I2C
index f878ce634..f878ce634 100644
--- a/baseconfig/CONFIG_NFC_PN533_I2C
+++ b/configs/base-generic/CONFIG_NFC_PN533_I2C
diff --git a/baseconfig/CONFIG_NFC_PN533_USB b/configs/base-generic/CONFIG_NFC_PN533_USB
index c8c234f6d..c8c234f6d 100644
--- a/baseconfig/CONFIG_NFC_PN533_USB
+++ b/configs/base-generic/CONFIG_NFC_PN533_USB
diff --git a/baseconfig/CONFIG_NFC_PN544 b/configs/base-generic/CONFIG_NFC_PN544
index 7bf4e817c..7bf4e817c 100644
--- a/baseconfig/CONFIG_NFC_PN544
+++ b/configs/base-generic/CONFIG_NFC_PN544
diff --git a/baseconfig/CONFIG_NFC_PN544_I2C b/configs/base-generic/CONFIG_NFC_PN544_I2C
index 80ad6ca34..80ad6ca34 100644
--- a/baseconfig/CONFIG_NFC_PN544_I2C
+++ b/configs/base-generic/CONFIG_NFC_PN544_I2C
diff --git a/baseconfig/CONFIG_NFC_PORT100 b/configs/base-generic/CONFIG_NFC_PORT100
index e07f4fe44..e07f4fe44 100644
--- a/baseconfig/CONFIG_NFC_PORT100
+++ b/configs/base-generic/CONFIG_NFC_PORT100
diff --git a/baseconfig/CONFIG_NFC_S3FWRN5_I2C b/configs/base-generic/CONFIG_NFC_S3FWRN5_I2C
index 9f489aaed..9f489aaed 100644
--- a/baseconfig/CONFIG_NFC_S3FWRN5_I2C
+++ b/configs/base-generic/CONFIG_NFC_S3FWRN5_I2C
diff --git a/baseconfig/CONFIG_NFC_SHDLC b/configs/base-generic/CONFIG_NFC_SHDLC
index f2c805245..f2c805245 100644
--- a/baseconfig/CONFIG_NFC_SHDLC
+++ b/configs/base-generic/CONFIG_NFC_SHDLC
diff --git a/baseconfig/CONFIG_NFC_SIM b/configs/base-generic/CONFIG_NFC_SIM
index ab43ca49b..ab43ca49b 100644
--- a/baseconfig/CONFIG_NFC_SIM
+++ b/configs/base-generic/CONFIG_NFC_SIM
diff --git a/baseconfig/CONFIG_NFC_ST21NFCA b/configs/base-generic/CONFIG_NFC_ST21NFCA
index d32c7f660..d32c7f660 100644
--- a/baseconfig/CONFIG_NFC_ST21NFCA
+++ b/configs/base-generic/CONFIG_NFC_ST21NFCA
diff --git a/baseconfig/CONFIG_NFC_ST21NFCA_I2C b/configs/base-generic/CONFIG_NFC_ST21NFCA_I2C
index fbcf83514..fbcf83514 100644
--- a/baseconfig/CONFIG_NFC_ST21NFCA_I2C
+++ b/configs/base-generic/CONFIG_NFC_ST21NFCA_I2C
diff --git a/baseconfig/CONFIG_NFC_ST95HF b/configs/base-generic/CONFIG_NFC_ST95HF
index db67eb450..db67eb450 100644
--- a/baseconfig/CONFIG_NFC_ST95HF
+++ b/configs/base-generic/CONFIG_NFC_ST95HF
diff --git a/baseconfig/CONFIG_NFC_ST_NCI b/configs/base-generic/CONFIG_NFC_ST_NCI
index 941247d24..941247d24 100644
--- a/baseconfig/CONFIG_NFC_ST_NCI
+++ b/configs/base-generic/CONFIG_NFC_ST_NCI
diff --git a/baseconfig/CONFIG_NFC_ST_NCI_I2C b/configs/base-generic/CONFIG_NFC_ST_NCI_I2C
index 820b1c137..820b1c137 100644
--- a/baseconfig/CONFIG_NFC_ST_NCI_I2C
+++ b/configs/base-generic/CONFIG_NFC_ST_NCI_I2C
diff --git a/baseconfig/CONFIG_NFC_ST_NCI_SPI b/configs/base-generic/CONFIG_NFC_ST_NCI_SPI
index d907adfda..d907adfda 100644
--- a/baseconfig/CONFIG_NFC_ST_NCI_SPI
+++ b/configs/base-generic/CONFIG_NFC_ST_NCI_SPI
diff --git a/baseconfig/CONFIG_NFC_TRF7970A b/configs/base-generic/CONFIG_NFC_TRF7970A
index aba3656f4..aba3656f4 100644
--- a/baseconfig/CONFIG_NFC_TRF7970A
+++ b/configs/base-generic/CONFIG_NFC_TRF7970A
diff --git a/baseconfig/CONFIG_NFP b/configs/base-generic/CONFIG_NFP
index 14f22b12c..14f22b12c 100644
--- a/baseconfig/CONFIG_NFP
+++ b/configs/base-generic/CONFIG_NFP
diff --git a/baseconfig/CONFIG_NFP_APP_FLOWER b/configs/base-generic/CONFIG_NFP_APP_FLOWER
index d9ff8a178..d9ff8a178 100644
--- a/baseconfig/CONFIG_NFP_APP_FLOWER
+++ b/configs/base-generic/CONFIG_NFP_APP_FLOWER
diff --git a/baseconfig/CONFIG_NFP_DEBUG b/configs/base-generic/CONFIG_NFP_DEBUG
index b7f75b3f3..b7f75b3f3 100644
--- a/baseconfig/CONFIG_NFP_DEBUG
+++ b/configs/base-generic/CONFIG_NFP_DEBUG
diff --git a/baseconfig/CONFIG_NFP_NETVF b/configs/base-generic/CONFIG_NFP_NETVF
index 8f0dbe8e5..8f0dbe8e5 100644
--- a/baseconfig/CONFIG_NFP_NETVF
+++ b/configs/base-generic/CONFIG_NFP_NETVF
diff --git a/baseconfig/CONFIG_NFP_NET_DEBUG b/configs/base-generic/CONFIG_NFP_NET_DEBUG
index aa7c49e38..aa7c49e38 100644
--- a/baseconfig/CONFIG_NFP_NET_DEBUG
+++ b/configs/base-generic/CONFIG_NFP_NET_DEBUG
diff --git a/baseconfig/CONFIG_NFSD b/configs/base-generic/CONFIG_NFSD
index 4edd3f446..4edd3f446 100644
--- a/baseconfig/CONFIG_NFSD
+++ b/configs/base-generic/CONFIG_NFSD
diff --git a/baseconfig/CONFIG_NFSD_BLOCKLAYOUT b/configs/base-generic/CONFIG_NFSD_BLOCKLAYOUT
index 409083589..409083589 100644
--- a/baseconfig/CONFIG_NFSD_BLOCKLAYOUT
+++ b/configs/base-generic/CONFIG_NFSD_BLOCKLAYOUT
diff --git a/baseconfig/CONFIG_NFSD_FAULT_INJECTION b/configs/base-generic/CONFIG_NFSD_FAULT_INJECTION
index c5c1b8466..c5c1b8466 100644
--- a/baseconfig/CONFIG_NFSD_FAULT_INJECTION
+++ b/configs/base-generic/CONFIG_NFSD_FAULT_INJECTION
diff --git a/baseconfig/CONFIG_NFSD_FLEXFILELAYOUT b/configs/base-generic/CONFIG_NFSD_FLEXFILELAYOUT
index df95ada42..df95ada42 100644
--- a/baseconfig/CONFIG_NFSD_FLEXFILELAYOUT
+++ b/configs/base-generic/CONFIG_NFSD_FLEXFILELAYOUT
diff --git a/baseconfig/CONFIG_NFSD_PNFS b/configs/base-generic/CONFIG_NFSD_PNFS
index d934bd18c..d934bd18c 100644
--- a/baseconfig/CONFIG_NFSD_PNFS
+++ b/configs/base-generic/CONFIG_NFSD_PNFS
diff --git a/baseconfig/CONFIG_NFSD_SCSILAYOUT b/configs/base-generic/CONFIG_NFSD_SCSILAYOUT
index 1d94de716..1d94de716 100644
--- a/baseconfig/CONFIG_NFSD_SCSILAYOUT
+++ b/configs/base-generic/CONFIG_NFSD_SCSILAYOUT
diff --git a/baseconfig/CONFIG_NFSD_V3 b/configs/base-generic/CONFIG_NFSD_V3
index 4207adaad..4207adaad 100644
--- a/baseconfig/CONFIG_NFSD_V3
+++ b/configs/base-generic/CONFIG_NFSD_V3
diff --git a/baseconfig/CONFIG_NFSD_V3_ACL b/configs/base-generic/CONFIG_NFSD_V3_ACL
index 451933884..451933884 100644
--- a/baseconfig/CONFIG_NFSD_V3_ACL
+++ b/configs/base-generic/CONFIG_NFSD_V3_ACL
diff --git a/baseconfig/CONFIG_NFSD_V4 b/configs/base-generic/CONFIG_NFSD_V4
index a1df1fcb6..a1df1fcb6 100644
--- a/baseconfig/CONFIG_NFSD_V4
+++ b/configs/base-generic/CONFIG_NFSD_V4
diff --git a/baseconfig/CONFIG_NFSD_V4_SECURITY_LABEL b/configs/base-generic/CONFIG_NFSD_V4_SECURITY_LABEL
index 16f3ee380..16f3ee380 100644
--- a/baseconfig/CONFIG_NFSD_V4_SECURITY_LABEL
+++ b/configs/base-generic/CONFIG_NFSD_V4_SECURITY_LABEL
diff --git a/baseconfig/CONFIG_NFS_FS b/configs/base-generic/CONFIG_NFS_FS
index b181162e4..b181162e4 100644
--- a/baseconfig/CONFIG_NFS_FS
+++ b/configs/base-generic/CONFIG_NFS_FS
diff --git a/baseconfig/CONFIG_NFS_FSCACHE b/configs/base-generic/CONFIG_NFS_FSCACHE
index dff728512..dff728512 100644
--- a/baseconfig/CONFIG_NFS_FSCACHE
+++ b/configs/base-generic/CONFIG_NFS_FSCACHE
diff --git a/baseconfig/CONFIG_NFS_SWAP b/configs/base-generic/CONFIG_NFS_SWAP
index c7f9c46c9..c7f9c46c9 100644
--- a/baseconfig/CONFIG_NFS_SWAP
+++ b/configs/base-generic/CONFIG_NFS_SWAP
diff --git a/baseconfig/CONFIG_NFS_USE_LEGACY_DNS b/configs/base-generic/CONFIG_NFS_USE_LEGACY_DNS
index 691992941..691992941 100644
--- a/baseconfig/CONFIG_NFS_USE_LEGACY_DNS
+++ b/configs/base-generic/CONFIG_NFS_USE_LEGACY_DNS
diff --git a/baseconfig/CONFIG_NFS_V2 b/configs/base-generic/CONFIG_NFS_V2
index f0f45e180..f0f45e180 100644
--- a/baseconfig/CONFIG_NFS_V2
+++ b/configs/base-generic/CONFIG_NFS_V2
diff --git a/baseconfig/CONFIG_NFS_V3 b/configs/base-generic/CONFIG_NFS_V3
index 22442d57a..22442d57a 100644
--- a/baseconfig/CONFIG_NFS_V3
+++ b/configs/base-generic/CONFIG_NFS_V3
diff --git a/baseconfig/CONFIG_NFS_V3_ACL b/configs/base-generic/CONFIG_NFS_V3_ACL
index d4c6a260e..d4c6a260e 100644
--- a/baseconfig/CONFIG_NFS_V3_ACL
+++ b/configs/base-generic/CONFIG_NFS_V3_ACL
diff --git a/baseconfig/CONFIG_NFS_V4 b/configs/base-generic/CONFIG_NFS_V4
index f18a771f0..f18a771f0 100644
--- a/baseconfig/CONFIG_NFS_V4
+++ b/configs/base-generic/CONFIG_NFS_V4
diff --git a/baseconfig/CONFIG_NFS_V4_1 b/configs/base-generic/CONFIG_NFS_V4_1
index f131fcb57..f131fcb57 100644
--- a/baseconfig/CONFIG_NFS_V4_1
+++ b/configs/base-generic/CONFIG_NFS_V4_1
diff --git a/baseconfig/CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN b/configs/base-generic/CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
index 1a02c0904..1a02c0904 100644
--- a/baseconfig/CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
+++ b/configs/base-generic/CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
diff --git a/baseconfig/CONFIG_NFS_V4_1_MIGRATION b/configs/base-generic/CONFIG_NFS_V4_1_MIGRATION
index c64757144..c64757144 100644
--- a/baseconfig/CONFIG_NFS_V4_1_MIGRATION
+++ b/configs/base-generic/CONFIG_NFS_V4_1_MIGRATION
diff --git a/baseconfig/CONFIG_NFS_V4_2 b/configs/base-generic/CONFIG_NFS_V4_2
index 1c4ac4799..1c4ac4799 100644
--- a/baseconfig/CONFIG_NFS_V4_2
+++ b/configs/base-generic/CONFIG_NFS_V4_2
diff --git a/baseconfig/CONFIG_NFTL b/configs/base-generic/CONFIG_NFTL
index c834b8376..c834b8376 100644
--- a/baseconfig/CONFIG_NFTL
+++ b/configs/base-generic/CONFIG_NFTL
diff --git a/baseconfig/CONFIG_NFT_BRIDGE_META b/configs/base-generic/CONFIG_NFT_BRIDGE_META
index 93dbf6fa7..93dbf6fa7 100644
--- a/baseconfig/CONFIG_NFT_BRIDGE_META
+++ b/configs/base-generic/CONFIG_NFT_BRIDGE_META
diff --git a/baseconfig/CONFIG_NFT_BRIDGE_REJECT b/configs/base-generic/CONFIG_NFT_BRIDGE_REJECT
index 1ec341fc3..1ec341fc3 100644
--- a/baseconfig/CONFIG_NFT_BRIDGE_REJECT
+++ b/configs/base-generic/CONFIG_NFT_BRIDGE_REJECT
diff --git a/baseconfig/CONFIG_NFT_CHAIN_NAT_IPV4 b/configs/base-generic/CONFIG_NFT_CHAIN_NAT_IPV4
index dabdbc46a..dabdbc46a 100644
--- a/baseconfig/CONFIG_NFT_CHAIN_NAT_IPV4
+++ b/configs/base-generic/CONFIG_NFT_CHAIN_NAT_IPV4
diff --git a/baseconfig/CONFIG_NFT_CHAIN_NAT_IPV6 b/configs/base-generic/CONFIG_NFT_CHAIN_NAT_IPV6
index 1afb99374..1afb99374 100644
--- a/baseconfig/CONFIG_NFT_CHAIN_NAT_IPV6
+++ b/configs/base-generic/CONFIG_NFT_CHAIN_NAT_IPV6
diff --git a/baseconfig/CONFIG_NFT_CHAIN_ROUTE_IPV4 b/configs/base-generic/CONFIG_NFT_CHAIN_ROUTE_IPV4
index eb79509ae..eb79509ae 100644
--- a/baseconfig/CONFIG_NFT_CHAIN_ROUTE_IPV4
+++ b/configs/base-generic/CONFIG_NFT_CHAIN_ROUTE_IPV4
diff --git a/baseconfig/CONFIG_NFT_CHAIN_ROUTE_IPV6 b/configs/base-generic/CONFIG_NFT_CHAIN_ROUTE_IPV6
index 0ccc52a0b..0ccc52a0b 100644
--- a/baseconfig/CONFIG_NFT_CHAIN_ROUTE_IPV6
+++ b/configs/base-generic/CONFIG_NFT_CHAIN_ROUTE_IPV6
diff --git a/baseconfig/CONFIG_NFT_COMPAT b/configs/base-generic/CONFIG_NFT_COMPAT
index 3b5eab9df..3b5eab9df 100644
--- a/baseconfig/CONFIG_NFT_COMPAT
+++ b/configs/base-generic/CONFIG_NFT_COMPAT
diff --git a/baseconfig/CONFIG_NFT_COUNTER b/configs/base-generic/CONFIG_NFT_COUNTER
index ba06cd8eb..ba06cd8eb 100644
--- a/baseconfig/CONFIG_NFT_COUNTER
+++ b/configs/base-generic/CONFIG_NFT_COUNTER
diff --git a/baseconfig/CONFIG_NFT_CT b/configs/base-generic/CONFIG_NFT_CT
index 33c2f017d..33c2f017d 100644
--- a/baseconfig/CONFIG_NFT_CT
+++ b/configs/base-generic/CONFIG_NFT_CT
diff --git a/baseconfig/CONFIG_NFT_DUP_IPV4 b/configs/base-generic/CONFIG_NFT_DUP_IPV4
index fb9ab921d..fb9ab921d 100644
--- a/baseconfig/CONFIG_NFT_DUP_IPV4
+++ b/configs/base-generic/CONFIG_NFT_DUP_IPV4
diff --git a/baseconfig/CONFIG_NFT_DUP_IPV6 b/configs/base-generic/CONFIG_NFT_DUP_IPV6
index 391a7f256..391a7f256 100644
--- a/baseconfig/CONFIG_NFT_DUP_IPV6
+++ b/configs/base-generic/CONFIG_NFT_DUP_IPV6
diff --git a/baseconfig/CONFIG_NFT_DUP_NETDEV b/configs/base-generic/CONFIG_NFT_DUP_NETDEV
index 4cab8e030..4cab8e030 100644
--- a/baseconfig/CONFIG_NFT_DUP_NETDEV
+++ b/configs/base-generic/CONFIG_NFT_DUP_NETDEV
diff --git a/baseconfig/CONFIG_NFT_EXTHDR b/configs/base-generic/CONFIG_NFT_EXTHDR
index 0dfd00392..0dfd00392 100644
--- a/baseconfig/CONFIG_NFT_EXTHDR
+++ b/configs/base-generic/CONFIG_NFT_EXTHDR
diff --git a/baseconfig/CONFIG_NFT_FIB_INET b/configs/base-generic/CONFIG_NFT_FIB_INET
index fe7a8f35b..fe7a8f35b 100644
--- a/baseconfig/CONFIG_NFT_FIB_INET
+++ b/configs/base-generic/CONFIG_NFT_FIB_INET
diff --git a/baseconfig/CONFIG_NFT_FIB_IPV4 b/configs/base-generic/CONFIG_NFT_FIB_IPV4
index 210fb695a..210fb695a 100644
--- a/baseconfig/CONFIG_NFT_FIB_IPV4
+++ b/configs/base-generic/CONFIG_NFT_FIB_IPV4
diff --git a/baseconfig/CONFIG_NFT_FIB_IPV6 b/configs/base-generic/CONFIG_NFT_FIB_IPV6
index 26b95dea8..26b95dea8 100644
--- a/baseconfig/CONFIG_NFT_FIB_IPV6
+++ b/configs/base-generic/CONFIG_NFT_FIB_IPV6
diff --git a/baseconfig/CONFIG_NFT_FIB_NETDEV b/configs/base-generic/CONFIG_NFT_FIB_NETDEV
index 273bfeb6a..273bfeb6a 100644
--- a/baseconfig/CONFIG_NFT_FIB_NETDEV
+++ b/configs/base-generic/CONFIG_NFT_FIB_NETDEV
diff --git a/baseconfig/CONFIG_NFT_FWD_NETDEV b/configs/base-generic/CONFIG_NFT_FWD_NETDEV
index 2f10f39e2..2f10f39e2 100644
--- a/baseconfig/CONFIG_NFT_FWD_NETDEV
+++ b/configs/base-generic/CONFIG_NFT_FWD_NETDEV
diff --git a/baseconfig/CONFIG_NFT_HASH b/configs/base-generic/CONFIG_NFT_HASH
index 581bd38e1..581bd38e1 100644
--- a/baseconfig/CONFIG_NFT_HASH
+++ b/configs/base-generic/CONFIG_NFT_HASH
diff --git a/baseconfig/CONFIG_NFT_LIMIT b/configs/base-generic/CONFIG_NFT_LIMIT
index ab64be55f..ab64be55f 100644
--- a/baseconfig/CONFIG_NFT_LIMIT
+++ b/configs/base-generic/CONFIG_NFT_LIMIT
diff --git a/baseconfig/CONFIG_NFT_LOG b/configs/base-generic/CONFIG_NFT_LOG
index beb1a00cc..beb1a00cc 100644
--- a/baseconfig/CONFIG_NFT_LOG
+++ b/configs/base-generic/CONFIG_NFT_LOG
diff --git a/baseconfig/CONFIG_NFT_MASQ b/configs/base-generic/CONFIG_NFT_MASQ
index ab4234885..ab4234885 100644
--- a/baseconfig/CONFIG_NFT_MASQ
+++ b/configs/base-generic/CONFIG_NFT_MASQ
diff --git a/baseconfig/CONFIG_NFT_MASQ_IPV4 b/configs/base-generic/CONFIG_NFT_MASQ_IPV4
index 5a5ec1c61..5a5ec1c61 100644
--- a/baseconfig/CONFIG_NFT_MASQ_IPV4
+++ b/configs/base-generic/CONFIG_NFT_MASQ_IPV4
diff --git a/baseconfig/CONFIG_NFT_MASQ_IPV6 b/configs/base-generic/CONFIG_NFT_MASQ_IPV6
index d1e703f9b..d1e703f9b 100644
--- a/baseconfig/CONFIG_NFT_MASQ_IPV6
+++ b/configs/base-generic/CONFIG_NFT_MASQ_IPV6
diff --git a/baseconfig/CONFIG_NFT_META b/configs/base-generic/CONFIG_NFT_META
index f05189297..f05189297 100644
--- a/baseconfig/CONFIG_NFT_META
+++ b/configs/base-generic/CONFIG_NFT_META
diff --git a/baseconfig/CONFIG_NFT_NAT b/configs/base-generic/CONFIG_NFT_NAT
index 6fc5795d2..6fc5795d2 100644
--- a/baseconfig/CONFIG_NFT_NAT
+++ b/configs/base-generic/CONFIG_NFT_NAT
diff --git a/baseconfig/CONFIG_NFT_NUMGEN b/configs/base-generic/CONFIG_NFT_NUMGEN
index 243007744..243007744 100644
--- a/baseconfig/CONFIG_NFT_NUMGEN
+++ b/configs/base-generic/CONFIG_NFT_NUMGEN
diff --git a/baseconfig/CONFIG_NFT_OBJREF b/configs/base-generic/CONFIG_NFT_OBJREF
index e5f5db859..e5f5db859 100644
--- a/baseconfig/CONFIG_NFT_OBJREF
+++ b/configs/base-generic/CONFIG_NFT_OBJREF
diff --git a/baseconfig/CONFIG_NFT_QUEUE b/configs/base-generic/CONFIG_NFT_QUEUE
index b8aea55e8..b8aea55e8 100644
--- a/baseconfig/CONFIG_NFT_QUEUE
+++ b/configs/base-generic/CONFIG_NFT_QUEUE
diff --git a/baseconfig/CONFIG_NFT_QUOTA b/configs/base-generic/CONFIG_NFT_QUOTA
index 1984d0ec7..1984d0ec7 100644
--- a/baseconfig/CONFIG_NFT_QUOTA
+++ b/configs/base-generic/CONFIG_NFT_QUOTA
diff --git a/baseconfig/CONFIG_NFT_RBTREE b/configs/base-generic/CONFIG_NFT_RBTREE
index bd8bc766b..bd8bc766b 100644
--- a/baseconfig/CONFIG_NFT_RBTREE
+++ b/configs/base-generic/CONFIG_NFT_RBTREE
diff --git a/baseconfig/CONFIG_NFT_REDIR b/configs/base-generic/CONFIG_NFT_REDIR
index d7f2d7c76..d7f2d7c76 100644
--- a/baseconfig/CONFIG_NFT_REDIR
+++ b/configs/base-generic/CONFIG_NFT_REDIR
diff --git a/baseconfig/CONFIG_NFT_REDIR_IPV4 b/configs/base-generic/CONFIG_NFT_REDIR_IPV4
index 8f2025454..8f2025454 100644
--- a/baseconfig/CONFIG_NFT_REDIR_IPV4
+++ b/configs/base-generic/CONFIG_NFT_REDIR_IPV4
diff --git a/baseconfig/CONFIG_NFT_REDIR_IPV6 b/configs/base-generic/CONFIG_NFT_REDIR_IPV6
index 23f2aa25b..23f2aa25b 100644
--- a/baseconfig/CONFIG_NFT_REDIR_IPV6
+++ b/configs/base-generic/CONFIG_NFT_REDIR_IPV6
diff --git a/baseconfig/CONFIG_NFT_REJECT b/configs/base-generic/CONFIG_NFT_REJECT
index 3f0167e83..3f0167e83 100644
--- a/baseconfig/CONFIG_NFT_REJECT
+++ b/configs/base-generic/CONFIG_NFT_REJECT
diff --git a/baseconfig/CONFIG_NFT_REJECT_IPV4 b/configs/base-generic/CONFIG_NFT_REJECT_IPV4
index dd70ddc43..dd70ddc43 100644
--- a/baseconfig/CONFIG_NFT_REJECT_IPV4
+++ b/configs/base-generic/CONFIG_NFT_REJECT_IPV4
diff --git a/baseconfig/CONFIG_NFT_RT b/configs/base-generic/CONFIG_NFT_RT
index 528a1bdb8..528a1bdb8 100644
--- a/baseconfig/CONFIG_NFT_RT
+++ b/configs/base-generic/CONFIG_NFT_RT
diff --git a/baseconfig/CONFIG_NFT_SET_BITMAP b/configs/base-generic/CONFIG_NFT_SET_BITMAP
index a0a3769ff..a0a3769ff 100644
--- a/baseconfig/CONFIG_NFT_SET_BITMAP
+++ b/configs/base-generic/CONFIG_NFT_SET_BITMAP
diff --git a/baseconfig/CONFIG_NFT_SET_HASH b/configs/base-generic/CONFIG_NFT_SET_HASH
index c33837913..c33837913 100644
--- a/baseconfig/CONFIG_NFT_SET_HASH
+++ b/configs/base-generic/CONFIG_NFT_SET_HASH
diff --git a/baseconfig/CONFIG_NFT_SET_RBTREE b/configs/base-generic/CONFIG_NFT_SET_RBTREE
index 5924a541e..5924a541e 100644
--- a/baseconfig/CONFIG_NFT_SET_RBTREE
+++ b/configs/base-generic/CONFIG_NFT_SET_RBTREE
diff --git a/baseconfig/CONFIG_NF_CONNTRACK b/configs/base-generic/CONFIG_NF_CONNTRACK
index 6eb10bb34..6eb10bb34 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_AMANDA b/configs/base-generic/CONFIG_NF_CONNTRACK_AMANDA
index 07c3990d1..07c3990d1 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_AMANDA
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_AMANDA
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_EVENTS b/configs/base-generic/CONFIG_NF_CONNTRACK_EVENTS
index 711ab9d5d..711ab9d5d 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_EVENTS
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_EVENTS
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_FTP b/configs/base-generic/CONFIG_NF_CONNTRACK_FTP
index 7a0409d05..7a0409d05 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_FTP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_FTP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_H323 b/configs/base-generic/CONFIG_NF_CONNTRACK_H323
index a8b54d4ba..a8b54d4ba 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_H323
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_H323
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_IPV4 b/configs/base-generic/CONFIG_NF_CONNTRACK_IPV4
index af4f32370..af4f32370 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_IPV4
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_IPV4
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_IPV6 b/configs/base-generic/CONFIG_NF_CONNTRACK_IPV6
index 988725fce..988725fce 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_IPV6
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_IPV6
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_IRC b/configs/base-generic/CONFIG_NF_CONNTRACK_IRC
index 5034694f2..5034694f2 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_IRC
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_IRC
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_MARK b/configs/base-generic/CONFIG_NF_CONNTRACK_MARK
index e8915b4a5..e8915b4a5 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_MARK
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_MARK
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_NETBIOS_NS b/configs/base-generic/CONFIG_NF_CONNTRACK_NETBIOS_NS
index dc0343f63..dc0343f63 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_NETBIOS_NS
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_NETBIOS_NS
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_PPTP b/configs/base-generic/CONFIG_NF_CONNTRACK_PPTP
index a1a813aaf..a1a813aaf 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_PPTP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_PPTP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_PROCFS b/configs/base-generic/CONFIG_NF_CONNTRACK_PROCFS
index 11ac5f67b..11ac5f67b 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_PROCFS
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_PROCFS
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_PROC_COMPAT b/configs/base-generic/CONFIG_NF_CONNTRACK_PROC_COMPAT
index d7487f755..d7487f755 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_PROC_COMPAT
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_PROC_COMPAT
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_SANE b/configs/base-generic/CONFIG_NF_CONNTRACK_SANE
index a17c92be6..a17c92be6 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_SANE
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_SANE
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_SECMARK b/configs/base-generic/CONFIG_NF_CONNTRACK_SECMARK
index 9490d56ed..9490d56ed 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_SECMARK
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_SECMARK
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_SIP b/configs/base-generic/CONFIG_NF_CONNTRACK_SIP
index 82f089e80..82f089e80 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_SIP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_SIP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_SNMP b/configs/base-generic/CONFIG_NF_CONNTRACK_SNMP
index 44c5aec37..44c5aec37 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_SNMP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_SNMP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_TFTP b/configs/base-generic/CONFIG_NF_CONNTRACK_TFTP
index 161b2f007..161b2f007 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_TFTP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_TFTP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_TIMEOUT b/configs/base-generic/CONFIG_NF_CONNTRACK_TIMEOUT
index 2accb0286..2accb0286 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_TIMEOUT
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_TIMEOUT
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_TIMESTAMP b/configs/base-generic/CONFIG_NF_CONNTRACK_TIMESTAMP
index 09d9e909b..09d9e909b 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_TIMESTAMP
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_TIMESTAMP
diff --git a/baseconfig/CONFIG_NF_CONNTRACK_ZONES b/configs/base-generic/CONFIG_NF_CONNTRACK_ZONES
index e4b2f40cd..e4b2f40cd 100644
--- a/baseconfig/CONFIG_NF_CONNTRACK_ZONES
+++ b/configs/base-generic/CONFIG_NF_CONNTRACK_ZONES
diff --git a/baseconfig/CONFIG_NF_CT_NETLINK b/configs/base-generic/CONFIG_NF_CT_NETLINK
index 805a8bc93..805a8bc93 100644
--- a/baseconfig/CONFIG_NF_CT_NETLINK
+++ b/configs/base-generic/CONFIG_NF_CT_NETLINK
diff --git a/baseconfig/CONFIG_NF_CT_NETLINK_HELPER b/configs/base-generic/CONFIG_NF_CT_NETLINK_HELPER
index 6dc2ad6c7..6dc2ad6c7 100644
--- a/baseconfig/CONFIG_NF_CT_NETLINK_HELPER
+++ b/configs/base-generic/CONFIG_NF_CT_NETLINK_HELPER
diff --git a/baseconfig/CONFIG_NF_CT_NETLINK_TIMEOUT b/configs/base-generic/CONFIG_NF_CT_NETLINK_TIMEOUT
index 76df034f9..76df034f9 100644
--- a/baseconfig/CONFIG_NF_CT_NETLINK_TIMEOUT
+++ b/configs/base-generic/CONFIG_NF_CT_NETLINK_TIMEOUT
diff --git a/baseconfig/CONFIG_NF_CT_PROTO_DCCP b/configs/base-generic/CONFIG_NF_CT_PROTO_DCCP
index 87cb5eaf9..87cb5eaf9 100644
--- a/baseconfig/CONFIG_NF_CT_PROTO_DCCP
+++ b/configs/base-generic/CONFIG_NF_CT_PROTO_DCCP
diff --git a/baseconfig/CONFIG_NF_CT_PROTO_SCTP b/configs/base-generic/CONFIG_NF_CT_PROTO_SCTP
index c882bb262..c882bb262 100644
--- a/baseconfig/CONFIG_NF_CT_PROTO_SCTP
+++ b/configs/base-generic/CONFIG_NF_CT_PROTO_SCTP
diff --git a/baseconfig/CONFIG_NF_CT_PROTO_UDPLITE b/configs/base-generic/CONFIG_NF_CT_PROTO_UDPLITE
index 25c61d430..25c61d430 100644
--- a/baseconfig/CONFIG_NF_CT_PROTO_UDPLITE
+++ b/configs/base-generic/CONFIG_NF_CT_PROTO_UDPLITE
diff --git a/baseconfig/CONFIG_NF_DUP_IPV4 b/configs/base-generic/CONFIG_NF_DUP_IPV4
index 7c349df6c..7c349df6c 100644
--- a/baseconfig/CONFIG_NF_DUP_IPV4
+++ b/configs/base-generic/CONFIG_NF_DUP_IPV4
diff --git a/baseconfig/CONFIG_NF_DUP_IPV6 b/configs/base-generic/CONFIG_NF_DUP_IPV6
index a130933ed..a130933ed 100644
--- a/baseconfig/CONFIG_NF_DUP_IPV6
+++ b/configs/base-generic/CONFIG_NF_DUP_IPV6
diff --git a/baseconfig/CONFIG_NF_DUP_NETDEV b/configs/base-generic/CONFIG_NF_DUP_NETDEV
index d058a0ab8..d058a0ab8 100644
--- a/baseconfig/CONFIG_NF_DUP_NETDEV
+++ b/configs/base-generic/CONFIG_NF_DUP_NETDEV
diff --git a/baseconfig/CONFIG_NF_LOG_ARP b/configs/base-generic/CONFIG_NF_LOG_ARP
index 561b42dbb..561b42dbb 100644
--- a/baseconfig/CONFIG_NF_LOG_ARP
+++ b/configs/base-generic/CONFIG_NF_LOG_ARP
diff --git a/baseconfig/CONFIG_NF_LOG_BRIDGE b/configs/base-generic/CONFIG_NF_LOG_BRIDGE
index 35d7b92d7..35d7b92d7 100644
--- a/baseconfig/CONFIG_NF_LOG_BRIDGE
+++ b/configs/base-generic/CONFIG_NF_LOG_BRIDGE
diff --git a/baseconfig/CONFIG_NF_LOG_IPV4 b/configs/base-generic/CONFIG_NF_LOG_IPV4
index 97d73f968..97d73f968 100644
--- a/baseconfig/CONFIG_NF_LOG_IPV4
+++ b/configs/base-generic/CONFIG_NF_LOG_IPV4
diff --git a/baseconfig/CONFIG_NF_LOG_IPV6 b/configs/base-generic/CONFIG_NF_LOG_IPV6
index dbfa7adfb..dbfa7adfb 100644
--- a/baseconfig/CONFIG_NF_LOG_IPV6
+++ b/configs/base-generic/CONFIG_NF_LOG_IPV6
diff --git a/baseconfig/CONFIG_NF_LOG_NETDEV b/configs/base-generic/CONFIG_NF_LOG_NETDEV
index 02f2d7737..02f2d7737 100644
--- a/baseconfig/CONFIG_NF_LOG_NETDEV
+++ b/configs/base-generic/CONFIG_NF_LOG_NETDEV
diff --git a/baseconfig/CONFIG_NF_NAT b/configs/base-generic/CONFIG_NF_NAT
index 25565b971..25565b971 100644
--- a/baseconfig/CONFIG_NF_NAT
+++ b/configs/base-generic/CONFIG_NF_NAT
diff --git a/baseconfig/CONFIG_NF_NAT_SNMP_BASIC b/configs/base-generic/CONFIG_NF_NAT_SNMP_BASIC
index b73738613..b73738613 100644
--- a/baseconfig/CONFIG_NF_NAT_SNMP_BASIC
+++ b/configs/base-generic/CONFIG_NF_NAT_SNMP_BASIC
diff --git a/baseconfig/CONFIG_NF_REJECT_IPV6 b/configs/base-generic/CONFIG_NF_REJECT_IPV6
index efa588cd5..efa588cd5 100644
--- a/baseconfig/CONFIG_NF_REJECT_IPV6
+++ b/configs/base-generic/CONFIG_NF_REJECT_IPV6
diff --git a/baseconfig/CONFIG_NF_SOCKET_IPV4 b/configs/base-generic/CONFIG_NF_SOCKET_IPV4
index 330b7cf66..330b7cf66 100644
--- a/baseconfig/CONFIG_NF_SOCKET_IPV4
+++ b/configs/base-generic/CONFIG_NF_SOCKET_IPV4
diff --git a/baseconfig/CONFIG_NF_SOCKET_IPV6 b/configs/base-generic/CONFIG_NF_SOCKET_IPV6
index f3ec9e0fd..f3ec9e0fd 100644
--- a/baseconfig/CONFIG_NF_SOCKET_IPV6
+++ b/configs/base-generic/CONFIG_NF_SOCKET_IPV6
diff --git a/baseconfig/CONFIG_NF_TABLES b/configs/base-generic/CONFIG_NF_TABLES
index b7803fc40..b7803fc40 100644
--- a/baseconfig/CONFIG_NF_TABLES
+++ b/configs/base-generic/CONFIG_NF_TABLES
diff --git a/baseconfig/CONFIG_NF_TABLES_ARP b/configs/base-generic/CONFIG_NF_TABLES_ARP
index da6153883..da6153883 100644
--- a/baseconfig/CONFIG_NF_TABLES_ARP
+++ b/configs/base-generic/CONFIG_NF_TABLES_ARP
diff --git a/baseconfig/CONFIG_NF_TABLES_BRIDGE b/configs/base-generic/CONFIG_NF_TABLES_BRIDGE
index bfdd62752..bfdd62752 100644
--- a/baseconfig/CONFIG_NF_TABLES_BRIDGE
+++ b/configs/base-generic/CONFIG_NF_TABLES_BRIDGE
diff --git a/baseconfig/CONFIG_NF_TABLES_INET b/configs/base-generic/CONFIG_NF_TABLES_INET
index b3eca5592..b3eca5592 100644
--- a/baseconfig/CONFIG_NF_TABLES_INET
+++ b/configs/base-generic/CONFIG_NF_TABLES_INET
diff --git a/baseconfig/CONFIG_NF_TABLES_IPV4 b/configs/base-generic/CONFIG_NF_TABLES_IPV4
index 591589bd6..591589bd6 100644
--- a/baseconfig/CONFIG_NF_TABLES_IPV4
+++ b/configs/base-generic/CONFIG_NF_TABLES_IPV4
diff --git a/baseconfig/CONFIG_NF_TABLES_IPV6 b/configs/base-generic/CONFIG_NF_TABLES_IPV6
index 66bd77464..66bd77464 100644
--- a/baseconfig/CONFIG_NF_TABLES_IPV6
+++ b/configs/base-generic/CONFIG_NF_TABLES_IPV6
diff --git a/baseconfig/CONFIG_NF_TABLES_NETDEV b/configs/base-generic/CONFIG_NF_TABLES_NETDEV
index 397090994..397090994 100644
--- a/baseconfig/CONFIG_NF_TABLES_NETDEV
+++ b/configs/base-generic/CONFIG_NF_TABLES_NETDEV
diff --git a/baseconfig/CONFIG_NI903X_WDT b/configs/base-generic/CONFIG_NI903X_WDT
index 117073a49..117073a49 100644
--- a/baseconfig/CONFIG_NI903X_WDT
+++ b/configs/base-generic/CONFIG_NI903X_WDT
diff --git a/baseconfig/CONFIG_NILFS2_FS b/configs/base-generic/CONFIG_NILFS2_FS
index c0ba42269..c0ba42269 100644
--- a/baseconfig/CONFIG_NILFS2_FS
+++ b/configs/base-generic/CONFIG_NILFS2_FS
diff --git a/baseconfig/CONFIG_NIU b/configs/base-generic/CONFIG_NIU
index b8ec9c29b..b8ec9c29b 100644
--- a/baseconfig/CONFIG_NIU
+++ b/configs/base-generic/CONFIG_NIU
diff --git a/baseconfig/CONFIG_NL80211 b/configs/base-generic/CONFIG_NL80211
index 7c755507f..7c755507f 100644
--- a/baseconfig/CONFIG_NL80211
+++ b/configs/base-generic/CONFIG_NL80211
diff --git a/baseconfig/CONFIG_NL80211_TESTMODE b/configs/base-generic/CONFIG_NL80211_TESTMODE
index fc4435e08..fc4435e08 100644
--- a/baseconfig/CONFIG_NL80211_TESTMODE
+++ b/configs/base-generic/CONFIG_NL80211_TESTMODE
diff --git a/baseconfig/CONFIG_NLMON b/configs/base-generic/CONFIG_NLMON
index 53e8b7742..53e8b7742 100644
--- a/baseconfig/CONFIG_NLMON
+++ b/configs/base-generic/CONFIG_NLMON
diff --git a/baseconfig/CONFIG_NLS b/configs/base-generic/CONFIG_NLS
index 0ca649ce7..0ca649ce7 100644
--- a/baseconfig/CONFIG_NLS
+++ b/configs/base-generic/CONFIG_NLS
diff --git a/baseconfig/CONFIG_NLS_ASCII b/configs/base-generic/CONFIG_NLS_ASCII
index 4c75b84a9..4c75b84a9 100644
--- a/baseconfig/CONFIG_NLS_ASCII
+++ b/configs/base-generic/CONFIG_NLS_ASCII
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_1250 b/configs/base-generic/CONFIG_NLS_CODEPAGE_1250
index 2ab2aa026..2ab2aa026 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_1250
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_1250
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_1251 b/configs/base-generic/CONFIG_NLS_CODEPAGE_1251
index 2c23320ef..2c23320ef 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_1251
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_1251
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_437 b/configs/base-generic/CONFIG_NLS_CODEPAGE_437
index 28e6c82d3..28e6c82d3 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_437
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_437
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_737 b/configs/base-generic/CONFIG_NLS_CODEPAGE_737
index 7fbb36904..7fbb36904 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_737
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_737
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_775 b/configs/base-generic/CONFIG_NLS_CODEPAGE_775
index a6dbd8ecf..a6dbd8ecf 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_775
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_775
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_850 b/configs/base-generic/CONFIG_NLS_CODEPAGE_850
index 37a7de91b..37a7de91b 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_850
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_850
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_852 b/configs/base-generic/CONFIG_NLS_CODEPAGE_852
index 6154f8d3d..6154f8d3d 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_852
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_852
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_855 b/configs/base-generic/CONFIG_NLS_CODEPAGE_855
index 347b0df13..347b0df13 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_855
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_855
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_857 b/configs/base-generic/CONFIG_NLS_CODEPAGE_857
index f44591925..f44591925 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_857
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_857
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_860 b/configs/base-generic/CONFIG_NLS_CODEPAGE_860
index 5e8d61ab1..5e8d61ab1 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_860
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_860
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_861 b/configs/base-generic/CONFIG_NLS_CODEPAGE_861
index 39d141b6b..39d141b6b 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_861
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_861
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_862 b/configs/base-generic/CONFIG_NLS_CODEPAGE_862
index cbdc58462..cbdc58462 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_862
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_862
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_863 b/configs/base-generic/CONFIG_NLS_CODEPAGE_863
index f0274505c..f0274505c 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_863
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_863
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_864 b/configs/base-generic/CONFIG_NLS_CODEPAGE_864
index de63e9d61..de63e9d61 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_864
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_864
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_865 b/configs/base-generic/CONFIG_NLS_CODEPAGE_865
index ebbe1cdbf..ebbe1cdbf 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_865
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_865
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_866 b/configs/base-generic/CONFIG_NLS_CODEPAGE_866
index 694549836..694549836 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_866
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_866
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_869 b/configs/base-generic/CONFIG_NLS_CODEPAGE_869
index 3b4b8bf73..3b4b8bf73 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_869
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_869
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_874 b/configs/base-generic/CONFIG_NLS_CODEPAGE_874
index eead1363b..eead1363b 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_874
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_874
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_932 b/configs/base-generic/CONFIG_NLS_CODEPAGE_932
index f423190f8..f423190f8 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_932
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_932
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_936 b/configs/base-generic/CONFIG_NLS_CODEPAGE_936
index 49aec3120..49aec3120 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_936
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_936
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_949 b/configs/base-generic/CONFIG_NLS_CODEPAGE_949
index f67e8c400..f67e8c400 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_949
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_949
diff --git a/baseconfig/CONFIG_NLS_CODEPAGE_950 b/configs/base-generic/CONFIG_NLS_CODEPAGE_950
index 4b6af6728..4b6af6728 100644
--- a/baseconfig/CONFIG_NLS_CODEPAGE_950
+++ b/configs/base-generic/CONFIG_NLS_CODEPAGE_950
diff --git a/baseconfig/CONFIG_NLS_DEFAULT b/configs/base-generic/CONFIG_NLS_DEFAULT
index bf5fe34ea..bf5fe34ea 100644
--- a/baseconfig/CONFIG_NLS_DEFAULT
+++ b/configs/base-generic/CONFIG_NLS_DEFAULT
diff --git a/baseconfig/CONFIG_NLS_ISO8859_1 b/configs/base-generic/CONFIG_NLS_ISO8859_1
index 883240974..883240974 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_1
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_1
diff --git a/baseconfig/CONFIG_NLS_ISO8859_13 b/configs/base-generic/CONFIG_NLS_ISO8859_13
index 78ad020a6..78ad020a6 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_13
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_13
diff --git a/baseconfig/CONFIG_NLS_ISO8859_14 b/configs/base-generic/CONFIG_NLS_ISO8859_14
index 94002d530..94002d530 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_14
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_14
diff --git a/baseconfig/CONFIG_NLS_ISO8859_15 b/configs/base-generic/CONFIG_NLS_ISO8859_15
index 19eb61c9c..19eb61c9c 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_15
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_15
diff --git a/baseconfig/CONFIG_NLS_ISO8859_2 b/configs/base-generic/CONFIG_NLS_ISO8859_2
index 13f70956d..13f70956d 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_2
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_2
diff --git a/baseconfig/CONFIG_NLS_ISO8859_3 b/configs/base-generic/CONFIG_NLS_ISO8859_3
index 73b4a2e7d..73b4a2e7d 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_3
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_3
diff --git a/baseconfig/CONFIG_NLS_ISO8859_4 b/configs/base-generic/CONFIG_NLS_ISO8859_4
index bd726a9a4..bd726a9a4 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_4
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_4
diff --git a/baseconfig/CONFIG_NLS_ISO8859_5 b/configs/base-generic/CONFIG_NLS_ISO8859_5
index 5f1dc8d93..5f1dc8d93 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_5
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_5
diff --git a/baseconfig/CONFIG_NLS_ISO8859_6 b/configs/base-generic/CONFIG_NLS_ISO8859_6
index f2a298248..f2a298248 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_6
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_6
diff --git a/baseconfig/CONFIG_NLS_ISO8859_7 b/configs/base-generic/CONFIG_NLS_ISO8859_7
index 27e788c91..27e788c91 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_7
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_7
diff --git a/baseconfig/CONFIG_NLS_ISO8859_8 b/configs/base-generic/CONFIG_NLS_ISO8859_8
index 23288bc77..23288bc77 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_8
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_8
diff --git a/baseconfig/CONFIG_NLS_ISO8859_9 b/configs/base-generic/CONFIG_NLS_ISO8859_9
index 155b6f80c..155b6f80c 100644
--- a/baseconfig/CONFIG_NLS_ISO8859_9
+++ b/configs/base-generic/CONFIG_NLS_ISO8859_9
diff --git a/baseconfig/CONFIG_NLS_KOI8_R b/configs/base-generic/CONFIG_NLS_KOI8_R
index 55956c2df..55956c2df 100644
--- a/baseconfig/CONFIG_NLS_KOI8_R
+++ b/configs/base-generic/CONFIG_NLS_KOI8_R
diff --git a/baseconfig/CONFIG_NLS_KOI8_U b/configs/base-generic/CONFIG_NLS_KOI8_U
index 81ce86b0f..81ce86b0f 100644
--- a/baseconfig/CONFIG_NLS_KOI8_U
+++ b/configs/base-generic/CONFIG_NLS_KOI8_U
diff --git a/baseconfig/CONFIG_NLS_MAC_CELTIC b/configs/base-generic/CONFIG_NLS_MAC_CELTIC
index 2eeb97218..2eeb97218 100644
--- a/baseconfig/CONFIG_NLS_MAC_CELTIC
+++ b/configs/base-generic/CONFIG_NLS_MAC_CELTIC
diff --git a/baseconfig/CONFIG_NLS_MAC_CENTEURO b/configs/base-generic/CONFIG_NLS_MAC_CENTEURO
index 8f378fa0b..8f378fa0b 100644
--- a/baseconfig/CONFIG_NLS_MAC_CENTEURO
+++ b/configs/base-generic/CONFIG_NLS_MAC_CENTEURO
diff --git a/baseconfig/CONFIG_NLS_MAC_CROATIAN b/configs/base-generic/CONFIG_NLS_MAC_CROATIAN
index 450569f5a..450569f5a 100644
--- a/baseconfig/CONFIG_NLS_MAC_CROATIAN
+++ b/configs/base-generic/CONFIG_NLS_MAC_CROATIAN
diff --git a/baseconfig/CONFIG_NLS_MAC_CYRILLIC b/configs/base-generic/CONFIG_NLS_MAC_CYRILLIC
index 027531c44..027531c44 100644
--- a/baseconfig/CONFIG_NLS_MAC_CYRILLIC
+++ b/configs/base-generic/CONFIG_NLS_MAC_CYRILLIC
diff --git a/baseconfig/CONFIG_NLS_MAC_GAELIC b/configs/base-generic/CONFIG_NLS_MAC_GAELIC
index d3617cd61..d3617cd61 100644
--- a/baseconfig/CONFIG_NLS_MAC_GAELIC
+++ b/configs/base-generic/CONFIG_NLS_MAC_GAELIC
diff --git a/baseconfig/CONFIG_NLS_MAC_GREEK b/configs/base-generic/CONFIG_NLS_MAC_GREEK
index 3d52cb40d..3d52cb40d 100644
--- a/baseconfig/CONFIG_NLS_MAC_GREEK
+++ b/configs/base-generic/CONFIG_NLS_MAC_GREEK
diff --git a/baseconfig/CONFIG_NLS_MAC_ICELAND b/configs/base-generic/CONFIG_NLS_MAC_ICELAND
index edb7121c9..edb7121c9 100644
--- a/baseconfig/CONFIG_NLS_MAC_ICELAND
+++ b/configs/base-generic/CONFIG_NLS_MAC_ICELAND
diff --git a/baseconfig/CONFIG_NLS_MAC_INUIT b/configs/base-generic/CONFIG_NLS_MAC_INUIT
index 877602ad2..877602ad2 100644
--- a/baseconfig/CONFIG_NLS_MAC_INUIT
+++ b/configs/base-generic/CONFIG_NLS_MAC_INUIT
diff --git a/baseconfig/CONFIG_NLS_MAC_ROMAN b/configs/base-generic/CONFIG_NLS_MAC_ROMAN
index 256f7e8a8..256f7e8a8 100644
--- a/baseconfig/CONFIG_NLS_MAC_ROMAN
+++ b/configs/base-generic/CONFIG_NLS_MAC_ROMAN
diff --git a/baseconfig/CONFIG_NLS_MAC_ROMANIAN b/configs/base-generic/CONFIG_NLS_MAC_ROMANIAN
index 1b9b8506a..1b9b8506a 100644
--- a/baseconfig/CONFIG_NLS_MAC_ROMANIAN
+++ b/configs/base-generic/CONFIG_NLS_MAC_ROMANIAN
diff --git a/baseconfig/CONFIG_NLS_MAC_TURKISH b/configs/base-generic/CONFIG_NLS_MAC_TURKISH
index f2b486a5b..f2b486a5b 100644
--- a/baseconfig/CONFIG_NLS_MAC_TURKISH
+++ b/configs/base-generic/CONFIG_NLS_MAC_TURKISH
diff --git a/baseconfig/CONFIG_NLS_UTF8 b/configs/base-generic/CONFIG_NLS_UTF8
index c9692f4e2..c9692f4e2 100644
--- a/baseconfig/CONFIG_NLS_UTF8
+++ b/configs/base-generic/CONFIG_NLS_UTF8
diff --git a/baseconfig/CONFIG_NMI_LOG_BUF_SHIFT b/configs/base-generic/CONFIG_NMI_LOG_BUF_SHIFT
index 3453995d5..3453995d5 100644
--- a/baseconfig/CONFIG_NMI_LOG_BUF_SHIFT
+++ b/configs/base-generic/CONFIG_NMI_LOG_BUF_SHIFT
diff --git a/baseconfig/CONFIG_NOP_USB_XCEIV b/configs/base-generic/CONFIG_NOP_USB_XCEIV
index 520ebce59..520ebce59 100644
--- a/baseconfig/CONFIG_NOP_USB_XCEIV
+++ b/configs/base-generic/CONFIG_NOP_USB_XCEIV
diff --git a/baseconfig/CONFIG_NORTEL_HERMES b/configs/base-generic/CONFIG_NORTEL_HERMES
index a9c63455b..a9c63455b 100644
--- a/baseconfig/CONFIG_NORTEL_HERMES
+++ b/configs/base-generic/CONFIG_NORTEL_HERMES
diff --git a/baseconfig/CONFIG_NOTIFIER_ERROR_INJECTION b/configs/base-generic/CONFIG_NOTIFIER_ERROR_INJECTION
index 44e141c45..44e141c45 100644
--- a/baseconfig/CONFIG_NOTIFIER_ERROR_INJECTION
+++ b/configs/base-generic/CONFIG_NOTIFIER_ERROR_INJECTION
diff --git a/baseconfig/CONFIG_NOUVEAU_DEBUG b/configs/base-generic/CONFIG_NOUVEAU_DEBUG
index 6a31e2d26..6a31e2d26 100644
--- a/baseconfig/CONFIG_NOUVEAU_DEBUG
+++ b/configs/base-generic/CONFIG_NOUVEAU_DEBUG
diff --git a/baseconfig/CONFIG_NOUVEAU_DEBUG_DEFAULT b/configs/base-generic/CONFIG_NOUVEAU_DEBUG_DEFAULT
index 521d58d7d..521d58d7d 100644
--- a/baseconfig/CONFIG_NOUVEAU_DEBUG_DEFAULT
+++ b/configs/base-generic/CONFIG_NOUVEAU_DEBUG_DEFAULT
diff --git a/baseconfig/CONFIG_NOZOMI b/configs/base-generic/CONFIG_NOZOMI
index e94a0abf8..e94a0abf8 100644
--- a/baseconfig/CONFIG_NOZOMI
+++ b/configs/base-generic/CONFIG_NOZOMI
diff --git a/baseconfig/CONFIG_NO_HZ b/configs/base-generic/CONFIG_NO_HZ
index 8c68dcd51..8c68dcd51 100644
--- a/baseconfig/CONFIG_NO_HZ
+++ b/configs/base-generic/CONFIG_NO_HZ
diff --git a/baseconfig/CONFIG_NR_DEV_DAX b/configs/base-generic/CONFIG_NR_DEV_DAX
index 3fd0f86b1..3fd0f86b1 100644
--- a/baseconfig/CONFIG_NR_DEV_DAX
+++ b/configs/base-generic/CONFIG_NR_DEV_DAX
diff --git a/baseconfig/CONFIG_NS83820 b/configs/base-generic/CONFIG_NS83820
index 9f98b7c00..9f98b7c00 100644
--- a/baseconfig/CONFIG_NS83820
+++ b/configs/base-generic/CONFIG_NS83820
diff --git a/baseconfig/CONFIG_NSC_FIR b/configs/base-generic/CONFIG_NSC_FIR
index fcc795e63..fcc795e63 100644
--- a/baseconfig/CONFIG_NSC_FIR
+++ b/configs/base-generic/CONFIG_NSC_FIR
diff --git a/baseconfig/CONFIG_NTB b/configs/base-generic/CONFIG_NTB
index 78d7f1891..78d7f1891 100644
--- a/baseconfig/CONFIG_NTB
+++ b/configs/base-generic/CONFIG_NTB
diff --git a/baseconfig/CONFIG_NTB_IDT b/configs/base-generic/CONFIG_NTB_IDT
index 0e9236c2a..0e9236c2a 100644
--- a/baseconfig/CONFIG_NTB_IDT
+++ b/configs/base-generic/CONFIG_NTB_IDT
diff --git a/baseconfig/CONFIG_NTFS_FS b/configs/base-generic/CONFIG_NTFS_FS
index 454b2b913..454b2b913 100644
--- a/baseconfig/CONFIG_NTFS_FS
+++ b/configs/base-generic/CONFIG_NTFS_FS
diff --git a/baseconfig/CONFIG_NTP_PPS b/configs/base-generic/CONFIG_NTP_PPS
index 8d3984bb4..8d3984bb4 100644
--- a/baseconfig/CONFIG_NTP_PPS
+++ b/configs/base-generic/CONFIG_NTP_PPS
diff --git a/baseconfig/CONFIG_NVM b/configs/base-generic/CONFIG_NVM
index d1edd087f..d1edd087f 100644
--- a/baseconfig/CONFIG_NVM
+++ b/configs/base-generic/CONFIG_NVM
diff --git a/baseconfig/CONFIG_NVMEM b/configs/base-generic/CONFIG_NVMEM
index 3d8963b5b..3d8963b5b 100644
--- a/baseconfig/CONFIG_NVMEM
+++ b/configs/base-generic/CONFIG_NVMEM
diff --git a/baseconfig/CONFIG_NVME_FC b/configs/base-generic/CONFIG_NVME_FC
index 2152575d9..2152575d9 100644
--- a/baseconfig/CONFIG_NVME_FC
+++ b/configs/base-generic/CONFIG_NVME_FC
diff --git a/baseconfig/CONFIG_NVME_RDMA b/configs/base-generic/CONFIG_NVME_RDMA
index 134190973..134190973 100644
--- a/baseconfig/CONFIG_NVME_RDMA
+++ b/configs/base-generic/CONFIG_NVME_RDMA
diff --git a/baseconfig/CONFIG_NVME_TARGET b/configs/base-generic/CONFIG_NVME_TARGET
index 03d6079ba..03d6079ba 100644
--- a/baseconfig/CONFIG_NVME_TARGET
+++ b/configs/base-generic/CONFIG_NVME_TARGET
diff --git a/baseconfig/CONFIG_NVME_TARGET_FC b/configs/base-generic/CONFIG_NVME_TARGET_FC
index 5d264040c..5d264040c 100644
--- a/baseconfig/CONFIG_NVME_TARGET_FC
+++ b/configs/base-generic/CONFIG_NVME_TARGET_FC
diff --git a/baseconfig/CONFIG_NVME_TARGET_FCLOOP b/configs/base-generic/CONFIG_NVME_TARGET_FCLOOP
index 7334e95ad..7334e95ad 100644
--- a/baseconfig/CONFIG_NVME_TARGET_FCLOOP
+++ b/configs/base-generic/CONFIG_NVME_TARGET_FCLOOP
diff --git a/baseconfig/CONFIG_NVME_TARGET_LOOP b/configs/base-generic/CONFIG_NVME_TARGET_LOOP
index 31f358bca..31f358bca 100644
--- a/baseconfig/CONFIG_NVME_TARGET_LOOP
+++ b/configs/base-generic/CONFIG_NVME_TARGET_LOOP
diff --git a/baseconfig/CONFIG_NVME_TARGET_RDMA b/configs/base-generic/CONFIG_NVME_TARGET_RDMA
index 0f1470c53..0f1470c53 100644
--- a/baseconfig/CONFIG_NVME_TARGET_RDMA
+++ b/configs/base-generic/CONFIG_NVME_TARGET_RDMA
diff --git a/baseconfig/CONFIG_NVRAM b/configs/base-generic/CONFIG_NVRAM
index 723bbe970..723bbe970 100644
--- a/baseconfig/CONFIG_NVRAM
+++ b/configs/base-generic/CONFIG_NVRAM
diff --git a/baseconfig/CONFIG_N_GSM b/configs/base-generic/CONFIG_N_GSM
index 333f7243e..333f7243e 100644
--- a/baseconfig/CONFIG_N_GSM
+++ b/configs/base-generic/CONFIG_N_GSM
diff --git a/baseconfig/CONFIG_N_HDLC b/configs/base-generic/CONFIG_N_HDLC
index cac70b3e4..cac70b3e4 100644
--- a/baseconfig/CONFIG_N_HDLC
+++ b/configs/base-generic/CONFIG_N_HDLC
diff --git a/baseconfig/CONFIG_OCFS2_DEBUG_FS b/configs/base-generic/CONFIG_OCFS2_DEBUG_FS
index af3fdffc2..af3fdffc2 100644
--- a/baseconfig/CONFIG_OCFS2_DEBUG_FS
+++ b/configs/base-generic/CONFIG_OCFS2_DEBUG_FS
diff --git a/baseconfig/CONFIG_OCFS2_DEBUG_MASKLOG b/configs/base-generic/CONFIG_OCFS2_DEBUG_MASKLOG
index 46a06e4da..46a06e4da 100644
--- a/baseconfig/CONFIG_OCFS2_DEBUG_MASKLOG
+++ b/configs/base-generic/CONFIG_OCFS2_DEBUG_MASKLOG
diff --git a/baseconfig/CONFIG_OCFS2_FS b/configs/base-generic/CONFIG_OCFS2_FS
index 40c7becc7..40c7becc7 100644
--- a/baseconfig/CONFIG_OCFS2_FS
+++ b/configs/base-generic/CONFIG_OCFS2_FS
diff --git a/baseconfig/CONFIG_OCFS2_FS_O2CB b/configs/base-generic/CONFIG_OCFS2_FS_O2CB
index b788912cd..b788912cd 100644
--- a/baseconfig/CONFIG_OCFS2_FS_O2CB
+++ b/configs/base-generic/CONFIG_OCFS2_FS_O2CB
diff --git a/baseconfig/CONFIG_OCFS2_FS_STATS b/configs/base-generic/CONFIG_OCFS2_FS_STATS
index 43907977c..43907977c 100644
--- a/baseconfig/CONFIG_OCFS2_FS_STATS
+++ b/configs/base-generic/CONFIG_OCFS2_FS_STATS
diff --git a/baseconfig/CONFIG_OCFS2_FS_USERSPACE_CLUSTER b/configs/base-generic/CONFIG_OCFS2_FS_USERSPACE_CLUSTER
index d81da81a4..d81da81a4 100644
--- a/baseconfig/CONFIG_OCFS2_FS_USERSPACE_CLUSTER
+++ b/configs/base-generic/CONFIG_OCFS2_FS_USERSPACE_CLUSTER
diff --git a/baseconfig/CONFIG_OLD_BELKIN_DONGLE b/configs/base-generic/CONFIG_OLD_BELKIN_DONGLE
index 92a72ab40..92a72ab40 100644
--- a/baseconfig/CONFIG_OLD_BELKIN_DONGLE
+++ b/configs/base-generic/CONFIG_OLD_BELKIN_DONGLE
diff --git a/baseconfig/CONFIG_OMFS_FS b/configs/base-generic/CONFIG_OMFS_FS
index 0aecb6226..0aecb6226 100644
--- a/baseconfig/CONFIG_OMFS_FS
+++ b/configs/base-generic/CONFIG_OMFS_FS
diff --git a/baseconfig/CONFIG_OPENVSWITCH b/configs/base-generic/CONFIG_OPENVSWITCH
index 82b61f8a1..82b61f8a1 100644
--- a/baseconfig/CONFIG_OPENVSWITCH
+++ b/configs/base-generic/CONFIG_OPENVSWITCH
diff --git a/baseconfig/CONFIG_OPENVSWITCH_GENEVE b/configs/base-generic/CONFIG_OPENVSWITCH_GENEVE
index 158138e65..158138e65 100644
--- a/baseconfig/CONFIG_OPENVSWITCH_GENEVE
+++ b/configs/base-generic/CONFIG_OPENVSWITCH_GENEVE
diff --git a/baseconfig/CONFIG_OPENVSWITCH_GRE b/configs/base-generic/CONFIG_OPENVSWITCH_GRE
index 462594567..462594567 100644
--- a/baseconfig/CONFIG_OPENVSWITCH_GRE
+++ b/configs/base-generic/CONFIG_OPENVSWITCH_GRE
diff --git a/baseconfig/CONFIG_OPENVSWITCH_VXLAN b/configs/base-generic/CONFIG_OPENVSWITCH_VXLAN
index c572c1296..c572c1296 100644
--- a/baseconfig/CONFIG_OPENVSWITCH_VXLAN
+++ b/configs/base-generic/CONFIG_OPENVSWITCH_VXLAN
diff --git a/baseconfig/CONFIG_OPROFILE b/configs/base-generic/CONFIG_OPROFILE
index 10bbee816..10bbee816 100644
--- a/baseconfig/CONFIG_OPROFILE
+++ b/configs/base-generic/CONFIG_OPROFILE
diff --git a/baseconfig/CONFIG_OPT3001 b/configs/base-generic/CONFIG_OPT3001
index b9753f2d0..b9753f2d0 100644
--- a/baseconfig/CONFIG_OPT3001
+++ b/configs/base-generic/CONFIG_OPT3001
diff --git a/baseconfig/CONFIG_OPTIMIZE_INLINING b/configs/base-generic/CONFIG_OPTIMIZE_INLINING
index 6991e6d3f..6991e6d3f 100644
--- a/baseconfig/CONFIG_OPTIMIZE_INLINING
+++ b/configs/base-generic/CONFIG_OPTIMIZE_INLINING
diff --git a/baseconfig/CONFIG_OPTPROBES b/configs/base-generic/CONFIG_OPTPROBES
index a604dda96..a604dda96 100644
--- a/baseconfig/CONFIG_OPTPROBES
+++ b/configs/base-generic/CONFIG_OPTPROBES
diff --git a/baseconfig/CONFIG_ORANGEFS_FS b/configs/base-generic/CONFIG_ORANGEFS_FS
index a73482b1d..a73482b1d 100644
--- a/baseconfig/CONFIG_ORANGEFS_FS
+++ b/configs/base-generic/CONFIG_ORANGEFS_FS
diff --git a/baseconfig/CONFIG_ORINOCO_USB b/configs/base-generic/CONFIG_ORINOCO_USB
index 6b7e42b1d..6b7e42b1d 100644
--- a/baseconfig/CONFIG_ORINOCO_USB
+++ b/configs/base-generic/CONFIG_ORINOCO_USB
diff --git a/baseconfig/CONFIG_OSF_PARTITION b/configs/base-generic/CONFIG_OSF_PARTITION
index 8ff387ae9..8ff387ae9 100644
--- a/baseconfig/CONFIG_OSF_PARTITION
+++ b/configs/base-generic/CONFIG_OSF_PARTITION
diff --git a/baseconfig/CONFIG_OVERLAY_FS b/configs/base-generic/CONFIG_OVERLAY_FS
index b30428db0..b30428db0 100644
--- a/baseconfig/CONFIG_OVERLAY_FS
+++ b/configs/base-generic/CONFIG_OVERLAY_FS
diff --git a/baseconfig/CONFIG_OVERLAY_FS_INDEX b/configs/base-generic/CONFIG_OVERLAY_FS_INDEX
index 48a283270..48a283270 100644
--- a/baseconfig/CONFIG_OVERLAY_FS_INDEX
+++ b/configs/base-generic/CONFIG_OVERLAY_FS_INDEX
diff --git a/baseconfig/CONFIG_OVERLAY_FS_REDIRECT_DIR b/configs/base-generic/CONFIG_OVERLAY_FS_REDIRECT_DIR
index 666a9e77d..666a9e77d 100644
--- a/baseconfig/CONFIG_OVERLAY_FS_REDIRECT_DIR
+++ b/configs/base-generic/CONFIG_OVERLAY_FS_REDIRECT_DIR
diff --git a/baseconfig/CONFIG_P54_COMMON b/configs/base-generic/CONFIG_P54_COMMON
index 6807ec0c9..6807ec0c9 100644
--- a/baseconfig/CONFIG_P54_COMMON
+++ b/configs/base-generic/CONFIG_P54_COMMON
diff --git a/baseconfig/CONFIG_P54_PCI b/configs/base-generic/CONFIG_P54_PCI
index 8ae59793a..8ae59793a 100644
--- a/baseconfig/CONFIG_P54_PCI
+++ b/configs/base-generic/CONFIG_P54_PCI
diff --git a/baseconfig/CONFIG_P54_SPI b/configs/base-generic/CONFIG_P54_SPI
index cc9f25267..cc9f25267 100644
--- a/baseconfig/CONFIG_P54_SPI
+++ b/configs/base-generic/CONFIG_P54_SPI
diff --git a/baseconfig/CONFIG_P54_USB b/configs/base-generic/CONFIG_P54_USB
index 7ca2532cd..7ca2532cd 100644
--- a/baseconfig/CONFIG_P54_USB
+++ b/configs/base-generic/CONFIG_P54_USB
diff --git a/baseconfig/CONFIG_PA12203001 b/configs/base-generic/CONFIG_PA12203001
index 96a9a24d4..96a9a24d4 100644
--- a/baseconfig/CONFIG_PA12203001
+++ b/configs/base-generic/CONFIG_PA12203001
diff --git a/baseconfig/CONFIG_PACKET b/configs/base-generic/CONFIG_PACKET
index 15b6ef5b8..15b6ef5b8 100644
--- a/baseconfig/CONFIG_PACKET
+++ b/configs/base-generic/CONFIG_PACKET
diff --git a/baseconfig/CONFIG_PACKET_DIAG b/configs/base-generic/CONFIG_PACKET_DIAG
index f9e9bf425..f9e9bf425 100644
--- a/baseconfig/CONFIG_PACKET_DIAG
+++ b/configs/base-generic/CONFIG_PACKET_DIAG
diff --git a/baseconfig/CONFIG_PAGE_EXTENSION b/configs/base-generic/CONFIG_PAGE_EXTENSION
index f55df4f4e..f55df4f4e 100644
--- a/baseconfig/CONFIG_PAGE_EXTENSION
+++ b/configs/base-generic/CONFIG_PAGE_EXTENSION
diff --git a/baseconfig/CONFIG_PAGE_OWNER b/configs/base-generic/CONFIG_PAGE_OWNER
index 441661dcf..441661dcf 100644
--- a/baseconfig/CONFIG_PAGE_OWNER
+++ b/configs/base-generic/CONFIG_PAGE_OWNER
diff --git a/baseconfig/CONFIG_PAGE_POISONING b/configs/base-generic/CONFIG_PAGE_POISONING
index 0602168f3..0602168f3 100644
--- a/baseconfig/CONFIG_PAGE_POISONING
+++ b/configs/base-generic/CONFIG_PAGE_POISONING
diff --git a/baseconfig/CONFIG_PANEL b/configs/base-generic/CONFIG_PANEL
index de8051393..de8051393 100644
--- a/baseconfig/CONFIG_PANEL
+++ b/configs/base-generic/CONFIG_PANEL
diff --git a/baseconfig/CONFIG_PANIC_ON_OOPS b/configs/base-generic/CONFIG_PANIC_ON_OOPS
index e78949e66..e78949e66 100644
--- a/baseconfig/CONFIG_PANIC_ON_OOPS
+++ b/configs/base-generic/CONFIG_PANIC_ON_OOPS
diff --git a/baseconfig/CONFIG_PANIC_TIMEOUT b/configs/base-generic/CONFIG_PANIC_TIMEOUT
index f09da2173..f09da2173 100644
--- a/baseconfig/CONFIG_PANIC_TIMEOUT
+++ b/configs/base-generic/CONFIG_PANIC_TIMEOUT
diff --git a/baseconfig/CONFIG_PANTHERLORD_FF b/configs/base-generic/CONFIG_PANTHERLORD_FF
index b0c984c36..b0c984c36 100644
--- a/baseconfig/CONFIG_PANTHERLORD_FF
+++ b/configs/base-generic/CONFIG_PANTHERLORD_FF
diff --git a/baseconfig/CONFIG_PARIDE b/configs/base-generic/CONFIG_PARIDE
index cba9eec13..cba9eec13 100644
--- a/baseconfig/CONFIG_PARIDE
+++ b/configs/base-generic/CONFIG_PARIDE
diff --git a/baseconfig/CONFIG_PARMAN b/configs/base-generic/CONFIG_PARMAN
index 1e5d4dd91..1e5d4dd91 100644
--- a/baseconfig/CONFIG_PARMAN
+++ b/configs/base-generic/CONFIG_PARMAN
diff --git a/baseconfig/CONFIG_PARPORT b/configs/base-generic/CONFIG_PARPORT
index 9dd8f33af..9dd8f33af 100644
--- a/baseconfig/CONFIG_PARPORT
+++ b/configs/base-generic/CONFIG_PARPORT
diff --git a/baseconfig/CONFIG_PARPORT_PC b/configs/base-generic/CONFIG_PARPORT_PC
index e2a0d3656..e2a0d3656 100644
--- a/baseconfig/CONFIG_PARPORT_PC
+++ b/configs/base-generic/CONFIG_PARPORT_PC
diff --git a/baseconfig/CONFIG_PARTITION_ADVANCED b/configs/base-generic/CONFIG_PARTITION_ADVANCED
index 313ee5586..313ee5586 100644
--- a/baseconfig/CONFIG_PARTITION_ADVANCED
+++ b/configs/base-generic/CONFIG_PARTITION_ADVANCED
diff --git a/baseconfig/CONFIG_PATA_ALI b/configs/base-generic/CONFIG_PATA_ALI
index fbd742a57..fbd742a57 100644
--- a/baseconfig/CONFIG_PATA_ALI
+++ b/configs/base-generic/CONFIG_PATA_ALI
diff --git a/baseconfig/CONFIG_PATA_AMD b/configs/base-generic/CONFIG_PATA_AMD
index acf7db321..acf7db321 100644
--- a/baseconfig/CONFIG_PATA_AMD
+++ b/configs/base-generic/CONFIG_PATA_AMD
diff --git a/baseconfig/CONFIG_PATA_ARASAN_CF b/configs/base-generic/CONFIG_PATA_ARASAN_CF
index edd438e6c..edd438e6c 100644
--- a/baseconfig/CONFIG_PATA_ARASAN_CF
+++ b/configs/base-generic/CONFIG_PATA_ARASAN_CF
diff --git a/baseconfig/CONFIG_PATA_ARTOP b/configs/base-generic/CONFIG_PATA_ARTOP
index db2c10844..db2c10844 100644
--- a/baseconfig/CONFIG_PATA_ARTOP
+++ b/configs/base-generic/CONFIG_PATA_ARTOP
diff --git a/baseconfig/CONFIG_PATA_ATIIXP b/configs/base-generic/CONFIG_PATA_ATIIXP
index 2730e0e76..2730e0e76 100644
--- a/baseconfig/CONFIG_PATA_ATIIXP
+++ b/configs/base-generic/CONFIG_PATA_ATIIXP
diff --git a/baseconfig/CONFIG_PATA_ATP867X b/configs/base-generic/CONFIG_PATA_ATP867X
index f5a03f81d..f5a03f81d 100644
--- a/baseconfig/CONFIG_PATA_ATP867X
+++ b/configs/base-generic/CONFIG_PATA_ATP867X
diff --git a/baseconfig/CONFIG_PATA_CMD640_PCI b/configs/base-generic/CONFIG_PATA_CMD640_PCI
index 8abe24c03..8abe24c03 100644
--- a/baseconfig/CONFIG_PATA_CMD640_PCI
+++ b/configs/base-generic/CONFIG_PATA_CMD640_PCI
diff --git a/baseconfig/CONFIG_PATA_CMD64X b/configs/base-generic/CONFIG_PATA_CMD64X
index b065f35ad..b065f35ad 100644
--- a/baseconfig/CONFIG_PATA_CMD64X
+++ b/configs/base-generic/CONFIG_PATA_CMD64X
diff --git a/baseconfig/CONFIG_PATA_CS5520 b/configs/base-generic/CONFIG_PATA_CS5520
index a074c5377..a074c5377 100644
--- a/baseconfig/CONFIG_PATA_CS5520
+++ b/configs/base-generic/CONFIG_PATA_CS5520
diff --git a/baseconfig/CONFIG_PATA_CS5530 b/configs/base-generic/CONFIG_PATA_CS5530
index 127588742..127588742 100644
--- a/baseconfig/CONFIG_PATA_CS5530
+++ b/configs/base-generic/CONFIG_PATA_CS5530
diff --git a/baseconfig/CONFIG_PATA_CS5535 b/configs/base-generic/CONFIG_PATA_CS5535
index 4bf67fdea..4bf67fdea 100644
--- a/baseconfig/CONFIG_PATA_CS5535
+++ b/configs/base-generic/CONFIG_PATA_CS5535
diff --git a/baseconfig/CONFIG_PATA_CS5536 b/configs/base-generic/CONFIG_PATA_CS5536
index 0f4c35cac..0f4c35cac 100644
--- a/baseconfig/CONFIG_PATA_CS5536
+++ b/configs/base-generic/CONFIG_PATA_CS5536
diff --git a/baseconfig/CONFIG_PATA_CYPRESS b/configs/base-generic/CONFIG_PATA_CYPRESS
index 901fb21a9..901fb21a9 100644
--- a/baseconfig/CONFIG_PATA_CYPRESS
+++ b/configs/base-generic/CONFIG_PATA_CYPRESS
diff --git a/baseconfig/CONFIG_PATA_EFAR b/configs/base-generic/CONFIG_PATA_EFAR
index 049a9b5c7..049a9b5c7 100644
--- a/baseconfig/CONFIG_PATA_EFAR
+++ b/configs/base-generic/CONFIG_PATA_EFAR
diff --git a/baseconfig/CONFIG_PATA_HPT366 b/configs/base-generic/CONFIG_PATA_HPT366
index 0f8728413..0f8728413 100644
--- a/baseconfig/CONFIG_PATA_HPT366
+++ b/configs/base-generic/CONFIG_PATA_HPT366
diff --git a/baseconfig/CONFIG_PATA_HPT37X b/configs/base-generic/CONFIG_PATA_HPT37X
index c0f919942..c0f919942 100644
--- a/baseconfig/CONFIG_PATA_HPT37X
+++ b/configs/base-generic/CONFIG_PATA_HPT37X
diff --git a/baseconfig/CONFIG_PATA_HPT3X2N b/configs/base-generic/CONFIG_PATA_HPT3X2N
index ab1bf6eb1..ab1bf6eb1 100644
--- a/baseconfig/CONFIG_PATA_HPT3X2N
+++ b/configs/base-generic/CONFIG_PATA_HPT3X2N
diff --git a/baseconfig/CONFIG_PATA_HPT3X3 b/configs/base-generic/CONFIG_PATA_HPT3X3
index aba3749b3..aba3749b3 100644
--- a/baseconfig/CONFIG_PATA_HPT3X3
+++ b/configs/base-generic/CONFIG_PATA_HPT3X3
diff --git a/baseconfig/CONFIG_PATA_HPT3X3_DMA b/configs/base-generic/CONFIG_PATA_HPT3X3_DMA
index 723cb8bb7..723cb8bb7 100644
--- a/baseconfig/CONFIG_PATA_HPT3X3_DMA
+++ b/configs/base-generic/CONFIG_PATA_HPT3X3_DMA
diff --git a/baseconfig/CONFIG_PATA_IT8213 b/configs/base-generic/CONFIG_PATA_IT8213
index 1118a468f..1118a468f 100644
--- a/baseconfig/CONFIG_PATA_IT8213
+++ b/configs/base-generic/CONFIG_PATA_IT8213
diff --git a/baseconfig/CONFIG_PATA_IT821X b/configs/base-generic/CONFIG_PATA_IT821X
index 3b6426086..3b6426086 100644
--- a/baseconfig/CONFIG_PATA_IT821X
+++ b/configs/base-generic/CONFIG_PATA_IT821X
diff --git a/baseconfig/CONFIG_PATA_JMICRON b/configs/base-generic/CONFIG_PATA_JMICRON
index b2fb1f796..b2fb1f796 100644
--- a/baseconfig/CONFIG_PATA_JMICRON
+++ b/configs/base-generic/CONFIG_PATA_JMICRON
diff --git a/baseconfig/CONFIG_PATA_LEGACY b/configs/base-generic/CONFIG_PATA_LEGACY
index c8c3b44f2..c8c3b44f2 100644
--- a/baseconfig/CONFIG_PATA_LEGACY
+++ b/configs/base-generic/CONFIG_PATA_LEGACY
diff --git a/baseconfig/CONFIG_PATA_MARVELL b/configs/base-generic/CONFIG_PATA_MARVELL
index 7e569fb29..7e569fb29 100644
--- a/baseconfig/CONFIG_PATA_MARVELL
+++ b/configs/base-generic/CONFIG_PATA_MARVELL
diff --git a/baseconfig/CONFIG_PATA_MPIIX b/configs/base-generic/CONFIG_PATA_MPIIX
index 241149b47..241149b47 100644
--- a/baseconfig/CONFIG_PATA_MPIIX
+++ b/configs/base-generic/CONFIG_PATA_MPIIX
diff --git a/baseconfig/CONFIG_PATA_NETCELL b/configs/base-generic/CONFIG_PATA_NETCELL
index d3ad10131..d3ad10131 100644
--- a/baseconfig/CONFIG_PATA_NETCELL
+++ b/configs/base-generic/CONFIG_PATA_NETCELL
diff --git a/baseconfig/CONFIG_PATA_NINJA32 b/configs/base-generic/CONFIG_PATA_NINJA32
index 018ab5bca..018ab5bca 100644
--- a/baseconfig/CONFIG_PATA_NINJA32
+++ b/configs/base-generic/CONFIG_PATA_NINJA32
diff --git a/baseconfig/CONFIG_PATA_NS87410 b/configs/base-generic/CONFIG_PATA_NS87410
index d271847ca..d271847ca 100644
--- a/baseconfig/CONFIG_PATA_NS87410
+++ b/configs/base-generic/CONFIG_PATA_NS87410
diff --git a/baseconfig/CONFIG_PATA_NS87415 b/configs/base-generic/CONFIG_PATA_NS87415
index 1f8260c7e..1f8260c7e 100644
--- a/baseconfig/CONFIG_PATA_NS87415
+++ b/configs/base-generic/CONFIG_PATA_NS87415
diff --git a/baseconfig/CONFIG_PATA_OLDPIIX b/configs/base-generic/CONFIG_PATA_OLDPIIX
index b35bb81d0..b35bb81d0 100644
--- a/baseconfig/CONFIG_PATA_OLDPIIX
+++ b/configs/base-generic/CONFIG_PATA_OLDPIIX
diff --git a/baseconfig/CONFIG_PATA_OPTI b/configs/base-generic/CONFIG_PATA_OPTI
index 1808f64ce..1808f64ce 100644
--- a/baseconfig/CONFIG_PATA_OPTI
+++ b/configs/base-generic/CONFIG_PATA_OPTI
diff --git a/baseconfig/CONFIG_PATA_OPTIDMA b/configs/base-generic/CONFIG_PATA_OPTIDMA
index 75fa99779..75fa99779 100644
--- a/baseconfig/CONFIG_PATA_OPTIDMA
+++ b/configs/base-generic/CONFIG_PATA_OPTIDMA
diff --git a/baseconfig/CONFIG_PATA_PCMCIA b/configs/base-generic/CONFIG_PATA_PCMCIA
index e81a8a3c8..e81a8a3c8 100644
--- a/baseconfig/CONFIG_PATA_PCMCIA
+++ b/configs/base-generic/CONFIG_PATA_PCMCIA
diff --git a/baseconfig/CONFIG_PATA_PDC2027X b/configs/base-generic/CONFIG_PATA_PDC2027X
index 30d5e6f20..30d5e6f20 100644
--- a/baseconfig/CONFIG_PATA_PDC2027X
+++ b/configs/base-generic/CONFIG_PATA_PDC2027X
diff --git a/baseconfig/CONFIG_PATA_PDC_OLD b/configs/base-generic/CONFIG_PATA_PDC_OLD
index 10f98240c..10f98240c 100644
--- a/baseconfig/CONFIG_PATA_PDC_OLD
+++ b/configs/base-generic/CONFIG_PATA_PDC_OLD
diff --git a/baseconfig/CONFIG_PATA_RADISYS b/configs/base-generic/CONFIG_PATA_RADISYS
index 30316e774..30316e774 100644
--- a/baseconfig/CONFIG_PATA_RADISYS
+++ b/configs/base-generic/CONFIG_PATA_RADISYS
diff --git a/baseconfig/CONFIG_PATA_RDC b/configs/base-generic/CONFIG_PATA_RDC
index 48afa962b..48afa962b 100644
--- a/baseconfig/CONFIG_PATA_RDC
+++ b/configs/base-generic/CONFIG_PATA_RDC
diff --git a/baseconfig/CONFIG_PATA_RZ1000 b/configs/base-generic/CONFIG_PATA_RZ1000
index 7da7e0970..7da7e0970 100644
--- a/baseconfig/CONFIG_PATA_RZ1000
+++ b/configs/base-generic/CONFIG_PATA_RZ1000
diff --git a/baseconfig/CONFIG_PATA_SC1200 b/configs/base-generic/CONFIG_PATA_SC1200
index 46620f88c..46620f88c 100644
--- a/baseconfig/CONFIG_PATA_SC1200
+++ b/configs/base-generic/CONFIG_PATA_SC1200
diff --git a/baseconfig/CONFIG_PATA_SCH b/configs/base-generic/CONFIG_PATA_SCH
index 52035bf53..52035bf53 100644
--- a/baseconfig/CONFIG_PATA_SCH
+++ b/configs/base-generic/CONFIG_PATA_SCH
diff --git a/baseconfig/CONFIG_PATA_SERVERWORKS b/configs/base-generic/CONFIG_PATA_SERVERWORKS
index 3cded7596..3cded7596 100644
--- a/baseconfig/CONFIG_PATA_SERVERWORKS
+++ b/configs/base-generic/CONFIG_PATA_SERVERWORKS
diff --git a/baseconfig/CONFIG_PATA_SIL680 b/configs/base-generic/CONFIG_PATA_SIL680
index 2558da4e3..2558da4e3 100644
--- a/baseconfig/CONFIG_PATA_SIL680
+++ b/configs/base-generic/CONFIG_PATA_SIL680
diff --git a/baseconfig/CONFIG_PATA_SIS b/configs/base-generic/CONFIG_PATA_SIS
index 238622337..238622337 100644
--- a/baseconfig/CONFIG_PATA_SIS
+++ b/configs/base-generic/CONFIG_PATA_SIS
diff --git a/baseconfig/CONFIG_PATA_TOSHIBA b/configs/base-generic/CONFIG_PATA_TOSHIBA
index ffe9957f1..ffe9957f1 100644
--- a/baseconfig/CONFIG_PATA_TOSHIBA
+++ b/configs/base-generic/CONFIG_PATA_TOSHIBA
diff --git a/baseconfig/CONFIG_PATA_TRIFLEX b/configs/base-generic/CONFIG_PATA_TRIFLEX
index 5da0e57c4..5da0e57c4 100644
--- a/baseconfig/CONFIG_PATA_TRIFLEX
+++ b/configs/base-generic/CONFIG_PATA_TRIFLEX
diff --git a/baseconfig/CONFIG_PATA_VIA b/configs/base-generic/CONFIG_PATA_VIA
index b86e4cc69..b86e4cc69 100644
--- a/baseconfig/CONFIG_PATA_VIA
+++ b/configs/base-generic/CONFIG_PATA_VIA
diff --git a/baseconfig/CONFIG_PATA_WINBOND b/configs/base-generic/CONFIG_PATA_WINBOND
index a6a516597..a6a516597 100644
--- a/baseconfig/CONFIG_PATA_WINBOND
+++ b/configs/base-generic/CONFIG_PATA_WINBOND
diff --git a/baseconfig/CONFIG_PC104 b/configs/base-generic/CONFIG_PC104
index 0608d3f72..0608d3f72 100644
--- a/baseconfig/CONFIG_PC104
+++ b/configs/base-generic/CONFIG_PC104
diff --git a/baseconfig/CONFIG_PC87413_WDT b/configs/base-generic/CONFIG_PC87413_WDT
index 5cd896acc..5cd896acc 100644
--- a/baseconfig/CONFIG_PC87413_WDT
+++ b/configs/base-generic/CONFIG_PC87413_WDT
diff --git a/baseconfig/CONFIG_PCCARD b/configs/base-generic/CONFIG_PCCARD
index 44b97544d..44b97544d 100644
--- a/baseconfig/CONFIG_PCCARD
+++ b/configs/base-generic/CONFIG_PCCARD
diff --git a/baseconfig/CONFIG_PCF50633_ADC b/configs/base-generic/CONFIG_PCF50633_ADC
index dc666e54a..dc666e54a 100644
--- a/baseconfig/CONFIG_PCF50633_ADC
+++ b/configs/base-generic/CONFIG_PCF50633_ADC
diff --git a/baseconfig/CONFIG_PCF50633_GPIO b/configs/base-generic/CONFIG_PCF50633_GPIO
index ce031351d..ce031351d 100644
--- a/baseconfig/CONFIG_PCF50633_GPIO
+++ b/configs/base-generic/CONFIG_PCF50633_GPIO
diff --git a/baseconfig/CONFIG_PCH_GBE b/configs/base-generic/CONFIG_PCH_GBE
index cbba64e6a..cbba64e6a 100644
--- a/baseconfig/CONFIG_PCH_GBE
+++ b/configs/base-generic/CONFIG_PCH_GBE
diff --git a/baseconfig/CONFIG_PCI b/configs/base-generic/CONFIG_PCI
index c499609c3..c499609c3 100644
--- a/baseconfig/CONFIG_PCI
+++ b/configs/base-generic/CONFIG_PCI
diff --git a/baseconfig/CONFIG_PCIEAER b/configs/base-generic/CONFIG_PCIEAER
index 47b8ec3ca..47b8ec3ca 100644
--- a/baseconfig/CONFIG_PCIEAER
+++ b/configs/base-generic/CONFIG_PCIEAER
diff --git a/baseconfig/CONFIG_PCIEAER_INJECT b/configs/base-generic/CONFIG_PCIEAER_INJECT
index 3e2f994f4..3e2f994f4 100644
--- a/baseconfig/CONFIG_PCIEAER_INJECT
+++ b/configs/base-generic/CONFIG_PCIEAER_INJECT
diff --git a/baseconfig/CONFIG_PCIEASPM b/configs/base-generic/CONFIG_PCIEASPM
index 5233234fe..5233234fe 100644
--- a/baseconfig/CONFIG_PCIEASPM
+++ b/configs/base-generic/CONFIG_PCIEASPM
diff --git a/baseconfig/CONFIG_PCIEASPM_DEBUG b/configs/base-generic/CONFIG_PCIEASPM_DEBUG
index f298e0392..f298e0392 100644
--- a/baseconfig/CONFIG_PCIEASPM_DEBUG
+++ b/configs/base-generic/CONFIG_PCIEASPM_DEBUG
diff --git a/baseconfig/CONFIG_PCIEPORTBUS b/configs/base-generic/CONFIG_PCIEPORTBUS
index ead4f09ac..ead4f09ac 100644
--- a/baseconfig/CONFIG_PCIEPORTBUS
+++ b/configs/base-generic/CONFIG_PCIEPORTBUS
diff --git a/baseconfig/CONFIG_PCIE_DPC b/configs/base-generic/CONFIG_PCIE_DPC
index e45e816fc..e45e816fc 100644
--- a/baseconfig/CONFIG_PCIE_DPC
+++ b/configs/base-generic/CONFIG_PCIE_DPC
diff --git a/baseconfig/CONFIG_PCIE_DW_HOST_ECAM b/configs/base-generic/CONFIG_PCIE_DW_HOST_ECAM
index c73d5c1aa..c73d5c1aa 100644
--- a/baseconfig/CONFIG_PCIE_DW_HOST_ECAM
+++ b/configs/base-generic/CONFIG_PCIE_DW_HOST_ECAM
diff --git a/baseconfig/CONFIG_PCIE_DW_PLAT b/configs/base-generic/CONFIG_PCIE_DW_PLAT
index 86edee670..86edee670 100644
--- a/baseconfig/CONFIG_PCIE_DW_PLAT
+++ b/configs/base-generic/CONFIG_PCIE_DW_PLAT
diff --git a/baseconfig/CONFIG_PCIE_ECRC b/configs/base-generic/CONFIG_PCIE_ECRC
index e44624ce1..e44624ce1 100644
--- a/baseconfig/CONFIG_PCIE_ECRC
+++ b/configs/base-generic/CONFIG_PCIE_ECRC
diff --git a/baseconfig/CONFIG_PCIE_PTM b/configs/base-generic/CONFIG_PCIE_PTM
index a774b7686..a774b7686 100644
--- a/baseconfig/CONFIG_PCIE_PTM
+++ b/configs/base-generic/CONFIG_PCIE_PTM
diff --git a/baseconfig/CONFIG_PCIPCWATCHDOG b/configs/base-generic/CONFIG_PCIPCWATCHDOG
index fedb6b37b..fedb6b37b 100644
--- a/baseconfig/CONFIG_PCIPCWATCHDOG
+++ b/configs/base-generic/CONFIG_PCIPCWATCHDOG
diff --git a/baseconfig/CONFIG_PCI_DEBUG b/configs/base-generic/CONFIG_PCI_DEBUG
index 6162d029f..6162d029f 100644
--- a/baseconfig/CONFIG_PCI_DEBUG
+++ b/configs/base-generic/CONFIG_PCI_DEBUG
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT b/configs/base-generic/CONFIG_PCI_ENDPOINT
index d90e2a4f7..d90e2a4f7 100644
--- a/baseconfig/CONFIG_PCI_ENDPOINT
+++ b/configs/base-generic/CONFIG_PCI_ENDPOINT
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT_TEST b/configs/base-generic/CONFIG_PCI_ENDPOINT_TEST
index ac8854da9..ac8854da9 100644
--- a/baseconfig/CONFIG_PCI_ENDPOINT_TEST
+++ b/configs/base-generic/CONFIG_PCI_ENDPOINT_TEST
diff --git a/baseconfig/CONFIG_PCI_HERMES b/configs/base-generic/CONFIG_PCI_HERMES
index a10c65e88..a10c65e88 100644
--- a/baseconfig/CONFIG_PCI_HERMES
+++ b/configs/base-generic/CONFIG_PCI_HERMES
diff --git a/baseconfig/CONFIG_PCI_IOV b/configs/base-generic/CONFIG_PCI_IOV
index c52af465a..c52af465a 100644
--- a/baseconfig/CONFIG_PCI_IOV
+++ b/configs/base-generic/CONFIG_PCI_IOV
diff --git a/baseconfig/CONFIG_PCI_MSI b/configs/base-generic/CONFIG_PCI_MSI
index 9fc3bddd0..9fc3bddd0 100644
--- a/baseconfig/CONFIG_PCI_MSI
+++ b/configs/base-generic/CONFIG_PCI_MSI
diff --git a/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN b/configs/base-generic/CONFIG_PCI_MSI_IRQ_DOMAIN
index 90bf4c7ca..90bf4c7ca 100644
--- a/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN
+++ b/configs/base-generic/CONFIG_PCI_MSI_IRQ_DOMAIN
diff --git a/baseconfig/CONFIG_PCI_PASID b/configs/base-generic/CONFIG_PCI_PASID
index 33abee91c..33abee91c 100644
--- a/baseconfig/CONFIG_PCI_PASID
+++ b/configs/base-generic/CONFIG_PCI_PASID
diff --git a/baseconfig/CONFIG_PCI_PRI b/configs/base-generic/CONFIG_PCI_PRI
index 4f25cd0ae..4f25cd0ae 100644
--- a/baseconfig/CONFIG_PCI_PRI
+++ b/configs/base-generic/CONFIG_PCI_PRI
diff --git a/baseconfig/CONFIG_PCI_REALLOC_ENABLE_AUTO b/configs/base-generic/CONFIG_PCI_REALLOC_ENABLE_AUTO
index 55501f103..55501f103 100644
--- a/baseconfig/CONFIG_PCI_REALLOC_ENABLE_AUTO
+++ b/configs/base-generic/CONFIG_PCI_REALLOC_ENABLE_AUTO
diff --git a/baseconfig/CONFIG_PCI_STUB b/configs/base-generic/CONFIG_PCI_STUB
index b88db42e9..b88db42e9 100644
--- a/baseconfig/CONFIG_PCI_STUB
+++ b/configs/base-generic/CONFIG_PCI_STUB
diff --git a/baseconfig/CONFIG_PCI_SW_SWITCHTEC b/configs/base-generic/CONFIG_PCI_SW_SWITCHTEC
index f197a5ed6..f197a5ed6 100644
--- a/baseconfig/CONFIG_PCI_SW_SWITCHTEC
+++ b/configs/base-generic/CONFIG_PCI_SW_SWITCHTEC
diff --git a/baseconfig/CONFIG_PCMCIA b/configs/base-generic/CONFIG_PCMCIA
index 78cefb603..78cefb603 100644
--- a/baseconfig/CONFIG_PCMCIA
+++ b/configs/base-generic/CONFIG_PCMCIA
diff --git a/baseconfig/CONFIG_PCMCIA_3C574 b/configs/base-generic/CONFIG_PCMCIA_3C574
index 07a875830..07a875830 100644
--- a/baseconfig/CONFIG_PCMCIA_3C574
+++ b/configs/base-generic/CONFIG_PCMCIA_3C574
diff --git a/baseconfig/CONFIG_PCMCIA_3C589 b/configs/base-generic/CONFIG_PCMCIA_3C589
index 6f14f69b0..6f14f69b0 100644
--- a/baseconfig/CONFIG_PCMCIA_3C589
+++ b/configs/base-generic/CONFIG_PCMCIA_3C589
diff --git a/baseconfig/CONFIG_PCMCIA_AXNET b/configs/base-generic/CONFIG_PCMCIA_AXNET
index 61efb3f37..61efb3f37 100644
--- a/baseconfig/CONFIG_PCMCIA_AXNET
+++ b/configs/base-generic/CONFIG_PCMCIA_AXNET
diff --git a/baseconfig/CONFIG_PCMCIA_DEBUG b/configs/base-generic/CONFIG_PCMCIA_DEBUG
index 95c64e917..95c64e917 100644
--- a/baseconfig/CONFIG_PCMCIA_DEBUG
+++ b/configs/base-generic/CONFIG_PCMCIA_DEBUG
diff --git a/baseconfig/CONFIG_PCMCIA_FMVJ18X b/configs/base-generic/CONFIG_PCMCIA_FMVJ18X
index 0d07874d9..0d07874d9 100644
--- a/baseconfig/CONFIG_PCMCIA_FMVJ18X
+++ b/configs/base-generic/CONFIG_PCMCIA_FMVJ18X
diff --git a/baseconfig/CONFIG_PCMCIA_HERMES b/configs/base-generic/CONFIG_PCMCIA_HERMES
index be0d3c631..be0d3c631 100644
--- a/baseconfig/CONFIG_PCMCIA_HERMES
+++ b/configs/base-generic/CONFIG_PCMCIA_HERMES
diff --git a/baseconfig/CONFIG_PCMCIA_LOAD_CIS b/configs/base-generic/CONFIG_PCMCIA_LOAD_CIS
index 9e2ded918..9e2ded918 100644
--- a/baseconfig/CONFIG_PCMCIA_LOAD_CIS
+++ b/configs/base-generic/CONFIG_PCMCIA_LOAD_CIS
diff --git a/baseconfig/CONFIG_PCMCIA_NMCLAN b/configs/base-generic/CONFIG_PCMCIA_NMCLAN
index b545795ea..b545795ea 100644
--- a/baseconfig/CONFIG_PCMCIA_NMCLAN
+++ b/configs/base-generic/CONFIG_PCMCIA_NMCLAN
diff --git a/baseconfig/CONFIG_PCMCIA_PCNET b/configs/base-generic/CONFIG_PCMCIA_PCNET
index a9ce23abe..a9ce23abe 100644
--- a/baseconfig/CONFIG_PCMCIA_PCNET
+++ b/configs/base-generic/CONFIG_PCMCIA_PCNET
diff --git a/baseconfig/CONFIG_PCMCIA_RAYCS b/configs/base-generic/CONFIG_PCMCIA_RAYCS
index 57d6e90e9..57d6e90e9 100644
--- a/baseconfig/CONFIG_PCMCIA_RAYCS
+++ b/configs/base-generic/CONFIG_PCMCIA_RAYCS
diff --git a/baseconfig/CONFIG_PCMCIA_SMC91C92 b/configs/base-generic/CONFIG_PCMCIA_SMC91C92
index e63a395c5..e63a395c5 100644
--- a/baseconfig/CONFIG_PCMCIA_SMC91C92
+++ b/configs/base-generic/CONFIG_PCMCIA_SMC91C92
diff --git a/baseconfig/CONFIG_PCMCIA_SPECTRUM b/configs/base-generic/CONFIG_PCMCIA_SPECTRUM
index 03fe882b6..03fe882b6 100644
--- a/baseconfig/CONFIG_PCMCIA_SPECTRUM
+++ b/configs/base-generic/CONFIG_PCMCIA_SPECTRUM
diff --git a/baseconfig/CONFIG_PCMCIA_WL3501 b/configs/base-generic/CONFIG_PCMCIA_WL3501
index 73c2a9282..73c2a9282 100644
--- a/baseconfig/CONFIG_PCMCIA_WL3501
+++ b/configs/base-generic/CONFIG_PCMCIA_WL3501
diff --git a/baseconfig/CONFIG_PCMCIA_XIRC2PS b/configs/base-generic/CONFIG_PCMCIA_XIRC2PS
index 9904594db..9904594db 100644
--- a/baseconfig/CONFIG_PCMCIA_XIRC2PS
+++ b/configs/base-generic/CONFIG_PCMCIA_XIRC2PS
diff --git a/baseconfig/CONFIG_PCMCIA_XIRCOM b/configs/base-generic/CONFIG_PCMCIA_XIRCOM
index b1f33fa87..b1f33fa87 100644
--- a/baseconfig/CONFIG_PCMCIA_XIRCOM
+++ b/configs/base-generic/CONFIG_PCMCIA_XIRCOM
diff --git a/baseconfig/CONFIG_PCNET32 b/configs/base-generic/CONFIG_PCNET32
index af2abea17..af2abea17 100644
--- a/baseconfig/CONFIG_PCNET32
+++ b/configs/base-generic/CONFIG_PCNET32
diff --git a/baseconfig/CONFIG_PD6729 b/configs/base-generic/CONFIG_PD6729
index da66b1f68..da66b1f68 100644
--- a/baseconfig/CONFIG_PD6729
+++ b/configs/base-generic/CONFIG_PD6729
diff --git a/baseconfig/CONFIG_PDA_POWER b/configs/base-generic/CONFIG_PDA_POWER
index c909c457e..c909c457e 100644
--- a/baseconfig/CONFIG_PDA_POWER
+++ b/configs/base-generic/CONFIG_PDA_POWER
diff --git a/baseconfig/CONFIG_PDC_ADMA b/configs/base-generic/CONFIG_PDC_ADMA
index afd184f8b..afd184f8b 100644
--- a/baseconfig/CONFIG_PDC_ADMA
+++ b/configs/base-generic/CONFIG_PDC_ADMA
diff --git a/baseconfig/CONFIG_PERCPU_STATS b/configs/base-generic/CONFIG_PERCPU_STATS
index 873749756..873749756 100644
--- a/baseconfig/CONFIG_PERCPU_STATS
+++ b/configs/base-generic/CONFIG_PERCPU_STATS
diff --git a/baseconfig/CONFIG_PERCPU_TEST b/configs/base-generic/CONFIG_PERCPU_TEST
index f3d441c00..f3d441c00 100644
--- a/baseconfig/CONFIG_PERCPU_TEST
+++ b/configs/base-generic/CONFIG_PERCPU_TEST
diff --git a/baseconfig/CONFIG_PERF_EVENTS b/configs/base-generic/CONFIG_PERF_EVENTS
index ba58ff220..ba58ff220 100644
--- a/baseconfig/CONFIG_PERF_EVENTS
+++ b/configs/base-generic/CONFIG_PERF_EVENTS
diff --git a/baseconfig/CONFIG_PERSISTENT_KEYRINGS b/configs/base-generic/CONFIG_PERSISTENT_KEYRINGS
index 689472686..689472686 100644
--- a/baseconfig/CONFIG_PERSISTENT_KEYRINGS
+++ b/configs/base-generic/CONFIG_PERSISTENT_KEYRINGS
diff --git a/baseconfig/CONFIG_PGTABLE_MAPPING b/configs/base-generic/CONFIG_PGTABLE_MAPPING
index 3aaa9542f..3aaa9542f 100644
--- a/baseconfig/CONFIG_PGTABLE_MAPPING
+++ b/configs/base-generic/CONFIG_PGTABLE_MAPPING
diff --git a/baseconfig/CONFIG_PHANTOM b/configs/base-generic/CONFIG_PHANTOM
index dc10468e6..dc10468e6 100644
--- a/baseconfig/CONFIG_PHANTOM
+++ b/configs/base-generic/CONFIG_PHANTOM
diff --git a/baseconfig/CONFIG_PHONE b/configs/base-generic/CONFIG_PHONE
index 274e25652..274e25652 100644
--- a/baseconfig/CONFIG_PHONE
+++ b/configs/base-generic/CONFIG_PHONE
diff --git a/baseconfig/CONFIG_PHONET b/configs/base-generic/CONFIG_PHONET
index 093c18313..093c18313 100644
--- a/baseconfig/CONFIG_PHONET
+++ b/configs/base-generic/CONFIG_PHONET
diff --git a/baseconfig/CONFIG_PHYLIB b/configs/base-generic/CONFIG_PHYLIB
index 64ef52233..64ef52233 100644
--- a/baseconfig/CONFIG_PHYLIB
+++ b/configs/base-generic/CONFIG_PHYLIB
diff --git a/baseconfig/CONFIG_PHYLINK b/configs/base-generic/CONFIG_PHYLINK
index cc1e23e0b..cc1e23e0b 100644
--- a/baseconfig/CONFIG_PHYLINK
+++ b/configs/base-generic/CONFIG_PHYLINK
diff --git a/baseconfig/CONFIG_PHY_CPCAP_USB b/configs/base-generic/CONFIG_PHY_CPCAP_USB
index c68874d74..c68874d74 100644
--- a/baseconfig/CONFIG_PHY_CPCAP_USB
+++ b/configs/base-generic/CONFIG_PHY_CPCAP_USB
diff --git a/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY b/configs/base-generic/CONFIG_PHY_MVEBU_CP110_COMPHY
index 8c104689f..8c104689f 100644
--- a/baseconfig/CONFIG_PHY_MVEBU_CP110_COMPHY
+++ b/configs/base-generic/CONFIG_PHY_MVEBU_CP110_COMPHY
diff --git a/baseconfig/CONFIG_PHY_PXA_28NM_HSIC b/configs/base-generic/CONFIG_PHY_PXA_28NM_HSIC
index 450c0fddf..450c0fddf 100644
--- a/baseconfig/CONFIG_PHY_PXA_28NM_HSIC
+++ b/configs/base-generic/CONFIG_PHY_PXA_28NM_HSIC
diff --git a/baseconfig/CONFIG_PHY_PXA_28NM_USB2 b/configs/base-generic/CONFIG_PHY_PXA_28NM_USB2
index 02e05a791..02e05a791 100644
--- a/baseconfig/CONFIG_PHY_PXA_28NM_USB2
+++ b/configs/base-generic/CONFIG_PHY_PXA_28NM_USB2
diff --git a/baseconfig/CONFIG_PHY_QCOM_USB_HS b/configs/base-generic/CONFIG_PHY_QCOM_USB_HS
index ce9808509..ce9808509 100644
--- a/baseconfig/CONFIG_PHY_QCOM_USB_HS
+++ b/configs/base-generic/CONFIG_PHY_QCOM_USB_HS
diff --git a/baseconfig/CONFIG_PHY_QCOM_USB_HSIC b/configs/base-generic/CONFIG_PHY_QCOM_USB_HSIC
index 2a37d673c..2a37d673c 100644
--- a/baseconfig/CONFIG_PHY_QCOM_USB_HSIC
+++ b/configs/base-generic/CONFIG_PHY_QCOM_USB_HSIC
diff --git a/baseconfig/CONFIG_PHY_ST_SPEAR1310_MIPHY b/configs/base-generic/CONFIG_PHY_ST_SPEAR1310_MIPHY
index fcaa7afcd..fcaa7afcd 100644
--- a/baseconfig/CONFIG_PHY_ST_SPEAR1310_MIPHY
+++ b/configs/base-generic/CONFIG_PHY_ST_SPEAR1310_MIPHY
diff --git a/baseconfig/CONFIG_PHY_ST_SPEAR1340_MIPHY b/configs/base-generic/CONFIG_PHY_ST_SPEAR1340_MIPHY
index 356fafcb6..356fafcb6 100644
--- a/baseconfig/CONFIG_PHY_ST_SPEAR1340_MIPHY
+++ b/configs/base-generic/CONFIG_PHY_ST_SPEAR1340_MIPHY
diff --git a/baseconfig/CONFIG_PHY_TUSB1210 b/configs/base-generic/CONFIG_PHY_TUSB1210
index 39d68df37..39d68df37 100644
--- a/baseconfig/CONFIG_PHY_TUSB1210
+++ b/configs/base-generic/CONFIG_PHY_TUSB1210
diff --git a/baseconfig/CONFIG_PI433 b/configs/base-generic/CONFIG_PI433
index b275e1e6a..b275e1e6a 100644
--- a/baseconfig/CONFIG_PI433
+++ b/configs/base-generic/CONFIG_PI433
diff --git a/baseconfig/CONFIG_PID_NS b/configs/base-generic/CONFIG_PID_NS
index eae7bdaa3..eae7bdaa3 100644
--- a/baseconfig/CONFIG_PID_NS
+++ b/configs/base-generic/CONFIG_PID_NS
diff --git a/baseconfig/CONFIG_PINCONF b/configs/base-generic/CONFIG_PINCONF
index ee5813301..ee5813301 100644
--- a/baseconfig/CONFIG_PINCONF
+++ b/configs/base-generic/CONFIG_PINCONF
diff --git a/baseconfig/CONFIG_PINCTRL b/configs/base-generic/CONFIG_PINCTRL
index 0af50d3f6..0af50d3f6 100644
--- a/baseconfig/CONFIG_PINCTRL
+++ b/configs/base-generic/CONFIG_PINCTRL
diff --git a/baseconfig/CONFIG_PINCTRL_CANNONLAKE b/configs/base-generic/CONFIG_PINCTRL_CANNONLAKE
index 4a9b7754f..4a9b7754f 100644
--- a/baseconfig/CONFIG_PINCTRL_CANNONLAKE
+++ b/configs/base-generic/CONFIG_PINCTRL_CANNONLAKE
diff --git a/baseconfig/CONFIG_PINCTRL_IPQ8074 b/configs/base-generic/CONFIG_PINCTRL_IPQ8074
index 3cb74ba4b..3cb74ba4b 100644
--- a/baseconfig/CONFIG_PINCTRL_IPQ8074
+++ b/configs/base-generic/CONFIG_PINCTRL_IPQ8074
diff --git a/baseconfig/CONFIG_PINCTRL_MCP23S08 b/configs/base-generic/CONFIG_PINCTRL_MCP23S08
index 948eb6057..948eb6057 100644
--- a/baseconfig/CONFIG_PINCTRL_MCP23S08
+++ b/configs/base-generic/CONFIG_PINCTRL_MCP23S08
diff --git a/baseconfig/CONFIG_PINCTRL_RK805 b/configs/base-generic/CONFIG_PINCTRL_RK805
index 47b4fd855..47b4fd855 100644
--- a/baseconfig/CONFIG_PINCTRL_RK805
+++ b/configs/base-generic/CONFIG_PINCTRL_RK805
diff --git a/baseconfig/CONFIG_PINCTRL_SPRD b/configs/base-generic/CONFIG_PINCTRL_SPRD
index cffa73544..cffa73544 100644
--- a/baseconfig/CONFIG_PINCTRL_SPRD
+++ b/configs/base-generic/CONFIG_PINCTRL_SPRD
diff --git a/baseconfig/CONFIG_PINCTRL_SPRD_SC9860 b/configs/base-generic/CONFIG_PINCTRL_SPRD_SC9860
index f9b405f96..f9b405f96 100644
--- a/baseconfig/CONFIG_PINCTRL_SPRD_SC9860
+++ b/configs/base-generic/CONFIG_PINCTRL_SPRD_SC9860
diff --git a/baseconfig/CONFIG_PINCTRL_SX150X b/configs/base-generic/CONFIG_PINCTRL_SX150X
index 4416b9f36..4416b9f36 100644
--- a/baseconfig/CONFIG_PINCTRL_SX150X
+++ b/configs/base-generic/CONFIG_PINCTRL_SX150X
diff --git a/baseconfig/CONFIG_PINMUX b/configs/base-generic/CONFIG_PINMUX
index 46bca3a3a..46bca3a3a 100644
--- a/baseconfig/CONFIG_PINMUX
+++ b/configs/base-generic/CONFIG_PINMUX
diff --git a/baseconfig/CONFIG_PKCS7_MESSAGE_PARSER b/configs/base-generic/CONFIG_PKCS7_MESSAGE_PARSER
index 49e251bf1..49e251bf1 100644
--- a/baseconfig/CONFIG_PKCS7_MESSAGE_PARSER
+++ b/configs/base-generic/CONFIG_PKCS7_MESSAGE_PARSER
diff --git a/baseconfig/CONFIG_PKCS7_TEST_KEY b/configs/base-generic/CONFIG_PKCS7_TEST_KEY
index ba15fabfb..ba15fabfb 100644
--- a/baseconfig/CONFIG_PKCS7_TEST_KEY
+++ b/configs/base-generic/CONFIG_PKCS7_TEST_KEY
diff --git a/baseconfig/CONFIG_PLATFORM_SI4713 b/configs/base-generic/CONFIG_PLATFORM_SI4713
index f1f370ad3..f1f370ad3 100644
--- a/baseconfig/CONFIG_PLATFORM_SI4713
+++ b/configs/base-generic/CONFIG_PLATFORM_SI4713
diff --git a/baseconfig/CONFIG_PLIP b/configs/base-generic/CONFIG_PLIP
index b8c35e075..b8c35e075 100644
--- a/baseconfig/CONFIG_PLIP
+++ b/configs/base-generic/CONFIG_PLIP
diff --git a/baseconfig/CONFIG_PLX_HERMES b/configs/base-generic/CONFIG_PLX_HERMES
index 6df2ad3a7..6df2ad3a7 100644
--- a/baseconfig/CONFIG_PLX_HERMES
+++ b/configs/base-generic/CONFIG_PLX_HERMES
diff --git a/baseconfig/CONFIG_PM b/configs/base-generic/CONFIG_PM
index 2df782efc..2df782efc 100644
--- a/baseconfig/CONFIG_PM
+++ b/configs/base-generic/CONFIG_PM
diff --git a/baseconfig/CONFIG_PMBUS b/configs/base-generic/CONFIG_PMBUS
index 8c904bea1..8c904bea1 100644
--- a/baseconfig/CONFIG_PMBUS
+++ b/configs/base-generic/CONFIG_PMBUS
diff --git a/baseconfig/CONFIG_PMIC_ADP5520 b/configs/base-generic/CONFIG_PMIC_ADP5520
index 8664194c8..8664194c8 100644
--- a/baseconfig/CONFIG_PMIC_ADP5520
+++ b/configs/base-generic/CONFIG_PMIC_ADP5520
diff --git a/baseconfig/CONFIG_PMIC_DA903X b/configs/base-generic/CONFIG_PMIC_DA903X
index 875cd2580..875cd2580 100644
--- a/baseconfig/CONFIG_PMIC_DA903X
+++ b/configs/base-generic/CONFIG_PMIC_DA903X
diff --git a/baseconfig/CONFIG_PM_ADVANCED_DEBUG b/configs/base-generic/CONFIG_PM_ADVANCED_DEBUG
index 5ebe2ad86..5ebe2ad86 100644
--- a/baseconfig/CONFIG_PM_ADVANCED_DEBUG
+++ b/configs/base-generic/CONFIG_PM_ADVANCED_DEBUG
diff --git a/baseconfig/CONFIG_PM_AUTOSLEEP b/configs/base-generic/CONFIG_PM_AUTOSLEEP
index f79c502c3..f79c502c3 100644
--- a/baseconfig/CONFIG_PM_AUTOSLEEP
+++ b/configs/base-generic/CONFIG_PM_AUTOSLEEP
diff --git a/baseconfig/CONFIG_PM_DEBUG b/configs/base-generic/CONFIG_PM_DEBUG
index 7bdf35967..7bdf35967 100644
--- a/baseconfig/CONFIG_PM_DEBUG
+++ b/configs/base-generic/CONFIG_PM_DEBUG
diff --git a/baseconfig/CONFIG_PM_DEVFREQ b/configs/base-generic/CONFIG_PM_DEVFREQ
index 89637109c..89637109c 100644
--- a/baseconfig/CONFIG_PM_DEVFREQ
+++ b/configs/base-generic/CONFIG_PM_DEVFREQ
diff --git a/baseconfig/CONFIG_PM_DEVFREQ_EVENT b/configs/base-generic/CONFIG_PM_DEVFREQ_EVENT
index e8ed02e7e..e8ed02e7e 100644
--- a/baseconfig/CONFIG_PM_DEVFREQ_EVENT
+++ b/configs/base-generic/CONFIG_PM_DEVFREQ_EVENT
diff --git a/baseconfig/CONFIG_PM_OPP b/configs/base-generic/CONFIG_PM_OPP
index bbe2b56ba..bbe2b56ba 100644
--- a/baseconfig/CONFIG_PM_OPP
+++ b/configs/base-generic/CONFIG_PM_OPP
diff --git a/baseconfig/CONFIG_PM_STD_PARTITION b/configs/base-generic/CONFIG_PM_STD_PARTITION
index f4866f0ea..f4866f0ea 100644
--- a/baseconfig/CONFIG_PM_STD_PARTITION
+++ b/configs/base-generic/CONFIG_PM_STD_PARTITION
diff --git a/debugconfig/CONFIG_PM_TEST_SUSPEND b/configs/base-generic/CONFIG_PM_TEST_SUSPEND
index ce7dae5cb..ce7dae5cb 100644
--- a/debugconfig/CONFIG_PM_TEST_SUSPEND
+++ b/configs/base-generic/CONFIG_PM_TEST_SUSPEND
diff --git a/baseconfig/CONFIG_PM_TRACE b/configs/base-generic/CONFIG_PM_TRACE
index 1233fcd0a..1233fcd0a 100644
--- a/baseconfig/CONFIG_PM_TRACE
+++ b/configs/base-generic/CONFIG_PM_TRACE
diff --git a/baseconfig/CONFIG_PM_TRACE_RTC b/configs/base-generic/CONFIG_PM_TRACE_RTC
index 44df56f01..44df56f01 100644
--- a/baseconfig/CONFIG_PM_TRACE_RTC
+++ b/configs/base-generic/CONFIG_PM_TRACE_RTC
diff --git a/baseconfig/CONFIG_PM_WAKELOCKS b/configs/base-generic/CONFIG_PM_WAKELOCKS
index 8c4739d32..8c4739d32 100644
--- a/baseconfig/CONFIG_PM_WAKELOCKS
+++ b/configs/base-generic/CONFIG_PM_WAKELOCKS
diff --git a/baseconfig/CONFIG_PNFS_BLOCK b/configs/base-generic/CONFIG_PNFS_BLOCK
index e3d84638b..e3d84638b 100644
--- a/baseconfig/CONFIG_PNFS_BLOCK
+++ b/configs/base-generic/CONFIG_PNFS_BLOCK
diff --git a/baseconfig/CONFIG_PNFS_OBJLAYOUT b/configs/base-generic/CONFIG_PNFS_OBJLAYOUT
index dad412cca..dad412cca 100644
--- a/baseconfig/CONFIG_PNFS_OBJLAYOUT
+++ b/configs/base-generic/CONFIG_PNFS_OBJLAYOUT
diff --git a/baseconfig/CONFIG_POSIX_MQUEUE b/configs/base-generic/CONFIG_POSIX_MQUEUE
index 6991d0bcb..6991d0bcb 100644
--- a/baseconfig/CONFIG_POSIX_MQUEUE
+++ b/configs/base-generic/CONFIG_POSIX_MQUEUE
diff --git a/baseconfig/CONFIG_POWERCAP b/configs/base-generic/CONFIG_POWERCAP
index 279fe368f..279fe368f 100644
--- a/baseconfig/CONFIG_POWERCAP
+++ b/configs/base-generic/CONFIG_POWERCAP
diff --git a/baseconfig/CONFIG_POWER_AVS b/configs/base-generic/CONFIG_POWER_AVS
index f9ee36b73..f9ee36b73 100644
--- a/baseconfig/CONFIG_POWER_AVS
+++ b/configs/base-generic/CONFIG_POWER_AVS
diff --git a/baseconfig/CONFIG_POWER_RESET b/configs/base-generic/CONFIG_POWER_RESET
index 453890b18..453890b18 100644
--- a/baseconfig/CONFIG_POWER_RESET
+++ b/configs/base-generic/CONFIG_POWER_RESET
diff --git a/baseconfig/CONFIG_POWER_RESET_BRCMKONA b/configs/base-generic/CONFIG_POWER_RESET_BRCMKONA
index 4198963df..4198963df 100644
--- a/baseconfig/CONFIG_POWER_RESET_BRCMKONA
+++ b/configs/base-generic/CONFIG_POWER_RESET_BRCMKONA
diff --git a/baseconfig/CONFIG_POWER_RESET_BRCMSTB b/configs/base-generic/CONFIG_POWER_RESET_BRCMSTB
index 35f35e595..35f35e595 100644
--- a/baseconfig/CONFIG_POWER_RESET_BRCMSTB
+++ b/configs/base-generic/CONFIG_POWER_RESET_BRCMSTB
diff --git a/baseconfig/CONFIG_POWER_RESET_LTC2952 b/configs/base-generic/CONFIG_POWER_RESET_LTC2952
index 33d2e69bd..33d2e69bd 100644
--- a/baseconfig/CONFIG_POWER_RESET_LTC2952
+++ b/configs/base-generic/CONFIG_POWER_RESET_LTC2952
diff --git a/baseconfig/CONFIG_POWER_RESET_RESTART b/configs/base-generic/CONFIG_POWER_RESET_RESTART
index 62520aa1d..62520aa1d 100644
--- a/baseconfig/CONFIG_POWER_RESET_RESTART
+++ b/configs/base-generic/CONFIG_POWER_RESET_RESTART
diff --git a/baseconfig/CONFIG_POWER_RESET_SYSCON b/configs/base-generic/CONFIG_POWER_RESET_SYSCON
index e80cc8bef..e80cc8bef 100644
--- a/baseconfig/CONFIG_POWER_RESET_SYSCON
+++ b/configs/base-generic/CONFIG_POWER_RESET_SYSCON
diff --git a/baseconfig/CONFIG_POWER_RESET_SYSCON_POWEROFF b/configs/base-generic/CONFIG_POWER_RESET_SYSCON_POWEROFF
index 72673e06d..72673e06d 100644
--- a/baseconfig/CONFIG_POWER_RESET_SYSCON_POWEROFF
+++ b/configs/base-generic/CONFIG_POWER_RESET_SYSCON_POWEROFF
diff --git a/baseconfig/CONFIG_POWER_SUPPLY b/configs/base-generic/CONFIG_POWER_SUPPLY
index 5f28cbaf0..5f28cbaf0 100644
--- a/baseconfig/CONFIG_POWER_SUPPLY
+++ b/configs/base-generic/CONFIG_POWER_SUPPLY
diff --git a/baseconfig/CONFIG_POWER_SUPPLY_DEBUG b/configs/base-generic/CONFIG_POWER_SUPPLY_DEBUG
index 23ed22a2e..23ed22a2e 100644
--- a/baseconfig/CONFIG_POWER_SUPPLY_DEBUG
+++ b/configs/base-generic/CONFIG_POWER_SUPPLY_DEBUG
diff --git a/baseconfig/CONFIG_PPC_PTDUMP b/configs/base-generic/CONFIG_PPC_PTDUMP
index 8c36b38b9..8c36b38b9 100644
--- a/baseconfig/CONFIG_PPC_PTDUMP
+++ b/configs/base-generic/CONFIG_PPC_PTDUMP
diff --git a/baseconfig/CONFIG_PPDEV b/configs/base-generic/CONFIG_PPDEV
index 34c75b4ab..34c75b4ab 100644
--- a/baseconfig/CONFIG_PPDEV
+++ b/configs/base-generic/CONFIG_PPDEV
diff --git a/baseconfig/CONFIG_PPP b/configs/base-generic/CONFIG_PPP
index f2e4de8c9..f2e4de8c9 100644
--- a/baseconfig/CONFIG_PPP
+++ b/configs/base-generic/CONFIG_PPP
diff --git a/baseconfig/CONFIG_PPPOATM b/configs/base-generic/CONFIG_PPPOATM
index d2b11b3b6..d2b11b3b6 100644
--- a/baseconfig/CONFIG_PPPOATM
+++ b/configs/base-generic/CONFIG_PPPOATM
diff --git a/baseconfig/CONFIG_PPPOE b/configs/base-generic/CONFIG_PPPOE
index 3451811b5..3451811b5 100644
--- a/baseconfig/CONFIG_PPPOE
+++ b/configs/base-generic/CONFIG_PPPOE
diff --git a/baseconfig/CONFIG_PPPOL2TP b/configs/base-generic/CONFIG_PPPOL2TP
index cb8272d91..cb8272d91 100644
--- a/baseconfig/CONFIG_PPPOL2TP
+++ b/configs/base-generic/CONFIG_PPPOL2TP
diff --git a/baseconfig/CONFIG_PPP_ASYNC b/configs/base-generic/CONFIG_PPP_ASYNC
index 822b86ae9..822b86ae9 100644
--- a/baseconfig/CONFIG_PPP_ASYNC
+++ b/configs/base-generic/CONFIG_PPP_ASYNC
diff --git a/baseconfig/CONFIG_PPP_BSDCOMP b/configs/base-generic/CONFIG_PPP_BSDCOMP
index da4db48b4..da4db48b4 100644
--- a/baseconfig/CONFIG_PPP_BSDCOMP
+++ b/configs/base-generic/CONFIG_PPP_BSDCOMP
diff --git a/baseconfig/CONFIG_PPP_DEFLATE b/configs/base-generic/CONFIG_PPP_DEFLATE
index a292110b3..a292110b3 100644
--- a/baseconfig/CONFIG_PPP_DEFLATE
+++ b/configs/base-generic/CONFIG_PPP_DEFLATE
diff --git a/baseconfig/CONFIG_PPP_FILTER b/configs/base-generic/CONFIG_PPP_FILTER
index 0a7a25c08..0a7a25c08 100644
--- a/baseconfig/CONFIG_PPP_FILTER
+++ b/configs/base-generic/CONFIG_PPP_FILTER
diff --git a/baseconfig/CONFIG_PPP_MPPE b/configs/base-generic/CONFIG_PPP_MPPE
index 534e6d2b1..534e6d2b1 100644
--- a/baseconfig/CONFIG_PPP_MPPE
+++ b/configs/base-generic/CONFIG_PPP_MPPE
diff --git a/baseconfig/CONFIG_PPP_MULTILINK b/configs/base-generic/CONFIG_PPP_MULTILINK
index 815360d7a..815360d7a 100644
--- a/baseconfig/CONFIG_PPP_MULTILINK
+++ b/configs/base-generic/CONFIG_PPP_MULTILINK
diff --git a/baseconfig/CONFIG_PPP_SYNC_TTY b/configs/base-generic/CONFIG_PPP_SYNC_TTY
index e50b04a03..e50b04a03 100644
--- a/baseconfig/CONFIG_PPP_SYNC_TTY
+++ b/configs/base-generic/CONFIG_PPP_SYNC_TTY
diff --git a/baseconfig/CONFIG_PPS b/configs/base-generic/CONFIG_PPS
index f2a107935..f2a107935 100644
--- a/baseconfig/CONFIG_PPS
+++ b/configs/base-generic/CONFIG_PPS
diff --git a/baseconfig/CONFIG_PPS_CLIENT_GPIO b/configs/base-generic/CONFIG_PPS_CLIENT_GPIO
index 70ddbfa66..70ddbfa66 100644
--- a/baseconfig/CONFIG_PPS_CLIENT_GPIO
+++ b/configs/base-generic/CONFIG_PPS_CLIENT_GPIO
diff --git a/baseconfig/CONFIG_PPS_CLIENT_KTIMER b/configs/base-generic/CONFIG_PPS_CLIENT_KTIMER
index 58cc6a5c1..58cc6a5c1 100644
--- a/baseconfig/CONFIG_PPS_CLIENT_KTIMER
+++ b/configs/base-generic/CONFIG_PPS_CLIENT_KTIMER
diff --git a/baseconfig/CONFIG_PPS_CLIENT_LDISC b/configs/base-generic/CONFIG_PPS_CLIENT_LDISC
index 856b2b85b..856b2b85b 100644
--- a/baseconfig/CONFIG_PPS_CLIENT_LDISC
+++ b/configs/base-generic/CONFIG_PPS_CLIENT_LDISC
diff --git a/baseconfig/CONFIG_PPS_DEBUG b/configs/base-generic/CONFIG_PPS_DEBUG
index 68357ea56..68357ea56 100644
--- a/baseconfig/CONFIG_PPS_DEBUG
+++ b/configs/base-generic/CONFIG_PPS_DEBUG
diff --git a/baseconfig/CONFIG_PPTP b/configs/base-generic/CONFIG_PPTP
index cbe270876..cbe270876 100644
--- a/baseconfig/CONFIG_PPTP
+++ b/configs/base-generic/CONFIG_PPTP
diff --git a/baseconfig/CONFIG_PREEMPT b/configs/base-generic/CONFIG_PREEMPT
index 38362d94a..38362d94a 100644
--- a/baseconfig/CONFIG_PREEMPT
+++ b/configs/base-generic/CONFIG_PREEMPT
diff --git a/baseconfig/CONFIG_PREEMPT_NONE b/configs/base-generic/CONFIG_PREEMPT_NONE
index 45e314681..45e314681 100644
--- a/baseconfig/CONFIG_PREEMPT_NONE
+++ b/configs/base-generic/CONFIG_PREEMPT_NONE
diff --git a/baseconfig/CONFIG_PREEMPT_VOLUNTARY b/configs/base-generic/CONFIG_PREEMPT_VOLUNTARY
index 4762d5ecd..4762d5ecd 100644
--- a/baseconfig/CONFIG_PREEMPT_VOLUNTARY
+++ b/configs/base-generic/CONFIG_PREEMPT_VOLUNTARY
diff --git a/baseconfig/CONFIG_PREVENT_FIRMWARE_BUILD b/configs/base-generic/CONFIG_PREVENT_FIRMWARE_BUILD
index 3793f37f1..3793f37f1 100644
--- a/baseconfig/CONFIG_PREVENT_FIRMWARE_BUILD
+++ b/configs/base-generic/CONFIG_PREVENT_FIRMWARE_BUILD
diff --git a/baseconfig/CONFIG_PRINTER b/configs/base-generic/CONFIG_PRINTER
index 9b82c068b..9b82c068b 100644
--- a/baseconfig/CONFIG_PRINTER
+++ b/configs/base-generic/CONFIG_PRINTER
diff --git a/baseconfig/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT b/configs/base-generic/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
index eb368f2d7..eb368f2d7 100644
--- a/baseconfig/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
+++ b/configs/base-generic/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
diff --git a/baseconfig/CONFIG_PRINTK_TIME b/configs/base-generic/CONFIG_PRINTK_TIME
index 5d5b73e9c..5d5b73e9c 100644
--- a/baseconfig/CONFIG_PRINTK_TIME
+++ b/configs/base-generic/CONFIG_PRINTK_TIME
diff --git a/baseconfig/CONFIG_PRINT_QUOTA_WARNING b/configs/base-generic/CONFIG_PRINT_QUOTA_WARNING
index 6b9e46508..6b9e46508 100644
--- a/baseconfig/CONFIG_PRINT_QUOTA_WARNING
+++ b/configs/base-generic/CONFIG_PRINT_QUOTA_WARNING
diff --git a/baseconfig/CONFIG_PRISM2_USB b/configs/base-generic/CONFIG_PRISM2_USB
index 739b9fe26..739b9fe26 100644
--- a/baseconfig/CONFIG_PRISM2_USB
+++ b/configs/base-generic/CONFIG_PRISM2_USB
diff --git a/baseconfig/CONFIG_PRISM54 b/configs/base-generic/CONFIG_PRISM54
index 06efec38d..06efec38d 100644
--- a/baseconfig/CONFIG_PRISM54
+++ b/configs/base-generic/CONFIG_PRISM54
diff --git a/baseconfig/CONFIG_PROC_CHILDREN b/configs/base-generic/CONFIG_PROC_CHILDREN
index e0d900831..e0d900831 100644
--- a/baseconfig/CONFIG_PROC_CHILDREN
+++ b/configs/base-generic/CONFIG_PROC_CHILDREN
diff --git a/baseconfig/CONFIG_PROC_EVENTS b/configs/base-generic/CONFIG_PROC_EVENTS
index 3755504b7..3755504b7 100644
--- a/baseconfig/CONFIG_PROC_EVENTS
+++ b/configs/base-generic/CONFIG_PROC_EVENTS
diff --git a/baseconfig/CONFIG_PROC_FS b/configs/base-generic/CONFIG_PROC_FS
index 68fbd2b35..68fbd2b35 100644
--- a/baseconfig/CONFIG_PROC_FS
+++ b/configs/base-generic/CONFIG_PROC_FS
diff --git a/baseconfig/CONFIG_PROC_KCORE b/configs/base-generic/CONFIG_PROC_KCORE
index eb475c0a7..eb475c0a7 100644
--- a/baseconfig/CONFIG_PROC_KCORE
+++ b/configs/base-generic/CONFIG_PROC_KCORE
diff --git a/baseconfig/CONFIG_PROC_PID_CPUSET b/configs/base-generic/CONFIG_PROC_PID_CPUSET
index 1d12cb14d..1d12cb14d 100644
--- a/baseconfig/CONFIG_PROC_PID_CPUSET
+++ b/configs/base-generic/CONFIG_PROC_PID_CPUSET
diff --git a/baseconfig/CONFIG_PROC_VMCORE b/configs/base-generic/CONFIG_PROC_VMCORE
index c864e6b0b..c864e6b0b 100644
--- a/baseconfig/CONFIG_PROC_VMCORE
+++ b/configs/base-generic/CONFIG_PROC_VMCORE
diff --git a/baseconfig/CONFIG_PROFILING b/configs/base-generic/CONFIG_PROFILING
index 5c7124d60..5c7124d60 100644
--- a/baseconfig/CONFIG_PROFILING
+++ b/configs/base-generic/CONFIG_PROFILING
diff --git a/baseconfig/CONFIG_PROVE_LOCKING b/configs/base-generic/CONFIG_PROVE_LOCKING
index adea6cc66..adea6cc66 100644
--- a/baseconfig/CONFIG_PROVE_LOCKING
+++ b/configs/base-generic/CONFIG_PROVE_LOCKING
diff --git a/baseconfig/CONFIG_PROVE_RCU_REPEATEDLY b/configs/base-generic/CONFIG_PROVE_RCU_REPEATEDLY
index ffa734f76..ffa734f76 100644
--- a/baseconfig/CONFIG_PROVE_RCU_REPEATEDLY
+++ b/configs/base-generic/CONFIG_PROVE_RCU_REPEATEDLY
diff --git a/baseconfig/CONFIG_PSAMPLE b/configs/base-generic/CONFIG_PSAMPLE
index fca0860ea..fca0860ea 100644
--- a/baseconfig/CONFIG_PSAMPLE
+++ b/configs/base-generic/CONFIG_PSAMPLE
diff --git a/baseconfig/CONFIG_PSTORE b/configs/base-generic/CONFIG_PSTORE
index e7ffca208..e7ffca208 100644
--- a/baseconfig/CONFIG_PSTORE
+++ b/configs/base-generic/CONFIG_PSTORE
diff --git a/baseconfig/CONFIG_PSTORE_CONSOLE b/configs/base-generic/CONFIG_PSTORE_CONSOLE
index 27ecf9894..27ecf9894 100644
--- a/baseconfig/CONFIG_PSTORE_CONSOLE
+++ b/configs/base-generic/CONFIG_PSTORE_CONSOLE
diff --git a/baseconfig/CONFIG_PSTORE_FTRACE b/configs/base-generic/CONFIG_PSTORE_FTRACE
index e8e51dd1e..e8e51dd1e 100644
--- a/baseconfig/CONFIG_PSTORE_FTRACE
+++ b/configs/base-generic/CONFIG_PSTORE_FTRACE
diff --git a/baseconfig/CONFIG_PSTORE_PMSG b/configs/base-generic/CONFIG_PSTORE_PMSG
index 06350590d..06350590d 100644
--- a/baseconfig/CONFIG_PSTORE_PMSG
+++ b/configs/base-generic/CONFIG_PSTORE_PMSG
diff --git a/baseconfig/CONFIG_PSTORE_RAM b/configs/base-generic/CONFIG_PSTORE_RAM
index a2f597d9c..a2f597d9c 100644
--- a/baseconfig/CONFIG_PSTORE_RAM
+++ b/configs/base-generic/CONFIG_PSTORE_RAM
diff --git a/baseconfig/CONFIG_PTP_1588_CLOCK b/configs/base-generic/CONFIG_PTP_1588_CLOCK
index cea01d507..cea01d507 100644
--- a/baseconfig/CONFIG_PTP_1588_CLOCK
+++ b/configs/base-generic/CONFIG_PTP_1588_CLOCK
diff --git a/baseconfig/CONFIG_PTP_1588_CLOCK_PCH b/configs/base-generic/CONFIG_PTP_1588_CLOCK_PCH
index 32d9bef8c..32d9bef8c 100644
--- a/baseconfig/CONFIG_PTP_1588_CLOCK_PCH
+++ b/configs/base-generic/CONFIG_PTP_1588_CLOCK_PCH
diff --git a/baseconfig/CONFIG_PWM b/configs/base-generic/CONFIG_PWM
index 346c909b6..346c909b6 100644
--- a/baseconfig/CONFIG_PWM
+++ b/configs/base-generic/CONFIG_PWM
diff --git a/baseconfig/CONFIG_PWM_FSL_FTM b/configs/base-generic/CONFIG_PWM_FSL_FTM
index 8bd1025ee..8bd1025ee 100644
--- a/baseconfig/CONFIG_PWM_FSL_FTM
+++ b/configs/base-generic/CONFIG_PWM_FSL_FTM
diff --git a/baseconfig/CONFIG_PWM_HIBVT b/configs/base-generic/CONFIG_PWM_HIBVT
index b2e696005..b2e696005 100644
--- a/baseconfig/CONFIG_PWM_HIBVT
+++ b/configs/base-generic/CONFIG_PWM_HIBVT
diff --git a/baseconfig/CONFIG_PWM_PCA9685 b/configs/base-generic/CONFIG_PWM_PCA9685
index 87e2b86ae..87e2b86ae 100644
--- a/baseconfig/CONFIG_PWM_PCA9685
+++ b/configs/base-generic/CONFIG_PWM_PCA9685
diff --git a/baseconfig/CONFIG_PWRSEQ_EMMC b/configs/base-generic/CONFIG_PWRSEQ_EMMC
index 995df8828..995df8828 100644
--- a/baseconfig/CONFIG_PWRSEQ_EMMC
+++ b/configs/base-generic/CONFIG_PWRSEQ_EMMC
diff --git a/baseconfig/CONFIG_PWRSEQ_SD8787 b/configs/base-generic/CONFIG_PWRSEQ_SD8787
index 820984327..820984327 100644
--- a/baseconfig/CONFIG_PWRSEQ_SD8787
+++ b/configs/base-generic/CONFIG_PWRSEQ_SD8787
diff --git a/baseconfig/CONFIG_PWRSEQ_SIMPLE b/configs/base-generic/CONFIG_PWRSEQ_SIMPLE
index e03b57d1e..e03b57d1e 100644
--- a/baseconfig/CONFIG_PWRSEQ_SIMPLE
+++ b/configs/base-generic/CONFIG_PWRSEQ_SIMPLE
diff --git a/baseconfig/CONFIG_QCA7000 b/configs/base-generic/CONFIG_QCA7000
index 1a7ec7f1e..1a7ec7f1e 100644
--- a/baseconfig/CONFIG_QCA7000
+++ b/configs/base-generic/CONFIG_QCA7000
diff --git a/baseconfig/CONFIG_QCA7000_SPI b/configs/base-generic/CONFIG_QCA7000_SPI
index 9e9088849..9e9088849 100644
--- a/baseconfig/CONFIG_QCA7000_SPI
+++ b/configs/base-generic/CONFIG_QCA7000_SPI
diff --git a/baseconfig/CONFIG_QCA7000_UART b/configs/base-generic/CONFIG_QCA7000_UART
index fc691586b..fc691586b 100644
--- a/baseconfig/CONFIG_QCA7000_UART
+++ b/configs/base-generic/CONFIG_QCA7000_UART
diff --git a/baseconfig/CONFIG_QCOM_EMAC b/configs/base-generic/CONFIG_QCOM_EMAC
index 5f97471b2..5f97471b2 100644
--- a/baseconfig/CONFIG_QCOM_EMAC
+++ b/configs/base-generic/CONFIG_QCOM_EMAC
diff --git a/baseconfig/CONFIG_QCOM_GLINK_SSR b/configs/base-generic/CONFIG_QCOM_GLINK_SSR
index 1c67b32f7..1c67b32f7 100644
--- a/baseconfig/CONFIG_QCOM_GLINK_SSR
+++ b/configs/base-generic/CONFIG_QCOM_GLINK_SSR
diff --git a/baseconfig/CONFIG_QCOM_HIDMA b/configs/base-generic/CONFIG_QCOM_HIDMA
index b58063523..b58063523 100644
--- a/baseconfig/CONFIG_QCOM_HIDMA
+++ b/configs/base-generic/CONFIG_QCOM_HIDMA
diff --git a/baseconfig/CONFIG_QCOM_HIDMA_MGMT b/configs/base-generic/CONFIG_QCOM_HIDMA_MGMT
index 4b37c0348..4b37c0348 100644
--- a/baseconfig/CONFIG_QCOM_HIDMA_MGMT
+++ b/configs/base-generic/CONFIG_QCOM_HIDMA_MGMT
diff --git a/baseconfig/CONFIG_QED b/configs/base-generic/CONFIG_QED
index c39c087a9..c39c087a9 100644
--- a/baseconfig/CONFIG_QED
+++ b/configs/base-generic/CONFIG_QED
diff --git a/baseconfig/CONFIG_QEDE b/configs/base-generic/CONFIG_QEDE
index 3e672b166..3e672b166 100644
--- a/baseconfig/CONFIG_QEDE
+++ b/configs/base-generic/CONFIG_QEDE
diff --git a/baseconfig/CONFIG_QEDF b/configs/base-generic/CONFIG_QEDF
index 33c24865a..33c24865a 100644
--- a/baseconfig/CONFIG_QEDF
+++ b/configs/base-generic/CONFIG_QEDF
diff --git a/baseconfig/CONFIG_QEDI b/configs/base-generic/CONFIG_QEDI
index c751aba20..c751aba20 100644
--- a/baseconfig/CONFIG_QEDI
+++ b/configs/base-generic/CONFIG_QEDI
diff --git a/baseconfig/CONFIG_QED_SRIOV b/configs/base-generic/CONFIG_QED_SRIOV
index 35fa4ac2f..35fa4ac2f 100644
--- a/baseconfig/CONFIG_QED_SRIOV
+++ b/configs/base-generic/CONFIG_QED_SRIOV
diff --git a/baseconfig/CONFIG_QFMT_V1 b/configs/base-generic/CONFIG_QFMT_V1
index ca782388a..ca782388a 100644
--- a/baseconfig/CONFIG_QFMT_V1
+++ b/configs/base-generic/CONFIG_QFMT_V1
diff --git a/baseconfig/CONFIG_QFMT_V2 b/configs/base-generic/CONFIG_QFMT_V2
index 961af550c..961af550c 100644
--- a/baseconfig/CONFIG_QFMT_V2
+++ b/configs/base-generic/CONFIG_QFMT_V2
diff --git a/baseconfig/CONFIG_QLA3XXX b/configs/base-generic/CONFIG_QLA3XXX
index 718c130d4..718c130d4 100644
--- a/baseconfig/CONFIG_QLA3XXX
+++ b/configs/base-generic/CONFIG_QLA3XXX
diff --git a/baseconfig/CONFIG_QLCNIC b/configs/base-generic/CONFIG_QLCNIC
index 7065bab83..7065bab83 100644
--- a/baseconfig/CONFIG_QLCNIC
+++ b/configs/base-generic/CONFIG_QLCNIC
diff --git a/baseconfig/CONFIG_QLCNIC_DCB b/configs/base-generic/CONFIG_QLCNIC_DCB
index 5a36f44b3..5a36f44b3 100644
--- a/baseconfig/CONFIG_QLCNIC_DCB
+++ b/configs/base-generic/CONFIG_QLCNIC_DCB
diff --git a/baseconfig/CONFIG_QLCNIC_HWMON b/configs/base-generic/CONFIG_QLCNIC_HWMON
index b9b23cd4d..b9b23cd4d 100644
--- a/baseconfig/CONFIG_QLCNIC_HWMON
+++ b/configs/base-generic/CONFIG_QLCNIC_HWMON
diff --git a/baseconfig/CONFIG_QLCNIC_SRIOV b/configs/base-generic/CONFIG_QLCNIC_SRIOV
index cd8d9510e..cd8d9510e 100644
--- a/baseconfig/CONFIG_QLCNIC_SRIOV
+++ b/configs/base-generic/CONFIG_QLCNIC_SRIOV
diff --git a/baseconfig/CONFIG_QLGE b/configs/base-generic/CONFIG_QLGE
index 7dca1df17..7dca1df17 100644
--- a/baseconfig/CONFIG_QLGE
+++ b/configs/base-generic/CONFIG_QLGE
diff --git a/baseconfig/CONFIG_QNX4FS_FS b/configs/base-generic/CONFIG_QNX4FS_FS
index 43a604f47..43a604f47 100644
--- a/baseconfig/CONFIG_QNX4FS_FS
+++ b/configs/base-generic/CONFIG_QNX4FS_FS
diff --git a/baseconfig/CONFIG_QNX6FS_FS b/configs/base-generic/CONFIG_QNX6FS_FS
index 9fba608a8..9fba608a8 100644
--- a/baseconfig/CONFIG_QNX6FS_FS
+++ b/configs/base-generic/CONFIG_QNX6FS_FS
diff --git a/baseconfig/CONFIG_QSEMI_PHY b/configs/base-generic/CONFIG_QSEMI_PHY
index 460334246..460334246 100644
--- a/baseconfig/CONFIG_QSEMI_PHY
+++ b/configs/base-generic/CONFIG_QSEMI_PHY
diff --git a/baseconfig/CONFIG_QTNFMAC_PEARL_PCIE b/configs/base-generic/CONFIG_QTNFMAC_PEARL_PCIE
index f67981f77..f67981f77 100644
--- a/baseconfig/CONFIG_QTNFMAC_PEARL_PCIE
+++ b/configs/base-generic/CONFIG_QTNFMAC_PEARL_PCIE
diff --git a/baseconfig/CONFIG_QUOTA b/configs/base-generic/CONFIG_QUOTA
index 7ae6b6fba..7ae6b6fba 100644
--- a/baseconfig/CONFIG_QUOTA
+++ b/configs/base-generic/CONFIG_QUOTA
diff --git a/baseconfig/CONFIG_QUOTACTL b/configs/base-generic/CONFIG_QUOTACTL
index d473401f1..d473401f1 100644
--- a/baseconfig/CONFIG_QUOTACTL
+++ b/configs/base-generic/CONFIG_QUOTACTL
diff --git a/baseconfig/CONFIG_QUOTA_DEBUG b/configs/base-generic/CONFIG_QUOTA_DEBUG
index f7312a841..f7312a841 100644
--- a/baseconfig/CONFIG_QUOTA_DEBUG
+++ b/configs/base-generic/CONFIG_QUOTA_DEBUG
diff --git a/baseconfig/CONFIG_QUOTA_NETLINK_INTERFACE b/configs/base-generic/CONFIG_QUOTA_NETLINK_INTERFACE
index 83abecebb..83abecebb 100644
--- a/baseconfig/CONFIG_QUOTA_NETLINK_INTERFACE
+++ b/configs/base-generic/CONFIG_QUOTA_NETLINK_INTERFACE
diff --git a/baseconfig/CONFIG_R3964 b/configs/base-generic/CONFIG_R3964
index 6dd888eaa..6dd888eaa 100644
--- a/baseconfig/CONFIG_R3964
+++ b/configs/base-generic/CONFIG_R3964
diff --git a/baseconfig/CONFIG_R6040 b/configs/base-generic/CONFIG_R6040
index ae051d28e..ae051d28e 100644
--- a/baseconfig/CONFIG_R6040
+++ b/configs/base-generic/CONFIG_R6040
diff --git a/baseconfig/CONFIG_R8169 b/configs/base-generic/CONFIG_R8169
index 3f47885c1..3f47885c1 100644
--- a/baseconfig/CONFIG_R8169
+++ b/configs/base-generic/CONFIG_R8169
diff --git a/baseconfig/CONFIG_R8188EU b/configs/base-generic/CONFIG_R8188EU
index 53dbebe11..53dbebe11 100644
--- a/baseconfig/CONFIG_R8188EU
+++ b/configs/base-generic/CONFIG_R8188EU
diff --git a/baseconfig/CONFIG_R8712U b/configs/base-generic/CONFIG_R8712U
index 8fce42ff2..8fce42ff2 100644
--- a/baseconfig/CONFIG_R8712U
+++ b/configs/base-generic/CONFIG_R8712U
diff --git a/baseconfig/CONFIG_R8723AU b/configs/base-generic/CONFIG_R8723AU
index 81f320f50..81f320f50 100644
--- a/baseconfig/CONFIG_R8723AU
+++ b/configs/base-generic/CONFIG_R8723AU
diff --git a/baseconfig/CONFIG_R8822BE b/configs/base-generic/CONFIG_R8822BE
index 2f7c08787..2f7c08787 100644
--- a/baseconfig/CONFIG_R8822BE
+++ b/configs/base-generic/CONFIG_R8822BE
diff --git a/baseconfig/CONFIG_RADIO_ADAPTERS b/configs/base-generic/CONFIG_RADIO_ADAPTERS
index f6f0715d7..f6f0715d7 100644
--- a/baseconfig/CONFIG_RADIO_ADAPTERS
+++ b/configs/base-generic/CONFIG_RADIO_ADAPTERS
diff --git a/baseconfig/CONFIG_RADIO_AZTECH b/configs/base-generic/CONFIG_RADIO_AZTECH
index 26b22f16f..26b22f16f 100644
--- a/baseconfig/CONFIG_RADIO_AZTECH
+++ b/configs/base-generic/CONFIG_RADIO_AZTECH
diff --git a/baseconfig/CONFIG_RADIO_CADET b/configs/base-generic/CONFIG_RADIO_CADET
index 04fa8b0df..04fa8b0df 100644
--- a/baseconfig/CONFIG_RADIO_CADET
+++ b/configs/base-generic/CONFIG_RADIO_CADET
diff --git a/baseconfig/CONFIG_RADIO_GEMTEK b/configs/base-generic/CONFIG_RADIO_GEMTEK
index a6b1dd2bc..a6b1dd2bc 100644
--- a/baseconfig/CONFIG_RADIO_GEMTEK
+++ b/configs/base-generic/CONFIG_RADIO_GEMTEK
diff --git a/baseconfig/CONFIG_RADIO_MAXIRADIO b/configs/base-generic/CONFIG_RADIO_MAXIRADIO
index eaf7ca996..eaf7ca996 100644
--- a/baseconfig/CONFIG_RADIO_MAXIRADIO
+++ b/configs/base-generic/CONFIG_RADIO_MAXIRADIO
diff --git a/baseconfig/CONFIG_RADIO_MIROPCM20 b/configs/base-generic/CONFIG_RADIO_MIROPCM20
index b61430814..b61430814 100644
--- a/baseconfig/CONFIG_RADIO_MIROPCM20
+++ b/configs/base-generic/CONFIG_RADIO_MIROPCM20
diff --git a/baseconfig/CONFIG_RADIO_RTRACK b/configs/base-generic/CONFIG_RADIO_RTRACK
index 9199a249c..9199a249c 100644
--- a/baseconfig/CONFIG_RADIO_RTRACK
+++ b/configs/base-generic/CONFIG_RADIO_RTRACK
diff --git a/baseconfig/CONFIG_RADIO_RTRACK2 b/configs/base-generic/CONFIG_RADIO_RTRACK2
index 3c7a22dc9..3c7a22dc9 100644
--- a/baseconfig/CONFIG_RADIO_RTRACK2
+++ b/configs/base-generic/CONFIG_RADIO_RTRACK2
diff --git a/baseconfig/CONFIG_RADIO_SAA7706H b/configs/base-generic/CONFIG_RADIO_SAA7706H
index e740665c7..e740665c7 100644
--- a/baseconfig/CONFIG_RADIO_SAA7706H
+++ b/configs/base-generic/CONFIG_RADIO_SAA7706H
diff --git a/baseconfig/CONFIG_RADIO_SF16FMI b/configs/base-generic/CONFIG_RADIO_SF16FMI
index b0ee2b9d3..b0ee2b9d3 100644
--- a/baseconfig/CONFIG_RADIO_SF16FMI
+++ b/configs/base-generic/CONFIG_RADIO_SF16FMI
diff --git a/baseconfig/CONFIG_RADIO_SF16FMR2 b/configs/base-generic/CONFIG_RADIO_SF16FMR2
index e79c3f9cf..e79c3f9cf 100644
--- a/baseconfig/CONFIG_RADIO_SF16FMR2
+++ b/configs/base-generic/CONFIG_RADIO_SF16FMR2
diff --git a/baseconfig/CONFIG_RADIO_SHARK b/configs/base-generic/CONFIG_RADIO_SHARK
index 928bd8a66..928bd8a66 100644
--- a/baseconfig/CONFIG_RADIO_SHARK
+++ b/configs/base-generic/CONFIG_RADIO_SHARK
diff --git a/baseconfig/CONFIG_RADIO_SHARK2 b/configs/base-generic/CONFIG_RADIO_SHARK2
index 2d9827208..2d9827208 100644
--- a/baseconfig/CONFIG_RADIO_SHARK2
+++ b/configs/base-generic/CONFIG_RADIO_SHARK2
diff --git a/baseconfig/CONFIG_RADIO_SI470X b/configs/base-generic/CONFIG_RADIO_SI470X
index a20a29c34..a20a29c34 100644
--- a/baseconfig/CONFIG_RADIO_SI470X
+++ b/configs/base-generic/CONFIG_RADIO_SI470X
diff --git a/baseconfig/CONFIG_RADIO_SI4713 b/configs/base-generic/CONFIG_RADIO_SI4713
index 5cfc614de..5cfc614de 100644
--- a/baseconfig/CONFIG_RADIO_SI4713
+++ b/configs/base-generic/CONFIG_RADIO_SI4713
diff --git a/baseconfig/CONFIG_RADIO_TEA5764 b/configs/base-generic/CONFIG_RADIO_TEA5764
index 96e89db2a..96e89db2a 100644
--- a/baseconfig/CONFIG_RADIO_TEA5764
+++ b/configs/base-generic/CONFIG_RADIO_TEA5764
diff --git a/baseconfig/CONFIG_RADIO_TEF6862 b/configs/base-generic/CONFIG_RADIO_TEF6862
index 4ed980fb6..4ed980fb6 100644
--- a/baseconfig/CONFIG_RADIO_TEF6862
+++ b/configs/base-generic/CONFIG_RADIO_TEF6862
diff --git a/baseconfig/CONFIG_RADIO_TERRATEC b/configs/base-generic/CONFIG_RADIO_TERRATEC
index e108d23e7..e108d23e7 100644
--- a/baseconfig/CONFIG_RADIO_TERRATEC
+++ b/configs/base-generic/CONFIG_RADIO_TERRATEC
diff --git a/baseconfig/CONFIG_RADIO_TRUST b/configs/base-generic/CONFIG_RADIO_TRUST
index b919f162c..b919f162c 100644
--- a/baseconfig/CONFIG_RADIO_TRUST
+++ b/configs/base-generic/CONFIG_RADIO_TRUST
diff --git a/baseconfig/CONFIG_RADIO_TYPHOON b/configs/base-generic/CONFIG_RADIO_TYPHOON
index 7fd67083b..7fd67083b 100644
--- a/baseconfig/CONFIG_RADIO_TYPHOON
+++ b/configs/base-generic/CONFIG_RADIO_TYPHOON
diff --git a/baseconfig/CONFIG_RADIO_WL1273 b/configs/base-generic/CONFIG_RADIO_WL1273
index f061c05a3..f061c05a3 100644
--- a/baseconfig/CONFIG_RADIO_WL1273
+++ b/configs/base-generic/CONFIG_RADIO_WL1273
diff --git a/baseconfig/CONFIG_RADIO_ZOLTRIX b/configs/base-generic/CONFIG_RADIO_ZOLTRIX
index f03317841..f03317841 100644
--- a/baseconfig/CONFIG_RADIO_ZOLTRIX
+++ b/configs/base-generic/CONFIG_RADIO_ZOLTRIX
diff --git a/baseconfig/CONFIG_RAID_ATTRS b/configs/base-generic/CONFIG_RAID_ATTRS
index 6ba5f1cc4..6ba5f1cc4 100644
--- a/baseconfig/CONFIG_RAID_ATTRS
+++ b/configs/base-generic/CONFIG_RAID_ATTRS
diff --git a/baseconfig/CONFIG_RANDOM32_SELFTEST b/configs/base-generic/CONFIG_RANDOM32_SELFTEST
index 5c9c3b986..5c9c3b986 100644
--- a/baseconfig/CONFIG_RANDOM32_SELFTEST
+++ b/configs/base-generic/CONFIG_RANDOM32_SELFTEST
diff --git a/baseconfig/CONFIG_RAS_CEC b/configs/base-generic/CONFIG_RAS_CEC
index 7b0901ca1..7b0901ca1 100644
--- a/baseconfig/CONFIG_RAS_CEC
+++ b/configs/base-generic/CONFIG_RAS_CEC
diff --git a/baseconfig/CONFIG_RAW_DRIVER b/configs/base-generic/CONFIG_RAW_DRIVER
index 359c63460..359c63460 100644
--- a/baseconfig/CONFIG_RAW_DRIVER
+++ b/configs/base-generic/CONFIG_RAW_DRIVER
diff --git a/baseconfig/CONFIG_RBTREE_TEST b/configs/base-generic/CONFIG_RBTREE_TEST
index 51b8db7b7..51b8db7b7 100644
--- a/baseconfig/CONFIG_RBTREE_TEST
+++ b/configs/base-generic/CONFIG_RBTREE_TEST
diff --git a/baseconfig/CONFIG_RCU_CPU_STALL_TIMEOUT b/configs/base-generic/CONFIG_RCU_CPU_STALL_TIMEOUT
index 472dbad6e..472dbad6e 100644
--- a/baseconfig/CONFIG_RCU_CPU_STALL_TIMEOUT
+++ b/configs/base-generic/CONFIG_RCU_CPU_STALL_TIMEOUT
diff --git a/baseconfig/CONFIG_RCU_EQS_DEBUG b/configs/base-generic/CONFIG_RCU_EQS_DEBUG
index 225c6bd3a..225c6bd3a 100644
--- a/baseconfig/CONFIG_RCU_EQS_DEBUG
+++ b/configs/base-generic/CONFIG_RCU_EQS_DEBUG
diff --git a/baseconfig/CONFIG_RCU_EXPERT b/configs/base-generic/CONFIG_RCU_EXPERT
index 8c9922cf3..8c9922cf3 100644
--- a/baseconfig/CONFIG_RCU_EXPERT
+++ b/configs/base-generic/CONFIG_RCU_EXPERT
diff --git a/baseconfig/CONFIG_RCU_FAST_NO_HZ b/configs/base-generic/CONFIG_RCU_FAST_NO_HZ
index 366c6156f..366c6156f 100644
--- a/baseconfig/CONFIG_RCU_FAST_NO_HZ
+++ b/configs/base-generic/CONFIG_RCU_FAST_NO_HZ
diff --git a/baseconfig/CONFIG_RCU_KTHREAD_PRIO b/configs/base-generic/CONFIG_RCU_KTHREAD_PRIO
index e9d19d1f8..e9d19d1f8 100644
--- a/baseconfig/CONFIG_RCU_KTHREAD_PRIO
+++ b/configs/base-generic/CONFIG_RCU_KTHREAD_PRIO
diff --git a/baseconfig/CONFIG_RCU_NOCB_CPU b/configs/base-generic/CONFIG_RCU_NOCB_CPU
index 19a962135..19a962135 100644
--- a/baseconfig/CONFIG_RCU_NOCB_CPU
+++ b/configs/base-generic/CONFIG_RCU_NOCB_CPU
diff --git a/baseconfig/CONFIG_RCU_NOCB_CPU_ALL b/configs/base-generic/CONFIG_RCU_NOCB_CPU_ALL
index ea18f8dcd..ea18f8dcd 100644
--- a/baseconfig/CONFIG_RCU_NOCB_CPU_ALL
+++ b/configs/base-generic/CONFIG_RCU_NOCB_CPU_ALL
diff --git a/baseconfig/CONFIG_RCU_PERF_TEST b/configs/base-generic/CONFIG_RCU_PERF_TEST
index 66e8f52b7..66e8f52b7 100644
--- a/baseconfig/CONFIG_RCU_PERF_TEST
+++ b/configs/base-generic/CONFIG_RCU_PERF_TEST
diff --git a/baseconfig/CONFIG_RCU_TORTURE_TEST b/configs/base-generic/CONFIG_RCU_TORTURE_TEST
index 2f5748692..2f5748692 100644
--- a/baseconfig/CONFIG_RCU_TORTURE_TEST
+++ b/configs/base-generic/CONFIG_RCU_TORTURE_TEST
diff --git a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP
index bada41bec..bada41bec 100644
--- a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP
+++ b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP
diff --git a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_INIT b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_INIT
index 209752ec1..209752ec1 100644
--- a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_INIT
+++ b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_INIT
diff --git a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY
index a1ca5b669..a1ca5b669 100644
--- a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY
+++ b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY
diff --git a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT
index 20e78f542..20e78f542 100644
--- a/baseconfig/CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT
+++ b/configs/base-generic/CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT
diff --git a/baseconfig/CONFIG_RCU_TRACE b/configs/base-generic/CONFIG_RCU_TRACE
index 4acae1aab..4acae1aab 100644
--- a/baseconfig/CONFIG_RCU_TRACE
+++ b/configs/base-generic/CONFIG_RCU_TRACE
diff --git a/baseconfig/CONFIG_RC_ATI_REMOTE b/configs/base-generic/CONFIG_RC_ATI_REMOTE
index 9912b0af8..9912b0af8 100644
--- a/baseconfig/CONFIG_RC_ATI_REMOTE
+++ b/configs/base-generic/CONFIG_RC_ATI_REMOTE
diff --git a/baseconfig/CONFIG_RC_CORE b/configs/base-generic/CONFIG_RC_CORE
index 73d773223..73d773223 100644
--- a/baseconfig/CONFIG_RC_CORE
+++ b/configs/base-generic/CONFIG_RC_CORE
diff --git a/baseconfig/CONFIG_RC_DECODERS b/configs/base-generic/CONFIG_RC_DECODERS
index ae93cb8de..ae93cb8de 100644
--- a/baseconfig/CONFIG_RC_DECODERS
+++ b/configs/base-generic/CONFIG_RC_DECODERS
diff --git a/baseconfig/CONFIG_RC_DEVICES b/configs/base-generic/CONFIG_RC_DEVICES
index fb9a9e567..fb9a9e567 100644
--- a/baseconfig/CONFIG_RC_DEVICES
+++ b/configs/base-generic/CONFIG_RC_DEVICES
diff --git a/baseconfig/CONFIG_RC_LOOPBACK b/configs/base-generic/CONFIG_RC_LOOPBACK
index 013a7f858..013a7f858 100644
--- a/baseconfig/CONFIG_RC_LOOPBACK
+++ b/configs/base-generic/CONFIG_RC_LOOPBACK
diff --git a/baseconfig/CONFIG_RC_MAP b/configs/base-generic/CONFIG_RC_MAP
index 910c883d4..910c883d4 100644
--- a/baseconfig/CONFIG_RC_MAP
+++ b/configs/base-generic/CONFIG_RC_MAP
diff --git a/baseconfig/CONFIG_RDMA_RXE b/configs/base-generic/CONFIG_RDMA_RXE
index 53cd17fc2..53cd17fc2 100644
--- a/baseconfig/CONFIG_RDMA_RXE
+++ b/configs/base-generic/CONFIG_RDMA_RXE
diff --git a/baseconfig/CONFIG_RDS b/configs/base-generic/CONFIG_RDS
index f6fd21f6d..f6fd21f6d 100644
--- a/baseconfig/CONFIG_RDS
+++ b/configs/base-generic/CONFIG_RDS
diff --git a/baseconfig/CONFIG_RDS_DEBUG b/configs/base-generic/CONFIG_RDS_DEBUG
index 0140abdac..0140abdac 100644
--- a/baseconfig/CONFIG_RDS_DEBUG
+++ b/configs/base-generic/CONFIG_RDS_DEBUG
diff --git a/baseconfig/CONFIG_RDS_RDMA b/configs/base-generic/CONFIG_RDS_RDMA
index 2dc47512a..2dc47512a 100644
--- a/baseconfig/CONFIG_RDS_RDMA
+++ b/configs/base-generic/CONFIG_RDS_RDMA
diff --git a/baseconfig/CONFIG_RDS_TCP b/configs/base-generic/CONFIG_RDS_TCP
index 23c07a0d9..23c07a0d9 100644
--- a/baseconfig/CONFIG_RDS_TCP
+++ b/configs/base-generic/CONFIG_RDS_TCP
diff --git a/baseconfig/CONFIG_RD_BZIP2 b/configs/base-generic/CONFIG_RD_BZIP2
index 9d25ca811..9d25ca811 100644
--- a/baseconfig/CONFIG_RD_BZIP2
+++ b/configs/base-generic/CONFIG_RD_BZIP2
diff --git a/baseconfig/CONFIG_RD_GZIP b/configs/base-generic/CONFIG_RD_GZIP
index d38a59a2b..d38a59a2b 100644
--- a/baseconfig/CONFIG_RD_GZIP
+++ b/configs/base-generic/CONFIG_RD_GZIP
diff --git a/baseconfig/CONFIG_RD_LZ4 b/configs/base-generic/CONFIG_RD_LZ4
index ecc2a7048..ecc2a7048 100644
--- a/baseconfig/CONFIG_RD_LZ4
+++ b/configs/base-generic/CONFIG_RD_LZ4
diff --git a/baseconfig/CONFIG_RD_LZMA b/configs/base-generic/CONFIG_RD_LZMA
index 02827c69b..02827c69b 100644
--- a/baseconfig/CONFIG_RD_LZMA
+++ b/configs/base-generic/CONFIG_RD_LZMA
diff --git a/baseconfig/CONFIG_RD_LZO b/configs/base-generic/CONFIG_RD_LZO
index 4734aec1d..4734aec1d 100644
--- a/baseconfig/CONFIG_RD_LZO
+++ b/configs/base-generic/CONFIG_RD_LZO
diff --git a/baseconfig/CONFIG_RD_XZ b/configs/base-generic/CONFIG_RD_XZ
index bbd13fc54..bbd13fc54 100644
--- a/baseconfig/CONFIG_RD_XZ
+++ b/configs/base-generic/CONFIG_RD_XZ
diff --git a/baseconfig/CONFIG_READABLE_ASM b/configs/base-generic/CONFIG_READABLE_ASM
index 147b2c061..147b2c061 100644
--- a/baseconfig/CONFIG_READABLE_ASM
+++ b/configs/base-generic/CONFIG_READABLE_ASM
diff --git a/baseconfig/CONFIG_REALTEK_AUTOPM b/configs/base-generic/CONFIG_REALTEK_AUTOPM
index ea952943f..ea952943f 100644
--- a/baseconfig/CONFIG_REALTEK_AUTOPM
+++ b/configs/base-generic/CONFIG_REALTEK_AUTOPM
diff --git a/baseconfig/CONFIG_REALTEK_PHY b/configs/base-generic/CONFIG_REALTEK_PHY
index 051e7cc45..051e7cc45 100644
--- a/baseconfig/CONFIG_REALTEK_PHY
+++ b/configs/base-generic/CONFIG_REALTEK_PHY
diff --git a/baseconfig/CONFIG_REFCOUNT_FULL b/configs/base-generic/CONFIG_REFCOUNT_FULL
index 0789ed3be..0789ed3be 100644
--- a/baseconfig/CONFIG_REFCOUNT_FULL
+++ b/configs/base-generic/CONFIG_REFCOUNT_FULL
diff --git a/baseconfig/CONFIG_REGMAP b/configs/base-generic/CONFIG_REGMAP
index 5e40b3c4b..5e40b3c4b 100644
--- a/baseconfig/CONFIG_REGMAP
+++ b/configs/base-generic/CONFIG_REGMAP
diff --git a/baseconfig/CONFIG_REGMAP_I2C b/configs/base-generic/CONFIG_REGMAP_I2C
index 8440b2caf..8440b2caf 100644
--- a/baseconfig/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/CONFIG_REGMAP_I2C
diff --git a/baseconfig/CONFIG_REGULATOR b/configs/base-generic/CONFIG_REGULATOR
index 3987d79a1..3987d79a1 100644
--- a/baseconfig/CONFIG_REGULATOR
+++ b/configs/base-generic/CONFIG_REGULATOR
diff --git a/baseconfig/CONFIG_REGULATOR_BD9571MWV b/configs/base-generic/CONFIG_REGULATOR_BD9571MWV
index 3b0acb786..3b0acb786 100644
--- a/baseconfig/CONFIG_REGULATOR_BD9571MWV
+++ b/configs/base-generic/CONFIG_REGULATOR_BD9571MWV
diff --git a/baseconfig/CONFIG_REGULATOR_DEBUG b/configs/base-generic/CONFIG_REGULATOR_DEBUG
index 2894d4909..2894d4909 100644
--- a/baseconfig/CONFIG_REGULATOR_DEBUG
+++ b/configs/base-generic/CONFIG_REGULATOR_DEBUG
diff --git a/baseconfig/CONFIG_REGULATOR_TPS65132 b/configs/base-generic/CONFIG_REGULATOR_TPS65132
index b82a99f6c..b82a99f6c 100644
--- a/baseconfig/CONFIG_REGULATOR_TPS65132
+++ b/configs/base-generic/CONFIG_REGULATOR_TPS65132
diff --git a/baseconfig/CONFIG_REGULATOR_VCTRL b/configs/base-generic/CONFIG_REGULATOR_VCTRL
index 478bc6400..478bc6400 100644
--- a/baseconfig/CONFIG_REGULATOR_VCTRL
+++ b/configs/base-generic/CONFIG_REGULATOR_VCTRL
diff --git a/baseconfig/CONFIG_REISERFS_CHECK b/configs/base-generic/CONFIG_REISERFS_CHECK
index 7f6527f45..7f6527f45 100644
--- a/baseconfig/CONFIG_REISERFS_CHECK
+++ b/configs/base-generic/CONFIG_REISERFS_CHECK
diff --git a/baseconfig/CONFIG_REISERFS_FS b/configs/base-generic/CONFIG_REISERFS_FS
index f3658b5f2..f3658b5f2 100644
--- a/baseconfig/CONFIG_REISERFS_FS
+++ b/configs/base-generic/CONFIG_REISERFS_FS
diff --git a/baseconfig/CONFIG_REISERFS_FS_POSIX_ACL b/configs/base-generic/CONFIG_REISERFS_FS_POSIX_ACL
index a4bd2482d..a4bd2482d 100644
--- a/baseconfig/CONFIG_REISERFS_FS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_REISERFS_FS_POSIX_ACL
diff --git a/baseconfig/CONFIG_REISERFS_FS_SECURITY b/configs/base-generic/CONFIG_REISERFS_FS_SECURITY
index ba88ad81a..ba88ad81a 100644
--- a/baseconfig/CONFIG_REISERFS_FS_SECURITY
+++ b/configs/base-generic/CONFIG_REISERFS_FS_SECURITY
diff --git a/baseconfig/CONFIG_REISERFS_FS_XATTR b/configs/base-generic/CONFIG_REISERFS_FS_XATTR
index c77389f68..c77389f68 100644
--- a/baseconfig/CONFIG_REISERFS_FS_XATTR
+++ b/configs/base-generic/CONFIG_REISERFS_FS_XATTR
diff --git a/baseconfig/CONFIG_REISERFS_PROC_INFO b/configs/base-generic/CONFIG_REISERFS_PROC_INFO
index 9a8680aee..9a8680aee 100644
--- a/baseconfig/CONFIG_REISERFS_PROC_INFO
+++ b/configs/base-generic/CONFIG_REISERFS_PROC_INFO
diff --git a/baseconfig/CONFIG_RELAY b/configs/base-generic/CONFIG_RELAY
index 146eff5b4..146eff5b4 100644
--- a/baseconfig/CONFIG_RELAY
+++ b/configs/base-generic/CONFIG_RELAY
diff --git a/baseconfig/CONFIG_RELOCATABLE_TEST b/configs/base-generic/CONFIG_RELOCATABLE_TEST
index 89e9c50a4..89e9c50a4 100644
--- a/baseconfig/CONFIG_RELOCATABLE_TEST
+++ b/configs/base-generic/CONFIG_RELOCATABLE_TEST
diff --git a/baseconfig/CONFIG_REMOTEPROC b/configs/base-generic/CONFIG_REMOTEPROC
index 5a1f9df99..5a1f9df99 100644
--- a/baseconfig/CONFIG_REMOTEPROC
+++ b/configs/base-generic/CONFIG_REMOTEPROC
diff --git a/baseconfig/CONFIG_RESET_ATTACK_MITIGATION b/configs/base-generic/CONFIG_RESET_ATTACK_MITIGATION
index 8202a7865..8202a7865 100644
--- a/baseconfig/CONFIG_RESET_ATTACK_MITIGATION
+++ b/configs/base-generic/CONFIG_RESET_ATTACK_MITIGATION
diff --git a/baseconfig/CONFIG_RESET_HSDK_V1 b/configs/base-generic/CONFIG_RESET_HSDK_V1
index 4c2b97d79..4c2b97d79 100644
--- a/baseconfig/CONFIG_RESET_HSDK_V1
+++ b/configs/base-generic/CONFIG_RESET_HSDK_V1
diff --git a/baseconfig/CONFIG_RESET_TI_SYSCON b/configs/base-generic/CONFIG_RESET_TI_SYSCON
index 1e76bd135..1e76bd135 100644
--- a/baseconfig/CONFIG_RESET_TI_SYSCON
+++ b/configs/base-generic/CONFIG_RESET_TI_SYSCON
diff --git a/baseconfig/CONFIG_RFD_FTL b/configs/base-generic/CONFIG_RFD_FTL
index 3d4b2f0de..3d4b2f0de 100644
--- a/baseconfig/CONFIG_RFD_FTL
+++ b/configs/base-generic/CONFIG_RFD_FTL
diff --git a/baseconfig/CONFIG_RFKILL b/configs/base-generic/CONFIG_RFKILL
index 7ec901c53..7ec901c53 100644
--- a/baseconfig/CONFIG_RFKILL
+++ b/configs/base-generic/CONFIG_RFKILL
diff --git a/baseconfig/CONFIG_RFKILL_GPIO b/configs/base-generic/CONFIG_RFKILL_GPIO
index 1665e0ed4..1665e0ed4 100644
--- a/baseconfig/CONFIG_RFKILL_GPIO
+++ b/configs/base-generic/CONFIG_RFKILL_GPIO
diff --git a/baseconfig/CONFIG_RFKILL_INPUT b/configs/base-generic/CONFIG_RFKILL_INPUT
index 15fc0f8ad..15fc0f8ad 100644
--- a/baseconfig/CONFIG_RFKILL_INPUT
+++ b/configs/base-generic/CONFIG_RFKILL_INPUT
diff --git a/baseconfig/CONFIG_RING_BUFFER_BENCHMARK b/configs/base-generic/CONFIG_RING_BUFFER_BENCHMARK
index 4116ef243..4116ef243 100644
--- a/baseconfig/CONFIG_RING_BUFFER_BENCHMARK
+++ b/configs/base-generic/CONFIG_RING_BUFFER_BENCHMARK
diff --git a/baseconfig/CONFIG_RING_BUFFER_STARTUP_TEST b/configs/base-generic/CONFIG_RING_BUFFER_STARTUP_TEST
index 999c92369..999c92369 100644
--- a/baseconfig/CONFIG_RING_BUFFER_STARTUP_TEST
+++ b/configs/base-generic/CONFIG_RING_BUFFER_STARTUP_TEST
diff --git a/baseconfig/CONFIG_RIO b/configs/base-generic/CONFIG_RIO
index eaf1ab7a1..eaf1ab7a1 100644
--- a/baseconfig/CONFIG_RIO
+++ b/configs/base-generic/CONFIG_RIO
diff --git a/baseconfig/CONFIG_RMI4_CORE b/configs/base-generic/CONFIG_RMI4_CORE
index 2e5716d66..2e5716d66 100644
--- a/baseconfig/CONFIG_RMI4_CORE
+++ b/configs/base-generic/CONFIG_RMI4_CORE
diff --git a/baseconfig/CONFIG_RMI4_F03 b/configs/base-generic/CONFIG_RMI4_F03
index 08ae820b1..08ae820b1 100644
--- a/baseconfig/CONFIG_RMI4_F03
+++ b/configs/base-generic/CONFIG_RMI4_F03
diff --git a/baseconfig/CONFIG_RMI4_F11 b/configs/base-generic/CONFIG_RMI4_F11
index 94542f838..94542f838 100644
--- a/baseconfig/CONFIG_RMI4_F11
+++ b/configs/base-generic/CONFIG_RMI4_F11
diff --git a/baseconfig/CONFIG_RMI4_F12 b/configs/base-generic/CONFIG_RMI4_F12
index c1bf5103b..c1bf5103b 100644
--- a/baseconfig/CONFIG_RMI4_F12
+++ b/configs/base-generic/CONFIG_RMI4_F12
diff --git a/baseconfig/CONFIG_RMI4_F30 b/configs/base-generic/CONFIG_RMI4_F30
index 2efcd29cf..2efcd29cf 100644
--- a/baseconfig/CONFIG_RMI4_F30
+++ b/configs/base-generic/CONFIG_RMI4_F30
diff --git a/baseconfig/CONFIG_RMI4_F34 b/configs/base-generic/CONFIG_RMI4_F34
index 9cf1d1384..9cf1d1384 100644
--- a/baseconfig/CONFIG_RMI4_F34
+++ b/configs/base-generic/CONFIG_RMI4_F34
diff --git a/baseconfig/CONFIG_RMI4_F54 b/configs/base-generic/CONFIG_RMI4_F54
index 7451000c6..7451000c6 100644
--- a/baseconfig/CONFIG_RMI4_F54
+++ b/configs/base-generic/CONFIG_RMI4_F54
diff --git a/baseconfig/CONFIG_RMI4_F55 b/configs/base-generic/CONFIG_RMI4_F55
index 893bb030d..893bb030d 100644
--- a/baseconfig/CONFIG_RMI4_F55
+++ b/configs/base-generic/CONFIG_RMI4_F55
diff --git a/baseconfig/CONFIG_RMI4_I2C b/configs/base-generic/CONFIG_RMI4_I2C
index 731005809..731005809 100644
--- a/baseconfig/CONFIG_RMI4_I2C
+++ b/configs/base-generic/CONFIG_RMI4_I2C
diff --git a/baseconfig/CONFIG_RMI4_SMB b/configs/base-generic/CONFIG_RMI4_SMB
index 9c2ab3f29..9c2ab3f29 100644
--- a/baseconfig/CONFIG_RMI4_SMB
+++ b/configs/base-generic/CONFIG_RMI4_SMB
diff --git a/baseconfig/CONFIG_RMI4_SPI b/configs/base-generic/CONFIG_RMI4_SPI
index 805037dfd..805037dfd 100644
--- a/baseconfig/CONFIG_RMI4_SPI
+++ b/configs/base-generic/CONFIG_RMI4_SPI
diff --git a/baseconfig/CONFIG_RMNET b/configs/base-generic/CONFIG_RMNET
index 5e8c115b5..5e8c115b5 100644
--- a/baseconfig/CONFIG_RMNET
+++ b/configs/base-generic/CONFIG_RMNET
diff --git a/baseconfig/CONFIG_ROCKCHIP_PHY b/configs/base-generic/CONFIG_ROCKCHIP_PHY
index 4ca60873a..4ca60873a 100644
--- a/baseconfig/CONFIG_ROCKCHIP_PHY
+++ b/configs/base-generic/CONFIG_ROCKCHIP_PHY
diff --git a/baseconfig/CONFIG_ROCKER b/configs/base-generic/CONFIG_ROCKER
index 4e61c5a5e..4e61c5a5e 100644
--- a/baseconfig/CONFIG_ROCKER
+++ b/configs/base-generic/CONFIG_ROCKER
diff --git a/baseconfig/CONFIG_ROCKETPORT b/configs/base-generic/CONFIG_ROCKETPORT
index cd6a0b563..cd6a0b563 100644
--- a/baseconfig/CONFIG_ROCKETPORT
+++ b/configs/base-generic/CONFIG_ROCKETPORT
diff --git a/baseconfig/CONFIG_ROMFS_FS b/configs/base-generic/CONFIG_ROMFS_FS
index 162b881be..162b881be 100644
--- a/baseconfig/CONFIG_ROMFS_FS
+++ b/configs/base-generic/CONFIG_ROMFS_FS
diff --git a/baseconfig/CONFIG_ROSE b/configs/base-generic/CONFIG_ROSE
index 6e78b79db..6e78b79db 100644
--- a/baseconfig/CONFIG_ROSE
+++ b/configs/base-generic/CONFIG_ROSE
diff --git a/baseconfig/CONFIG_RPCSEC_GSS_KRB5 b/configs/base-generic/CONFIG_RPCSEC_GSS_KRB5
index 81fb2fe89..81fb2fe89 100644
--- a/baseconfig/CONFIG_RPCSEC_GSS_KRB5
+++ b/configs/base-generic/CONFIG_RPCSEC_GSS_KRB5
diff --git a/baseconfig/CONFIG_RPMSG_CHAR b/configs/base-generic/CONFIG_RPMSG_CHAR
index 3aa998906..3aa998906 100644
--- a/baseconfig/CONFIG_RPMSG_CHAR
+++ b/configs/base-generic/CONFIG_RPMSG_CHAR
diff --git a/baseconfig/CONFIG_RPMSG_QCOM_GLINK_RPM b/configs/base-generic/CONFIG_RPMSG_QCOM_GLINK_RPM
index df2fa18d0..df2fa18d0 100644
--- a/baseconfig/CONFIG_RPMSG_QCOM_GLINK_RPM
+++ b/configs/base-generic/CONFIG_RPMSG_QCOM_GLINK_RPM
diff --git a/baseconfig/CONFIG_RPMSG_QCOM_GLINK_SMEM b/configs/base-generic/CONFIG_RPMSG_QCOM_GLINK_SMEM
index c2c0a0c78..c2c0a0c78 100644
--- a/baseconfig/CONFIG_RPMSG_QCOM_GLINK_SMEM
+++ b/configs/base-generic/CONFIG_RPMSG_QCOM_GLINK_SMEM
diff --git a/baseconfig/CONFIG_RPR0521 b/configs/base-generic/CONFIG_RPR0521
index 18dc33c77..18dc33c77 100644
--- a/baseconfig/CONFIG_RPR0521
+++ b/configs/base-generic/CONFIG_RPR0521
diff --git a/baseconfig/CONFIG_RSI_91X b/configs/base-generic/CONFIG_RSI_91X
index 41342e8b8..41342e8b8 100644
--- a/baseconfig/CONFIG_RSI_91X
+++ b/configs/base-generic/CONFIG_RSI_91X
diff --git a/baseconfig/CONFIG_RSI_DEBUGFS b/configs/base-generic/CONFIG_RSI_DEBUGFS
index d0c1dd1ee..d0c1dd1ee 100644
--- a/baseconfig/CONFIG_RSI_DEBUGFS
+++ b/configs/base-generic/CONFIG_RSI_DEBUGFS
diff --git a/baseconfig/CONFIG_RSI_SDIO b/configs/base-generic/CONFIG_RSI_SDIO
index da4f0155f..da4f0155f 100644
--- a/baseconfig/CONFIG_RSI_SDIO
+++ b/configs/base-generic/CONFIG_RSI_SDIO
diff --git a/baseconfig/CONFIG_RSI_USB b/configs/base-generic/CONFIG_RSI_USB
index dcbac5b30..dcbac5b30 100644
--- a/baseconfig/CONFIG_RSI_USB
+++ b/configs/base-generic/CONFIG_RSI_USB
diff --git a/baseconfig/CONFIG_RT2400PCI b/configs/base-generic/CONFIG_RT2400PCI
index aff2f6949..aff2f6949 100644
--- a/baseconfig/CONFIG_RT2400PCI
+++ b/configs/base-generic/CONFIG_RT2400PCI
diff --git a/baseconfig/CONFIG_RT2500PCI b/configs/base-generic/CONFIG_RT2500PCI
index 654e09fd0..654e09fd0 100644
--- a/baseconfig/CONFIG_RT2500PCI
+++ b/configs/base-generic/CONFIG_RT2500PCI
diff --git a/baseconfig/CONFIG_RT2500USB b/configs/base-generic/CONFIG_RT2500USB
index d3d8be972..d3d8be972 100644
--- a/baseconfig/CONFIG_RT2500USB
+++ b/configs/base-generic/CONFIG_RT2500USB
diff --git a/baseconfig/CONFIG_RT2800PCI b/configs/base-generic/CONFIG_RT2800PCI
index 6a092667a..6a092667a 100644
--- a/baseconfig/CONFIG_RT2800PCI
+++ b/configs/base-generic/CONFIG_RT2800PCI
diff --git a/baseconfig/CONFIG_RT2800PCI_RT3290 b/configs/base-generic/CONFIG_RT2800PCI_RT3290
index b407d7ee5..b407d7ee5 100644
--- a/baseconfig/CONFIG_RT2800PCI_RT3290
+++ b/configs/base-generic/CONFIG_RT2800PCI_RT3290
diff --git a/baseconfig/CONFIG_RT2800PCI_RT33XX b/configs/base-generic/CONFIG_RT2800PCI_RT33XX
index fc48a116e..fc48a116e 100644
--- a/baseconfig/CONFIG_RT2800PCI_RT33XX
+++ b/configs/base-generic/CONFIG_RT2800PCI_RT33XX
diff --git a/baseconfig/CONFIG_RT2800PCI_RT35XX b/configs/base-generic/CONFIG_RT2800PCI_RT35XX
index f9d3762c3..f9d3762c3 100644
--- a/baseconfig/CONFIG_RT2800PCI_RT35XX
+++ b/configs/base-generic/CONFIG_RT2800PCI_RT35XX
diff --git a/baseconfig/CONFIG_RT2800PCI_RT53XX b/configs/base-generic/CONFIG_RT2800PCI_RT53XX
index 652712478..652712478 100644
--- a/baseconfig/CONFIG_RT2800PCI_RT53XX
+++ b/configs/base-generic/CONFIG_RT2800PCI_RT53XX
diff --git a/baseconfig/CONFIG_RT2800USB b/configs/base-generic/CONFIG_RT2800USB
index d6eaffd7b..d6eaffd7b 100644
--- a/baseconfig/CONFIG_RT2800USB
+++ b/configs/base-generic/CONFIG_RT2800USB
diff --git a/baseconfig/CONFIG_RT2800USB_RT33XX b/configs/base-generic/CONFIG_RT2800USB_RT33XX
index f86c4e42f..f86c4e42f 100644
--- a/baseconfig/CONFIG_RT2800USB_RT33XX
+++ b/configs/base-generic/CONFIG_RT2800USB_RT33XX
diff --git a/baseconfig/CONFIG_RT2800USB_RT3573 b/configs/base-generic/CONFIG_RT2800USB_RT3573
index df9ae1acc..df9ae1acc 100644
--- a/baseconfig/CONFIG_RT2800USB_RT3573
+++ b/configs/base-generic/CONFIG_RT2800USB_RT3573
diff --git a/baseconfig/CONFIG_RT2800USB_RT35XX b/configs/base-generic/CONFIG_RT2800USB_RT35XX
index 52c191500..52c191500 100644
--- a/baseconfig/CONFIG_RT2800USB_RT35XX
+++ b/configs/base-generic/CONFIG_RT2800USB_RT35XX
diff --git a/baseconfig/CONFIG_RT2800USB_RT53XX b/configs/base-generic/CONFIG_RT2800USB_RT53XX
index b896dc2ee..b896dc2ee 100644
--- a/baseconfig/CONFIG_RT2800USB_RT53XX
+++ b/configs/base-generic/CONFIG_RT2800USB_RT53XX
diff --git a/baseconfig/CONFIG_RT2800USB_RT55XX b/configs/base-generic/CONFIG_RT2800USB_RT55XX
index f585f4f02..f585f4f02 100644
--- a/baseconfig/CONFIG_RT2800USB_RT55XX
+++ b/configs/base-generic/CONFIG_RT2800USB_RT55XX
diff --git a/baseconfig/CONFIG_RT2800USB_UNKNOWN b/configs/base-generic/CONFIG_RT2800USB_UNKNOWN
index 95d862008..95d862008 100644
--- a/baseconfig/CONFIG_RT2800USB_UNKNOWN
+++ b/configs/base-generic/CONFIG_RT2800USB_UNKNOWN
diff --git a/baseconfig/CONFIG_RT2X00 b/configs/base-generic/CONFIG_RT2X00
index b9390bdc8..b9390bdc8 100644
--- a/baseconfig/CONFIG_RT2X00
+++ b/configs/base-generic/CONFIG_RT2X00
diff --git a/baseconfig/CONFIG_RT2X00_DEBUG b/configs/base-generic/CONFIG_RT2X00_DEBUG
index 65f957c23..65f957c23 100644
--- a/baseconfig/CONFIG_RT2X00_DEBUG
+++ b/configs/base-generic/CONFIG_RT2X00_DEBUG
diff --git a/baseconfig/CONFIG_RT2X00_LIB_DEBUGFS b/configs/base-generic/CONFIG_RT2X00_LIB_DEBUGFS
index bec40f8c8..bec40f8c8 100644
--- a/baseconfig/CONFIG_RT2X00_LIB_DEBUGFS
+++ b/configs/base-generic/CONFIG_RT2X00_LIB_DEBUGFS
diff --git a/baseconfig/CONFIG_RT61PCI b/configs/base-generic/CONFIG_RT61PCI
index 9cd657f8e..9cd657f8e 100644
--- a/baseconfig/CONFIG_RT61PCI
+++ b/configs/base-generic/CONFIG_RT61PCI
diff --git a/baseconfig/CONFIG_RT73USB b/configs/base-generic/CONFIG_RT73USB
index dfb346e77..dfb346e77 100644
--- a/baseconfig/CONFIG_RT73USB
+++ b/configs/base-generic/CONFIG_RT73USB
diff --git a/baseconfig/CONFIG_RTC b/configs/base-generic/CONFIG_RTC
index 6b706c9d8..6b706c9d8 100644
--- a/baseconfig/CONFIG_RTC
+++ b/configs/base-generic/CONFIG_RTC
diff --git a/baseconfig/CONFIG_RTC_CLASS b/configs/base-generic/CONFIG_RTC_CLASS
index 70c9c29c0..70c9c29c0 100644
--- a/baseconfig/CONFIG_RTC_CLASS
+++ b/configs/base-generic/CONFIG_RTC_CLASS
diff --git a/baseconfig/CONFIG_RTC_DEBUG b/configs/base-generic/CONFIG_RTC_DEBUG
index 13664a344..13664a344 100644
--- a/baseconfig/CONFIG_RTC_DEBUG
+++ b/configs/base-generic/CONFIG_RTC_DEBUG
diff --git a/baseconfig/CONFIG_RTC_DRV_AB3100 b/configs/base-generic/CONFIG_RTC_DRV_AB3100
index a90aac0cc..a90aac0cc 100644
--- a/baseconfig/CONFIG_RTC_DRV_AB3100
+++ b/configs/base-generic/CONFIG_RTC_DRV_AB3100
diff --git a/baseconfig/CONFIG_RTC_DRV_ABB5ZES3 b/configs/base-generic/CONFIG_RTC_DRV_ABB5ZES3
index e7552fd8f..e7552fd8f 100644
--- a/baseconfig/CONFIG_RTC_DRV_ABB5ZES3
+++ b/configs/base-generic/CONFIG_RTC_DRV_ABB5ZES3
diff --git a/baseconfig/CONFIG_RTC_DRV_ABX80X b/configs/base-generic/CONFIG_RTC_DRV_ABX80X
index 8a32953e6..8a32953e6 100644
--- a/baseconfig/CONFIG_RTC_DRV_ABX80X
+++ b/configs/base-generic/CONFIG_RTC_DRV_ABX80X
diff --git a/baseconfig/CONFIG_RTC_DRV_BQ32K b/configs/base-generic/CONFIG_RTC_DRV_BQ32K
index a5b9fe1c6..a5b9fe1c6 100644
--- a/baseconfig/CONFIG_RTC_DRV_BQ32K
+++ b/configs/base-generic/CONFIG_RTC_DRV_BQ32K
diff --git a/baseconfig/CONFIG_RTC_DRV_BQ4802 b/configs/base-generic/CONFIG_RTC_DRV_BQ4802
index 098579fda..098579fda 100644
--- a/baseconfig/CONFIG_RTC_DRV_BQ4802
+++ b/configs/base-generic/CONFIG_RTC_DRV_BQ4802
diff --git a/baseconfig/CONFIG_RTC_DRV_CMOS b/configs/base-generic/CONFIG_RTC_DRV_CMOS
index 2051e4afe..2051e4afe 100644
--- a/baseconfig/CONFIG_RTC_DRV_CMOS
+++ b/configs/base-generic/CONFIG_RTC_DRV_CMOS
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1286 b/configs/base-generic/CONFIG_RTC_DRV_DS1286
index 26ed4fb21..26ed4fb21 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1286
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1286
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1302 b/configs/base-generic/CONFIG_RTC_DRV_DS1302
index 053d2126a..053d2126a 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1302
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1302
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1305 b/configs/base-generic/CONFIG_RTC_DRV_DS1305
index 37b8971b4..37b8971b4 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1305
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1305
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1307 b/configs/base-generic/CONFIG_RTC_DRV_DS1307
index 2d3d02090..2d3d02090 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1307
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1307
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1307_CENTURY b/configs/base-generic/CONFIG_RTC_DRV_DS1307_CENTURY
index dd3202f45..dd3202f45 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1307_CENTURY
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1307_CENTURY
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1307_HWMON b/configs/base-generic/CONFIG_RTC_DRV_DS1307_HWMON
index 3ae476626..3ae476626 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1307_HWMON
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1307_HWMON
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1343 b/configs/base-generic/CONFIG_RTC_DRV_DS1343
index 452567d49..452567d49 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1343
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1343
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1347 b/configs/base-generic/CONFIG_RTC_DRV_DS1347
index c0dec754c..c0dec754c 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1347
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1347
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1374 b/configs/base-generic/CONFIG_RTC_DRV_DS1374
index 39c837c5e..39c837c5e 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1374
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1374
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1374_WDT b/configs/base-generic/CONFIG_RTC_DRV_DS1374_WDT
index 025d8e33a..025d8e33a 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1374_WDT
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1374_WDT
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1390 b/configs/base-generic/CONFIG_RTC_DRV_DS1390
index 9c4133771..9c4133771 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1390
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1390
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1511 b/configs/base-generic/CONFIG_RTC_DRV_DS1511
index a36656c78..a36656c78 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1511
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1511
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1553 b/configs/base-generic/CONFIG_RTC_DRV_DS1553
index a069d4ba2..a069d4ba2 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1553
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1553
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1672 b/configs/base-generic/CONFIG_RTC_DRV_DS1672
index 2b12e3905..2b12e3905 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1672
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1672
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1685_FAMILY b/configs/base-generic/CONFIG_RTC_DRV_DS1685_FAMILY
index c780040db..c780040db 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1685_FAMILY
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1685_FAMILY
diff --git a/baseconfig/CONFIG_RTC_DRV_DS1742 b/configs/base-generic/CONFIG_RTC_DRV_DS1742
index ab8422c1b..ab8422c1b 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS1742
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS1742
diff --git a/baseconfig/CONFIG_RTC_DRV_DS2404 b/configs/base-generic/CONFIG_RTC_DRV_DS2404
index 88909128b..88909128b 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS2404
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS2404
diff --git a/baseconfig/CONFIG_RTC_DRV_DS3232 b/configs/base-generic/CONFIG_RTC_DRV_DS3232
index f891d41b8..f891d41b8 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS3232
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS3232
diff --git a/baseconfig/CONFIG_RTC_DRV_DS3232_HWMON b/configs/base-generic/CONFIG_RTC_DRV_DS3232_HWMON
index 88600a2ce..88600a2ce 100644
--- a/baseconfig/CONFIG_RTC_DRV_DS3232_HWMON
+++ b/configs/base-generic/CONFIG_RTC_DRV_DS3232_HWMON
diff --git a/baseconfig/CONFIG_RTC_DRV_EFI b/configs/base-generic/CONFIG_RTC_DRV_EFI
index 46ab18f22..46ab18f22 100644
--- a/baseconfig/CONFIG_RTC_DRV_EFI
+++ b/configs/base-generic/CONFIG_RTC_DRV_EFI
diff --git a/baseconfig/CONFIG_RTC_DRV_EM3027 b/configs/base-generic/CONFIG_RTC_DRV_EM3027
index 5045a2f14..5045a2f14 100644
--- a/baseconfig/CONFIG_RTC_DRV_EM3027
+++ b/configs/base-generic/CONFIG_RTC_DRV_EM3027
diff --git a/baseconfig/CONFIG_RTC_DRV_EP93XX b/configs/base-generic/CONFIG_RTC_DRV_EP93XX
index 48974c08a..48974c08a 100644
--- a/baseconfig/CONFIG_RTC_DRV_EP93XX
+++ b/configs/base-generic/CONFIG_RTC_DRV_EP93XX
diff --git a/baseconfig/CONFIG_RTC_DRV_FM3130 b/configs/base-generic/CONFIG_RTC_DRV_FM3130
index 32065e365..32065e365 100644
--- a/baseconfig/CONFIG_RTC_DRV_FM3130
+++ b/configs/base-generic/CONFIG_RTC_DRV_FM3130
diff --git a/baseconfig/CONFIG_RTC_DRV_FTRTC010 b/configs/base-generic/CONFIG_RTC_DRV_FTRTC010
index bbb608e4f..bbb608e4f 100644
--- a/baseconfig/CONFIG_RTC_DRV_FTRTC010
+++ b/configs/base-generic/CONFIG_RTC_DRV_FTRTC010
diff --git a/baseconfig/CONFIG_RTC_DRV_HID_SENSOR_TIME b/configs/base-generic/CONFIG_RTC_DRV_HID_SENSOR_TIME
index 0c15783d9..0c15783d9 100644
--- a/baseconfig/CONFIG_RTC_DRV_HID_SENSOR_TIME
+++ b/configs/base-generic/CONFIG_RTC_DRV_HID_SENSOR_TIME
diff --git a/baseconfig/CONFIG_RTC_DRV_HYM8563 b/configs/base-generic/CONFIG_RTC_DRV_HYM8563
index 2c04b57d9..2c04b57d9 100644
--- a/baseconfig/CONFIG_RTC_DRV_HYM8563
+++ b/configs/base-generic/CONFIG_RTC_DRV_HYM8563
diff --git a/baseconfig/CONFIG_RTC_DRV_ISL12022 b/configs/base-generic/CONFIG_RTC_DRV_ISL12022
index e12f2be21..e12f2be21 100644
--- a/baseconfig/CONFIG_RTC_DRV_ISL12022
+++ b/configs/base-generic/CONFIG_RTC_DRV_ISL12022
diff --git a/baseconfig/CONFIG_RTC_DRV_ISL12057 b/configs/base-generic/CONFIG_RTC_DRV_ISL12057
index 6b881e033..6b881e033 100644
--- a/baseconfig/CONFIG_RTC_DRV_ISL12057
+++ b/configs/base-generic/CONFIG_RTC_DRV_ISL12057
diff --git a/baseconfig/CONFIG_RTC_DRV_ISL1208 b/configs/base-generic/CONFIG_RTC_DRV_ISL1208
index b3f7280e1..b3f7280e1 100644
--- a/baseconfig/CONFIG_RTC_DRV_ISL1208
+++ b/configs/base-generic/CONFIG_RTC_DRV_ISL1208
diff --git a/baseconfig/CONFIG_RTC_DRV_M41T80 b/configs/base-generic/CONFIG_RTC_DRV_M41T80
index 0654b656c..0654b656c 100644
--- a/baseconfig/CONFIG_RTC_DRV_M41T80
+++ b/configs/base-generic/CONFIG_RTC_DRV_M41T80
diff --git a/baseconfig/CONFIG_RTC_DRV_M41T80_WDT b/configs/base-generic/CONFIG_RTC_DRV_M41T80_WDT
index 7b134a9a8..7b134a9a8 100644
--- a/baseconfig/CONFIG_RTC_DRV_M41T80_WDT
+++ b/configs/base-generic/CONFIG_RTC_DRV_M41T80_WDT
diff --git a/baseconfig/CONFIG_RTC_DRV_M41T93 b/configs/base-generic/CONFIG_RTC_DRV_M41T93
index c2255ff15..c2255ff15 100644
--- a/baseconfig/CONFIG_RTC_DRV_M41T93
+++ b/configs/base-generic/CONFIG_RTC_DRV_M41T93
diff --git a/baseconfig/CONFIG_RTC_DRV_M41T94 b/configs/base-generic/CONFIG_RTC_DRV_M41T94
index 85abd7c6a..85abd7c6a 100644
--- a/baseconfig/CONFIG_RTC_DRV_M41T94
+++ b/configs/base-generic/CONFIG_RTC_DRV_M41T94
diff --git a/baseconfig/CONFIG_RTC_DRV_M48T35 b/configs/base-generic/CONFIG_RTC_DRV_M48T35
index 6bbe79a05..6bbe79a05 100644
--- a/baseconfig/CONFIG_RTC_DRV_M48T35
+++ b/configs/base-generic/CONFIG_RTC_DRV_M48T35
diff --git a/baseconfig/CONFIG_RTC_DRV_M48T59 b/configs/base-generic/CONFIG_RTC_DRV_M48T59
index 62a856ff3..62a856ff3 100644
--- a/baseconfig/CONFIG_RTC_DRV_M48T59
+++ b/configs/base-generic/CONFIG_RTC_DRV_M48T59
diff --git a/baseconfig/CONFIG_RTC_DRV_M48T86 b/configs/base-generic/CONFIG_RTC_DRV_M48T86
index d7a817993..d7a817993 100644
--- a/baseconfig/CONFIG_RTC_DRV_M48T86
+++ b/configs/base-generic/CONFIG_RTC_DRV_M48T86
diff --git a/baseconfig/CONFIG_RTC_DRV_MAX6900 b/configs/base-generic/CONFIG_RTC_DRV_MAX6900
index bed716d84..bed716d84 100644
--- a/baseconfig/CONFIG_RTC_DRV_MAX6900
+++ b/configs/base-generic/CONFIG_RTC_DRV_MAX6900
diff --git a/baseconfig/CONFIG_RTC_DRV_MAX6902 b/configs/base-generic/CONFIG_RTC_DRV_MAX6902
index 4bfa40bf0..4bfa40bf0 100644
--- a/baseconfig/CONFIG_RTC_DRV_MAX6902
+++ b/configs/base-generic/CONFIG_RTC_DRV_MAX6902
diff --git a/baseconfig/CONFIG_RTC_DRV_MAX6916 b/configs/base-generic/CONFIG_RTC_DRV_MAX6916
index 2c57fe766..2c57fe766 100644
--- a/baseconfig/CONFIG_RTC_DRV_MAX6916
+++ b/configs/base-generic/CONFIG_RTC_DRV_MAX6916
diff --git a/baseconfig/CONFIG_RTC_DRV_MCP795 b/configs/base-generic/CONFIG_RTC_DRV_MCP795
index 498c0614b..498c0614b 100644
--- a/baseconfig/CONFIG_RTC_DRV_MCP795
+++ b/configs/base-generic/CONFIG_RTC_DRV_MCP795
diff --git a/baseconfig/CONFIG_RTC_DRV_MOXART b/configs/base-generic/CONFIG_RTC_DRV_MOXART
index 4086c6ec0..4086c6ec0 100644
--- a/baseconfig/CONFIG_RTC_DRV_MOXART
+++ b/configs/base-generic/CONFIG_RTC_DRV_MOXART
diff --git a/baseconfig/CONFIG_RTC_DRV_MSM6242 b/configs/base-generic/CONFIG_RTC_DRV_MSM6242
index 3f567e999..3f567e999 100644
--- a/baseconfig/CONFIG_RTC_DRV_MSM6242
+++ b/configs/base-generic/CONFIG_RTC_DRV_MSM6242
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF2123 b/configs/base-generic/CONFIG_RTC_DRV_PCF2123
index 3a3a2e87b..3a3a2e87b 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF2123
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF2123
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF2127 b/configs/base-generic/CONFIG_RTC_DRV_PCF2127
index 20c191fb7..20c191fb7 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF2127
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF2127
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF50633 b/configs/base-generic/CONFIG_RTC_DRV_PCF50633
index 9a76ab899..9a76ab899 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF50633
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF50633
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF85063 b/configs/base-generic/CONFIG_RTC_DRV_PCF85063
index acad89a93..acad89a93 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF85063
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF85063
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF8523 b/configs/base-generic/CONFIG_RTC_DRV_PCF8523
index a4f006448..a4f006448 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF8523
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF8523
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF8563 b/configs/base-generic/CONFIG_RTC_DRV_PCF8563
index f3654f9d7..f3654f9d7 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF8563
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF8563
diff --git a/baseconfig/CONFIG_RTC_DRV_PCF8583 b/configs/base-generic/CONFIG_RTC_DRV_PCF8583
index 06e61bf3b..06e61bf3b 100644
--- a/baseconfig/CONFIG_RTC_DRV_PCF8583
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF8583
diff --git a/baseconfig/CONFIG_RTC_DRV_PM8XXX b/configs/base-generic/CONFIG_RTC_DRV_PM8XXX
index adc778ea4..adc778ea4 100644
--- a/baseconfig/CONFIG_RTC_DRV_PM8XXX
+++ b/configs/base-generic/CONFIG_RTC_DRV_PM8XXX
diff --git a/baseconfig/CONFIG_RTC_DRV_R7301 b/configs/base-generic/CONFIG_RTC_DRV_R7301
index 0159fbb01..0159fbb01 100644
--- a/baseconfig/CONFIG_RTC_DRV_R7301
+++ b/configs/base-generic/CONFIG_RTC_DRV_R7301
diff --git a/baseconfig/CONFIG_RTC_DRV_R9701 b/configs/base-generic/CONFIG_RTC_DRV_R9701
index 3a1cb4f3a..3a1cb4f3a 100644
--- a/baseconfig/CONFIG_RTC_DRV_R9701
+++ b/configs/base-generic/CONFIG_RTC_DRV_R9701
diff --git a/baseconfig/CONFIG_RTC_DRV_RP5C01 b/configs/base-generic/CONFIG_RTC_DRV_RP5C01
index e13e06b65..e13e06b65 100644
--- a/baseconfig/CONFIG_RTC_DRV_RP5C01
+++ b/configs/base-generic/CONFIG_RTC_DRV_RP5C01
diff --git a/baseconfig/CONFIG_RTC_DRV_RS5C348 b/configs/base-generic/CONFIG_RTC_DRV_RS5C348
index 56e73e950..56e73e950 100644
--- a/baseconfig/CONFIG_RTC_DRV_RS5C348
+++ b/configs/base-generic/CONFIG_RTC_DRV_RS5C348
diff --git a/baseconfig/CONFIG_RTC_DRV_RS5C372 b/configs/base-generic/CONFIG_RTC_DRV_RS5C372
index 52e9cb50f..52e9cb50f 100644
--- a/baseconfig/CONFIG_RTC_DRV_RS5C372
+++ b/configs/base-generic/CONFIG_RTC_DRV_RS5C372
diff --git a/baseconfig/CONFIG_RTC_DRV_RV3029C2 b/configs/base-generic/CONFIG_RTC_DRV_RV3029C2
index 4c0b36c33..4c0b36c33 100644
--- a/baseconfig/CONFIG_RTC_DRV_RV3029C2
+++ b/configs/base-generic/CONFIG_RTC_DRV_RV3029C2
diff --git a/baseconfig/CONFIG_RTC_DRV_RV3029_HWMON b/configs/base-generic/CONFIG_RTC_DRV_RV3029_HWMON
index d441d287b..d441d287b 100644
--- a/baseconfig/CONFIG_RTC_DRV_RV3029_HWMON
+++ b/configs/base-generic/CONFIG_RTC_DRV_RV3029_HWMON
diff --git a/baseconfig/CONFIG_RTC_DRV_RV8803 b/configs/base-generic/CONFIG_RTC_DRV_RV8803
index 413de6727..413de6727 100644
--- a/baseconfig/CONFIG_RTC_DRV_RV8803
+++ b/configs/base-generic/CONFIG_RTC_DRV_RV8803
diff --git a/baseconfig/CONFIG_RTC_DRV_RX4581 b/configs/base-generic/CONFIG_RTC_DRV_RX4581
index 9d1489894..9d1489894 100644
--- a/baseconfig/CONFIG_RTC_DRV_RX4581
+++ b/configs/base-generic/CONFIG_RTC_DRV_RX4581
diff --git a/baseconfig/CONFIG_RTC_DRV_RX6110 b/configs/base-generic/CONFIG_RTC_DRV_RX6110
index a7fc05a8e..a7fc05a8e 100644
--- a/baseconfig/CONFIG_RTC_DRV_RX6110
+++ b/configs/base-generic/CONFIG_RTC_DRV_RX6110
diff --git a/baseconfig/CONFIG_RTC_DRV_RX8010 b/configs/base-generic/CONFIG_RTC_DRV_RX8010
index 334d51df6..334d51df6 100644
--- a/baseconfig/CONFIG_RTC_DRV_RX8010
+++ b/configs/base-generic/CONFIG_RTC_DRV_RX8010
diff --git a/baseconfig/CONFIG_RTC_DRV_RX8025 b/configs/base-generic/CONFIG_RTC_DRV_RX8025
index 62d782918..62d782918 100644
--- a/baseconfig/CONFIG_RTC_DRV_RX8025
+++ b/configs/base-generic/CONFIG_RTC_DRV_RX8025
diff --git a/baseconfig/CONFIG_RTC_DRV_RX8581 b/configs/base-generic/CONFIG_RTC_DRV_RX8581
index 051a55f2a..051a55f2a 100644
--- a/baseconfig/CONFIG_RTC_DRV_RX8581
+++ b/configs/base-generic/CONFIG_RTC_DRV_RX8581
diff --git a/baseconfig/CONFIG_RTC_DRV_S35390A b/configs/base-generic/CONFIG_RTC_DRV_S35390A
index 5c810d565..5c810d565 100644
--- a/baseconfig/CONFIG_RTC_DRV_S35390A
+++ b/configs/base-generic/CONFIG_RTC_DRV_S35390A
diff --git a/baseconfig/CONFIG_RTC_DRV_SA1100 b/configs/base-generic/CONFIG_RTC_DRV_SA1100
index abb87c52e..abb87c52e 100644
--- a/baseconfig/CONFIG_RTC_DRV_SA1100
+++ b/configs/base-generic/CONFIG_RTC_DRV_SA1100
diff --git a/baseconfig/CONFIG_RTC_DRV_SNVS b/configs/base-generic/CONFIG_RTC_DRV_SNVS
index 056f83d82..056f83d82 100644
--- a/baseconfig/CONFIG_RTC_DRV_SNVS
+++ b/configs/base-generic/CONFIG_RTC_DRV_SNVS
diff --git a/baseconfig/CONFIG_RTC_DRV_STK17TA8 b/configs/base-generic/CONFIG_RTC_DRV_STK17TA8
index ace135852..ace135852 100644
--- a/baseconfig/CONFIG_RTC_DRV_STK17TA8
+++ b/configs/base-generic/CONFIG_RTC_DRV_STK17TA8
diff --git a/baseconfig/CONFIG_RTC_DRV_TEST b/configs/base-generic/CONFIG_RTC_DRV_TEST
index 70982b012..70982b012 100644
--- a/baseconfig/CONFIG_RTC_DRV_TEST
+++ b/configs/base-generic/CONFIG_RTC_DRV_TEST
diff --git a/baseconfig/CONFIG_RTC_DRV_V3020 b/configs/base-generic/CONFIG_RTC_DRV_V3020
index 707fdcc2a..707fdcc2a 100644
--- a/baseconfig/CONFIG_RTC_DRV_V3020
+++ b/configs/base-generic/CONFIG_RTC_DRV_V3020
diff --git a/baseconfig/CONFIG_RTC_DRV_WM831X b/configs/base-generic/CONFIG_RTC_DRV_WM831X
index 1283c434b..1283c434b 100644
--- a/baseconfig/CONFIG_RTC_DRV_WM831X
+++ b/configs/base-generic/CONFIG_RTC_DRV_WM831X
diff --git a/baseconfig/CONFIG_RTC_DRV_WM8350 b/configs/base-generic/CONFIG_RTC_DRV_WM8350
index 20aeff447..20aeff447 100644
--- a/baseconfig/CONFIG_RTC_DRV_WM8350
+++ b/configs/base-generic/CONFIG_RTC_DRV_WM8350
diff --git a/baseconfig/CONFIG_RTC_DRV_X1205 b/configs/base-generic/CONFIG_RTC_DRV_X1205
index 444d4d32c..444d4d32c 100644
--- a/baseconfig/CONFIG_RTC_DRV_X1205
+++ b/configs/base-generic/CONFIG_RTC_DRV_X1205
diff --git a/baseconfig/CONFIG_RTC_DRV_ZYNQMP b/configs/base-generic/CONFIG_RTC_DRV_ZYNQMP
index 0125f992e..0125f992e 100644
--- a/baseconfig/CONFIG_RTC_DRV_ZYNQMP
+++ b/configs/base-generic/CONFIG_RTC_DRV_ZYNQMP
diff --git a/baseconfig/CONFIG_RTC_DS1685_PROC_REGS b/configs/base-generic/CONFIG_RTC_DS1685_PROC_REGS
index 97572648a..97572648a 100644
--- a/baseconfig/CONFIG_RTC_DS1685_PROC_REGS
+++ b/configs/base-generic/CONFIG_RTC_DS1685_PROC_REGS
diff --git a/baseconfig/CONFIG_RTC_DS1685_SYSFS_REGS b/configs/base-generic/CONFIG_RTC_DS1685_SYSFS_REGS
index 97d67cdf4..97d67cdf4 100644
--- a/baseconfig/CONFIG_RTC_DS1685_SYSFS_REGS
+++ b/configs/base-generic/CONFIG_RTC_DS1685_SYSFS_REGS
diff --git a/baseconfig/CONFIG_RTC_HCTOSYS b/configs/base-generic/CONFIG_RTC_HCTOSYS
index bea344181..bea344181 100644
--- a/baseconfig/CONFIG_RTC_HCTOSYS
+++ b/configs/base-generic/CONFIG_RTC_HCTOSYS
diff --git a/baseconfig/CONFIG_RTC_HCTOSYS_DEVICE b/configs/base-generic/CONFIG_RTC_HCTOSYS_DEVICE
index 0e6f28849..0e6f28849 100644
--- a/baseconfig/CONFIG_RTC_HCTOSYS_DEVICE
+++ b/configs/base-generic/CONFIG_RTC_HCTOSYS_DEVICE
diff --git a/baseconfig/CONFIG_RTC_INTF_DEV b/configs/base-generic/CONFIG_RTC_INTF_DEV
index 9481b9dfa..9481b9dfa 100644
--- a/baseconfig/CONFIG_RTC_INTF_DEV
+++ b/configs/base-generic/CONFIG_RTC_INTF_DEV
diff --git a/baseconfig/CONFIG_RTC_INTF_DEV_UIE_EMUL b/configs/base-generic/CONFIG_RTC_INTF_DEV_UIE_EMUL
index 80e6b2a9b..80e6b2a9b 100644
--- a/baseconfig/CONFIG_RTC_INTF_DEV_UIE_EMUL
+++ b/configs/base-generic/CONFIG_RTC_INTF_DEV_UIE_EMUL
diff --git a/baseconfig/CONFIG_RTC_INTF_PROC b/configs/base-generic/CONFIG_RTC_INTF_PROC
index 12f034216..12f034216 100644
--- a/baseconfig/CONFIG_RTC_INTF_PROC
+++ b/configs/base-generic/CONFIG_RTC_INTF_PROC
diff --git a/baseconfig/CONFIG_RTC_INTF_SYSFS b/configs/base-generic/CONFIG_RTC_INTF_SYSFS
index 7c6014587..7c6014587 100644
--- a/baseconfig/CONFIG_RTC_INTF_SYSFS
+++ b/configs/base-generic/CONFIG_RTC_INTF_SYSFS
diff --git a/baseconfig/CONFIG_RTC_NVMEM b/configs/base-generic/CONFIG_RTC_NVMEM
index 5abe8e336..5abe8e336 100644
--- a/baseconfig/CONFIG_RTC_NVMEM
+++ b/configs/base-generic/CONFIG_RTC_NVMEM
diff --git a/baseconfig/CONFIG_RTC_SYSTOHC b/configs/base-generic/CONFIG_RTC_SYSTOHC
index 03ebe734a..03ebe734a 100644
--- a/baseconfig/CONFIG_RTC_SYSTOHC
+++ b/configs/base-generic/CONFIG_RTC_SYSTOHC
diff --git a/baseconfig/CONFIG_RTL8180 b/configs/base-generic/CONFIG_RTL8180
index e58c88d35..e58c88d35 100644
--- a/baseconfig/CONFIG_RTL8180
+++ b/configs/base-generic/CONFIG_RTL8180
diff --git a/baseconfig/CONFIG_RTL8187 b/configs/base-generic/CONFIG_RTL8187
index ab398fbc3..ab398fbc3 100644
--- a/baseconfig/CONFIG_RTL8187
+++ b/configs/base-generic/CONFIG_RTL8187
diff --git a/baseconfig/CONFIG_RTL8188EE b/configs/base-generic/CONFIG_RTL8188EE
index d5e7eaf43..d5e7eaf43 100644
--- a/baseconfig/CONFIG_RTL8188EE
+++ b/configs/base-generic/CONFIG_RTL8188EE
diff --git a/baseconfig/CONFIG_RTL8192CE b/configs/base-generic/CONFIG_RTL8192CE
index d9088f1a4..d9088f1a4 100644
--- a/baseconfig/CONFIG_RTL8192CE
+++ b/configs/base-generic/CONFIG_RTL8192CE
diff --git a/baseconfig/CONFIG_RTL8192CU b/configs/base-generic/CONFIG_RTL8192CU
index eaf668f4a..eaf668f4a 100644
--- a/baseconfig/CONFIG_RTL8192CU
+++ b/configs/base-generic/CONFIG_RTL8192CU
diff --git a/baseconfig/CONFIG_RTL8192DE b/configs/base-generic/CONFIG_RTL8192DE
index c8c6d2241..c8c6d2241 100644
--- a/baseconfig/CONFIG_RTL8192DE
+++ b/configs/base-generic/CONFIG_RTL8192DE
diff --git a/baseconfig/CONFIG_RTL8192E b/configs/base-generic/CONFIG_RTL8192E
index 4a2c537f5..4a2c537f5 100644
--- a/baseconfig/CONFIG_RTL8192E
+++ b/configs/base-generic/CONFIG_RTL8192E
diff --git a/baseconfig/CONFIG_RTL8192EE b/configs/base-generic/CONFIG_RTL8192EE
index 2a52d41d8..2a52d41d8 100644
--- a/baseconfig/CONFIG_RTL8192EE
+++ b/configs/base-generic/CONFIG_RTL8192EE
diff --git a/baseconfig/CONFIG_RTL8192SE b/configs/base-generic/CONFIG_RTL8192SE
index afaa055bb..afaa055bb 100644
--- a/baseconfig/CONFIG_RTL8192SE
+++ b/configs/base-generic/CONFIG_RTL8192SE
diff --git a/baseconfig/CONFIG_RTL8192U b/configs/base-generic/CONFIG_RTL8192U
index 1f63bca97..1f63bca97 100644
--- a/baseconfig/CONFIG_RTL8192U
+++ b/configs/base-generic/CONFIG_RTL8192U
diff --git a/baseconfig/CONFIG_RTL8723AE b/configs/base-generic/CONFIG_RTL8723AE
index 2c83e20a2..2c83e20a2 100644
--- a/baseconfig/CONFIG_RTL8723AE
+++ b/configs/base-generic/CONFIG_RTL8723AE
diff --git a/baseconfig/CONFIG_RTL8723BE b/configs/base-generic/CONFIG_RTL8723BE
index cf446b816..cf446b816 100644
--- a/baseconfig/CONFIG_RTL8723BE
+++ b/configs/base-generic/CONFIG_RTL8723BE
diff --git a/baseconfig/CONFIG_RTL8723BS b/configs/base-generic/CONFIG_RTL8723BS
index 4837f05c7..4837f05c7 100644
--- a/baseconfig/CONFIG_RTL8723BS
+++ b/configs/base-generic/CONFIG_RTL8723BS
diff --git a/baseconfig/CONFIG_RTL8821AE b/configs/base-generic/CONFIG_RTL8821AE
index 3498bf5db..3498bf5db 100644
--- a/baseconfig/CONFIG_RTL8821AE
+++ b/configs/base-generic/CONFIG_RTL8821AE
diff --git a/baseconfig/CONFIG_RTL8XXXU b/configs/base-generic/CONFIG_RTL8XXXU
index 13b2ed870..13b2ed870 100644
--- a/baseconfig/CONFIG_RTL8XXXU
+++ b/configs/base-generic/CONFIG_RTL8XXXU
diff --git a/baseconfig/CONFIG_RTL8XXXU_UNTESTED b/configs/base-generic/CONFIG_RTL8XXXU_UNTESTED
index 2f21da9f5..2f21da9f5 100644
--- a/baseconfig/CONFIG_RTL8XXXU_UNTESTED
+++ b/configs/base-generic/CONFIG_RTL8XXXU_UNTESTED
diff --git a/baseconfig/CONFIG_RTLLIB b/configs/base-generic/CONFIG_RTLLIB
index ea7fc2570..ea7fc2570 100644
--- a/baseconfig/CONFIG_RTLLIB
+++ b/configs/base-generic/CONFIG_RTLLIB
diff --git a/baseconfig/CONFIG_RTLLIB_CRYPTO_CCMP b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_CCMP
index 8ccbc197b..8ccbc197b 100644
--- a/baseconfig/CONFIG_RTLLIB_CRYPTO_CCMP
+++ b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_CCMP
diff --git a/baseconfig/CONFIG_RTLLIB_CRYPTO_TKIP b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_TKIP
index 32d792750..32d792750 100644
--- a/baseconfig/CONFIG_RTLLIB_CRYPTO_TKIP
+++ b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_TKIP
diff --git a/baseconfig/CONFIG_RTLLIB_CRYPTO_WEP b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_WEP
index 28d72265d..28d72265d 100644
--- a/baseconfig/CONFIG_RTLLIB_CRYPTO_WEP
+++ b/configs/base-generic/CONFIG_RTLLIB_CRYPTO_WEP
diff --git a/baseconfig/CONFIG_RTLWIFI b/configs/base-generic/CONFIG_RTLWIFI
index 61ed2c5ea..61ed2c5ea 100644
--- a/baseconfig/CONFIG_RTLWIFI
+++ b/configs/base-generic/CONFIG_RTLWIFI
diff --git a/baseconfig/CONFIG_RTLWIFI_DEBUG b/configs/base-generic/CONFIG_RTLWIFI_DEBUG
index e61d486f9..e61d486f9 100644
--- a/baseconfig/CONFIG_RTLWIFI_DEBUG
+++ b/configs/base-generic/CONFIG_RTLWIFI_DEBUG
diff --git a/baseconfig/CONFIG_RTL_CARDS b/configs/base-generic/CONFIG_RTL_CARDS
index 61b7c276b..61b7c276b 100644
--- a/baseconfig/CONFIG_RTL_CARDS
+++ b/configs/base-generic/CONFIG_RTL_CARDS
diff --git a/baseconfig/CONFIG_RTS5208 b/configs/base-generic/CONFIG_RTS5208
index 7d01cbf8f..7d01cbf8f 100644
--- a/baseconfig/CONFIG_RTS5208
+++ b/configs/base-generic/CONFIG_RTS5208
diff --git a/baseconfig/CONFIG_RT_GROUP_SCHED b/configs/base-generic/CONFIG_RT_GROUP_SCHED
index 768c43da4..768c43da4 100644
--- a/baseconfig/CONFIG_RT_GROUP_SCHED
+++ b/configs/base-generic/CONFIG_RT_GROUP_SCHED
diff --git a/baseconfig/CONFIG_S2IO b/configs/base-generic/CONFIG_S2IO
index 300408a3f..300408a3f 100644
--- a/baseconfig/CONFIG_S2IO
+++ b/configs/base-generic/CONFIG_S2IO
diff --git a/baseconfig/CONFIG_SAMPLES b/configs/base-generic/CONFIG_SAMPLES
index 6e026deba..6e026deba 100644
--- a/baseconfig/CONFIG_SAMPLES
+++ b/configs/base-generic/CONFIG_SAMPLES
diff --git a/baseconfig/CONFIG_SAMSUNG_USBPHY b/configs/base-generic/CONFIG_SAMSUNG_USBPHY
index 9e98b4d86..9e98b4d86 100644
--- a/baseconfig/CONFIG_SAMSUNG_USBPHY
+++ b/configs/base-generic/CONFIG_SAMSUNG_USBPHY
diff --git a/baseconfig/CONFIG_SATA_ACARD_AHCI b/configs/base-generic/CONFIG_SATA_ACARD_AHCI
index e289586bf..e289586bf 100644
--- a/baseconfig/CONFIG_SATA_ACARD_AHCI
+++ b/configs/base-generic/CONFIG_SATA_ACARD_AHCI
diff --git a/baseconfig/CONFIG_SATA_AHCI b/configs/base-generic/CONFIG_SATA_AHCI
index 3551035a1..3551035a1 100644
--- a/baseconfig/CONFIG_SATA_AHCI
+++ b/configs/base-generic/CONFIG_SATA_AHCI
diff --git a/baseconfig/CONFIG_SATA_AHCI_PLATFORM b/configs/base-generic/CONFIG_SATA_AHCI_PLATFORM
index ff2a626ab..ff2a626ab 100644
--- a/baseconfig/CONFIG_SATA_AHCI_PLATFORM
+++ b/configs/base-generic/CONFIG_SATA_AHCI_PLATFORM
diff --git a/baseconfig/CONFIG_SATA_DWC b/configs/base-generic/CONFIG_SATA_DWC
index 57c283648..57c283648 100644
--- a/baseconfig/CONFIG_SATA_DWC
+++ b/configs/base-generic/CONFIG_SATA_DWC
diff --git a/baseconfig/CONFIG_SATA_HIGHBANK b/configs/base-generic/CONFIG_SATA_HIGHBANK
index 6d5e60a66..6d5e60a66 100644
--- a/baseconfig/CONFIG_SATA_HIGHBANK
+++ b/configs/base-generic/CONFIG_SATA_HIGHBANK
diff --git a/baseconfig/CONFIG_SATA_INIC162X b/configs/base-generic/CONFIG_SATA_INIC162X
index e05fa5552..e05fa5552 100644
--- a/baseconfig/CONFIG_SATA_INIC162X
+++ b/configs/base-generic/CONFIG_SATA_INIC162X
diff --git a/baseconfig/CONFIG_SATA_MV b/configs/base-generic/CONFIG_SATA_MV
index cb1877ac7..cb1877ac7 100644
--- a/baseconfig/CONFIG_SATA_MV
+++ b/configs/base-generic/CONFIG_SATA_MV
diff --git a/baseconfig/CONFIG_SATA_NV b/configs/base-generic/CONFIG_SATA_NV
index 47109d86c..47109d86c 100644
--- a/baseconfig/CONFIG_SATA_NV
+++ b/configs/base-generic/CONFIG_SATA_NV
diff --git a/baseconfig/CONFIG_SATA_PMP b/configs/base-generic/CONFIG_SATA_PMP
index 11f39dd50..11f39dd50 100644
--- a/baseconfig/CONFIG_SATA_PMP
+++ b/configs/base-generic/CONFIG_SATA_PMP
diff --git a/baseconfig/CONFIG_SATA_PROMISE b/configs/base-generic/CONFIG_SATA_PROMISE
index 0376859cb..0376859cb 100644
--- a/baseconfig/CONFIG_SATA_PROMISE
+++ b/configs/base-generic/CONFIG_SATA_PROMISE
diff --git a/baseconfig/CONFIG_SATA_QSTOR b/configs/base-generic/CONFIG_SATA_QSTOR
index e49e10469..e49e10469 100644
--- a/baseconfig/CONFIG_SATA_QSTOR
+++ b/configs/base-generic/CONFIG_SATA_QSTOR
diff --git a/baseconfig/CONFIG_SATA_SIL b/configs/base-generic/CONFIG_SATA_SIL
index 831bdc200..831bdc200 100644
--- a/baseconfig/CONFIG_SATA_SIL
+++ b/configs/base-generic/CONFIG_SATA_SIL
diff --git a/baseconfig/CONFIG_SATA_SIL24 b/configs/base-generic/CONFIG_SATA_SIL24
index 999a46eb5..999a46eb5 100644
--- a/baseconfig/CONFIG_SATA_SIL24
+++ b/configs/base-generic/CONFIG_SATA_SIL24
diff --git a/baseconfig/CONFIG_SATA_SIS b/configs/base-generic/CONFIG_SATA_SIS
index fa6474dee..fa6474dee 100644
--- a/baseconfig/CONFIG_SATA_SIS
+++ b/configs/base-generic/CONFIG_SATA_SIS
diff --git a/baseconfig/CONFIG_SATA_SVW b/configs/base-generic/CONFIG_SATA_SVW
index 9eac60e9c..9eac60e9c 100644
--- a/baseconfig/CONFIG_SATA_SVW
+++ b/configs/base-generic/CONFIG_SATA_SVW
diff --git a/baseconfig/CONFIG_SATA_SX4 b/configs/base-generic/CONFIG_SATA_SX4
index 2423653ce..2423653ce 100644
--- a/baseconfig/CONFIG_SATA_SX4
+++ b/configs/base-generic/CONFIG_SATA_SX4
diff --git a/baseconfig/CONFIG_SATA_ULI b/configs/base-generic/CONFIG_SATA_ULI
index 51607fa85..51607fa85 100644
--- a/baseconfig/CONFIG_SATA_ULI
+++ b/configs/base-generic/CONFIG_SATA_ULI
diff --git a/baseconfig/CONFIG_SATA_VIA b/configs/base-generic/CONFIG_SATA_VIA
index f7822f142..f7822f142 100644
--- a/baseconfig/CONFIG_SATA_VIA
+++ b/configs/base-generic/CONFIG_SATA_VIA
diff --git a/baseconfig/CONFIG_SATA_VITESSE b/configs/base-generic/CONFIG_SATA_VITESSE
index ca2d317e5..ca2d317e5 100644
--- a/baseconfig/CONFIG_SATA_VITESSE
+++ b/configs/base-generic/CONFIG_SATA_VITESSE
diff --git a/baseconfig/CONFIG_SATA_ZPODD b/configs/base-generic/CONFIG_SATA_ZPODD
index 61d1a70b3..61d1a70b3 100644
--- a/baseconfig/CONFIG_SATA_ZPODD
+++ b/configs/base-generic/CONFIG_SATA_ZPODD
diff --git a/baseconfig/CONFIG_SBC7240_WDT b/configs/base-generic/CONFIG_SBC7240_WDT
index 39ee59a03..39ee59a03 100644
--- a/baseconfig/CONFIG_SBC7240_WDT
+++ b/configs/base-generic/CONFIG_SBC7240_WDT
diff --git a/baseconfig/CONFIG_SBC8360_WDT b/configs/base-generic/CONFIG_SBC8360_WDT
index ca845e7be..ca845e7be 100644
--- a/baseconfig/CONFIG_SBC8360_WDT
+++ b/configs/base-generic/CONFIG_SBC8360_WDT
diff --git a/baseconfig/CONFIG_SBC_EPX_C3_WATCHDOG b/configs/base-generic/CONFIG_SBC_EPX_C3_WATCHDOG
index 2f9695c65..2f9695c65 100644
--- a/baseconfig/CONFIG_SBC_EPX_C3_WATCHDOG
+++ b/configs/base-generic/CONFIG_SBC_EPX_C3_WATCHDOG
diff --git a/baseconfig/CONFIG_SBP_TARGET b/configs/base-generic/CONFIG_SBP_TARGET
index 4eb58188d..4eb58188d 100644
--- a/baseconfig/CONFIG_SBP_TARGET
+++ b/configs/base-generic/CONFIG_SBP_TARGET
diff --git a/baseconfig/CONFIG_SC1200_WDT b/configs/base-generic/CONFIG_SC1200_WDT
index 86f8c743e..86f8c743e 100644
--- a/baseconfig/CONFIG_SC1200_WDT
+++ b/configs/base-generic/CONFIG_SC1200_WDT
diff --git a/baseconfig/CONFIG_SC520_WDT b/configs/base-generic/CONFIG_SC520_WDT
index 4e4fb7fe6..4e4fb7fe6 100644
--- a/baseconfig/CONFIG_SC520_WDT
+++ b/configs/base-generic/CONFIG_SC520_WDT
diff --git a/baseconfig/CONFIG_SC92031 b/configs/base-generic/CONFIG_SC92031
index 980cba933..980cba933 100644
--- a/baseconfig/CONFIG_SC92031
+++ b/configs/base-generic/CONFIG_SC92031
diff --git a/baseconfig/CONFIG_SCA3000 b/configs/base-generic/CONFIG_SCA3000
index 48f4cf26b..48f4cf26b 100644
--- a/baseconfig/CONFIG_SCA3000
+++ b/configs/base-generic/CONFIG_SCA3000
diff --git a/baseconfig/CONFIG_SCHEDSTATS b/configs/base-generic/CONFIG_SCHEDSTATS
index a9ef3bd78..a9ef3bd78 100644
--- a/baseconfig/CONFIG_SCHEDSTATS
+++ b/configs/base-generic/CONFIG_SCHEDSTATS
diff --git a/baseconfig/CONFIG_SCHED_AUTOGROUP b/configs/base-generic/CONFIG_SCHED_AUTOGROUP
index 6f615c29f..6f615c29f 100644
--- a/baseconfig/CONFIG_SCHED_AUTOGROUP
+++ b/configs/base-generic/CONFIG_SCHED_AUTOGROUP
diff --git a/baseconfig/CONFIG_SCHED_DEBUG b/configs/base-generic/CONFIG_SCHED_DEBUG
index e8b09aa7c..e8b09aa7c 100644
--- a/baseconfig/CONFIG_SCHED_DEBUG
+++ b/configs/base-generic/CONFIG_SCHED_DEBUG
diff --git a/baseconfig/CONFIG_SCHED_MC_PRIO b/configs/base-generic/CONFIG_SCHED_MC_PRIO
index 0686472a4..0686472a4 100644
--- a/baseconfig/CONFIG_SCHED_MC_PRIO
+++ b/configs/base-generic/CONFIG_SCHED_MC_PRIO
diff --git a/baseconfig/CONFIG_SCHED_OMIT_FRAME_POINTER b/configs/base-generic/CONFIG_SCHED_OMIT_FRAME_POINTER
index c567a7513..c567a7513 100644
--- a/baseconfig/CONFIG_SCHED_OMIT_FRAME_POINTER
+++ b/configs/base-generic/CONFIG_SCHED_OMIT_FRAME_POINTER
diff --git a/baseconfig/CONFIG_SCHED_STACK_END_CHECK b/configs/base-generic/CONFIG_SCHED_STACK_END_CHECK
index 976ab2b50..976ab2b50 100644
--- a/baseconfig/CONFIG_SCHED_STACK_END_CHECK
+++ b/configs/base-generic/CONFIG_SCHED_STACK_END_CHECK
diff --git a/baseconfig/CONFIG_SCHED_TRACER b/configs/base-generic/CONFIG_SCHED_TRACER
index 413447ad6..413447ad6 100644
--- a/baseconfig/CONFIG_SCHED_TRACER
+++ b/configs/base-generic/CONFIG_SCHED_TRACER
diff --git a/baseconfig/CONFIG_SCR24X b/configs/base-generic/CONFIG_SCR24X
index de80aaf3e..de80aaf3e 100644
--- a/baseconfig/CONFIG_SCR24X
+++ b/configs/base-generic/CONFIG_SCR24X
diff --git a/baseconfig/CONFIG_SCSI b/configs/base-generic/CONFIG_SCSI
index 2e9142f10..2e9142f10 100644
--- a/baseconfig/CONFIG_SCSI
+++ b/configs/base-generic/CONFIG_SCSI
diff --git a/baseconfig/CONFIG_SCSI_3W_9XXX b/configs/base-generic/CONFIG_SCSI_3W_9XXX
index 5dcef4ab8..5dcef4ab8 100644
--- a/baseconfig/CONFIG_SCSI_3W_9XXX
+++ b/configs/base-generic/CONFIG_SCSI_3W_9XXX
diff --git a/baseconfig/CONFIG_SCSI_3W_SAS b/configs/base-generic/CONFIG_SCSI_3W_SAS
index b2151dc72..b2151dc72 100644
--- a/baseconfig/CONFIG_SCSI_3W_SAS
+++ b/configs/base-generic/CONFIG_SCSI_3W_SAS
diff --git a/baseconfig/CONFIG_SCSI_AACRAID b/configs/base-generic/CONFIG_SCSI_AACRAID
index c164284d6..c164284d6 100644
--- a/baseconfig/CONFIG_SCSI_AACRAID
+++ b/configs/base-generic/CONFIG_SCSI_AACRAID
diff --git a/baseconfig/CONFIG_SCSI_ACARD b/configs/base-generic/CONFIG_SCSI_ACARD
index 27f285d23..27f285d23 100644
--- a/baseconfig/CONFIG_SCSI_ACARD
+++ b/configs/base-generic/CONFIG_SCSI_ACARD
diff --git a/baseconfig/CONFIG_SCSI_ADVANSYS b/configs/base-generic/CONFIG_SCSI_ADVANSYS
index 9727b0b93..9727b0b93 100644
--- a/baseconfig/CONFIG_SCSI_ADVANSYS
+++ b/configs/base-generic/CONFIG_SCSI_ADVANSYS
diff --git a/baseconfig/CONFIG_SCSI_AIC79XX b/configs/base-generic/CONFIG_SCSI_AIC79XX
index 48758f81a..48758f81a 100644
--- a/baseconfig/CONFIG_SCSI_AIC79XX
+++ b/configs/base-generic/CONFIG_SCSI_AIC79XX
diff --git a/baseconfig/CONFIG_SCSI_AIC7XXX b/configs/base-generic/CONFIG_SCSI_AIC7XXX
index a07884fcc..a07884fcc 100644
--- a/baseconfig/CONFIG_SCSI_AIC7XXX
+++ b/configs/base-generic/CONFIG_SCSI_AIC7XXX
diff --git a/baseconfig/CONFIG_SCSI_AIC94XX b/configs/base-generic/CONFIG_SCSI_AIC94XX
index ec2405137..ec2405137 100644
--- a/baseconfig/CONFIG_SCSI_AIC94XX
+++ b/configs/base-generic/CONFIG_SCSI_AIC94XX
diff --git a/baseconfig/CONFIG_SCSI_AM53C974 b/configs/base-generic/CONFIG_SCSI_AM53C974
index 42f324a00..42f324a00 100644
--- a/baseconfig/CONFIG_SCSI_AM53C974
+++ b/configs/base-generic/CONFIG_SCSI_AM53C974
diff --git a/baseconfig/CONFIG_SCSI_ARCMSR b/configs/base-generic/CONFIG_SCSI_ARCMSR
index 6578cb5a0..6578cb5a0 100644
--- a/baseconfig/CONFIG_SCSI_ARCMSR
+++ b/configs/base-generic/CONFIG_SCSI_ARCMSR
diff --git a/baseconfig/CONFIG_SCSI_BFA_FC b/configs/base-generic/CONFIG_SCSI_BFA_FC
index cb58181c9..cb58181c9 100644
--- a/baseconfig/CONFIG_SCSI_BFA_FC
+++ b/configs/base-generic/CONFIG_SCSI_BFA_FC
diff --git a/baseconfig/CONFIG_SCSI_BNX2X_FCOE b/configs/base-generic/CONFIG_SCSI_BNX2X_FCOE
index b74e58b83..b74e58b83 100644
--- a/baseconfig/CONFIG_SCSI_BNX2X_FCOE
+++ b/configs/base-generic/CONFIG_SCSI_BNX2X_FCOE
diff --git a/baseconfig/CONFIG_SCSI_BNX2_ISCSI b/configs/base-generic/CONFIG_SCSI_BNX2_ISCSI
index 7c597f4bc..7c597f4bc 100644
--- a/baseconfig/CONFIG_SCSI_BNX2_ISCSI
+++ b/configs/base-generic/CONFIG_SCSI_BNX2_ISCSI
diff --git a/baseconfig/CONFIG_SCSI_BUSLOGIC b/configs/base-generic/CONFIG_SCSI_BUSLOGIC
index dd7f70541..dd7f70541 100644
--- a/baseconfig/CONFIG_SCSI_BUSLOGIC
+++ b/configs/base-generic/CONFIG_SCSI_BUSLOGIC
diff --git a/baseconfig/CONFIG_SCSI_CHELSIO_FCOE b/configs/base-generic/CONFIG_SCSI_CHELSIO_FCOE
index 8acf63ea3..8acf63ea3 100644
--- a/baseconfig/CONFIG_SCSI_CHELSIO_FCOE
+++ b/configs/base-generic/CONFIG_SCSI_CHELSIO_FCOE
diff --git a/baseconfig/CONFIG_SCSI_CONSTANTS b/configs/base-generic/CONFIG_SCSI_CONSTANTS
index 7d1c6cb22..7d1c6cb22 100644
--- a/baseconfig/CONFIG_SCSI_CONSTANTS
+++ b/configs/base-generic/CONFIG_SCSI_CONSTANTS
diff --git a/baseconfig/CONFIG_SCSI_CXGB3_ISCSI b/configs/base-generic/CONFIG_SCSI_CXGB3_ISCSI
index 6e9254d00..6e9254d00 100644
--- a/baseconfig/CONFIG_SCSI_CXGB3_ISCSI
+++ b/configs/base-generic/CONFIG_SCSI_CXGB3_ISCSI
diff --git a/baseconfig/CONFIG_SCSI_CXGB4_ISCSI b/configs/base-generic/CONFIG_SCSI_CXGB4_ISCSI
index 3cbb0b57d..3cbb0b57d 100644
--- a/baseconfig/CONFIG_SCSI_CXGB4_ISCSI
+++ b/configs/base-generic/CONFIG_SCSI_CXGB4_ISCSI
diff --git a/baseconfig/CONFIG_SCSI_DC395x b/configs/base-generic/CONFIG_SCSI_DC395x
index 5878e21d5..5878e21d5 100644
--- a/baseconfig/CONFIG_SCSI_DC395x
+++ b/configs/base-generic/CONFIG_SCSI_DC395x
diff --git a/baseconfig/CONFIG_SCSI_DEBUG b/configs/base-generic/CONFIG_SCSI_DEBUG
index 86b328498..86b328498 100644
--- a/baseconfig/CONFIG_SCSI_DEBUG
+++ b/configs/base-generic/CONFIG_SCSI_DEBUG
diff --git a/baseconfig/CONFIG_SCSI_DH b/configs/base-generic/CONFIG_SCSI_DH
index b73df00a2..b73df00a2 100644
--- a/baseconfig/CONFIG_SCSI_DH
+++ b/configs/base-generic/CONFIG_SCSI_DH
diff --git a/baseconfig/CONFIG_SCSI_DH_ALUA b/configs/base-generic/CONFIG_SCSI_DH_ALUA
index 7e6ab0db4..7e6ab0db4 100644
--- a/baseconfig/CONFIG_SCSI_DH_ALUA
+++ b/configs/base-generic/CONFIG_SCSI_DH_ALUA
diff --git a/baseconfig/CONFIG_SCSI_DH_EMC b/configs/base-generic/CONFIG_SCSI_DH_EMC
index 019c88ab1..019c88ab1 100644
--- a/baseconfig/CONFIG_SCSI_DH_EMC
+++ b/configs/base-generic/CONFIG_SCSI_DH_EMC
diff --git a/baseconfig/CONFIG_SCSI_DH_HP_SW b/configs/base-generic/CONFIG_SCSI_DH_HP_SW
index 2663d05f5..2663d05f5 100644
--- a/baseconfig/CONFIG_SCSI_DH_HP_SW
+++ b/configs/base-generic/CONFIG_SCSI_DH_HP_SW
diff --git a/baseconfig/CONFIG_SCSI_DH_RDAC b/configs/base-generic/CONFIG_SCSI_DH_RDAC
index ceafc0981..ceafc0981 100644
--- a/baseconfig/CONFIG_SCSI_DH_RDAC
+++ b/configs/base-generic/CONFIG_SCSI_DH_RDAC
diff --git a/baseconfig/CONFIG_SCSI_DMX3191D b/configs/base-generic/CONFIG_SCSI_DMX3191D
index 92b3c4d7a..92b3c4d7a 100644
--- a/baseconfig/CONFIG_SCSI_DMX3191D
+++ b/configs/base-generic/CONFIG_SCSI_DMX3191D
diff --git a/baseconfig/CONFIG_SCSI_DPT_I2O b/configs/base-generic/CONFIG_SCSI_DPT_I2O
index 29f68374e..29f68374e 100644
--- a/baseconfig/CONFIG_SCSI_DPT_I2O
+++ b/configs/base-generic/CONFIG_SCSI_DPT_I2O
diff --git a/baseconfig/CONFIG_SCSI_EATA b/configs/base-generic/CONFIG_SCSI_EATA
index 5d59e999f..5d59e999f 100644
--- a/baseconfig/CONFIG_SCSI_EATA
+++ b/configs/base-generic/CONFIG_SCSI_EATA
diff --git a/baseconfig/CONFIG_SCSI_EATA_PIO b/configs/base-generic/CONFIG_SCSI_EATA_PIO
index 76d12ce8a..76d12ce8a 100644
--- a/baseconfig/CONFIG_SCSI_EATA_PIO
+++ b/configs/base-generic/CONFIG_SCSI_EATA_PIO
diff --git a/baseconfig/CONFIG_SCSI_ENCLOSURE b/configs/base-generic/CONFIG_SCSI_ENCLOSURE
index adc36eab0..adc36eab0 100644
--- a/baseconfig/CONFIG_SCSI_ENCLOSURE
+++ b/configs/base-generic/CONFIG_SCSI_ENCLOSURE
diff --git a/baseconfig/CONFIG_SCSI_ESAS2R b/configs/base-generic/CONFIG_SCSI_ESAS2R
index a1abea598..a1abea598 100644
--- a/baseconfig/CONFIG_SCSI_ESAS2R
+++ b/configs/base-generic/CONFIG_SCSI_ESAS2R
diff --git a/baseconfig/CONFIG_SCSI_FC_ATTRS b/configs/base-generic/CONFIG_SCSI_FC_ATTRS
index 71f848d2d..71f848d2d 100644
--- a/baseconfig/CONFIG_SCSI_FC_ATTRS
+++ b/configs/base-generic/CONFIG_SCSI_FC_ATTRS
diff --git a/baseconfig/CONFIG_SCSI_FLASHPOINT b/configs/base-generic/CONFIG_SCSI_FLASHPOINT
index 92cc82060..92cc82060 100644
--- a/baseconfig/CONFIG_SCSI_FLASHPOINT
+++ b/configs/base-generic/CONFIG_SCSI_FLASHPOINT
diff --git a/baseconfig/CONFIG_SCSI_FUTURE_DOMAIN b/configs/base-generic/CONFIG_SCSI_FUTURE_DOMAIN
index 81d062bc7..81d062bc7 100644
--- a/baseconfig/CONFIG_SCSI_FUTURE_DOMAIN
+++ b/configs/base-generic/CONFIG_SCSI_FUTURE_DOMAIN
diff --git a/baseconfig/CONFIG_SCSI_GDTH b/configs/base-generic/CONFIG_SCSI_GDTH
index 358faa59f..358faa59f 100644
--- a/baseconfig/CONFIG_SCSI_GDTH
+++ b/configs/base-generic/CONFIG_SCSI_GDTH
diff --git a/baseconfig/CONFIG_SCSI_HISI_SAS b/configs/base-generic/CONFIG_SCSI_HISI_SAS
index 56bedd7ed..56bedd7ed 100644
--- a/baseconfig/CONFIG_SCSI_HISI_SAS
+++ b/configs/base-generic/CONFIG_SCSI_HISI_SAS
diff --git a/baseconfig/CONFIG_SCSI_HPSA b/configs/base-generic/CONFIG_SCSI_HPSA
index 11cf299e0..11cf299e0 100644
--- a/baseconfig/CONFIG_SCSI_HPSA
+++ b/configs/base-generic/CONFIG_SCSI_HPSA
diff --git a/baseconfig/CONFIG_SCSI_HPTIOP b/configs/base-generic/CONFIG_SCSI_HPTIOP
index 1b6f0c080..1b6f0c080 100644
--- a/baseconfig/CONFIG_SCSI_HPTIOP
+++ b/configs/base-generic/CONFIG_SCSI_HPTIOP
diff --git a/baseconfig/CONFIG_SCSI_IMM b/configs/base-generic/CONFIG_SCSI_IMM
index 46434497d..46434497d 100644
--- a/baseconfig/CONFIG_SCSI_IMM
+++ b/configs/base-generic/CONFIG_SCSI_IMM
diff --git a/baseconfig/CONFIG_SCSI_INIA100 b/configs/base-generic/CONFIG_SCSI_INIA100
index ee6b49ced..ee6b49ced 100644
--- a/baseconfig/CONFIG_SCSI_INIA100
+++ b/configs/base-generic/CONFIG_SCSI_INIA100
diff --git a/baseconfig/CONFIG_SCSI_INITIO b/configs/base-generic/CONFIG_SCSI_INITIO
index df15bd047..df15bd047 100644
--- a/baseconfig/CONFIG_SCSI_INITIO
+++ b/configs/base-generic/CONFIG_SCSI_INITIO
diff --git a/baseconfig/CONFIG_SCSI_IPR b/configs/base-generic/CONFIG_SCSI_IPR
index ce2ee5618..ce2ee5618 100644
--- a/baseconfig/CONFIG_SCSI_IPR
+++ b/configs/base-generic/CONFIG_SCSI_IPR
diff --git a/baseconfig/CONFIG_SCSI_IPR_DUMP b/configs/base-generic/CONFIG_SCSI_IPR_DUMP
index e9892cabf..e9892cabf 100644
--- a/baseconfig/CONFIG_SCSI_IPR_DUMP
+++ b/configs/base-generic/CONFIG_SCSI_IPR_DUMP
diff --git a/baseconfig/CONFIG_SCSI_IPR_TRACE b/configs/base-generic/CONFIG_SCSI_IPR_TRACE
index 126c699b6..126c699b6 100644
--- a/baseconfig/CONFIG_SCSI_IPR_TRACE
+++ b/configs/base-generic/CONFIG_SCSI_IPR_TRACE
diff --git a/baseconfig/CONFIG_SCSI_IPS b/configs/base-generic/CONFIG_SCSI_IPS
index 5f5cd634d..5f5cd634d 100644
--- a/baseconfig/CONFIG_SCSI_IPS
+++ b/configs/base-generic/CONFIG_SCSI_IPS
diff --git a/baseconfig/CONFIG_SCSI_ISCI b/configs/base-generic/CONFIG_SCSI_ISCI
index 9b9e4f77a..9b9e4f77a 100644
--- a/baseconfig/CONFIG_SCSI_ISCI
+++ b/configs/base-generic/CONFIG_SCSI_ISCI
diff --git a/baseconfig/CONFIG_SCSI_ISCSI_ATTRS b/configs/base-generic/CONFIG_SCSI_ISCSI_ATTRS
index e75a2fb48..e75a2fb48 100644
--- a/baseconfig/CONFIG_SCSI_ISCSI_ATTRS
+++ b/configs/base-generic/CONFIG_SCSI_ISCSI_ATTRS
diff --git a/baseconfig/CONFIG_SCSI_IZIP_EPP16 b/configs/base-generic/CONFIG_SCSI_IZIP_EPP16
index edd074cce..edd074cce 100644
--- a/baseconfig/CONFIG_SCSI_IZIP_EPP16
+++ b/configs/base-generic/CONFIG_SCSI_IZIP_EPP16
diff --git a/baseconfig/CONFIG_SCSI_IZIP_SLOW_CTR b/configs/base-generic/CONFIG_SCSI_IZIP_SLOW_CTR
index 55b8cadd5..55b8cadd5 100644
--- a/baseconfig/CONFIG_SCSI_IZIP_SLOW_CTR
+++ b/configs/base-generic/CONFIG_SCSI_IZIP_SLOW_CTR
diff --git a/baseconfig/CONFIG_SCSI_LOGGING b/configs/base-generic/CONFIG_SCSI_LOGGING
index 5739436c0..5739436c0 100644
--- a/baseconfig/CONFIG_SCSI_LOGGING
+++ b/configs/base-generic/CONFIG_SCSI_LOGGING
diff --git a/baseconfig/CONFIG_SCSI_LOWLEVEL b/configs/base-generic/CONFIG_SCSI_LOWLEVEL
index 0aa35b304..0aa35b304 100644
--- a/baseconfig/CONFIG_SCSI_LOWLEVEL
+++ b/configs/base-generic/CONFIG_SCSI_LOWLEVEL
diff --git a/baseconfig/CONFIG_SCSI_LOWLEVEL_PCMCIA b/configs/base-generic/CONFIG_SCSI_LOWLEVEL_PCMCIA
index 2c5fc0612..2c5fc0612 100644
--- a/baseconfig/CONFIG_SCSI_LOWLEVEL_PCMCIA
+++ b/configs/base-generic/CONFIG_SCSI_LOWLEVEL_PCMCIA
diff --git a/baseconfig/CONFIG_SCSI_LPFC b/configs/base-generic/CONFIG_SCSI_LPFC
index c7cbc90fe..c7cbc90fe 100644
--- a/baseconfig/CONFIG_SCSI_LPFC
+++ b/configs/base-generic/CONFIG_SCSI_LPFC
diff --git a/baseconfig/CONFIG_SCSI_LPFC_DEBUG_FS b/configs/base-generic/CONFIG_SCSI_LPFC_DEBUG_FS
index 52fa94e27..52fa94e27 100644
--- a/baseconfig/CONFIG_SCSI_LPFC_DEBUG_FS
+++ b/configs/base-generic/CONFIG_SCSI_LPFC_DEBUG_FS
diff --git a/baseconfig/CONFIG_SCSI_MPT2SAS b/configs/base-generic/CONFIG_SCSI_MPT2SAS
index b9b08c3fb..b9b08c3fb 100644
--- a/baseconfig/CONFIG_SCSI_MPT2SAS
+++ b/configs/base-generic/CONFIG_SCSI_MPT2SAS
diff --git a/baseconfig/CONFIG_SCSI_MPT2SAS_MAX_SGE b/configs/base-generic/CONFIG_SCSI_MPT2SAS_MAX_SGE
index b0633b38d..b0633b38d 100644
--- a/baseconfig/CONFIG_SCSI_MPT2SAS_MAX_SGE
+++ b/configs/base-generic/CONFIG_SCSI_MPT2SAS_MAX_SGE
diff --git a/baseconfig/CONFIG_SCSI_MPT3SAS b/configs/base-generic/CONFIG_SCSI_MPT3SAS
index dc5f4d8ff..dc5f4d8ff 100644
--- a/baseconfig/CONFIG_SCSI_MPT3SAS
+++ b/configs/base-generic/CONFIG_SCSI_MPT3SAS
diff --git a/baseconfig/CONFIG_SCSI_MPT3SAS_MAX_SGE b/configs/base-generic/CONFIG_SCSI_MPT3SAS_MAX_SGE
index b5f29773f..b5f29773f 100644
--- a/baseconfig/CONFIG_SCSI_MPT3SAS_MAX_SGE
+++ b/configs/base-generic/CONFIG_SCSI_MPT3SAS_MAX_SGE
diff --git a/baseconfig/CONFIG_SCSI_MQ_DEFAULT b/configs/base-generic/CONFIG_SCSI_MQ_DEFAULT
index 1ac925494..1ac925494 100644
--- a/baseconfig/CONFIG_SCSI_MQ_DEFAULT
+++ b/configs/base-generic/CONFIG_SCSI_MQ_DEFAULT
diff --git a/baseconfig/CONFIG_SCSI_MVSAS b/configs/base-generic/CONFIG_SCSI_MVSAS
index 1576ebf49..1576ebf49 100644
--- a/baseconfig/CONFIG_SCSI_MVSAS
+++ b/configs/base-generic/CONFIG_SCSI_MVSAS
diff --git a/baseconfig/CONFIG_SCSI_MVSAS_DEBUG b/configs/base-generic/CONFIG_SCSI_MVSAS_DEBUG
index 36bf05187..36bf05187 100644
--- a/baseconfig/CONFIG_SCSI_MVSAS_DEBUG
+++ b/configs/base-generic/CONFIG_SCSI_MVSAS_DEBUG
diff --git a/baseconfig/CONFIG_SCSI_MVSAS_TASKLET b/configs/base-generic/CONFIG_SCSI_MVSAS_TASKLET
index 9de3de532..9de3de532 100644
--- a/baseconfig/CONFIG_SCSI_MVSAS_TASKLET
+++ b/configs/base-generic/CONFIG_SCSI_MVSAS_TASKLET
diff --git a/baseconfig/CONFIG_SCSI_MVUMI b/configs/base-generic/CONFIG_SCSI_MVUMI
index f0d9cf9ef..f0d9cf9ef 100644
--- a/baseconfig/CONFIG_SCSI_MVUMI
+++ b/configs/base-generic/CONFIG_SCSI_MVUMI
diff --git a/baseconfig/CONFIG_SCSI_NSP32 b/configs/base-generic/CONFIG_SCSI_NSP32
index 484ff6038..484ff6038 100644
--- a/baseconfig/CONFIG_SCSI_NSP32
+++ b/configs/base-generic/CONFIG_SCSI_NSP32
diff --git a/baseconfig/CONFIG_SCSI_OSD_DEBUG b/configs/base-generic/CONFIG_SCSI_OSD_DEBUG
index 94c77fa09..94c77fa09 100644
--- a/baseconfig/CONFIG_SCSI_OSD_DEBUG
+++ b/configs/base-generic/CONFIG_SCSI_OSD_DEBUG
diff --git a/baseconfig/CONFIG_SCSI_OSD_DPRINT_SENSE b/configs/base-generic/CONFIG_SCSI_OSD_DPRINT_SENSE
index ff51990d8..ff51990d8 100644
--- a/baseconfig/CONFIG_SCSI_OSD_DPRINT_SENSE
+++ b/configs/base-generic/CONFIG_SCSI_OSD_DPRINT_SENSE
diff --git a/baseconfig/CONFIG_SCSI_OSD_INITIATOR b/configs/base-generic/CONFIG_SCSI_OSD_INITIATOR
index 052e3e9c9..052e3e9c9 100644
--- a/baseconfig/CONFIG_SCSI_OSD_INITIATOR
+++ b/configs/base-generic/CONFIG_SCSI_OSD_INITIATOR
diff --git a/baseconfig/CONFIG_SCSI_OSD_ULD b/configs/base-generic/CONFIG_SCSI_OSD_ULD
index 34f6a7895..34f6a7895 100644
--- a/baseconfig/CONFIG_SCSI_OSD_ULD
+++ b/configs/base-generic/CONFIG_SCSI_OSD_ULD
diff --git a/baseconfig/CONFIG_SCSI_PM8001 b/configs/base-generic/CONFIG_SCSI_PM8001
index 375506121..375506121 100644
--- a/baseconfig/CONFIG_SCSI_PM8001
+++ b/configs/base-generic/CONFIG_SCSI_PM8001
diff --git a/baseconfig/CONFIG_SCSI_PMCRAID b/configs/base-generic/CONFIG_SCSI_PMCRAID
index ccbae3c45..ccbae3c45 100644
--- a/baseconfig/CONFIG_SCSI_PMCRAID
+++ b/configs/base-generic/CONFIG_SCSI_PMCRAID
diff --git a/baseconfig/CONFIG_SCSI_PPA b/configs/base-generic/CONFIG_SCSI_PPA
index aa0ba6c12..aa0ba6c12 100644
--- a/baseconfig/CONFIG_SCSI_PPA
+++ b/configs/base-generic/CONFIG_SCSI_PPA
diff --git a/baseconfig/CONFIG_SCSI_PROC_FS b/configs/base-generic/CONFIG_SCSI_PROC_FS
index 565a44b8b..565a44b8b 100644
--- a/baseconfig/CONFIG_SCSI_PROC_FS
+++ b/configs/base-generic/CONFIG_SCSI_PROC_FS
diff --git a/baseconfig/CONFIG_SCSI_QLA_FC b/configs/base-generic/CONFIG_SCSI_QLA_FC
index 68581bbb0..68581bbb0 100644
--- a/baseconfig/CONFIG_SCSI_QLA_FC
+++ b/configs/base-generic/CONFIG_SCSI_QLA_FC
diff --git a/baseconfig/CONFIG_SCSI_QLA_ISCSI b/configs/base-generic/CONFIG_SCSI_QLA_ISCSI
index 4c654831b..4c654831b 100644
--- a/baseconfig/CONFIG_SCSI_QLA_ISCSI
+++ b/configs/base-generic/CONFIG_SCSI_QLA_ISCSI
diff --git a/baseconfig/CONFIG_SCSI_QLOGIC_1280 b/configs/base-generic/CONFIG_SCSI_QLOGIC_1280
index 746dfc263..746dfc263 100644
--- a/baseconfig/CONFIG_SCSI_QLOGIC_1280
+++ b/configs/base-generic/CONFIG_SCSI_QLOGIC_1280
diff --git a/baseconfig/CONFIG_SCSI_SAS_ATA b/configs/base-generic/CONFIG_SCSI_SAS_ATA
index 5bd5a74d7..5bd5a74d7 100644
--- a/baseconfig/CONFIG_SCSI_SAS_ATA
+++ b/configs/base-generic/CONFIG_SCSI_SAS_ATA
diff --git a/baseconfig/CONFIG_SCSI_SAS_ATTRS b/configs/base-generic/CONFIG_SCSI_SAS_ATTRS
index 11e4323ab..11e4323ab 100644
--- a/baseconfig/CONFIG_SCSI_SAS_ATTRS
+++ b/configs/base-generic/CONFIG_SCSI_SAS_ATTRS
diff --git a/baseconfig/CONFIG_SCSI_SAS_HOST_SMP b/configs/base-generic/CONFIG_SCSI_SAS_HOST_SMP
index 8227d7063..8227d7063 100644
--- a/baseconfig/CONFIG_SCSI_SAS_HOST_SMP
+++ b/configs/base-generic/CONFIG_SCSI_SAS_HOST_SMP
diff --git a/baseconfig/CONFIG_SCSI_SAS_LIBSAS b/configs/base-generic/CONFIG_SCSI_SAS_LIBSAS
index 31d548387..31d548387 100644
--- a/baseconfig/CONFIG_SCSI_SAS_LIBSAS
+++ b/configs/base-generic/CONFIG_SCSI_SAS_LIBSAS
diff --git a/baseconfig/CONFIG_SCSI_SCAN_ASYNC b/configs/base-generic/CONFIG_SCSI_SCAN_ASYNC
index 7de665f4b..7de665f4b 100644
--- a/baseconfig/CONFIG_SCSI_SCAN_ASYNC
+++ b/configs/base-generic/CONFIG_SCSI_SCAN_ASYNC
diff --git a/baseconfig/CONFIG_SCSI_SMARTPQI b/configs/base-generic/CONFIG_SCSI_SMARTPQI
index da9632f9a..da9632f9a 100644
--- a/baseconfig/CONFIG_SCSI_SMARTPQI
+++ b/configs/base-generic/CONFIG_SCSI_SMARTPQI
diff --git a/baseconfig/CONFIG_SCSI_SNIC b/configs/base-generic/CONFIG_SCSI_SNIC
index 0291098a0..0291098a0 100644
--- a/baseconfig/CONFIG_SCSI_SNIC
+++ b/configs/base-generic/CONFIG_SCSI_SNIC
diff --git a/baseconfig/CONFIG_SCSI_SNIC_DEBUG_FS b/configs/base-generic/CONFIG_SCSI_SNIC_DEBUG_FS
index cd944a775..cd944a775 100644
--- a/baseconfig/CONFIG_SCSI_SNIC_DEBUG_FS
+++ b/configs/base-generic/CONFIG_SCSI_SNIC_DEBUG_FS
diff --git a/baseconfig/CONFIG_SCSI_SPI_ATTRS b/configs/base-generic/CONFIG_SCSI_SPI_ATTRS
index fab2e0b91..fab2e0b91 100644
--- a/baseconfig/CONFIG_SCSI_SPI_ATTRS
+++ b/configs/base-generic/CONFIG_SCSI_SPI_ATTRS
diff --git a/baseconfig/CONFIG_SCSI_SRP b/configs/base-generic/CONFIG_SCSI_SRP
index a93665cea..a93665cea 100644
--- a/baseconfig/CONFIG_SCSI_SRP
+++ b/configs/base-generic/CONFIG_SCSI_SRP
diff --git a/baseconfig/CONFIG_SCSI_SRP_ATTRS b/configs/base-generic/CONFIG_SCSI_SRP_ATTRS
index b1f7492d3..b1f7492d3 100644
--- a/baseconfig/CONFIG_SCSI_SRP_ATTRS
+++ b/configs/base-generic/CONFIG_SCSI_SRP_ATTRS
diff --git a/baseconfig/CONFIG_SCSI_STEX b/configs/base-generic/CONFIG_SCSI_STEX
index 500de78df..500de78df 100644
--- a/baseconfig/CONFIG_SCSI_STEX
+++ b/configs/base-generic/CONFIG_SCSI_STEX
diff --git a/baseconfig/CONFIG_SCSI_SYM53C8XX_2 b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_2
index ea0988892..ea0988892 100644
--- a/baseconfig/CONFIG_SCSI_SYM53C8XX_2
+++ b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_2
diff --git a/baseconfig/CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS
index 12ec21fe5..12ec21fe5 100644
--- a/baseconfig/CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS
+++ b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS
diff --git a/baseconfig/CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE
index f00e78e30..f00e78e30 100644
--- a/baseconfig/CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE
+++ b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE
diff --git a/baseconfig/CONFIG_SCSI_SYM53C8XX_MAX_TAGS b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_MAX_TAGS
index 0dde531de..0dde531de 100644
--- a/baseconfig/CONFIG_SCSI_SYM53C8XX_MAX_TAGS
+++ b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_MAX_TAGS
diff --git a/baseconfig/CONFIG_SCSI_SYM53C8XX_MMIO b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_MMIO
index 7b5f6d58c..7b5f6d58c 100644
--- a/baseconfig/CONFIG_SCSI_SYM53C8XX_MMIO
+++ b/configs/base-generic/CONFIG_SCSI_SYM53C8XX_MMIO
diff --git a/baseconfig/CONFIG_SCSI_UFSHCD b/configs/base-generic/CONFIG_SCSI_UFSHCD
index 041b8209b..041b8209b 100644
--- a/baseconfig/CONFIG_SCSI_UFSHCD
+++ b/configs/base-generic/CONFIG_SCSI_UFSHCD
diff --git a/baseconfig/CONFIG_SCSI_UFSHCD_PCI b/configs/base-generic/CONFIG_SCSI_UFSHCD_PCI
index 4907ac2e6..4907ac2e6 100644
--- a/baseconfig/CONFIG_SCSI_UFSHCD_PCI
+++ b/configs/base-generic/CONFIG_SCSI_UFSHCD_PCI
diff --git a/baseconfig/CONFIG_SCSI_UFSHCD_PLATFORM b/configs/base-generic/CONFIG_SCSI_UFSHCD_PLATFORM
index 16e9439f5..16e9439f5 100644
--- a/baseconfig/CONFIG_SCSI_UFSHCD_PLATFORM
+++ b/configs/base-generic/CONFIG_SCSI_UFSHCD_PLATFORM
diff --git a/baseconfig/CONFIG_SCSI_UFS_DWC_TC_PCI b/configs/base-generic/CONFIG_SCSI_UFS_DWC_TC_PCI
index 39a2940c8..39a2940c8 100644
--- a/baseconfig/CONFIG_SCSI_UFS_DWC_TC_PCI
+++ b/configs/base-generic/CONFIG_SCSI_UFS_DWC_TC_PCI
diff --git a/baseconfig/CONFIG_SCSI_VIRTIO b/configs/base-generic/CONFIG_SCSI_VIRTIO
index 6fadaf0f2..6fadaf0f2 100644
--- a/baseconfig/CONFIG_SCSI_VIRTIO
+++ b/configs/base-generic/CONFIG_SCSI_VIRTIO
diff --git a/baseconfig/CONFIG_SCSI_WD719X b/configs/base-generic/CONFIG_SCSI_WD719X
index 4b8343bfe..4b8343bfe 100644
--- a/baseconfig/CONFIG_SCSI_WD719X
+++ b/configs/base-generic/CONFIG_SCSI_WD719X
diff --git a/baseconfig/CONFIG_SCTP_COOKIE_HMAC_MD5 b/configs/base-generic/CONFIG_SCTP_COOKIE_HMAC_MD5
index fabd74383..fabd74383 100644
--- a/baseconfig/CONFIG_SCTP_COOKIE_HMAC_MD5
+++ b/configs/base-generic/CONFIG_SCTP_COOKIE_HMAC_MD5
diff --git a/baseconfig/CONFIG_SCTP_COOKIE_HMAC_SHA1 b/configs/base-generic/CONFIG_SCTP_COOKIE_HMAC_SHA1
index 7b2efb49b..7b2efb49b 100644
--- a/baseconfig/CONFIG_SCTP_COOKIE_HMAC_SHA1
+++ b/configs/base-generic/CONFIG_SCTP_COOKIE_HMAC_SHA1
diff --git a/baseconfig/CONFIG_SCTP_DBG_OBJCNT b/configs/base-generic/CONFIG_SCTP_DBG_OBJCNT
index c9b522839..c9b522839 100644
--- a/baseconfig/CONFIG_SCTP_DBG_OBJCNT
+++ b/configs/base-generic/CONFIG_SCTP_DBG_OBJCNT
diff --git a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5
index 39efc2075..39efc2075 100644
--- a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5
+++ b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5
diff --git a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE
index e5bb9ecfe..e5bb9ecfe 100644
--- a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE
+++ b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE
diff --git a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1
index ecf09aef8..ecf09aef8 100644
--- a/baseconfig/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1
+++ b/configs/base-generic/CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1
diff --git a/baseconfig/CONFIG_SDIO_UART b/configs/base-generic/CONFIG_SDIO_UART
index 11f20bf33..11f20bf33 100644
--- a/baseconfig/CONFIG_SDIO_UART
+++ b/configs/base-generic/CONFIG_SDIO_UART
diff --git a/baseconfig/CONFIG_SECCOMP b/configs/base-generic/CONFIG_SECCOMP
index eb9e15092..eb9e15092 100644
--- a/baseconfig/CONFIG_SECCOMP
+++ b/configs/base-generic/CONFIG_SECCOMP
diff --git a/baseconfig/CONFIG_SECONDARY_TRUSTED_KEYRING b/configs/base-generic/CONFIG_SECONDARY_TRUSTED_KEYRING
index 6f8a21900..6f8a21900 100644
--- a/baseconfig/CONFIG_SECONDARY_TRUSTED_KEYRING
+++ b/configs/base-generic/CONFIG_SECONDARY_TRUSTED_KEYRING
diff --git a/baseconfig/CONFIG_SECTION_MISMATCH_WARN_ONLY b/configs/base-generic/CONFIG_SECTION_MISMATCH_WARN_ONLY
index 0a6814b81..0a6814b81 100644
--- a/baseconfig/CONFIG_SECTION_MISMATCH_WARN_ONLY
+++ b/configs/base-generic/CONFIG_SECTION_MISMATCH_WARN_ONLY
diff --git a/baseconfig/CONFIG_SECURITY b/configs/base-generic/CONFIG_SECURITY
index 56c9d8401..56c9d8401 100644
--- a/baseconfig/CONFIG_SECURITY
+++ b/configs/base-generic/CONFIG_SECURITY
diff --git a/baseconfig/CONFIG_SECURITYFS b/configs/base-generic/CONFIG_SECURITYFS
index a108272d7..a108272d7 100644
--- a/baseconfig/CONFIG_SECURITYFS
+++ b/configs/base-generic/CONFIG_SECURITYFS
diff --git a/baseconfig/CONFIG_SECURITY_APPARMOR b/configs/base-generic/CONFIG_SECURITY_APPARMOR
index 4e207e1ac..4e207e1ac 100644
--- a/baseconfig/CONFIG_SECURITY_APPARMOR
+++ b/configs/base-generic/CONFIG_SECURITY_APPARMOR
diff --git a/baseconfig/CONFIG_SECURITY_DMESG_RESTRICT b/configs/base-generic/CONFIG_SECURITY_DMESG_RESTRICT
index 353ad6288..353ad6288 100644
--- a/baseconfig/CONFIG_SECURITY_DMESG_RESTRICT
+++ b/configs/base-generic/CONFIG_SECURITY_DMESG_RESTRICT
diff --git a/baseconfig/CONFIG_SECURITY_INFINIBAND b/configs/base-generic/CONFIG_SECURITY_INFINIBAND
index 393c3f5f8..393c3f5f8 100644
--- a/baseconfig/CONFIG_SECURITY_INFINIBAND
+++ b/configs/base-generic/CONFIG_SECURITY_INFINIBAND
diff --git a/baseconfig/CONFIG_SECURITY_LOADPIN b/configs/base-generic/CONFIG_SECURITY_LOADPIN
index 3276f3e87..3276f3e87 100644
--- a/baseconfig/CONFIG_SECURITY_LOADPIN
+++ b/configs/base-generic/CONFIG_SECURITY_LOADPIN
diff --git a/baseconfig/CONFIG_SECURITY_NETWORK b/configs/base-generic/CONFIG_SECURITY_NETWORK
index cfde232dc..cfde232dc 100644
--- a/baseconfig/CONFIG_SECURITY_NETWORK
+++ b/configs/base-generic/CONFIG_SECURITY_NETWORK
diff --git a/baseconfig/CONFIG_SECURITY_NETWORK_XFRM b/configs/base-generic/CONFIG_SECURITY_NETWORK_XFRM
index 4920b268c..4920b268c 100644
--- a/baseconfig/CONFIG_SECURITY_NETWORK_XFRM
+++ b/configs/base-generic/CONFIG_SECURITY_NETWORK_XFRM
diff --git a/baseconfig/CONFIG_SECURITY_PATH b/configs/base-generic/CONFIG_SECURITY_PATH
index d1e3b305c..d1e3b305c 100644
--- a/baseconfig/CONFIG_SECURITY_PATH
+++ b/configs/base-generic/CONFIG_SECURITY_PATH
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX b/configs/base-generic/CONFIG_SECURITY_SELINUX
index 377ec83aa..377ec83aa 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_AVC_STATS b/configs/base-generic/CONFIG_SECURITY_SELINUX_AVC_STATS
index 8596c96eb..8596c96eb 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_AVC_STATS
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_AVC_STATS
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_BOOTPARAM b/configs/base-generic/CONFIG_SECURITY_SELINUX_BOOTPARAM
index e39bcd52e..e39bcd52e 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_BOOTPARAM
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_BOOTPARAM
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE b/configs/base-generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
index afb675430..afb675430 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE b/configs/base-generic/CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE
index 47810c7e4..47810c7e4 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_DEVELOP b/configs/base-generic/CONFIG_SECURITY_SELINUX_DEVELOP
index b9559b49f..b9559b49f 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_DEVELOP
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_DEVELOP
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_DISABLE b/configs/base-generic/CONFIG_SECURITY_SELINUX_DISABLE
index 82137a083..82137a083 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_DISABLE
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_DISABLE
diff --git a/baseconfig/CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX b/configs/base-generic/CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
index 5683cd345..5683cd345 100644
--- a/baseconfig/CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
+++ b/configs/base-generic/CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX
diff --git a/baseconfig/CONFIG_SECURITY_SMACK b/configs/base-generic/CONFIG_SECURITY_SMACK
index 32bdd7cd5..32bdd7cd5 100644
--- a/baseconfig/CONFIG_SECURITY_SMACK
+++ b/configs/base-generic/CONFIG_SECURITY_SMACK
diff --git a/baseconfig/CONFIG_SECURITY_TOMOYO b/configs/base-generic/CONFIG_SECURITY_TOMOYO
index e0785195f..e0785195f 100644
--- a/baseconfig/CONFIG_SECURITY_TOMOYO
+++ b/configs/base-generic/CONFIG_SECURITY_TOMOYO
diff --git a/baseconfig/CONFIG_SECURITY_YAMA b/configs/base-generic/CONFIG_SECURITY_YAMA
index 3b55731fa..3b55731fa 100644
--- a/baseconfig/CONFIG_SECURITY_YAMA
+++ b/configs/base-generic/CONFIG_SECURITY_YAMA
diff --git a/baseconfig/CONFIG_SENSORS_AD7314 b/configs/base-generic/CONFIG_SENSORS_AD7314
index b5581b798..b5581b798 100644
--- a/baseconfig/CONFIG_SENSORS_AD7314
+++ b/configs/base-generic/CONFIG_SENSORS_AD7314
diff --git a/baseconfig/CONFIG_SENSORS_AD7414 b/configs/base-generic/CONFIG_SENSORS_AD7414
index 10f22ae16..10f22ae16 100644
--- a/baseconfig/CONFIG_SENSORS_AD7414
+++ b/configs/base-generic/CONFIG_SENSORS_AD7414
diff --git a/baseconfig/CONFIG_SENSORS_AD7418 b/configs/base-generic/CONFIG_SENSORS_AD7418
index 3df9e9e12..3df9e9e12 100644
--- a/baseconfig/CONFIG_SENSORS_AD7418
+++ b/configs/base-generic/CONFIG_SENSORS_AD7418
diff --git a/baseconfig/CONFIG_SENSORS_ADC128D818 b/configs/base-generic/CONFIG_SENSORS_ADC128D818
index 9f24634fc..9f24634fc 100644
--- a/baseconfig/CONFIG_SENSORS_ADC128D818
+++ b/configs/base-generic/CONFIG_SENSORS_ADC128D818
diff --git a/baseconfig/CONFIG_SENSORS_ADCXX b/configs/base-generic/CONFIG_SENSORS_ADCXX
index 78229786b..78229786b 100644
--- a/baseconfig/CONFIG_SENSORS_ADCXX
+++ b/configs/base-generic/CONFIG_SENSORS_ADCXX
diff --git a/baseconfig/CONFIG_SENSORS_ADM1021 b/configs/base-generic/CONFIG_SENSORS_ADM1021
index aec81b046..aec81b046 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1021
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1021
diff --git a/baseconfig/CONFIG_SENSORS_ADM1025 b/configs/base-generic/CONFIG_SENSORS_ADM1025
index a5617d87e..a5617d87e 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1025
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1025
diff --git a/baseconfig/CONFIG_SENSORS_ADM1026 b/configs/base-generic/CONFIG_SENSORS_ADM1026
index d6cb0376d..d6cb0376d 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1026
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1026
diff --git a/baseconfig/CONFIG_SENSORS_ADM1029 b/configs/base-generic/CONFIG_SENSORS_ADM1029
index 0d3c99845..0d3c99845 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1029
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1029
diff --git a/baseconfig/CONFIG_SENSORS_ADM1031 b/configs/base-generic/CONFIG_SENSORS_ADM1031
index 6109dab5e..6109dab5e 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1031
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1031
diff --git a/baseconfig/CONFIG_SENSORS_ADM1275 b/configs/base-generic/CONFIG_SENSORS_ADM1275
index 76144de6f..76144de6f 100644
--- a/baseconfig/CONFIG_SENSORS_ADM1275
+++ b/configs/base-generic/CONFIG_SENSORS_ADM1275
diff --git a/baseconfig/CONFIG_SENSORS_ADM9240 b/configs/base-generic/CONFIG_SENSORS_ADM9240
index f79944a97..f79944a97 100644
--- a/baseconfig/CONFIG_SENSORS_ADM9240
+++ b/configs/base-generic/CONFIG_SENSORS_ADM9240
diff --git a/baseconfig/CONFIG_SENSORS_ADS1015 b/configs/base-generic/CONFIG_SENSORS_ADS1015
index 928b4f25f..928b4f25f 100644
--- a/baseconfig/CONFIG_SENSORS_ADS1015
+++ b/configs/base-generic/CONFIG_SENSORS_ADS1015
diff --git a/baseconfig/CONFIG_SENSORS_ADS7828 b/configs/base-generic/CONFIG_SENSORS_ADS7828
index 494099a32..494099a32 100644
--- a/baseconfig/CONFIG_SENSORS_ADS7828
+++ b/configs/base-generic/CONFIG_SENSORS_ADS7828
diff --git a/baseconfig/CONFIG_SENSORS_ADS7871 b/configs/base-generic/CONFIG_SENSORS_ADS7871
index 9a4091fb8..9a4091fb8 100644
--- a/baseconfig/CONFIG_SENSORS_ADS7871
+++ b/configs/base-generic/CONFIG_SENSORS_ADS7871
diff --git a/baseconfig/CONFIG_SENSORS_ADT7310 b/configs/base-generic/CONFIG_SENSORS_ADT7310
index 238ff8363..238ff8363 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7310
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7310
diff --git a/baseconfig/CONFIG_SENSORS_ADT7410 b/configs/base-generic/CONFIG_SENSORS_ADT7410
index 7255e3abd..7255e3abd 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7410
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7410
diff --git a/baseconfig/CONFIG_SENSORS_ADT7411 b/configs/base-generic/CONFIG_SENSORS_ADT7411
index a4c670ee7..a4c670ee7 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7411
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7411
diff --git a/baseconfig/CONFIG_SENSORS_ADT7462 b/configs/base-generic/CONFIG_SENSORS_ADT7462
index 0eaa2e22f..0eaa2e22f 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7462
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7462
diff --git a/baseconfig/CONFIG_SENSORS_ADT7470 b/configs/base-generic/CONFIG_SENSORS_ADT7470
index 7fbf07427..7fbf07427 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7470
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7470
diff --git a/baseconfig/CONFIG_SENSORS_ADT7475 b/configs/base-generic/CONFIG_SENSORS_ADT7475
index 38e288230..38e288230 100644
--- a/baseconfig/CONFIG_SENSORS_ADT7475
+++ b/configs/base-generic/CONFIG_SENSORS_ADT7475
diff --git a/baseconfig/CONFIG_SENSORS_AMC6821 b/configs/base-generic/CONFIG_SENSORS_AMC6821
index c0389d189..c0389d189 100644
--- a/baseconfig/CONFIG_SENSORS_AMC6821
+++ b/configs/base-generic/CONFIG_SENSORS_AMC6821
diff --git a/baseconfig/CONFIG_SENSORS_APDS990X b/configs/base-generic/CONFIG_SENSORS_APDS990X
index 1521713d8..1521713d8 100644
--- a/baseconfig/CONFIG_SENSORS_APDS990X
+++ b/configs/base-generic/CONFIG_SENSORS_APDS990X
diff --git a/baseconfig/CONFIG_SENSORS_ASC7621 b/configs/base-generic/CONFIG_SENSORS_ASC7621
index 5ba8f0815..5ba8f0815 100644
--- a/baseconfig/CONFIG_SENSORS_ASC7621
+++ b/configs/base-generic/CONFIG_SENSORS_ASC7621
diff --git a/baseconfig/CONFIG_SENSORS_ASPEED b/configs/base-generic/CONFIG_SENSORS_ASPEED
index 7808f12a0..7808f12a0 100644
--- a/baseconfig/CONFIG_SENSORS_ASPEED
+++ b/configs/base-generic/CONFIG_SENSORS_ASPEED
diff --git a/baseconfig/CONFIG_SENSORS_ATXP1 b/configs/base-generic/CONFIG_SENSORS_ATXP1
index 78edcd84d..78edcd84d 100644
--- a/baseconfig/CONFIG_SENSORS_ATXP1
+++ b/configs/base-generic/CONFIG_SENSORS_ATXP1
diff --git a/baseconfig/CONFIG_SENSORS_BH1770 b/configs/base-generic/CONFIG_SENSORS_BH1770
index 78371b1b5..78371b1b5 100644
--- a/baseconfig/CONFIG_SENSORS_BH1770
+++ b/configs/base-generic/CONFIG_SENSORS_BH1770
diff --git a/baseconfig/CONFIG_SENSORS_DME1737 b/configs/base-generic/CONFIG_SENSORS_DME1737
index 981a96d2f..981a96d2f 100644
--- a/baseconfig/CONFIG_SENSORS_DME1737
+++ b/configs/base-generic/CONFIG_SENSORS_DME1737
diff --git a/baseconfig/CONFIG_SENSORS_DS1621 b/configs/base-generic/CONFIG_SENSORS_DS1621
index 79f96d6ea..79f96d6ea 100644
--- a/baseconfig/CONFIG_SENSORS_DS1621
+++ b/configs/base-generic/CONFIG_SENSORS_DS1621
diff --git a/baseconfig/CONFIG_SENSORS_DS620 b/configs/base-generic/CONFIG_SENSORS_DS620
index 4a06b361a..4a06b361a 100644
--- a/baseconfig/CONFIG_SENSORS_DS620
+++ b/configs/base-generic/CONFIG_SENSORS_DS620
diff --git a/baseconfig/CONFIG_SENSORS_EMC1403 b/configs/base-generic/CONFIG_SENSORS_EMC1403
index efe0b0e41..efe0b0e41 100644
--- a/baseconfig/CONFIG_SENSORS_EMC1403
+++ b/configs/base-generic/CONFIG_SENSORS_EMC1403
diff --git a/baseconfig/CONFIG_SENSORS_EMC2103 b/configs/base-generic/CONFIG_SENSORS_EMC2103
index 17ff741c5..17ff741c5 100644
--- a/baseconfig/CONFIG_SENSORS_EMC2103
+++ b/configs/base-generic/CONFIG_SENSORS_EMC2103
diff --git a/baseconfig/CONFIG_SENSORS_EMC6W201 b/configs/base-generic/CONFIG_SENSORS_EMC6W201
index 4e7513c59..4e7513c59 100644
--- a/baseconfig/CONFIG_SENSORS_EMC6W201
+++ b/configs/base-generic/CONFIG_SENSORS_EMC6W201
diff --git a/baseconfig/CONFIG_SENSORS_F71805F b/configs/base-generic/CONFIG_SENSORS_F71805F
index 57db5db3c..57db5db3c 100644
--- a/baseconfig/CONFIG_SENSORS_F71805F
+++ b/configs/base-generic/CONFIG_SENSORS_F71805F
diff --git a/baseconfig/CONFIG_SENSORS_F71882FG b/configs/base-generic/CONFIG_SENSORS_F71882FG
index 67c502c71..67c502c71 100644
--- a/baseconfig/CONFIG_SENSORS_F71882FG
+++ b/configs/base-generic/CONFIG_SENSORS_F71882FG
diff --git a/baseconfig/CONFIG_SENSORS_F75375S b/configs/base-generic/CONFIG_SENSORS_F75375S
index 04d774dca..04d774dca 100644
--- a/baseconfig/CONFIG_SENSORS_F75375S
+++ b/configs/base-generic/CONFIG_SENSORS_F75375S
diff --git a/baseconfig/CONFIG_SENSORS_FTSTEUTATES b/configs/base-generic/CONFIG_SENSORS_FTSTEUTATES
index cf11a4e2c..cf11a4e2c 100644
--- a/baseconfig/CONFIG_SENSORS_FTSTEUTATES
+++ b/configs/base-generic/CONFIG_SENSORS_FTSTEUTATES
diff --git a/baseconfig/CONFIG_SENSORS_G760A b/configs/base-generic/CONFIG_SENSORS_G760A
index 17b630baa..17b630baa 100644
--- a/baseconfig/CONFIG_SENSORS_G760A
+++ b/configs/base-generic/CONFIG_SENSORS_G760A
diff --git a/baseconfig/CONFIG_SENSORS_G762 b/configs/base-generic/CONFIG_SENSORS_G762
index c036656b3..c036656b3 100644
--- a/baseconfig/CONFIG_SENSORS_G762
+++ b/configs/base-generic/CONFIG_SENSORS_G762
diff --git a/baseconfig/CONFIG_SENSORS_GL518SM b/configs/base-generic/CONFIG_SENSORS_GL518SM
index 394299257..394299257 100644
--- a/baseconfig/CONFIG_SENSORS_GL518SM
+++ b/configs/base-generic/CONFIG_SENSORS_GL518SM
diff --git a/baseconfig/CONFIG_SENSORS_GL520SM b/configs/base-generic/CONFIG_SENSORS_GL520SM
index d03316fec..d03316fec 100644
--- a/baseconfig/CONFIG_SENSORS_GL520SM
+++ b/configs/base-generic/CONFIG_SENSORS_GL520SM
diff --git a/baseconfig/CONFIG_SENSORS_GPIO_FAN b/configs/base-generic/CONFIG_SENSORS_GPIO_FAN
index 7211f3f57..7211f3f57 100644
--- a/baseconfig/CONFIG_SENSORS_GPIO_FAN
+++ b/configs/base-generic/CONFIG_SENSORS_GPIO_FAN
diff --git a/baseconfig/CONFIG_SENSORS_HIH6130 b/configs/base-generic/CONFIG_SENSORS_HIH6130
index ee050b4ac..ee050b4ac 100644
--- a/baseconfig/CONFIG_SENSORS_HIH6130
+++ b/configs/base-generic/CONFIG_SENSORS_HIH6130
diff --git a/baseconfig/CONFIG_SENSORS_HMC5843 b/configs/base-generic/CONFIG_SENSORS_HMC5843
index 5496d1905..5496d1905 100644
--- a/baseconfig/CONFIG_SENSORS_HMC5843
+++ b/configs/base-generic/CONFIG_SENSORS_HMC5843
diff --git a/baseconfig/CONFIG_SENSORS_HMC5843_I2C b/configs/base-generic/CONFIG_SENSORS_HMC5843_I2C
index 8ecf97fd1..8ecf97fd1 100644
--- a/baseconfig/CONFIG_SENSORS_HMC5843_I2C
+++ b/configs/base-generic/CONFIG_SENSORS_HMC5843_I2C
diff --git a/baseconfig/CONFIG_SENSORS_HMC5843_SPI b/configs/base-generic/CONFIG_SENSORS_HMC5843_SPI
index 51f52f1bf..51f52f1bf 100644
--- a/baseconfig/CONFIG_SENSORS_HMC5843_SPI
+++ b/configs/base-generic/CONFIG_SENSORS_HMC5843_SPI
diff --git a/baseconfig/CONFIG_SENSORS_I5K_AMB b/configs/base-generic/CONFIG_SENSORS_I5K_AMB
index e68ba7b46..e68ba7b46 100644
--- a/baseconfig/CONFIG_SENSORS_I5K_AMB
+++ b/configs/base-generic/CONFIG_SENSORS_I5K_AMB
diff --git a/baseconfig/CONFIG_SENSORS_IBMAEM b/configs/base-generic/CONFIG_SENSORS_IBMAEM
index b291c6637..b291c6637 100644
--- a/baseconfig/CONFIG_SENSORS_IBMAEM
+++ b/configs/base-generic/CONFIG_SENSORS_IBMAEM
diff --git a/baseconfig/CONFIG_SENSORS_IBMPEX b/configs/base-generic/CONFIG_SENSORS_IBMPEX
index a82ec4e6d..a82ec4e6d 100644
--- a/baseconfig/CONFIG_SENSORS_IBMPEX
+++ b/configs/base-generic/CONFIG_SENSORS_IBMPEX
diff --git a/baseconfig/CONFIG_SENSORS_IBM_CFFPS b/configs/base-generic/CONFIG_SENSORS_IBM_CFFPS
index a217d973e..a217d973e 100644
--- a/baseconfig/CONFIG_SENSORS_IBM_CFFPS
+++ b/configs/base-generic/CONFIG_SENSORS_IBM_CFFPS
diff --git a/baseconfig/CONFIG_SENSORS_IIO_HWMON b/configs/base-generic/CONFIG_SENSORS_IIO_HWMON
index d7dbcc83c..d7dbcc83c 100644
--- a/baseconfig/CONFIG_SENSORS_IIO_HWMON
+++ b/configs/base-generic/CONFIG_SENSORS_IIO_HWMON
diff --git a/baseconfig/CONFIG_SENSORS_INA209 b/configs/base-generic/CONFIG_SENSORS_INA209
index 4b0197e0a..4b0197e0a 100644
--- a/baseconfig/CONFIG_SENSORS_INA209
+++ b/configs/base-generic/CONFIG_SENSORS_INA209
diff --git a/baseconfig/CONFIG_SENSORS_INA2XX b/configs/base-generic/CONFIG_SENSORS_INA2XX
index 4c6a7ebe7..4c6a7ebe7 100644
--- a/baseconfig/CONFIG_SENSORS_INA2XX
+++ b/configs/base-generic/CONFIG_SENSORS_INA2XX
diff --git a/baseconfig/CONFIG_SENSORS_INA3221 b/configs/base-generic/CONFIG_SENSORS_INA3221
index d8c62b53f..d8c62b53f 100644
--- a/baseconfig/CONFIG_SENSORS_INA3221
+++ b/configs/base-generic/CONFIG_SENSORS_INA3221
diff --git a/baseconfig/CONFIG_SENSORS_IR35221 b/configs/base-generic/CONFIG_SENSORS_IR35221
index 788fcfa05..788fcfa05 100644
--- a/baseconfig/CONFIG_SENSORS_IR35221
+++ b/configs/base-generic/CONFIG_SENSORS_IR35221
diff --git a/baseconfig/CONFIG_SENSORS_ISL29018 b/configs/base-generic/CONFIG_SENSORS_ISL29018
index 131aebf71..131aebf71 100644
--- a/baseconfig/CONFIG_SENSORS_ISL29018
+++ b/configs/base-generic/CONFIG_SENSORS_ISL29018
diff --git a/baseconfig/CONFIG_SENSORS_ISL29028 b/configs/base-generic/CONFIG_SENSORS_ISL29028
index 53f7bb3ff..53f7bb3ff 100644
--- a/baseconfig/CONFIG_SENSORS_ISL29028
+++ b/configs/base-generic/CONFIG_SENSORS_ISL29028
diff --git a/baseconfig/CONFIG_SENSORS_IT87 b/configs/base-generic/CONFIG_SENSORS_IT87
index f6a8baf0d..f6a8baf0d 100644
--- a/baseconfig/CONFIG_SENSORS_IT87
+++ b/configs/base-generic/CONFIG_SENSORS_IT87
diff --git a/baseconfig/CONFIG_SENSORS_JC42 b/configs/base-generic/CONFIG_SENSORS_JC42
index 8a07c3eef..8a07c3eef 100644
--- a/baseconfig/CONFIG_SENSORS_JC42
+++ b/configs/base-generic/CONFIG_SENSORS_JC42
diff --git a/baseconfig/CONFIG_SENSORS_LINEAGE b/configs/base-generic/CONFIG_SENSORS_LINEAGE
index 43bc1aa07..43bc1aa07 100644
--- a/baseconfig/CONFIG_SENSORS_LINEAGE
+++ b/configs/base-generic/CONFIG_SENSORS_LINEAGE
diff --git a/baseconfig/CONFIG_SENSORS_LIS3LV02D b/configs/base-generic/CONFIG_SENSORS_LIS3LV02D
index 980124650..980124650 100644
--- a/baseconfig/CONFIG_SENSORS_LIS3LV02D
+++ b/configs/base-generic/CONFIG_SENSORS_LIS3LV02D
diff --git a/baseconfig/CONFIG_SENSORS_LIS3_I2C b/configs/base-generic/CONFIG_SENSORS_LIS3_I2C
index 3f3a59ae6..3f3a59ae6 100644
--- a/baseconfig/CONFIG_SENSORS_LIS3_I2C
+++ b/configs/base-generic/CONFIG_SENSORS_LIS3_I2C
diff --git a/baseconfig/CONFIG_SENSORS_LIS3_SPI b/configs/base-generic/CONFIG_SENSORS_LIS3_SPI
index 463b75c67..463b75c67 100644
--- a/baseconfig/CONFIG_SENSORS_LIS3_SPI
+++ b/configs/base-generic/CONFIG_SENSORS_LIS3_SPI
diff --git a/baseconfig/CONFIG_SENSORS_LM25066 b/configs/base-generic/CONFIG_SENSORS_LM25066
index 5c202b02f..5c202b02f 100644
--- a/baseconfig/CONFIG_SENSORS_LM25066
+++ b/configs/base-generic/CONFIG_SENSORS_LM25066
diff --git a/baseconfig/CONFIG_SENSORS_LM63 b/configs/base-generic/CONFIG_SENSORS_LM63
index 7d893171b..7d893171b 100644
--- a/baseconfig/CONFIG_SENSORS_LM63
+++ b/configs/base-generic/CONFIG_SENSORS_LM63
diff --git a/baseconfig/CONFIG_SENSORS_LM70 b/configs/base-generic/CONFIG_SENSORS_LM70
index d8626cc07..d8626cc07 100644
--- a/baseconfig/CONFIG_SENSORS_LM70
+++ b/configs/base-generic/CONFIG_SENSORS_LM70
diff --git a/baseconfig/CONFIG_SENSORS_LM73 b/configs/base-generic/CONFIG_SENSORS_LM73
index b78a7f18d..b78a7f18d 100644
--- a/baseconfig/CONFIG_SENSORS_LM73
+++ b/configs/base-generic/CONFIG_SENSORS_LM73
diff --git a/baseconfig/CONFIG_SENSORS_LM75 b/configs/base-generic/CONFIG_SENSORS_LM75
index 205675fc6..205675fc6 100644
--- a/baseconfig/CONFIG_SENSORS_LM75
+++ b/configs/base-generic/CONFIG_SENSORS_LM75
diff --git a/baseconfig/CONFIG_SENSORS_LM77 b/configs/base-generic/CONFIG_SENSORS_LM77
index 3fd7f3f3b..3fd7f3f3b 100644
--- a/baseconfig/CONFIG_SENSORS_LM77
+++ b/configs/base-generic/CONFIG_SENSORS_LM77
diff --git a/baseconfig/CONFIG_SENSORS_LM78 b/configs/base-generic/CONFIG_SENSORS_LM78
index 6dc289cbc..6dc289cbc 100644
--- a/baseconfig/CONFIG_SENSORS_LM78
+++ b/configs/base-generic/CONFIG_SENSORS_LM78
diff --git a/baseconfig/CONFIG_SENSORS_LM80 b/configs/base-generic/CONFIG_SENSORS_LM80
index a7cfa2123..a7cfa2123 100644
--- a/baseconfig/CONFIG_SENSORS_LM80
+++ b/configs/base-generic/CONFIG_SENSORS_LM80
diff --git a/baseconfig/CONFIG_SENSORS_LM83 b/configs/base-generic/CONFIG_SENSORS_LM83
index 2e15080a2..2e15080a2 100644
--- a/baseconfig/CONFIG_SENSORS_LM83
+++ b/configs/base-generic/CONFIG_SENSORS_LM83
diff --git a/baseconfig/CONFIG_SENSORS_LM85 b/configs/base-generic/CONFIG_SENSORS_LM85
index 1ce412b29..1ce412b29 100644
--- a/baseconfig/CONFIG_SENSORS_LM85
+++ b/configs/base-generic/CONFIG_SENSORS_LM85
diff --git a/baseconfig/CONFIG_SENSORS_LM87 b/configs/base-generic/CONFIG_SENSORS_LM87
index 893096357..893096357 100644
--- a/baseconfig/CONFIG_SENSORS_LM87
+++ b/configs/base-generic/CONFIG_SENSORS_LM87
diff --git a/baseconfig/CONFIG_SENSORS_LM90 b/configs/base-generic/CONFIG_SENSORS_LM90
index 2633ff934..2633ff934 100644
--- a/baseconfig/CONFIG_SENSORS_LM90
+++ b/configs/base-generic/CONFIG_SENSORS_LM90
diff --git a/baseconfig/CONFIG_SENSORS_LM92 b/configs/base-generic/CONFIG_SENSORS_LM92
index 58b30a4e3..58b30a4e3 100644
--- a/baseconfig/CONFIG_SENSORS_LM92
+++ b/configs/base-generic/CONFIG_SENSORS_LM92
diff --git a/baseconfig/CONFIG_SENSORS_LM93 b/configs/base-generic/CONFIG_SENSORS_LM93
index 46514707a..46514707a 100644
--- a/baseconfig/CONFIG_SENSORS_LM93
+++ b/configs/base-generic/CONFIG_SENSORS_LM93
diff --git a/baseconfig/CONFIG_SENSORS_LM95234 b/configs/base-generic/CONFIG_SENSORS_LM95234
index f8a7d302e..f8a7d302e 100644
--- a/baseconfig/CONFIG_SENSORS_LM95234
+++ b/configs/base-generic/CONFIG_SENSORS_LM95234
diff --git a/baseconfig/CONFIG_SENSORS_LM95241 b/configs/base-generic/CONFIG_SENSORS_LM95241
index 10e50c1c2..10e50c1c2 100644
--- a/baseconfig/CONFIG_SENSORS_LM95241
+++ b/configs/base-generic/CONFIG_SENSORS_LM95241
diff --git a/baseconfig/CONFIG_SENSORS_LM95245 b/configs/base-generic/CONFIG_SENSORS_LM95245
index c66b17705..c66b17705 100644
--- a/baseconfig/CONFIG_SENSORS_LM95245
+++ b/configs/base-generic/CONFIG_SENSORS_LM95245
diff --git a/baseconfig/CONFIG_SENSORS_LTC2945 b/configs/base-generic/CONFIG_SENSORS_LTC2945
index 4df4be93d..4df4be93d 100644
--- a/baseconfig/CONFIG_SENSORS_LTC2945
+++ b/configs/base-generic/CONFIG_SENSORS_LTC2945
diff --git a/baseconfig/CONFIG_SENSORS_LTC2978 b/configs/base-generic/CONFIG_SENSORS_LTC2978
index 5b47e4c44..5b47e4c44 100644
--- a/baseconfig/CONFIG_SENSORS_LTC2978
+++ b/configs/base-generic/CONFIG_SENSORS_LTC2978
diff --git a/baseconfig/CONFIG_SENSORS_LTC2990 b/configs/base-generic/CONFIG_SENSORS_LTC2990
index d5ed71950..d5ed71950 100644
--- a/baseconfig/CONFIG_SENSORS_LTC2990
+++ b/configs/base-generic/CONFIG_SENSORS_LTC2990
diff --git a/baseconfig/CONFIG_SENSORS_LTC3815 b/configs/base-generic/CONFIG_SENSORS_LTC3815
index af91d3915..af91d3915 100644
--- a/baseconfig/CONFIG_SENSORS_LTC3815
+++ b/configs/base-generic/CONFIG_SENSORS_LTC3815
diff --git a/baseconfig/CONFIG_SENSORS_LTC4151 b/configs/base-generic/CONFIG_SENSORS_LTC4151
index 9a8d133d2..9a8d133d2 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4151
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4151
diff --git a/baseconfig/CONFIG_SENSORS_LTC4215 b/configs/base-generic/CONFIG_SENSORS_LTC4215
index 3734c6ff2..3734c6ff2 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4215
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4215
diff --git a/baseconfig/CONFIG_SENSORS_LTC4222 b/configs/base-generic/CONFIG_SENSORS_LTC4222
index e7e172810..e7e172810 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4222
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4222
diff --git a/baseconfig/CONFIG_SENSORS_LTC4245 b/configs/base-generic/CONFIG_SENSORS_LTC4245
index 9ef758048..9ef758048 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4245
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4245
diff --git a/baseconfig/CONFIG_SENSORS_LTC4260 b/configs/base-generic/CONFIG_SENSORS_LTC4260
index fa5a33de1..fa5a33de1 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4260
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4260
diff --git a/baseconfig/CONFIG_SENSORS_LTC4261 b/configs/base-generic/CONFIG_SENSORS_LTC4261
index a6cd8f7f1..a6cd8f7f1 100644
--- a/baseconfig/CONFIG_SENSORS_LTC4261
+++ b/configs/base-generic/CONFIG_SENSORS_LTC4261
diff --git a/baseconfig/CONFIG_SENSORS_MAX1111 b/configs/base-generic/CONFIG_SENSORS_MAX1111
index fdefcc26b..fdefcc26b 100644
--- a/baseconfig/CONFIG_SENSORS_MAX1111
+++ b/configs/base-generic/CONFIG_SENSORS_MAX1111
diff --git a/baseconfig/CONFIG_SENSORS_MAX16064 b/configs/base-generic/CONFIG_SENSORS_MAX16064
index 579d1c59d..579d1c59d 100644
--- a/baseconfig/CONFIG_SENSORS_MAX16064
+++ b/configs/base-generic/CONFIG_SENSORS_MAX16064
diff --git a/baseconfig/CONFIG_SENSORS_MAX16065 b/configs/base-generic/CONFIG_SENSORS_MAX16065
index 1054c9622..1054c9622 100644
--- a/baseconfig/CONFIG_SENSORS_MAX16065
+++ b/configs/base-generic/CONFIG_SENSORS_MAX16065
diff --git a/baseconfig/CONFIG_SENSORS_MAX1619 b/configs/base-generic/CONFIG_SENSORS_MAX1619
index 0b3146610..0b3146610 100644
--- a/baseconfig/CONFIG_SENSORS_MAX1619
+++ b/configs/base-generic/CONFIG_SENSORS_MAX1619
diff --git a/baseconfig/CONFIG_SENSORS_MAX1668 b/configs/base-generic/CONFIG_SENSORS_MAX1668
index 129708ae5..129708ae5 100644
--- a/baseconfig/CONFIG_SENSORS_MAX1668
+++ b/configs/base-generic/CONFIG_SENSORS_MAX1668
diff --git a/baseconfig/CONFIG_SENSORS_MAX197 b/configs/base-generic/CONFIG_SENSORS_MAX197
index 10089e38b..10089e38b 100644
--- a/baseconfig/CONFIG_SENSORS_MAX197
+++ b/configs/base-generic/CONFIG_SENSORS_MAX197
diff --git a/baseconfig/CONFIG_SENSORS_MAX20751 b/configs/base-generic/CONFIG_SENSORS_MAX20751
index c1b89ff07..c1b89ff07 100644
--- a/baseconfig/CONFIG_SENSORS_MAX20751
+++ b/configs/base-generic/CONFIG_SENSORS_MAX20751
diff --git a/baseconfig/CONFIG_SENSORS_MAX31722 b/configs/base-generic/CONFIG_SENSORS_MAX31722
index ac722d921..ac722d921 100644
--- a/baseconfig/CONFIG_SENSORS_MAX31722
+++ b/configs/base-generic/CONFIG_SENSORS_MAX31722
diff --git a/baseconfig/CONFIG_SENSORS_MAX31790 b/configs/base-generic/CONFIG_SENSORS_MAX31790
index fb5b83c53..fb5b83c53 100644
--- a/baseconfig/CONFIG_SENSORS_MAX31790
+++ b/configs/base-generic/CONFIG_SENSORS_MAX31790
diff --git a/baseconfig/CONFIG_SENSORS_MAX34440 b/configs/base-generic/CONFIG_SENSORS_MAX34440
index d6c798caf..d6c798caf 100644
--- a/baseconfig/CONFIG_SENSORS_MAX34440
+++ b/configs/base-generic/CONFIG_SENSORS_MAX34440
diff --git a/baseconfig/CONFIG_SENSORS_MAX6639 b/configs/base-generic/CONFIG_SENSORS_MAX6639
index a56c9c522..a56c9c522 100644
--- a/baseconfig/CONFIG_SENSORS_MAX6639
+++ b/configs/base-generic/CONFIG_SENSORS_MAX6639
diff --git a/baseconfig/CONFIG_SENSORS_MAX6642 b/configs/base-generic/CONFIG_SENSORS_MAX6642
index b979450cf..b979450cf 100644
--- a/baseconfig/CONFIG_SENSORS_MAX6642
+++ b/configs/base-generic/CONFIG_SENSORS_MAX6642
diff --git a/baseconfig/CONFIG_SENSORS_MAX6650 b/configs/base-generic/CONFIG_SENSORS_MAX6650
index 45f922494..45f922494 100644
--- a/baseconfig/CONFIG_SENSORS_MAX6650
+++ b/configs/base-generic/CONFIG_SENSORS_MAX6650
diff --git a/baseconfig/CONFIG_SENSORS_MAX6697 b/configs/base-generic/CONFIG_SENSORS_MAX6697
index 346dae3df..346dae3df 100644
--- a/baseconfig/CONFIG_SENSORS_MAX6697
+++ b/configs/base-generic/CONFIG_SENSORS_MAX6697
diff --git a/baseconfig/CONFIG_SENSORS_MAX8688 b/configs/base-generic/CONFIG_SENSORS_MAX8688
index d983ad1d5..d983ad1d5 100644
--- a/baseconfig/CONFIG_SENSORS_MAX8688
+++ b/configs/base-generic/CONFIG_SENSORS_MAX8688
diff --git a/baseconfig/CONFIG_SENSORS_MCP3021 b/configs/base-generic/CONFIG_SENSORS_MCP3021
index 508286fe1..508286fe1 100644
--- a/baseconfig/CONFIG_SENSORS_MCP3021
+++ b/configs/base-generic/CONFIG_SENSORS_MCP3021
diff --git a/baseconfig/CONFIG_SENSORS_NCT6683 b/configs/base-generic/CONFIG_SENSORS_NCT6683
index 3dfe7f818..3dfe7f818 100644
--- a/baseconfig/CONFIG_SENSORS_NCT6683
+++ b/configs/base-generic/CONFIG_SENSORS_NCT6683
diff --git a/baseconfig/CONFIG_SENSORS_NCT6775 b/configs/base-generic/CONFIG_SENSORS_NCT6775
index 8bde1424c..8bde1424c 100644
--- a/baseconfig/CONFIG_SENSORS_NCT6775
+++ b/configs/base-generic/CONFIG_SENSORS_NCT6775
diff --git a/baseconfig/CONFIG_SENSORS_NCT7802 b/configs/base-generic/CONFIG_SENSORS_NCT7802
index 63cdd409c..63cdd409c 100644
--- a/baseconfig/CONFIG_SENSORS_NCT7802
+++ b/configs/base-generic/CONFIG_SENSORS_NCT7802
diff --git a/baseconfig/CONFIG_SENSORS_NCT7904 b/configs/base-generic/CONFIG_SENSORS_NCT7904
index adf813657..adf813657 100644
--- a/baseconfig/CONFIG_SENSORS_NCT7904
+++ b/configs/base-generic/CONFIG_SENSORS_NCT7904
diff --git a/baseconfig/CONFIG_SENSORS_NTC_THERMISTOR b/configs/base-generic/CONFIG_SENSORS_NTC_THERMISTOR
index 269cb4eb7..269cb4eb7 100644
--- a/baseconfig/CONFIG_SENSORS_NTC_THERMISTOR
+++ b/configs/base-generic/CONFIG_SENSORS_NTC_THERMISTOR
diff --git a/baseconfig/CONFIG_SENSORS_PC87360 b/configs/base-generic/CONFIG_SENSORS_PC87360
index bbd351dbf..bbd351dbf 100644
--- a/baseconfig/CONFIG_SENSORS_PC87360
+++ b/configs/base-generic/CONFIG_SENSORS_PC87360
diff --git a/baseconfig/CONFIG_SENSORS_PC87427 b/configs/base-generic/CONFIG_SENSORS_PC87427
index 113695150..113695150 100644
--- a/baseconfig/CONFIG_SENSORS_PC87427
+++ b/configs/base-generic/CONFIG_SENSORS_PC87427
diff --git a/baseconfig/CONFIG_SENSORS_PCF8591 b/configs/base-generic/CONFIG_SENSORS_PCF8591
index 685b3b3c2..685b3b3c2 100644
--- a/baseconfig/CONFIG_SENSORS_PCF8591
+++ b/configs/base-generic/CONFIG_SENSORS_PCF8591
diff --git a/baseconfig/CONFIG_SENSORS_PMBUS b/configs/base-generic/CONFIG_SENSORS_PMBUS
index 7b11c9b8f..7b11c9b8f 100644
--- a/baseconfig/CONFIG_SENSORS_PMBUS
+++ b/configs/base-generic/CONFIG_SENSORS_PMBUS
diff --git a/baseconfig/CONFIG_SENSORS_POWR1220 b/configs/base-generic/CONFIG_SENSORS_POWR1220
index 5524b22aa..5524b22aa 100644
--- a/baseconfig/CONFIG_SENSORS_POWR1220
+++ b/configs/base-generic/CONFIG_SENSORS_POWR1220
diff --git a/baseconfig/CONFIG_SENSORS_PWM_FAN b/configs/base-generic/CONFIG_SENSORS_PWM_FAN
index 4d8a381c5..4d8a381c5 100644
--- a/baseconfig/CONFIG_SENSORS_PWM_FAN
+++ b/configs/base-generic/CONFIG_SENSORS_PWM_FAN
diff --git a/baseconfig/CONFIG_SENSORS_SCH5627 b/configs/base-generic/CONFIG_SENSORS_SCH5627
index 2a3b5924d..2a3b5924d 100644
--- a/baseconfig/CONFIG_SENSORS_SCH5627
+++ b/configs/base-generic/CONFIG_SENSORS_SCH5627
diff --git a/baseconfig/CONFIG_SENSORS_SCH5636 b/configs/base-generic/CONFIG_SENSORS_SCH5636
index 038ef2e17..038ef2e17 100644
--- a/baseconfig/CONFIG_SENSORS_SCH5636
+++ b/configs/base-generic/CONFIG_SENSORS_SCH5636
diff --git a/baseconfig/CONFIG_SENSORS_SHT15 b/configs/base-generic/CONFIG_SENSORS_SHT15
index 997046201..997046201 100644
--- a/baseconfig/CONFIG_SENSORS_SHT15
+++ b/configs/base-generic/CONFIG_SENSORS_SHT15
diff --git a/baseconfig/CONFIG_SENSORS_SHT21 b/configs/base-generic/CONFIG_SENSORS_SHT21
index dbc5dd9f3..dbc5dd9f3 100644
--- a/baseconfig/CONFIG_SENSORS_SHT21
+++ b/configs/base-generic/CONFIG_SENSORS_SHT21
diff --git a/baseconfig/CONFIG_SENSORS_SHT3x b/configs/base-generic/CONFIG_SENSORS_SHT3x
index dcc6a7870..dcc6a7870 100644
--- a/baseconfig/CONFIG_SENSORS_SHT3x
+++ b/configs/base-generic/CONFIG_SENSORS_SHT3x
diff --git a/baseconfig/CONFIG_SENSORS_SHTC1 b/configs/base-generic/CONFIG_SENSORS_SHTC1
index 7eeb26cc7..7eeb26cc7 100644
--- a/baseconfig/CONFIG_SENSORS_SHTC1
+++ b/configs/base-generic/CONFIG_SENSORS_SHTC1
diff --git a/baseconfig/CONFIG_SENSORS_SIS5595 b/configs/base-generic/CONFIG_SENSORS_SIS5595
index 70c05287c..70c05287c 100644
--- a/baseconfig/CONFIG_SENSORS_SIS5595
+++ b/configs/base-generic/CONFIG_SENSORS_SIS5595
diff --git a/baseconfig/CONFIG_SENSORS_SMM665 b/configs/base-generic/CONFIG_SENSORS_SMM665
index d5bff3de4..d5bff3de4 100644
--- a/baseconfig/CONFIG_SENSORS_SMM665
+++ b/configs/base-generic/CONFIG_SENSORS_SMM665
diff --git a/baseconfig/CONFIG_SENSORS_SMSC47B397 b/configs/base-generic/CONFIG_SENSORS_SMSC47B397
index eba9f9c80..eba9f9c80 100644
--- a/baseconfig/CONFIG_SENSORS_SMSC47B397
+++ b/configs/base-generic/CONFIG_SENSORS_SMSC47B397
diff --git a/baseconfig/CONFIG_SENSORS_SMSC47M1 b/configs/base-generic/CONFIG_SENSORS_SMSC47M1
index 5c35e7613..5c35e7613 100644
--- a/baseconfig/CONFIG_SENSORS_SMSC47M1
+++ b/configs/base-generic/CONFIG_SENSORS_SMSC47M1
diff --git a/baseconfig/CONFIG_SENSORS_SMSC47M192 b/configs/base-generic/CONFIG_SENSORS_SMSC47M192
index e239c8299..e239c8299 100644
--- a/baseconfig/CONFIG_SENSORS_SMSC47M192
+++ b/configs/base-generic/CONFIG_SENSORS_SMSC47M192
diff --git a/baseconfig/CONFIG_SENSORS_STTS751 b/configs/base-generic/CONFIG_SENSORS_STTS751
index f2f8006af..f2f8006af 100644
--- a/baseconfig/CONFIG_SENSORS_STTS751
+++ b/configs/base-generic/CONFIG_SENSORS_STTS751
diff --git a/baseconfig/CONFIG_SENSORS_TC654 b/configs/base-generic/CONFIG_SENSORS_TC654
index 96736a73a..96736a73a 100644
--- a/baseconfig/CONFIG_SENSORS_TC654
+++ b/configs/base-generic/CONFIG_SENSORS_TC654
diff --git a/baseconfig/CONFIG_SENSORS_TC74 b/configs/base-generic/CONFIG_SENSORS_TC74
index 32f0b8ea4..32f0b8ea4 100644
--- a/baseconfig/CONFIG_SENSORS_TC74
+++ b/configs/base-generic/CONFIG_SENSORS_TC74
diff --git a/baseconfig/CONFIG_SENSORS_THMC50 b/configs/base-generic/CONFIG_SENSORS_THMC50
index f3b849b5c..f3b849b5c 100644
--- a/baseconfig/CONFIG_SENSORS_THMC50
+++ b/configs/base-generic/CONFIG_SENSORS_THMC50
diff --git a/baseconfig/CONFIG_SENSORS_TMP102 b/configs/base-generic/CONFIG_SENSORS_TMP102
index eec18af38..eec18af38 100644
--- a/baseconfig/CONFIG_SENSORS_TMP102
+++ b/configs/base-generic/CONFIG_SENSORS_TMP102
diff --git a/baseconfig/CONFIG_SENSORS_TMP103 b/configs/base-generic/CONFIG_SENSORS_TMP103
index 89c6eca5e..89c6eca5e 100644
--- a/baseconfig/CONFIG_SENSORS_TMP103
+++ b/configs/base-generic/CONFIG_SENSORS_TMP103
diff --git a/baseconfig/CONFIG_SENSORS_TMP108 b/configs/base-generic/CONFIG_SENSORS_TMP108
index 3a5133c23..3a5133c23 100644
--- a/baseconfig/CONFIG_SENSORS_TMP108
+++ b/configs/base-generic/CONFIG_SENSORS_TMP108
diff --git a/baseconfig/CONFIG_SENSORS_TMP401 b/configs/base-generic/CONFIG_SENSORS_TMP401
index de3f7de90..de3f7de90 100644
--- a/baseconfig/CONFIG_SENSORS_TMP401
+++ b/configs/base-generic/CONFIG_SENSORS_TMP401
diff --git a/baseconfig/CONFIG_SENSORS_TMP421 b/configs/base-generic/CONFIG_SENSORS_TMP421
index 390515bf3..390515bf3 100644
--- a/baseconfig/CONFIG_SENSORS_TMP421
+++ b/configs/base-generic/CONFIG_SENSORS_TMP421
diff --git a/baseconfig/CONFIG_SENSORS_TPS40422 b/configs/base-generic/CONFIG_SENSORS_TPS40422
index 1abcf8970..1abcf8970 100644
--- a/baseconfig/CONFIG_SENSORS_TPS40422
+++ b/configs/base-generic/CONFIG_SENSORS_TPS40422
diff --git a/baseconfig/CONFIG_SENSORS_TPS53679 b/configs/base-generic/CONFIG_SENSORS_TPS53679
index 461a703df..461a703df 100644
--- a/baseconfig/CONFIG_SENSORS_TPS53679
+++ b/configs/base-generic/CONFIG_SENSORS_TPS53679
diff --git a/baseconfig/CONFIG_SENSORS_TSL2550 b/configs/base-generic/CONFIG_SENSORS_TSL2550
index 93ceff810..93ceff810 100644
--- a/baseconfig/CONFIG_SENSORS_TSL2550
+++ b/configs/base-generic/CONFIG_SENSORS_TSL2550
diff --git a/baseconfig/CONFIG_SENSORS_TSL2563 b/configs/base-generic/CONFIG_SENSORS_TSL2563
index b94d33641..b94d33641 100644
--- a/baseconfig/CONFIG_SENSORS_TSL2563
+++ b/configs/base-generic/CONFIG_SENSORS_TSL2563
diff --git a/baseconfig/CONFIG_SENSORS_UCD9000 b/configs/base-generic/CONFIG_SENSORS_UCD9000
index 1bce80fa9..1bce80fa9 100644
--- a/baseconfig/CONFIG_SENSORS_UCD9000
+++ b/configs/base-generic/CONFIG_SENSORS_UCD9000
diff --git a/baseconfig/CONFIG_SENSORS_UCD9200 b/configs/base-generic/CONFIG_SENSORS_UCD9200
index da028a1df..da028a1df 100644
--- a/baseconfig/CONFIG_SENSORS_UCD9200
+++ b/configs/base-generic/CONFIG_SENSORS_UCD9200
diff --git a/baseconfig/CONFIG_SENSORS_VIA686A b/configs/base-generic/CONFIG_SENSORS_VIA686A
index d3b212f27..d3b212f27 100644
--- a/baseconfig/CONFIG_SENSORS_VIA686A
+++ b/configs/base-generic/CONFIG_SENSORS_VIA686A
diff --git a/baseconfig/CONFIG_SENSORS_VT1211 b/configs/base-generic/CONFIG_SENSORS_VT1211
index bfcec4313..bfcec4313 100644
--- a/baseconfig/CONFIG_SENSORS_VT1211
+++ b/configs/base-generic/CONFIG_SENSORS_VT1211
diff --git a/baseconfig/CONFIG_SENSORS_VT8231 b/configs/base-generic/CONFIG_SENSORS_VT8231
index 7e7679174..7e7679174 100644
--- a/baseconfig/CONFIG_SENSORS_VT8231
+++ b/configs/base-generic/CONFIG_SENSORS_VT8231
diff --git a/baseconfig/CONFIG_SENSORS_W83627EHF b/configs/base-generic/CONFIG_SENSORS_W83627EHF
index 6a06ef0fa..6a06ef0fa 100644
--- a/baseconfig/CONFIG_SENSORS_W83627EHF
+++ b/configs/base-generic/CONFIG_SENSORS_W83627EHF
diff --git a/baseconfig/CONFIG_SENSORS_W83627HF b/configs/base-generic/CONFIG_SENSORS_W83627HF
index 8c578db80..8c578db80 100644
--- a/baseconfig/CONFIG_SENSORS_W83627HF
+++ b/configs/base-generic/CONFIG_SENSORS_W83627HF
diff --git a/baseconfig/CONFIG_SENSORS_W83781D b/configs/base-generic/CONFIG_SENSORS_W83781D
index e0a34bf27..e0a34bf27 100644
--- a/baseconfig/CONFIG_SENSORS_W83781D
+++ b/configs/base-generic/CONFIG_SENSORS_W83781D
diff --git a/baseconfig/CONFIG_SENSORS_W83791D b/configs/base-generic/CONFIG_SENSORS_W83791D
index 8bbb2b5b8..8bbb2b5b8 100644
--- a/baseconfig/CONFIG_SENSORS_W83791D
+++ b/configs/base-generic/CONFIG_SENSORS_W83791D
diff --git a/baseconfig/CONFIG_SENSORS_W83792D b/configs/base-generic/CONFIG_SENSORS_W83792D
index 9dc3fda8b..9dc3fda8b 100644
--- a/baseconfig/CONFIG_SENSORS_W83792D
+++ b/configs/base-generic/CONFIG_SENSORS_W83792D
diff --git a/baseconfig/CONFIG_SENSORS_W83793 b/configs/base-generic/CONFIG_SENSORS_W83793
index 6c2fefb45..6c2fefb45 100644
--- a/baseconfig/CONFIG_SENSORS_W83793
+++ b/configs/base-generic/CONFIG_SENSORS_W83793
diff --git a/baseconfig/CONFIG_SENSORS_W83795 b/configs/base-generic/CONFIG_SENSORS_W83795
index e85aa8e5e..e85aa8e5e 100644
--- a/baseconfig/CONFIG_SENSORS_W83795
+++ b/configs/base-generic/CONFIG_SENSORS_W83795
diff --git a/baseconfig/CONFIG_SENSORS_W83795_FANCTRL b/configs/base-generic/CONFIG_SENSORS_W83795_FANCTRL
index 896ede334..896ede334 100644
--- a/baseconfig/CONFIG_SENSORS_W83795_FANCTRL
+++ b/configs/base-generic/CONFIG_SENSORS_W83795_FANCTRL
diff --git a/baseconfig/CONFIG_SENSORS_W83L785TS b/configs/base-generic/CONFIG_SENSORS_W83L785TS
index 0c220bdf8..0c220bdf8 100644
--- a/baseconfig/CONFIG_SENSORS_W83L785TS
+++ b/configs/base-generic/CONFIG_SENSORS_W83L785TS
diff --git a/baseconfig/CONFIG_SENSORS_W83L786NG b/configs/base-generic/CONFIG_SENSORS_W83L786NG
index 0dfd97664..0dfd97664 100644
--- a/baseconfig/CONFIG_SENSORS_W83L786NG
+++ b/configs/base-generic/CONFIG_SENSORS_W83L786NG
diff --git a/baseconfig/CONFIG_SENSORS_WM831X b/configs/base-generic/CONFIG_SENSORS_WM831X
index 4cc09dd6d..4cc09dd6d 100644
--- a/baseconfig/CONFIG_SENSORS_WM831X
+++ b/configs/base-generic/CONFIG_SENSORS_WM831X
diff --git a/baseconfig/CONFIG_SENSORS_WM8350 b/configs/base-generic/CONFIG_SENSORS_WM8350
index d1c6006eb..d1c6006eb 100644
--- a/baseconfig/CONFIG_SENSORS_WM8350
+++ b/configs/base-generic/CONFIG_SENSORS_WM8350
diff --git a/baseconfig/CONFIG_SENSORS_XGENE b/configs/base-generic/CONFIG_SENSORS_XGENE
index ae549128e..ae549128e 100644
--- a/baseconfig/CONFIG_SENSORS_XGENE
+++ b/configs/base-generic/CONFIG_SENSORS_XGENE
diff --git a/baseconfig/CONFIG_SENSORS_ZL6100 b/configs/base-generic/CONFIG_SENSORS_ZL6100
index 8a28e5080..8a28e5080 100644
--- a/baseconfig/CONFIG_SENSORS_ZL6100
+++ b/configs/base-generic/CONFIG_SENSORS_ZL6100
diff --git a/baseconfig/CONFIG_SERIAL_8250 b/configs/base-generic/CONFIG_SERIAL_8250
index 6896f6a62..6896f6a62 100644
--- a/baseconfig/CONFIG_SERIAL_8250
+++ b/configs/base-generic/CONFIG_SERIAL_8250
diff --git a/baseconfig/CONFIG_SERIAL_8250_ASPEED_VUART b/configs/base-generic/CONFIG_SERIAL_8250_ASPEED_VUART
index bbab9a646..bbab9a646 100644
--- a/baseconfig/CONFIG_SERIAL_8250_ASPEED_VUART
+++ b/configs/base-generic/CONFIG_SERIAL_8250_ASPEED_VUART
diff --git a/baseconfig/CONFIG_SERIAL_8250_CONSOLE b/configs/base-generic/CONFIG_SERIAL_8250_CONSOLE
index 49dda6ea7..49dda6ea7 100644
--- a/baseconfig/CONFIG_SERIAL_8250_CONSOLE
+++ b/configs/base-generic/CONFIG_SERIAL_8250_CONSOLE
diff --git a/baseconfig/CONFIG_SERIAL_8250_CS b/configs/base-generic/CONFIG_SERIAL_8250_CS
index 9d69777cb..9d69777cb 100644
--- a/baseconfig/CONFIG_SERIAL_8250_CS
+++ b/configs/base-generic/CONFIG_SERIAL_8250_CS
diff --git a/baseconfig/CONFIG_SERIAL_8250_DEPRECATED_OPTIONS b/configs/base-generic/CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
index bec6e2822..bec6e2822 100644
--- a/baseconfig/CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
+++ b/configs/base-generic/CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
diff --git a/baseconfig/CONFIG_SERIAL_8250_DETECT_IRQ b/configs/base-generic/CONFIG_SERIAL_8250_DETECT_IRQ
index 3fc7f91ea..3fc7f91ea 100644
--- a/baseconfig/CONFIG_SERIAL_8250_DETECT_IRQ
+++ b/configs/base-generic/CONFIG_SERIAL_8250_DETECT_IRQ
diff --git a/baseconfig/CONFIG_SERIAL_8250_DW b/configs/base-generic/CONFIG_SERIAL_8250_DW
index 43894bea0..43894bea0 100644
--- a/baseconfig/CONFIG_SERIAL_8250_DW
+++ b/configs/base-generic/CONFIG_SERIAL_8250_DW
diff --git a/baseconfig/CONFIG_SERIAL_8250_EXAR b/configs/base-generic/CONFIG_SERIAL_8250_EXAR
index bb519d916..bb519d916 100644
--- a/baseconfig/CONFIG_SERIAL_8250_EXAR
+++ b/configs/base-generic/CONFIG_SERIAL_8250_EXAR
diff --git a/baseconfig/CONFIG_SERIAL_8250_EXTENDED b/configs/base-generic/CONFIG_SERIAL_8250_EXTENDED
index 91881b195..91881b195 100644
--- a/baseconfig/CONFIG_SERIAL_8250_EXTENDED
+++ b/configs/base-generic/CONFIG_SERIAL_8250_EXTENDED
diff --git a/baseconfig/CONFIG_SERIAL_8250_FINTEK b/configs/base-generic/CONFIG_SERIAL_8250_FINTEK
index b6cf08b71..b6cf08b71 100644
--- a/baseconfig/CONFIG_SERIAL_8250_FINTEK
+++ b/configs/base-generic/CONFIG_SERIAL_8250_FINTEK
diff --git a/baseconfig/CONFIG_SERIAL_8250_INGENIC b/configs/base-generic/CONFIG_SERIAL_8250_INGENIC
index e53a07bf5..e53a07bf5 100644
--- a/baseconfig/CONFIG_SERIAL_8250_INGENIC
+++ b/configs/base-generic/CONFIG_SERIAL_8250_INGENIC
diff --git a/baseconfig/CONFIG_SERIAL_8250_MANY_PORTS b/configs/base-generic/CONFIG_SERIAL_8250_MANY_PORTS
index ded898381..ded898381 100644
--- a/baseconfig/CONFIG_SERIAL_8250_MANY_PORTS
+++ b/configs/base-generic/CONFIG_SERIAL_8250_MANY_PORTS
diff --git a/baseconfig/CONFIG_SERIAL_8250_MID b/configs/base-generic/CONFIG_SERIAL_8250_MID
index 2ac8894cb..2ac8894cb 100644
--- a/baseconfig/CONFIG_SERIAL_8250_MID
+++ b/configs/base-generic/CONFIG_SERIAL_8250_MID
diff --git a/baseconfig/CONFIG_SERIAL_8250_MOXA b/configs/base-generic/CONFIG_SERIAL_8250_MOXA
index 5fe7e1175..5fe7e1175 100644
--- a/baseconfig/CONFIG_SERIAL_8250_MOXA
+++ b/configs/base-generic/CONFIG_SERIAL_8250_MOXA
diff --git a/baseconfig/CONFIG_SERIAL_8250_NR_UARTS b/configs/base-generic/CONFIG_SERIAL_8250_NR_UARTS
index c30ccb26b..c30ccb26b 100644
--- a/baseconfig/CONFIG_SERIAL_8250_NR_UARTS
+++ b/configs/base-generic/CONFIG_SERIAL_8250_NR_UARTS
diff --git a/baseconfig/CONFIG_SERIAL_8250_PCI b/configs/base-generic/CONFIG_SERIAL_8250_PCI
index c0ac5637f..c0ac5637f 100644
--- a/baseconfig/CONFIG_SERIAL_8250_PCI
+++ b/configs/base-generic/CONFIG_SERIAL_8250_PCI
diff --git a/baseconfig/CONFIG_SERIAL_8250_RSA b/configs/base-generic/CONFIG_SERIAL_8250_RSA
index 2e1143ad4..2e1143ad4 100644
--- a/baseconfig/CONFIG_SERIAL_8250_RSA
+++ b/configs/base-generic/CONFIG_SERIAL_8250_RSA
diff --git a/baseconfig/CONFIG_SERIAL_8250_RT288X b/configs/base-generic/CONFIG_SERIAL_8250_RT288X
index 8d92a9a3f..8d92a9a3f 100644
--- a/baseconfig/CONFIG_SERIAL_8250_RT288X
+++ b/configs/base-generic/CONFIG_SERIAL_8250_RT288X
diff --git a/baseconfig/CONFIG_SERIAL_8250_RUNTIME_UARTS b/configs/base-generic/CONFIG_SERIAL_8250_RUNTIME_UARTS
index f7b04059a..f7b04059a 100644
--- a/baseconfig/CONFIG_SERIAL_8250_RUNTIME_UARTS
+++ b/configs/base-generic/CONFIG_SERIAL_8250_RUNTIME_UARTS
diff --git a/baseconfig/CONFIG_SERIAL_8250_SHARE_IRQ b/configs/base-generic/CONFIG_SERIAL_8250_SHARE_IRQ
index d346f0d47..d346f0d47 100644
--- a/baseconfig/CONFIG_SERIAL_8250_SHARE_IRQ
+++ b/configs/base-generic/CONFIG_SERIAL_8250_SHARE_IRQ
diff --git a/baseconfig/CONFIG_SERIAL_ALTERA_JTAGUART b/configs/base-generic/CONFIG_SERIAL_ALTERA_JTAGUART
index b21939fa7..b21939fa7 100644
--- a/baseconfig/CONFIG_SERIAL_ALTERA_JTAGUART
+++ b/configs/base-generic/CONFIG_SERIAL_ALTERA_JTAGUART
diff --git a/baseconfig/CONFIG_SERIAL_ALTERA_UART b/configs/base-generic/CONFIG_SERIAL_ALTERA_UART
index a4c4bd742..a4c4bd742 100644
--- a/baseconfig/CONFIG_SERIAL_ALTERA_UART
+++ b/configs/base-generic/CONFIG_SERIAL_ALTERA_UART
diff --git a/baseconfig/CONFIG_SERIAL_ARC b/configs/base-generic/CONFIG_SERIAL_ARC
index 998cbcfd7..998cbcfd7 100644
--- a/baseconfig/CONFIG_SERIAL_ARC
+++ b/configs/base-generic/CONFIG_SERIAL_ARC
diff --git a/baseconfig/CONFIG_SERIAL_ARC_NR_PORTS b/configs/base-generic/CONFIG_SERIAL_ARC_NR_PORTS
index 02dfacf68..02dfacf68 100644
--- a/baseconfig/CONFIG_SERIAL_ARC_NR_PORTS
+++ b/configs/base-generic/CONFIG_SERIAL_ARC_NR_PORTS
diff --git a/baseconfig/CONFIG_SERIAL_CONEXANT_DIGICOLOR b/configs/base-generic/CONFIG_SERIAL_CONEXANT_DIGICOLOR
index b7ae4d4a2..b7ae4d4a2 100644
--- a/baseconfig/CONFIG_SERIAL_CONEXANT_DIGICOLOR
+++ b/configs/base-generic/CONFIG_SERIAL_CONEXANT_DIGICOLOR
diff --git a/baseconfig/CONFIG_SERIAL_CORE b/configs/base-generic/CONFIG_SERIAL_CORE
index a9e727ef6..a9e727ef6 100644
--- a/baseconfig/CONFIG_SERIAL_CORE
+++ b/configs/base-generic/CONFIG_SERIAL_CORE
diff --git a/baseconfig/CONFIG_SERIAL_CORE_CONSOLE b/configs/base-generic/CONFIG_SERIAL_CORE_CONSOLE
index 7a5650c97..7a5650c97 100644
--- a/baseconfig/CONFIG_SERIAL_CORE_CONSOLE
+++ b/configs/base-generic/CONFIG_SERIAL_CORE_CONSOLE
diff --git a/baseconfig/CONFIG_SERIAL_DEV_BUS b/configs/base-generic/CONFIG_SERIAL_DEV_BUS
index f73dc688e..f73dc688e 100644
--- a/baseconfig/CONFIG_SERIAL_DEV_BUS
+++ b/configs/base-generic/CONFIG_SERIAL_DEV_BUS
diff --git a/baseconfig/CONFIG_SERIAL_DEV_CTRL_TTYPORT b/configs/base-generic/CONFIG_SERIAL_DEV_CTRL_TTYPORT
index 4d61eadb1..4d61eadb1 100644
--- a/baseconfig/CONFIG_SERIAL_DEV_CTRL_TTYPORT
+++ b/configs/base-generic/CONFIG_SERIAL_DEV_CTRL_TTYPORT
diff --git a/baseconfig/CONFIG_SERIAL_FSL_LPUART b/configs/base-generic/CONFIG_SERIAL_FSL_LPUART
index 345c6ea2a..345c6ea2a 100644
--- a/baseconfig/CONFIG_SERIAL_FSL_LPUART
+++ b/configs/base-generic/CONFIG_SERIAL_FSL_LPUART
diff --git a/baseconfig/CONFIG_SERIAL_IFX6X60 b/configs/base-generic/CONFIG_SERIAL_IFX6X60
index b456384e1..b456384e1 100644
--- a/baseconfig/CONFIG_SERIAL_IFX6X60
+++ b/configs/base-generic/CONFIG_SERIAL_IFX6X60
diff --git a/baseconfig/CONFIG_SERIAL_JSM b/configs/base-generic/CONFIG_SERIAL_JSM
index 7f35395cf..7f35395cf 100644
--- a/baseconfig/CONFIG_SERIAL_JSM
+++ b/configs/base-generic/CONFIG_SERIAL_JSM
diff --git a/baseconfig/CONFIG_SERIAL_KGDB_NMI b/configs/base-generic/CONFIG_SERIAL_KGDB_NMI
index 617006684..617006684 100644
--- a/baseconfig/CONFIG_SERIAL_KGDB_NMI
+++ b/configs/base-generic/CONFIG_SERIAL_KGDB_NMI
diff --git a/baseconfig/CONFIG_SERIAL_MAX3100 b/configs/base-generic/CONFIG_SERIAL_MAX3100
index 5fb197ebc..5fb197ebc 100644
--- a/baseconfig/CONFIG_SERIAL_MAX3100
+++ b/configs/base-generic/CONFIG_SERIAL_MAX3100
diff --git a/baseconfig/CONFIG_SERIAL_MAX310X b/configs/base-generic/CONFIG_SERIAL_MAX310X
index 10f39f7fa..10f39f7fa 100644
--- a/baseconfig/CONFIG_SERIAL_MAX310X
+++ b/configs/base-generic/CONFIG_SERIAL_MAX310X
diff --git a/baseconfig/CONFIG_SERIAL_NONSTANDARD b/configs/base-generic/CONFIG_SERIAL_NONSTANDARD
index f371b2fdc..f371b2fdc 100644
--- a/baseconfig/CONFIG_SERIAL_NONSTANDARD
+++ b/configs/base-generic/CONFIG_SERIAL_NONSTANDARD
diff --git a/baseconfig/CONFIG_SERIAL_PCH_UART b/configs/base-generic/CONFIG_SERIAL_PCH_UART
index 857509074..857509074 100644
--- a/baseconfig/CONFIG_SERIAL_PCH_UART
+++ b/configs/base-generic/CONFIG_SERIAL_PCH_UART
diff --git a/baseconfig/CONFIG_SERIAL_RP2 b/configs/base-generic/CONFIG_SERIAL_RP2
index 2645fe9c7..2645fe9c7 100644
--- a/baseconfig/CONFIG_SERIAL_RP2
+++ b/configs/base-generic/CONFIG_SERIAL_RP2
diff --git a/baseconfig/CONFIG_SERIAL_SC16IS7XX b/configs/base-generic/CONFIG_SERIAL_SC16IS7XX
index 29deacf2a..29deacf2a 100644
--- a/baseconfig/CONFIG_SERIAL_SC16IS7XX
+++ b/configs/base-generic/CONFIG_SERIAL_SC16IS7XX
diff --git a/baseconfig/CONFIG_SERIAL_SCCNXP b/configs/base-generic/CONFIG_SERIAL_SCCNXP
index 1ef04c208..1ef04c208 100644
--- a/baseconfig/CONFIG_SERIAL_SCCNXP
+++ b/configs/base-generic/CONFIG_SERIAL_SCCNXP
diff --git a/baseconfig/CONFIG_SERIAL_ST_ASC b/configs/base-generic/CONFIG_SERIAL_ST_ASC
index c578350a1..c578350a1 100644
--- a/baseconfig/CONFIG_SERIAL_ST_ASC
+++ b/configs/base-generic/CONFIG_SERIAL_ST_ASC
diff --git a/baseconfig/CONFIG_SERIAL_TIMBERDALE b/configs/base-generic/CONFIG_SERIAL_TIMBERDALE
index 56dc097b7..56dc097b7 100644
--- a/baseconfig/CONFIG_SERIAL_TIMBERDALE
+++ b/configs/base-generic/CONFIG_SERIAL_TIMBERDALE
diff --git a/baseconfig/CONFIG_SERIAL_UARTLITE b/configs/base-generic/CONFIG_SERIAL_UARTLITE
index 5c730f9cf..5c730f9cf 100644
--- a/baseconfig/CONFIG_SERIAL_UARTLITE
+++ b/configs/base-generic/CONFIG_SERIAL_UARTLITE
diff --git a/baseconfig/CONFIG_SERIAL_XILINX_PS_UART b/configs/base-generic/CONFIG_SERIAL_XILINX_PS_UART
index 3d6ecfc5e..3d6ecfc5e 100644
--- a/baseconfig/CONFIG_SERIAL_XILINX_PS_UART
+++ b/configs/base-generic/CONFIG_SERIAL_XILINX_PS_UART
diff --git a/baseconfig/CONFIG_SERIO b/configs/base-generic/CONFIG_SERIO
index e0e509335..e0e509335 100644
--- a/baseconfig/CONFIG_SERIO
+++ b/configs/base-generic/CONFIG_SERIO
diff --git a/baseconfig/CONFIG_SERIO_ALTERA_PS2 b/configs/base-generic/CONFIG_SERIO_ALTERA_PS2
index 9e366c11a..9e366c11a 100644
--- a/baseconfig/CONFIG_SERIO_ALTERA_PS2
+++ b/configs/base-generic/CONFIG_SERIO_ALTERA_PS2
diff --git a/baseconfig/CONFIG_SERIO_APBPS2 b/configs/base-generic/CONFIG_SERIO_APBPS2
index 9e86f27a9..9e86f27a9 100644
--- a/baseconfig/CONFIG_SERIO_APBPS2
+++ b/configs/base-generic/CONFIG_SERIO_APBPS2
diff --git a/baseconfig/CONFIG_SERIO_ARC_PS2 b/configs/base-generic/CONFIG_SERIO_ARC_PS2
index 7535bbef9..7535bbef9 100644
--- a/baseconfig/CONFIG_SERIO_ARC_PS2
+++ b/configs/base-generic/CONFIG_SERIO_ARC_PS2
diff --git a/baseconfig/CONFIG_SERIO_CT82C710 b/configs/base-generic/CONFIG_SERIO_CT82C710
index 6ba82bb7c..6ba82bb7c 100644
--- a/baseconfig/CONFIG_SERIO_CT82C710
+++ b/configs/base-generic/CONFIG_SERIO_CT82C710
diff --git a/baseconfig/CONFIG_SERIO_GPIO_PS2 b/configs/base-generic/CONFIG_SERIO_GPIO_PS2
index 22c1adbfb..22c1adbfb 100644
--- a/baseconfig/CONFIG_SERIO_GPIO_PS2
+++ b/configs/base-generic/CONFIG_SERIO_GPIO_PS2
diff --git a/baseconfig/CONFIG_SERIO_I8042 b/configs/base-generic/CONFIG_SERIO_I8042
index 8e5a28dd3..8e5a28dd3 100644
--- a/baseconfig/CONFIG_SERIO_I8042
+++ b/configs/base-generic/CONFIG_SERIO_I8042
diff --git a/baseconfig/CONFIG_SERIO_LIBPS2 b/configs/base-generic/CONFIG_SERIO_LIBPS2
index 0db209ef2..0db209ef2 100644
--- a/baseconfig/CONFIG_SERIO_LIBPS2
+++ b/configs/base-generic/CONFIG_SERIO_LIBPS2
diff --git a/baseconfig/CONFIG_SERIO_OLPC_APSP b/configs/base-generic/CONFIG_SERIO_OLPC_APSP
index f5ddd7459..f5ddd7459 100644
--- a/baseconfig/CONFIG_SERIO_OLPC_APSP
+++ b/configs/base-generic/CONFIG_SERIO_OLPC_APSP
diff --git a/baseconfig/CONFIG_SERIO_PARKBD b/configs/base-generic/CONFIG_SERIO_PARKBD
index 8f6819617..8f6819617 100644
--- a/baseconfig/CONFIG_SERIO_PARKBD
+++ b/configs/base-generic/CONFIG_SERIO_PARKBD
diff --git a/baseconfig/CONFIG_SERIO_PCIPS2 b/configs/base-generic/CONFIG_SERIO_PCIPS2
index 81c68994f..81c68994f 100644
--- a/baseconfig/CONFIG_SERIO_PCIPS2
+++ b/configs/base-generic/CONFIG_SERIO_PCIPS2
diff --git a/baseconfig/CONFIG_SERIO_PS2MULT b/configs/base-generic/CONFIG_SERIO_PS2MULT
index ecaa8cce1..ecaa8cce1 100644
--- a/baseconfig/CONFIG_SERIO_PS2MULT
+++ b/configs/base-generic/CONFIG_SERIO_PS2MULT
diff --git a/baseconfig/CONFIG_SERIO_RAW b/configs/base-generic/CONFIG_SERIO_RAW
index 29fd33a29..29fd33a29 100644
--- a/baseconfig/CONFIG_SERIO_RAW
+++ b/configs/base-generic/CONFIG_SERIO_RAW
diff --git a/baseconfig/CONFIG_SERIO_SERPORT b/configs/base-generic/CONFIG_SERIO_SERPORT
index 341b61290..341b61290 100644
--- a/baseconfig/CONFIG_SERIO_SERPORT
+++ b/configs/base-generic/CONFIG_SERIO_SERPORT
diff --git a/baseconfig/CONFIG_SFC b/configs/base-generic/CONFIG_SFC
index fdc60b90f..fdc60b90f 100644
--- a/baseconfig/CONFIG_SFC
+++ b/configs/base-generic/CONFIG_SFC
diff --git a/baseconfig/CONFIG_SFC_FALCON b/configs/base-generic/CONFIG_SFC_FALCON
index 1d449db86..1d449db86 100644
--- a/baseconfig/CONFIG_SFC_FALCON
+++ b/configs/base-generic/CONFIG_SFC_FALCON
diff --git a/baseconfig/CONFIG_SFC_FALCON_MTD b/configs/base-generic/CONFIG_SFC_FALCON_MTD
index ebf5bfd79..ebf5bfd79 100644
--- a/baseconfig/CONFIG_SFC_FALCON_MTD
+++ b/configs/base-generic/CONFIG_SFC_FALCON_MTD
diff --git a/baseconfig/CONFIG_SFP b/configs/base-generic/CONFIG_SFP
index db57db12e..db57db12e 100644
--- a/baseconfig/CONFIG_SFP
+++ b/configs/base-generic/CONFIG_SFP
diff --git a/baseconfig/CONFIG_SGI_IOC4 b/configs/base-generic/CONFIG_SGI_IOC4
index 0d104aafd..0d104aafd 100644
--- a/baseconfig/CONFIG_SGI_IOC4
+++ b/configs/base-generic/CONFIG_SGI_IOC4
diff --git a/baseconfig/CONFIG_SGI_PARTITION b/configs/base-generic/CONFIG_SGI_PARTITION
index 2c96dcdff..2c96dcdff 100644
--- a/baseconfig/CONFIG_SGI_PARTITION
+++ b/configs/base-generic/CONFIG_SGI_PARTITION
diff --git a/baseconfig/CONFIG_SH_ETH b/configs/base-generic/CONFIG_SH_ETH
index 5102dbe95..5102dbe95 100644
--- a/baseconfig/CONFIG_SH_ETH
+++ b/configs/base-generic/CONFIG_SH_ETH
diff --git a/baseconfig/CONFIG_SI1145 b/configs/base-generic/CONFIG_SI1145
index 744fc2b7f..744fc2b7f 100644
--- a/baseconfig/CONFIG_SI1145
+++ b/configs/base-generic/CONFIG_SI1145
diff --git a/baseconfig/CONFIG_SI7005 b/configs/base-generic/CONFIG_SI7005
index f04c186e3..f04c186e3 100644
--- a/baseconfig/CONFIG_SI7005
+++ b/configs/base-generic/CONFIG_SI7005
diff --git a/baseconfig/CONFIG_SI7020 b/configs/base-generic/CONFIG_SI7020
index 25a811632..25a811632 100644
--- a/baseconfig/CONFIG_SI7020
+++ b/configs/base-generic/CONFIG_SI7020
diff --git a/baseconfig/CONFIG_SIGMA b/configs/base-generic/CONFIG_SIGMA
index 290f59d9d..290f59d9d 100644
--- a/baseconfig/CONFIG_SIGMA
+++ b/configs/base-generic/CONFIG_SIGMA
diff --git a/baseconfig/CONFIG_SIGMATEL_FIR b/configs/base-generic/CONFIG_SIGMATEL_FIR
index 0483fa10a..0483fa10a 100644
--- a/baseconfig/CONFIG_SIGMATEL_FIR
+++ b/configs/base-generic/CONFIG_SIGMATEL_FIR
diff --git a/baseconfig/CONFIG_SIGNED_PE_FILE_VERIFICATION b/configs/base-generic/CONFIG_SIGNED_PE_FILE_VERIFICATION
index d7551a589..d7551a589 100644
--- a/baseconfig/CONFIG_SIGNED_PE_FILE_VERIFICATION
+++ b/configs/base-generic/CONFIG_SIGNED_PE_FILE_VERIFICATION
diff --git a/baseconfig/CONFIG_SIMPLE_PM_BUS b/configs/base-generic/CONFIG_SIMPLE_PM_BUS
index a0712c1c4..a0712c1c4 100644
--- a/baseconfig/CONFIG_SIMPLE_PM_BUS
+++ b/configs/base-generic/CONFIG_SIMPLE_PM_BUS
diff --git a/baseconfig/CONFIG_SIS190 b/configs/base-generic/CONFIG_SIS190
index e9cd4e6b1..e9cd4e6b1 100644
--- a/baseconfig/CONFIG_SIS190
+++ b/configs/base-generic/CONFIG_SIS190
diff --git a/baseconfig/CONFIG_SIS900 b/configs/base-generic/CONFIG_SIS900
index c5f74a68a..c5f74a68a 100644
--- a/baseconfig/CONFIG_SIS900
+++ b/configs/base-generic/CONFIG_SIS900
diff --git a/baseconfig/CONFIG_SKFP b/configs/base-generic/CONFIG_SKFP
index 447153251..447153251 100644
--- a/baseconfig/CONFIG_SKFP
+++ b/configs/base-generic/CONFIG_SKFP
diff --git a/baseconfig/CONFIG_SKGE b/configs/base-generic/CONFIG_SKGE
index 715250881..715250881 100644
--- a/baseconfig/CONFIG_SKGE
+++ b/configs/base-generic/CONFIG_SKGE
diff --git a/baseconfig/CONFIG_SKGE_DEBUG b/configs/base-generic/CONFIG_SKGE_DEBUG
index 3c3ed82ea..3c3ed82ea 100644
--- a/baseconfig/CONFIG_SKGE_DEBUG
+++ b/configs/base-generic/CONFIG_SKGE_DEBUG
diff --git a/baseconfig/CONFIG_SKGE_GENESIS b/configs/base-generic/CONFIG_SKGE_GENESIS
index 084b46c1c..084b46c1c 100644
--- a/baseconfig/CONFIG_SKGE_GENESIS
+++ b/configs/base-generic/CONFIG_SKGE_GENESIS
diff --git a/baseconfig/CONFIG_SKY2 b/configs/base-generic/CONFIG_SKY2
index 63b5b5144..63b5b5144 100644
--- a/baseconfig/CONFIG_SKY2
+++ b/configs/base-generic/CONFIG_SKY2
diff --git a/baseconfig/CONFIG_SKY2_DEBUG b/configs/base-generic/CONFIG_SKY2_DEBUG
index 90ef01d02..90ef01d02 100644
--- a/baseconfig/CONFIG_SKY2_DEBUG
+++ b/configs/base-generic/CONFIG_SKY2_DEBUG
diff --git a/baseconfig/CONFIG_SLAB_FREELIST_HARDENED b/configs/base-generic/CONFIG_SLAB_FREELIST_HARDENED
index 52602d279..52602d279 100644
--- a/baseconfig/CONFIG_SLAB_FREELIST_HARDENED
+++ b/configs/base-generic/CONFIG_SLAB_FREELIST_HARDENED
diff --git a/baseconfig/CONFIG_SLAB_FREELIST_RANDOM b/configs/base-generic/CONFIG_SLAB_FREELIST_RANDOM
index 2ec53d02b..2ec53d02b 100644
--- a/baseconfig/CONFIG_SLAB_FREELIST_RANDOM
+++ b/configs/base-generic/CONFIG_SLAB_FREELIST_RANDOM
diff --git a/baseconfig/CONFIG_SLAB_MERGE_DEFAULT b/configs/base-generic/CONFIG_SLAB_MERGE_DEFAULT
index c092cff73..c092cff73 100644
--- a/baseconfig/CONFIG_SLAB_MERGE_DEFAULT
+++ b/configs/base-generic/CONFIG_SLAB_MERGE_DEFAULT
diff --git a/baseconfig/CONFIG_SLICOSS b/configs/base-generic/CONFIG_SLICOSS
index 08e6b170e..08e6b170e 100644
--- a/baseconfig/CONFIG_SLICOSS
+++ b/configs/base-generic/CONFIG_SLICOSS
diff --git a/baseconfig/CONFIG_SLIP b/configs/base-generic/CONFIG_SLIP
index 86e448e49..86e448e49 100644
--- a/baseconfig/CONFIG_SLIP
+++ b/configs/base-generic/CONFIG_SLIP
diff --git a/baseconfig/CONFIG_SLIP_COMPRESSED b/configs/base-generic/CONFIG_SLIP_COMPRESSED
index a67a13f74..a67a13f74 100644
--- a/baseconfig/CONFIG_SLIP_COMPRESSED
+++ b/configs/base-generic/CONFIG_SLIP_COMPRESSED
diff --git a/baseconfig/CONFIG_SLIP_MODE_SLIP6 b/configs/base-generic/CONFIG_SLIP_MODE_SLIP6
index 8ddc7389f..8ddc7389f 100644
--- a/baseconfig/CONFIG_SLIP_MODE_SLIP6
+++ b/configs/base-generic/CONFIG_SLIP_MODE_SLIP6
diff --git a/baseconfig/CONFIG_SLIP_SMART b/configs/base-generic/CONFIG_SLIP_SMART
index b6e3b7cba..b6e3b7cba 100644
--- a/baseconfig/CONFIG_SLIP_SMART
+++ b/configs/base-generic/CONFIG_SLIP_SMART
diff --git a/baseconfig/CONFIG_SLUB b/configs/base-generic/CONFIG_SLUB
index 05f729d8b..05f729d8b 100644
--- a/baseconfig/CONFIG_SLUB
+++ b/configs/base-generic/CONFIG_SLUB
diff --git a/baseconfig/CONFIG_SLUB_CPU_PARTIAL b/configs/base-generic/CONFIG_SLUB_CPU_PARTIAL
index bc41c67ab..bc41c67ab 100644
--- a/baseconfig/CONFIG_SLUB_CPU_PARTIAL
+++ b/configs/base-generic/CONFIG_SLUB_CPU_PARTIAL
diff --git a/baseconfig/CONFIG_SLUB_DEBUG_ON b/configs/base-generic/CONFIG_SLUB_DEBUG_ON
index ed8690f18..ed8690f18 100644
--- a/baseconfig/CONFIG_SLUB_DEBUG_ON
+++ b/configs/base-generic/CONFIG_SLUB_DEBUG_ON
diff --git a/baseconfig/CONFIG_SLUB_STATS b/configs/base-generic/CONFIG_SLUB_STATS
index 349cf0449..349cf0449 100644
--- a/baseconfig/CONFIG_SLUB_STATS
+++ b/configs/base-generic/CONFIG_SLUB_STATS
diff --git a/baseconfig/CONFIG_SMARTJOYPLUS_FF b/configs/base-generic/CONFIG_SMARTJOYPLUS_FF
index 626768d8c..626768d8c 100644
--- a/baseconfig/CONFIG_SMARTJOYPLUS_FF
+++ b/configs/base-generic/CONFIG_SMARTJOYPLUS_FF
diff --git a/baseconfig/CONFIG_SMC b/configs/base-generic/CONFIG_SMC
index 88600dc91..88600dc91 100644
--- a/baseconfig/CONFIG_SMC
+++ b/configs/base-generic/CONFIG_SMC
diff --git a/baseconfig/CONFIG_SMC_IRCC_FIR b/configs/base-generic/CONFIG_SMC_IRCC_FIR
index 2b996d8b9..2b996d8b9 100644
--- a/baseconfig/CONFIG_SMC_IRCC_FIR
+++ b/configs/base-generic/CONFIG_SMC_IRCC_FIR
diff --git a/baseconfig/CONFIG_SMP b/configs/base-generic/CONFIG_SMP
index 1cbf7ec07..1cbf7ec07 100644
--- a/baseconfig/CONFIG_SMP
+++ b/configs/base-generic/CONFIG_SMP
diff --git a/baseconfig/CONFIG_SMSC911X b/configs/base-generic/CONFIG_SMSC911X
index bc77c896a..bc77c896a 100644
--- a/baseconfig/CONFIG_SMSC911X
+++ b/configs/base-generic/CONFIG_SMSC911X
diff --git a/baseconfig/CONFIG_SMSC9420 b/configs/base-generic/CONFIG_SMSC9420
index 623705fdc..623705fdc 100644
--- a/baseconfig/CONFIG_SMSC9420
+++ b/configs/base-generic/CONFIG_SMSC9420
diff --git a/baseconfig/CONFIG_SMSC_PHY b/configs/base-generic/CONFIG_SMSC_PHY
index 12a6f39b1..12a6f39b1 100644
--- a/baseconfig/CONFIG_SMSC_PHY
+++ b/configs/base-generic/CONFIG_SMSC_PHY
diff --git a/baseconfig/CONFIG_SMSC_SCH311X_WDT b/configs/base-generic/CONFIG_SMSC_SCH311X_WDT
index 86a9a5ae1..86a9a5ae1 100644
--- a/baseconfig/CONFIG_SMSC_SCH311X_WDT
+++ b/configs/base-generic/CONFIG_SMSC_SCH311X_WDT
diff --git a/baseconfig/CONFIG_SMS_SDIO_DRV b/configs/base-generic/CONFIG_SMS_SDIO_DRV
index b8a22da9d..b8a22da9d 100644
--- a/baseconfig/CONFIG_SMS_SDIO_DRV
+++ b/configs/base-generic/CONFIG_SMS_SDIO_DRV
diff --git a/baseconfig/CONFIG_SMS_SIANO_DEBUGFS b/configs/base-generic/CONFIG_SMS_SIANO_DEBUGFS
index 9b39e3812..9b39e3812 100644
--- a/baseconfig/CONFIG_SMS_SIANO_DEBUGFS
+++ b/configs/base-generic/CONFIG_SMS_SIANO_DEBUGFS
diff --git a/baseconfig/CONFIG_SMS_SIANO_MDTV b/configs/base-generic/CONFIG_SMS_SIANO_MDTV
index f4ee868c5..f4ee868c5 100644
--- a/baseconfig/CONFIG_SMS_SIANO_MDTV
+++ b/configs/base-generic/CONFIG_SMS_SIANO_MDTV
diff --git a/baseconfig/CONFIG_SMS_SIANO_RC b/configs/base-generic/CONFIG_SMS_SIANO_RC
index 3f130303e..3f130303e 100644
--- a/baseconfig/CONFIG_SMS_SIANO_RC
+++ b/configs/base-generic/CONFIG_SMS_SIANO_RC
diff --git a/baseconfig/CONFIG_SMS_USB_DRV b/configs/base-generic/CONFIG_SMS_USB_DRV
index fac386b7b..fac386b7b 100644
--- a/baseconfig/CONFIG_SMS_USB_DRV
+++ b/configs/base-generic/CONFIG_SMS_USB_DRV
diff --git a/baseconfig/CONFIG_SM_FTL b/configs/base-generic/CONFIG_SM_FTL
index da9ab33b4..da9ab33b4 100644
--- a/baseconfig/CONFIG_SM_FTL
+++ b/configs/base-generic/CONFIG_SM_FTL
diff --git a/baseconfig/CONFIG_SND b/configs/base-generic/CONFIG_SND
index 1f2dde914..1f2dde914 100644
--- a/baseconfig/CONFIG_SND
+++ b/configs/base-generic/CONFIG_SND
diff --git a/baseconfig/CONFIG_SND_AC97_POWER_SAVE b/configs/base-generic/CONFIG_SND_AC97_POWER_SAVE
index e27f2df05..e27f2df05 100644
--- a/baseconfig/CONFIG_SND_AC97_POWER_SAVE
+++ b/configs/base-generic/CONFIG_SND_AC97_POWER_SAVE
diff --git a/baseconfig/CONFIG_SND_AC97_POWER_SAVE_DEFAULT b/configs/base-generic/CONFIG_SND_AC97_POWER_SAVE_DEFAULT
index 3f6595ff3..3f6595ff3 100644
--- a/baseconfig/CONFIG_SND_AC97_POWER_SAVE_DEFAULT
+++ b/configs/base-generic/CONFIG_SND_AC97_POWER_SAVE_DEFAULT
diff --git a/baseconfig/CONFIG_SND_AD1889 b/configs/base-generic/CONFIG_SND_AD1889
index 2f42a5584..2f42a5584 100644
--- a/baseconfig/CONFIG_SND_AD1889
+++ b/configs/base-generic/CONFIG_SND_AD1889
diff --git a/baseconfig/CONFIG_SND_ALI5451 b/configs/base-generic/CONFIG_SND_ALI5451
index c3983af8d..c3983af8d 100644
--- a/baseconfig/CONFIG_SND_ALI5451
+++ b/configs/base-generic/CONFIG_SND_ALI5451
diff --git a/baseconfig/CONFIG_SND_ALOOP b/configs/base-generic/CONFIG_SND_ALOOP
index 4204ca20e..4204ca20e 100644
--- a/baseconfig/CONFIG_SND_ALOOP
+++ b/configs/base-generic/CONFIG_SND_ALOOP
diff --git a/baseconfig/CONFIG_SND_ALS300 b/configs/base-generic/CONFIG_SND_ALS300
index 604c1f835..604c1f835 100644
--- a/baseconfig/CONFIG_SND_ALS300
+++ b/configs/base-generic/CONFIG_SND_ALS300
diff --git a/baseconfig/CONFIG_SND_ALS4000 b/configs/base-generic/CONFIG_SND_ALS4000
index 2baee1b69..2baee1b69 100644
--- a/baseconfig/CONFIG_SND_ALS4000
+++ b/configs/base-generic/CONFIG_SND_ALS4000
diff --git a/baseconfig/CONFIG_SND_ASIHPI b/configs/base-generic/CONFIG_SND_ASIHPI
index 2673743e5..2673743e5 100644
--- a/baseconfig/CONFIG_SND_ASIHPI
+++ b/configs/base-generic/CONFIG_SND_ASIHPI
diff --git a/baseconfig/CONFIG_SND_ATIIXP b/configs/base-generic/CONFIG_SND_ATIIXP
index db7c97d1a..db7c97d1a 100644
--- a/baseconfig/CONFIG_SND_ATIIXP
+++ b/configs/base-generic/CONFIG_SND_ATIIXP
diff --git a/baseconfig/CONFIG_SND_ATIIXP_MODEM b/configs/base-generic/CONFIG_SND_ATIIXP_MODEM
index 4e62b6124..4e62b6124 100644
--- a/baseconfig/CONFIG_SND_ATIIXP_MODEM
+++ b/configs/base-generic/CONFIG_SND_ATIIXP_MODEM
diff --git a/baseconfig/CONFIG_SND_ATMEL_SOC b/configs/base-generic/CONFIG_SND_ATMEL_SOC
index 46592b518..46592b518 100644
--- a/baseconfig/CONFIG_SND_ATMEL_SOC
+++ b/configs/base-generic/CONFIG_SND_ATMEL_SOC
diff --git a/baseconfig/CONFIG_SND_AU8810 b/configs/base-generic/CONFIG_SND_AU8810
index 4e69ea6ed..4e69ea6ed 100644
--- a/baseconfig/CONFIG_SND_AU8810
+++ b/configs/base-generic/CONFIG_SND_AU8810
diff --git a/baseconfig/CONFIG_SND_AU8820 b/configs/base-generic/CONFIG_SND_AU8820
index 90da278c7..90da278c7 100644
--- a/baseconfig/CONFIG_SND_AU8820
+++ b/configs/base-generic/CONFIG_SND_AU8820
diff --git a/baseconfig/CONFIG_SND_AU8830 b/configs/base-generic/CONFIG_SND_AU8830
index 3c65429c8..3c65429c8 100644
--- a/baseconfig/CONFIG_SND_AU8830
+++ b/configs/base-generic/CONFIG_SND_AU8830
diff --git a/baseconfig/CONFIG_SND_AUDIO_GRAPH_CARD b/configs/base-generic/CONFIG_SND_AUDIO_GRAPH_CARD
index 1a2c935d7..1a2c935d7 100644
--- a/baseconfig/CONFIG_SND_AUDIO_GRAPH_CARD
+++ b/configs/base-generic/CONFIG_SND_AUDIO_GRAPH_CARD
diff --git a/baseconfig/CONFIG_SND_AUDIO_GRAPH_SCU_CARD b/configs/base-generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
index 12d870d77..12d870d77 100644
--- a/baseconfig/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
+++ b/configs/base-generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD
diff --git a/baseconfig/CONFIG_SND_AW2 b/configs/base-generic/CONFIG_SND_AW2
index 0065d112f..0065d112f 100644
--- a/baseconfig/CONFIG_SND_AW2
+++ b/configs/base-generic/CONFIG_SND_AW2
diff --git a/baseconfig/CONFIG_SND_AZT3328 b/configs/base-generic/CONFIG_SND_AZT3328
index 9f3b9c47b..9f3b9c47b 100644
--- a/baseconfig/CONFIG_SND_AZT3328
+++ b/configs/base-generic/CONFIG_SND_AZT3328
diff --git a/baseconfig/CONFIG_SND_BCD2000 b/configs/base-generic/CONFIG_SND_BCD2000
index 0a60c490b..0a60c490b 100644
--- a/baseconfig/CONFIG_SND_BCD2000
+++ b/configs/base-generic/CONFIG_SND_BCD2000
diff --git a/baseconfig/CONFIG_SND_BEBOB b/configs/base-generic/CONFIG_SND_BEBOB
index ced32e5aa..ced32e5aa 100644
--- a/baseconfig/CONFIG_SND_BEBOB
+++ b/configs/base-generic/CONFIG_SND_BEBOB
diff --git a/baseconfig/CONFIG_SND_BT87X b/configs/base-generic/CONFIG_SND_BT87X
index 73d30d974..73d30d974 100644
--- a/baseconfig/CONFIG_SND_BT87X
+++ b/configs/base-generic/CONFIG_SND_BT87X
diff --git a/baseconfig/CONFIG_SND_BT87X_OVERCLOCK b/configs/base-generic/CONFIG_SND_BT87X_OVERCLOCK
index 6e09250a5..6e09250a5 100644
--- a/baseconfig/CONFIG_SND_BT87X_OVERCLOCK
+++ b/configs/base-generic/CONFIG_SND_BT87X_OVERCLOCK
diff --git a/baseconfig/CONFIG_SND_CA0106 b/configs/base-generic/CONFIG_SND_CA0106
index 3ada7ee17..3ada7ee17 100644
--- a/baseconfig/CONFIG_SND_CA0106
+++ b/configs/base-generic/CONFIG_SND_CA0106
diff --git a/baseconfig/CONFIG_SND_CMIPCI b/configs/base-generic/CONFIG_SND_CMIPCI
index 1d4d9f525..1d4d9f525 100644
--- a/baseconfig/CONFIG_SND_CMIPCI
+++ b/configs/base-generic/CONFIG_SND_CMIPCI
diff --git a/baseconfig/CONFIG_SND_COMPRESS_OFFLOAD b/configs/base-generic/CONFIG_SND_COMPRESS_OFFLOAD
index fd201e00e..fd201e00e 100644
--- a/baseconfig/CONFIG_SND_COMPRESS_OFFLOAD
+++ b/configs/base-generic/CONFIG_SND_COMPRESS_OFFLOAD
diff --git a/baseconfig/CONFIG_SND_CS4281 b/configs/base-generic/CONFIG_SND_CS4281
index e7087eeae..e7087eeae 100644
--- a/baseconfig/CONFIG_SND_CS4281
+++ b/configs/base-generic/CONFIG_SND_CS4281
diff --git a/baseconfig/CONFIG_SND_CS46XX b/configs/base-generic/CONFIG_SND_CS46XX
index c6b7bb077..c6b7bb077 100644
--- a/baseconfig/CONFIG_SND_CS46XX
+++ b/configs/base-generic/CONFIG_SND_CS46XX
diff --git a/baseconfig/CONFIG_SND_CS46XX_NEW_DSP b/configs/base-generic/CONFIG_SND_CS46XX_NEW_DSP
index 9eb9aec45..9eb9aec45 100644
--- a/baseconfig/CONFIG_SND_CS46XX_NEW_DSP
+++ b/configs/base-generic/CONFIG_SND_CS46XX_NEW_DSP
diff --git a/baseconfig/CONFIG_SND_CS5530 b/configs/base-generic/CONFIG_SND_CS5530
index 426e23090..426e23090 100644
--- a/baseconfig/CONFIG_SND_CS5530
+++ b/configs/base-generic/CONFIG_SND_CS5530
diff --git a/baseconfig/CONFIG_SND_CS5535AUDIO b/configs/base-generic/CONFIG_SND_CS5535AUDIO
index 1d1e62c16..1d1e62c16 100644
--- a/baseconfig/CONFIG_SND_CS5535AUDIO
+++ b/configs/base-generic/CONFIG_SND_CS5535AUDIO
diff --git a/baseconfig/CONFIG_SND_CTXFI b/configs/base-generic/CONFIG_SND_CTXFI
index 0ebc4ec64..0ebc4ec64 100644
--- a/baseconfig/CONFIG_SND_CTXFI
+++ b/configs/base-generic/CONFIG_SND_CTXFI
diff --git a/baseconfig/CONFIG_SND_DARLA20 b/configs/base-generic/CONFIG_SND_DARLA20
index 7efc8cec1..7efc8cec1 100644
--- a/baseconfig/CONFIG_SND_DARLA20
+++ b/configs/base-generic/CONFIG_SND_DARLA20
diff --git a/baseconfig/CONFIG_SND_DARLA24 b/configs/base-generic/CONFIG_SND_DARLA24
index e88e8486e..e88e8486e 100644
--- a/baseconfig/CONFIG_SND_DARLA24
+++ b/configs/base-generic/CONFIG_SND_DARLA24
diff --git a/baseconfig/CONFIG_SND_DEBUG b/configs/base-generic/CONFIG_SND_DEBUG
index 21d131de6..21d131de6 100644
--- a/baseconfig/CONFIG_SND_DEBUG
+++ b/configs/base-generic/CONFIG_SND_DEBUG
diff --git a/baseconfig/CONFIG_SND_DEBUG_VERBOSE b/configs/base-generic/CONFIG_SND_DEBUG_VERBOSE
index a98d8747d..a98d8747d 100644
--- a/baseconfig/CONFIG_SND_DEBUG_VERBOSE
+++ b/configs/base-generic/CONFIG_SND_DEBUG_VERBOSE
diff --git a/baseconfig/CONFIG_SND_DESIGNWARE_I2S b/configs/base-generic/CONFIG_SND_DESIGNWARE_I2S
index a34b50b32..a34b50b32 100644
--- a/baseconfig/CONFIG_SND_DESIGNWARE_I2S
+++ b/configs/base-generic/CONFIG_SND_DESIGNWARE_I2S
diff --git a/baseconfig/CONFIG_SND_DESIGNWARE_PCM b/configs/base-generic/CONFIG_SND_DESIGNWARE_PCM
index 8f93f9dce..8f93f9dce 100644
--- a/baseconfig/CONFIG_SND_DESIGNWARE_PCM
+++ b/configs/base-generic/CONFIG_SND_DESIGNWARE_PCM
diff --git a/baseconfig/CONFIG_SND_DICE b/configs/base-generic/CONFIG_SND_DICE
index 0e20de13b..0e20de13b 100644
--- a/baseconfig/CONFIG_SND_DICE
+++ b/configs/base-generic/CONFIG_SND_DICE
diff --git a/baseconfig/CONFIG_SND_DMAENGINE_PCM b/configs/base-generic/CONFIG_SND_DMAENGINE_PCM
index 3228eeba3..3228eeba3 100644
--- a/baseconfig/CONFIG_SND_DMAENGINE_PCM
+++ b/configs/base-generic/CONFIG_SND_DMAENGINE_PCM
diff --git a/baseconfig/CONFIG_SND_DRIVERS b/configs/base-generic/CONFIG_SND_DRIVERS
index 83723e9d4..83723e9d4 100644
--- a/baseconfig/CONFIG_SND_DRIVERS
+++ b/configs/base-generic/CONFIG_SND_DRIVERS
diff --git a/baseconfig/CONFIG_SND_DUMMY b/configs/base-generic/CONFIG_SND_DUMMY
index bb9405c17..bb9405c17 100644
--- a/baseconfig/CONFIG_SND_DUMMY
+++ b/configs/base-generic/CONFIG_SND_DUMMY
diff --git a/baseconfig/CONFIG_SND_DYNAMIC_MINORS b/configs/base-generic/CONFIG_SND_DYNAMIC_MINORS
index 57ebb1064..57ebb1064 100644
--- a/baseconfig/CONFIG_SND_DYNAMIC_MINORS
+++ b/configs/base-generic/CONFIG_SND_DYNAMIC_MINORS
diff --git a/baseconfig/CONFIG_SND_ECHO3G b/configs/base-generic/CONFIG_SND_ECHO3G
index fcd1ca4d3..fcd1ca4d3 100644
--- a/baseconfig/CONFIG_SND_ECHO3G
+++ b/configs/base-generic/CONFIG_SND_ECHO3G
diff --git a/baseconfig/CONFIG_SND_EDMA_SOC b/configs/base-generic/CONFIG_SND_EDMA_SOC
index ae54b98cd..ae54b98cd 100644
--- a/baseconfig/CONFIG_SND_EDMA_SOC
+++ b/configs/base-generic/CONFIG_SND_EDMA_SOC
diff --git a/baseconfig/CONFIG_SND_EMU10K1 b/configs/base-generic/CONFIG_SND_EMU10K1
index 06b6479c6..06b6479c6 100644
--- a/baseconfig/CONFIG_SND_EMU10K1
+++ b/configs/base-generic/CONFIG_SND_EMU10K1
diff --git a/baseconfig/CONFIG_SND_EMU10K1X b/configs/base-generic/CONFIG_SND_EMU10K1X
index 2f5eadbf4..2f5eadbf4 100644
--- a/baseconfig/CONFIG_SND_EMU10K1X
+++ b/configs/base-generic/CONFIG_SND_EMU10K1X
diff --git a/baseconfig/CONFIG_SND_ENS1370 b/configs/base-generic/CONFIG_SND_ENS1370
index a8a251f7e..a8a251f7e 100644
--- a/baseconfig/CONFIG_SND_ENS1370
+++ b/configs/base-generic/CONFIG_SND_ENS1370
diff --git a/baseconfig/CONFIG_SND_ENS1371 b/configs/base-generic/CONFIG_SND_ENS1371
index 5aa65b6cc..5aa65b6cc 100644
--- a/baseconfig/CONFIG_SND_ENS1371
+++ b/configs/base-generic/CONFIG_SND_ENS1371
diff --git a/baseconfig/CONFIG_SND_ES1938 b/configs/base-generic/CONFIG_SND_ES1938
index 60ce7b14c..60ce7b14c 100644
--- a/baseconfig/CONFIG_SND_ES1938
+++ b/configs/base-generic/CONFIG_SND_ES1938
diff --git a/baseconfig/CONFIG_SND_ES1968 b/configs/base-generic/CONFIG_SND_ES1968
index 75b2e9dd5..75b2e9dd5 100644
--- a/baseconfig/CONFIG_SND_ES1968
+++ b/configs/base-generic/CONFIG_SND_ES1968
diff --git a/baseconfig/CONFIG_SND_ES1968_INPUT b/configs/base-generic/CONFIG_SND_ES1968_INPUT
index e26bf4693..e26bf4693 100644
--- a/baseconfig/CONFIG_SND_ES1968_INPUT
+++ b/configs/base-generic/CONFIG_SND_ES1968_INPUT
diff --git a/baseconfig/CONFIG_SND_ES1968_RADIO b/configs/base-generic/CONFIG_SND_ES1968_RADIO
index eaddaaf5f..eaddaaf5f 100644
--- a/baseconfig/CONFIG_SND_ES1968_RADIO
+++ b/configs/base-generic/CONFIG_SND_ES1968_RADIO
diff --git a/baseconfig/CONFIG_SND_FIREFACE b/configs/base-generic/CONFIG_SND_FIREFACE
index 18782f689..18782f689 100644
--- a/baseconfig/CONFIG_SND_FIREFACE
+++ b/configs/base-generic/CONFIG_SND_FIREFACE
diff --git a/baseconfig/CONFIG_SND_FIREWIRE b/configs/base-generic/CONFIG_SND_FIREWIRE
index 6e0712765..6e0712765 100644
--- a/baseconfig/CONFIG_SND_FIREWIRE
+++ b/configs/base-generic/CONFIG_SND_FIREWIRE
diff --git a/baseconfig/CONFIG_SND_FIREWIRE_DIGI00X b/configs/base-generic/CONFIG_SND_FIREWIRE_DIGI00X
index 9646b0769..9646b0769 100644
--- a/baseconfig/CONFIG_SND_FIREWIRE_DIGI00X
+++ b/configs/base-generic/CONFIG_SND_FIREWIRE_DIGI00X
diff --git a/baseconfig/CONFIG_SND_FIREWIRE_MOTU b/configs/base-generic/CONFIG_SND_FIREWIRE_MOTU
index 73299e869..73299e869 100644
--- a/baseconfig/CONFIG_SND_FIREWIRE_MOTU
+++ b/configs/base-generic/CONFIG_SND_FIREWIRE_MOTU
diff --git a/baseconfig/CONFIG_SND_FIREWIRE_TASCAM b/configs/base-generic/CONFIG_SND_FIREWIRE_TASCAM
index 25037239e..25037239e 100644
--- a/baseconfig/CONFIG_SND_FIREWIRE_TASCAM
+++ b/configs/base-generic/CONFIG_SND_FIREWIRE_TASCAM
diff --git a/baseconfig/CONFIG_SND_FIREWORKS b/configs/base-generic/CONFIG_SND_FIREWORKS
index 944e248fd..944e248fd 100644
--- a/baseconfig/CONFIG_SND_FIREWORKS
+++ b/configs/base-generic/CONFIG_SND_FIREWORKS
diff --git a/baseconfig/CONFIG_SND_FM801 b/configs/base-generic/CONFIG_SND_FM801
index a38c3472c..a38c3472c 100644
--- a/baseconfig/CONFIG_SND_FM801
+++ b/configs/base-generic/CONFIG_SND_FM801
diff --git a/baseconfig/CONFIG_SND_FM801_TEA575X_BOOL b/configs/base-generic/CONFIG_SND_FM801_TEA575X_BOOL
index 2a8df96d5..2a8df96d5 100644
--- a/baseconfig/CONFIG_SND_FM801_TEA575X_BOOL
+++ b/configs/base-generic/CONFIG_SND_FM801_TEA575X_BOOL
diff --git a/baseconfig/CONFIG_SND_GINA20 b/configs/base-generic/CONFIG_SND_GINA20
index bb1bc2acd..bb1bc2acd 100644
--- a/baseconfig/CONFIG_SND_GINA20
+++ b/configs/base-generic/CONFIG_SND_GINA20
diff --git a/baseconfig/CONFIG_SND_GINA24 b/configs/base-generic/CONFIG_SND_GINA24
index f1ee95540..f1ee95540 100644
--- a/baseconfig/CONFIG_SND_GINA24
+++ b/configs/base-generic/CONFIG_SND_GINA24
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_ANALOG b/configs/base-generic/CONFIG_SND_HDA_CODEC_ANALOG
index 714b57024..714b57024 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_ANALOG
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_ANALOG
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CA0110 b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0110
index 6be18ed1e..6be18ed1e 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CA0110
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0110
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CA0132 b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0132
index a5d87c54d..a5d87c54d 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CA0132
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0132
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CA0132_DSP b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0132_DSP
index 3f68e572d..3f68e572d 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CA0132_DSP
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CA0132_DSP
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CIRRUS b/configs/base-generic/CONFIG_SND_HDA_CODEC_CIRRUS
index 916e6c74f..916e6c74f 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CIRRUS
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CIRRUS
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CMEDIA b/configs/base-generic/CONFIG_SND_HDA_CODEC_CMEDIA
index 3d16f1343..3d16f1343 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CMEDIA
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CMEDIA
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_CONEXANT b/configs/base-generic/CONFIG_SND_HDA_CODEC_CONEXANT
index d2900b005..d2900b005 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_CONEXANT
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_CONEXANT
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_HDMI b/configs/base-generic/CONFIG_SND_HDA_CODEC_HDMI
index d3bcbdf2a..d3bcbdf2a 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_HDMI
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_HDMI
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_REALTEK b/configs/base-generic/CONFIG_SND_HDA_CODEC_REALTEK
index 1fec68a16..1fec68a16 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_REALTEK
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_REALTEK
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_SI3054 b/configs/base-generic/CONFIG_SND_HDA_CODEC_SI3054
index c072d301b..c072d301b 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_SI3054
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_SI3054
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_SIGMATEL b/configs/base-generic/CONFIG_SND_HDA_CODEC_SIGMATEL
index c27b3f8ef..c27b3f8ef 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_SIGMATEL
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_SIGMATEL
diff --git a/baseconfig/CONFIG_SND_HDA_CODEC_VIA b/configs/base-generic/CONFIG_SND_HDA_CODEC_VIA
index 21c3d40d1..21c3d40d1 100644
--- a/baseconfig/CONFIG_SND_HDA_CODEC_VIA
+++ b/configs/base-generic/CONFIG_SND_HDA_CODEC_VIA
diff --git a/baseconfig/CONFIG_SND_HDA_GENERIC b/configs/base-generic/CONFIG_SND_HDA_GENERIC
index c498603ea..c498603ea 100644
--- a/baseconfig/CONFIG_SND_HDA_GENERIC
+++ b/configs/base-generic/CONFIG_SND_HDA_GENERIC
diff --git a/baseconfig/CONFIG_SND_HDA_HWDEP b/configs/base-generic/CONFIG_SND_HDA_HWDEP
index b72e40df4..b72e40df4 100644
--- a/baseconfig/CONFIG_SND_HDA_HWDEP
+++ b/configs/base-generic/CONFIG_SND_HDA_HWDEP
diff --git a/baseconfig/CONFIG_SND_HDA_I915 b/configs/base-generic/CONFIG_SND_HDA_I915
index 97c5a333d..97c5a333d 100644
--- a/baseconfig/CONFIG_SND_HDA_I915
+++ b/configs/base-generic/CONFIG_SND_HDA_I915
diff --git a/baseconfig/CONFIG_SND_HDA_INPUT_BEEP b/configs/base-generic/CONFIG_SND_HDA_INPUT_BEEP
index b782b4325..b782b4325 100644
--- a/baseconfig/CONFIG_SND_HDA_INPUT_BEEP
+++ b/configs/base-generic/CONFIG_SND_HDA_INPUT_BEEP
diff --git a/baseconfig/CONFIG_SND_HDA_INPUT_BEEP_MODE b/configs/base-generic/CONFIG_SND_HDA_INPUT_BEEP_MODE
index 2a94083eb..2a94083eb 100644
--- a/baseconfig/CONFIG_SND_HDA_INPUT_BEEP_MODE
+++ b/configs/base-generic/CONFIG_SND_HDA_INPUT_BEEP_MODE
diff --git a/baseconfig/CONFIG_SND_HDA_INTEL b/configs/base-generic/CONFIG_SND_HDA_INTEL
index dfe74ea98..dfe74ea98 100644
--- a/baseconfig/CONFIG_SND_HDA_INTEL
+++ b/configs/base-generic/CONFIG_SND_HDA_INTEL
diff --git a/baseconfig/CONFIG_SND_HDA_PATCH_LOADER b/configs/base-generic/CONFIG_SND_HDA_PATCH_LOADER
index bc00b08cf..bc00b08cf 100644
--- a/baseconfig/CONFIG_SND_HDA_PATCH_LOADER
+++ b/configs/base-generic/CONFIG_SND_HDA_PATCH_LOADER
diff --git a/baseconfig/CONFIG_SND_HDA_POWER_SAVE b/configs/base-generic/CONFIG_SND_HDA_POWER_SAVE
index 5dc31fe6e..5dc31fe6e 100644
--- a/baseconfig/CONFIG_SND_HDA_POWER_SAVE
+++ b/configs/base-generic/CONFIG_SND_HDA_POWER_SAVE
diff --git a/baseconfig/CONFIG_SND_HDA_POWER_SAVE_DEFAULT b/configs/base-generic/CONFIG_SND_HDA_POWER_SAVE_DEFAULT
index ba018972d..ba018972d 100644
--- a/baseconfig/CONFIG_SND_HDA_POWER_SAVE_DEFAULT
+++ b/configs/base-generic/CONFIG_SND_HDA_POWER_SAVE_DEFAULT
diff --git a/baseconfig/CONFIG_SND_HDA_PREALLOC_SIZE b/configs/base-generic/CONFIG_SND_HDA_PREALLOC_SIZE
index 41629f17a..41629f17a 100644
--- a/baseconfig/CONFIG_SND_HDA_PREALLOC_SIZE
+++ b/configs/base-generic/CONFIG_SND_HDA_PREALLOC_SIZE
diff --git a/baseconfig/CONFIG_SND_HDA_RECONFIG b/configs/base-generic/CONFIG_SND_HDA_RECONFIG
index c65d9baa4..c65d9baa4 100644
--- a/baseconfig/CONFIG_SND_HDA_RECONFIG
+++ b/configs/base-generic/CONFIG_SND_HDA_RECONFIG
diff --git a/baseconfig/CONFIG_SND_HDSP b/configs/base-generic/CONFIG_SND_HDSP
index b197a0d79..b197a0d79 100644
--- a/baseconfig/CONFIG_SND_HDSP
+++ b/configs/base-generic/CONFIG_SND_HDSP
diff --git a/baseconfig/CONFIG_SND_HDSPM b/configs/base-generic/CONFIG_SND_HDSPM
index 887b1c8bf..887b1c8bf 100644
--- a/baseconfig/CONFIG_SND_HDSPM
+++ b/configs/base-generic/CONFIG_SND_HDSPM
diff --git a/baseconfig/CONFIG_SND_HRTIMER b/configs/base-generic/CONFIG_SND_HRTIMER
index b026518da..b026518da 100644
--- a/baseconfig/CONFIG_SND_HRTIMER
+++ b/configs/base-generic/CONFIG_SND_HRTIMER
diff --git a/baseconfig/CONFIG_SND_I2S_HI6210_I2S b/configs/base-generic/CONFIG_SND_I2S_HI6210_I2S
index 9ae15dc8a..9ae15dc8a 100644
--- a/baseconfig/CONFIG_SND_I2S_HI6210_I2S
+++ b/configs/base-generic/CONFIG_SND_I2S_HI6210_I2S
diff --git a/baseconfig/CONFIG_SND_ICE1712 b/configs/base-generic/CONFIG_SND_ICE1712
index 062c90c83..062c90c83 100644
--- a/baseconfig/CONFIG_SND_ICE1712
+++ b/configs/base-generic/CONFIG_SND_ICE1712
diff --git a/baseconfig/CONFIG_SND_ICE1724 b/configs/base-generic/CONFIG_SND_ICE1724
index d1d24eeb2..d1d24eeb2 100644
--- a/baseconfig/CONFIG_SND_ICE1724
+++ b/configs/base-generic/CONFIG_SND_ICE1724
diff --git a/baseconfig/CONFIG_SND_INDIGO b/configs/base-generic/CONFIG_SND_INDIGO
index f53fefc61..f53fefc61 100644
--- a/baseconfig/CONFIG_SND_INDIGO
+++ b/configs/base-generic/CONFIG_SND_INDIGO
diff --git a/baseconfig/CONFIG_SND_INDIGODJ b/configs/base-generic/CONFIG_SND_INDIGODJ
index 46dafaedc..46dafaedc 100644
--- a/baseconfig/CONFIG_SND_INDIGODJ
+++ b/configs/base-generic/CONFIG_SND_INDIGODJ
diff --git a/baseconfig/CONFIG_SND_INDIGODJX b/configs/base-generic/CONFIG_SND_INDIGODJX
index 65afec014..65afec014 100644
--- a/baseconfig/CONFIG_SND_INDIGODJX
+++ b/configs/base-generic/CONFIG_SND_INDIGODJX
diff --git a/baseconfig/CONFIG_SND_INDIGOIO b/configs/base-generic/CONFIG_SND_INDIGOIO
index 4742d3f7a..4742d3f7a 100644
--- a/baseconfig/CONFIG_SND_INDIGOIO
+++ b/configs/base-generic/CONFIG_SND_INDIGOIO
diff --git a/baseconfig/CONFIG_SND_INDIGOIOX b/configs/base-generic/CONFIG_SND_INDIGOIOX
index abcedc78d..abcedc78d 100644
--- a/baseconfig/CONFIG_SND_INDIGOIOX
+++ b/configs/base-generic/CONFIG_SND_INDIGOIOX
diff --git a/baseconfig/CONFIG_SND_INTEL8X0 b/configs/base-generic/CONFIG_SND_INTEL8X0
index d97191a98..d97191a98 100644
--- a/baseconfig/CONFIG_SND_INTEL8X0
+++ b/configs/base-generic/CONFIG_SND_INTEL8X0
diff --git a/baseconfig/CONFIG_SND_INTEL8X0M b/configs/base-generic/CONFIG_SND_INTEL8X0M
index 4e04bb51c..4e04bb51c 100644
--- a/baseconfig/CONFIG_SND_INTEL8X0M
+++ b/configs/base-generic/CONFIG_SND_INTEL8X0M
diff --git a/baseconfig/CONFIG_SND_ISIGHT b/configs/base-generic/CONFIG_SND_ISIGHT
index 84a792b91..84a792b91 100644
--- a/baseconfig/CONFIG_SND_ISIGHT
+++ b/configs/base-generic/CONFIG_SND_ISIGHT
diff --git a/baseconfig/CONFIG_SND_JACK b/configs/base-generic/CONFIG_SND_JACK
index 31e71a548..31e71a548 100644
--- a/baseconfig/CONFIG_SND_JACK
+++ b/configs/base-generic/CONFIG_SND_JACK
diff --git a/baseconfig/CONFIG_SND_KORG1212 b/configs/base-generic/CONFIG_SND_KORG1212
index 8c708e058..8c708e058 100644
--- a/baseconfig/CONFIG_SND_KORG1212
+++ b/configs/base-generic/CONFIG_SND_KORG1212
diff --git a/baseconfig/CONFIG_SND_LAYLA20 b/configs/base-generic/CONFIG_SND_LAYLA20
index 1eec1f97d..1eec1f97d 100644
--- a/baseconfig/CONFIG_SND_LAYLA20
+++ b/configs/base-generic/CONFIG_SND_LAYLA20
diff --git a/baseconfig/CONFIG_SND_LAYLA24 b/configs/base-generic/CONFIG_SND_LAYLA24
index 6c3498570..6c3498570 100644
--- a/baseconfig/CONFIG_SND_LAYLA24
+++ b/configs/base-generic/CONFIG_SND_LAYLA24
diff --git a/baseconfig/CONFIG_SND_LOLA b/configs/base-generic/CONFIG_SND_LOLA
index 8b876c306..8b876c306 100644
--- a/baseconfig/CONFIG_SND_LOLA
+++ b/configs/base-generic/CONFIG_SND_LOLA
diff --git a/baseconfig/CONFIG_SND_LX6464ES b/configs/base-generic/CONFIG_SND_LX6464ES
index a7a336931..a7a336931 100644
--- a/baseconfig/CONFIG_SND_LX6464ES
+++ b/configs/base-generic/CONFIG_SND_LX6464ES
diff --git a/baseconfig/CONFIG_SND_MAESTRO3 b/configs/base-generic/CONFIG_SND_MAESTRO3
index 0a0e7fb33..0a0e7fb33 100644
--- a/baseconfig/CONFIG_SND_MAESTRO3
+++ b/configs/base-generic/CONFIG_SND_MAESTRO3
diff --git a/baseconfig/CONFIG_SND_MAESTRO3_INPUT b/configs/base-generic/CONFIG_SND_MAESTRO3_INPUT
index e3728e74c..e3728e74c 100644
--- a/baseconfig/CONFIG_SND_MAESTRO3_INPUT
+++ b/configs/base-generic/CONFIG_SND_MAESTRO3_INPUT
diff --git a/baseconfig/CONFIG_SND_MAX_CARDS b/configs/base-generic/CONFIG_SND_MAX_CARDS
index e11151f8b..e11151f8b 100644
--- a/baseconfig/CONFIG_SND_MAX_CARDS
+++ b/configs/base-generic/CONFIG_SND_MAX_CARDS
diff --git a/baseconfig/CONFIG_SND_MIA b/configs/base-generic/CONFIG_SND_MIA
index d24f6ede5..d24f6ede5 100644
--- a/baseconfig/CONFIG_SND_MIA
+++ b/configs/base-generic/CONFIG_SND_MIA
diff --git a/baseconfig/CONFIG_SND_MIXART b/configs/base-generic/CONFIG_SND_MIXART
index 26e619ef9..26e619ef9 100644
--- a/baseconfig/CONFIG_SND_MIXART
+++ b/configs/base-generic/CONFIG_SND_MIXART
diff --git a/baseconfig/CONFIG_SND_MIXER_OSS b/configs/base-generic/CONFIG_SND_MIXER_OSS
index b60389505..b60389505 100644
--- a/baseconfig/CONFIG_SND_MIXER_OSS
+++ b/configs/base-generic/CONFIG_SND_MIXER_OSS
diff --git a/baseconfig/CONFIG_SND_MONA b/configs/base-generic/CONFIG_SND_MONA
index e18d2cec5..e18d2cec5 100644
--- a/baseconfig/CONFIG_SND_MONA
+++ b/configs/base-generic/CONFIG_SND_MONA
diff --git a/baseconfig/CONFIG_SND_MPU401 b/configs/base-generic/CONFIG_SND_MPU401
index 3f3bae52a..3f3bae52a 100644
--- a/baseconfig/CONFIG_SND_MPU401
+++ b/configs/base-generic/CONFIG_SND_MPU401
diff --git a/baseconfig/CONFIG_SND_MTPAV b/configs/base-generic/CONFIG_SND_MTPAV
index a681e7542..a681e7542 100644
--- a/baseconfig/CONFIG_SND_MTPAV
+++ b/configs/base-generic/CONFIG_SND_MTPAV
diff --git a/baseconfig/CONFIG_SND_MTS64 b/configs/base-generic/CONFIG_SND_MTS64
index 3587053af..3587053af 100644
--- a/baseconfig/CONFIG_SND_MTS64
+++ b/configs/base-generic/CONFIG_SND_MTS64
diff --git a/baseconfig/CONFIG_SND_NM256 b/configs/base-generic/CONFIG_SND_NM256
index 9d3d5669c..9d3d5669c 100644
--- a/baseconfig/CONFIG_SND_NM256
+++ b/configs/base-generic/CONFIG_SND_NM256
diff --git a/baseconfig/CONFIG_SND_OSSEMUL b/configs/base-generic/CONFIG_SND_OSSEMUL
index ce1feff49..ce1feff49 100644
--- a/baseconfig/CONFIG_SND_OSSEMUL
+++ b/configs/base-generic/CONFIG_SND_OSSEMUL
diff --git a/baseconfig/CONFIG_SND_OXFW b/configs/base-generic/CONFIG_SND_OXFW
index 5f91a4072..5f91a4072 100644
--- a/baseconfig/CONFIG_SND_OXFW
+++ b/configs/base-generic/CONFIG_SND_OXFW
diff --git a/baseconfig/CONFIG_SND_OXYGEN b/configs/base-generic/CONFIG_SND_OXYGEN
index 45b26c1da..45b26c1da 100644
--- a/baseconfig/CONFIG_SND_OXYGEN
+++ b/configs/base-generic/CONFIG_SND_OXYGEN
diff --git a/baseconfig/CONFIG_SND_PCI b/configs/base-generic/CONFIG_SND_PCI
index 667778acc..667778acc 100644
--- a/baseconfig/CONFIG_SND_PCI
+++ b/configs/base-generic/CONFIG_SND_PCI
diff --git a/baseconfig/CONFIG_SND_PCMCIA b/configs/base-generic/CONFIG_SND_PCMCIA
index 549f74dbf..549f74dbf 100644
--- a/baseconfig/CONFIG_SND_PCMCIA
+++ b/configs/base-generic/CONFIG_SND_PCMCIA
diff --git a/baseconfig/CONFIG_SND_PCM_OSS b/configs/base-generic/CONFIG_SND_PCM_OSS
index 05b2f2308..05b2f2308 100644
--- a/baseconfig/CONFIG_SND_PCM_OSS
+++ b/configs/base-generic/CONFIG_SND_PCM_OSS
diff --git a/baseconfig/CONFIG_SND_PCM_OSS_PLUGINS b/configs/base-generic/CONFIG_SND_PCM_OSS_PLUGINS
index b6ff47c21..b6ff47c21 100644
--- a/baseconfig/CONFIG_SND_PCM_OSS_PLUGINS
+++ b/configs/base-generic/CONFIG_SND_PCM_OSS_PLUGINS
diff --git a/baseconfig/CONFIG_SND_PCSP b/configs/base-generic/CONFIG_SND_PCSP
index 271f411cc..271f411cc 100644
--- a/baseconfig/CONFIG_SND_PCSP
+++ b/configs/base-generic/CONFIG_SND_PCSP
diff --git a/baseconfig/CONFIG_SND_PCXHR b/configs/base-generic/CONFIG_SND_PCXHR
index 599b41920..599b41920 100644
--- a/baseconfig/CONFIG_SND_PCXHR
+++ b/configs/base-generic/CONFIG_SND_PCXHR
diff --git a/baseconfig/CONFIG_SND_PORTMAN2X4 b/configs/base-generic/CONFIG_SND_PORTMAN2X4
index 76607fff5..76607fff5 100644
--- a/baseconfig/CONFIG_SND_PORTMAN2X4
+++ b/configs/base-generic/CONFIG_SND_PORTMAN2X4
diff --git a/baseconfig/CONFIG_SND_RIPTIDE b/configs/base-generic/CONFIG_SND_RIPTIDE
index baa82b28b..baa82b28b 100644
--- a/baseconfig/CONFIG_SND_RIPTIDE
+++ b/configs/base-generic/CONFIG_SND_RIPTIDE
diff --git a/baseconfig/CONFIG_SND_RME32 b/configs/base-generic/CONFIG_SND_RME32
index d374f646b..d374f646b 100644
--- a/baseconfig/CONFIG_SND_RME32
+++ b/configs/base-generic/CONFIG_SND_RME32
diff --git a/baseconfig/CONFIG_SND_RME96 b/configs/base-generic/CONFIG_SND_RME96
index af9fdcd21..af9fdcd21 100644
--- a/baseconfig/CONFIG_SND_RME96
+++ b/configs/base-generic/CONFIG_SND_RME96
diff --git a/baseconfig/CONFIG_SND_RME9652 b/configs/base-generic/CONFIG_SND_RME9652
index 407b3e4ae..407b3e4ae 100644
--- a/baseconfig/CONFIG_SND_RME9652
+++ b/configs/base-generic/CONFIG_SND_RME9652
diff --git a/baseconfig/CONFIG_SND_SEQUENCER b/configs/base-generic/CONFIG_SND_SEQUENCER
index 8d3c68c44..8d3c68c44 100644
--- a/baseconfig/CONFIG_SND_SEQUENCER
+++ b/configs/base-generic/CONFIG_SND_SEQUENCER
diff --git a/baseconfig/CONFIG_SND_SEQUENCER_OSS b/configs/base-generic/CONFIG_SND_SEQUENCER_OSS
index 439bdb368..439bdb368 100644
--- a/baseconfig/CONFIG_SND_SEQUENCER_OSS
+++ b/configs/base-generic/CONFIG_SND_SEQUENCER_OSS
diff --git a/baseconfig/CONFIG_SND_SEQ_DUMMY b/configs/base-generic/CONFIG_SND_SEQ_DUMMY
index c50085964..c50085964 100644
--- a/baseconfig/CONFIG_SND_SEQ_DUMMY
+++ b/configs/base-generic/CONFIG_SND_SEQ_DUMMY
diff --git a/baseconfig/CONFIG_SND_SEQ_HRTIMER_DEFAULT b/configs/base-generic/CONFIG_SND_SEQ_HRTIMER_DEFAULT
index 037df8940..037df8940 100644
--- a/baseconfig/CONFIG_SND_SEQ_HRTIMER_DEFAULT
+++ b/configs/base-generic/CONFIG_SND_SEQ_HRTIMER_DEFAULT
diff --git a/baseconfig/CONFIG_SND_SERIAL_U16550 b/configs/base-generic/CONFIG_SND_SERIAL_U16550
index 8cc5ff8ae..8cc5ff8ae 100644
--- a/baseconfig/CONFIG_SND_SERIAL_U16550
+++ b/configs/base-generic/CONFIG_SND_SERIAL_U16550
diff --git a/baseconfig/CONFIG_SND_SIMPLE_CARD b/configs/base-generic/CONFIG_SND_SIMPLE_CARD
index 79d7ff4b1..79d7ff4b1 100644
--- a/baseconfig/CONFIG_SND_SIMPLE_CARD
+++ b/configs/base-generic/CONFIG_SND_SIMPLE_CARD
diff --git a/baseconfig/CONFIG_SND_SIMPLE_CARD_UTILS b/configs/base-generic/CONFIG_SND_SIMPLE_CARD_UTILS
index 9d19715c0..9d19715c0 100644
--- a/baseconfig/CONFIG_SND_SIMPLE_CARD_UTILS
+++ b/configs/base-generic/CONFIG_SND_SIMPLE_CARD_UTILS
diff --git a/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD b/configs/base-generic/CONFIG_SND_SIMPLE_SCU_CARD
index e50c18374..e50c18374 100644
--- a/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD
+++ b/configs/base-generic/CONFIG_SND_SIMPLE_SCU_CARD
diff --git a/baseconfig/CONFIG_SND_SIS7019 b/configs/base-generic/CONFIG_SND_SIS7019
index 7b1abdc1d..7b1abdc1d 100644
--- a/baseconfig/CONFIG_SND_SIS7019
+++ b/configs/base-generic/CONFIG_SND_SIS7019
diff --git a/baseconfig/CONFIG_SND_SOC b/configs/base-generic/CONFIG_SND_SOC
index c4dd032ce..c4dd032ce 100644
--- a/baseconfig/CONFIG_SND_SOC
+++ b/configs/base-generic/CONFIG_SND_SOC
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU1701 b/configs/base-generic/CONFIG_SND_SOC_ADAU1701
index 001bd241b..001bd241b 100644
--- a/baseconfig/CONFIG_SND_SOC_ADAU1701
+++ b/configs/base-generic/CONFIG_SND_SOC_ADAU1701
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU1761_I2C b/configs/base-generic/CONFIG_SND_SOC_ADAU1761_I2C
index 54124be46..54124be46 100644
--- a/baseconfig/CONFIG_SND_SOC_ADAU1761_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_ADAU1761_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU1761_SPI b/configs/base-generic/CONFIG_SND_SOC_ADAU1761_SPI
index fce8309a6..fce8309a6 100644
--- a/baseconfig/CONFIG_SND_SOC_ADAU1761_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_ADAU1761_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_ADAU7002 b/configs/base-generic/CONFIG_SND_SOC_ADAU7002
index a426395be..a426395be 100644
--- a/baseconfig/CONFIG_SND_SOC_ADAU7002
+++ b/configs/base-generic/CONFIG_SND_SOC_ADAU7002
diff --git a/baseconfig/CONFIG_SND_SOC_AK4104 b/configs/base-generic/CONFIG_SND_SOC_AK4104
index 969ed247c..969ed247c 100644
--- a/baseconfig/CONFIG_SND_SOC_AK4104
+++ b/configs/base-generic/CONFIG_SND_SOC_AK4104
diff --git a/baseconfig/CONFIG_SND_SOC_AK4554 b/configs/base-generic/CONFIG_SND_SOC_AK4554
index 29f694259..29f694259 100644
--- a/baseconfig/CONFIG_SND_SOC_AK4554
+++ b/configs/base-generic/CONFIG_SND_SOC_AK4554
diff --git a/baseconfig/CONFIG_SND_SOC_AK4613 b/configs/base-generic/CONFIG_SND_SOC_AK4613
index 79bd23443..79bd23443 100644
--- a/baseconfig/CONFIG_SND_SOC_AK4613
+++ b/configs/base-generic/CONFIG_SND_SOC_AK4613
diff --git a/baseconfig/CONFIG_SND_SOC_AK4642 b/configs/base-generic/CONFIG_SND_SOC_AK4642
index 1f327b35f..1f327b35f 100644
--- a/baseconfig/CONFIG_SND_SOC_AK4642
+++ b/configs/base-generic/CONFIG_SND_SOC_AK4642
diff --git a/baseconfig/CONFIG_SND_SOC_AK5386 b/configs/base-generic/CONFIG_SND_SOC_AK5386
index 68c70438c..68c70438c 100644
--- a/baseconfig/CONFIG_SND_SOC_AK5386
+++ b/configs/base-generic/CONFIG_SND_SOC_AK5386
diff --git a/baseconfig/CONFIG_SND_SOC_ALC5623 b/configs/base-generic/CONFIG_SND_SOC_ALC5623
index 2df8ca415..2df8ca415 100644
--- a/baseconfig/CONFIG_SND_SOC_ALC5623
+++ b/configs/base-generic/CONFIG_SND_SOC_ALC5623
diff --git a/baseconfig/CONFIG_SND_SOC_ALL_CODECS b/configs/base-generic/CONFIG_SND_SOC_ALL_CODECS
index 7b0df01c8..7b0df01c8 100644
--- a/baseconfig/CONFIG_SND_SOC_ALL_CODECS
+++ b/configs/base-generic/CONFIG_SND_SOC_ALL_CODECS
diff --git a/baseconfig/CONFIG_SND_SOC_AMD_ACP b/configs/base-generic/CONFIG_SND_SOC_AMD_ACP
index 34ad4a762..34ad4a762 100644
--- a/baseconfig/CONFIG_SND_SOC_AMD_ACP
+++ b/configs/base-generic/CONFIG_SND_SOC_AMD_ACP
diff --git a/baseconfig/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 b/configs/base-generic/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
index b4777839c..b4777839c 100644
--- a/baseconfig/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
+++ b/configs/base-generic/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
diff --git a/baseconfig/CONFIG_SND_SOC_BT_SCO b/configs/base-generic/CONFIG_SND_SOC_BT_SCO
index 3c015783c..3c015783c 100644
--- a/baseconfig/CONFIG_SND_SOC_BT_SCO
+++ b/configs/base-generic/CONFIG_SND_SOC_BT_SCO
diff --git a/baseconfig/CONFIG_SND_SOC_CS35L32 b/configs/base-generic/CONFIG_SND_SOC_CS35L32
index 51b44a14b..51b44a14b 100644
--- a/baseconfig/CONFIG_SND_SOC_CS35L32
+++ b/configs/base-generic/CONFIG_SND_SOC_CS35L32
diff --git a/baseconfig/CONFIG_SND_SOC_CS35L33 b/configs/base-generic/CONFIG_SND_SOC_CS35L33
index 4843a98fb..4843a98fb 100644
--- a/baseconfig/CONFIG_SND_SOC_CS35L33
+++ b/configs/base-generic/CONFIG_SND_SOC_CS35L33
diff --git a/baseconfig/CONFIG_SND_SOC_CS35L34 b/configs/base-generic/CONFIG_SND_SOC_CS35L34
index 79a29924f..79a29924f 100644
--- a/baseconfig/CONFIG_SND_SOC_CS35L34
+++ b/configs/base-generic/CONFIG_SND_SOC_CS35L34
diff --git a/baseconfig/CONFIG_SND_SOC_CS35L35 b/configs/base-generic/CONFIG_SND_SOC_CS35L35
index 3969b2fee..3969b2fee 100644
--- a/baseconfig/CONFIG_SND_SOC_CS35L35
+++ b/configs/base-generic/CONFIG_SND_SOC_CS35L35
diff --git a/baseconfig/CONFIG_SND_SOC_CS4265 b/configs/base-generic/CONFIG_SND_SOC_CS4265
index ef04e477d..ef04e477d 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4265
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4265
diff --git a/baseconfig/CONFIG_SND_SOC_CS4270 b/configs/base-generic/CONFIG_SND_SOC_CS4270
index fdd2c7ddc..fdd2c7ddc 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4270
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4270
diff --git a/baseconfig/CONFIG_SND_SOC_CS4271 b/configs/base-generic/CONFIG_SND_SOC_CS4271
index 2db9b8b00..2db9b8b00 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4271
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4271
diff --git a/baseconfig/CONFIG_SND_SOC_CS4271_I2C b/configs/base-generic/CONFIG_SND_SOC_CS4271_I2C
index 957a6e5e2..957a6e5e2 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4271_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4271_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_CS4271_SPI b/configs/base-generic/CONFIG_SND_SOC_CS4271_SPI
index b6cf0959e..b6cf0959e 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4271_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4271_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_CS42L42 b/configs/base-generic/CONFIG_SND_SOC_CS42L42
index ae7598e6c..ae7598e6c 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42L42
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42L42
diff --git a/baseconfig/CONFIG_SND_SOC_CS42L51_I2C b/configs/base-generic/CONFIG_SND_SOC_CS42L51_I2C
index d1fada0fa..d1fada0fa 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42L51_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42L51_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_CS42L52 b/configs/base-generic/CONFIG_SND_SOC_CS42L52
index 0586658c9..0586658c9 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42L52
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42L52
diff --git a/baseconfig/CONFIG_SND_SOC_CS42L56 b/configs/base-generic/CONFIG_SND_SOC_CS42L56
index 80493f87d..80493f87d 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42L56
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42L56
diff --git a/baseconfig/CONFIG_SND_SOC_CS42L73 b/configs/base-generic/CONFIG_SND_SOC_CS42L73
index 42232536d..42232536d 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42L73
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42L73
diff --git a/baseconfig/CONFIG_SND_SOC_CS42XX8_I2C b/configs/base-generic/CONFIG_SND_SOC_CS42XX8_I2C
index 25759007b..25759007b 100644
--- a/baseconfig/CONFIG_SND_SOC_CS42XX8_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_CS42XX8_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_CS43130 b/configs/base-generic/CONFIG_SND_SOC_CS43130
index 3fad16f6d..3fad16f6d 100644
--- a/baseconfig/CONFIG_SND_SOC_CS43130
+++ b/configs/base-generic/CONFIG_SND_SOC_CS43130
diff --git a/baseconfig/CONFIG_SND_SOC_CS4349 b/configs/base-generic/CONFIG_SND_SOC_CS4349
index efff8b12d..efff8b12d 100644
--- a/baseconfig/CONFIG_SND_SOC_CS4349
+++ b/configs/base-generic/CONFIG_SND_SOC_CS4349
diff --git a/baseconfig/CONFIG_SND_SOC_CS53L30 b/configs/base-generic/CONFIG_SND_SOC_CS53L30
index 220148ec5..220148ec5 100644
--- a/baseconfig/CONFIG_SND_SOC_CS53L30
+++ b/configs/base-generic/CONFIG_SND_SOC_CS53L30
diff --git a/baseconfig/CONFIG_SND_SOC_DIO2125 b/configs/base-generic/CONFIG_SND_SOC_DIO2125
index d3121e77e..d3121e77e 100644
--- a/baseconfig/CONFIG_SND_SOC_DIO2125
+++ b/configs/base-generic/CONFIG_SND_SOC_DIO2125
diff --git a/baseconfig/CONFIG_SND_SOC_DMIC b/configs/base-generic/CONFIG_SND_SOC_DMIC
index 6b12176ba..6b12176ba 100644
--- a/baseconfig/CONFIG_SND_SOC_DMIC
+++ b/configs/base-generic/CONFIG_SND_SOC_DMIC
diff --git a/baseconfig/CONFIG_SND_SOC_ES7134 b/configs/base-generic/CONFIG_SND_SOC_ES7134
index ff087adce..ff087adce 100644
--- a/baseconfig/CONFIG_SND_SOC_ES7134
+++ b/configs/base-generic/CONFIG_SND_SOC_ES7134
diff --git a/baseconfig/CONFIG_SND_SOC_ES8316 b/configs/base-generic/CONFIG_SND_SOC_ES8316
index c9fcabfea..c9fcabfea 100644
--- a/baseconfig/CONFIG_SND_SOC_ES8316
+++ b/configs/base-generic/CONFIG_SND_SOC_ES8316
diff --git a/baseconfig/CONFIG_SND_SOC_ES8328 b/configs/base-generic/CONFIG_SND_SOC_ES8328
index 96f563b3d..96f563b3d 100644
--- a/baseconfig/CONFIG_SND_SOC_ES8328
+++ b/configs/base-generic/CONFIG_SND_SOC_ES8328
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_ASOC_CARD b/configs/base-generic/CONFIG_SND_SOC_FSL_ASOC_CARD
index 769c532b0..769c532b0 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_ASOC_CARD
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_ASOC_CARD
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_ASRC b/configs/base-generic/CONFIG_SND_SOC_FSL_ASRC
index 530366201..530366201 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_ASRC
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_ASRC
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_ESAI b/configs/base-generic/CONFIG_SND_SOC_FSL_ESAI
index 04c9ad249..04c9ad249 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_ESAI
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_ESAI
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_SAI b/configs/base-generic/CONFIG_SND_SOC_FSL_SAI
index 5096a137a..5096a137a 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_SAI
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_SAI
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_SPDIF b/configs/base-generic/CONFIG_SND_SOC_FSL_SPDIF
index 80e8a3eae..80e8a3eae 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_SPDIF
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_SPDIF
diff --git a/baseconfig/CONFIG_SND_SOC_FSL_SSI b/configs/base-generic/CONFIG_SND_SOC_FSL_SSI
index 31798b9f5..31798b9f5 100644
--- a/baseconfig/CONFIG_SND_SOC_FSL_SSI
+++ b/configs/base-generic/CONFIG_SND_SOC_FSL_SSI
diff --git a/baseconfig/CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM b/configs/base-generic/CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM
index 4dc73d40d..4dc73d40d 100644
--- a/baseconfig/CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM
+++ b/configs/base-generic/CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/baseconfig/CONFIG_SND_SOC_GTM601 b/configs/base-generic/CONFIG_SND_SOC_GTM601
index 1d8270ebe..1d8270ebe 100644
--- a/baseconfig/CONFIG_SND_SOC_GTM601
+++ b/configs/base-generic/CONFIG_SND_SOC_GTM601
diff --git a/baseconfig/CONFIG_SND_SOC_HDAC_HDMI b/configs/base-generic/CONFIG_SND_SOC_HDAC_HDMI
index dfefcf887..dfefcf887 100644
--- a/baseconfig/CONFIG_SND_SOC_HDAC_HDMI
+++ b/configs/base-generic/CONFIG_SND_SOC_HDAC_HDMI
diff --git a/baseconfig/CONFIG_SND_SOC_HDMI_CODEC b/configs/base-generic/CONFIG_SND_SOC_HDMI_CODEC
index 8b198f3fa..8b198f3fa 100644
--- a/baseconfig/CONFIG_SND_SOC_HDMI_CODEC
+++ b/configs/base-generic/CONFIG_SND_SOC_HDMI_CODEC
diff --git a/baseconfig/CONFIG_SND_SOC_IMG b/configs/base-generic/CONFIG_SND_SOC_IMG
index b711ee0d5..b711ee0d5 100644
--- a/baseconfig/CONFIG_SND_SOC_IMG
+++ b/configs/base-generic/CONFIG_SND_SOC_IMG
diff --git a/baseconfig/CONFIG_SND_SOC_IMX_AUDMUX b/configs/base-generic/CONFIG_SND_SOC_IMX_AUDMUX
index 57522da64..57522da64 100644
--- a/baseconfig/CONFIG_SND_SOC_IMX_AUDMUX
+++ b/configs/base-generic/CONFIG_SND_SOC_IMX_AUDMUX
diff --git a/baseconfig/CONFIG_SND_SOC_IMX_ES8328 b/configs/base-generic/CONFIG_SND_SOC_IMX_ES8328
index fe43d57a4..fe43d57a4 100644
--- a/baseconfig/CONFIG_SND_SOC_IMX_ES8328
+++ b/configs/base-generic/CONFIG_SND_SOC_IMX_ES8328
diff --git a/baseconfig/CONFIG_SND_SOC_INNO_RK3036 b/configs/base-generic/CONFIG_SND_SOC_INNO_RK3036
index 66860330a..66860330a 100644
--- a/baseconfig/CONFIG_SND_SOC_INNO_RK3036
+++ b/configs/base-generic/CONFIG_SND_SOC_INNO_RK3036
diff --git a/baseconfig/CONFIG_SND_SOC_MAX98504 b/configs/base-generic/CONFIG_SND_SOC_MAX98504
index 0cfacaf03..0cfacaf03 100644
--- a/baseconfig/CONFIG_SND_SOC_MAX98504
+++ b/configs/base-generic/CONFIG_SND_SOC_MAX98504
diff --git a/baseconfig/CONFIG_SND_SOC_MAX9860 b/configs/base-generic/CONFIG_SND_SOC_MAX9860
index 769195ad2..769195ad2 100644
--- a/baseconfig/CONFIG_SND_SOC_MAX9860
+++ b/configs/base-generic/CONFIG_SND_SOC_MAX9860
diff --git a/baseconfig/CONFIG_SND_SOC_MAX98927 b/configs/base-generic/CONFIG_SND_SOC_MAX98927
index 341a74d43..341a74d43 100644
--- a/baseconfig/CONFIG_SND_SOC_MAX98927
+++ b/configs/base-generic/CONFIG_SND_SOC_MAX98927
diff --git a/baseconfig/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/configs/base-generic/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index 620531081..620531081 100644
--- a/baseconfig/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/configs/base-generic/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
diff --git a/baseconfig/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/configs/base-generic/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
index 995b64d3d..995b64d3d 100644
--- a/baseconfig/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
+++ b/configs/base-generic/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
diff --git a/baseconfig/CONFIG_SND_SOC_NAU8540 b/configs/base-generic/CONFIG_SND_SOC_NAU8540
index 43355fa74..43355fa74 100644
--- a/baseconfig/CONFIG_SND_SOC_NAU8540
+++ b/configs/base-generic/CONFIG_SND_SOC_NAU8540
diff --git a/baseconfig/CONFIG_SND_SOC_NAU8810 b/configs/base-generic/CONFIG_SND_SOC_NAU8810
index 51b710a4c..51b710a4c 100644
--- a/baseconfig/CONFIG_SND_SOC_NAU8810
+++ b/configs/base-generic/CONFIG_SND_SOC_NAU8810
diff --git a/baseconfig/CONFIG_SND_SOC_NAU8824 b/configs/base-generic/CONFIG_SND_SOC_NAU8824
index 3551419c6..3551419c6 100644
--- a/baseconfig/CONFIG_SND_SOC_NAU8824
+++ b/configs/base-generic/CONFIG_SND_SOC_NAU8824
diff --git a/baseconfig/CONFIG_SND_SOC_PCM1681 b/configs/base-generic/CONFIG_SND_SOC_PCM1681
index 334e9fb18..334e9fb18 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM1681
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM1681
diff --git a/baseconfig/CONFIG_SND_SOC_PCM179X b/configs/base-generic/CONFIG_SND_SOC_PCM179X
index 6c0d2afc0..6c0d2afc0 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM179X
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM179X
diff --git a/baseconfig/CONFIG_SND_SOC_PCM179X_I2C b/configs/base-generic/CONFIG_SND_SOC_PCM179X_I2C
index 70359c19a..70359c19a 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM179X_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM179X_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_PCM179X_SPI b/configs/base-generic/CONFIG_SND_SOC_PCM179X_SPI
index 0778cf9b5..0778cf9b5 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM179X_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM179X_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_PCM3168A_I2C b/configs/base-generic/CONFIG_SND_SOC_PCM3168A_I2C
index 4ef7072cc..4ef7072cc 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM3168A_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM3168A_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_PCM3168A_SPI b/configs/base-generic/CONFIG_SND_SOC_PCM3168A_SPI
index aa17b6dd3..aa17b6dd3 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM3168A_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM3168A_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_PCM512x_I2C b/configs/base-generic/CONFIG_SND_SOC_PCM512x_I2C
index 4482311b2..4482311b2 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM512x_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM512x_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_PCM512x_SPI b/configs/base-generic/CONFIG_SND_SOC_PCM512x_SPI
index c2bc285c4..c2bc285c4 100644
--- a/baseconfig/CONFIG_SND_SOC_PCM512x_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_PCM512x_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_RT5616 b/configs/base-generic/CONFIG_SND_SOC_RT5616
index 2d9bf82d2..2d9bf82d2 100644
--- a/baseconfig/CONFIG_SND_SOC_RT5616
+++ b/configs/base-generic/CONFIG_SND_SOC_RT5616
diff --git a/baseconfig/CONFIG_SND_SOC_RT5631 b/configs/base-generic/CONFIG_SND_SOC_RT5631
index 235104dd6..235104dd6 100644
--- a/baseconfig/CONFIG_SND_SOC_RT5631
+++ b/configs/base-generic/CONFIG_SND_SOC_RT5631
diff --git a/baseconfig/CONFIG_SND_SOC_SGTL5000 b/configs/base-generic/CONFIG_SND_SOC_SGTL5000
index d9d63078a..d9d63078a 100644
--- a/baseconfig/CONFIG_SND_SOC_SGTL5000
+++ b/configs/base-generic/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/CONFIG_SND_SOC_SIRF_AUDIO_CODEC b/configs/base-generic/CONFIG_SND_SOC_SIRF_AUDIO_CODEC
index a9e4b9b19..a9e4b9b19 100644
--- a/baseconfig/CONFIG_SND_SOC_SIRF_AUDIO_CODEC
+++ b/configs/base-generic/CONFIG_SND_SOC_SIRF_AUDIO_CODEC
diff --git a/baseconfig/CONFIG_SND_SOC_SPDIF b/configs/base-generic/CONFIG_SND_SOC_SPDIF
index 8cfb4310d..8cfb4310d 100644
--- a/baseconfig/CONFIG_SND_SOC_SPDIF
+++ b/configs/base-generic/CONFIG_SND_SOC_SPDIF
diff --git a/baseconfig/CONFIG_SND_SOC_SSM2602_I2C b/configs/base-generic/CONFIG_SND_SOC_SSM2602_I2C
index 67441741a..67441741a 100644
--- a/baseconfig/CONFIG_SND_SOC_SSM2602_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_SSM2602_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_SSM2602_SPI b/configs/base-generic/CONFIG_SND_SOC_SSM2602_SPI
index ddcc10c2d..ddcc10c2d 100644
--- a/baseconfig/CONFIG_SND_SOC_SSM2602_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_SSM2602_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_SSM4567 b/configs/base-generic/CONFIG_SND_SOC_SSM4567
index e3e9e606a..e3e9e606a 100644
--- a/baseconfig/CONFIG_SND_SOC_SSM4567
+++ b/configs/base-generic/CONFIG_SND_SOC_SSM4567
diff --git a/baseconfig/CONFIG_SND_SOC_STA32X b/configs/base-generic/CONFIG_SND_SOC_STA32X
index b346102fb..b346102fb 100644
--- a/baseconfig/CONFIG_SND_SOC_STA32X
+++ b/configs/base-generic/CONFIG_SND_SOC_STA32X
diff --git a/baseconfig/CONFIG_SND_SOC_STA350 b/configs/base-generic/CONFIG_SND_SOC_STA350
index f4295f2a6..f4295f2a6 100644
--- a/baseconfig/CONFIG_SND_SOC_STA350
+++ b/configs/base-generic/CONFIG_SND_SOC_STA350
diff --git a/baseconfig/CONFIG_SND_SOC_STI_SAS b/configs/base-generic/CONFIG_SND_SOC_STI_SAS
index 9a28cf9f5..9a28cf9f5 100644
--- a/baseconfig/CONFIG_SND_SOC_STI_SAS
+++ b/configs/base-generic/CONFIG_SND_SOC_STI_SAS
diff --git a/baseconfig/CONFIG_SND_SOC_TAS2552 b/configs/base-generic/CONFIG_SND_SOC_TAS2552
index 3db316562..3db316562 100644
--- a/baseconfig/CONFIG_SND_SOC_TAS2552
+++ b/configs/base-generic/CONFIG_SND_SOC_TAS2552
diff --git a/baseconfig/CONFIG_SND_SOC_TAS5086 b/configs/base-generic/CONFIG_SND_SOC_TAS5086
index 6527125bc..6527125bc 100644
--- a/baseconfig/CONFIG_SND_SOC_TAS5086
+++ b/configs/base-generic/CONFIG_SND_SOC_TAS5086
diff --git a/baseconfig/CONFIG_SND_SOC_TAS571X b/configs/base-generic/CONFIG_SND_SOC_TAS571X
index 5a0960c0f..5a0960c0f 100644
--- a/baseconfig/CONFIG_SND_SOC_TAS571X
+++ b/configs/base-generic/CONFIG_SND_SOC_TAS571X
diff --git a/baseconfig/CONFIG_SND_SOC_TAS5720 b/configs/base-generic/CONFIG_SND_SOC_TAS5720
index 5490fed30..5490fed30 100644
--- a/baseconfig/CONFIG_SND_SOC_TAS5720
+++ b/configs/base-generic/CONFIG_SND_SOC_TAS5720
diff --git a/baseconfig/CONFIG_SND_SOC_TFA9879 b/configs/base-generic/CONFIG_SND_SOC_TFA9879
index 1b9db2a07..1b9db2a07 100644
--- a/baseconfig/CONFIG_SND_SOC_TFA9879
+++ b/configs/base-generic/CONFIG_SND_SOC_TFA9879
diff --git a/baseconfig/CONFIG_SND_SOC_TLV320AIC23_I2C b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC23_I2C
index be1c97f36..be1c97f36 100644
--- a/baseconfig/CONFIG_SND_SOC_TLV320AIC23_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC23_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_TLV320AIC23_SPI b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC23_SPI
index b4f9b1d90..b4f9b1d90 100644
--- a/baseconfig/CONFIG_SND_SOC_TLV320AIC23_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC23_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_TLV320AIC31XX b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC31XX
index a8668cd43..a8668cd43 100644
--- a/baseconfig/CONFIG_SND_SOC_TLV320AIC31XX
+++ b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC31XX
diff --git a/baseconfig/CONFIG_SND_SOC_TLV320AIC3X b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC3X
index bc9c730b5..bc9c730b5 100644
--- a/baseconfig/CONFIG_SND_SOC_TLV320AIC3X
+++ b/configs/base-generic/CONFIG_SND_SOC_TLV320AIC3X
diff --git a/baseconfig/CONFIG_SND_SOC_TPA6130A2 b/configs/base-generic/CONFIG_SND_SOC_TPA6130A2
index eacee918e..eacee918e 100644
--- a/baseconfig/CONFIG_SND_SOC_TPA6130A2
+++ b/configs/base-generic/CONFIG_SND_SOC_TPA6130A2
diff --git a/baseconfig/CONFIG_SND_SOC_TS3A227E b/configs/base-generic/CONFIG_SND_SOC_TS3A227E
index 39a606863..39a606863 100644
--- a/baseconfig/CONFIG_SND_SOC_TS3A227E
+++ b/configs/base-generic/CONFIG_SND_SOC_TS3A227E
diff --git a/baseconfig/CONFIG_SND_SOC_WM8510 b/configs/base-generic/CONFIG_SND_SOC_WM8510
index 5b5309c21..5b5309c21 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8510
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8510
diff --git a/baseconfig/CONFIG_SND_SOC_WM8523 b/configs/base-generic/CONFIG_SND_SOC_WM8523
index c7cc3665b..c7cc3665b 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8523
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8523
diff --git a/baseconfig/CONFIG_SND_SOC_WM8524 b/configs/base-generic/CONFIG_SND_SOC_WM8524
index 1eb33d7e5..1eb33d7e5 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8524
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8524
diff --git a/baseconfig/CONFIG_SND_SOC_WM8580 b/configs/base-generic/CONFIG_SND_SOC_WM8580
index 60d965bff..60d965bff 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8580
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8580
diff --git a/baseconfig/CONFIG_SND_SOC_WM8711 b/configs/base-generic/CONFIG_SND_SOC_WM8711
index 9a3d2136e..9a3d2136e 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8711
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8711
diff --git a/baseconfig/CONFIG_SND_SOC_WM8728 b/configs/base-generic/CONFIG_SND_SOC_WM8728
index 611be365d..611be365d 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8728
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8728
diff --git a/baseconfig/CONFIG_SND_SOC_WM8731 b/configs/base-generic/CONFIG_SND_SOC_WM8731
index 7a8092175..7a8092175 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8731
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8731
diff --git a/baseconfig/CONFIG_SND_SOC_WM8737 b/configs/base-generic/CONFIG_SND_SOC_WM8737
index 506ffb96b..506ffb96b 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8737
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8737
diff --git a/baseconfig/CONFIG_SND_SOC_WM8741 b/configs/base-generic/CONFIG_SND_SOC_WM8741
index 7e04e24a8..7e04e24a8 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8741
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8741
diff --git a/baseconfig/CONFIG_SND_SOC_WM8750 b/configs/base-generic/CONFIG_SND_SOC_WM8750
index 458d505f9..458d505f9 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8750
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8750
diff --git a/baseconfig/CONFIG_SND_SOC_WM8753 b/configs/base-generic/CONFIG_SND_SOC_WM8753
index 7ece4bdfb..7ece4bdfb 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8753
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8753
diff --git a/baseconfig/CONFIG_SND_SOC_WM8770 b/configs/base-generic/CONFIG_SND_SOC_WM8770
index f446bfabb..f446bfabb 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8770
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8770
diff --git a/baseconfig/CONFIG_SND_SOC_WM8776 b/configs/base-generic/CONFIG_SND_SOC_WM8776
index 1f4047e4f..1f4047e4f 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8776
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8776
diff --git a/baseconfig/CONFIG_SND_SOC_WM8804 b/configs/base-generic/CONFIG_SND_SOC_WM8804
index 074702b5e..074702b5e 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8804
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8804
diff --git a/baseconfig/CONFIG_SND_SOC_WM8804_I2C b/configs/base-generic/CONFIG_SND_SOC_WM8804_I2C
index 7a71c6a97..7a71c6a97 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8804_I2C
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8804_I2C
diff --git a/baseconfig/CONFIG_SND_SOC_WM8804_SPI b/configs/base-generic/CONFIG_SND_SOC_WM8804_SPI
index 2e6d1ee42..2e6d1ee42 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8804_SPI
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8804_SPI
diff --git a/baseconfig/CONFIG_SND_SOC_WM8903 b/configs/base-generic/CONFIG_SND_SOC_WM8903
index 1ded9e042..1ded9e042 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8903
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8903
diff --git a/baseconfig/CONFIG_SND_SOC_WM8960 b/configs/base-generic/CONFIG_SND_SOC_WM8960
index 2e90afbd6..2e90afbd6 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8960
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8960
diff --git a/baseconfig/CONFIG_SND_SOC_WM8962 b/configs/base-generic/CONFIG_SND_SOC_WM8962
index cd2c48e6e..cd2c48e6e 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8962
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8962
diff --git a/baseconfig/CONFIG_SND_SOC_WM8974 b/configs/base-generic/CONFIG_SND_SOC_WM8974
index 74e72b3f2..74e72b3f2 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8974
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8974
diff --git a/baseconfig/CONFIG_SND_SOC_WM8978 b/configs/base-generic/CONFIG_SND_SOC_WM8978
index 3f02f841e..3f02f841e 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8978
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8978
diff --git a/baseconfig/CONFIG_SND_SOC_WM8985 b/configs/base-generic/CONFIG_SND_SOC_WM8985
index 7d11c4548..7d11c4548 100644
--- a/baseconfig/CONFIG_SND_SOC_WM8985
+++ b/configs/base-generic/CONFIG_SND_SOC_WM8985
diff --git a/baseconfig/CONFIG_SND_SOC_XTFPGA_I2S b/configs/base-generic/CONFIG_SND_SOC_XTFPGA_I2S
index 0d2021836..0d2021836 100644
--- a/baseconfig/CONFIG_SND_SOC_XTFPGA_I2S
+++ b/configs/base-generic/CONFIG_SND_SOC_XTFPGA_I2S
diff --git a/baseconfig/CONFIG_SND_SOC_ZX_AUD96P22 b/configs/base-generic/CONFIG_SND_SOC_ZX_AUD96P22
index 487603ce8..487603ce8 100644
--- a/baseconfig/CONFIG_SND_SOC_ZX_AUD96P22
+++ b/configs/base-generic/CONFIG_SND_SOC_ZX_AUD96P22
diff --git a/baseconfig/CONFIG_SND_SONICVIBES b/configs/base-generic/CONFIG_SND_SONICVIBES
index d58e27404..d58e27404 100644
--- a/baseconfig/CONFIG_SND_SONICVIBES
+++ b/configs/base-generic/CONFIG_SND_SONICVIBES
diff --git a/baseconfig/CONFIG_SND_SPI b/configs/base-generic/CONFIG_SND_SPI
index f5ad2b1e9..f5ad2b1e9 100644
--- a/baseconfig/CONFIG_SND_SPI
+++ b/configs/base-generic/CONFIG_SND_SPI
diff --git a/baseconfig/CONFIG_SND_SUPPORT_OLD_API b/configs/base-generic/CONFIG_SND_SUPPORT_OLD_API
index 20c4b60d4..20c4b60d4 100644
--- a/baseconfig/CONFIG_SND_SUPPORT_OLD_API
+++ b/configs/base-generic/CONFIG_SND_SUPPORT_OLD_API
diff --git a/baseconfig/CONFIG_SND_TRIDENT b/configs/base-generic/CONFIG_SND_TRIDENT
index d04ec8cc4..d04ec8cc4 100644
--- a/baseconfig/CONFIG_SND_TRIDENT
+++ b/configs/base-generic/CONFIG_SND_TRIDENT
diff --git a/baseconfig/CONFIG_SND_USB b/configs/base-generic/CONFIG_SND_USB
index fb681b173..fb681b173 100644
--- a/baseconfig/CONFIG_SND_USB
+++ b/configs/base-generic/CONFIG_SND_USB
diff --git a/baseconfig/CONFIG_SND_USB_6FIRE b/configs/base-generic/CONFIG_SND_USB_6FIRE
index 92e1bb7e9..92e1bb7e9 100644
--- a/baseconfig/CONFIG_SND_USB_6FIRE
+++ b/configs/base-generic/CONFIG_SND_USB_6FIRE
diff --git a/baseconfig/CONFIG_SND_USB_AUDIO b/configs/base-generic/CONFIG_SND_USB_AUDIO
index d45330bf1..d45330bf1 100644
--- a/baseconfig/CONFIG_SND_USB_AUDIO
+++ b/configs/base-generic/CONFIG_SND_USB_AUDIO
diff --git a/baseconfig/CONFIG_SND_USB_CAIAQ b/configs/base-generic/CONFIG_SND_USB_CAIAQ
index 69dabb922..69dabb922 100644
--- a/baseconfig/CONFIG_SND_USB_CAIAQ
+++ b/configs/base-generic/CONFIG_SND_USB_CAIAQ
diff --git a/baseconfig/CONFIG_SND_USB_CAIAQ_INPUT b/configs/base-generic/CONFIG_SND_USB_CAIAQ_INPUT
index 825b7033d..825b7033d 100644
--- a/baseconfig/CONFIG_SND_USB_CAIAQ_INPUT
+++ b/configs/base-generic/CONFIG_SND_USB_CAIAQ_INPUT
diff --git a/baseconfig/CONFIG_SND_USB_HIFACE b/configs/base-generic/CONFIG_SND_USB_HIFACE
index 818dea140..818dea140 100644
--- a/baseconfig/CONFIG_SND_USB_HIFACE
+++ b/configs/base-generic/CONFIG_SND_USB_HIFACE
diff --git a/baseconfig/CONFIG_SND_USB_POD b/configs/base-generic/CONFIG_SND_USB_POD
index a7ff3df2e..a7ff3df2e 100644
--- a/baseconfig/CONFIG_SND_USB_POD
+++ b/configs/base-generic/CONFIG_SND_USB_POD
diff --git a/baseconfig/CONFIG_SND_USB_PODHD b/configs/base-generic/CONFIG_SND_USB_PODHD
index 1be9c1ddd..1be9c1ddd 100644
--- a/baseconfig/CONFIG_SND_USB_PODHD
+++ b/configs/base-generic/CONFIG_SND_USB_PODHD
diff --git a/baseconfig/CONFIG_SND_USB_TONEPORT b/configs/base-generic/CONFIG_SND_USB_TONEPORT
index 605617dc4..605617dc4 100644
--- a/baseconfig/CONFIG_SND_USB_TONEPORT
+++ b/configs/base-generic/CONFIG_SND_USB_TONEPORT
diff --git a/baseconfig/CONFIG_SND_USB_UA101 b/configs/base-generic/CONFIG_SND_USB_UA101
index 0513a4b56..0513a4b56 100644
--- a/baseconfig/CONFIG_SND_USB_UA101
+++ b/configs/base-generic/CONFIG_SND_USB_UA101
diff --git a/baseconfig/CONFIG_SND_USB_US122L b/configs/base-generic/CONFIG_SND_USB_US122L
index 52e0d18c4..52e0d18c4 100644
--- a/baseconfig/CONFIG_SND_USB_US122L
+++ b/configs/base-generic/CONFIG_SND_USB_US122L
diff --git a/baseconfig/CONFIG_SND_USB_USX2Y b/configs/base-generic/CONFIG_SND_USB_USX2Y
index 6015b75a9..6015b75a9 100644
--- a/baseconfig/CONFIG_SND_USB_USX2Y
+++ b/configs/base-generic/CONFIG_SND_USB_USX2Y
diff --git a/baseconfig/CONFIG_SND_USB_VARIAX b/configs/base-generic/CONFIG_SND_USB_VARIAX
index 3b05afb27..3b05afb27 100644
--- a/baseconfig/CONFIG_SND_USB_VARIAX
+++ b/configs/base-generic/CONFIG_SND_USB_VARIAX
diff --git a/baseconfig/CONFIG_SND_VERBOSE_PRINTK b/configs/base-generic/CONFIG_SND_VERBOSE_PRINTK
index b119c633d..b119c633d 100644
--- a/baseconfig/CONFIG_SND_VERBOSE_PRINTK
+++ b/configs/base-generic/CONFIG_SND_VERBOSE_PRINTK
diff --git a/baseconfig/CONFIG_SND_VERBOSE_PROCFS b/configs/base-generic/CONFIG_SND_VERBOSE_PROCFS
index 4ae50d741..4ae50d741 100644
--- a/baseconfig/CONFIG_SND_VERBOSE_PROCFS
+++ b/configs/base-generic/CONFIG_SND_VERBOSE_PROCFS
diff --git a/baseconfig/CONFIG_SND_VIA82XX b/configs/base-generic/CONFIG_SND_VIA82XX
index 2c2673578..2c2673578 100644
--- a/baseconfig/CONFIG_SND_VIA82XX
+++ b/configs/base-generic/CONFIG_SND_VIA82XX
diff --git a/baseconfig/CONFIG_SND_VIA82XX_MODEM b/configs/base-generic/CONFIG_SND_VIA82XX_MODEM
index 53055c694..53055c694 100644
--- a/baseconfig/CONFIG_SND_VIA82XX_MODEM
+++ b/configs/base-generic/CONFIG_SND_VIA82XX_MODEM
diff --git a/baseconfig/CONFIG_SND_VIRMIDI b/configs/base-generic/CONFIG_SND_VIRMIDI
index d3ef40f4a..d3ef40f4a 100644
--- a/baseconfig/CONFIG_SND_VIRMIDI
+++ b/configs/base-generic/CONFIG_SND_VIRMIDI
diff --git a/baseconfig/CONFIG_SND_VIRTUOSO b/configs/base-generic/CONFIG_SND_VIRTUOSO
index 19b6bce5b..19b6bce5b 100644
--- a/baseconfig/CONFIG_SND_VIRTUOSO
+++ b/configs/base-generic/CONFIG_SND_VIRTUOSO
diff --git a/baseconfig/CONFIG_SND_VX222 b/configs/base-generic/CONFIG_SND_VX222
index 136e37828..136e37828 100644
--- a/baseconfig/CONFIG_SND_VX222
+++ b/configs/base-generic/CONFIG_SND_VX222
diff --git a/baseconfig/CONFIG_SND_YMFPCI b/configs/base-generic/CONFIG_SND_YMFPCI
index 2588fb582..2588fb582 100644
--- a/baseconfig/CONFIG_SND_YMFPCI
+++ b/configs/base-generic/CONFIG_SND_YMFPCI
diff --git a/baseconfig/CONFIG_SOC_CAMERA b/configs/base-generic/CONFIG_SOC_CAMERA
index e4623ae1a..e4623ae1a 100644
--- a/baseconfig/CONFIG_SOC_CAMERA
+++ b/configs/base-generic/CONFIG_SOC_CAMERA
diff --git a/baseconfig/CONFIG_SOC_TI b/configs/base-generic/CONFIG_SOC_TI
index 88248080d..88248080d 100644
--- a/baseconfig/CONFIG_SOC_TI
+++ b/configs/base-generic/CONFIG_SOC_TI
diff --git a/baseconfig/CONFIG_SOC_ZTE b/configs/base-generic/CONFIG_SOC_ZTE
index 95a233e40..95a233e40 100644
--- a/baseconfig/CONFIG_SOC_ZTE
+++ b/configs/base-generic/CONFIG_SOC_ZTE
diff --git a/baseconfig/CONFIG_SOFTLOCKUP_DETECTOR b/configs/base-generic/CONFIG_SOFTLOCKUP_DETECTOR
index 1ff04a43b..1ff04a43b 100644
--- a/baseconfig/CONFIG_SOFTLOCKUP_DETECTOR
+++ b/configs/base-generic/CONFIG_SOFTLOCKUP_DETECTOR
diff --git a/baseconfig/CONFIG_SOFT_WATCHDOG b/configs/base-generic/CONFIG_SOFT_WATCHDOG
index 0e0d36a48..0e0d36a48 100644
--- a/baseconfig/CONFIG_SOFT_WATCHDOG
+++ b/configs/base-generic/CONFIG_SOFT_WATCHDOG
diff --git a/baseconfig/CONFIG_SOLARIS_X86_PARTITION b/configs/base-generic/CONFIG_SOLARIS_X86_PARTITION
index deb79e27e..deb79e27e 100644
--- a/baseconfig/CONFIG_SOLARIS_X86_PARTITION
+++ b/configs/base-generic/CONFIG_SOLARIS_X86_PARTITION
diff --git a/baseconfig/CONFIG_SOLO6X10 b/configs/base-generic/CONFIG_SOLO6X10
index b745a6041..b745a6041 100644
--- a/baseconfig/CONFIG_SOLO6X10
+++ b/configs/base-generic/CONFIG_SOLO6X10
diff --git a/baseconfig/CONFIG_SONYPI b/configs/base-generic/CONFIG_SONYPI
index 8516cd651..8516cd651 100644
--- a/baseconfig/CONFIG_SONYPI
+++ b/configs/base-generic/CONFIG_SONYPI
diff --git a/baseconfig/CONFIG_SONY_FF b/configs/base-generic/CONFIG_SONY_FF
index f3a327bba..f3a327bba 100644
--- a/baseconfig/CONFIG_SONY_FF
+++ b/configs/base-generic/CONFIG_SONY_FF
diff --git a/baseconfig/CONFIG_SOUND b/configs/base-generic/CONFIG_SOUND
index b62f24440..b62f24440 100644
--- a/baseconfig/CONFIG_SOUND
+++ b/configs/base-generic/CONFIG_SOUND
diff --git a/baseconfig/CONFIG_SOUND_OSS_CORE_PRECLAIM b/configs/base-generic/CONFIG_SOUND_OSS_CORE_PRECLAIM
index 90d307c4b..90d307c4b 100644
--- a/baseconfig/CONFIG_SOUND_OSS_CORE_PRECLAIM
+++ b/configs/base-generic/CONFIG_SOUND_OSS_CORE_PRECLAIM
diff --git a/baseconfig/CONFIG_SOUND_PRIME b/configs/base-generic/CONFIG_SOUND_PRIME
index 7a8a0ab6b..7a8a0ab6b 100644
--- a/baseconfig/CONFIG_SOUND_PRIME
+++ b/configs/base-generic/CONFIG_SOUND_PRIME
diff --git a/baseconfig/CONFIG_SPARSE_RCU_POINTER b/configs/base-generic/CONFIG_SPARSE_RCU_POINTER
index 7ef47693e..7ef47693e 100644
--- a/baseconfig/CONFIG_SPARSE_RCU_POINTER
+++ b/configs/base-generic/CONFIG_SPARSE_RCU_POINTER
diff --git a/baseconfig/CONFIG_SPEAKUP b/configs/base-generic/CONFIG_SPEAKUP
index 0f084bb71..0f084bb71 100644
--- a/baseconfig/CONFIG_SPEAKUP
+++ b/configs/base-generic/CONFIG_SPEAKUP
diff --git a/baseconfig/CONFIG_SPI b/configs/base-generic/CONFIG_SPI
index 7ef70c9b4..7ef70c9b4 100644
--- a/baseconfig/CONFIG_SPI
+++ b/configs/base-generic/CONFIG_SPI
diff --git a/baseconfig/CONFIG_SPI_ALTERA b/configs/base-generic/CONFIG_SPI_ALTERA
index 2f6b419d6..2f6b419d6 100644
--- a/baseconfig/CONFIG_SPI_ALTERA
+++ b/configs/base-generic/CONFIG_SPI_ALTERA
diff --git a/baseconfig/CONFIG_SPI_AXI_SPI_ENGINE b/configs/base-generic/CONFIG_SPI_AXI_SPI_ENGINE
index 2f54b92cd..2f54b92cd 100644
--- a/baseconfig/CONFIG_SPI_AXI_SPI_ENGINE
+++ b/configs/base-generic/CONFIG_SPI_AXI_SPI_ENGINE
diff --git a/baseconfig/CONFIG_SPI_BITBANG b/configs/base-generic/CONFIG_SPI_BITBANG
index 07bad2e56..07bad2e56 100644
--- a/baseconfig/CONFIG_SPI_BITBANG
+++ b/configs/base-generic/CONFIG_SPI_BITBANG
diff --git a/baseconfig/CONFIG_SPI_BUTTERFLY b/configs/base-generic/CONFIG_SPI_BUTTERFLY
index 958604c8f..958604c8f 100644
--- a/baseconfig/CONFIG_SPI_BUTTERFLY
+++ b/configs/base-generic/CONFIG_SPI_BUTTERFLY
diff --git a/baseconfig/CONFIG_SPI_DEBUG b/configs/base-generic/CONFIG_SPI_DEBUG
index eb5fcb37b..eb5fcb37b 100644
--- a/baseconfig/CONFIG_SPI_DEBUG
+++ b/configs/base-generic/CONFIG_SPI_DEBUG
diff --git a/baseconfig/CONFIG_SPI_DESIGNWARE b/configs/base-generic/CONFIG_SPI_DESIGNWARE
index de58a1341..de58a1341 100644
--- a/baseconfig/CONFIG_SPI_DESIGNWARE
+++ b/configs/base-generic/CONFIG_SPI_DESIGNWARE
diff --git a/baseconfig/CONFIG_SPI_FSL_LPSPI b/configs/base-generic/CONFIG_SPI_FSL_LPSPI
index 347930b05..347930b05 100644
--- a/baseconfig/CONFIG_SPI_FSL_LPSPI
+++ b/configs/base-generic/CONFIG_SPI_FSL_LPSPI
diff --git a/baseconfig/CONFIG_SPI_FSL_SPI b/configs/base-generic/CONFIG_SPI_FSL_SPI
index aa09f7541..aa09f7541 100644
--- a/baseconfig/CONFIG_SPI_FSL_SPI
+++ b/configs/base-generic/CONFIG_SPI_FSL_SPI
diff --git a/baseconfig/CONFIG_SPI_GPIO b/configs/base-generic/CONFIG_SPI_GPIO
index ebdaac3fe..ebdaac3fe 100644
--- a/baseconfig/CONFIG_SPI_GPIO
+++ b/configs/base-generic/CONFIG_SPI_GPIO
diff --git a/baseconfig/CONFIG_SPI_LM70_LLP b/configs/base-generic/CONFIG_SPI_LM70_LLP
index a3b56af5a..a3b56af5a 100644
--- a/baseconfig/CONFIG_SPI_LM70_LLP
+++ b/configs/base-generic/CONFIG_SPI_LM70_LLP
diff --git a/baseconfig/CONFIG_SPI_LOOPBACK_TEST b/configs/base-generic/CONFIG_SPI_LOOPBACK_TEST
index c3e9782b1..c3e9782b1 100644
--- a/baseconfig/CONFIG_SPI_LOOPBACK_TEST
+++ b/configs/base-generic/CONFIG_SPI_LOOPBACK_TEST
diff --git a/baseconfig/CONFIG_SPI_OC_TINY b/configs/base-generic/CONFIG_SPI_OC_TINY
index 742e9abe7..742e9abe7 100644
--- a/baseconfig/CONFIG_SPI_OC_TINY
+++ b/configs/base-generic/CONFIG_SPI_OC_TINY
diff --git a/baseconfig/CONFIG_SPI_PXA2XX b/configs/base-generic/CONFIG_SPI_PXA2XX
index 266e686b8..266e686b8 100644
--- a/baseconfig/CONFIG_SPI_PXA2XX
+++ b/configs/base-generic/CONFIG_SPI_PXA2XX
diff --git a/baseconfig/CONFIG_SPI_ROCKCHIP b/configs/base-generic/CONFIG_SPI_ROCKCHIP
index bf067a3e5..bf067a3e5 100644
--- a/baseconfig/CONFIG_SPI_ROCKCHIP
+++ b/configs/base-generic/CONFIG_SPI_ROCKCHIP
diff --git a/baseconfig/CONFIG_SPI_SC18IS602 b/configs/base-generic/CONFIG_SPI_SC18IS602
index 5d8f72c23..5d8f72c23 100644
--- a/baseconfig/CONFIG_SPI_SC18IS602
+++ b/configs/base-generic/CONFIG_SPI_SC18IS602
diff --git a/baseconfig/CONFIG_SPI_SLAVE b/configs/base-generic/CONFIG_SPI_SLAVE
index 663aaaaf3..663aaaaf3 100644
--- a/baseconfig/CONFIG_SPI_SLAVE
+++ b/configs/base-generic/CONFIG_SPI_SLAVE
diff --git a/baseconfig/CONFIG_SPI_SPIDEV b/configs/base-generic/CONFIG_SPI_SPIDEV
index c785b6d7e..c785b6d7e 100644
--- a/baseconfig/CONFIG_SPI_SPIDEV
+++ b/configs/base-generic/CONFIG_SPI_SPIDEV
diff --git a/baseconfig/CONFIG_SPI_TLE62X0 b/configs/base-generic/CONFIG_SPI_TLE62X0
index f9c7a26af..f9c7a26af 100644
--- a/baseconfig/CONFIG_SPI_TLE62X0
+++ b/configs/base-generic/CONFIG_SPI_TLE62X0
diff --git a/baseconfig/CONFIG_SPI_TOPCLIFF_PCH b/configs/base-generic/CONFIG_SPI_TOPCLIFF_PCH
index e15043469..e15043469 100644
--- a/baseconfig/CONFIG_SPI_TOPCLIFF_PCH
+++ b/configs/base-generic/CONFIG_SPI_TOPCLIFF_PCH
diff --git a/baseconfig/CONFIG_SPI_XCOMM b/configs/base-generic/CONFIG_SPI_XCOMM
index c3da8e9c3..c3da8e9c3 100644
--- a/baseconfig/CONFIG_SPI_XCOMM
+++ b/configs/base-generic/CONFIG_SPI_XCOMM
diff --git a/baseconfig/CONFIG_SPI_XILINX b/configs/base-generic/CONFIG_SPI_XILINX
index 47ea00e62..47ea00e62 100644
--- a/baseconfig/CONFIG_SPI_XILINX
+++ b/configs/base-generic/CONFIG_SPI_XILINX
diff --git a/baseconfig/CONFIG_SPMI b/configs/base-generic/CONFIG_SPMI
index 35e1ee706..35e1ee706 100644
--- a/baseconfig/CONFIG_SPMI
+++ b/configs/base-generic/CONFIG_SPMI
diff --git a/baseconfig/CONFIG_SQUASHFS b/configs/base-generic/CONFIG_SQUASHFS
index 931ff1ddd..931ff1ddd 100644
--- a/baseconfig/CONFIG_SQUASHFS
+++ b/configs/base-generic/CONFIG_SQUASHFS
diff --git a/baseconfig/CONFIG_SQUASHFS_4K_DEVBLK_SIZE b/configs/base-generic/CONFIG_SQUASHFS_4K_DEVBLK_SIZE
index 575ec8501..575ec8501 100644
--- a/baseconfig/CONFIG_SQUASHFS_4K_DEVBLK_SIZE
+++ b/configs/base-generic/CONFIG_SQUASHFS_4K_DEVBLK_SIZE
diff --git a/baseconfig/CONFIG_SQUASHFS_EMBEDDED b/configs/base-generic/CONFIG_SQUASHFS_EMBEDDED
index a28449ed1..a28449ed1 100644
--- a/baseconfig/CONFIG_SQUASHFS_EMBEDDED
+++ b/configs/base-generic/CONFIG_SQUASHFS_EMBEDDED
diff --git a/baseconfig/CONFIG_SQUASHFS_LZ4 b/configs/base-generic/CONFIG_SQUASHFS_LZ4
index f45773f0c..f45773f0c 100644
--- a/baseconfig/CONFIG_SQUASHFS_LZ4
+++ b/configs/base-generic/CONFIG_SQUASHFS_LZ4
diff --git a/baseconfig/CONFIG_SQUASHFS_LZO b/configs/base-generic/CONFIG_SQUASHFS_LZO
index 8b3e6f933..8b3e6f933 100644
--- a/baseconfig/CONFIG_SQUASHFS_LZO
+++ b/configs/base-generic/CONFIG_SQUASHFS_LZO
diff --git a/baseconfig/CONFIG_SQUASHFS_XATTR b/configs/base-generic/CONFIG_SQUASHFS_XATTR
index 81b21b94c..81b21b94c 100644
--- a/baseconfig/CONFIG_SQUASHFS_XATTR
+++ b/configs/base-generic/CONFIG_SQUASHFS_XATTR
diff --git a/baseconfig/CONFIG_SQUASHFS_XZ b/configs/base-generic/CONFIG_SQUASHFS_XZ
index 2a9b9bd46..2a9b9bd46 100644
--- a/baseconfig/CONFIG_SQUASHFS_XZ
+++ b/configs/base-generic/CONFIG_SQUASHFS_XZ
diff --git a/baseconfig/CONFIG_SQUASHFS_ZLIB b/configs/base-generic/CONFIG_SQUASHFS_ZLIB
index dcb246a8e..dcb246a8e 100644
--- a/baseconfig/CONFIG_SQUASHFS_ZLIB
+++ b/configs/base-generic/CONFIG_SQUASHFS_ZLIB
diff --git a/baseconfig/CONFIG_SQUASHFS_ZSTD b/configs/base-generic/CONFIG_SQUASHFS_ZSTD
index 023fb21e0..023fb21e0 100644
--- a/baseconfig/CONFIG_SQUASHFS_ZSTD
+++ b/configs/base-generic/CONFIG_SQUASHFS_ZSTD
diff --git a/baseconfig/CONFIG_SRAM b/configs/base-generic/CONFIG_SRAM
index 29a3ef2ac..29a3ef2ac 100644
--- a/baseconfig/CONFIG_SRAM
+++ b/configs/base-generic/CONFIG_SRAM
diff --git a/baseconfig/CONFIG_SRF04 b/configs/base-generic/CONFIG_SRF04
index 7dcc9136e..7dcc9136e 100644
--- a/baseconfig/CONFIG_SRF04
+++ b/configs/base-generic/CONFIG_SRF04
diff --git a/baseconfig/CONFIG_SRF08 b/configs/base-generic/CONFIG_SRF08
index 11f5dbcf5..11f5dbcf5 100644
--- a/baseconfig/CONFIG_SRF08
+++ b/configs/base-generic/CONFIG_SRF08
diff --git a/baseconfig/CONFIG_SSB b/configs/base-generic/CONFIG_SSB
index 4a239c413..4a239c413 100644
--- a/baseconfig/CONFIG_SSB
+++ b/configs/base-generic/CONFIG_SSB
diff --git a/baseconfig/CONFIG_SSB_DEBUG b/configs/base-generic/CONFIG_SSB_DEBUG
index 639f60d80..639f60d80 100644
--- a/baseconfig/CONFIG_SSB_DEBUG
+++ b/configs/base-generic/CONFIG_SSB_DEBUG
diff --git a/baseconfig/CONFIG_SSB_DRIVER_GPIO b/configs/base-generic/CONFIG_SSB_DRIVER_GPIO
index f8abee42f..f8abee42f 100644
--- a/baseconfig/CONFIG_SSB_DRIVER_GPIO
+++ b/configs/base-generic/CONFIG_SSB_DRIVER_GPIO
diff --git a/baseconfig/CONFIG_SSB_DRIVER_PCICORE b/configs/base-generic/CONFIG_SSB_DRIVER_PCICORE
index 9b51cb94d..9b51cb94d 100644
--- a/baseconfig/CONFIG_SSB_DRIVER_PCICORE
+++ b/configs/base-generic/CONFIG_SSB_DRIVER_PCICORE
diff --git a/baseconfig/CONFIG_SSB_HOST_SOC b/configs/base-generic/CONFIG_SSB_HOST_SOC
index e252c51b8..e252c51b8 100644
--- a/baseconfig/CONFIG_SSB_HOST_SOC
+++ b/configs/base-generic/CONFIG_SSB_HOST_SOC
diff --git a/baseconfig/CONFIG_SSB_PCIHOST b/configs/base-generic/CONFIG_SSB_PCIHOST
index 0bf8199c3..0bf8199c3 100644
--- a/baseconfig/CONFIG_SSB_PCIHOST
+++ b/configs/base-generic/CONFIG_SSB_PCIHOST
diff --git a/baseconfig/CONFIG_SSB_PCMCIAHOST b/configs/base-generic/CONFIG_SSB_PCMCIAHOST
index c93be03d0..c93be03d0 100644
--- a/baseconfig/CONFIG_SSB_PCMCIAHOST
+++ b/configs/base-generic/CONFIG_SSB_PCMCIAHOST
diff --git a/baseconfig/CONFIG_SSB_SDIOHOST b/configs/base-generic/CONFIG_SSB_SDIOHOST
index 6bd1c9ca9..6bd1c9ca9 100644
--- a/baseconfig/CONFIG_SSB_SDIOHOST
+++ b/configs/base-generic/CONFIG_SSB_SDIOHOST
diff --git a/baseconfig/CONFIG_SSB_SILENT b/configs/base-generic/CONFIG_SSB_SILENT
index 98a1a9576..98a1a9576 100644
--- a/baseconfig/CONFIG_SSB_SILENT
+++ b/configs/base-generic/CONFIG_SSB_SILENT
diff --git a/baseconfig/CONFIG_SSFDC b/configs/base-generic/CONFIG_SSFDC
index 29dfb19ed..29dfb19ed 100644
--- a/baseconfig/CONFIG_SSFDC
+++ b/configs/base-generic/CONFIG_SSFDC
diff --git a/baseconfig/CONFIG_STACK_TRACER b/configs/base-generic/CONFIG_STACK_TRACER
index 643bacdcd..643bacdcd 100644
--- a/baseconfig/CONFIG_STACK_TRACER
+++ b/configs/base-generic/CONFIG_STACK_TRACER
diff --git a/baseconfig/CONFIG_STACK_VALIDATION b/configs/base-generic/CONFIG_STACK_VALIDATION
index e335fefdd..e335fefdd 100644
--- a/baseconfig/CONFIG_STACK_VALIDATION
+++ b/configs/base-generic/CONFIG_STACK_VALIDATION
diff --git a/baseconfig/CONFIG_STAGING b/configs/base-generic/CONFIG_STAGING
index c53ae30fa..c53ae30fa 100644
--- a/baseconfig/CONFIG_STAGING
+++ b/configs/base-generic/CONFIG_STAGING
diff --git a/baseconfig/CONFIG_STAGING_BOARD b/configs/base-generic/CONFIG_STAGING_BOARD
index 16496bf2b..16496bf2b 100644
--- a/baseconfig/CONFIG_STAGING_BOARD
+++ b/configs/base-generic/CONFIG_STAGING_BOARD
diff --git a/baseconfig/CONFIG_STAGING_MEDIA b/configs/base-generic/CONFIG_STAGING_MEDIA
index 853f255d4..853f255d4 100644
--- a/baseconfig/CONFIG_STAGING_MEDIA
+++ b/configs/base-generic/CONFIG_STAGING_MEDIA
diff --git a/baseconfig/CONFIG_STANDALONE b/configs/base-generic/CONFIG_STANDALONE
index c3d25b3d6..c3d25b3d6 100644
--- a/baseconfig/CONFIG_STANDALONE
+++ b/configs/base-generic/CONFIG_STANDALONE
diff --git a/baseconfig/CONFIG_STATIC_KEYS_SELFTEST b/configs/base-generic/CONFIG_STATIC_KEYS_SELFTEST
index 09446dc77..09446dc77 100644
--- a/baseconfig/CONFIG_STATIC_KEYS_SELFTEST
+++ b/configs/base-generic/CONFIG_STATIC_KEYS_SELFTEST
diff --git a/baseconfig/CONFIG_STATIC_USERMODEHELPER b/configs/base-generic/CONFIG_STATIC_USERMODEHELPER
index 9cfc00a5f..9cfc00a5f 100644
--- a/baseconfig/CONFIG_STATIC_USERMODEHELPER
+++ b/configs/base-generic/CONFIG_STATIC_USERMODEHELPER
diff --git a/baseconfig/CONFIG_STE10XP b/configs/base-generic/CONFIG_STE10XP
index e6a1c2bca..e6a1c2bca 100644
--- a/baseconfig/CONFIG_STE10XP
+++ b/configs/base-generic/CONFIG_STE10XP
diff --git a/baseconfig/CONFIG_STE_MODEM_RPROC b/configs/base-generic/CONFIG_STE_MODEM_RPROC
index 1b3660c49..1b3660c49 100644
--- a/baseconfig/CONFIG_STE_MODEM_RPROC
+++ b/configs/base-generic/CONFIG_STE_MODEM_RPROC
diff --git a/baseconfig/CONFIG_STK3310 b/configs/base-generic/CONFIG_STK3310
index 31eddcbe7..31eddcbe7 100644
--- a/baseconfig/CONFIG_STK3310
+++ b/configs/base-generic/CONFIG_STK3310
diff --git a/baseconfig/CONFIG_STK8312 b/configs/base-generic/CONFIG_STK8312
index a6776d90e..a6776d90e 100644
--- a/baseconfig/CONFIG_STK8312
+++ b/configs/base-generic/CONFIG_STK8312
diff --git a/baseconfig/CONFIG_STK8BA50 b/configs/base-generic/CONFIG_STK8BA50
index 7608b4ef7..7608b4ef7 100644
--- a/baseconfig/CONFIG_STK8BA50
+++ b/configs/base-generic/CONFIG_STK8BA50
diff --git a/baseconfig/CONFIG_STM b/configs/base-generic/CONFIG_STM
index 8718165ed..8718165ed 100644
--- a/baseconfig/CONFIG_STM
+++ b/configs/base-generic/CONFIG_STM
diff --git a/baseconfig/CONFIG_STMMAC_ETH b/configs/base-generic/CONFIG_STMMAC_ETH
index 8c476ead6..8c476ead6 100644
--- a/baseconfig/CONFIG_STMMAC_ETH
+++ b/configs/base-generic/CONFIG_STMMAC_ETH
diff --git a/baseconfig/CONFIG_STMMAC_PCI b/configs/base-generic/CONFIG_STMMAC_PCI
index 481393875..481393875 100644
--- a/baseconfig/CONFIG_STMMAC_PCI
+++ b/configs/base-generic/CONFIG_STMMAC_PCI
diff --git a/baseconfig/CONFIG_STMMAC_PLATFORM b/configs/base-generic/CONFIG_STMMAC_PLATFORM
index a3a019c76..a3a019c76 100644
--- a/baseconfig/CONFIG_STMMAC_PLATFORM
+++ b/configs/base-generic/CONFIG_STMMAC_PLATFORM
diff --git a/baseconfig/CONFIG_STM_DUMMY b/configs/base-generic/CONFIG_STM_DUMMY
index 704a19ece..704a19ece 100644
--- a/baseconfig/CONFIG_STM_DUMMY
+++ b/configs/base-generic/CONFIG_STM_DUMMY
diff --git a/baseconfig/CONFIG_STM_SOURCE_CONSOLE b/configs/base-generic/CONFIG_STM_SOURCE_CONSOLE
index aa10fd476..aa10fd476 100644
--- a/baseconfig/CONFIG_STM_SOURCE_CONSOLE
+++ b/configs/base-generic/CONFIG_STM_SOURCE_CONSOLE
diff --git a/baseconfig/CONFIG_STRICT_DEVMEM b/configs/base-generic/CONFIG_STRICT_DEVMEM
index f2c0c3a61..f2c0c3a61 100644
--- a/baseconfig/CONFIG_STRICT_DEVMEM
+++ b/configs/base-generic/CONFIG_STRICT_DEVMEM
diff --git a/baseconfig/CONFIG_STRING_SELFTEST b/configs/base-generic/CONFIG_STRING_SELFTEST
index dbff6d7fa..dbff6d7fa 100644
--- a/baseconfig/CONFIG_STRING_SELFTEST
+++ b/configs/base-generic/CONFIG_STRING_SELFTEST
diff --git a/baseconfig/CONFIG_STRIP b/configs/base-generic/CONFIG_STRIP
index f9ea173e3..f9ea173e3 100644
--- a/baseconfig/CONFIG_STRIP
+++ b/configs/base-generic/CONFIG_STRIP
diff --git a/baseconfig/CONFIG_STRIP_ASM_SYMS b/configs/base-generic/CONFIG_STRIP_ASM_SYMS
index 274455389..274455389 100644
--- a/baseconfig/CONFIG_STRIP_ASM_SYMS
+++ b/configs/base-generic/CONFIG_STRIP_ASM_SYMS
diff --git a/baseconfig/CONFIG_SUNDANCE b/configs/base-generic/CONFIG_SUNDANCE
index b14706aef..b14706aef 100644
--- a/baseconfig/CONFIG_SUNDANCE
+++ b/configs/base-generic/CONFIG_SUNDANCE
diff --git a/baseconfig/CONFIG_SUNDANCE_MMIO b/configs/base-generic/CONFIG_SUNDANCE_MMIO
index 96e5c0212..96e5c0212 100644
--- a/baseconfig/CONFIG_SUNDANCE_MMIO
+++ b/configs/base-generic/CONFIG_SUNDANCE_MMIO
diff --git a/baseconfig/CONFIG_SUNGEM b/configs/base-generic/CONFIG_SUNGEM
index 94adaed65..94adaed65 100644
--- a/baseconfig/CONFIG_SUNGEM
+++ b/configs/base-generic/CONFIG_SUNGEM
diff --git a/baseconfig/CONFIG_SUNRPC b/configs/base-generic/CONFIG_SUNRPC
index 1c5b2e240..1c5b2e240 100644
--- a/baseconfig/CONFIG_SUNRPC
+++ b/configs/base-generic/CONFIG_SUNRPC
diff --git a/baseconfig/CONFIG_SUNRPC_DEBUG b/configs/base-generic/CONFIG_SUNRPC_DEBUG
index 448eb69ea..448eb69ea 100644
--- a/baseconfig/CONFIG_SUNRPC_DEBUG
+++ b/configs/base-generic/CONFIG_SUNRPC_DEBUG
diff --git a/baseconfig/CONFIG_SUNRPC_GSS b/configs/base-generic/CONFIG_SUNRPC_GSS
index 4a4e93eed..4a4e93eed 100644
--- a/baseconfig/CONFIG_SUNRPC_GSS
+++ b/configs/base-generic/CONFIG_SUNRPC_GSS
diff --git a/baseconfig/CONFIG_SUNRPC_XPRT_RDMA b/configs/base-generic/CONFIG_SUNRPC_XPRT_RDMA
index b85162d8f..b85162d8f 100644
--- a/baseconfig/CONFIG_SUNRPC_XPRT_RDMA
+++ b/configs/base-generic/CONFIG_SUNRPC_XPRT_RDMA
diff --git a/baseconfig/CONFIG_SUN_PARTITION b/configs/base-generic/CONFIG_SUN_PARTITION
index 67e2deb51..67e2deb51 100644
--- a/baseconfig/CONFIG_SUN_PARTITION
+++ b/configs/base-generic/CONFIG_SUN_PARTITION
diff --git a/baseconfig/CONFIG_SURFACE_3_BUTTON b/configs/base-generic/CONFIG_SURFACE_3_BUTTON
index 5b0621446..5b0621446 100644
--- a/baseconfig/CONFIG_SURFACE_3_BUTTON
+++ b/configs/base-generic/CONFIG_SURFACE_3_BUTTON
diff --git a/baseconfig/CONFIG_SUSPEND b/configs/base-generic/CONFIG_SUSPEND
index 68d22d8bd..68d22d8bd 100644
--- a/baseconfig/CONFIG_SUSPEND
+++ b/configs/base-generic/CONFIG_SUSPEND
diff --git a/baseconfig/CONFIG_SWAP b/configs/base-generic/CONFIG_SWAP
index 38565471d..38565471d 100644
--- a/baseconfig/CONFIG_SWAP
+++ b/configs/base-generic/CONFIG_SWAP
diff --git a/baseconfig/CONFIG_SW_SYNC b/configs/base-generic/CONFIG_SW_SYNC
index 6afd35b6b..6afd35b6b 100644
--- a/baseconfig/CONFIG_SW_SYNC
+++ b/configs/base-generic/CONFIG_SW_SYNC
diff --git a/baseconfig/CONFIG_SX9500 b/configs/base-generic/CONFIG_SX9500
index f7899805e..f7899805e 100644
--- a/baseconfig/CONFIG_SX9500
+++ b/configs/base-generic/CONFIG_SX9500
diff --git a/baseconfig/CONFIG_SYNCLINK b/configs/base-generic/CONFIG_SYNCLINK
index 0a377c347..0a377c347 100644
--- a/baseconfig/CONFIG_SYNCLINK
+++ b/configs/base-generic/CONFIG_SYNCLINK
diff --git a/baseconfig/CONFIG_SYNCLINKMP b/configs/base-generic/CONFIG_SYNCLINKMP
index c16bdab90..c16bdab90 100644
--- a/baseconfig/CONFIG_SYNCLINKMP
+++ b/configs/base-generic/CONFIG_SYNCLINKMP
diff --git a/baseconfig/CONFIG_SYNCLINK_CS b/configs/base-generic/CONFIG_SYNCLINK_CS
index ffb2311ed..ffb2311ed 100644
--- a/baseconfig/CONFIG_SYNCLINK_CS
+++ b/configs/base-generic/CONFIG_SYNCLINK_CS
diff --git a/baseconfig/CONFIG_SYNCLINK_GT b/configs/base-generic/CONFIG_SYNCLINK_GT
index c91a333b6..c91a333b6 100644
--- a/baseconfig/CONFIG_SYNCLINK_GT
+++ b/configs/base-generic/CONFIG_SYNCLINK_GT
diff --git a/baseconfig/CONFIG_SYNC_FILE b/configs/base-generic/CONFIG_SYNC_FILE
index ce64cf8fb..ce64cf8fb 100644
--- a/baseconfig/CONFIG_SYNC_FILE
+++ b/configs/base-generic/CONFIG_SYNC_FILE
diff --git a/baseconfig/CONFIG_SYNOPSYS_DWC_ETH_QOS b/configs/base-generic/CONFIG_SYNOPSYS_DWC_ETH_QOS
index 1adfca10b..1adfca10b 100644
--- a/baseconfig/CONFIG_SYNOPSYS_DWC_ETH_QOS
+++ b/configs/base-generic/CONFIG_SYNOPSYS_DWC_ETH_QOS
diff --git a/baseconfig/CONFIG_SYN_COOKIES b/configs/base-generic/CONFIG_SYN_COOKIES
index 5fec45b29..5fec45b29 100644
--- a/baseconfig/CONFIG_SYN_COOKIES
+++ b/configs/base-generic/CONFIG_SYN_COOKIES
diff --git a/baseconfig/CONFIG_SYSCON_REBOOT_MODE b/configs/base-generic/CONFIG_SYSCON_REBOOT_MODE
index 0f871191b..0f871191b 100644
--- a/baseconfig/CONFIG_SYSCON_REBOOT_MODE
+++ b/configs/base-generic/CONFIG_SYSCON_REBOOT_MODE
diff --git a/baseconfig/CONFIG_SYSCTL b/configs/base-generic/CONFIG_SYSCTL
index dd53c266b..dd53c266b 100644
--- a/baseconfig/CONFIG_SYSCTL
+++ b/configs/base-generic/CONFIG_SYSCTL
diff --git a/baseconfig/CONFIG_SYSFS_DEPRECATED b/configs/base-generic/CONFIG_SYSFS_DEPRECATED
index 0da557196..0da557196 100644
--- a/baseconfig/CONFIG_SYSFS_DEPRECATED
+++ b/configs/base-generic/CONFIG_SYSFS_DEPRECATED
diff --git a/baseconfig/CONFIG_SYSFS_DEPRECATED_V2 b/configs/base-generic/CONFIG_SYSFS_DEPRECATED_V2
index d81acb477..d81acb477 100644
--- a/baseconfig/CONFIG_SYSFS_DEPRECATED_V2
+++ b/configs/base-generic/CONFIG_SYSFS_DEPRECATED_V2
diff --git a/baseconfig/CONFIG_SYSTEMPORT b/configs/base-generic/CONFIG_SYSTEMPORT
index edb77a634..edb77a634 100644
--- a/baseconfig/CONFIG_SYSTEMPORT
+++ b/configs/base-generic/CONFIG_SYSTEMPORT
diff --git a/baseconfig/CONFIG_SYSTEM_BLACKLIST_HASH_LIST b/configs/base-generic/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
index 858e87e78..858e87e78 100644
--- a/baseconfig/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
+++ b/configs/base-generic/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
diff --git a/baseconfig/CONFIG_SYSTEM_BLACKLIST_KEYRING b/configs/base-generic/CONFIG_SYSTEM_BLACKLIST_KEYRING
index 4fcc4b31e..4fcc4b31e 100644
--- a/baseconfig/CONFIG_SYSTEM_BLACKLIST_KEYRING
+++ b/configs/base-generic/CONFIG_SYSTEM_BLACKLIST_KEYRING
diff --git a/baseconfig/CONFIG_SYSTEM_EXTRA_CERTIFICATE b/configs/base-generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE
index fea571fdc..fea571fdc 100644
--- a/baseconfig/CONFIG_SYSTEM_EXTRA_CERTIFICATE
+++ b/configs/base-generic/CONFIG_SYSTEM_EXTRA_CERTIFICATE
diff --git a/baseconfig/CONFIG_SYSTEM_TRUSTED_KEYRING b/configs/base-generic/CONFIG_SYSTEM_TRUSTED_KEYRING
index 9cb63f099..9cb63f099 100644
--- a/baseconfig/CONFIG_SYSTEM_TRUSTED_KEYRING
+++ b/configs/base-generic/CONFIG_SYSTEM_TRUSTED_KEYRING
diff --git a/baseconfig/CONFIG_SYSTEM_TRUSTED_KEYS b/configs/base-generic/CONFIG_SYSTEM_TRUSTED_KEYS
index db0105d04..db0105d04 100644
--- a/baseconfig/CONFIG_SYSTEM_TRUSTED_KEYS
+++ b/configs/base-generic/CONFIG_SYSTEM_TRUSTED_KEYS
diff --git a/baseconfig/CONFIG_SYSV68_PARTITION b/configs/base-generic/CONFIG_SYSV68_PARTITION
index 90936c779..90936c779 100644
--- a/baseconfig/CONFIG_SYSV68_PARTITION
+++ b/configs/base-generic/CONFIG_SYSV68_PARTITION
diff --git a/baseconfig/CONFIG_SYSVIPC b/configs/base-generic/CONFIG_SYSVIPC
index 3d67b9bac..3d67b9bac 100644
--- a/baseconfig/CONFIG_SYSVIPC
+++ b/configs/base-generic/CONFIG_SYSVIPC
diff --git a/baseconfig/CONFIG_SYSV_FS b/configs/base-generic/CONFIG_SYSV_FS
index 7003874cb..7003874cb 100644
--- a/baseconfig/CONFIG_SYSV_FS
+++ b/configs/base-generic/CONFIG_SYSV_FS
diff --git a/baseconfig/CONFIG_T5403 b/configs/base-generic/CONFIG_T5403
index ef5a8130a..ef5a8130a 100644
--- a/baseconfig/CONFIG_T5403
+++ b/configs/base-generic/CONFIG_T5403
diff --git a/baseconfig/CONFIG_TABLET_SERIAL_WACOM4 b/configs/base-generic/CONFIG_TABLET_SERIAL_WACOM4
index dc8670f60..dc8670f60 100644
--- a/baseconfig/CONFIG_TABLET_SERIAL_WACOM4
+++ b/configs/base-generic/CONFIG_TABLET_SERIAL_WACOM4
diff --git a/baseconfig/CONFIG_TABLET_USB_ACECAD b/configs/base-generic/CONFIG_TABLET_USB_ACECAD
index cc981e4af..cc981e4af 100644
--- a/baseconfig/CONFIG_TABLET_USB_ACECAD
+++ b/configs/base-generic/CONFIG_TABLET_USB_ACECAD
diff --git a/baseconfig/CONFIG_TABLET_USB_AIPTEK b/configs/base-generic/CONFIG_TABLET_USB_AIPTEK
index 250cea738..250cea738 100644
--- a/baseconfig/CONFIG_TABLET_USB_AIPTEK
+++ b/configs/base-generic/CONFIG_TABLET_USB_AIPTEK
diff --git a/baseconfig/CONFIG_TABLET_USB_GTCO b/configs/base-generic/CONFIG_TABLET_USB_GTCO
index 50032433f..50032433f 100644
--- a/baseconfig/CONFIG_TABLET_USB_GTCO
+++ b/configs/base-generic/CONFIG_TABLET_USB_GTCO
diff --git a/baseconfig/CONFIG_TABLET_USB_HANWANG b/configs/base-generic/CONFIG_TABLET_USB_HANWANG
index d5cf01a57..d5cf01a57 100644
--- a/baseconfig/CONFIG_TABLET_USB_HANWANG
+++ b/configs/base-generic/CONFIG_TABLET_USB_HANWANG
diff --git a/baseconfig/CONFIG_TABLET_USB_KBTAB b/configs/base-generic/CONFIG_TABLET_USB_KBTAB
index 2dcbea933..2dcbea933 100644
--- a/baseconfig/CONFIG_TABLET_USB_KBTAB
+++ b/configs/base-generic/CONFIG_TABLET_USB_KBTAB
diff --git a/baseconfig/CONFIG_TABLET_USB_PEGASUS b/configs/base-generic/CONFIG_TABLET_USB_PEGASUS
index 755bfc291..755bfc291 100644
--- a/baseconfig/CONFIG_TABLET_USB_PEGASUS
+++ b/configs/base-generic/CONFIG_TABLET_USB_PEGASUS
diff --git a/baseconfig/CONFIG_TARGET_CORE b/configs/base-generic/CONFIG_TARGET_CORE
index 437db1bb0..437db1bb0 100644
--- a/baseconfig/CONFIG_TARGET_CORE
+++ b/configs/base-generic/CONFIG_TARGET_CORE
diff --git a/baseconfig/CONFIG_TASKSTATS b/configs/base-generic/CONFIG_TASKSTATS
index 2e4f141d5..2e4f141d5 100644
--- a/baseconfig/CONFIG_TASKSTATS
+++ b/configs/base-generic/CONFIG_TASKSTATS
diff --git a/baseconfig/CONFIG_TASKS_RCU b/configs/base-generic/CONFIG_TASKS_RCU
index fb944bc3b..fb944bc3b 100644
--- a/baseconfig/CONFIG_TASKS_RCU
+++ b/configs/base-generic/CONFIG_TASKS_RCU
diff --git a/baseconfig/CONFIG_TASK_DELAY_ACCT b/configs/base-generic/CONFIG_TASK_DELAY_ACCT
index 11205fe20..11205fe20 100644
--- a/baseconfig/CONFIG_TASK_DELAY_ACCT
+++ b/configs/base-generic/CONFIG_TASK_DELAY_ACCT
diff --git a/baseconfig/CONFIG_TASK_IO_ACCOUNTING b/configs/base-generic/CONFIG_TASK_IO_ACCOUNTING
index 7c36f8898..7c36f8898 100644
--- a/baseconfig/CONFIG_TASK_IO_ACCOUNTING
+++ b/configs/base-generic/CONFIG_TASK_IO_ACCOUNTING
diff --git a/baseconfig/CONFIG_TASK_XACCT b/configs/base-generic/CONFIG_TASK_XACCT
index 8b61b9cb0..8b61b9cb0 100644
--- a/baseconfig/CONFIG_TASK_XACCT
+++ b/configs/base-generic/CONFIG_TASK_XACCT
diff --git a/baseconfig/CONFIG_TCG_ATMEL b/configs/base-generic/CONFIG_TCG_ATMEL
index 05d7d17d4..05d7d17d4 100644
--- a/baseconfig/CONFIG_TCG_ATMEL
+++ b/configs/base-generic/CONFIG_TCG_ATMEL
diff --git a/baseconfig/CONFIG_TCG_CRB b/configs/base-generic/CONFIG_TCG_CRB
index 07a62cae3..07a62cae3 100644
--- a/baseconfig/CONFIG_TCG_CRB
+++ b/configs/base-generic/CONFIG_TCG_CRB
diff --git a/baseconfig/CONFIG_TCG_INFINEON b/configs/base-generic/CONFIG_TCG_INFINEON
index e2e45880f..e2e45880f 100644
--- a/baseconfig/CONFIG_TCG_INFINEON
+++ b/configs/base-generic/CONFIG_TCG_INFINEON
diff --git a/baseconfig/CONFIG_TCG_NSC b/configs/base-generic/CONFIG_TCG_NSC
index 21b0d6865..21b0d6865 100644
--- a/baseconfig/CONFIG_TCG_NSC
+++ b/configs/base-generic/CONFIG_TCG_NSC
diff --git a/baseconfig/CONFIG_TCG_TIS b/configs/base-generic/CONFIG_TCG_TIS
index b119645b2..b119645b2 100644
--- a/baseconfig/CONFIG_TCG_TIS
+++ b/configs/base-generic/CONFIG_TCG_TIS
diff --git a/baseconfig/CONFIG_TCG_TIS_I2C_ATMEL b/configs/base-generic/CONFIG_TCG_TIS_I2C_ATMEL
index 2d7f3fd83..2d7f3fd83 100644
--- a/baseconfig/CONFIG_TCG_TIS_I2C_ATMEL
+++ b/configs/base-generic/CONFIG_TCG_TIS_I2C_ATMEL
diff --git a/baseconfig/CONFIG_TCG_TIS_I2C_INFINEON b/configs/base-generic/CONFIG_TCG_TIS_I2C_INFINEON
index 0514455b1..0514455b1 100644
--- a/baseconfig/CONFIG_TCG_TIS_I2C_INFINEON
+++ b/configs/base-generic/CONFIG_TCG_TIS_I2C_INFINEON
diff --git a/baseconfig/CONFIG_TCG_TIS_I2C_NUVOTON b/configs/base-generic/CONFIG_TCG_TIS_I2C_NUVOTON
index 84d30bc2c..84d30bc2c 100644
--- a/baseconfig/CONFIG_TCG_TIS_I2C_NUVOTON
+++ b/configs/base-generic/CONFIG_TCG_TIS_I2C_NUVOTON
diff --git a/baseconfig/CONFIG_TCG_TIS_SPI b/configs/base-generic/CONFIG_TCG_TIS_SPI
index 3b6623798..3b6623798 100644
--- a/baseconfig/CONFIG_TCG_TIS_SPI
+++ b/configs/base-generic/CONFIG_TCG_TIS_SPI
diff --git a/baseconfig/CONFIG_TCG_TIS_ST33ZP24 b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24
index 771159aec..771159aec 100644
--- a/baseconfig/CONFIG_TCG_TIS_ST33ZP24
+++ b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24
diff --git a/baseconfig/CONFIG_TCG_TIS_ST33ZP24_I2C b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24_I2C
index 1ff9e8cfa..1ff9e8cfa 100644
--- a/baseconfig/CONFIG_TCG_TIS_ST33ZP24_I2C
+++ b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24_I2C
diff --git a/baseconfig/CONFIG_TCG_TIS_ST33ZP24_SPI b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24_SPI
index 5d54489c9..5d54489c9 100644
--- a/baseconfig/CONFIG_TCG_TIS_ST33ZP24_SPI
+++ b/configs/base-generic/CONFIG_TCG_TIS_ST33ZP24_SPI
diff --git a/baseconfig/CONFIG_TCG_TPM b/configs/base-generic/CONFIG_TCG_TPM
index 8c2c3b86d..8c2c3b86d 100644
--- a/baseconfig/CONFIG_TCG_TPM
+++ b/configs/base-generic/CONFIG_TCG_TPM
diff --git a/baseconfig/CONFIG_TCG_VTPM_PROXY b/configs/base-generic/CONFIG_TCG_VTPM_PROXY
index c5a7ebd13..c5a7ebd13 100644
--- a/baseconfig/CONFIG_TCG_VTPM_PROXY
+++ b/configs/base-generic/CONFIG_TCG_VTPM_PROXY
diff --git a/baseconfig/CONFIG_TCG_XEN b/configs/base-generic/CONFIG_TCG_XEN
index 778bc2d90..778bc2d90 100644
--- a/baseconfig/CONFIG_TCG_XEN
+++ b/configs/base-generic/CONFIG_TCG_XEN
diff --git a/baseconfig/CONFIG_TCM_FC b/configs/base-generic/CONFIG_TCM_FC
index 338e96480..338e96480 100644
--- a/baseconfig/CONFIG_TCM_FC
+++ b/configs/base-generic/CONFIG_TCM_FC
diff --git a/baseconfig/CONFIG_TCM_FILEIO b/configs/base-generic/CONFIG_TCM_FILEIO
index cab5895c1..cab5895c1 100644
--- a/baseconfig/CONFIG_TCM_FILEIO
+++ b/configs/base-generic/CONFIG_TCM_FILEIO
diff --git a/baseconfig/CONFIG_TCM_IBLOCK b/configs/base-generic/CONFIG_TCM_IBLOCK
index 0eccf352f..0eccf352f 100644
--- a/baseconfig/CONFIG_TCM_IBLOCK
+++ b/configs/base-generic/CONFIG_TCM_IBLOCK
diff --git a/baseconfig/CONFIG_TCM_PSCSI b/configs/base-generic/CONFIG_TCM_PSCSI
index 5fa5e2b3a..5fa5e2b3a 100644
--- a/baseconfig/CONFIG_TCM_PSCSI
+++ b/configs/base-generic/CONFIG_TCM_PSCSI
diff --git a/baseconfig/CONFIG_TCM_QLA2XXX b/configs/base-generic/CONFIG_TCM_QLA2XXX
index 23b0dff2d..23b0dff2d 100644
--- a/baseconfig/CONFIG_TCM_QLA2XXX
+++ b/configs/base-generic/CONFIG_TCM_QLA2XXX
diff --git a/baseconfig/CONFIG_TCM_QLA2XXX_DEBUG b/configs/base-generic/CONFIG_TCM_QLA2XXX_DEBUG
index 59b80c5f5..59b80c5f5 100644
--- a/baseconfig/CONFIG_TCM_QLA2XXX_DEBUG
+++ b/configs/base-generic/CONFIG_TCM_QLA2XXX_DEBUG
diff --git a/baseconfig/CONFIG_TCM_USER2 b/configs/base-generic/CONFIG_TCM_USER2
index df07ef1d4..df07ef1d4 100644
--- a/baseconfig/CONFIG_TCM_USER2
+++ b/configs/base-generic/CONFIG_TCM_USER2
diff --git a/baseconfig/CONFIG_TCP_CONG_ADVANCED b/configs/base-generic/CONFIG_TCP_CONG_ADVANCED
index 86f996b95..86f996b95 100644
--- a/baseconfig/CONFIG_TCP_CONG_ADVANCED
+++ b/configs/base-generic/CONFIG_TCP_CONG_ADVANCED
diff --git a/baseconfig/CONFIG_TCP_CONG_BBR b/configs/base-generic/CONFIG_TCP_CONG_BBR
index 55ff89cb6..55ff89cb6 100644
--- a/baseconfig/CONFIG_TCP_CONG_BBR
+++ b/configs/base-generic/CONFIG_TCP_CONG_BBR
diff --git a/baseconfig/CONFIG_TCP_CONG_BIC b/configs/base-generic/CONFIG_TCP_CONG_BIC
index 82e23b7f3..82e23b7f3 100644
--- a/baseconfig/CONFIG_TCP_CONG_BIC
+++ b/configs/base-generic/CONFIG_TCP_CONG_BIC
diff --git a/baseconfig/CONFIG_TCP_CONG_CDG b/configs/base-generic/CONFIG_TCP_CONG_CDG
index fb074cdd5..fb074cdd5 100644
--- a/baseconfig/CONFIG_TCP_CONG_CDG
+++ b/configs/base-generic/CONFIG_TCP_CONG_CDG
diff --git a/baseconfig/CONFIG_TCP_CONG_CUBIC b/configs/base-generic/CONFIG_TCP_CONG_CUBIC
index 7be0dc424..7be0dc424 100644
--- a/baseconfig/CONFIG_TCP_CONG_CUBIC
+++ b/configs/base-generic/CONFIG_TCP_CONG_CUBIC
diff --git a/baseconfig/CONFIG_TCP_CONG_DCTCP b/configs/base-generic/CONFIG_TCP_CONG_DCTCP
index f9aa892d8..f9aa892d8 100644
--- a/baseconfig/CONFIG_TCP_CONG_DCTCP
+++ b/configs/base-generic/CONFIG_TCP_CONG_DCTCP
diff --git a/baseconfig/CONFIG_TCP_CONG_HSTCP b/configs/base-generic/CONFIG_TCP_CONG_HSTCP
index 6f546faad..6f546faad 100644
--- a/baseconfig/CONFIG_TCP_CONG_HSTCP
+++ b/configs/base-generic/CONFIG_TCP_CONG_HSTCP
diff --git a/baseconfig/CONFIG_TCP_CONG_HTCP b/configs/base-generic/CONFIG_TCP_CONG_HTCP
index c68bb11a6..c68bb11a6 100644
--- a/baseconfig/CONFIG_TCP_CONG_HTCP
+++ b/configs/base-generic/CONFIG_TCP_CONG_HTCP
diff --git a/baseconfig/CONFIG_TCP_CONG_HYBLA b/configs/base-generic/CONFIG_TCP_CONG_HYBLA
index 82892dbfd..82892dbfd 100644
--- a/baseconfig/CONFIG_TCP_CONG_HYBLA
+++ b/configs/base-generic/CONFIG_TCP_CONG_HYBLA
diff --git a/baseconfig/CONFIG_TCP_CONG_ILLINOIS b/configs/base-generic/CONFIG_TCP_CONG_ILLINOIS
index 7dbbe7377..7dbbe7377 100644
--- a/baseconfig/CONFIG_TCP_CONG_ILLINOIS
+++ b/configs/base-generic/CONFIG_TCP_CONG_ILLINOIS
diff --git a/baseconfig/CONFIG_TCP_CONG_LP b/configs/base-generic/CONFIG_TCP_CONG_LP
index 1136111b9..1136111b9 100644
--- a/baseconfig/CONFIG_TCP_CONG_LP
+++ b/configs/base-generic/CONFIG_TCP_CONG_LP
diff --git a/baseconfig/CONFIG_TCP_CONG_NV b/configs/base-generic/CONFIG_TCP_CONG_NV
index 2994a8025..2994a8025 100644
--- a/baseconfig/CONFIG_TCP_CONG_NV
+++ b/configs/base-generic/CONFIG_TCP_CONG_NV
diff --git a/baseconfig/CONFIG_TCP_CONG_SCALABLE b/configs/base-generic/CONFIG_TCP_CONG_SCALABLE
index d5b5bf020..d5b5bf020 100644
--- a/baseconfig/CONFIG_TCP_CONG_SCALABLE
+++ b/configs/base-generic/CONFIG_TCP_CONG_SCALABLE
diff --git a/baseconfig/CONFIG_TCP_CONG_VEGAS b/configs/base-generic/CONFIG_TCP_CONG_VEGAS
index a584ed4f1..a584ed4f1 100644
--- a/baseconfig/CONFIG_TCP_CONG_VEGAS
+++ b/configs/base-generic/CONFIG_TCP_CONG_VEGAS
diff --git a/baseconfig/CONFIG_TCP_CONG_VENO b/configs/base-generic/CONFIG_TCP_CONG_VENO
index e450df2f9..e450df2f9 100644
--- a/baseconfig/CONFIG_TCP_CONG_VENO
+++ b/configs/base-generic/CONFIG_TCP_CONG_VENO
diff --git a/baseconfig/CONFIG_TCP_CONG_WESTWOOD b/configs/base-generic/CONFIG_TCP_CONG_WESTWOOD
index ca233b9df..ca233b9df 100644
--- a/baseconfig/CONFIG_TCP_CONG_WESTWOOD
+++ b/configs/base-generic/CONFIG_TCP_CONG_WESTWOOD
diff --git a/baseconfig/CONFIG_TCP_CONG_YEAH b/configs/base-generic/CONFIG_TCP_CONG_YEAH
index c2db36941..c2db36941 100644
--- a/baseconfig/CONFIG_TCP_CONG_YEAH
+++ b/configs/base-generic/CONFIG_TCP_CONG_YEAH
diff --git a/baseconfig/CONFIG_TCP_MD5SIG b/configs/base-generic/CONFIG_TCP_MD5SIG
index b92ad2fb5..b92ad2fb5 100644
--- a/baseconfig/CONFIG_TCP_MD5SIG
+++ b/configs/base-generic/CONFIG_TCP_MD5SIG
diff --git a/baseconfig/CONFIG_TCS3414 b/configs/base-generic/CONFIG_TCS3414
index 5b04d4ee1..5b04d4ee1 100644
--- a/baseconfig/CONFIG_TCS3414
+++ b/configs/base-generic/CONFIG_TCS3414
diff --git a/baseconfig/CONFIG_TCS3472 b/configs/base-generic/CONFIG_TCS3472
index 0d00b4785..0d00b4785 100644
--- a/baseconfig/CONFIG_TCS3472
+++ b/configs/base-generic/CONFIG_TCS3472
diff --git a/baseconfig/CONFIG_TEE b/configs/base-generic/CONFIG_TEE
index accc7a854..accc7a854 100644
--- a/baseconfig/CONFIG_TEE
+++ b/configs/base-generic/CONFIG_TEE
diff --git a/baseconfig/CONFIG_TEHUTI b/configs/base-generic/CONFIG_TEHUTI
index 2b394b8c2..2b394b8c2 100644
--- a/baseconfig/CONFIG_TEHUTI
+++ b/configs/base-generic/CONFIG_TEHUTI
diff --git a/baseconfig/CONFIG_TEKRAM_DONGLE b/configs/base-generic/CONFIG_TEKRAM_DONGLE
index b68cfc30c..b68cfc30c 100644
--- a/baseconfig/CONFIG_TEKRAM_DONGLE
+++ b/configs/base-generic/CONFIG_TEKRAM_DONGLE
diff --git a/baseconfig/CONFIG_TELCLOCK b/configs/base-generic/CONFIG_TELCLOCK
index 0cfe9ee4a..0cfe9ee4a 100644
--- a/baseconfig/CONFIG_TELCLOCK
+++ b/configs/base-generic/CONFIG_TELCLOCK
diff --git a/baseconfig/CONFIG_TERANETICS_PHY b/configs/base-generic/CONFIG_TERANETICS_PHY
index 3f0ce3f88..3f0ce3f88 100644
--- a/baseconfig/CONFIG_TERANETICS_PHY
+++ b/configs/base-generic/CONFIG_TERANETICS_PHY
diff --git a/baseconfig/CONFIG_TEST_ASYNC_DRIVER_PROBE b/configs/base-generic/CONFIG_TEST_ASYNC_DRIVER_PROBE
index 40f4a33e8..40f4a33e8 100644
--- a/baseconfig/CONFIG_TEST_ASYNC_DRIVER_PROBE
+++ b/configs/base-generic/CONFIG_TEST_ASYNC_DRIVER_PROBE
diff --git a/baseconfig/CONFIG_TEST_BITMAP b/configs/base-generic/CONFIG_TEST_BITMAP
index 444f2cff0..444f2cff0 100644
--- a/baseconfig/CONFIG_TEST_BITMAP
+++ b/configs/base-generic/CONFIG_TEST_BITMAP
diff --git a/baseconfig/CONFIG_TEST_BPF b/configs/base-generic/CONFIG_TEST_BPF
index e1f0c0636..e1f0c0636 100644
--- a/baseconfig/CONFIG_TEST_BPF
+++ b/configs/base-generic/CONFIG_TEST_BPF
diff --git a/baseconfig/CONFIG_TEST_FIRMWARE b/configs/base-generic/CONFIG_TEST_FIRMWARE
index e59302889..e59302889 100644
--- a/baseconfig/CONFIG_TEST_FIRMWARE
+++ b/configs/base-generic/CONFIG_TEST_FIRMWARE
diff --git a/baseconfig/CONFIG_TEST_HASH b/configs/base-generic/CONFIG_TEST_HASH
index 80eb79dbb..80eb79dbb 100644
--- a/baseconfig/CONFIG_TEST_HASH
+++ b/configs/base-generic/CONFIG_TEST_HASH
diff --git a/baseconfig/CONFIG_TEST_HEXDUMP b/configs/base-generic/CONFIG_TEST_HEXDUMP
index 7a62932d9..7a62932d9 100644
--- a/baseconfig/CONFIG_TEST_HEXDUMP
+++ b/configs/base-generic/CONFIG_TEST_HEXDUMP
diff --git a/baseconfig/CONFIG_TEST_KMOD b/configs/base-generic/CONFIG_TEST_KMOD
index 59165b345..59165b345 100644
--- a/baseconfig/CONFIG_TEST_KMOD
+++ b/configs/base-generic/CONFIG_TEST_KMOD
diff --git a/baseconfig/CONFIG_TEST_KSTRTOX b/configs/base-generic/CONFIG_TEST_KSTRTOX
index e85f83bc9..e85f83bc9 100644
--- a/baseconfig/CONFIG_TEST_KSTRTOX
+++ b/configs/base-generic/CONFIG_TEST_KSTRTOX
diff --git a/baseconfig/CONFIG_TEST_LIST_SORT b/configs/base-generic/CONFIG_TEST_LIST_SORT
index 1c8710365..1c8710365 100644
--- a/baseconfig/CONFIG_TEST_LIST_SORT
+++ b/configs/base-generic/CONFIG_TEST_LIST_SORT
diff --git a/baseconfig/CONFIG_TEST_LKM b/configs/base-generic/CONFIG_TEST_LKM
index b52f756d8..b52f756d8 100644
--- a/baseconfig/CONFIG_TEST_LKM
+++ b/configs/base-generic/CONFIG_TEST_LKM
diff --git a/baseconfig/CONFIG_TEST_PARMAN b/configs/base-generic/CONFIG_TEST_PARMAN
index 2aade4293..2aade4293 100644
--- a/baseconfig/CONFIG_TEST_PARMAN
+++ b/configs/base-generic/CONFIG_TEST_PARMAN
diff --git a/baseconfig/CONFIG_TEST_POWER b/configs/base-generic/CONFIG_TEST_POWER
index 64e229a69..64e229a69 100644
--- a/baseconfig/CONFIG_TEST_POWER
+++ b/configs/base-generic/CONFIG_TEST_POWER
diff --git a/baseconfig/CONFIG_TEST_PRINTF b/configs/base-generic/CONFIG_TEST_PRINTF
index 5b3c2da98..5b3c2da98 100644
--- a/baseconfig/CONFIG_TEST_PRINTF
+++ b/configs/base-generic/CONFIG_TEST_PRINTF
diff --git a/baseconfig/CONFIG_TEST_RHASHTABLE b/configs/base-generic/CONFIG_TEST_RHASHTABLE
index 5d9f7d290..5d9f7d290 100644
--- a/baseconfig/CONFIG_TEST_RHASHTABLE
+++ b/configs/base-generic/CONFIG_TEST_RHASHTABLE
diff --git a/baseconfig/CONFIG_TEST_SORT b/configs/base-generic/CONFIG_TEST_SORT
index de9e1bbd6..de9e1bbd6 100644
--- a/baseconfig/CONFIG_TEST_SORT
+++ b/configs/base-generic/CONFIG_TEST_SORT
diff --git a/baseconfig/CONFIG_TEST_STATIC_KEYS b/configs/base-generic/CONFIG_TEST_STATIC_KEYS
index 1bf36ae82..1bf36ae82 100644
--- a/baseconfig/CONFIG_TEST_STATIC_KEYS
+++ b/configs/base-generic/CONFIG_TEST_STATIC_KEYS
diff --git a/baseconfig/CONFIG_TEST_STRING_HELPERS b/configs/base-generic/CONFIG_TEST_STRING_HELPERS
index b12561567..b12561567 100644
--- a/baseconfig/CONFIG_TEST_STRING_HELPERS
+++ b/configs/base-generic/CONFIG_TEST_STRING_HELPERS
diff --git a/baseconfig/CONFIG_TEST_SYSCTL b/configs/base-generic/CONFIG_TEST_SYSCTL
index f81589ea4..f81589ea4 100644
--- a/baseconfig/CONFIG_TEST_SYSCTL
+++ b/configs/base-generic/CONFIG_TEST_SYSCTL
diff --git a/baseconfig/CONFIG_TEST_UDELAY b/configs/base-generic/CONFIG_TEST_UDELAY
index 95fd4596f..95fd4596f 100644
--- a/baseconfig/CONFIG_TEST_UDELAY
+++ b/configs/base-generic/CONFIG_TEST_UDELAY
diff --git a/baseconfig/CONFIG_TEST_USER_COPY b/configs/base-generic/CONFIG_TEST_USER_COPY
index ba777e177..ba777e177 100644
--- a/baseconfig/CONFIG_TEST_USER_COPY
+++ b/configs/base-generic/CONFIG_TEST_USER_COPY
diff --git a/baseconfig/CONFIG_TEST_UUID b/configs/base-generic/CONFIG_TEST_UUID
index 434dbe100..434dbe100 100644
--- a/baseconfig/CONFIG_TEST_UUID
+++ b/configs/base-generic/CONFIG_TEST_UUID
diff --git a/baseconfig/CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE b/configs/base-generic/CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE
index 83801238f..83801238f 100644
--- a/baseconfig/CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE
+++ b/configs/base-generic/CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE
diff --git a/baseconfig/CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE b/configs/base-generic/CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE
index e70c564b4..e70c564b4 100644
--- a/baseconfig/CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE
+++ b/configs/base-generic/CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE
diff --git a/baseconfig/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS b/configs/base-generic/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
index 9288765d6..9288765d6 100644
--- a/baseconfig/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
+++ b/configs/base-generic/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
diff --git a/baseconfig/CONFIG_THERMAL_EMULATION b/configs/base-generic/CONFIG_THERMAL_EMULATION
index 230517ec2..230517ec2 100644
--- a/baseconfig/CONFIG_THERMAL_EMULATION
+++ b/configs/base-generic/CONFIG_THERMAL_EMULATION
diff --git a/baseconfig/CONFIG_THERMAL_GOV_BANG_BANG b/configs/base-generic/CONFIG_THERMAL_GOV_BANG_BANG
index 63f90615a..63f90615a 100644
--- a/baseconfig/CONFIG_THERMAL_GOV_BANG_BANG
+++ b/configs/base-generic/CONFIG_THERMAL_GOV_BANG_BANG
diff --git a/baseconfig/CONFIG_THERMAL_GOV_FAIR_SHARE b/configs/base-generic/CONFIG_THERMAL_GOV_FAIR_SHARE
index b32c15590..b32c15590 100644
--- a/baseconfig/CONFIG_THERMAL_GOV_FAIR_SHARE
+++ b/configs/base-generic/CONFIG_THERMAL_GOV_FAIR_SHARE
diff --git a/baseconfig/CONFIG_THERMAL_GOV_POWER_ALLOCATOR b/configs/base-generic/CONFIG_THERMAL_GOV_POWER_ALLOCATOR
index 5d1a0b499..5d1a0b499 100644
--- a/baseconfig/CONFIG_THERMAL_GOV_POWER_ALLOCATOR
+++ b/configs/base-generic/CONFIG_THERMAL_GOV_POWER_ALLOCATOR
diff --git a/baseconfig/CONFIG_THERMAL_GOV_STEP_WISE b/configs/base-generic/CONFIG_THERMAL_GOV_STEP_WISE
index 614bc305e..614bc305e 100644
--- a/baseconfig/CONFIG_THERMAL_GOV_STEP_WISE
+++ b/configs/base-generic/CONFIG_THERMAL_GOV_STEP_WISE
diff --git a/baseconfig/CONFIG_THERMAL_GOV_USER_SPACE b/configs/base-generic/CONFIG_THERMAL_GOV_USER_SPACE
index 38df53e87..38df53e87 100644
--- a/baseconfig/CONFIG_THERMAL_GOV_USER_SPACE
+++ b/configs/base-generic/CONFIG_THERMAL_GOV_USER_SPACE
diff --git a/baseconfig/CONFIG_THERMAL_HWMON b/configs/base-generic/CONFIG_THERMAL_HWMON
index 3404084e0..3404084e0 100644
--- a/baseconfig/CONFIG_THERMAL_HWMON
+++ b/configs/base-generic/CONFIG_THERMAL_HWMON
diff --git a/baseconfig/CONFIG_THERMAL_OF b/configs/base-generic/CONFIG_THERMAL_OF
index ad953b6af..ad953b6af 100644
--- a/baseconfig/CONFIG_THERMAL_OF
+++ b/configs/base-generic/CONFIG_THERMAL_OF
diff --git a/baseconfig/CONFIG_THERMAL_WRITABLE_TRIPS b/configs/base-generic/CONFIG_THERMAL_WRITABLE_TRIPS
index abc3c076e..abc3c076e 100644
--- a/baseconfig/CONFIG_THERMAL_WRITABLE_TRIPS
+++ b/configs/base-generic/CONFIG_THERMAL_WRITABLE_TRIPS
diff --git a/baseconfig/CONFIG_THRUSTMASTER_FF b/configs/base-generic/CONFIG_THRUSTMASTER_FF
index 741004ece..741004ece 100644
--- a/baseconfig/CONFIG_THRUSTMASTER_FF
+++ b/configs/base-generic/CONFIG_THRUSTMASTER_FF
diff --git a/baseconfig/CONFIG_THUNDERBOLT b/configs/base-generic/CONFIG_THUNDERBOLT
index dce0561e8..dce0561e8 100644
--- a/baseconfig/CONFIG_THUNDERBOLT
+++ b/configs/base-generic/CONFIG_THUNDERBOLT
diff --git a/baseconfig/CONFIG_TIFM_7XX1 b/configs/base-generic/CONFIG_TIFM_7XX1
index 86734bb34..86734bb34 100644
--- a/baseconfig/CONFIG_TIFM_7XX1
+++ b/configs/base-generic/CONFIG_TIFM_7XX1
diff --git a/baseconfig/CONFIG_TIFM_CORE b/configs/base-generic/CONFIG_TIFM_CORE
index 21d8210ff..21d8210ff 100644
--- a/baseconfig/CONFIG_TIFM_CORE
+++ b/configs/base-generic/CONFIG_TIFM_CORE
diff --git a/baseconfig/CONFIG_TIGON3 b/configs/base-generic/CONFIG_TIGON3
index 673c01b6a..673c01b6a 100644
--- a/baseconfig/CONFIG_TIGON3
+++ b/configs/base-generic/CONFIG_TIGON3
diff --git a/baseconfig/CONFIG_TIGON3_HWMON b/configs/base-generic/CONFIG_TIGON3_HWMON
index 31215b555..31215b555 100644
--- a/baseconfig/CONFIG_TIGON3_HWMON
+++ b/configs/base-generic/CONFIG_TIGON3_HWMON
diff --git a/baseconfig/CONFIG_TIMB_DMA b/configs/base-generic/CONFIG_TIMB_DMA
index 23ecd74d8..23ecd74d8 100644
--- a/baseconfig/CONFIG_TIMB_DMA
+++ b/configs/base-generic/CONFIG_TIMB_DMA
diff --git a/baseconfig/CONFIG_TIMER_STATS b/configs/base-generic/CONFIG_TIMER_STATS
index 0dfc820be..0dfc820be 100644
--- a/baseconfig/CONFIG_TIMER_STATS
+++ b/configs/base-generic/CONFIG_TIMER_STATS
diff --git a/baseconfig/CONFIG_TIPC b/configs/base-generic/CONFIG_TIPC
index 764e2085e..764e2085e 100644
--- a/baseconfig/CONFIG_TIPC
+++ b/configs/base-generic/CONFIG_TIPC
diff --git a/baseconfig/CONFIG_TIPC_MEDIA_IB b/configs/base-generic/CONFIG_TIPC_MEDIA_IB
index e564bb68b..e564bb68b 100644
--- a/baseconfig/CONFIG_TIPC_MEDIA_IB
+++ b/configs/base-generic/CONFIG_TIPC_MEDIA_IB
diff --git a/baseconfig/CONFIG_TIPC_MEDIA_UDP b/configs/base-generic/CONFIG_TIPC_MEDIA_UDP
index d25fc0f03..d25fc0f03 100644
--- a/baseconfig/CONFIG_TIPC_MEDIA_UDP
+++ b/configs/base-generic/CONFIG_TIPC_MEDIA_UDP
diff --git a/baseconfig/CONFIG_TI_ADC081C b/configs/base-generic/CONFIG_TI_ADC081C
index 58ab34695..58ab34695 100644
--- a/baseconfig/CONFIG_TI_ADC081C
+++ b/configs/base-generic/CONFIG_TI_ADC081C
diff --git a/baseconfig/CONFIG_TI_ADC0832 b/configs/base-generic/CONFIG_TI_ADC0832
index a1e55e6c0..a1e55e6c0 100644
--- a/baseconfig/CONFIG_TI_ADC0832
+++ b/configs/base-generic/CONFIG_TI_ADC0832
diff --git a/baseconfig/CONFIG_TI_ADC084S021 b/configs/base-generic/CONFIG_TI_ADC084S021
index 484542094..484542094 100644
--- a/baseconfig/CONFIG_TI_ADC084S021
+++ b/configs/base-generic/CONFIG_TI_ADC084S021
diff --git a/baseconfig/CONFIG_TI_ADC108S102 b/configs/base-generic/CONFIG_TI_ADC108S102
index b70880f5b..b70880f5b 100644
--- a/baseconfig/CONFIG_TI_ADC108S102
+++ b/configs/base-generic/CONFIG_TI_ADC108S102
diff --git a/baseconfig/CONFIG_TI_ADC12138 b/configs/base-generic/CONFIG_TI_ADC12138
index 097a76b1d..097a76b1d 100644
--- a/baseconfig/CONFIG_TI_ADC12138
+++ b/configs/base-generic/CONFIG_TI_ADC12138
diff --git a/baseconfig/CONFIG_TI_ADC128S052 b/configs/base-generic/CONFIG_TI_ADC128S052
index d42dd79ca..d42dd79ca 100644
--- a/baseconfig/CONFIG_TI_ADC128S052
+++ b/configs/base-generic/CONFIG_TI_ADC128S052
diff --git a/baseconfig/CONFIG_TI_ADC161S626 b/configs/base-generic/CONFIG_TI_ADC161S626
index 016e8c552..016e8c552 100644
--- a/baseconfig/CONFIG_TI_ADC161S626
+++ b/configs/base-generic/CONFIG_TI_ADC161S626
diff --git a/baseconfig/CONFIG_TI_ADS1015 b/configs/base-generic/CONFIG_TI_ADS1015
index f57c3fdc4..f57c3fdc4 100644
--- a/baseconfig/CONFIG_TI_ADS1015
+++ b/configs/base-generic/CONFIG_TI_ADS1015
diff --git a/baseconfig/CONFIG_TI_ADS7950 b/configs/base-generic/CONFIG_TI_ADS7950
index f2a68954b..f2a68954b 100644
--- a/baseconfig/CONFIG_TI_ADS7950
+++ b/configs/base-generic/CONFIG_TI_ADS7950
diff --git a/baseconfig/CONFIG_TI_ADS8688 b/configs/base-generic/CONFIG_TI_ADS8688
index c1e7d3010..c1e7d3010 100644
--- a/baseconfig/CONFIG_TI_ADS8688
+++ b/configs/base-generic/CONFIG_TI_ADS8688
diff --git a/baseconfig/CONFIG_TI_CPSW_ALE b/configs/base-generic/CONFIG_TI_CPSW_ALE
index 1bd3a2e79..1bd3a2e79 100644
--- a/baseconfig/CONFIG_TI_CPSW_ALE
+++ b/configs/base-generic/CONFIG_TI_CPSW_ALE
diff --git a/baseconfig/CONFIG_TI_DAC7512 b/configs/base-generic/CONFIG_TI_DAC7512
index 30609953c..30609953c 100644
--- a/baseconfig/CONFIG_TI_DAC7512
+++ b/configs/base-generic/CONFIG_TI_DAC7512
diff --git a/baseconfig/CONFIG_TI_SCI_PROTOCOL b/configs/base-generic/CONFIG_TI_SCI_PROTOCOL
index 10dfa04f9..10dfa04f9 100644
--- a/baseconfig/CONFIG_TI_SCI_PROTOCOL
+++ b/configs/base-generic/CONFIG_TI_SCI_PROTOCOL
diff --git a/baseconfig/CONFIG_TI_ST b/configs/base-generic/CONFIG_TI_ST
index 6d11e4e2c..6d11e4e2c 100644
--- a/baseconfig/CONFIG_TI_ST
+++ b/configs/base-generic/CONFIG_TI_ST
diff --git a/baseconfig/CONFIG_TI_TLC4541 b/configs/base-generic/CONFIG_TI_TLC4541
index c8c8183fd..c8c8183fd 100644
--- a/baseconfig/CONFIG_TI_TLC4541
+++ b/configs/base-generic/CONFIG_TI_TLC4541
diff --git a/baseconfig/CONFIG_TLAN b/configs/base-generic/CONFIG_TLAN
index 4af057d45..4af057d45 100644
--- a/baseconfig/CONFIG_TLAN
+++ b/configs/base-generic/CONFIG_TLAN
diff --git a/baseconfig/CONFIG_TLS b/configs/base-generic/CONFIG_TLS
index 1d627c36a..1d627c36a 100644
--- a/baseconfig/CONFIG_TLS
+++ b/configs/base-generic/CONFIG_TLS
diff --git a/baseconfig/CONFIG_TMD_HERMES b/configs/base-generic/CONFIG_TMD_HERMES
index 4d901554c..4d901554c 100644
--- a/baseconfig/CONFIG_TMD_HERMES
+++ b/configs/base-generic/CONFIG_TMD_HERMES
diff --git a/baseconfig/CONFIG_TMP006 b/configs/base-generic/CONFIG_TMP006
index d76f2b090..d76f2b090 100644
--- a/baseconfig/CONFIG_TMP006
+++ b/configs/base-generic/CONFIG_TMP006
diff --git a/baseconfig/CONFIG_TMP007 b/configs/base-generic/CONFIG_TMP007
index a3a96d4a8..a3a96d4a8 100644
--- a/baseconfig/CONFIG_TMP007
+++ b/configs/base-generic/CONFIG_TMP007
diff --git a/baseconfig/CONFIG_TMPFS b/configs/base-generic/CONFIG_TMPFS
index 417f7b76b..417f7b76b 100644
--- a/baseconfig/CONFIG_TMPFS
+++ b/configs/base-generic/CONFIG_TMPFS
diff --git a/baseconfig/CONFIG_TMPFS_POSIX_ACL b/configs/base-generic/CONFIG_TMPFS_POSIX_ACL
index 2c4c8f4e8..2c4c8f4e8 100644
--- a/baseconfig/CONFIG_TMPFS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_TMPFS_POSIX_ACL
diff --git a/baseconfig/CONFIG_TMPFS_XATTR b/configs/base-generic/CONFIG_TMPFS_XATTR
index c83e77775..c83e77775 100644
--- a/baseconfig/CONFIG_TMPFS_XATTR
+++ b/configs/base-generic/CONFIG_TMPFS_XATTR
diff --git a/baseconfig/CONFIG_TOIM3232_DONGLE b/configs/base-generic/CONFIG_TOIM3232_DONGLE
index a657c0499..a657c0499 100644
--- a/baseconfig/CONFIG_TOIM3232_DONGLE
+++ b/configs/base-generic/CONFIG_TOIM3232_DONGLE
diff --git a/baseconfig/CONFIG_TOSHIBA_FIR b/configs/base-generic/CONFIG_TOSHIBA_FIR
index fd5cda6bb..fd5cda6bb 100644
--- a/baseconfig/CONFIG_TOSHIBA_FIR
+++ b/configs/base-generic/CONFIG_TOSHIBA_FIR
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_AD7877 b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7877
index 822e85f15..822e85f15 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_AD7877
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7877
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_AD7879 b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7879
index c3836e69d..c3836e69d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_AD7879
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7879
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_AD7879_I2C b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7879_I2C
index f7fdb66d4..f7fdb66d4 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_AD7879_I2C
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_AD7879_I2C
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ADS7846 b/configs/base-generic/CONFIG_TOUCHSCREEN_ADS7846
index dd12ad15c..dd12ad15c 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ADS7846
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ADS7846
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_AR1021_I2C b/configs/base-generic/CONFIG_TOUCHSCREEN_AR1021_I2C
index a93a63bea..a93a63bea 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_AR1021_I2C
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_AR1021_I2C
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ATMEL_MXT b/configs/base-generic/CONFIG_TOUCHSCREEN_ATMEL_MXT
index fb16290e1..fb16290e1 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ATMEL_MXT
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ATMEL_MXT
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 b/configs/base-generic/CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
index 2a0098bf1..2a0098bf1 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/configs/base-generic/CONFIG_TOUCHSCREEN_AUO_PIXCIR
index 1ab6fb261..1ab6fb261 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_AUO_PIXCIR
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_BU21013 b/configs/base-generic/CONFIG_TOUCHSCREEN_BU21013
index 547232cb2..547232cb2 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_BU21013
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_BU21013
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 b/configs/base-generic/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
index a61c15a4d..a61c15a4d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_CY8CTMG110 b/configs/base-generic/CONFIG_TOUCHSCREEN_CY8CTMG110
index 0e43d53b5..0e43d53b5 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_CY8CTMG110
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_CY8CTMG110
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_CYTTSP4_CORE b/configs/base-generic/CONFIG_TOUCHSCREEN_CYTTSP4_CORE
index 9a38f4fd8..9a38f4fd8 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_CYTTSP4_CORE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_CYTTSP4_CORE
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_CYTTSP_CORE b/configs/base-generic/CONFIG_TOUCHSCREEN_CYTTSP_CORE
index aa92f1028..aa92f1028 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_CYTTSP_CORE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_CYTTSP_CORE
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_DYNAPRO b/configs/base-generic/CONFIG_TOUCHSCREEN_DYNAPRO
index c0c2aac1d..c0c2aac1d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_DYNAPRO
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_DYNAPRO
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_EDT_FT5X06 b/configs/base-generic/CONFIG_TOUCHSCREEN_EDT_FT5X06
index 707a2cac5..707a2cac5 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_EDT_FT5X06
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_EDT_FT5X06
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_EETI b/configs/base-generic/CONFIG_TOUCHSCREEN_EETI
index d4bb6ff41..d4bb6ff41 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_EETI
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_EETI
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_EGALAX b/configs/base-generic/CONFIG_TOUCHSCREEN_EGALAX
index f16c1f5ce..f16c1f5ce 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_EGALAX
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_EGALAX
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_EGALAX_SERIAL b/configs/base-generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL
index e5f6e2bb7..e5f6e2bb7 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_EGALAX_SERIAL
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_EKTF2127 b/configs/base-generic/CONFIG_TOUCHSCREEN_EKTF2127
index 2b8f3d594..2b8f3d594 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_EKTF2127
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_EKTF2127
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ELAN b/configs/base-generic/CONFIG_TOUCHSCREEN_ELAN
index f72fe0a9f..f72fe0a9f 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ELAN
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ELAN
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ELO b/configs/base-generic/CONFIG_TOUCHSCREEN_ELO
index 889c6b213..889c6b213 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ELO
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ELO
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_FT6236 b/configs/base-generic/CONFIG_TOUCHSCREEN_FT6236
index fb21c0793..fb21c0793 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_FT6236
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_FT6236
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_FUJITSU b/configs/base-generic/CONFIG_TOUCHSCREEN_FUJITSU
index 331843651..331843651 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_FUJITSU
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_FUJITSU
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_GOODIX b/configs/base-generic/CONFIG_TOUCHSCREEN_GOODIX
index 2cd772276..2cd772276 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_GOODIX
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_GOODIX
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_GUNZE b/configs/base-generic/CONFIG_TOUCHSCREEN_GUNZE
index 2e65c5201..2e65c5201 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_GUNZE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_GUNZE
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_HAMPSHIRE b/configs/base-generic/CONFIG_TOUCHSCREEN_HAMPSHIRE
index 6030c1a6c..6030c1a6c 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_HAMPSHIRE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_HAMPSHIRE
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ILI210X b/configs/base-generic/CONFIG_TOUCHSCREEN_ILI210X
index a8ebba27e..a8ebba27e 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ILI210X
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ILI210X
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_IMX6UL_TSC b/configs/base-generic/CONFIG_TOUCHSCREEN_IMX6UL_TSC
index 22a71d390..22a71d390 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_IMX6UL_TSC
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_IMX6UL_TSC
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_INEXIO b/configs/base-generic/CONFIG_TOUCHSCREEN_INEXIO
index ffc94383d..ffc94383d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_INEXIO
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_INEXIO
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MAX11801 b/configs/base-generic/CONFIG_TOUCHSCREEN_MAX11801
index 2273504da..2273504da 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MAX11801
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MAX11801
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MCS5000 b/configs/base-generic/CONFIG_TOUCHSCREEN_MCS5000
index afd8bd614..afd8bd614 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MCS5000
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MCS5000
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MELFAS_MIP4 b/configs/base-generic/CONFIG_TOUCHSCREEN_MELFAS_MIP4
index 0adb4f84a..0adb4f84a 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MELFAS_MIP4
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MELFAS_MIP4
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MK712 b/configs/base-generic/CONFIG_TOUCHSCREEN_MK712
index 13a5f250d..13a5f250d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MK712
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MK712
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MMS114 b/configs/base-generic/CONFIG_TOUCHSCREEN_MMS114
index 2bcf3b87e..2bcf3b87e 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MMS114
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MMS114
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_MTOUCH b/configs/base-generic/CONFIG_TOUCHSCREEN_MTOUCH
index acb361fea..acb361fea 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_MTOUCH
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_MTOUCH
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_PENMOUNT b/configs/base-generic/CONFIG_TOUCHSCREEN_PENMOUNT
index 625ee11d2..625ee11d2 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_PENMOUNT
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_PENMOUNT
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_PIXCIR b/configs/base-generic/CONFIG_TOUCHSCREEN_PIXCIR
index f7f877031..f7f877031 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_PIXCIR
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_PIXCIR
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_RM_TS b/configs/base-generic/CONFIG_TOUCHSCREEN_RM_TS
index ee05242bc..ee05242bc 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_RM_TS
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_RM_TS
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ROHM_BU21023 b/configs/base-generic/CONFIG_TOUCHSCREEN_ROHM_BU21023
index 94349fdcb..94349fdcb 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ROHM_BU21023
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ROHM_BU21023
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_SILEAD b/configs/base-generic/CONFIG_TOUCHSCREEN_SILEAD
index ce55127b1..ce55127b1 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_SILEAD
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_SILEAD
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_SIS_I2C b/configs/base-generic/CONFIG_TOUCHSCREEN_SIS_I2C
index 394382faf..394382faf 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_SIS_I2C
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_SIS_I2C
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ST1232 b/configs/base-generic/CONFIG_TOUCHSCREEN_ST1232
index c7e2ae632..c7e2ae632 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ST1232
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ST1232
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_STMFTS b/configs/base-generic/CONFIG_TOUCHSCREEN_STMFTS
index 0b1cd21e7..0b1cd21e7 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_STMFTS
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_STMFTS
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_SUR40 b/configs/base-generic/CONFIG_TOUCHSCREEN_SUR40
index 9a01190af..9a01190af 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_SUR40
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_SUR40
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_SURFACE3_SPI b/configs/base-generic/CONFIG_TOUCHSCREEN_SURFACE3_SPI
index 2254ef05f..2254ef05f 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_SURFACE3_SPI
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_SURFACE3_SPI
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_SX8654 b/configs/base-generic/CONFIG_TOUCHSCREEN_SX8654
index d63f10cfb..d63f10cfb 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_SX8654
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_SX8654
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TI_AM335X_TSC b/configs/base-generic/CONFIG_TOUCHSCREEN_TI_AM335X_TSC
index 0ff3da36f..0ff3da36f 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TI_AM335X_TSC
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TI_AM335X_TSC
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHIT213 b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHIT213
index 261a55cdf..261a55cdf 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHIT213
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHIT213
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHRIGHT b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT
index e005070af..e005070af 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHRIGHT
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHWIN b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHWIN
index 8b49f7cd9..8b49f7cd9 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TOUCHWIN
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TOUCHWIN
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TPS6507X b/configs/base-generic/CONFIG_TOUCHSCREEN_TPS6507X
index 6f56a322e..6f56a322e 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TPS6507X
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TPS6507X
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TS4800 b/configs/base-generic/CONFIG_TOUCHSCREEN_TS4800
index 775cc398c..775cc398c 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TS4800
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TS4800
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC2004 b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2004
index 6ecfb739d..6ecfb739d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TSC2004
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2004
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC2005 b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2005
index 6c1893766..6c1893766 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TSC2005
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2005
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC2007 b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2007
index e41b9bb37..e41b9bb37 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TSC2007
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2007
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC2007_IIO b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2007_IIO
index b67dd760f..b67dd760f 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TSC2007_IIO
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC2007_IIO
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_TSC_SERIO b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC_SERIO
index 6f34191a2..6f34191a2 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_TSC_SERIO
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_TSC_SERIO
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_UCB1400 b/configs/base-generic/CONFIG_TOUCHSCREEN_UCB1400
index 01029bdf8..01029bdf8 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_UCB1400
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_UCB1400
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_USB_COMPOSITE b/configs/base-generic/CONFIG_TOUCHSCREEN_USB_COMPOSITE
index 6772e4f9c..6772e4f9c 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_USB_COMPOSITE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_USB_COMPOSITE
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_USB_E2I b/configs/base-generic/CONFIG_TOUCHSCREEN_USB_E2I
index becbee889..becbee889 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_USB_E2I
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_USB_E2I
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_W90X900 b/configs/base-generic/CONFIG_TOUCHSCREEN_W90X900
index ff8ef2e8d..ff8ef2e8d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_W90X900
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_W90X900
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_WACOM_I2C b/configs/base-generic/CONFIG_TOUCHSCREEN_WACOM_I2C
index efff558f0..efff558f0 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_WACOM_I2C
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_WACOM_I2C
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_WACOM_W8001 b/configs/base-generic/CONFIG_TOUCHSCREEN_WACOM_W8001
index 27610e7df..27610e7df 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_WACOM_W8001
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_WACOM_W8001
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_WDT87XX_I2C b/configs/base-generic/CONFIG_TOUCHSCREEN_WDT87XX_I2C
index 66be75a9d..66be75a9d 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_WDT87XX_I2C
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_WDT87XX_I2C
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_WM97XX b/configs/base-generic/CONFIG_TOUCHSCREEN_WM97XX
index 6e5261bc5..6e5261bc5 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_WM97XX
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_WM97XX
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ZET6223 b/configs/base-generic/CONFIG_TOUCHSCREEN_ZET6223
index 134c0c432..134c0c432 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ZET6223
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ZET6223
diff --git a/baseconfig/CONFIG_TOUCHSCREEN_ZFORCE b/configs/base-generic/CONFIG_TOUCHSCREEN_ZFORCE
index 198beaaf7..198beaaf7 100644
--- a/baseconfig/CONFIG_TOUCHSCREEN_ZFORCE
+++ b/configs/base-generic/CONFIG_TOUCHSCREEN_ZFORCE
diff --git a/baseconfig/CONFIG_TPL0102 b/configs/base-generic/CONFIG_TPL0102
index a74d18f75..a74d18f75 100644
--- a/baseconfig/CONFIG_TPL0102
+++ b/configs/base-generic/CONFIG_TPL0102
diff --git a/baseconfig/CONFIG_TPS6105X b/configs/base-generic/CONFIG_TPS6105X
index 8b8423e57..8b8423e57 100644
--- a/baseconfig/CONFIG_TPS6105X
+++ b/configs/base-generic/CONFIG_TPS6105X
diff --git a/baseconfig/CONFIG_TPS65010 b/configs/base-generic/CONFIG_TPS65010
index 3be4f7b82..3be4f7b82 100644
--- a/baseconfig/CONFIG_TPS65010
+++ b/configs/base-generic/CONFIG_TPS65010
diff --git a/baseconfig/CONFIG_TPS6507X b/configs/base-generic/CONFIG_TPS6507X
index bf40879fd..bf40879fd 100644
--- a/baseconfig/CONFIG_TPS6507X
+++ b/configs/base-generic/CONFIG_TPS6507X
diff --git a/baseconfig/CONFIG_TR b/configs/base-generic/CONFIG_TR
index 7e4e24ec2..7e4e24ec2 100644
--- a/baseconfig/CONFIG_TR
+++ b/configs/base-generic/CONFIG_TR
diff --git a/baseconfig/CONFIG_TRACEPOINT_BENCHMARK b/configs/base-generic/CONFIG_TRACEPOINT_BENCHMARK
index c5ad1dcc2..c5ad1dcc2 100644
--- a/baseconfig/CONFIG_TRACEPOINT_BENCHMARK
+++ b/configs/base-generic/CONFIG_TRACEPOINT_BENCHMARK
diff --git a/baseconfig/CONFIG_TRACER_SNAPSHOT b/configs/base-generic/CONFIG_TRACER_SNAPSHOT
index 31429b63d..31429b63d 100644
--- a/baseconfig/CONFIG_TRACER_SNAPSHOT
+++ b/configs/base-generic/CONFIG_TRACER_SNAPSHOT
diff --git a/baseconfig/CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP b/configs/base-generic/CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP
index 83708605f..83708605f 100644
--- a/baseconfig/CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP
+++ b/configs/base-generic/CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP
diff --git a/baseconfig/CONFIG_TRACE_BRANCH_PROFILING b/configs/base-generic/CONFIG_TRACE_BRANCH_PROFILING
index 62a87eb7f..62a87eb7f 100644
--- a/baseconfig/CONFIG_TRACE_BRANCH_PROFILING
+++ b/configs/base-generic/CONFIG_TRACE_BRANCH_PROFILING
diff --git a/baseconfig/CONFIG_TRACE_ENUM_MAP_FILE b/configs/base-generic/CONFIG_TRACE_ENUM_MAP_FILE
index 641042e95..641042e95 100644
--- a/baseconfig/CONFIG_TRACE_ENUM_MAP_FILE
+++ b/configs/base-generic/CONFIG_TRACE_ENUM_MAP_FILE
diff --git a/baseconfig/CONFIG_TRACE_EVAL_MAP_FILE b/configs/base-generic/CONFIG_TRACE_EVAL_MAP_FILE
index 64d28ec6a..64d28ec6a 100644
--- a/baseconfig/CONFIG_TRACE_EVAL_MAP_FILE
+++ b/configs/base-generic/CONFIG_TRACE_EVAL_MAP_FILE
diff --git a/baseconfig/CONFIG_TRACE_SINK b/configs/base-generic/CONFIG_TRACE_SINK
index d20f512ef..d20f512ef 100644
--- a/baseconfig/CONFIG_TRACE_SINK
+++ b/configs/base-generic/CONFIG_TRACE_SINK
diff --git a/baseconfig/CONFIG_TRACING_EVENTS_GPIO b/configs/base-generic/CONFIG_TRACING_EVENTS_GPIO
index c18054ee3..c18054ee3 100644
--- a/baseconfig/CONFIG_TRACING_EVENTS_GPIO
+++ b/configs/base-generic/CONFIG_TRACING_EVENTS_GPIO
diff --git a/baseconfig/CONFIG_TRUSTED_KEYS b/configs/base-generic/CONFIG_TRUSTED_KEYS
index 9a8bb08d6..9a8bb08d6 100644
--- a/baseconfig/CONFIG_TRUSTED_KEYS
+++ b/configs/base-generic/CONFIG_TRUSTED_KEYS
diff --git a/baseconfig/CONFIG_TS4800_IRQ b/configs/base-generic/CONFIG_TS4800_IRQ
index 59d46bd6a..59d46bd6a 100644
--- a/baseconfig/CONFIG_TS4800_IRQ
+++ b/configs/base-generic/CONFIG_TS4800_IRQ
diff --git a/baseconfig/CONFIG_TS4800_WATCHDOG b/configs/base-generic/CONFIG_TS4800_WATCHDOG
index 1a98eb3ed..1a98eb3ed 100644
--- a/baseconfig/CONFIG_TS4800_WATCHDOG
+++ b/configs/base-generic/CONFIG_TS4800_WATCHDOG
diff --git a/baseconfig/CONFIG_TSL2583 b/configs/base-generic/CONFIG_TSL2583
index 04de26240..04de26240 100644
--- a/baseconfig/CONFIG_TSL2583
+++ b/configs/base-generic/CONFIG_TSL2583
diff --git a/baseconfig/CONFIG_TSL2x7x b/configs/base-generic/CONFIG_TSL2x7x
index 566ddc2cc..566ddc2cc 100644
--- a/baseconfig/CONFIG_TSL2x7x
+++ b/configs/base-generic/CONFIG_TSL2x7x
diff --git a/baseconfig/CONFIG_TSL4531 b/configs/base-generic/CONFIG_TSL4531
index f83080df9..f83080df9 100644
--- a/baseconfig/CONFIG_TSL4531
+++ b/configs/base-generic/CONFIG_TSL4531
diff --git a/baseconfig/CONFIG_TSYS01 b/configs/base-generic/CONFIG_TSYS01
index 278ed9b09..278ed9b09 100644
--- a/baseconfig/CONFIG_TSYS01
+++ b/configs/base-generic/CONFIG_TSYS01
diff --git a/baseconfig/CONFIG_TSYS02D b/configs/base-generic/CONFIG_TSYS02D
index a81a8031d..a81a8031d 100644
--- a/baseconfig/CONFIG_TSYS02D
+++ b/configs/base-generic/CONFIG_TSYS02D
diff --git a/baseconfig/CONFIG_TULIP b/configs/base-generic/CONFIG_TULIP
index 806435e9a..806435e9a 100644
--- a/baseconfig/CONFIG_TULIP
+++ b/configs/base-generic/CONFIG_TULIP
diff --git a/baseconfig/CONFIG_TULIP_MMIO b/configs/base-generic/CONFIG_TULIP_MMIO
index 9d7c8af42..9d7c8af42 100644
--- a/baseconfig/CONFIG_TULIP_MMIO
+++ b/configs/base-generic/CONFIG_TULIP_MMIO
diff --git a/baseconfig/CONFIG_TULIP_MWI b/configs/base-generic/CONFIG_TULIP_MWI
index ba9a49380..ba9a49380 100644
--- a/baseconfig/CONFIG_TULIP_MWI
+++ b/configs/base-generic/CONFIG_TULIP_MWI
diff --git a/baseconfig/CONFIG_TULIP_NAPI b/configs/base-generic/CONFIG_TULIP_NAPI
index 73a854540..73a854540 100644
--- a/baseconfig/CONFIG_TULIP_NAPI
+++ b/configs/base-generic/CONFIG_TULIP_NAPI
diff --git a/baseconfig/CONFIG_TUN b/configs/base-generic/CONFIG_TUN
index 12009e34d..12009e34d 100644
--- a/baseconfig/CONFIG_TUN
+++ b/configs/base-generic/CONFIG_TUN
diff --git a/baseconfig/CONFIG_TUN_VNET_CROSS_LE b/configs/base-generic/CONFIG_TUN_VNET_CROSS_LE
index 80f431815..80f431815 100644
--- a/baseconfig/CONFIG_TUN_VNET_CROSS_LE
+++ b/configs/base-generic/CONFIG_TUN_VNET_CROSS_LE
diff --git a/baseconfig/CONFIG_TWL4030_CORE b/configs/base-generic/CONFIG_TWL4030_CORE
index 1f5b92782..1f5b92782 100644
--- a/baseconfig/CONFIG_TWL4030_CORE
+++ b/configs/base-generic/CONFIG_TWL4030_CORE
diff --git a/baseconfig/CONFIG_TWL6040_CORE b/configs/base-generic/CONFIG_TWL6040_CORE
index d44fdc15f..d44fdc15f 100644
--- a/baseconfig/CONFIG_TWL6040_CORE
+++ b/configs/base-generic/CONFIG_TWL6040_CORE
diff --git a/baseconfig/CONFIG_TYPEC_FUSB302 b/configs/base-generic/CONFIG_TYPEC_FUSB302
index 9633e1956..9633e1956 100644
--- a/baseconfig/CONFIG_TYPEC_FUSB302
+++ b/configs/base-generic/CONFIG_TYPEC_FUSB302
diff --git a/baseconfig/CONFIG_TYPEC_TCPCI b/configs/base-generic/CONFIG_TYPEC_TCPCI
index 46687f546..46687f546 100644
--- a/baseconfig/CONFIG_TYPEC_TCPCI
+++ b/configs/base-generic/CONFIG_TYPEC_TCPCI
diff --git a/baseconfig/CONFIG_TYPEC_TCPM b/configs/base-generic/CONFIG_TYPEC_TCPM
index 8294bcc60..8294bcc60 100644
--- a/baseconfig/CONFIG_TYPEC_TCPM
+++ b/configs/base-generic/CONFIG_TYPEC_TCPM
diff --git a/baseconfig/CONFIG_TYPEC_UCSI b/configs/base-generic/CONFIG_TYPEC_UCSI
index 6eeb035c1..6eeb035c1 100644
--- a/baseconfig/CONFIG_TYPEC_UCSI
+++ b/configs/base-generic/CONFIG_TYPEC_UCSI
diff --git a/baseconfig/CONFIG_TYPEC_WCOVE b/configs/base-generic/CONFIG_TYPEC_WCOVE
index 8801ecb28..8801ecb28 100644
--- a/baseconfig/CONFIG_TYPEC_WCOVE
+++ b/configs/base-generic/CONFIG_TYPEC_WCOVE
diff --git a/baseconfig/CONFIG_TYPHOON b/configs/base-generic/CONFIG_TYPHOON
index fc0707fb4..fc0707fb4 100644
--- a/baseconfig/CONFIG_TYPHOON
+++ b/configs/base-generic/CONFIG_TYPHOON
diff --git a/baseconfig/CONFIG_UBIFS_ATIME_SUPPORT b/configs/base-generic/CONFIG_UBIFS_ATIME_SUPPORT
index 70f0ade9f..70f0ade9f 100644
--- a/baseconfig/CONFIG_UBIFS_ATIME_SUPPORT
+++ b/configs/base-generic/CONFIG_UBIFS_ATIME_SUPPORT
diff --git a/baseconfig/CONFIG_UBIFS_FS b/configs/base-generic/CONFIG_UBIFS_FS
index e71980df4..e71980df4 100644
--- a/baseconfig/CONFIG_UBIFS_FS
+++ b/configs/base-generic/CONFIG_UBIFS_FS
diff --git a/baseconfig/CONFIG_UBIFS_FS_ADVANCED_COMPR b/configs/base-generic/CONFIG_UBIFS_FS_ADVANCED_COMPR
index 33e0488a9..33e0488a9 100644
--- a/baseconfig/CONFIG_UBIFS_FS_ADVANCED_COMPR
+++ b/configs/base-generic/CONFIG_UBIFS_FS_ADVANCED_COMPR
diff --git a/baseconfig/CONFIG_UBIFS_FS_ENCRYPTION b/configs/base-generic/CONFIG_UBIFS_FS_ENCRYPTION
index 163dac774..163dac774 100644
--- a/baseconfig/CONFIG_UBIFS_FS_ENCRYPTION
+++ b/configs/base-generic/CONFIG_UBIFS_FS_ENCRYPTION
diff --git a/baseconfig/CONFIG_UBIFS_FS_SECURITY b/configs/base-generic/CONFIG_UBIFS_FS_SECURITY
index cb238b9c2..cb238b9c2 100644
--- a/baseconfig/CONFIG_UBIFS_FS_SECURITY
+++ b/configs/base-generic/CONFIG_UBIFS_FS_SECURITY
diff --git a/baseconfig/CONFIG_UBSAN b/configs/base-generic/CONFIG_UBSAN
index ef973c71d..ef973c71d 100644
--- a/baseconfig/CONFIG_UBSAN
+++ b/configs/base-generic/CONFIG_UBSAN
diff --git a/baseconfig/CONFIG_UBSAN_ALIGNMENT b/configs/base-generic/CONFIG_UBSAN_ALIGNMENT
index e9d6e5f7a..e9d6e5f7a 100644
--- a/baseconfig/CONFIG_UBSAN_ALIGNMENT
+++ b/configs/base-generic/CONFIG_UBSAN_ALIGNMENT
diff --git a/baseconfig/CONFIG_UBSAN_SANITIZE_ALL b/configs/base-generic/CONFIG_UBSAN_SANITIZE_ALL
index d8c5f1b53..d8c5f1b53 100644
--- a/baseconfig/CONFIG_UBSAN_SANITIZE_ALL
+++ b/configs/base-generic/CONFIG_UBSAN_SANITIZE_ALL
diff --git a/baseconfig/CONFIG_UCB1400_CORE b/configs/base-generic/CONFIG_UCB1400_CORE
index d1045efa1..d1045efa1 100644
--- a/baseconfig/CONFIG_UCB1400_CORE
+++ b/configs/base-generic/CONFIG_UCB1400_CORE
diff --git a/baseconfig/CONFIG_UCSI b/configs/base-generic/CONFIG_UCSI
index a0aee31c0..a0aee31c0 100644
--- a/baseconfig/CONFIG_UCSI
+++ b/configs/base-generic/CONFIG_UCSI
diff --git a/baseconfig/CONFIG_UCSI_ACPI b/configs/base-generic/CONFIG_UCSI_ACPI
index 34e35d282..34e35d282 100644
--- a/baseconfig/CONFIG_UCSI_ACPI
+++ b/configs/base-generic/CONFIG_UCSI_ACPI
diff --git a/baseconfig/CONFIG_UDF_FS b/configs/base-generic/CONFIG_UDF_FS
index 4c8e1e829..4c8e1e829 100644
--- a/baseconfig/CONFIG_UDF_FS
+++ b/configs/base-generic/CONFIG_UDF_FS
diff --git a/baseconfig/CONFIG_UEVENT_HELPER b/configs/base-generic/CONFIG_UEVENT_HELPER
index 262a0f054..262a0f054 100644
--- a/baseconfig/CONFIG_UEVENT_HELPER
+++ b/configs/base-generic/CONFIG_UEVENT_HELPER
diff --git a/baseconfig/CONFIG_UFS_DEBUG b/configs/base-generic/CONFIG_UFS_DEBUG
index b64de49fc..b64de49fc 100644
--- a/baseconfig/CONFIG_UFS_DEBUG
+++ b/configs/base-generic/CONFIG_UFS_DEBUG
diff --git a/baseconfig/CONFIG_UFS_FS b/configs/base-generic/CONFIG_UFS_FS
index 43f7443ad..43f7443ad 100644
--- a/baseconfig/CONFIG_UFS_FS
+++ b/configs/base-generic/CONFIG_UFS_FS
diff --git a/baseconfig/CONFIG_UFS_FS_WRITE b/configs/base-generic/CONFIG_UFS_FS_WRITE
index 90c90999b..90c90999b 100644
--- a/baseconfig/CONFIG_UFS_FS_WRITE
+++ b/configs/base-generic/CONFIG_UFS_FS_WRITE
diff --git a/baseconfig/CONFIG_UHID b/configs/base-generic/CONFIG_UHID
index dc2985779..dc2985779 100644
--- a/baseconfig/CONFIG_UHID
+++ b/configs/base-generic/CONFIG_UHID
diff --git a/baseconfig/CONFIG_UIO b/configs/base-generic/CONFIG_UIO
index 109e55966..109e55966 100644
--- a/baseconfig/CONFIG_UIO
+++ b/configs/base-generic/CONFIG_UIO
diff --git a/baseconfig/CONFIG_UIO_AEC b/configs/base-generic/CONFIG_UIO_AEC
index 2ee61ddb0..2ee61ddb0 100644
--- a/baseconfig/CONFIG_UIO_AEC
+++ b/configs/base-generic/CONFIG_UIO_AEC
diff --git a/baseconfig/CONFIG_UIO_CIF b/configs/base-generic/CONFIG_UIO_CIF
index 6ed58ca58..6ed58ca58 100644
--- a/baseconfig/CONFIG_UIO_CIF
+++ b/configs/base-generic/CONFIG_UIO_CIF
diff --git a/baseconfig/CONFIG_UIO_DMEM_GENIRQ b/configs/base-generic/CONFIG_UIO_DMEM_GENIRQ
index 2ad111cbe..2ad111cbe 100644
--- a/baseconfig/CONFIG_UIO_DMEM_GENIRQ
+++ b/configs/base-generic/CONFIG_UIO_DMEM_GENIRQ
diff --git a/baseconfig/CONFIG_UIO_HV_GENERIC b/configs/base-generic/CONFIG_UIO_HV_GENERIC
index 12f0b2b2a..12f0b2b2a 100644
--- a/baseconfig/CONFIG_UIO_HV_GENERIC
+++ b/configs/base-generic/CONFIG_UIO_HV_GENERIC
diff --git a/baseconfig/CONFIG_UIO_MF624 b/configs/base-generic/CONFIG_UIO_MF624
index 4a912c486..4a912c486 100644
--- a/baseconfig/CONFIG_UIO_MF624
+++ b/configs/base-generic/CONFIG_UIO_MF624
diff --git a/baseconfig/CONFIG_UIO_NETX b/configs/base-generic/CONFIG_UIO_NETX
index faca8ad87..faca8ad87 100644
--- a/baseconfig/CONFIG_UIO_NETX
+++ b/configs/base-generic/CONFIG_UIO_NETX
diff --git a/baseconfig/CONFIG_UIO_PCI_GENERIC b/configs/base-generic/CONFIG_UIO_PCI_GENERIC
index 46f7ab71c..46f7ab71c 100644
--- a/baseconfig/CONFIG_UIO_PCI_GENERIC
+++ b/configs/base-generic/CONFIG_UIO_PCI_GENERIC
diff --git a/baseconfig/CONFIG_UIO_PDRV b/configs/base-generic/CONFIG_UIO_PDRV
index 234d1ba5d..234d1ba5d 100644
--- a/baseconfig/CONFIG_UIO_PDRV
+++ b/configs/base-generic/CONFIG_UIO_PDRV
diff --git a/baseconfig/CONFIG_UIO_PDRV_GENIRQ b/configs/base-generic/CONFIG_UIO_PDRV_GENIRQ
index e33e5d355..e33e5d355 100644
--- a/baseconfig/CONFIG_UIO_PDRV_GENIRQ
+++ b/configs/base-generic/CONFIG_UIO_PDRV_GENIRQ
diff --git a/baseconfig/CONFIG_UIO_PRUSS b/configs/base-generic/CONFIG_UIO_PRUSS
index e1549ea24..e1549ea24 100644
--- a/baseconfig/CONFIG_UIO_PRUSS
+++ b/configs/base-generic/CONFIG_UIO_PRUSS
diff --git a/baseconfig/CONFIG_UIO_SERCOS3 b/configs/base-generic/CONFIG_UIO_SERCOS3
index 287c23a64..287c23a64 100644
--- a/baseconfig/CONFIG_UIO_SERCOS3
+++ b/configs/base-generic/CONFIG_UIO_SERCOS3
diff --git a/baseconfig/CONFIG_ULI526X b/configs/base-generic/CONFIG_ULI526X
index e1e9bc88a..e1e9bc88a 100644
--- a/baseconfig/CONFIG_ULI526X
+++ b/configs/base-generic/CONFIG_ULI526X
diff --git a/baseconfig/CONFIG_ULTRIX_PARTITION b/configs/base-generic/CONFIG_ULTRIX_PARTITION
index 918b1ac2b..918b1ac2b 100644
--- a/baseconfig/CONFIG_ULTRIX_PARTITION
+++ b/configs/base-generic/CONFIG_ULTRIX_PARTITION
diff --git a/baseconfig/CONFIG_UNISYSSPAR b/configs/base-generic/CONFIG_UNISYSSPAR
index d8bbe5cc2..d8bbe5cc2 100644
--- a/baseconfig/CONFIG_UNISYSSPAR
+++ b/configs/base-generic/CONFIG_UNISYSSPAR
diff --git a/baseconfig/CONFIG_UNIX b/configs/base-generic/CONFIG_UNIX
index 07b000ef4..07b000ef4 100644
--- a/baseconfig/CONFIG_UNIX
+++ b/configs/base-generic/CONFIG_UNIX
diff --git a/baseconfig/CONFIG_UNIX98_PTYS b/configs/base-generic/CONFIG_UNIX98_PTYS
index 9e2359922..9e2359922 100644
--- a/baseconfig/CONFIG_UNIX98_PTYS
+++ b/configs/base-generic/CONFIG_UNIX98_PTYS
diff --git a/baseconfig/CONFIG_UNIXWARE_DISKLABEL b/configs/base-generic/CONFIG_UNIXWARE_DISKLABEL
index 94a5d7bd1..94a5d7bd1 100644
--- a/baseconfig/CONFIG_UNIXWARE_DISKLABEL
+++ b/configs/base-generic/CONFIG_UNIXWARE_DISKLABEL
diff --git a/baseconfig/CONFIG_UNIX_DIAG b/configs/base-generic/CONFIG_UNIX_DIAG
index 51b222763..51b222763 100644
--- a/baseconfig/CONFIG_UNIX_DIAG
+++ b/configs/base-generic/CONFIG_UNIX_DIAG
diff --git a/baseconfig/CONFIG_UNUSED_SYMBOLS b/configs/base-generic/CONFIG_UNUSED_SYMBOLS
index c86acb390..c86acb390 100644
--- a/baseconfig/CONFIG_UNUSED_SYMBOLS
+++ b/configs/base-generic/CONFIG_UNUSED_SYMBOLS
diff --git a/baseconfig/CONFIG_UPROBE_EVENTS b/configs/base-generic/CONFIG_UPROBE_EVENTS
index 81f7be965..81f7be965 100644
--- a/baseconfig/CONFIG_UPROBE_EVENTS
+++ b/configs/base-generic/CONFIG_UPROBE_EVENTS
diff --git a/baseconfig/CONFIG_US5182D b/configs/base-generic/CONFIG_US5182D
index 176817910..176817910 100644
--- a/baseconfig/CONFIG_US5182D
+++ b/configs/base-generic/CONFIG_US5182D
diff --git a/baseconfig/CONFIG_USB b/configs/base-generic/CONFIG_USB
index 45e19309d..45e19309d 100644
--- a/baseconfig/CONFIG_USB
+++ b/configs/base-generic/CONFIG_USB
diff --git a/baseconfig/CONFIG_USBIP_CORE b/configs/base-generic/CONFIG_USBIP_CORE
index 971dca64d..971dca64d 100644
--- a/baseconfig/CONFIG_USBIP_CORE
+++ b/configs/base-generic/CONFIG_USBIP_CORE
diff --git a/baseconfig/CONFIG_USBIP_DEBUG b/configs/base-generic/CONFIG_USBIP_DEBUG
index eb6793c46..eb6793c46 100644
--- a/baseconfig/CONFIG_USBIP_DEBUG
+++ b/configs/base-generic/CONFIG_USBIP_DEBUG
diff --git a/baseconfig/CONFIG_USBIP_HOST b/configs/base-generic/CONFIG_USBIP_HOST
index c511de74e..c511de74e 100644
--- a/baseconfig/CONFIG_USBIP_HOST
+++ b/configs/base-generic/CONFIG_USBIP_HOST
diff --git a/baseconfig/CONFIG_USBIP_VHCI_HCD b/configs/base-generic/CONFIG_USBIP_VHCI_HCD
index 7d6365c74..7d6365c74 100644
--- a/baseconfig/CONFIG_USBIP_VHCI_HCD
+++ b/configs/base-generic/CONFIG_USBIP_VHCI_HCD
diff --git a/baseconfig/CONFIG_USBIP_VHCI_HC_PORTS b/configs/base-generic/CONFIG_USBIP_VHCI_HC_PORTS
index 820824e3f..820824e3f 100644
--- a/baseconfig/CONFIG_USBIP_VHCI_HC_PORTS
+++ b/configs/base-generic/CONFIG_USBIP_VHCI_HC_PORTS
diff --git a/baseconfig/CONFIG_USBIP_VHCI_NR_HCS b/configs/base-generic/CONFIG_USBIP_VHCI_NR_HCS
index c91105e22..c91105e22 100644
--- a/baseconfig/CONFIG_USBIP_VHCI_NR_HCS
+++ b/configs/base-generic/CONFIG_USBIP_VHCI_NR_HCS
diff --git a/baseconfig/CONFIG_USBIP_VUDC b/configs/base-generic/CONFIG_USBIP_VUDC
index 9c08156ae..9c08156ae 100644
--- a/baseconfig/CONFIG_USBIP_VUDC
+++ b/configs/base-generic/CONFIG_USBIP_VUDC
diff --git a/baseconfig/CONFIG_USBPCWATCHDOG b/configs/base-generic/CONFIG_USBPCWATCHDOG
index e92c7cbba..e92c7cbba 100644
--- a/baseconfig/CONFIG_USBPCWATCHDOG
+++ b/configs/base-generic/CONFIG_USBPCWATCHDOG
diff --git a/baseconfig/CONFIG_USB_ACM b/configs/base-generic/CONFIG_USB_ACM
index 62189f613..62189f613 100644
--- a/baseconfig/CONFIG_USB_ACM
+++ b/configs/base-generic/CONFIG_USB_ACM
diff --git a/baseconfig/CONFIG_USB_ADUTUX b/configs/base-generic/CONFIG_USB_ADUTUX
index e082deeb5..e082deeb5 100644
--- a/baseconfig/CONFIG_USB_ADUTUX
+++ b/configs/base-generic/CONFIG_USB_ADUTUX
diff --git a/baseconfig/CONFIG_USB_ALI_M5632 b/configs/base-generic/CONFIG_USB_ALI_M5632
index e578e0be4..e578e0be4 100644
--- a/baseconfig/CONFIG_USB_ALI_M5632
+++ b/configs/base-generic/CONFIG_USB_ALI_M5632
diff --git a/baseconfig/CONFIG_USB_AN2720 b/configs/base-generic/CONFIG_USB_AN2720
index 696ce5c88..696ce5c88 100644
--- a/baseconfig/CONFIG_USB_AN2720
+++ b/configs/base-generic/CONFIG_USB_AN2720
diff --git a/baseconfig/CONFIG_USB_ANNOUNCE_NEW_DEVICES b/configs/base-generic/CONFIG_USB_ANNOUNCE_NEW_DEVICES
index f6c074bb0..f6c074bb0 100644
--- a/baseconfig/CONFIG_USB_ANNOUNCE_NEW_DEVICES
+++ b/configs/base-generic/CONFIG_USB_ANNOUNCE_NEW_DEVICES
diff --git a/baseconfig/CONFIG_USB_APPLEDISPLAY b/configs/base-generic/CONFIG_USB_APPLEDISPLAY
index ec4e8a64a..ec4e8a64a 100644
--- a/baseconfig/CONFIG_USB_APPLEDISPLAY
+++ b/configs/base-generic/CONFIG_USB_APPLEDISPLAY
diff --git a/baseconfig/CONFIG_USB_ARMLINUX b/configs/base-generic/CONFIG_USB_ARMLINUX
index 597b27f40..597b27f40 100644
--- a/baseconfig/CONFIG_USB_ARMLINUX
+++ b/configs/base-generic/CONFIG_USB_ARMLINUX
diff --git a/baseconfig/CONFIG_USB_ATM b/configs/base-generic/CONFIG_USB_ATM
index 0bdc7ed90..0bdc7ed90 100644
--- a/baseconfig/CONFIG_USB_ATM
+++ b/configs/base-generic/CONFIG_USB_ATM
diff --git a/baseconfig/CONFIG_USB_ATMEL b/configs/base-generic/CONFIG_USB_ATMEL
index 8843bc433..8843bc433 100644
--- a/baseconfig/CONFIG_USB_ATMEL
+++ b/configs/base-generic/CONFIG_USB_ATMEL
diff --git a/baseconfig/CONFIG_USB_BELKIN b/configs/base-generic/CONFIG_USB_BELKIN
index 2f7e9876d..2f7e9876d 100644
--- a/baseconfig/CONFIG_USB_BELKIN
+++ b/configs/base-generic/CONFIG_USB_BELKIN
diff --git a/baseconfig/CONFIG_USB_C67X00_HCD b/configs/base-generic/CONFIG_USB_C67X00_HCD
index a0e2f42da..a0e2f42da 100644
--- a/baseconfig/CONFIG_USB_C67X00_HCD
+++ b/configs/base-generic/CONFIG_USB_C67X00_HCD
diff --git a/baseconfig/CONFIG_USB_CATC b/configs/base-generic/CONFIG_USB_CATC
index c89d8f72c..c89d8f72c 100644
--- a/baseconfig/CONFIG_USB_CATC
+++ b/configs/base-generic/CONFIG_USB_CATC
diff --git a/baseconfig/CONFIG_USB_CDC_PHONET b/configs/base-generic/CONFIG_USB_CDC_PHONET
index 07dab86f6..07dab86f6 100644
--- a/baseconfig/CONFIG_USB_CDC_PHONET
+++ b/configs/base-generic/CONFIG_USB_CDC_PHONET
diff --git a/baseconfig/CONFIG_USB_CHAOSKEY b/configs/base-generic/CONFIG_USB_CHAOSKEY
index e92d4cfb0..e92d4cfb0 100644
--- a/baseconfig/CONFIG_USB_CHAOSKEY
+++ b/configs/base-generic/CONFIG_USB_CHAOSKEY
diff --git a/baseconfig/CONFIG_USB_CHIPIDEA b/configs/base-generic/CONFIG_USB_CHIPIDEA
index b006254ad..b006254ad 100644
--- a/baseconfig/CONFIG_USB_CHIPIDEA
+++ b/configs/base-generic/CONFIG_USB_CHIPIDEA
diff --git a/baseconfig/CONFIG_USB_CHIPIDEA_ULPI b/configs/base-generic/CONFIG_USB_CHIPIDEA_ULPI
index c97b84c79..c97b84c79 100644
--- a/baseconfig/CONFIG_USB_CHIPIDEA_ULPI
+++ b/configs/base-generic/CONFIG_USB_CHIPIDEA_ULPI
diff --git a/baseconfig/CONFIG_USB_CONFIGFS_F_UAC1_LEGACY b/configs/base-generic/CONFIG_USB_CONFIGFS_F_UAC1_LEGACY
index 6dd4f027c..6dd4f027c 100644
--- a/baseconfig/CONFIG_USB_CONFIGFS_F_UAC1_LEGACY
+++ b/configs/base-generic/CONFIG_USB_CONFIGFS_F_UAC1_LEGACY
diff --git a/baseconfig/CONFIG_USB_CXACRU b/configs/base-generic/CONFIG_USB_CXACRU
index 7650d329e..7650d329e 100644
--- a/baseconfig/CONFIG_USB_CXACRU
+++ b/configs/base-generic/CONFIG_USB_CXACRU
diff --git a/baseconfig/CONFIG_USB_CYPRESS_CY7C63 b/configs/base-generic/CONFIG_USB_CYPRESS_CY7C63
index 5547144d9..5547144d9 100644
--- a/baseconfig/CONFIG_USB_CYPRESS_CY7C63
+++ b/configs/base-generic/CONFIG_USB_CYPRESS_CY7C63
diff --git a/baseconfig/CONFIG_USB_CYTHERM b/configs/base-generic/CONFIG_USB_CYTHERM
index e8dc4c60b..e8dc4c60b 100644
--- a/baseconfig/CONFIG_USB_CYTHERM
+++ b/configs/base-generic/CONFIG_USB_CYTHERM
diff --git a/baseconfig/CONFIG_USB_DEBUG b/configs/base-generic/CONFIG_USB_DEBUG
index 24cbd8d04..24cbd8d04 100644
--- a/baseconfig/CONFIG_USB_DEBUG
+++ b/configs/base-generic/CONFIG_USB_DEBUG
diff --git a/baseconfig/CONFIG_USB_DEFAULT_PERSIST b/configs/base-generic/CONFIG_USB_DEFAULT_PERSIST
index db89fa3d4..db89fa3d4 100644
--- a/baseconfig/CONFIG_USB_DEFAULT_PERSIST
+++ b/configs/base-generic/CONFIG_USB_DEFAULT_PERSIST
diff --git a/baseconfig/CONFIG_USB_DSBR b/configs/base-generic/CONFIG_USB_DSBR
index 618ec53c5..618ec53c5 100644
--- a/baseconfig/CONFIG_USB_DSBR
+++ b/configs/base-generic/CONFIG_USB_DSBR
diff --git a/baseconfig/CONFIG_USB_DWC2 b/configs/base-generic/CONFIG_USB_DWC2
index 94b56af6d..94b56af6d 100644
--- a/baseconfig/CONFIG_USB_DWC2
+++ b/configs/base-generic/CONFIG_USB_DWC2
diff --git a/baseconfig/CONFIG_USB_DWC3 b/configs/base-generic/CONFIG_USB_DWC3
index fc9f5c8fe..fc9f5c8fe 100644
--- a/baseconfig/CONFIG_USB_DWC3
+++ b/configs/base-generic/CONFIG_USB_DWC3
diff --git a/baseconfig/CONFIG_USB_DWC3_OF_SIMPLE b/configs/base-generic/CONFIG_USB_DWC3_OF_SIMPLE
index 49a38d42a..49a38d42a 100644
--- a/baseconfig/CONFIG_USB_DWC3_OF_SIMPLE
+++ b/configs/base-generic/CONFIG_USB_DWC3_OF_SIMPLE
diff --git a/baseconfig/CONFIG_USB_DYNAMIC_MINORS b/configs/base-generic/CONFIG_USB_DYNAMIC_MINORS
index 88b6f1f71..88b6f1f71 100644
--- a/baseconfig/CONFIG_USB_DYNAMIC_MINORS
+++ b/configs/base-generic/CONFIG_USB_DYNAMIC_MINORS
diff --git a/baseconfig/CONFIG_USB_EHCI_HCD b/configs/base-generic/CONFIG_USB_EHCI_HCD
index 7322dc2d5..7322dc2d5 100644
--- a/baseconfig/CONFIG_USB_EHCI_HCD
+++ b/configs/base-generic/CONFIG_USB_EHCI_HCD
diff --git a/baseconfig/CONFIG_USB_EHCI_HCD_PLATFORM b/configs/base-generic/CONFIG_USB_EHCI_HCD_PLATFORM
index 28e68839c..28e68839c 100644
--- a/baseconfig/CONFIG_USB_EHCI_HCD_PLATFORM
+++ b/configs/base-generic/CONFIG_USB_EHCI_HCD_PLATFORM
diff --git a/baseconfig/CONFIG_USB_EHCI_MV b/configs/base-generic/CONFIG_USB_EHCI_MV
index dbbc3345f..dbbc3345f 100644
--- a/baseconfig/CONFIG_USB_EHCI_MV
+++ b/configs/base-generic/CONFIG_USB_EHCI_MV
diff --git a/baseconfig/CONFIG_USB_EHCI_ROOT_HUB_TT b/configs/base-generic/CONFIG_USB_EHCI_ROOT_HUB_TT
index a5c3cc477..a5c3cc477 100644
--- a/baseconfig/CONFIG_USB_EHCI_ROOT_HUB_TT
+++ b/configs/base-generic/CONFIG_USB_EHCI_ROOT_HUB_TT
diff --git a/baseconfig/CONFIG_USB_EHCI_TT_NEWSCHED b/configs/base-generic/CONFIG_USB_EHCI_TT_NEWSCHED
index 1eebea303..1eebea303 100644
--- a/baseconfig/CONFIG_USB_EHCI_TT_NEWSCHED
+++ b/configs/base-generic/CONFIG_USB_EHCI_TT_NEWSCHED
diff --git a/baseconfig/CONFIG_USB_EHSET_TEST_FIXTURE b/configs/base-generic/CONFIG_USB_EHSET_TEST_FIXTURE
index 4cef71e49..4cef71e49 100644
--- a/baseconfig/CONFIG_USB_EHSET_TEST_FIXTURE
+++ b/configs/base-generic/CONFIG_USB_EHSET_TEST_FIXTURE
diff --git a/baseconfig/CONFIG_USB_EMI26 b/configs/base-generic/CONFIG_USB_EMI26
index 35081c0de..35081c0de 100644
--- a/baseconfig/CONFIG_USB_EMI26
+++ b/configs/base-generic/CONFIG_USB_EMI26
diff --git a/baseconfig/CONFIG_USB_EMI62 b/configs/base-generic/CONFIG_USB_EMI62
index f2e7d6628..f2e7d6628 100644
--- a/baseconfig/CONFIG_USB_EMI62
+++ b/configs/base-generic/CONFIG_USB_EMI62
diff --git a/baseconfig/CONFIG_USB_EPSON2888 b/configs/base-generic/CONFIG_USB_EPSON2888
index 944ff495a..944ff495a 100644
--- a/baseconfig/CONFIG_USB_EPSON2888
+++ b/configs/base-generic/CONFIG_USB_EPSON2888
diff --git a/baseconfig/CONFIG_USB_EZUSB b/configs/base-generic/CONFIG_USB_EZUSB
index 6f221aa0b..6f221aa0b 100644
--- a/baseconfig/CONFIG_USB_EZUSB
+++ b/configs/base-generic/CONFIG_USB_EZUSB
diff --git a/baseconfig/CONFIG_USB_EZUSB_FX2 b/configs/base-generic/CONFIG_USB_EZUSB_FX2
index cbcda7399..cbcda7399 100644
--- a/baseconfig/CONFIG_USB_EZUSB_FX2
+++ b/configs/base-generic/CONFIG_USB_EZUSB_FX2
diff --git a/baseconfig/CONFIG_USB_FOTG210_HCD b/configs/base-generic/CONFIG_USB_FOTG210_HCD
index 806a52fd5..806a52fd5 100644
--- a/baseconfig/CONFIG_USB_FOTG210_HCD
+++ b/configs/base-generic/CONFIG_USB_FOTG210_HCD
diff --git a/baseconfig/CONFIG_USB_FTDI_ELAN b/configs/base-generic/CONFIG_USB_FTDI_ELAN
index 87edda117..87edda117 100644
--- a/baseconfig/CONFIG_USB_FTDI_ELAN
+++ b/configs/base-generic/CONFIG_USB_FTDI_ELAN
diff --git a/baseconfig/CONFIG_USB_GADGET b/configs/base-generic/CONFIG_USB_GADGET
index 86fb660fe..86fb660fe 100644
--- a/baseconfig/CONFIG_USB_GADGET
+++ b/configs/base-generic/CONFIG_USB_GADGET
diff --git a/baseconfig/CONFIG_USB_GADGETFS b/configs/base-generic/CONFIG_USB_GADGETFS
index 8e55195f5..8e55195f5 100644
--- a/baseconfig/CONFIG_USB_GADGETFS
+++ b/configs/base-generic/CONFIG_USB_GADGETFS
diff --git a/baseconfig/CONFIG_USB_GL860 b/configs/base-generic/CONFIG_USB_GL860
index ad5c03b81..ad5c03b81 100644
--- a/baseconfig/CONFIG_USB_GL860
+++ b/configs/base-generic/CONFIG_USB_GL860
diff --git a/baseconfig/CONFIG_USB_GPIO_VBUS b/configs/base-generic/CONFIG_USB_GPIO_VBUS
index 3fb805336..3fb805336 100644
--- a/baseconfig/CONFIG_USB_GPIO_VBUS
+++ b/configs/base-generic/CONFIG_USB_GPIO_VBUS
diff --git a/baseconfig/CONFIG_USB_GR_UDC b/configs/base-generic/CONFIG_USB_GR_UDC
index cea9ca5cb..cea9ca5cb 100644
--- a/baseconfig/CONFIG_USB_GR_UDC
+++ b/configs/base-generic/CONFIG_USB_GR_UDC
diff --git a/baseconfig/CONFIG_USB_GSPCA b/configs/base-generic/CONFIG_USB_GSPCA
index ee98ad8e0..ee98ad8e0 100644
--- a/baseconfig/CONFIG_USB_GSPCA
+++ b/configs/base-generic/CONFIG_USB_GSPCA
diff --git a/baseconfig/CONFIG_USB_GSPCA_BENQ b/configs/base-generic/CONFIG_USB_GSPCA_BENQ
index 83b1e1644..83b1e1644 100644
--- a/baseconfig/CONFIG_USB_GSPCA_BENQ
+++ b/configs/base-generic/CONFIG_USB_GSPCA_BENQ
diff --git a/baseconfig/CONFIG_USB_GSPCA_CONEX b/configs/base-generic/CONFIG_USB_GSPCA_CONEX
index e837a0831..e837a0831 100644
--- a/baseconfig/CONFIG_USB_GSPCA_CONEX
+++ b/configs/base-generic/CONFIG_USB_GSPCA_CONEX
diff --git a/baseconfig/CONFIG_USB_GSPCA_CPIA1 b/configs/base-generic/CONFIG_USB_GSPCA_CPIA1
index 01423c37f..01423c37f 100644
--- a/baseconfig/CONFIG_USB_GSPCA_CPIA1
+++ b/configs/base-generic/CONFIG_USB_GSPCA_CPIA1
diff --git a/baseconfig/CONFIG_USB_GSPCA_DTCS033 b/configs/base-generic/CONFIG_USB_GSPCA_DTCS033
index 66d7699c0..66d7699c0 100644
--- a/baseconfig/CONFIG_USB_GSPCA_DTCS033
+++ b/configs/base-generic/CONFIG_USB_GSPCA_DTCS033
diff --git a/baseconfig/CONFIG_USB_GSPCA_ETOMS b/configs/base-generic/CONFIG_USB_GSPCA_ETOMS
index f46d33ff3..f46d33ff3 100644
--- a/baseconfig/CONFIG_USB_GSPCA_ETOMS
+++ b/configs/base-generic/CONFIG_USB_GSPCA_ETOMS
diff --git a/baseconfig/CONFIG_USB_GSPCA_FINEPIX b/configs/base-generic/CONFIG_USB_GSPCA_FINEPIX
index 4e9cff17f..4e9cff17f 100644
--- a/baseconfig/CONFIG_USB_GSPCA_FINEPIX
+++ b/configs/base-generic/CONFIG_USB_GSPCA_FINEPIX
diff --git a/baseconfig/CONFIG_USB_GSPCA_JEILINJ b/configs/base-generic/CONFIG_USB_GSPCA_JEILINJ
index 5feee2b76..5feee2b76 100644
--- a/baseconfig/CONFIG_USB_GSPCA_JEILINJ
+++ b/configs/base-generic/CONFIG_USB_GSPCA_JEILINJ
diff --git a/baseconfig/CONFIG_USB_GSPCA_JL2005BCD b/configs/base-generic/CONFIG_USB_GSPCA_JL2005BCD
index 01f02f3a5..01f02f3a5 100644
--- a/baseconfig/CONFIG_USB_GSPCA_JL2005BCD
+++ b/configs/base-generic/CONFIG_USB_GSPCA_JL2005BCD
diff --git a/baseconfig/CONFIG_USB_GSPCA_KINECT b/configs/base-generic/CONFIG_USB_GSPCA_KINECT
index 0f026473c..0f026473c 100644
--- a/baseconfig/CONFIG_USB_GSPCA_KINECT
+++ b/configs/base-generic/CONFIG_USB_GSPCA_KINECT
diff --git a/baseconfig/CONFIG_USB_GSPCA_KONICA b/configs/base-generic/CONFIG_USB_GSPCA_KONICA
index 2e392a5d3..2e392a5d3 100644
--- a/baseconfig/CONFIG_USB_GSPCA_KONICA
+++ b/configs/base-generic/CONFIG_USB_GSPCA_KONICA
diff --git a/baseconfig/CONFIG_USB_GSPCA_MARS b/configs/base-generic/CONFIG_USB_GSPCA_MARS
index 6672f400f..6672f400f 100644
--- a/baseconfig/CONFIG_USB_GSPCA_MARS
+++ b/configs/base-generic/CONFIG_USB_GSPCA_MARS
diff --git a/baseconfig/CONFIG_USB_GSPCA_MR97310A b/configs/base-generic/CONFIG_USB_GSPCA_MR97310A
index 5b9017ad0..5b9017ad0 100644
--- a/baseconfig/CONFIG_USB_GSPCA_MR97310A
+++ b/configs/base-generic/CONFIG_USB_GSPCA_MR97310A
diff --git a/baseconfig/CONFIG_USB_GSPCA_NW80X b/configs/base-generic/CONFIG_USB_GSPCA_NW80X
index 9f7246454..9f7246454 100644
--- a/baseconfig/CONFIG_USB_GSPCA_NW80X
+++ b/configs/base-generic/CONFIG_USB_GSPCA_NW80X
diff --git a/baseconfig/CONFIG_USB_GSPCA_OV519 b/configs/base-generic/CONFIG_USB_GSPCA_OV519
index 46c8d17fa..46c8d17fa 100644
--- a/baseconfig/CONFIG_USB_GSPCA_OV519
+++ b/configs/base-generic/CONFIG_USB_GSPCA_OV519
diff --git a/baseconfig/CONFIG_USB_GSPCA_OV534 b/configs/base-generic/CONFIG_USB_GSPCA_OV534
index 710d97b9f..710d97b9f 100644
--- a/baseconfig/CONFIG_USB_GSPCA_OV534
+++ b/configs/base-generic/CONFIG_USB_GSPCA_OV534
diff --git a/baseconfig/CONFIG_USB_GSPCA_OV534_9 b/configs/base-generic/CONFIG_USB_GSPCA_OV534_9
index aee31dd8c..aee31dd8c 100644
--- a/baseconfig/CONFIG_USB_GSPCA_OV534_9
+++ b/configs/base-generic/CONFIG_USB_GSPCA_OV534_9
diff --git a/baseconfig/CONFIG_USB_GSPCA_PAC207 b/configs/base-generic/CONFIG_USB_GSPCA_PAC207
index c77c495f6..c77c495f6 100644
--- a/baseconfig/CONFIG_USB_GSPCA_PAC207
+++ b/configs/base-generic/CONFIG_USB_GSPCA_PAC207
diff --git a/baseconfig/CONFIG_USB_GSPCA_PAC7302 b/configs/base-generic/CONFIG_USB_GSPCA_PAC7302
index 83f7a1dc5..83f7a1dc5 100644
--- a/baseconfig/CONFIG_USB_GSPCA_PAC7302
+++ b/configs/base-generic/CONFIG_USB_GSPCA_PAC7302
diff --git a/baseconfig/CONFIG_USB_GSPCA_PAC7311 b/configs/base-generic/CONFIG_USB_GSPCA_PAC7311
index 8825d866b..8825d866b 100644
--- a/baseconfig/CONFIG_USB_GSPCA_PAC7311
+++ b/configs/base-generic/CONFIG_USB_GSPCA_PAC7311
diff --git a/baseconfig/CONFIG_USB_GSPCA_SE401 b/configs/base-generic/CONFIG_USB_GSPCA_SE401
index 02c166a2b..02c166a2b 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SE401
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SE401
diff --git a/baseconfig/CONFIG_USB_GSPCA_SN9C2028 b/configs/base-generic/CONFIG_USB_GSPCA_SN9C2028
index e4254d0c3..e4254d0c3 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SN9C2028
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SN9C2028
diff --git a/baseconfig/CONFIG_USB_GSPCA_SN9C20X b/configs/base-generic/CONFIG_USB_GSPCA_SN9C20X
index 49d525507..49d525507 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SN9C20X
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SN9C20X
diff --git a/baseconfig/CONFIG_USB_GSPCA_SONIXB b/configs/base-generic/CONFIG_USB_GSPCA_SONIXB
index 9d06c420e..9d06c420e 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SONIXB
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SONIXB
diff --git a/baseconfig/CONFIG_USB_GSPCA_SONIXJ b/configs/base-generic/CONFIG_USB_GSPCA_SONIXJ
index a0b0455af..a0b0455af 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SONIXJ
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SONIXJ
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA1528 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA1528
index 69f10e17b..69f10e17b 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA1528
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA1528
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA500 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA500
index f360bd24d..f360bd24d 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA500
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA500
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA501 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA501
index 38ac0548f..38ac0548f 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA501
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA501
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA505 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA505
index 92ca2e7ed..92ca2e7ed 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA505
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA505
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA506 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA506
index a3f753223..a3f753223 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA506
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA506
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA508 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA508
index 2782fcb6d..2782fcb6d 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA508
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA508
diff --git a/baseconfig/CONFIG_USB_GSPCA_SPCA561 b/configs/base-generic/CONFIG_USB_GSPCA_SPCA561
index f8a226800..f8a226800 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SPCA561
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SPCA561
diff --git a/baseconfig/CONFIG_USB_GSPCA_SQ905 b/configs/base-generic/CONFIG_USB_GSPCA_SQ905
index 6cdca2581..6cdca2581 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SQ905
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SQ905
diff --git a/baseconfig/CONFIG_USB_GSPCA_SQ905C b/configs/base-generic/CONFIG_USB_GSPCA_SQ905C
index 15a36189d..15a36189d 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SQ905C
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SQ905C
diff --git a/baseconfig/CONFIG_USB_GSPCA_SQ930X b/configs/base-generic/CONFIG_USB_GSPCA_SQ930X
index ca78aec3a..ca78aec3a 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SQ930X
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SQ930X
diff --git a/baseconfig/CONFIG_USB_GSPCA_STK014 b/configs/base-generic/CONFIG_USB_GSPCA_STK014
index f024d94b2..f024d94b2 100644
--- a/baseconfig/CONFIG_USB_GSPCA_STK014
+++ b/configs/base-generic/CONFIG_USB_GSPCA_STK014
diff --git a/baseconfig/CONFIG_USB_GSPCA_STK1135 b/configs/base-generic/CONFIG_USB_GSPCA_STK1135
index d534dbd1c..d534dbd1c 100644
--- a/baseconfig/CONFIG_USB_GSPCA_STK1135
+++ b/configs/base-generic/CONFIG_USB_GSPCA_STK1135
diff --git a/baseconfig/CONFIG_USB_GSPCA_STV0680 b/configs/base-generic/CONFIG_USB_GSPCA_STV0680
index 5c70c9f4b..5c70c9f4b 100644
--- a/baseconfig/CONFIG_USB_GSPCA_STV0680
+++ b/configs/base-generic/CONFIG_USB_GSPCA_STV0680
diff --git a/baseconfig/CONFIG_USB_GSPCA_SUNPLUS b/configs/base-generic/CONFIG_USB_GSPCA_SUNPLUS
index 96784999e..96784999e 100644
--- a/baseconfig/CONFIG_USB_GSPCA_SUNPLUS
+++ b/configs/base-generic/CONFIG_USB_GSPCA_SUNPLUS
diff --git a/baseconfig/CONFIG_USB_GSPCA_T613 b/configs/base-generic/CONFIG_USB_GSPCA_T613
index d6c5a7fd1..d6c5a7fd1 100644
--- a/baseconfig/CONFIG_USB_GSPCA_T613
+++ b/configs/base-generic/CONFIG_USB_GSPCA_T613
diff --git a/baseconfig/CONFIG_USB_GSPCA_TOPRO b/configs/base-generic/CONFIG_USB_GSPCA_TOPRO
index 2ab001e12..2ab001e12 100644
--- a/baseconfig/CONFIG_USB_GSPCA_TOPRO
+++ b/configs/base-generic/CONFIG_USB_GSPCA_TOPRO
diff --git a/baseconfig/CONFIG_USB_GSPCA_TOUPTEK b/configs/base-generic/CONFIG_USB_GSPCA_TOUPTEK
index 870ac3743..870ac3743 100644
--- a/baseconfig/CONFIG_USB_GSPCA_TOUPTEK
+++ b/configs/base-generic/CONFIG_USB_GSPCA_TOUPTEK
diff --git a/baseconfig/CONFIG_USB_GSPCA_TV8532 b/configs/base-generic/CONFIG_USB_GSPCA_TV8532
index fa34a5f16..fa34a5f16 100644
--- a/baseconfig/CONFIG_USB_GSPCA_TV8532
+++ b/configs/base-generic/CONFIG_USB_GSPCA_TV8532
diff --git a/baseconfig/CONFIG_USB_GSPCA_VC032X b/configs/base-generic/CONFIG_USB_GSPCA_VC032X
index b9323192a..b9323192a 100644
--- a/baseconfig/CONFIG_USB_GSPCA_VC032X
+++ b/configs/base-generic/CONFIG_USB_GSPCA_VC032X
diff --git a/baseconfig/CONFIG_USB_GSPCA_VICAM b/configs/base-generic/CONFIG_USB_GSPCA_VICAM
index b32da1430..b32da1430 100644
--- a/baseconfig/CONFIG_USB_GSPCA_VICAM
+++ b/configs/base-generic/CONFIG_USB_GSPCA_VICAM
diff --git a/baseconfig/CONFIG_USB_GSPCA_XIRLINK_CIT b/configs/base-generic/CONFIG_USB_GSPCA_XIRLINK_CIT
index 095067694..095067694 100644
--- a/baseconfig/CONFIG_USB_GSPCA_XIRLINK_CIT
+++ b/configs/base-generic/CONFIG_USB_GSPCA_XIRLINK_CIT
diff --git a/baseconfig/CONFIG_USB_GSPCA_ZC3XX b/configs/base-generic/CONFIG_USB_GSPCA_ZC3XX
index 787764f19..787764f19 100644
--- a/baseconfig/CONFIG_USB_GSPCA_ZC3XX
+++ b/configs/base-generic/CONFIG_USB_GSPCA_ZC3XX
diff --git a/baseconfig/CONFIG_USB_G_SERIAL b/configs/base-generic/CONFIG_USB_G_SERIAL
index 477550c34..477550c34 100644
--- a/baseconfig/CONFIG_USB_G_SERIAL
+++ b/configs/base-generic/CONFIG_USB_G_SERIAL
diff --git a/baseconfig/CONFIG_USB_HCD_BCMA b/configs/base-generic/CONFIG_USB_HCD_BCMA
index 645b79166..645b79166 100644
--- a/baseconfig/CONFIG_USB_HCD_BCMA
+++ b/configs/base-generic/CONFIG_USB_HCD_BCMA
diff --git a/baseconfig/CONFIG_USB_HCD_SSB b/configs/base-generic/CONFIG_USB_HCD_SSB
index cf3204d6f..cf3204d6f 100644
--- a/baseconfig/CONFIG_USB_HCD_SSB
+++ b/configs/base-generic/CONFIG_USB_HCD_SSB
diff --git a/baseconfig/CONFIG_USB_HCD_TEST_MODE b/configs/base-generic/CONFIG_USB_HCD_TEST_MODE
index 3d8668f5e..3d8668f5e 100644
--- a/baseconfig/CONFIG_USB_HCD_TEST_MODE
+++ b/configs/base-generic/CONFIG_USB_HCD_TEST_MODE
diff --git a/baseconfig/CONFIG_USB_HID b/configs/base-generic/CONFIG_USB_HID
index 9f35c0af7..9f35c0af7 100644
--- a/baseconfig/CONFIG_USB_HID
+++ b/configs/base-generic/CONFIG_USB_HID
diff --git a/baseconfig/CONFIG_USB_HIDDEV b/configs/base-generic/CONFIG_USB_HIDDEV
index 4d37a25b7..4d37a25b7 100644
--- a/baseconfig/CONFIG_USB_HIDDEV
+++ b/configs/base-generic/CONFIG_USB_HIDDEV
diff --git a/baseconfig/CONFIG_USB_HSIC_USB3503 b/configs/base-generic/CONFIG_USB_HSIC_USB3503
index 8f6b0dd20..8f6b0dd20 100644
--- a/baseconfig/CONFIG_USB_HSIC_USB3503
+++ b/configs/base-generic/CONFIG_USB_HSIC_USB3503
diff --git a/baseconfig/CONFIG_USB_HSIC_USB4604 b/configs/base-generic/CONFIG_USB_HSIC_USB4604
index bfcb492ca..bfcb492ca 100644
--- a/baseconfig/CONFIG_USB_HSIC_USB4604
+++ b/configs/base-generic/CONFIG_USB_HSIC_USB4604
diff --git a/baseconfig/CONFIG_USB_HSO b/configs/base-generic/CONFIG_USB_HSO
index 0a009eeca..0a009eeca 100644
--- a/baseconfig/CONFIG_USB_HSO
+++ b/configs/base-generic/CONFIG_USB_HSO
diff --git a/baseconfig/CONFIG_USB_HUB_USB251XB b/configs/base-generic/CONFIG_USB_HUB_USB251XB
index 26e0d11ae..26e0d11ae 100644
--- a/baseconfig/CONFIG_USB_HUB_USB251XB
+++ b/configs/base-generic/CONFIG_USB_HUB_USB251XB
diff --git a/baseconfig/CONFIG_USB_HWA_HCD b/configs/base-generic/CONFIG_USB_HWA_HCD
index 6b6040687..6b6040687 100644
--- a/baseconfig/CONFIG_USB_HWA_HCD
+++ b/configs/base-generic/CONFIG_USB_HWA_HCD
diff --git a/baseconfig/CONFIG_USB_IDMOUSE b/configs/base-generic/CONFIG_USB_IDMOUSE
index 8b5408875..8b5408875 100644
--- a/baseconfig/CONFIG_USB_IDMOUSE
+++ b/configs/base-generic/CONFIG_USB_IDMOUSE
diff --git a/baseconfig/CONFIG_USB_IOWARRIOR b/configs/base-generic/CONFIG_USB_IOWARRIOR
index 7bf2b0c65..7bf2b0c65 100644
--- a/baseconfig/CONFIG_USB_IOWARRIOR
+++ b/configs/base-generic/CONFIG_USB_IOWARRIOR
diff --git a/baseconfig/CONFIG_USB_IPHETH b/configs/base-generic/CONFIG_USB_IPHETH
index 9aa5dc344..9aa5dc344 100644
--- a/baseconfig/CONFIG_USB_IPHETH
+++ b/configs/base-generic/CONFIG_USB_IPHETH
diff --git a/baseconfig/CONFIG_USB_IRDA b/configs/base-generic/CONFIG_USB_IRDA
index 320b0d8b0..320b0d8b0 100644
--- a/baseconfig/CONFIG_USB_IRDA
+++ b/configs/base-generic/CONFIG_USB_IRDA
diff --git a/baseconfig/CONFIG_USB_ISIGHTFW b/configs/base-generic/CONFIG_USB_ISIGHTFW
index 80ead4f41..80ead4f41 100644
--- a/baseconfig/CONFIG_USB_ISIGHTFW
+++ b/configs/base-generic/CONFIG_USB_ISIGHTFW
diff --git a/baseconfig/CONFIG_USB_ISP116X_HCD b/configs/base-generic/CONFIG_USB_ISP116X_HCD
index bd16b5165..bd16b5165 100644
--- a/baseconfig/CONFIG_USB_ISP116X_HCD
+++ b/configs/base-generic/CONFIG_USB_ISP116X_HCD
diff --git a/baseconfig/CONFIG_USB_ISP1301 b/configs/base-generic/CONFIG_USB_ISP1301
index 8a6cb284e..8a6cb284e 100644
--- a/baseconfig/CONFIG_USB_ISP1301
+++ b/configs/base-generic/CONFIG_USB_ISP1301
diff --git a/baseconfig/CONFIG_USB_ISP1362_HCD b/configs/base-generic/CONFIG_USB_ISP1362_HCD
index e17938ca4..e17938ca4 100644
--- a/baseconfig/CONFIG_USB_ISP1362_HCD
+++ b/configs/base-generic/CONFIG_USB_ISP1362_HCD
diff --git a/baseconfig/CONFIG_USB_ISP1760 b/configs/base-generic/CONFIG_USB_ISP1760
index aed47c8aa..aed47c8aa 100644
--- a/baseconfig/CONFIG_USB_ISP1760
+++ b/configs/base-generic/CONFIG_USB_ISP1760
diff --git a/baseconfig/CONFIG_USB_KAWETH b/configs/base-generic/CONFIG_USB_KAWETH
index daed8dbd4..daed8dbd4 100644
--- a/baseconfig/CONFIG_USB_KAWETH
+++ b/configs/base-generic/CONFIG_USB_KAWETH
diff --git a/baseconfig/CONFIG_USB_KC2190 b/configs/base-generic/CONFIG_USB_KC2190
index bd099751c..bd099751c 100644
--- a/baseconfig/CONFIG_USB_KC2190
+++ b/configs/base-generic/CONFIG_USB_KC2190
diff --git a/baseconfig/CONFIG_USB_KEENE b/configs/base-generic/CONFIG_USB_KEENE
index 46a679045..46a679045 100644
--- a/baseconfig/CONFIG_USB_KEENE
+++ b/configs/base-generic/CONFIG_USB_KEENE
diff --git a/baseconfig/CONFIG_USB_LAN78XX b/configs/base-generic/CONFIG_USB_LAN78XX
index 6d409c13e..6d409c13e 100644
--- a/baseconfig/CONFIG_USB_LAN78XX
+++ b/configs/base-generic/CONFIG_USB_LAN78XX
diff --git a/baseconfig/CONFIG_USB_LCD b/configs/base-generic/CONFIG_USB_LCD
index b87994bf2..b87994bf2 100644
--- a/baseconfig/CONFIG_USB_LCD
+++ b/configs/base-generic/CONFIG_USB_LCD
diff --git a/baseconfig/CONFIG_USB_LD b/configs/base-generic/CONFIG_USB_LD
index ba993ee02..ba993ee02 100644
--- a/baseconfig/CONFIG_USB_LD
+++ b/configs/base-generic/CONFIG_USB_LD
diff --git a/baseconfig/CONFIG_USB_LEDS_TRIGGER_USBPORT b/configs/base-generic/CONFIG_USB_LEDS_TRIGGER_USBPORT
index 9d83c48a4..9d83c48a4 100644
--- a/baseconfig/CONFIG_USB_LEDS_TRIGGER_USBPORT
+++ b/configs/base-generic/CONFIG_USB_LEDS_TRIGGER_USBPORT
diff --git a/baseconfig/CONFIG_USB_LED_TRIG b/configs/base-generic/CONFIG_USB_LED_TRIG
index 28127f785..28127f785 100644
--- a/baseconfig/CONFIG_USB_LED_TRIG
+++ b/configs/base-generic/CONFIG_USB_LED_TRIG
diff --git a/baseconfig/CONFIG_USB_LEGOTOWER b/configs/base-generic/CONFIG_USB_LEGOTOWER
index 4f0188a9a..4f0188a9a 100644
--- a/baseconfig/CONFIG_USB_LEGOTOWER
+++ b/configs/base-generic/CONFIG_USB_LEGOTOWER
diff --git a/baseconfig/CONFIG_USB_LINK_LAYER_TEST b/configs/base-generic/CONFIG_USB_LINK_LAYER_TEST
index 0e4389a3d..0e4389a3d 100644
--- a/baseconfig/CONFIG_USB_LINK_LAYER_TEST
+++ b/configs/base-generic/CONFIG_USB_LINK_LAYER_TEST
diff --git a/baseconfig/CONFIG_USB_M5602 b/configs/base-generic/CONFIG_USB_M5602
index 1583775a4..1583775a4 100644
--- a/baseconfig/CONFIG_USB_M5602
+++ b/configs/base-generic/CONFIG_USB_M5602
diff --git a/baseconfig/CONFIG_USB_MA901 b/configs/base-generic/CONFIG_USB_MA901
index 070bad97d..070bad97d 100644
--- a/baseconfig/CONFIG_USB_MA901
+++ b/configs/base-generic/CONFIG_USB_MA901
diff --git a/baseconfig/CONFIG_USB_MAX3421_HCD b/configs/base-generic/CONFIG_USB_MAX3421_HCD
index 51b1205bf..51b1205bf 100644
--- a/baseconfig/CONFIG_USB_MAX3421_HCD
+++ b/configs/base-generic/CONFIG_USB_MAX3421_HCD
diff --git a/baseconfig/CONFIG_USB_MDC800 b/configs/base-generic/CONFIG_USB_MDC800
index bc7b0bfd8..bc7b0bfd8 100644
--- a/baseconfig/CONFIG_USB_MDC800
+++ b/configs/base-generic/CONFIG_USB_MDC800
diff --git a/baseconfig/CONFIG_USB_MICROTEK b/configs/base-generic/CONFIG_USB_MICROTEK
index 94f288329..94f288329 100644
--- a/baseconfig/CONFIG_USB_MICROTEK
+++ b/configs/base-generic/CONFIG_USB_MICROTEK
diff --git a/baseconfig/CONFIG_USB_MON b/configs/base-generic/CONFIG_USB_MON
index 330d7225c..330d7225c 100644
--- a/baseconfig/CONFIG_USB_MON
+++ b/configs/base-generic/CONFIG_USB_MON
diff --git a/baseconfig/CONFIG_USB_MR800 b/configs/base-generic/CONFIG_USB_MR800
index 5504e2c81..5504e2c81 100644
--- a/baseconfig/CONFIG_USB_MR800
+++ b/configs/base-generic/CONFIG_USB_MR800
diff --git a/baseconfig/CONFIG_USB_MUSB_HDRC b/configs/base-generic/CONFIG_USB_MUSB_HDRC
index ae1dea512..ae1dea512 100644
--- a/baseconfig/CONFIG_USB_MUSB_HDRC
+++ b/configs/base-generic/CONFIG_USB_MUSB_HDRC
diff --git a/baseconfig/CONFIG_USB_NET_AX88179_178A b/configs/base-generic/CONFIG_USB_NET_AX88179_178A
index da5aa15b2..da5aa15b2 100644
--- a/baseconfig/CONFIG_USB_NET_AX88179_178A
+++ b/configs/base-generic/CONFIG_USB_NET_AX88179_178A
diff --git a/baseconfig/CONFIG_USB_NET_AX8817X b/configs/base-generic/CONFIG_USB_NET_AX8817X
index 3ac11e4ec..3ac11e4ec 100644
--- a/baseconfig/CONFIG_USB_NET_AX8817X
+++ b/configs/base-generic/CONFIG_USB_NET_AX8817X
diff --git a/baseconfig/CONFIG_USB_NET_CDC_EEM b/configs/base-generic/CONFIG_USB_NET_CDC_EEM
index 73bbe6213..73bbe6213 100644
--- a/baseconfig/CONFIG_USB_NET_CDC_EEM
+++ b/configs/base-generic/CONFIG_USB_NET_CDC_EEM
diff --git a/baseconfig/CONFIG_USB_NET_CDC_MBIM b/configs/base-generic/CONFIG_USB_NET_CDC_MBIM
index a728babfc..a728babfc 100644
--- a/baseconfig/CONFIG_USB_NET_CDC_MBIM
+++ b/configs/base-generic/CONFIG_USB_NET_CDC_MBIM
diff --git a/baseconfig/CONFIG_USB_NET_CDC_NCM b/configs/base-generic/CONFIG_USB_NET_CDC_NCM
index 4c6e461cb..4c6e461cb 100644
--- a/baseconfig/CONFIG_USB_NET_CDC_NCM
+++ b/configs/base-generic/CONFIG_USB_NET_CDC_NCM
diff --git a/baseconfig/CONFIG_USB_NET_CDC_SUBSET b/configs/base-generic/CONFIG_USB_NET_CDC_SUBSET
index f54b326ea..f54b326ea 100644
--- a/baseconfig/CONFIG_USB_NET_CDC_SUBSET
+++ b/configs/base-generic/CONFIG_USB_NET_CDC_SUBSET
diff --git a/baseconfig/CONFIG_USB_NET_CH9200 b/configs/base-generic/CONFIG_USB_NET_CH9200
index ce2973245..ce2973245 100644
--- a/baseconfig/CONFIG_USB_NET_CH9200
+++ b/configs/base-generic/CONFIG_USB_NET_CH9200
diff --git a/baseconfig/CONFIG_USB_NET_CX82310_ETH b/configs/base-generic/CONFIG_USB_NET_CX82310_ETH
index 13aaf6f75..13aaf6f75 100644
--- a/baseconfig/CONFIG_USB_NET_CX82310_ETH
+++ b/configs/base-generic/CONFIG_USB_NET_CX82310_ETH
diff --git a/baseconfig/CONFIG_USB_NET_DM9601 b/configs/base-generic/CONFIG_USB_NET_DM9601
index 7227f7686..7227f7686 100644
--- a/baseconfig/CONFIG_USB_NET_DM9601
+++ b/configs/base-generic/CONFIG_USB_NET_DM9601
diff --git a/baseconfig/CONFIG_USB_NET_DRIVERS b/configs/base-generic/CONFIG_USB_NET_DRIVERS
index 954a18989..954a18989 100644
--- a/baseconfig/CONFIG_USB_NET_DRIVERS
+++ b/configs/base-generic/CONFIG_USB_NET_DRIVERS
diff --git a/baseconfig/CONFIG_USB_NET_GL620A b/configs/base-generic/CONFIG_USB_NET_GL620A
index 8a950c494..8a950c494 100644
--- a/baseconfig/CONFIG_USB_NET_GL620A
+++ b/configs/base-generic/CONFIG_USB_NET_GL620A
diff --git a/baseconfig/CONFIG_USB_NET_HUAWEI_CDC_NCM b/configs/base-generic/CONFIG_USB_NET_HUAWEI_CDC_NCM
index 16acb2301..16acb2301 100644
--- a/baseconfig/CONFIG_USB_NET_HUAWEI_CDC_NCM
+++ b/configs/base-generic/CONFIG_USB_NET_HUAWEI_CDC_NCM
diff --git a/baseconfig/CONFIG_USB_NET_INT51X1 b/configs/base-generic/CONFIG_USB_NET_INT51X1
index a2526e648..a2526e648 100644
--- a/baseconfig/CONFIG_USB_NET_INT51X1
+++ b/configs/base-generic/CONFIG_USB_NET_INT51X1
diff --git a/baseconfig/CONFIG_USB_NET_KALMIA b/configs/base-generic/CONFIG_USB_NET_KALMIA
index a92ab21e5..a92ab21e5 100644
--- a/baseconfig/CONFIG_USB_NET_KALMIA
+++ b/configs/base-generic/CONFIG_USB_NET_KALMIA
diff --git a/baseconfig/CONFIG_USB_NET_MCS7830 b/configs/base-generic/CONFIG_USB_NET_MCS7830
index 0c6fd98a5..0c6fd98a5 100644
--- a/baseconfig/CONFIG_USB_NET_MCS7830
+++ b/configs/base-generic/CONFIG_USB_NET_MCS7830
diff --git a/baseconfig/CONFIG_USB_NET_NET1080 b/configs/base-generic/CONFIG_USB_NET_NET1080
index 0ad1bc9be..0ad1bc9be 100644
--- a/baseconfig/CONFIG_USB_NET_NET1080
+++ b/configs/base-generic/CONFIG_USB_NET_NET1080
diff --git a/baseconfig/CONFIG_USB_NET_PLUSB b/configs/base-generic/CONFIG_USB_NET_PLUSB
index f87e9896e..f87e9896e 100644
--- a/baseconfig/CONFIG_USB_NET_PLUSB
+++ b/configs/base-generic/CONFIG_USB_NET_PLUSB
diff --git a/baseconfig/CONFIG_USB_NET_QMI_WWAN b/configs/base-generic/CONFIG_USB_NET_QMI_WWAN
index 6be46c7d2..6be46c7d2 100644
--- a/baseconfig/CONFIG_USB_NET_QMI_WWAN
+++ b/configs/base-generic/CONFIG_USB_NET_QMI_WWAN
diff --git a/baseconfig/CONFIG_USB_NET_RNDIS_HOST b/configs/base-generic/CONFIG_USB_NET_RNDIS_HOST
index 58c44e88a..58c44e88a 100644
--- a/baseconfig/CONFIG_USB_NET_RNDIS_HOST
+++ b/configs/base-generic/CONFIG_USB_NET_RNDIS_HOST
diff --git a/baseconfig/CONFIG_USB_NET_RNDIS_WLAN b/configs/base-generic/CONFIG_USB_NET_RNDIS_WLAN
index 76c3fcf9b..76c3fcf9b 100644
--- a/baseconfig/CONFIG_USB_NET_RNDIS_WLAN
+++ b/configs/base-generic/CONFIG_USB_NET_RNDIS_WLAN
diff --git a/baseconfig/CONFIG_USB_NET_SMSC75XX b/configs/base-generic/CONFIG_USB_NET_SMSC75XX
index 3011223ad..3011223ad 100644
--- a/baseconfig/CONFIG_USB_NET_SMSC75XX
+++ b/configs/base-generic/CONFIG_USB_NET_SMSC75XX
diff --git a/baseconfig/CONFIG_USB_NET_SMSC95XX b/configs/base-generic/CONFIG_USB_NET_SMSC95XX
index 479b43b1d..479b43b1d 100644
--- a/baseconfig/CONFIG_USB_NET_SMSC95XX
+++ b/configs/base-generic/CONFIG_USB_NET_SMSC95XX
diff --git a/baseconfig/CONFIG_USB_NET_SR9700 b/configs/base-generic/CONFIG_USB_NET_SR9700
index f2b8724f9..f2b8724f9 100644
--- a/baseconfig/CONFIG_USB_NET_SR9700
+++ b/configs/base-generic/CONFIG_USB_NET_SR9700
diff --git a/baseconfig/CONFIG_USB_NET_SR9800 b/configs/base-generic/CONFIG_USB_NET_SR9800
index 3caca281c..3caca281c 100644
--- a/baseconfig/CONFIG_USB_NET_SR9800
+++ b/configs/base-generic/CONFIG_USB_NET_SR9800
diff --git a/baseconfig/CONFIG_USB_NET_ZAURUS b/configs/base-generic/CONFIG_USB_NET_ZAURUS
index 00dfbaf3b..00dfbaf3b 100644
--- a/baseconfig/CONFIG_USB_NET_ZAURUS
+++ b/configs/base-generic/CONFIG_USB_NET_ZAURUS
diff --git a/baseconfig/CONFIG_USB_OHCI_HCD b/configs/base-generic/CONFIG_USB_OHCI_HCD
index 59f6d5fd5..59f6d5fd5 100644
--- a/baseconfig/CONFIG_USB_OHCI_HCD
+++ b/configs/base-generic/CONFIG_USB_OHCI_HCD
diff --git a/baseconfig/CONFIG_USB_OHCI_HCD_PCI b/configs/base-generic/CONFIG_USB_OHCI_HCD_PCI
index a78b62cb5..a78b62cb5 100644
--- a/baseconfig/CONFIG_USB_OHCI_HCD_PCI
+++ b/configs/base-generic/CONFIG_USB_OHCI_HCD_PCI
diff --git a/baseconfig/CONFIG_USB_OHCI_HCD_PLATFORM b/configs/base-generic/CONFIG_USB_OHCI_HCD_PLATFORM
index c35b2cdd6..c35b2cdd6 100644
--- a/baseconfig/CONFIG_USB_OHCI_HCD_PLATFORM
+++ b/configs/base-generic/CONFIG_USB_OHCI_HCD_PLATFORM
diff --git a/baseconfig/CONFIG_USB_OHCI_HCD_SSB b/configs/base-generic/CONFIG_USB_OHCI_HCD_SSB
index eb3e84ce6..eb3e84ce6 100644
--- a/baseconfig/CONFIG_USB_OHCI_HCD_SSB
+++ b/configs/base-generic/CONFIG_USB_OHCI_HCD_SSB
diff --git a/baseconfig/CONFIG_USB_OTG b/configs/base-generic/CONFIG_USB_OTG
index b4ad21e48..b4ad21e48 100644
--- a/baseconfig/CONFIG_USB_OTG
+++ b/configs/base-generic/CONFIG_USB_OTG
diff --git a/baseconfig/CONFIG_USB_OTG_FSM b/configs/base-generic/CONFIG_USB_OTG_FSM
index 7a17ecfdb..7a17ecfdb 100644
--- a/baseconfig/CONFIG_USB_OTG_FSM
+++ b/configs/base-generic/CONFIG_USB_OTG_FSM
diff --git a/baseconfig/CONFIG_USB_OTG_WHITELIST b/configs/base-generic/CONFIG_USB_OTG_WHITELIST
index e1e2a2f7b..e1e2a2f7b 100644
--- a/baseconfig/CONFIG_USB_OTG_WHITELIST
+++ b/configs/base-generic/CONFIG_USB_OTG_WHITELIST
diff --git a/baseconfig/CONFIG_USB_OXU210HP_HCD b/configs/base-generic/CONFIG_USB_OXU210HP_HCD
index 4f1efda37..4f1efda37 100644
--- a/baseconfig/CONFIG_USB_OXU210HP_HCD
+++ b/configs/base-generic/CONFIG_USB_OXU210HP_HCD
diff --git a/baseconfig/CONFIG_USB_PCI b/configs/base-generic/CONFIG_USB_PCI
index 26c372a3a..26c372a3a 100644
--- a/baseconfig/CONFIG_USB_PCI
+++ b/configs/base-generic/CONFIG_USB_PCI
diff --git a/baseconfig/CONFIG_USB_PEGASUS b/configs/base-generic/CONFIG_USB_PEGASUS
index 3218ed61f..3218ed61f 100644
--- a/baseconfig/CONFIG_USB_PEGASUS
+++ b/configs/base-generic/CONFIG_USB_PEGASUS
diff --git a/baseconfig/CONFIG_USB_PHY b/configs/base-generic/CONFIG_USB_PHY
index 72e98a45b..72e98a45b 100644
--- a/baseconfig/CONFIG_USB_PHY
+++ b/configs/base-generic/CONFIG_USB_PHY
diff --git a/baseconfig/CONFIG_USB_PRINTER b/configs/base-generic/CONFIG_USB_PRINTER
index 108d00bea..108d00bea 100644
--- a/baseconfig/CONFIG_USB_PRINTER
+++ b/configs/base-generic/CONFIG_USB_PRINTER
diff --git a/baseconfig/CONFIG_USB_PULSE8_CEC b/configs/base-generic/CONFIG_USB_PULSE8_CEC
index bd9c5b9bc..bd9c5b9bc 100644
--- a/baseconfig/CONFIG_USB_PULSE8_CEC
+++ b/configs/base-generic/CONFIG_USB_PULSE8_CEC
diff --git a/baseconfig/CONFIG_USB_PWC b/configs/base-generic/CONFIG_USB_PWC
index 2f37469fe..2f37469fe 100644
--- a/baseconfig/CONFIG_USB_PWC
+++ b/configs/base-generic/CONFIG_USB_PWC
diff --git a/baseconfig/CONFIG_USB_PWC_DEBUG b/configs/base-generic/CONFIG_USB_PWC_DEBUG
index 2c5aa58d3..2c5aa58d3 100644
--- a/baseconfig/CONFIG_USB_PWC_DEBUG
+++ b/configs/base-generic/CONFIG_USB_PWC_DEBUG
diff --git a/baseconfig/CONFIG_USB_PWC_INPUT_EVDEV b/configs/base-generic/CONFIG_USB_PWC_INPUT_EVDEV
index c7f0c4217..c7f0c4217 100644
--- a/baseconfig/CONFIG_USB_PWC_INPUT_EVDEV
+++ b/configs/base-generic/CONFIG_USB_PWC_INPUT_EVDEV
diff --git a/baseconfig/CONFIG_USB_R8A66597_HCD b/configs/base-generic/CONFIG_USB_R8A66597_HCD
index 70dcc7701..70dcc7701 100644
--- a/baseconfig/CONFIG_USB_R8A66597_HCD
+++ b/configs/base-generic/CONFIG_USB_R8A66597_HCD
diff --git a/baseconfig/CONFIG_USB_RAINSHADOW_CEC b/configs/base-generic/CONFIG_USB_RAINSHADOW_CEC
index c6605282b..c6605282b 100644
--- a/baseconfig/CONFIG_USB_RAINSHADOW_CEC
+++ b/configs/base-generic/CONFIG_USB_RAINSHADOW_CEC
diff --git a/baseconfig/CONFIG_USB_RAREMONO b/configs/base-generic/CONFIG_USB_RAREMONO
index 599d1ba7e..599d1ba7e 100644
--- a/baseconfig/CONFIG_USB_RAREMONO
+++ b/configs/base-generic/CONFIG_USB_RAREMONO
diff --git a/baseconfig/CONFIG_USB_RIO500 b/configs/base-generic/CONFIG_USB_RIO500
index 961c7e67f..961c7e67f 100644
--- a/baseconfig/CONFIG_USB_RIO500
+++ b/configs/base-generic/CONFIG_USB_RIO500
diff --git a/baseconfig/CONFIG_USB_RTL8150 b/configs/base-generic/CONFIG_USB_RTL8150
index 29f740fcf..29f740fcf 100644
--- a/baseconfig/CONFIG_USB_RTL8150
+++ b/configs/base-generic/CONFIG_USB_RTL8150
diff --git a/baseconfig/CONFIG_USB_RTL8152 b/configs/base-generic/CONFIG_USB_RTL8152
index 66869c024..66869c024 100644
--- a/baseconfig/CONFIG_USB_RTL8152
+++ b/configs/base-generic/CONFIG_USB_RTL8152
diff --git a/baseconfig/CONFIG_USB_S2255 b/configs/base-generic/CONFIG_USB_S2255
index 8383ef03e..8383ef03e 100644
--- a/baseconfig/CONFIG_USB_S2255
+++ b/configs/base-generic/CONFIG_USB_S2255
diff --git a/baseconfig/CONFIG_USB_SERIAL b/configs/base-generic/CONFIG_USB_SERIAL
index e5f3a6d27..e5f3a6d27 100644
--- a/baseconfig/CONFIG_USB_SERIAL
+++ b/configs/base-generic/CONFIG_USB_SERIAL
diff --git a/baseconfig/CONFIG_USB_SERIAL_AIRCABLE b/configs/base-generic/CONFIG_USB_SERIAL_AIRCABLE
index bbe37bf75..bbe37bf75 100644
--- a/baseconfig/CONFIG_USB_SERIAL_AIRCABLE
+++ b/configs/base-generic/CONFIG_USB_SERIAL_AIRCABLE
diff --git a/baseconfig/CONFIG_USB_SERIAL_ARK3116 b/configs/base-generic/CONFIG_USB_SERIAL_ARK3116
index 285aeacc9..285aeacc9 100644
--- a/baseconfig/CONFIG_USB_SERIAL_ARK3116
+++ b/configs/base-generic/CONFIG_USB_SERIAL_ARK3116
diff --git a/baseconfig/CONFIG_USB_SERIAL_BELKIN b/configs/base-generic/CONFIG_USB_SERIAL_BELKIN
index 313844222..313844222 100644
--- a/baseconfig/CONFIG_USB_SERIAL_BELKIN
+++ b/configs/base-generic/CONFIG_USB_SERIAL_BELKIN
diff --git a/baseconfig/CONFIG_USB_SERIAL_CH341 b/configs/base-generic/CONFIG_USB_SERIAL_CH341
index 7b09e0d90..7b09e0d90 100644
--- a/baseconfig/CONFIG_USB_SERIAL_CH341
+++ b/configs/base-generic/CONFIG_USB_SERIAL_CH341
diff --git a/baseconfig/CONFIG_USB_SERIAL_CONSOLE b/configs/base-generic/CONFIG_USB_SERIAL_CONSOLE
index d0dc474f9..d0dc474f9 100644
--- a/baseconfig/CONFIG_USB_SERIAL_CONSOLE
+++ b/configs/base-generic/CONFIG_USB_SERIAL_CONSOLE
diff --git a/baseconfig/CONFIG_USB_SERIAL_CP210X b/configs/base-generic/CONFIG_USB_SERIAL_CP210X
index 18e8641d5..18e8641d5 100644
--- a/baseconfig/CONFIG_USB_SERIAL_CP210X
+++ b/configs/base-generic/CONFIG_USB_SERIAL_CP210X
diff --git a/baseconfig/CONFIG_USB_SERIAL_CYBERJACK b/configs/base-generic/CONFIG_USB_SERIAL_CYBERJACK
index 3681a3797..3681a3797 100644
--- a/baseconfig/CONFIG_USB_SERIAL_CYBERJACK
+++ b/configs/base-generic/CONFIG_USB_SERIAL_CYBERJACK
diff --git a/baseconfig/CONFIG_USB_SERIAL_CYPRESS_M8 b/configs/base-generic/CONFIG_USB_SERIAL_CYPRESS_M8
index b9f46a742..b9f46a742 100644
--- a/baseconfig/CONFIG_USB_SERIAL_CYPRESS_M8
+++ b/configs/base-generic/CONFIG_USB_SERIAL_CYPRESS_M8
diff --git a/baseconfig/CONFIG_USB_SERIAL_DEBUG b/configs/base-generic/CONFIG_USB_SERIAL_DEBUG
index 896ed4ca6..896ed4ca6 100644
--- a/baseconfig/CONFIG_USB_SERIAL_DEBUG
+++ b/configs/base-generic/CONFIG_USB_SERIAL_DEBUG
diff --git a/baseconfig/CONFIG_USB_SERIAL_DIGI_ACCELEPORT b/configs/base-generic/CONFIG_USB_SERIAL_DIGI_ACCELEPORT
index 5617d88f8..5617d88f8 100644
--- a/baseconfig/CONFIG_USB_SERIAL_DIGI_ACCELEPORT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_DIGI_ACCELEPORT
diff --git a/baseconfig/CONFIG_USB_SERIAL_EDGEPORT b/configs/base-generic/CONFIG_USB_SERIAL_EDGEPORT
index bba8a43e8..bba8a43e8 100644
--- a/baseconfig/CONFIG_USB_SERIAL_EDGEPORT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_EDGEPORT
diff --git a/baseconfig/CONFIG_USB_SERIAL_EDGEPORT_TI b/configs/base-generic/CONFIG_USB_SERIAL_EDGEPORT_TI
index 06184eb4d..06184eb4d 100644
--- a/baseconfig/CONFIG_USB_SERIAL_EDGEPORT_TI
+++ b/configs/base-generic/CONFIG_USB_SERIAL_EDGEPORT_TI
diff --git a/baseconfig/CONFIG_USB_SERIAL_EMPEG b/configs/base-generic/CONFIG_USB_SERIAL_EMPEG
index 139e9f9aa..139e9f9aa 100644
--- a/baseconfig/CONFIG_USB_SERIAL_EMPEG
+++ b/configs/base-generic/CONFIG_USB_SERIAL_EMPEG
diff --git a/baseconfig/CONFIG_USB_SERIAL_F81232 b/configs/base-generic/CONFIG_USB_SERIAL_F81232
index c02ccac83..c02ccac83 100644
--- a/baseconfig/CONFIG_USB_SERIAL_F81232
+++ b/configs/base-generic/CONFIG_USB_SERIAL_F81232
diff --git a/baseconfig/CONFIG_USB_SERIAL_F8153X b/configs/base-generic/CONFIG_USB_SERIAL_F8153X
index 94dd9f277..94dd9f277 100644
--- a/baseconfig/CONFIG_USB_SERIAL_F8153X
+++ b/configs/base-generic/CONFIG_USB_SERIAL_F8153X
diff --git a/baseconfig/CONFIG_USB_SERIAL_FTDI_SIO b/configs/base-generic/CONFIG_USB_SERIAL_FTDI_SIO
index 0d2907aaa..0d2907aaa 100644
--- a/baseconfig/CONFIG_USB_SERIAL_FTDI_SIO
+++ b/configs/base-generic/CONFIG_USB_SERIAL_FTDI_SIO
diff --git a/baseconfig/CONFIG_USB_SERIAL_GARMIN b/configs/base-generic/CONFIG_USB_SERIAL_GARMIN
index 81637b491..81637b491 100644
--- a/baseconfig/CONFIG_USB_SERIAL_GARMIN
+++ b/configs/base-generic/CONFIG_USB_SERIAL_GARMIN
diff --git a/baseconfig/CONFIG_USB_SERIAL_GENERIC b/configs/base-generic/CONFIG_USB_SERIAL_GENERIC
index ad338db81..ad338db81 100644
--- a/baseconfig/CONFIG_USB_SERIAL_GENERIC
+++ b/configs/base-generic/CONFIG_USB_SERIAL_GENERIC
diff --git a/baseconfig/CONFIG_USB_SERIAL_IPAQ b/configs/base-generic/CONFIG_USB_SERIAL_IPAQ
index 3a435bc53..3a435bc53 100644
--- a/baseconfig/CONFIG_USB_SERIAL_IPAQ
+++ b/configs/base-generic/CONFIG_USB_SERIAL_IPAQ
diff --git a/baseconfig/CONFIG_USB_SERIAL_IPW b/configs/base-generic/CONFIG_USB_SERIAL_IPW
index 43c1be4f9..43c1be4f9 100644
--- a/baseconfig/CONFIG_USB_SERIAL_IPW
+++ b/configs/base-generic/CONFIG_USB_SERIAL_IPW
diff --git a/baseconfig/CONFIG_USB_SERIAL_IR b/configs/base-generic/CONFIG_USB_SERIAL_IR
index 5e8e41768..5e8e41768 100644
--- a/baseconfig/CONFIG_USB_SERIAL_IR
+++ b/configs/base-generic/CONFIG_USB_SERIAL_IR
diff --git a/baseconfig/CONFIG_USB_SERIAL_IUU b/configs/base-generic/CONFIG_USB_SERIAL_IUU
index e2b601afd..e2b601afd 100644
--- a/baseconfig/CONFIG_USB_SERIAL_IUU
+++ b/configs/base-generic/CONFIG_USB_SERIAL_IUU
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN
index a09ff3f77..a09ff3f77 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_MPR b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_MPR
index d561636fa..d561636fa 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_MPR
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_MPR
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_PDA b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_PDA
index fe57af002..fe57af002 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_PDA
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_PDA
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA18X b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA18X
index bcdb80fbb..bcdb80fbb 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA18X
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA18X
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19 b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19
index eafbdf784..eafbdf784 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19QI b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19QI
index aa7907801..aa7907801 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19QI
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19QI
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19QW b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19QW
index a2ed62f06..a2ed62f06 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19QW
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19QW
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19W b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19W
index 357aa7665..357aa7665 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA19W
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA19W
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28 b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28
index 1583a25c1..1583a25c1 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28X b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28X
index 2687d2e1f..2687d2e1f 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28X
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28X
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28XA b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28XA
index 61ae3d1b4..61ae3d1b4 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28XA
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28XA
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28XB b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28XB
index e6473ca77..e6473ca77 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA28XB
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA28XB
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA49W b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA49W
index bdd25840d..bdd25840d 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA49W
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA49W
diff --git a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA49WLC b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
index d35966c56..d35966c56 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
diff --git a/baseconfig/CONFIG_USB_SERIAL_KLSI b/configs/base-generic/CONFIG_USB_SERIAL_KLSI
index 6b920b859..6b920b859 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KLSI
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KLSI
diff --git a/baseconfig/CONFIG_USB_SERIAL_KOBIL_SCT b/configs/base-generic/CONFIG_USB_SERIAL_KOBIL_SCT
index 12f7217e2..12f7217e2 100644
--- a/baseconfig/CONFIG_USB_SERIAL_KOBIL_SCT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_KOBIL_SCT
diff --git a/baseconfig/CONFIG_USB_SERIAL_MCT_U232 b/configs/base-generic/CONFIG_USB_SERIAL_MCT_U232
index ee2c0eebb..ee2c0eebb 100644
--- a/baseconfig/CONFIG_USB_SERIAL_MCT_U232
+++ b/configs/base-generic/CONFIG_USB_SERIAL_MCT_U232
diff --git a/baseconfig/CONFIG_USB_SERIAL_METRO b/configs/base-generic/CONFIG_USB_SERIAL_METRO
index e18da6c48..e18da6c48 100644
--- a/baseconfig/CONFIG_USB_SERIAL_METRO
+++ b/configs/base-generic/CONFIG_USB_SERIAL_METRO
diff --git a/baseconfig/CONFIG_USB_SERIAL_MOS7720 b/configs/base-generic/CONFIG_USB_SERIAL_MOS7720
index 221f04db6..221f04db6 100644
--- a/baseconfig/CONFIG_USB_SERIAL_MOS7720
+++ b/configs/base-generic/CONFIG_USB_SERIAL_MOS7720
diff --git a/baseconfig/CONFIG_USB_SERIAL_MOS7840 b/configs/base-generic/CONFIG_USB_SERIAL_MOS7840
index d47711d40..d47711d40 100644
--- a/baseconfig/CONFIG_USB_SERIAL_MOS7840
+++ b/configs/base-generic/CONFIG_USB_SERIAL_MOS7840
diff --git a/baseconfig/CONFIG_USB_SERIAL_MXUPORT b/configs/base-generic/CONFIG_USB_SERIAL_MXUPORT
index 7be05998a..7be05998a 100644
--- a/baseconfig/CONFIG_USB_SERIAL_MXUPORT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_MXUPORT
diff --git a/baseconfig/CONFIG_USB_SERIAL_NAVMAN b/configs/base-generic/CONFIG_USB_SERIAL_NAVMAN
index 76073f7f8..76073f7f8 100644
--- a/baseconfig/CONFIG_USB_SERIAL_NAVMAN
+++ b/configs/base-generic/CONFIG_USB_SERIAL_NAVMAN
diff --git a/baseconfig/CONFIG_USB_SERIAL_OMNINET b/configs/base-generic/CONFIG_USB_SERIAL_OMNINET
index 318581205..318581205 100644
--- a/baseconfig/CONFIG_USB_SERIAL_OMNINET
+++ b/configs/base-generic/CONFIG_USB_SERIAL_OMNINET
diff --git a/baseconfig/CONFIG_USB_SERIAL_OPTICON b/configs/base-generic/CONFIG_USB_SERIAL_OPTICON
index 697554b8b..697554b8b 100644
--- a/baseconfig/CONFIG_USB_SERIAL_OPTICON
+++ b/configs/base-generic/CONFIG_USB_SERIAL_OPTICON
diff --git a/baseconfig/CONFIG_USB_SERIAL_OPTION b/configs/base-generic/CONFIG_USB_SERIAL_OPTION
index 6c05eb345..6c05eb345 100644
--- a/baseconfig/CONFIG_USB_SERIAL_OPTION
+++ b/configs/base-generic/CONFIG_USB_SERIAL_OPTION
diff --git a/baseconfig/CONFIG_USB_SERIAL_OTI6858 b/configs/base-generic/CONFIG_USB_SERIAL_OTI6858
index 051bd0fa4..051bd0fa4 100644
--- a/baseconfig/CONFIG_USB_SERIAL_OTI6858
+++ b/configs/base-generic/CONFIG_USB_SERIAL_OTI6858
diff --git a/baseconfig/CONFIG_USB_SERIAL_PL2303 b/configs/base-generic/CONFIG_USB_SERIAL_PL2303
index 5b99f3ed0..5b99f3ed0 100644
--- a/baseconfig/CONFIG_USB_SERIAL_PL2303
+++ b/configs/base-generic/CONFIG_USB_SERIAL_PL2303
diff --git a/baseconfig/CONFIG_USB_SERIAL_QCAUX b/configs/base-generic/CONFIG_USB_SERIAL_QCAUX
index 1c898ff4a..1c898ff4a 100644
--- a/baseconfig/CONFIG_USB_SERIAL_QCAUX
+++ b/configs/base-generic/CONFIG_USB_SERIAL_QCAUX
diff --git a/baseconfig/CONFIG_USB_SERIAL_QT2 b/configs/base-generic/CONFIG_USB_SERIAL_QT2
index 16c67f4ea..16c67f4ea 100644
--- a/baseconfig/CONFIG_USB_SERIAL_QT2
+++ b/configs/base-generic/CONFIG_USB_SERIAL_QT2
diff --git a/baseconfig/CONFIG_USB_SERIAL_QUALCOMM b/configs/base-generic/CONFIG_USB_SERIAL_QUALCOMM
index 26e5667b2..26e5667b2 100644
--- a/baseconfig/CONFIG_USB_SERIAL_QUALCOMM
+++ b/configs/base-generic/CONFIG_USB_SERIAL_QUALCOMM
diff --git a/baseconfig/CONFIG_USB_SERIAL_SAFE b/configs/base-generic/CONFIG_USB_SERIAL_SAFE
index 687dfe214..687dfe214 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SAFE
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SAFE
diff --git a/baseconfig/CONFIG_USB_SERIAL_SAFE_PADDED b/configs/base-generic/CONFIG_USB_SERIAL_SAFE_PADDED
index 7af538c75..7af538c75 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SAFE_PADDED
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SAFE_PADDED
diff --git a/baseconfig/CONFIG_USB_SERIAL_SIERRAWIRELESS b/configs/base-generic/CONFIG_USB_SERIAL_SIERRAWIRELESS
index 4f35e2616..4f35e2616 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SIERRAWIRELESS
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SIERRAWIRELESS
diff --git a/baseconfig/CONFIG_USB_SERIAL_SIMPLE b/configs/base-generic/CONFIG_USB_SERIAL_SIMPLE
index 6ffd8f60b..6ffd8f60b 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SIMPLE
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SIMPLE
diff --git a/baseconfig/CONFIG_USB_SERIAL_SPCP8X5 b/configs/base-generic/CONFIG_USB_SERIAL_SPCP8X5
index 97176567f..97176567f 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SPCP8X5
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SPCP8X5
diff --git a/baseconfig/CONFIG_USB_SERIAL_SSU100 b/configs/base-generic/CONFIG_USB_SERIAL_SSU100
index 5d35a493b..5d35a493b 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SSU100
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SSU100
diff --git a/baseconfig/CONFIG_USB_SERIAL_SYMBOL b/configs/base-generic/CONFIG_USB_SERIAL_SYMBOL
index 2f3118f12..2f3118f12 100644
--- a/baseconfig/CONFIG_USB_SERIAL_SYMBOL
+++ b/configs/base-generic/CONFIG_USB_SERIAL_SYMBOL
diff --git a/baseconfig/CONFIG_USB_SERIAL_TI b/configs/base-generic/CONFIG_USB_SERIAL_TI
index eb82f9ed7..eb82f9ed7 100644
--- a/baseconfig/CONFIG_USB_SERIAL_TI
+++ b/configs/base-generic/CONFIG_USB_SERIAL_TI
diff --git a/baseconfig/CONFIG_USB_SERIAL_UPD78F0730 b/configs/base-generic/CONFIG_USB_SERIAL_UPD78F0730
index 8258d573c..8258d573c 100644
--- a/baseconfig/CONFIG_USB_SERIAL_UPD78F0730
+++ b/configs/base-generic/CONFIG_USB_SERIAL_UPD78F0730
diff --git a/baseconfig/CONFIG_USB_SERIAL_VISOR b/configs/base-generic/CONFIG_USB_SERIAL_VISOR
index 51a00636b..51a00636b 100644
--- a/baseconfig/CONFIG_USB_SERIAL_VISOR
+++ b/configs/base-generic/CONFIG_USB_SERIAL_VISOR
diff --git a/baseconfig/CONFIG_USB_SERIAL_WHITEHEAT b/configs/base-generic/CONFIG_USB_SERIAL_WHITEHEAT
index 38ca17549..38ca17549 100644
--- a/baseconfig/CONFIG_USB_SERIAL_WHITEHEAT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_WHITEHEAT
diff --git a/baseconfig/CONFIG_USB_SERIAL_WISHBONE b/configs/base-generic/CONFIG_USB_SERIAL_WISHBONE
index 975ebe400..975ebe400 100644
--- a/baseconfig/CONFIG_USB_SERIAL_WISHBONE
+++ b/configs/base-generic/CONFIG_USB_SERIAL_WISHBONE
diff --git a/baseconfig/CONFIG_USB_SERIAL_XIRCOM b/configs/base-generic/CONFIG_USB_SERIAL_XIRCOM
index 856465ced..856465ced 100644
--- a/baseconfig/CONFIG_USB_SERIAL_XIRCOM
+++ b/configs/base-generic/CONFIG_USB_SERIAL_XIRCOM
diff --git a/baseconfig/CONFIG_USB_SERIAL_XSENS_MT b/configs/base-generic/CONFIG_USB_SERIAL_XSENS_MT
index bf74a0734..bf74a0734 100644
--- a/baseconfig/CONFIG_USB_SERIAL_XSENS_MT
+++ b/configs/base-generic/CONFIG_USB_SERIAL_XSENS_MT
diff --git a/baseconfig/CONFIG_USB_SEVSEG b/configs/base-generic/CONFIG_USB_SEVSEG
index 161fcb9b9..161fcb9b9 100644
--- a/baseconfig/CONFIG_USB_SEVSEG
+++ b/configs/base-generic/CONFIG_USB_SEVSEG
diff --git a/baseconfig/CONFIG_USB_SI470X b/configs/base-generic/CONFIG_USB_SI470X
index ef54d89e6..ef54d89e6 100644
--- a/baseconfig/CONFIG_USB_SI470X
+++ b/configs/base-generic/CONFIG_USB_SI470X
diff --git a/baseconfig/CONFIG_USB_SI4713 b/configs/base-generic/CONFIG_USB_SI4713
index 740b300f2..740b300f2 100644
--- a/baseconfig/CONFIG_USB_SI4713
+++ b/configs/base-generic/CONFIG_USB_SI4713
diff --git a/baseconfig/CONFIG_USB_SIERRA_NET b/configs/base-generic/CONFIG_USB_SIERRA_NET
index 310a9f31a..310a9f31a 100644
--- a/baseconfig/CONFIG_USB_SIERRA_NET
+++ b/configs/base-generic/CONFIG_USB_SIERRA_NET
diff --git a/baseconfig/CONFIG_USB_SISUSBVGA b/configs/base-generic/CONFIG_USB_SISUSBVGA
index 7efda84c1..7efda84c1 100644
--- a/baseconfig/CONFIG_USB_SISUSBVGA
+++ b/configs/base-generic/CONFIG_USB_SISUSBVGA
diff --git a/baseconfig/CONFIG_USB_SISUSBVGA_CON b/configs/base-generic/CONFIG_USB_SISUSBVGA_CON
index 88b771f2d..88b771f2d 100644
--- a/baseconfig/CONFIG_USB_SISUSBVGA_CON
+++ b/configs/base-generic/CONFIG_USB_SISUSBVGA_CON
diff --git a/baseconfig/CONFIG_USB_SL811_CS b/configs/base-generic/CONFIG_USB_SL811_CS
index e795e3e82..e795e3e82 100644
--- a/baseconfig/CONFIG_USB_SL811_CS
+++ b/configs/base-generic/CONFIG_USB_SL811_CS
diff --git a/baseconfig/CONFIG_USB_SL811_HCD b/configs/base-generic/CONFIG_USB_SL811_HCD
index 1f60c8204..1f60c8204 100644
--- a/baseconfig/CONFIG_USB_SL811_HCD
+++ b/configs/base-generic/CONFIG_USB_SL811_HCD
diff --git a/baseconfig/CONFIG_USB_SL811_HCD_ISO b/configs/base-generic/CONFIG_USB_SL811_HCD_ISO
index 475e241b6..475e241b6 100644
--- a/baseconfig/CONFIG_USB_SL811_HCD_ISO
+++ b/configs/base-generic/CONFIG_USB_SL811_HCD_ISO
diff --git a/baseconfig/CONFIG_USB_SNP_UDC_PLAT b/configs/base-generic/CONFIG_USB_SNP_UDC_PLAT
index b6095f92b..b6095f92b 100644
--- a/baseconfig/CONFIG_USB_SNP_UDC_PLAT
+++ b/configs/base-generic/CONFIG_USB_SNP_UDC_PLAT
diff --git a/baseconfig/CONFIG_USB_SPEEDTOUCH b/configs/base-generic/CONFIG_USB_SPEEDTOUCH
index 4d2b84780..4d2b84780 100644
--- a/baseconfig/CONFIG_USB_SPEEDTOUCH
+++ b/configs/base-generic/CONFIG_USB_SPEEDTOUCH
diff --git a/baseconfig/CONFIG_USB_STKWEBCAM b/configs/base-generic/CONFIG_USB_STKWEBCAM
index 6a636f6a5..6a636f6a5 100644
--- a/baseconfig/CONFIG_USB_STKWEBCAM
+++ b/configs/base-generic/CONFIG_USB_STKWEBCAM
diff --git a/baseconfig/CONFIG_USB_STORAGE b/configs/base-generic/CONFIG_USB_STORAGE
index c99c095df..c99c095df 100644
--- a/baseconfig/CONFIG_USB_STORAGE
+++ b/configs/base-generic/CONFIG_USB_STORAGE
diff --git a/baseconfig/CONFIG_USB_STORAGE_ALAUDA b/configs/base-generic/CONFIG_USB_STORAGE_ALAUDA
index 9f4bfdeac..9f4bfdeac 100644
--- a/baseconfig/CONFIG_USB_STORAGE_ALAUDA
+++ b/configs/base-generic/CONFIG_USB_STORAGE_ALAUDA
diff --git a/baseconfig/CONFIG_USB_STORAGE_CYPRESS_ATACB b/configs/base-generic/CONFIG_USB_STORAGE_CYPRESS_ATACB
index 3e095761b..3e095761b 100644
--- a/baseconfig/CONFIG_USB_STORAGE_CYPRESS_ATACB
+++ b/configs/base-generic/CONFIG_USB_STORAGE_CYPRESS_ATACB
diff --git a/baseconfig/CONFIG_USB_STORAGE_DATAFAB b/configs/base-generic/CONFIG_USB_STORAGE_DATAFAB
index 92eb4beb3..92eb4beb3 100644
--- a/baseconfig/CONFIG_USB_STORAGE_DATAFAB
+++ b/configs/base-generic/CONFIG_USB_STORAGE_DATAFAB
diff --git a/baseconfig/CONFIG_USB_STORAGE_DEBUG b/configs/base-generic/CONFIG_USB_STORAGE_DEBUG
index 3a8be6ac1..3a8be6ac1 100644
--- a/baseconfig/CONFIG_USB_STORAGE_DEBUG
+++ b/configs/base-generic/CONFIG_USB_STORAGE_DEBUG
diff --git a/baseconfig/CONFIG_USB_STORAGE_ENE_UB6250 b/configs/base-generic/CONFIG_USB_STORAGE_ENE_UB6250
index 64edcc2ac..64edcc2ac 100644
--- a/baseconfig/CONFIG_USB_STORAGE_ENE_UB6250
+++ b/configs/base-generic/CONFIG_USB_STORAGE_ENE_UB6250
diff --git a/baseconfig/CONFIG_USB_STORAGE_FREECOM b/configs/base-generic/CONFIG_USB_STORAGE_FREECOM
index 44ffc7edc..44ffc7edc 100644
--- a/baseconfig/CONFIG_USB_STORAGE_FREECOM
+++ b/configs/base-generic/CONFIG_USB_STORAGE_FREECOM
diff --git a/baseconfig/CONFIG_USB_STORAGE_ISD200 b/configs/base-generic/CONFIG_USB_STORAGE_ISD200
index c9604f346..c9604f346 100644
--- a/baseconfig/CONFIG_USB_STORAGE_ISD200
+++ b/configs/base-generic/CONFIG_USB_STORAGE_ISD200
diff --git a/baseconfig/CONFIG_USB_STORAGE_JUMPSHOT b/configs/base-generic/CONFIG_USB_STORAGE_JUMPSHOT
index 3753489e0..3753489e0 100644
--- a/baseconfig/CONFIG_USB_STORAGE_JUMPSHOT
+++ b/configs/base-generic/CONFIG_USB_STORAGE_JUMPSHOT
diff --git a/baseconfig/CONFIG_USB_STORAGE_KARMA b/configs/base-generic/CONFIG_USB_STORAGE_KARMA
index a3fcafa63..a3fcafa63 100644
--- a/baseconfig/CONFIG_USB_STORAGE_KARMA
+++ b/configs/base-generic/CONFIG_USB_STORAGE_KARMA
diff --git a/baseconfig/CONFIG_USB_STORAGE_ONETOUCH b/configs/base-generic/CONFIG_USB_STORAGE_ONETOUCH
index de105d95f..de105d95f 100644
--- a/baseconfig/CONFIG_USB_STORAGE_ONETOUCH
+++ b/configs/base-generic/CONFIG_USB_STORAGE_ONETOUCH
diff --git a/baseconfig/CONFIG_USB_STORAGE_REALTEK b/configs/base-generic/CONFIG_USB_STORAGE_REALTEK
index d726f0eff..d726f0eff 100644
--- a/baseconfig/CONFIG_USB_STORAGE_REALTEK
+++ b/configs/base-generic/CONFIG_USB_STORAGE_REALTEK
diff --git a/baseconfig/CONFIG_USB_STORAGE_SDDR09 b/configs/base-generic/CONFIG_USB_STORAGE_SDDR09
index 4336ce368..4336ce368 100644
--- a/baseconfig/CONFIG_USB_STORAGE_SDDR09
+++ b/configs/base-generic/CONFIG_USB_STORAGE_SDDR09
diff --git a/baseconfig/CONFIG_USB_STORAGE_SDDR55 b/configs/base-generic/CONFIG_USB_STORAGE_SDDR55
index 18e63e821..18e63e821 100644
--- a/baseconfig/CONFIG_USB_STORAGE_SDDR55
+++ b/configs/base-generic/CONFIG_USB_STORAGE_SDDR55
diff --git a/baseconfig/CONFIG_USB_STORAGE_USBAT b/configs/base-generic/CONFIG_USB_STORAGE_USBAT
index f5309cd3d..f5309cd3d 100644
--- a/baseconfig/CONFIG_USB_STORAGE_USBAT
+++ b/configs/base-generic/CONFIG_USB_STORAGE_USBAT
diff --git a/baseconfig/CONFIG_USB_STV06XX b/configs/base-generic/CONFIG_USB_STV06XX
index 6ad65be7c..6ad65be7c 100644
--- a/baseconfig/CONFIG_USB_STV06XX
+++ b/configs/base-generic/CONFIG_USB_STV06XX
diff --git a/baseconfig/CONFIG_USB_SUPPORT b/configs/base-generic/CONFIG_USB_SUPPORT
index c4310e0b7..c4310e0b7 100644
--- a/baseconfig/CONFIG_USB_SUPPORT
+++ b/configs/base-generic/CONFIG_USB_SUPPORT
diff --git a/baseconfig/CONFIG_USB_SWITCH_FSA9480 b/configs/base-generic/CONFIG_USB_SWITCH_FSA9480
index 96f7f1d30..96f7f1d30 100644
--- a/baseconfig/CONFIG_USB_SWITCH_FSA9480
+++ b/configs/base-generic/CONFIG_USB_SWITCH_FSA9480
diff --git a/baseconfig/CONFIG_USB_TEST b/configs/base-generic/CONFIG_USB_TEST
index d11d0fdaa..d11d0fdaa 100644
--- a/baseconfig/CONFIG_USB_TEST
+++ b/configs/base-generic/CONFIG_USB_TEST
diff --git a/baseconfig/CONFIG_USB_TMC b/configs/base-generic/CONFIG_USB_TMC
index 1215a85c2..1215a85c2 100644
--- a/baseconfig/CONFIG_USB_TMC
+++ b/configs/base-generic/CONFIG_USB_TMC
diff --git a/baseconfig/CONFIG_USB_TRANCEVIBRATOR b/configs/base-generic/CONFIG_USB_TRANCEVIBRATOR
index 3183ba4a2..3183ba4a2 100644
--- a/baseconfig/CONFIG_USB_TRANCEVIBRATOR
+++ b/configs/base-generic/CONFIG_USB_TRANCEVIBRATOR
diff --git a/baseconfig/CONFIG_USB_U132_HCD b/configs/base-generic/CONFIG_USB_U132_HCD
index b2e42ceb1..b2e42ceb1 100644
--- a/baseconfig/CONFIG_USB_U132_HCD
+++ b/configs/base-generic/CONFIG_USB_U132_HCD
diff --git a/baseconfig/CONFIG_USB_UAS b/configs/base-generic/CONFIG_USB_UAS
index 8d98eeae1..8d98eeae1 100644
--- a/baseconfig/CONFIG_USB_UAS
+++ b/configs/base-generic/CONFIG_USB_UAS
diff --git a/baseconfig/CONFIG_USB_UEAGLEATM b/configs/base-generic/CONFIG_USB_UEAGLEATM
index 42aac423b..42aac423b 100644
--- a/baseconfig/CONFIG_USB_UEAGLEATM
+++ b/configs/base-generic/CONFIG_USB_UEAGLEATM
diff --git a/baseconfig/CONFIG_USB_UHCI_HCD b/configs/base-generic/CONFIG_USB_UHCI_HCD
index 9c9d8c2f8..9c9d8c2f8 100644
--- a/baseconfig/CONFIG_USB_UHCI_HCD
+++ b/configs/base-generic/CONFIG_USB_UHCI_HCD
diff --git a/baseconfig/CONFIG_USB_ULPI_BUS b/configs/base-generic/CONFIG_USB_ULPI_BUS
index 2e81d95ff..2e81d95ff 100644
--- a/baseconfig/CONFIG_USB_ULPI_BUS
+++ b/configs/base-generic/CONFIG_USB_ULPI_BUS
diff --git a/baseconfig/CONFIG_USB_USBNET b/configs/base-generic/CONFIG_USB_USBNET
index 587a08dc5..587a08dc5 100644
--- a/baseconfig/CONFIG_USB_USBNET
+++ b/configs/base-generic/CONFIG_USB_USBNET
diff --git a/baseconfig/CONFIG_USB_USS720 b/configs/base-generic/CONFIG_USB_USS720
index ca903371e..ca903371e 100644
--- a/baseconfig/CONFIG_USB_USS720
+++ b/configs/base-generic/CONFIG_USB_USS720
diff --git a/baseconfig/CONFIG_USB_VIDEO_CLASS b/configs/base-generic/CONFIG_USB_VIDEO_CLASS
index 9a994b2c2..9a994b2c2 100644
--- a/baseconfig/CONFIG_USB_VIDEO_CLASS
+++ b/configs/base-generic/CONFIG_USB_VIDEO_CLASS
diff --git a/baseconfig/CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV b/configs/base-generic/CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
index 2d320f9d0..2d320f9d0 100644
--- a/baseconfig/CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
+++ b/configs/base-generic/CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
diff --git a/baseconfig/CONFIG_USB_VL600 b/configs/base-generic/CONFIG_USB_VL600
index 7f1be44f5..7f1be44f5 100644
--- a/baseconfig/CONFIG_USB_VL600
+++ b/configs/base-generic/CONFIG_USB_VL600
diff --git a/baseconfig/CONFIG_USB_WDM b/configs/base-generic/CONFIG_USB_WDM
index 5f264ab42..5f264ab42 100644
--- a/baseconfig/CONFIG_USB_WDM
+++ b/configs/base-generic/CONFIG_USB_WDM
diff --git a/baseconfig/CONFIG_USB_WHCI_HCD b/configs/base-generic/CONFIG_USB_WHCI_HCD
index 1fb8607f3..1fb8607f3 100644
--- a/baseconfig/CONFIG_USB_WHCI_HCD
+++ b/configs/base-generic/CONFIG_USB_WHCI_HCD
diff --git a/baseconfig/CONFIG_USB_WUSB b/configs/base-generic/CONFIG_USB_WUSB
index 8994ea5fc..8994ea5fc 100644
--- a/baseconfig/CONFIG_USB_WUSB
+++ b/configs/base-generic/CONFIG_USB_WUSB
diff --git a/baseconfig/CONFIG_USB_WUSB_CBAF b/configs/base-generic/CONFIG_USB_WUSB_CBAF
index e22af10d7..e22af10d7 100644
--- a/baseconfig/CONFIG_USB_WUSB_CBAF
+++ b/configs/base-generic/CONFIG_USB_WUSB_CBAF
diff --git a/baseconfig/CONFIG_USB_WUSB_CBAF_DEBUG b/configs/base-generic/CONFIG_USB_WUSB_CBAF_DEBUG
index ce6209b5a..ce6209b5a 100644
--- a/baseconfig/CONFIG_USB_WUSB_CBAF_DEBUG
+++ b/configs/base-generic/CONFIG_USB_WUSB_CBAF_DEBUG
diff --git a/baseconfig/CONFIG_USB_XHCI_HCD b/configs/base-generic/CONFIG_USB_XHCI_HCD
index ae4294baf..ae4294baf 100644
--- a/baseconfig/CONFIG_USB_XHCI_HCD
+++ b/configs/base-generic/CONFIG_USB_XHCI_HCD
diff --git a/baseconfig/CONFIG_USB_XHCI_PLATFORM b/configs/base-generic/CONFIG_USB_XHCI_PLATFORM
index c824b0c45..c824b0c45 100644
--- a/baseconfig/CONFIG_USB_XHCI_PLATFORM
+++ b/configs/base-generic/CONFIG_USB_XHCI_PLATFORM
diff --git a/baseconfig/CONFIG_USB_XUSBATM b/configs/base-generic/CONFIG_USB_XUSBATM
index 6c567c836..6c567c836 100644
--- a/baseconfig/CONFIG_USB_XUSBATM
+++ b/configs/base-generic/CONFIG_USB_XUSBATM
diff --git a/baseconfig/CONFIG_USB_YUREX b/configs/base-generic/CONFIG_USB_YUREX
index eae81a5eb..eae81a5eb 100644
--- a/baseconfig/CONFIG_USB_YUREX
+++ b/configs/base-generic/CONFIG_USB_YUREX
diff --git a/baseconfig/CONFIG_USB_ZD1201 b/configs/base-generic/CONFIG_USB_ZD1201
index d9678b1ad..d9678b1ad 100644
--- a/baseconfig/CONFIG_USB_ZD1201
+++ b/configs/base-generic/CONFIG_USB_ZD1201
diff --git a/baseconfig/CONFIG_USB_ZR364XX b/configs/base-generic/CONFIG_USB_ZR364XX
index c64997594..c64997594 100644
--- a/baseconfig/CONFIG_USB_ZR364XX
+++ b/configs/base-generic/CONFIG_USB_ZR364XX
diff --git a/baseconfig/CONFIG_USELIB b/configs/base-generic/CONFIG_USELIB
index a7491a18a..a7491a18a 100644
--- a/baseconfig/CONFIG_USELIB
+++ b/configs/base-generic/CONFIG_USELIB
diff --git a/baseconfig/CONFIG_USERFAULTFD b/configs/base-generic/CONFIG_USERFAULTFD
index 698c7ed28..698c7ed28 100644
--- a/baseconfig/CONFIG_USERFAULTFD
+++ b/configs/base-generic/CONFIG_USERFAULTFD
diff --git a/baseconfig/CONFIG_USERIO b/configs/base-generic/CONFIG_USERIO
index 994335413..994335413 100644
--- a/baseconfig/CONFIG_USERIO
+++ b/configs/base-generic/CONFIG_USERIO
diff --git a/baseconfig/CONFIG_USER_NS b/configs/base-generic/CONFIG_USER_NS
index 416bd53ce..416bd53ce 100644
--- a/baseconfig/CONFIG_USER_NS
+++ b/configs/base-generic/CONFIG_USER_NS
diff --git a/baseconfig/CONFIG_USE_THIN_ARCHIVES b/configs/base-generic/CONFIG_USE_THIN_ARCHIVES
index 828696b16..828696b16 100644
--- a/baseconfig/CONFIG_USE_THIN_ARCHIVES
+++ b/configs/base-generic/CONFIG_USE_THIN_ARCHIVES
diff --git a/baseconfig/CONFIG_UTS_NS b/configs/base-generic/CONFIG_UTS_NS
index d6c1f3443..d6c1f3443 100644
--- a/baseconfig/CONFIG_UTS_NS
+++ b/configs/base-generic/CONFIG_UTS_NS
diff --git a/baseconfig/CONFIG_UWB b/configs/base-generic/CONFIG_UWB
index 20f8ef938..20f8ef938 100644
--- a/baseconfig/CONFIG_UWB
+++ b/configs/base-generic/CONFIG_UWB
diff --git a/baseconfig/CONFIG_UWB_HWA b/configs/base-generic/CONFIG_UWB_HWA
index b6841199a..b6841199a 100644
--- a/baseconfig/CONFIG_UWB_HWA
+++ b/configs/base-generic/CONFIG_UWB_HWA
diff --git a/baseconfig/CONFIG_UWB_I1480U b/configs/base-generic/CONFIG_UWB_I1480U
index b315e0a98..b315e0a98 100644
--- a/baseconfig/CONFIG_UWB_I1480U
+++ b/configs/base-generic/CONFIG_UWB_I1480U
diff --git a/baseconfig/CONFIG_UWB_WHCI b/configs/base-generic/CONFIG_UWB_WHCI
index 4036889c6..4036889c6 100644
--- a/baseconfig/CONFIG_UWB_WHCI
+++ b/configs/base-generic/CONFIG_UWB_WHCI
diff --git a/baseconfig/CONFIG_V4L2_FLASH_LED_CLASS b/configs/base-generic/CONFIG_V4L2_FLASH_LED_CLASS
index 423407bd8..423407bd8 100644
--- a/baseconfig/CONFIG_V4L2_FLASH_LED_CLASS
+++ b/configs/base-generic/CONFIG_V4L2_FLASH_LED_CLASS
diff --git a/baseconfig/CONFIG_V4L_MEM2MEM_DRIVERS b/configs/base-generic/CONFIG_V4L_MEM2MEM_DRIVERS
index 938bc127e..938bc127e 100644
--- a/baseconfig/CONFIG_V4L_MEM2MEM_DRIVERS
+++ b/configs/base-generic/CONFIG_V4L_MEM2MEM_DRIVERS
diff --git a/baseconfig/CONFIG_V4L_PLATFORM_DRIVERS b/configs/base-generic/CONFIG_V4L_PLATFORM_DRIVERS
index 83d51763b..83d51763b 100644
--- a/baseconfig/CONFIG_V4L_PLATFORM_DRIVERS
+++ b/configs/base-generic/CONFIG_V4L_PLATFORM_DRIVERS
diff --git a/baseconfig/CONFIG_V4L_TEST_DRIVERS b/configs/base-generic/CONFIG_V4L_TEST_DRIVERS
index da5f958cf..da5f958cf 100644
--- a/baseconfig/CONFIG_V4L_TEST_DRIVERS
+++ b/configs/base-generic/CONFIG_V4L_TEST_DRIVERS
diff --git a/baseconfig/CONFIG_VCNL4000 b/configs/base-generic/CONFIG_VCNL4000
index ae803eced..ae803eced 100644
--- a/baseconfig/CONFIG_VCNL4000
+++ b/configs/base-generic/CONFIG_VCNL4000
diff --git a/baseconfig/CONFIG_VEML6070 b/configs/base-generic/CONFIG_VEML6070
index ad005705f..ad005705f 100644
--- a/baseconfig/CONFIG_VEML6070
+++ b/configs/base-generic/CONFIG_VEML6070
diff --git a/baseconfig/CONFIG_VETH b/configs/base-generic/CONFIG_VETH
index 80311f712..80311f712 100644
--- a/baseconfig/CONFIG_VETH
+++ b/configs/base-generic/CONFIG_VETH
diff --git a/baseconfig/CONFIG_VF610_ADC b/configs/base-generic/CONFIG_VF610_ADC
index 33803bea0..33803bea0 100644
--- a/baseconfig/CONFIG_VF610_ADC
+++ b/configs/base-generic/CONFIG_VF610_ADC
diff --git a/baseconfig/CONFIG_VF610_DAC b/configs/base-generic/CONFIG_VF610_DAC
index 556c9934d..556c9934d 100644
--- a/baseconfig/CONFIG_VF610_DAC
+++ b/configs/base-generic/CONFIG_VF610_DAC
diff --git a/baseconfig/CONFIG_VFAT_FS b/configs/base-generic/CONFIG_VFAT_FS
index 3204b85ef..3204b85ef 100644
--- a/baseconfig/CONFIG_VFAT_FS
+++ b/configs/base-generic/CONFIG_VFAT_FS
diff --git a/baseconfig/CONFIG_VFIO b/configs/base-generic/CONFIG_VFIO
index 3cdbde3d6..3cdbde3d6 100644
--- a/baseconfig/CONFIG_VFIO
+++ b/configs/base-generic/CONFIG_VFIO
diff --git a/baseconfig/CONFIG_VFIO_IOMMU_TYPE1 b/configs/base-generic/CONFIG_VFIO_IOMMU_TYPE1
index 0c5602392..0c5602392 100644
--- a/baseconfig/CONFIG_VFIO_IOMMU_TYPE1
+++ b/configs/base-generic/CONFIG_VFIO_IOMMU_TYPE1
diff --git a/baseconfig/CONFIG_VFIO_MDEV b/configs/base-generic/CONFIG_VFIO_MDEV
index 6657966d9..6657966d9 100644
--- a/baseconfig/CONFIG_VFIO_MDEV
+++ b/configs/base-generic/CONFIG_VFIO_MDEV
diff --git a/baseconfig/CONFIG_VFIO_MDEV_DEVICE b/configs/base-generic/CONFIG_VFIO_MDEV_DEVICE
index 5030e7f1e..5030e7f1e 100644
--- a/baseconfig/CONFIG_VFIO_MDEV_DEVICE
+++ b/configs/base-generic/CONFIG_VFIO_MDEV_DEVICE
diff --git a/baseconfig/CONFIG_VFIO_NOIOMMU b/configs/base-generic/CONFIG_VFIO_NOIOMMU
index 8f4a895e8..8f4a895e8 100644
--- a/baseconfig/CONFIG_VFIO_NOIOMMU
+++ b/configs/base-generic/CONFIG_VFIO_NOIOMMU
diff --git a/baseconfig/CONFIG_VFIO_PCI b/configs/base-generic/CONFIG_VFIO_PCI
index ace58fff3..ace58fff3 100644
--- a/baseconfig/CONFIG_VFIO_PCI
+++ b/configs/base-generic/CONFIG_VFIO_PCI
diff --git a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK
index 27fcded2d..27fcded2d 100644
--- a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK
+++ b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK
diff --git a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT
index a0a49c839..a0a49c839 100644
--- a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT
+++ b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT
diff --git a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK_SIZE b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
index 351b913ab..351b913ab 100644
--- a/baseconfig/CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
+++ b/configs/base-generic/CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
diff --git a/baseconfig/CONFIG_VGA_ARB b/configs/base-generic/CONFIG_VGA_ARB
index c6d1681b3..c6d1681b3 100644
--- a/baseconfig/CONFIG_VGA_ARB
+++ b/configs/base-generic/CONFIG_VGA_ARB
diff --git a/baseconfig/CONFIG_VGA_ARB_MAX_GPUS b/configs/base-generic/CONFIG_VGA_ARB_MAX_GPUS
index bb0eba9e0..bb0eba9e0 100644
--- a/baseconfig/CONFIG_VGA_ARB_MAX_GPUS
+++ b/configs/base-generic/CONFIG_VGA_ARB_MAX_GPUS
diff --git a/baseconfig/CONFIG_VGA_CONSOLE b/configs/base-generic/CONFIG_VGA_CONSOLE
index 461d0b1d4..461d0b1d4 100644
--- a/baseconfig/CONFIG_VGA_CONSOLE
+++ b/configs/base-generic/CONFIG_VGA_CONSOLE
diff --git a/baseconfig/CONFIG_VHOST_CROSS_ENDIAN_LEGACY b/configs/base-generic/CONFIG_VHOST_CROSS_ENDIAN_LEGACY
index e7cbfa39a..e7cbfa39a 100644
--- a/baseconfig/CONFIG_VHOST_CROSS_ENDIAN_LEGACY
+++ b/configs/base-generic/CONFIG_VHOST_CROSS_ENDIAN_LEGACY
diff --git a/baseconfig/CONFIG_VHOST_NET b/configs/base-generic/CONFIG_VHOST_NET
index 4dd9712dc..4dd9712dc 100644
--- a/baseconfig/CONFIG_VHOST_NET
+++ b/configs/base-generic/CONFIG_VHOST_NET
diff --git a/baseconfig/CONFIG_VHOST_SCSI b/configs/base-generic/CONFIG_VHOST_SCSI
index 3f733834e..3f733834e 100644
--- a/baseconfig/CONFIG_VHOST_SCSI
+++ b/configs/base-generic/CONFIG_VHOST_SCSI
diff --git a/baseconfig/CONFIG_VHOST_VSOCK b/configs/base-generic/CONFIG_VHOST_VSOCK
index 935594a5a..935594a5a 100644
--- a/baseconfig/CONFIG_VHOST_VSOCK
+++ b/configs/base-generic/CONFIG_VHOST_VSOCK
diff --git a/baseconfig/CONFIG_VIA_FIR b/configs/base-generic/CONFIG_VIA_FIR
index a123178c8..a123178c8 100644
--- a/baseconfig/CONFIG_VIA_FIR
+++ b/configs/base-generic/CONFIG_VIA_FIR
diff --git a/baseconfig/CONFIG_VIA_RHINE b/configs/base-generic/CONFIG_VIA_RHINE
index e5add953e..e5add953e 100644
--- a/baseconfig/CONFIG_VIA_RHINE
+++ b/configs/base-generic/CONFIG_VIA_RHINE
diff --git a/baseconfig/CONFIG_VIA_RHINE_MMIO b/configs/base-generic/CONFIG_VIA_RHINE_MMIO
index 7e19db828..7e19db828 100644
--- a/baseconfig/CONFIG_VIA_RHINE_MMIO
+++ b/configs/base-generic/CONFIG_VIA_RHINE_MMIO
diff --git a/baseconfig/CONFIG_VIA_VELOCITY b/configs/base-generic/CONFIG_VIA_VELOCITY
index 6946e11bd..6946e11bd 100644
--- a/baseconfig/CONFIG_VIA_VELOCITY
+++ b/configs/base-generic/CONFIG_VIA_VELOCITY
diff --git a/baseconfig/CONFIG_VIDEO_ADV_DEBUG b/configs/base-generic/CONFIG_VIDEO_ADV_DEBUG
index 896101ad3..896101ad3 100644
--- a/baseconfig/CONFIG_VIDEO_ADV_DEBUG
+++ b/configs/base-generic/CONFIG_VIDEO_ADV_DEBUG
diff --git a/baseconfig/CONFIG_VIDEO_AU0828 b/configs/base-generic/CONFIG_VIDEO_AU0828
index 57e308b28..57e308b28 100644
--- a/baseconfig/CONFIG_VIDEO_AU0828
+++ b/configs/base-generic/CONFIG_VIDEO_AU0828
diff --git a/baseconfig/CONFIG_VIDEO_AU0828_RC b/configs/base-generic/CONFIG_VIDEO_AU0828_RC
index 5b6d3346f..5b6d3346f 100644
--- a/baseconfig/CONFIG_VIDEO_AU0828_RC
+++ b/configs/base-generic/CONFIG_VIDEO_AU0828_RC
diff --git a/baseconfig/CONFIG_VIDEO_AU0828_V4L2 b/configs/base-generic/CONFIG_VIDEO_AU0828_V4L2
index 9862099c3..9862099c3 100644
--- a/baseconfig/CONFIG_VIDEO_AU0828_V4L2
+++ b/configs/base-generic/CONFIG_VIDEO_AU0828_V4L2
diff --git a/baseconfig/CONFIG_VIDEO_BT848 b/configs/base-generic/CONFIG_VIDEO_BT848
index cf561dc20..cf561dc20 100644
--- a/baseconfig/CONFIG_VIDEO_BT848
+++ b/configs/base-generic/CONFIG_VIDEO_BT848
diff --git a/baseconfig/CONFIG_VIDEO_CAFE_CCIC b/configs/base-generic/CONFIG_VIDEO_CAFE_CCIC
index f29531420..f29531420 100644
--- a/baseconfig/CONFIG_VIDEO_CAFE_CCIC
+++ b/configs/base-generic/CONFIG_VIDEO_CAFE_CCIC
diff --git a/baseconfig/CONFIG_VIDEO_CPIA b/configs/base-generic/CONFIG_VIDEO_CPIA
index 1101bdb4c..1101bdb4c 100644
--- a/baseconfig/CONFIG_VIDEO_CPIA
+++ b/configs/base-generic/CONFIG_VIDEO_CPIA
diff --git a/baseconfig/CONFIG_VIDEO_CPIA2 b/configs/base-generic/CONFIG_VIDEO_CPIA2
index a465885fc..a465885fc 100644
--- a/baseconfig/CONFIG_VIDEO_CPIA2
+++ b/configs/base-generic/CONFIG_VIDEO_CPIA2
diff --git a/baseconfig/CONFIG_VIDEO_CX18 b/configs/base-generic/CONFIG_VIDEO_CX18
index a64c7bd69..a64c7bd69 100644
--- a/baseconfig/CONFIG_VIDEO_CX18
+++ b/configs/base-generic/CONFIG_VIDEO_CX18
diff --git a/baseconfig/CONFIG_VIDEO_CX18_ALSA b/configs/base-generic/CONFIG_VIDEO_CX18_ALSA
index 851754c7e..851754c7e 100644
--- a/baseconfig/CONFIG_VIDEO_CX18_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_CX18_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_CX231XX b/configs/base-generic/CONFIG_VIDEO_CX231XX
index cc751ec5e..cc751ec5e 100644
--- a/baseconfig/CONFIG_VIDEO_CX231XX
+++ b/configs/base-generic/CONFIG_VIDEO_CX231XX
diff --git a/baseconfig/CONFIG_VIDEO_CX231XX_ALSA b/configs/base-generic/CONFIG_VIDEO_CX231XX_ALSA
index 321c73fe6..321c73fe6 100644
--- a/baseconfig/CONFIG_VIDEO_CX231XX_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_CX231XX_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_CX231XX_DVB b/configs/base-generic/CONFIG_VIDEO_CX231XX_DVB
index 89c4b20c7..89c4b20c7 100644
--- a/baseconfig/CONFIG_VIDEO_CX231XX_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_CX231XX_DVB
diff --git a/baseconfig/CONFIG_VIDEO_CX231XX_RC b/configs/base-generic/CONFIG_VIDEO_CX231XX_RC
index 6bb9b6434..6bb9b6434 100644
--- a/baseconfig/CONFIG_VIDEO_CX231XX_RC
+++ b/configs/base-generic/CONFIG_VIDEO_CX231XX_RC
diff --git a/baseconfig/CONFIG_VIDEO_CX23885 b/configs/base-generic/CONFIG_VIDEO_CX23885
index 3691f1117..3691f1117 100644
--- a/baseconfig/CONFIG_VIDEO_CX23885
+++ b/configs/base-generic/CONFIG_VIDEO_CX23885
diff --git a/baseconfig/CONFIG_VIDEO_CX25821 b/configs/base-generic/CONFIG_VIDEO_CX25821
index edab6b30b..edab6b30b 100644
--- a/baseconfig/CONFIG_VIDEO_CX25821
+++ b/configs/base-generic/CONFIG_VIDEO_CX25821
diff --git a/baseconfig/CONFIG_VIDEO_CX88 b/configs/base-generic/CONFIG_VIDEO_CX88
index fd2ebda36..fd2ebda36 100644
--- a/baseconfig/CONFIG_VIDEO_CX88
+++ b/configs/base-generic/CONFIG_VIDEO_CX88
diff --git a/baseconfig/CONFIG_VIDEO_CX88_ALSA b/configs/base-generic/CONFIG_VIDEO_CX88_ALSA
index 9380ee954..9380ee954 100644
--- a/baseconfig/CONFIG_VIDEO_CX88_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_CX88_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_CX88_BLACKBIRD b/configs/base-generic/CONFIG_VIDEO_CX88_BLACKBIRD
index 2625890b3..2625890b3 100644
--- a/baseconfig/CONFIG_VIDEO_CX88_BLACKBIRD
+++ b/configs/base-generic/CONFIG_VIDEO_CX88_BLACKBIRD
diff --git a/baseconfig/CONFIG_VIDEO_CX88_DVB b/configs/base-generic/CONFIG_VIDEO_CX88_DVB
index 744a6bffc..744a6bffc 100644
--- a/baseconfig/CONFIG_VIDEO_CX88_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_CX88_DVB
diff --git a/baseconfig/CONFIG_VIDEO_CX88_ENABLE_VP3054 b/configs/base-generic/CONFIG_VIDEO_CX88_ENABLE_VP3054
index 5d6b4c636..5d6b4c636 100644
--- a/baseconfig/CONFIG_VIDEO_CX88_ENABLE_VP3054
+++ b/configs/base-generic/CONFIG_VIDEO_CX88_ENABLE_VP3054
diff --git a/baseconfig/CONFIG_VIDEO_CX88_VP3054 b/configs/base-generic/CONFIG_VIDEO_CX88_VP3054
index b0f5660fa..b0f5660fa 100644
--- a/baseconfig/CONFIG_VIDEO_CX88_VP3054
+++ b/configs/base-generic/CONFIG_VIDEO_CX88_VP3054
diff --git a/baseconfig/CONFIG_VIDEO_DEV b/configs/base-generic/CONFIG_VIDEO_DEV
index 29d4f5fb9..29d4f5fb9 100644
--- a/baseconfig/CONFIG_VIDEO_DEV
+++ b/configs/base-generic/CONFIG_VIDEO_DEV
diff --git a/baseconfig/CONFIG_VIDEO_DT3155 b/configs/base-generic/CONFIG_VIDEO_DT3155
index e6e67dda2..e6e67dda2 100644
--- a/baseconfig/CONFIG_VIDEO_DT3155
+++ b/configs/base-generic/CONFIG_VIDEO_DT3155
diff --git a/baseconfig/CONFIG_VIDEO_EM28XX b/configs/base-generic/CONFIG_VIDEO_EM28XX
index 91dbbe8a8..91dbbe8a8 100644
--- a/baseconfig/CONFIG_VIDEO_EM28XX
+++ b/configs/base-generic/CONFIG_VIDEO_EM28XX
diff --git a/baseconfig/CONFIG_VIDEO_EM28XX_ALSA b/configs/base-generic/CONFIG_VIDEO_EM28XX_ALSA
index bfd028969..bfd028969 100644
--- a/baseconfig/CONFIG_VIDEO_EM28XX_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_EM28XX_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_EM28XX_DVB b/configs/base-generic/CONFIG_VIDEO_EM28XX_DVB
index fc878d969..fc878d969 100644
--- a/baseconfig/CONFIG_VIDEO_EM28XX_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_EM28XX_DVB
diff --git a/baseconfig/CONFIG_VIDEO_EM28XX_RC b/configs/base-generic/CONFIG_VIDEO_EM28XX_RC
index 188fbcde4..188fbcde4 100644
--- a/baseconfig/CONFIG_VIDEO_EM28XX_RC
+++ b/configs/base-generic/CONFIG_VIDEO_EM28XX_RC
diff --git a/baseconfig/CONFIG_VIDEO_EM28XX_V4L2 b/configs/base-generic/CONFIG_VIDEO_EM28XX_V4L2
index f8823fd49..f8823fd49 100644
--- a/baseconfig/CONFIG_VIDEO_EM28XX_V4L2
+++ b/configs/base-generic/CONFIG_VIDEO_EM28XX_V4L2
diff --git a/baseconfig/CONFIG_VIDEO_FB_IVTV b/configs/base-generic/CONFIG_VIDEO_FB_IVTV
index 168a1cd9f..168a1cd9f 100644
--- a/baseconfig/CONFIG_VIDEO_FB_IVTV
+++ b/configs/base-generic/CONFIG_VIDEO_FB_IVTV
diff --git a/baseconfig/CONFIG_VIDEO_FIXED_MINOR_RANGES b/configs/base-generic/CONFIG_VIDEO_FIXED_MINOR_RANGES
index 94e496440..94e496440 100644
--- a/baseconfig/CONFIG_VIDEO_FIXED_MINOR_RANGES
+++ b/configs/base-generic/CONFIG_VIDEO_FIXED_MINOR_RANGES
diff --git a/baseconfig/CONFIG_VIDEO_GO7007 b/configs/base-generic/CONFIG_VIDEO_GO7007
index d6278e5ec..d6278e5ec 100644
--- a/baseconfig/CONFIG_VIDEO_GO7007
+++ b/configs/base-generic/CONFIG_VIDEO_GO7007
diff --git a/baseconfig/CONFIG_VIDEO_GO7007_LOADER b/configs/base-generic/CONFIG_VIDEO_GO7007_LOADER
index ac5cb2d67..ac5cb2d67 100644
--- a/baseconfig/CONFIG_VIDEO_GO7007_LOADER
+++ b/configs/base-generic/CONFIG_VIDEO_GO7007_LOADER
diff --git a/baseconfig/CONFIG_VIDEO_GO7007_USB b/configs/base-generic/CONFIG_VIDEO_GO7007_USB
index 216a52165..216a52165 100644
--- a/baseconfig/CONFIG_VIDEO_GO7007_USB
+++ b/configs/base-generic/CONFIG_VIDEO_GO7007_USB
diff --git a/baseconfig/CONFIG_VIDEO_GO7007_USB_S2250_BOARD b/configs/base-generic/CONFIG_VIDEO_GO7007_USB_S2250_BOARD
index 3009f6423..3009f6423 100644
--- a/baseconfig/CONFIG_VIDEO_GO7007_USB_S2250_BOARD
+++ b/configs/base-generic/CONFIG_VIDEO_GO7007_USB_S2250_BOARD
diff --git a/baseconfig/CONFIG_VIDEO_HDPVR b/configs/base-generic/CONFIG_VIDEO_HDPVR
index 10a26d7b9..10a26d7b9 100644
--- a/baseconfig/CONFIG_VIDEO_HDPVR
+++ b/configs/base-generic/CONFIG_VIDEO_HDPVR
diff --git a/baseconfig/CONFIG_VIDEO_HEXIUM_GEMINI b/configs/base-generic/CONFIG_VIDEO_HEXIUM_GEMINI
index 97f5e16aa..97f5e16aa 100644
--- a/baseconfig/CONFIG_VIDEO_HEXIUM_GEMINI
+++ b/configs/base-generic/CONFIG_VIDEO_HEXIUM_GEMINI
diff --git a/baseconfig/CONFIG_VIDEO_HEXIUM_ORION b/configs/base-generic/CONFIG_VIDEO_HEXIUM_ORION
index fe06c155d..fe06c155d 100644
--- a/baseconfig/CONFIG_VIDEO_HEXIUM_ORION
+++ b/configs/base-generic/CONFIG_VIDEO_HEXIUM_ORION
diff --git a/baseconfig/CONFIG_VIDEO_IVTV b/configs/base-generic/CONFIG_VIDEO_IVTV
index 6929899fb..6929899fb 100644
--- a/baseconfig/CONFIG_VIDEO_IVTV
+++ b/configs/base-generic/CONFIG_VIDEO_IVTV
diff --git a/baseconfig/CONFIG_VIDEO_IVTV_ALSA b/configs/base-generic/CONFIG_VIDEO_IVTV_ALSA
index 399c4a119..399c4a119 100644
--- a/baseconfig/CONFIG_VIDEO_IVTV_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_IVTV_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS b/configs/base-generic/CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
index b1ad6abff..b1ad6abff 100644
--- a/baseconfig/CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
+++ b/configs/base-generic/CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
diff --git a/baseconfig/CONFIG_VIDEO_M5MOLS b/configs/base-generic/CONFIG_VIDEO_M5MOLS
index a6d833491..a6d833491 100644
--- a/baseconfig/CONFIG_VIDEO_M5MOLS
+++ b/configs/base-generic/CONFIG_VIDEO_M5MOLS
diff --git a/baseconfig/CONFIG_VIDEO_MEM2MEM_DEINTERLACE b/configs/base-generic/CONFIG_VIDEO_MEM2MEM_DEINTERLACE
index 6191ca49e..6191ca49e 100644
--- a/baseconfig/CONFIG_VIDEO_MEM2MEM_DEINTERLACE
+++ b/configs/base-generic/CONFIG_VIDEO_MEM2MEM_DEINTERLACE
diff --git a/baseconfig/CONFIG_VIDEO_MEYE b/configs/base-generic/CONFIG_VIDEO_MEYE
index 0b7775db9..0b7775db9 100644
--- a/baseconfig/CONFIG_VIDEO_MEYE
+++ b/configs/base-generic/CONFIG_VIDEO_MEYE
diff --git a/baseconfig/CONFIG_VIDEO_MXB b/configs/base-generic/CONFIG_VIDEO_MXB
index 86fc0dc78..86fc0dc78 100644
--- a/baseconfig/CONFIG_VIDEO_MXB
+++ b/configs/base-generic/CONFIG_VIDEO_MXB
diff --git a/baseconfig/CONFIG_VIDEO_NOON010PC30 b/configs/base-generic/CONFIG_VIDEO_NOON010PC30
index f85a2c867..f85a2c867 100644
--- a/baseconfig/CONFIG_VIDEO_NOON010PC30
+++ b/configs/base-generic/CONFIG_VIDEO_NOON010PC30
diff --git a/baseconfig/CONFIG_VIDEO_PCI_SKELETON b/configs/base-generic/CONFIG_VIDEO_PCI_SKELETON
index f3b48b7f1..f3b48b7f1 100644
--- a/baseconfig/CONFIG_VIDEO_PCI_SKELETON
+++ b/configs/base-generic/CONFIG_VIDEO_PCI_SKELETON
diff --git a/baseconfig/CONFIG_VIDEO_PVRUSB2 b/configs/base-generic/CONFIG_VIDEO_PVRUSB2
index 815541914..815541914 100644
--- a/baseconfig/CONFIG_VIDEO_PVRUSB2
+++ b/configs/base-generic/CONFIG_VIDEO_PVRUSB2
diff --git a/baseconfig/CONFIG_VIDEO_PVRUSB2_DEBUGIFC b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_DEBUGIFC
index 3f0f35e24..3f0f35e24 100644
--- a/baseconfig/CONFIG_VIDEO_PVRUSB2_DEBUGIFC
+++ b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_DEBUGIFC
diff --git a/baseconfig/CONFIG_VIDEO_PVRUSB2_DVB b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_DVB
index a4b22811c..a4b22811c 100644
--- a/baseconfig/CONFIG_VIDEO_PVRUSB2_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_DVB
diff --git a/baseconfig/CONFIG_VIDEO_PVRUSB2_SYSFS b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_SYSFS
index bf3bc3739..bf3bc3739 100644
--- a/baseconfig/CONFIG_VIDEO_PVRUSB2_SYSFS
+++ b/configs/base-generic/CONFIG_VIDEO_PVRUSB2_SYSFS
diff --git a/baseconfig/CONFIG_VIDEO_SAA6588 b/configs/base-generic/CONFIG_VIDEO_SAA6588
index 48d6306c3..48d6306c3 100644
--- a/baseconfig/CONFIG_VIDEO_SAA6588
+++ b/configs/base-generic/CONFIG_VIDEO_SAA6588
diff --git a/baseconfig/CONFIG_VIDEO_SAA7134 b/configs/base-generic/CONFIG_VIDEO_SAA7134
index d2572517a..d2572517a 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7134
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7134
diff --git a/baseconfig/CONFIG_VIDEO_SAA7134_ALSA b/configs/base-generic/CONFIG_VIDEO_SAA7134_ALSA
index d26534312..d26534312 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7134_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7134_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_SAA7134_DVB b/configs/base-generic/CONFIG_VIDEO_SAA7134_DVB
index 634959bee..634959bee 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7134_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7134_DVB
diff --git a/baseconfig/CONFIG_VIDEO_SAA7134_GO7007 b/configs/base-generic/CONFIG_VIDEO_SAA7134_GO7007
index 827ce2eae..827ce2eae 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7134_GO7007
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7134_GO7007
diff --git a/baseconfig/CONFIG_VIDEO_SAA7134_RC b/configs/base-generic/CONFIG_VIDEO_SAA7134_RC
index 42351d915..42351d915 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7134_RC
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7134_RC
diff --git a/baseconfig/CONFIG_VIDEO_SAA7146 b/configs/base-generic/CONFIG_VIDEO_SAA7146
index 02d317125..02d317125 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7146
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7146
diff --git a/baseconfig/CONFIG_VIDEO_SAA7146_VV b/configs/base-generic/CONFIG_VIDEO_SAA7146_VV
index 4053c13ed..4053c13ed 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7146_VV
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7146_VV
diff --git a/baseconfig/CONFIG_VIDEO_SAA7164 b/configs/base-generic/CONFIG_VIDEO_SAA7164
index 5eb306408..5eb306408 100644
--- a/baseconfig/CONFIG_VIDEO_SAA7164
+++ b/configs/base-generic/CONFIG_VIDEO_SAA7164
diff --git a/baseconfig/CONFIG_VIDEO_SH_MOBILE_CEU b/configs/base-generic/CONFIG_VIDEO_SH_MOBILE_CEU
index b1aa86b95..b1aa86b95 100644
--- a/baseconfig/CONFIG_VIDEO_SH_MOBILE_CEU
+++ b/configs/base-generic/CONFIG_VIDEO_SH_MOBILE_CEU
diff --git a/baseconfig/CONFIG_VIDEO_SH_MOBILE_CSI2 b/configs/base-generic/CONFIG_VIDEO_SH_MOBILE_CSI2
index 32d6d77f5..32d6d77f5 100644
--- a/baseconfig/CONFIG_VIDEO_SH_MOBILE_CSI2
+++ b/configs/base-generic/CONFIG_VIDEO_SH_MOBILE_CSI2
diff --git a/baseconfig/CONFIG_VIDEO_SH_VEU b/configs/base-generic/CONFIG_VIDEO_SH_VEU
index a5c75a605..a5c75a605 100644
--- a/baseconfig/CONFIG_VIDEO_SH_VEU
+++ b/configs/base-generic/CONFIG_VIDEO_SH_VEU
diff --git a/baseconfig/CONFIG_VIDEO_SOLO6X10 b/configs/base-generic/CONFIG_VIDEO_SOLO6X10
index 18e4b0459..18e4b0459 100644
--- a/baseconfig/CONFIG_VIDEO_SOLO6X10
+++ b/configs/base-generic/CONFIG_VIDEO_SOLO6X10
diff --git a/baseconfig/CONFIG_VIDEO_SR030PC30 b/configs/base-generic/CONFIG_VIDEO_SR030PC30
index 640980ee6..640980ee6 100644
--- a/baseconfig/CONFIG_VIDEO_SR030PC30
+++ b/configs/base-generic/CONFIG_VIDEO_SR030PC30
diff --git a/baseconfig/CONFIG_VIDEO_STK1160 b/configs/base-generic/CONFIG_VIDEO_STK1160
index 0583d960b..0583d960b 100644
--- a/baseconfig/CONFIG_VIDEO_STK1160
+++ b/configs/base-generic/CONFIG_VIDEO_STK1160
diff --git a/baseconfig/CONFIG_VIDEO_STK1160_AC97 b/configs/base-generic/CONFIG_VIDEO_STK1160_AC97
index 1d8b2ef3c..1d8b2ef3c 100644
--- a/baseconfig/CONFIG_VIDEO_STK1160_AC97
+++ b/configs/base-generic/CONFIG_VIDEO_STK1160_AC97
diff --git a/baseconfig/CONFIG_VIDEO_STK1160_COMMON b/configs/base-generic/CONFIG_VIDEO_STK1160_COMMON
index ecb59c6d9..ecb59c6d9 100644
--- a/baseconfig/CONFIG_VIDEO_STK1160_COMMON
+++ b/configs/base-generic/CONFIG_VIDEO_STK1160_COMMON
diff --git a/baseconfig/CONFIG_VIDEO_TM6000 b/configs/base-generic/CONFIG_VIDEO_TM6000
index de1314fa5..de1314fa5 100644
--- a/baseconfig/CONFIG_VIDEO_TM6000
+++ b/configs/base-generic/CONFIG_VIDEO_TM6000
diff --git a/baseconfig/CONFIG_VIDEO_TM6000_ALSA b/configs/base-generic/CONFIG_VIDEO_TM6000_ALSA
index 0bc0d4d94..0bc0d4d94 100644
--- a/baseconfig/CONFIG_VIDEO_TM6000_ALSA
+++ b/configs/base-generic/CONFIG_VIDEO_TM6000_ALSA
diff --git a/baseconfig/CONFIG_VIDEO_TM6000_DVB b/configs/base-generic/CONFIG_VIDEO_TM6000_DVB
index 331430bcc..331430bcc 100644
--- a/baseconfig/CONFIG_VIDEO_TM6000_DVB
+++ b/configs/base-generic/CONFIG_VIDEO_TM6000_DVB
diff --git a/baseconfig/CONFIG_VIDEO_TUNER b/configs/base-generic/CONFIG_VIDEO_TUNER
index 86fa64782..86fa64782 100644
--- a/baseconfig/CONFIG_VIDEO_TUNER
+++ b/configs/base-generic/CONFIG_VIDEO_TUNER
diff --git a/baseconfig/CONFIG_VIDEO_TW5864 b/configs/base-generic/CONFIG_VIDEO_TW5864
index a5c091656..a5c091656 100644
--- a/baseconfig/CONFIG_VIDEO_TW5864
+++ b/configs/base-generic/CONFIG_VIDEO_TW5864
diff --git a/baseconfig/CONFIG_VIDEO_TW68 b/configs/base-generic/CONFIG_VIDEO_TW68
index c3c9510d3..c3c9510d3 100644
--- a/baseconfig/CONFIG_VIDEO_TW68
+++ b/configs/base-generic/CONFIG_VIDEO_TW68
diff --git a/baseconfig/CONFIG_VIDEO_TW686X b/configs/base-generic/CONFIG_VIDEO_TW686X
index e5546d9b6..e5546d9b6 100644
--- a/baseconfig/CONFIG_VIDEO_TW686X
+++ b/configs/base-generic/CONFIG_VIDEO_TW686X
diff --git a/baseconfig/CONFIG_VIDEO_TW686X_KH b/configs/base-generic/CONFIG_VIDEO_TW686X_KH
index 4beac68db..4beac68db 100644
--- a/baseconfig/CONFIG_VIDEO_TW686X_KH
+++ b/configs/base-generic/CONFIG_VIDEO_TW686X_KH
diff --git a/baseconfig/CONFIG_VIDEO_USBTV b/configs/base-generic/CONFIG_VIDEO_USBTV
index 3a78fa25c..3a78fa25c 100644
--- a/baseconfig/CONFIG_VIDEO_USBTV
+++ b/configs/base-generic/CONFIG_VIDEO_USBTV
diff --git a/baseconfig/CONFIG_VIDEO_USBVISION b/configs/base-generic/CONFIG_VIDEO_USBVISION
index 1a04d6b12..1a04d6b12 100644
--- a/baseconfig/CONFIG_VIDEO_USBVISION
+++ b/configs/base-generic/CONFIG_VIDEO_USBVISION
diff --git a/baseconfig/CONFIG_VIDEO_V4L2 b/configs/base-generic/CONFIG_VIDEO_V4L2
index ec610631c..ec610631c 100644
--- a/baseconfig/CONFIG_VIDEO_V4L2
+++ b/configs/base-generic/CONFIG_VIDEO_V4L2
diff --git a/baseconfig/CONFIG_VIDEO_V4L2_SUBDEV_API b/configs/base-generic/CONFIG_VIDEO_V4L2_SUBDEV_API
index f591dc79a..f591dc79a 100644
--- a/baseconfig/CONFIG_VIDEO_V4L2_SUBDEV_API
+++ b/configs/base-generic/CONFIG_VIDEO_V4L2_SUBDEV_API
diff --git a/baseconfig/CONFIG_VIDEO_VIVI b/configs/base-generic/CONFIG_VIDEO_VIVI
index 03bab4943..03bab4943 100644
--- a/baseconfig/CONFIG_VIDEO_VIVI
+++ b/configs/base-generic/CONFIG_VIDEO_VIVI
diff --git a/baseconfig/CONFIG_VIDEO_VIVID b/configs/base-generic/CONFIG_VIDEO_VIVID
index 1201ac6dd..1201ac6dd 100644
--- a/baseconfig/CONFIG_VIDEO_VIVID
+++ b/configs/base-generic/CONFIG_VIDEO_VIVID
diff --git a/baseconfig/CONFIG_VIDEO_XILINX b/configs/base-generic/CONFIG_VIDEO_XILINX
index d57b7dd85..d57b7dd85 100644
--- a/baseconfig/CONFIG_VIDEO_XILINX
+++ b/configs/base-generic/CONFIG_VIDEO_XILINX
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN b/configs/base-generic/CONFIG_VIDEO_ZORAN
index cda3bcc19..cda3bcc19 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_AVS6EYES b/configs/base-generic/CONFIG_VIDEO_ZORAN_AVS6EYES
index b51611520..b51611520 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_AVS6EYES
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_AVS6EYES
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_BUZ b/configs/base-generic/CONFIG_VIDEO_ZORAN_BUZ
index 29e4bf146..29e4bf146 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_BUZ
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_BUZ
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_DC10 b/configs/base-generic/CONFIG_VIDEO_ZORAN_DC10
index d2acc130f..d2acc130f 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_DC10
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_DC10
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_DC30 b/configs/base-generic/CONFIG_VIDEO_ZORAN_DC30
index c7483f263..c7483f263 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_DC30
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_DC30
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_LML33 b/configs/base-generic/CONFIG_VIDEO_ZORAN_LML33
index 207ec6fc6..207ec6fc6 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_LML33
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_LML33
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_LML33R10 b/configs/base-generic/CONFIG_VIDEO_ZORAN_LML33R10
index 14ed0dedd..14ed0dedd 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_LML33R10
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_LML33R10
diff --git a/baseconfig/CONFIG_VIDEO_ZORAN_ZR36060 b/configs/base-generic/CONFIG_VIDEO_ZORAN_ZR36060
index dbec9b9d7..dbec9b9d7 100644
--- a/baseconfig/CONFIG_VIDEO_ZORAN_ZR36060
+++ b/configs/base-generic/CONFIG_VIDEO_ZORAN_ZR36060
diff --git a/baseconfig/CONFIG_VIPERBOARD_ADC b/configs/base-generic/CONFIG_VIPERBOARD_ADC
index 6427af502..6427af502 100644
--- a/baseconfig/CONFIG_VIPERBOARD_ADC
+++ b/configs/base-generic/CONFIG_VIPERBOARD_ADC
diff --git a/baseconfig/CONFIG_VIRTIO_BALLOON b/configs/base-generic/CONFIG_VIRTIO_BALLOON
index f3aec11c1..f3aec11c1 100644
--- a/baseconfig/CONFIG_VIRTIO_BALLOON
+++ b/configs/base-generic/CONFIG_VIRTIO_BALLOON
diff --git a/baseconfig/CONFIG_VIRTIO_BLK b/configs/base-generic/CONFIG_VIRTIO_BLK
index 193a20842..193a20842 100644
--- a/baseconfig/CONFIG_VIRTIO_BLK
+++ b/configs/base-generic/CONFIG_VIRTIO_BLK
diff --git a/baseconfig/CONFIG_VIRTIO_BLK_SCSI b/configs/base-generic/CONFIG_VIRTIO_BLK_SCSI
index e551a8ba1..e551a8ba1 100644
--- a/baseconfig/CONFIG_VIRTIO_BLK_SCSI
+++ b/configs/base-generic/CONFIG_VIRTIO_BLK_SCSI
diff --git a/baseconfig/CONFIG_VIRTIO_CONSOLE b/configs/base-generic/CONFIG_VIRTIO_CONSOLE
index 92643f4c4..92643f4c4 100644
--- a/baseconfig/CONFIG_VIRTIO_CONSOLE
+++ b/configs/base-generic/CONFIG_VIRTIO_CONSOLE
diff --git a/baseconfig/CONFIG_VIRTIO_INPUT b/configs/base-generic/CONFIG_VIRTIO_INPUT
index 87130e403..87130e403 100644
--- a/baseconfig/CONFIG_VIRTIO_INPUT
+++ b/configs/base-generic/CONFIG_VIRTIO_INPUT
diff --git a/baseconfig/CONFIG_VIRTIO_MMIO b/configs/base-generic/CONFIG_VIRTIO_MMIO
index be547dc13..be547dc13 100644
--- a/baseconfig/CONFIG_VIRTIO_MMIO
+++ b/configs/base-generic/CONFIG_VIRTIO_MMIO
diff --git a/baseconfig/CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES b/configs/base-generic/CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES
index 1abf97c1a..1abf97c1a 100644
--- a/baseconfig/CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES
+++ b/configs/base-generic/CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES
diff --git a/baseconfig/CONFIG_VIRTIO_NET b/configs/base-generic/CONFIG_VIRTIO_NET
index 170da19d6..170da19d6 100644
--- a/baseconfig/CONFIG_VIRTIO_NET
+++ b/configs/base-generic/CONFIG_VIRTIO_NET
diff --git a/baseconfig/CONFIG_VIRTIO_PCI b/configs/base-generic/CONFIG_VIRTIO_PCI
index 58505d3a5..58505d3a5 100644
--- a/baseconfig/CONFIG_VIRTIO_PCI
+++ b/configs/base-generic/CONFIG_VIRTIO_PCI
diff --git a/baseconfig/CONFIG_VIRTIO_PCI_LEGACY b/configs/base-generic/CONFIG_VIRTIO_PCI_LEGACY
index dc31c9947..dc31c9947 100644
--- a/baseconfig/CONFIG_VIRTIO_PCI_LEGACY
+++ b/configs/base-generic/CONFIG_VIRTIO_PCI_LEGACY
diff --git a/baseconfig/CONFIG_VIRTIO_VSOCKETS b/configs/base-generic/CONFIG_VIRTIO_VSOCKETS
index a14419e0f..a14419e0f 100644
--- a/baseconfig/CONFIG_VIRTIO_VSOCKETS
+++ b/configs/base-generic/CONFIG_VIRTIO_VSOCKETS
diff --git a/baseconfig/CONFIG_VIRTUALIZATION b/configs/base-generic/CONFIG_VIRTUALIZATION
index 097e8b935..097e8b935 100644
--- a/baseconfig/CONFIG_VIRTUALIZATION
+++ b/configs/base-generic/CONFIG_VIRTUALIZATION
diff --git a/baseconfig/CONFIG_VIRT_DRIVERS b/configs/base-generic/CONFIG_VIRT_DRIVERS
index 8cc1125d4..8cc1125d4 100644
--- a/baseconfig/CONFIG_VIRT_DRIVERS
+++ b/configs/base-generic/CONFIG_VIRT_DRIVERS
diff --git a/baseconfig/CONFIG_VITESSE_PHY b/configs/base-generic/CONFIG_VITESSE_PHY
index 98b7defb9..98b7defb9 100644
--- a/baseconfig/CONFIG_VITESSE_PHY
+++ b/configs/base-generic/CONFIG_VITESSE_PHY
diff --git a/baseconfig/CONFIG_VL6180 b/configs/base-generic/CONFIG_VL6180
index b178334de..b178334de 100644
--- a/baseconfig/CONFIG_VL6180
+++ b/configs/base-generic/CONFIG_VL6180
diff --git a/baseconfig/CONFIG_VLAN_8021Q b/configs/base-generic/CONFIG_VLAN_8021Q
index 1cb92b9cd..1cb92b9cd 100644
--- a/baseconfig/CONFIG_VLAN_8021Q
+++ b/configs/base-generic/CONFIG_VLAN_8021Q
diff --git a/baseconfig/CONFIG_VLAN_8021Q_GVRP b/configs/base-generic/CONFIG_VLAN_8021Q_GVRP
index dd976efa2..dd976efa2 100644
--- a/baseconfig/CONFIG_VLAN_8021Q_GVRP
+++ b/configs/base-generic/CONFIG_VLAN_8021Q_GVRP
diff --git a/baseconfig/CONFIG_VLAN_8021Q_MVRP b/configs/base-generic/CONFIG_VLAN_8021Q_MVRP
index c0184a3f6..c0184a3f6 100644
--- a/baseconfig/CONFIG_VLAN_8021Q_MVRP
+++ b/configs/base-generic/CONFIG_VLAN_8021Q_MVRP
diff --git a/baseconfig/CONFIG_VLSI_FIR b/configs/base-generic/CONFIG_VLSI_FIR
index fbade657a..fbade657a 100644
--- a/baseconfig/CONFIG_VLSI_FIR
+++ b/configs/base-generic/CONFIG_VLSI_FIR
diff --git a/baseconfig/CONFIG_VME_BUS b/configs/base-generic/CONFIG_VME_BUS
index 4523e4e1d..4523e4e1d 100644
--- a/baseconfig/CONFIG_VME_BUS
+++ b/configs/base-generic/CONFIG_VME_BUS
diff --git a/baseconfig/CONFIG_VMXNET3 b/configs/base-generic/CONFIG_VMXNET3
index 5055f163e..5055f163e 100644
--- a/baseconfig/CONFIG_VMXNET3
+++ b/configs/base-generic/CONFIG_VMXNET3
diff --git a/baseconfig/CONFIG_VORTEX b/configs/base-generic/CONFIG_VORTEX
index 3d9531497..3d9531497 100644
--- a/baseconfig/CONFIG_VORTEX
+++ b/configs/base-generic/CONFIG_VORTEX
diff --git a/baseconfig/CONFIG_VSOCKETS b/configs/base-generic/CONFIG_VSOCKETS
index da4a18806..da4a18806 100644
--- a/baseconfig/CONFIG_VSOCKETS
+++ b/configs/base-generic/CONFIG_VSOCKETS
diff --git a/baseconfig/CONFIG_VSOCKMON b/configs/base-generic/CONFIG_VSOCKMON
index 82594c488..82594c488 100644
--- a/baseconfig/CONFIG_VSOCKMON
+++ b/configs/base-generic/CONFIG_VSOCKMON
diff --git a/baseconfig/CONFIG_VT b/configs/base-generic/CONFIG_VT
index 4842a9980..4842a9980 100644
--- a/baseconfig/CONFIG_VT
+++ b/configs/base-generic/CONFIG_VT
diff --git a/baseconfig/CONFIG_VT6655 b/configs/base-generic/CONFIG_VT6655
index d13d9caef..d13d9caef 100644
--- a/baseconfig/CONFIG_VT6655
+++ b/configs/base-generic/CONFIG_VT6655
diff --git a/baseconfig/CONFIG_VT6656 b/configs/base-generic/CONFIG_VT6656
index 656f31345..656f31345 100644
--- a/baseconfig/CONFIG_VT6656
+++ b/configs/base-generic/CONFIG_VT6656
diff --git a/baseconfig/CONFIG_VT_CONSOLE b/configs/base-generic/CONFIG_VT_CONSOLE
index c3fcafd5f..c3fcafd5f 100644
--- a/baseconfig/CONFIG_VT_CONSOLE
+++ b/configs/base-generic/CONFIG_VT_CONSOLE
diff --git a/baseconfig/CONFIG_VT_HW_CONSOLE_BINDING b/configs/base-generic/CONFIG_VT_HW_CONSOLE_BINDING
index 04f0917d8..04f0917d8 100644
--- a/baseconfig/CONFIG_VT_HW_CONSOLE_BINDING
+++ b/configs/base-generic/CONFIG_VT_HW_CONSOLE_BINDING
diff --git a/baseconfig/CONFIG_VXFS_FS b/configs/base-generic/CONFIG_VXFS_FS
index 07d6c238c..07d6c238c 100644
--- a/baseconfig/CONFIG_VXFS_FS
+++ b/configs/base-generic/CONFIG_VXFS_FS
diff --git a/baseconfig/CONFIG_VXGE b/configs/base-generic/CONFIG_VXGE
index ceae8d57f..ceae8d57f 100644
--- a/baseconfig/CONFIG_VXGE
+++ b/configs/base-generic/CONFIG_VXGE
diff --git a/baseconfig/CONFIG_VXGE_DEBUG_TRACE_ALL b/configs/base-generic/CONFIG_VXGE_DEBUG_TRACE_ALL
index 2933be7e0..2933be7e0 100644
--- a/baseconfig/CONFIG_VXGE_DEBUG_TRACE_ALL
+++ b/configs/base-generic/CONFIG_VXGE_DEBUG_TRACE_ALL
diff --git a/baseconfig/CONFIG_VXLAN b/configs/base-generic/CONFIG_VXLAN
index 2aa404d8d..2aa404d8d 100644
--- a/baseconfig/CONFIG_VXLAN
+++ b/configs/base-generic/CONFIG_VXLAN
diff --git a/baseconfig/CONFIG_VZ89X b/configs/base-generic/CONFIG_VZ89X
index 3c56d573f..3c56d573f 100644
--- a/baseconfig/CONFIG_VZ89X
+++ b/configs/base-generic/CONFIG_VZ89X
diff --git a/baseconfig/CONFIG_W1 b/configs/base-generic/CONFIG_W1
index 34e2af379..34e2af379 100644
--- a/baseconfig/CONFIG_W1
+++ b/configs/base-generic/CONFIG_W1
diff --git a/baseconfig/CONFIG_W1_CON b/configs/base-generic/CONFIG_W1_CON
index 358619fe3..358619fe3 100644
--- a/baseconfig/CONFIG_W1_CON
+++ b/configs/base-generic/CONFIG_W1_CON
diff --git a/baseconfig/CONFIG_W1_MASTER_DS1WM b/configs/base-generic/CONFIG_W1_MASTER_DS1WM
index bf2934c1e..bf2934c1e 100644
--- a/baseconfig/CONFIG_W1_MASTER_DS1WM
+++ b/configs/base-generic/CONFIG_W1_MASTER_DS1WM
diff --git a/baseconfig/CONFIG_W1_MASTER_DS2482 b/configs/base-generic/CONFIG_W1_MASTER_DS2482
index 86b024d49..86b024d49 100644
--- a/baseconfig/CONFIG_W1_MASTER_DS2482
+++ b/configs/base-generic/CONFIG_W1_MASTER_DS2482
diff --git a/baseconfig/CONFIG_W1_MASTER_DS2490 b/configs/base-generic/CONFIG_W1_MASTER_DS2490
index 45a0491c9..45a0491c9 100644
--- a/baseconfig/CONFIG_W1_MASTER_DS2490
+++ b/configs/base-generic/CONFIG_W1_MASTER_DS2490
diff --git a/baseconfig/CONFIG_W1_MASTER_GPIO b/configs/base-generic/CONFIG_W1_MASTER_GPIO
index b4ee0962f..b4ee0962f 100644
--- a/baseconfig/CONFIG_W1_MASTER_GPIO
+++ b/configs/base-generic/CONFIG_W1_MASTER_GPIO
diff --git a/baseconfig/CONFIG_W1_MASTER_MATROX b/configs/base-generic/CONFIG_W1_MASTER_MATROX
index 764e89071..764e89071 100644
--- a/baseconfig/CONFIG_W1_MASTER_MATROX
+++ b/configs/base-generic/CONFIG_W1_MASTER_MATROX
diff --git a/baseconfig/CONFIG_W1_SLAVE_BQ27000 b/configs/base-generic/CONFIG_W1_SLAVE_BQ27000
index 8a2f20d83..8a2f20d83 100644
--- a/baseconfig/CONFIG_W1_SLAVE_BQ27000
+++ b/configs/base-generic/CONFIG_W1_SLAVE_BQ27000
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2405 b/configs/base-generic/CONFIG_W1_SLAVE_DS2405
index 16e7dd759..16e7dd759 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2405
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2405
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2406 b/configs/base-generic/CONFIG_W1_SLAVE_DS2406
index f84f5cc5d..f84f5cc5d 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2406
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2406
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2408 b/configs/base-generic/CONFIG_W1_SLAVE_DS2408
index 087722f52..087722f52 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2408
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2408
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2408_READBACK b/configs/base-generic/CONFIG_W1_SLAVE_DS2408_READBACK
index c85e0684b..c85e0684b 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2408_READBACK
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2408_READBACK
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2413 b/configs/base-generic/CONFIG_W1_SLAVE_DS2413
index 1706c056f..1706c056f 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2413
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2413
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2423 b/configs/base-generic/CONFIG_W1_SLAVE_DS2423
index 02d8b2a2b..02d8b2a2b 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2423
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2423
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2431 b/configs/base-generic/CONFIG_W1_SLAVE_DS2431
index 7ebd82d9a..7ebd82d9a 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2431
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2431
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2433 b/configs/base-generic/CONFIG_W1_SLAVE_DS2433
index 3e0c01dd9..3e0c01dd9 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2433
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2433
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2433_CRC b/configs/base-generic/CONFIG_W1_SLAVE_DS2433_CRC
index 2c85df291..2c85df291 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2433_CRC
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2433_CRC
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2438 b/configs/base-generic/CONFIG_W1_SLAVE_DS2438
index 34301a62e..34301a62e 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2438
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2438
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2760 b/configs/base-generic/CONFIG_W1_SLAVE_DS2760
index a010e4383..a010e4383 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2760
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2760
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2780 b/configs/base-generic/CONFIG_W1_SLAVE_DS2780
index 02cef33e8..02cef33e8 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2780
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2780
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2781 b/configs/base-generic/CONFIG_W1_SLAVE_DS2781
index 33bb9c0d4..33bb9c0d4 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2781
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2781
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS2805 b/configs/base-generic/CONFIG_W1_SLAVE_DS2805
index eddd3bbb3..eddd3bbb3 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS2805
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS2805
diff --git a/baseconfig/CONFIG_W1_SLAVE_DS28E04 b/configs/base-generic/CONFIG_W1_SLAVE_DS28E04
index 2cd9f8b44..2cd9f8b44 100644
--- a/baseconfig/CONFIG_W1_SLAVE_DS28E04
+++ b/configs/base-generic/CONFIG_W1_SLAVE_DS28E04
diff --git a/baseconfig/CONFIG_W1_SLAVE_SMEM b/configs/base-generic/CONFIG_W1_SLAVE_SMEM
index bc609766f..bc609766f 100644
--- a/baseconfig/CONFIG_W1_SLAVE_SMEM
+++ b/configs/base-generic/CONFIG_W1_SLAVE_SMEM
diff --git a/baseconfig/CONFIG_W1_SLAVE_THERM b/configs/base-generic/CONFIG_W1_SLAVE_THERM
index 96708a4f0..96708a4f0 100644
--- a/baseconfig/CONFIG_W1_SLAVE_THERM
+++ b/configs/base-generic/CONFIG_W1_SLAVE_THERM
diff --git a/baseconfig/CONFIG_W83627HF_WDT b/configs/base-generic/CONFIG_W83627HF_WDT
index f2cd258eb..f2cd258eb 100644
--- a/baseconfig/CONFIG_W83627HF_WDT
+++ b/configs/base-generic/CONFIG_W83627HF_WDT
diff --git a/baseconfig/CONFIG_W83877F_WDT b/configs/base-generic/CONFIG_W83877F_WDT
index f72b7e392..f72b7e392 100644
--- a/baseconfig/CONFIG_W83877F_WDT
+++ b/configs/base-generic/CONFIG_W83877F_WDT
diff --git a/baseconfig/CONFIG_W83977F_WDT b/configs/base-generic/CONFIG_W83977F_WDT
index 77f20d78f..77f20d78f 100644
--- a/baseconfig/CONFIG_W83977F_WDT
+++ b/configs/base-generic/CONFIG_W83977F_WDT
diff --git a/baseconfig/CONFIG_WAFER_WDT b/configs/base-generic/CONFIG_WAFER_WDT
index 40857148c..40857148c 100644
--- a/baseconfig/CONFIG_WAFER_WDT
+++ b/configs/base-generic/CONFIG_WAFER_WDT
diff --git a/baseconfig/CONFIG_WAN b/configs/base-generic/CONFIG_WAN
index d4ab57e1a..d4ab57e1a 100644
--- a/baseconfig/CONFIG_WAN
+++ b/configs/base-generic/CONFIG_WAN
diff --git a/baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM b/configs/base-generic/CONFIG_WARN_ALL_UNSEEDED_RANDOM
index 5244e5664..5244e5664 100644
--- a/baseconfig/CONFIG_WARN_ALL_UNSEEDED_RANDOM
+++ b/configs/base-generic/CONFIG_WARN_ALL_UNSEEDED_RANDOM
diff --git a/baseconfig/CONFIG_WATCHDOG b/configs/base-generic/CONFIG_WATCHDOG
index 80e211dce..80e211dce 100644
--- a/baseconfig/CONFIG_WATCHDOG
+++ b/configs/base-generic/CONFIG_WATCHDOG
diff --git a/baseconfig/CONFIG_WATCHDOG_CORE b/configs/base-generic/CONFIG_WATCHDOG_CORE
index e70e50b70..e70e50b70 100644
--- a/baseconfig/CONFIG_WATCHDOG_CORE
+++ b/configs/base-generic/CONFIG_WATCHDOG_CORE
diff --git a/baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED b/configs/base-generic/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED
index 2cdeb93aa..2cdeb93aa 100644
--- a/baseconfig/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED
+++ b/configs/base-generic/CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED
diff --git a/baseconfig/CONFIG_WATCHDOG_NOWAYOUT b/configs/base-generic/CONFIG_WATCHDOG_NOWAYOUT
index 0eb79411b..0eb79411b 100644
--- a/baseconfig/CONFIG_WATCHDOG_NOWAYOUT
+++ b/configs/base-generic/CONFIG_WATCHDOG_NOWAYOUT
diff --git a/baseconfig/CONFIG_WATCHDOG_PRETIMEOUT_GOV b/configs/base-generic/CONFIG_WATCHDOG_PRETIMEOUT_GOV
index 9002114df..9002114df 100644
--- a/baseconfig/CONFIG_WATCHDOG_PRETIMEOUT_GOV
+++ b/configs/base-generic/CONFIG_WATCHDOG_PRETIMEOUT_GOV
diff --git a/baseconfig/CONFIG_WATCHDOG_SYSFS b/configs/base-generic/CONFIG_WATCHDOG_SYSFS
index 7eb5ab9fc..7eb5ab9fc 100644
--- a/baseconfig/CONFIG_WATCHDOG_SYSFS
+++ b/configs/base-generic/CONFIG_WATCHDOG_SYSFS
diff --git a/baseconfig/CONFIG_WCN36XX b/configs/base-generic/CONFIG_WCN36XX
index 713e0088a..713e0088a 100644
--- a/baseconfig/CONFIG_WCN36XX
+++ b/configs/base-generic/CONFIG_WCN36XX
diff --git a/baseconfig/CONFIG_WCN36XX_DEBUGFS b/configs/base-generic/CONFIG_WCN36XX_DEBUGFS
index 672c1f3ea..672c1f3ea 100644
--- a/baseconfig/CONFIG_WCN36XX_DEBUGFS
+++ b/configs/base-generic/CONFIG_WCN36XX_DEBUGFS
diff --git a/baseconfig/CONFIG_WDAT_WDT b/configs/base-generic/CONFIG_WDAT_WDT
index 0aeb123ab..0aeb123ab 100644
--- a/baseconfig/CONFIG_WDAT_WDT
+++ b/configs/base-generic/CONFIG_WDAT_WDT
diff --git a/baseconfig/CONFIG_WDTPCI b/configs/base-generic/CONFIG_WDTPCI
index 9cc0d4bd5..9cc0d4bd5 100644
--- a/baseconfig/CONFIG_WDTPCI
+++ b/configs/base-generic/CONFIG_WDTPCI
diff --git a/baseconfig/CONFIG_WIL6210 b/configs/base-generic/CONFIG_WIL6210
index b68d764a8..b68d764a8 100644
--- a/baseconfig/CONFIG_WIL6210
+++ b/configs/base-generic/CONFIG_WIL6210
diff --git a/baseconfig/CONFIG_WIL6210_DEBUGFS b/configs/base-generic/CONFIG_WIL6210_DEBUGFS
index f0f5fe7cf..f0f5fe7cf 100644
--- a/baseconfig/CONFIG_WIL6210_DEBUGFS
+++ b/configs/base-generic/CONFIG_WIL6210_DEBUGFS
diff --git a/baseconfig/CONFIG_WIL6210_ISR_COR b/configs/base-generic/CONFIG_WIL6210_ISR_COR
index 0c8ea7b70..0c8ea7b70 100644
--- a/baseconfig/CONFIG_WIL6210_ISR_COR
+++ b/configs/base-generic/CONFIG_WIL6210_ISR_COR
diff --git a/baseconfig/CONFIG_WIL6210_TRACING b/configs/base-generic/CONFIG_WIL6210_TRACING
index 925a21f9f..925a21f9f 100644
--- a/baseconfig/CONFIG_WIL6210_TRACING
+++ b/configs/base-generic/CONFIG_WIL6210_TRACING
diff --git a/baseconfig/CONFIG_WILC1000_SDIO b/configs/base-generic/CONFIG_WILC1000_SDIO
index 603383d16..603383d16 100644
--- a/baseconfig/CONFIG_WILC1000_SDIO
+++ b/configs/base-generic/CONFIG_WILC1000_SDIO
diff --git a/baseconfig/CONFIG_WILC1000_SPI b/configs/base-generic/CONFIG_WILC1000_SPI
index a12849b37..a12849b37 100644
--- a/baseconfig/CONFIG_WILC1000_SPI
+++ b/configs/base-generic/CONFIG_WILC1000_SPI
diff --git a/baseconfig/CONFIG_WILINK_PLATFORM_DATA b/configs/base-generic/CONFIG_WILINK_PLATFORM_DATA
index e5ee7bc83..e5ee7bc83 100644
--- a/baseconfig/CONFIG_WILINK_PLATFORM_DATA
+++ b/configs/base-generic/CONFIG_WILINK_PLATFORM_DATA
diff --git a/baseconfig/CONFIG_WIMAX b/configs/base-generic/CONFIG_WIMAX
index 563d65057..563d65057 100644
--- a/baseconfig/CONFIG_WIMAX
+++ b/configs/base-generic/CONFIG_WIMAX
diff --git a/baseconfig/CONFIG_WINBOND_840 b/configs/base-generic/CONFIG_WINBOND_840
index e48420b66..e48420b66 100644
--- a/baseconfig/CONFIG_WINBOND_840
+++ b/configs/base-generic/CONFIG_WINBOND_840
diff --git a/baseconfig/CONFIG_WINBOND_FIR b/configs/base-generic/CONFIG_WINBOND_FIR
index 672756266..672756266 100644
--- a/baseconfig/CONFIG_WINBOND_FIR
+++ b/configs/base-generic/CONFIG_WINBOND_FIR
diff --git a/baseconfig/CONFIG_WIRELESS b/configs/base-generic/CONFIG_WIRELESS
index 150710089..150710089 100644
--- a/baseconfig/CONFIG_WIRELESS
+++ b/configs/base-generic/CONFIG_WIRELESS
diff --git a/baseconfig/CONFIG_WIRELESS_EXT b/configs/base-generic/CONFIG_WIRELESS_EXT
index f6ed50b4b..f6ed50b4b 100644
--- a/baseconfig/CONFIG_WIRELESS_EXT
+++ b/configs/base-generic/CONFIG_WIRELESS_EXT
diff --git a/baseconfig/CONFIG_WIZNET_W5100 b/configs/base-generic/CONFIG_WIZNET_W5100
index 899d98355..899d98355 100644
--- a/baseconfig/CONFIG_WIZNET_W5100
+++ b/configs/base-generic/CONFIG_WIZNET_W5100
diff --git a/baseconfig/CONFIG_WIZNET_W5100_SPI b/configs/base-generic/CONFIG_WIZNET_W5100_SPI
index 6ed2580dd..6ed2580dd 100644
--- a/baseconfig/CONFIG_WIZNET_W5100_SPI
+++ b/configs/base-generic/CONFIG_WIZNET_W5100_SPI
diff --git a/baseconfig/CONFIG_WIZNET_W5300 b/configs/base-generic/CONFIG_WIZNET_W5300
index 4d2eb1382..4d2eb1382 100644
--- a/baseconfig/CONFIG_WIZNET_W5300
+++ b/configs/base-generic/CONFIG_WIZNET_W5300
diff --git a/baseconfig/CONFIG_WL1251 b/configs/base-generic/CONFIG_WL1251
index 9c313c518..9c313c518 100644
--- a/baseconfig/CONFIG_WL1251
+++ b/configs/base-generic/CONFIG_WL1251
diff --git a/baseconfig/CONFIG_WL1251_SDIO b/configs/base-generic/CONFIG_WL1251_SDIO
index 235db171a..235db171a 100644
--- a/baseconfig/CONFIG_WL1251_SDIO
+++ b/configs/base-generic/CONFIG_WL1251_SDIO
diff --git a/baseconfig/CONFIG_WL1251_SPI b/configs/base-generic/CONFIG_WL1251_SPI
index ba82ae36f..ba82ae36f 100644
--- a/baseconfig/CONFIG_WL1251_SPI
+++ b/configs/base-generic/CONFIG_WL1251_SPI
diff --git a/baseconfig/CONFIG_WL12XX b/configs/base-generic/CONFIG_WL12XX
index 7ea7d1b9b..7ea7d1b9b 100644
--- a/baseconfig/CONFIG_WL12XX
+++ b/configs/base-generic/CONFIG_WL12XX
diff --git a/baseconfig/CONFIG_WL18XX b/configs/base-generic/CONFIG_WL18XX
index dcca0af3d..dcca0af3d 100644
--- a/baseconfig/CONFIG_WL18XX
+++ b/configs/base-generic/CONFIG_WL18XX
diff --git a/baseconfig/CONFIG_WLAN b/configs/base-generic/CONFIG_WLAN
index acb274930..acb274930 100644
--- a/baseconfig/CONFIG_WLAN
+++ b/configs/base-generic/CONFIG_WLAN
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_ADMTEK b/configs/base-generic/CONFIG_WLAN_VENDOR_ADMTEK
index b38ec2938..b38ec2938 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_ADMTEK
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_ADMTEK
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_ATH b/configs/base-generic/CONFIG_WLAN_VENDOR_ATH
index bbd0da798..bbd0da798 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_ATH
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_ATH
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_ATMEL b/configs/base-generic/CONFIG_WLAN_VENDOR_ATMEL
index 0cf5b4233..0cf5b4233 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_ATMEL
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_ATMEL
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_BROADCOM b/configs/base-generic/CONFIG_WLAN_VENDOR_BROADCOM
index 24736aa89..24736aa89 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_BROADCOM
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_BROADCOM
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_CISCO b/configs/base-generic/CONFIG_WLAN_VENDOR_CISCO
index 19bbb0848..19bbb0848 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_CISCO
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_CISCO
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_INTEL b/configs/base-generic/CONFIG_WLAN_VENDOR_INTEL
index 80de8dade..80de8dade 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_INTEL
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_INTEL
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_INTERSIL b/configs/base-generic/CONFIG_WLAN_VENDOR_INTERSIL
index be257935f..be257935f 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_INTERSIL
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_INTERSIL
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_MARVELL b/configs/base-generic/CONFIG_WLAN_VENDOR_MARVELL
index 46fdde217..46fdde217 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_MARVELL
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_MARVELL
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_MEDIATEK b/configs/base-generic/CONFIG_WLAN_VENDOR_MEDIATEK
index 47b49d2cb..47b49d2cb 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_MEDIATEK
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_MEDIATEK
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_QUANTENNA b/configs/base-generic/CONFIG_WLAN_VENDOR_QUANTENNA
index 94a9969d7..94a9969d7 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_QUANTENNA
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_QUANTENNA
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_RALINK b/configs/base-generic/CONFIG_WLAN_VENDOR_RALINK
index 604b617c5..604b617c5 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_RALINK
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_RALINK
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_REALTEK b/configs/base-generic/CONFIG_WLAN_VENDOR_REALTEK
index 2f41028dd..2f41028dd 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_REALTEK
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_REALTEK
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_RSI b/configs/base-generic/CONFIG_WLAN_VENDOR_RSI
index b3efc1de0..b3efc1de0 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_RSI
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_RSI
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_ST b/configs/base-generic/CONFIG_WLAN_VENDOR_ST
index 930c0fa3e..930c0fa3e 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_ST
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_ST
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_TI b/configs/base-generic/CONFIG_WLAN_VENDOR_TI
index 09b1c5ef1..09b1c5ef1 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_TI
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_TI
diff --git a/baseconfig/CONFIG_WLAN_VENDOR_ZYDAS b/configs/base-generic/CONFIG_WLAN_VENDOR_ZYDAS
index bf59a9403..bf59a9403 100644
--- a/baseconfig/CONFIG_WLAN_VENDOR_ZYDAS
+++ b/configs/base-generic/CONFIG_WLAN_VENDOR_ZYDAS
diff --git a/baseconfig/CONFIG_WLCORE b/configs/base-generic/CONFIG_WLCORE
index fa271342e..fa271342e 100644
--- a/baseconfig/CONFIG_WLCORE
+++ b/configs/base-generic/CONFIG_WLCORE
diff --git a/baseconfig/CONFIG_WLCORE_SDIO b/configs/base-generic/CONFIG_WLCORE_SDIO
index 27fbbf45e..27fbbf45e 100644
--- a/baseconfig/CONFIG_WLCORE_SDIO
+++ b/configs/base-generic/CONFIG_WLCORE_SDIO
diff --git a/baseconfig/CONFIG_WLCORE_SPI b/configs/base-generic/CONFIG_WLCORE_SPI
index 568d2a7fe..568d2a7fe 100644
--- a/baseconfig/CONFIG_WLCORE_SPI
+++ b/configs/base-generic/CONFIG_WLCORE_SPI
diff --git a/baseconfig/CONFIG_WM831X_POWER b/configs/base-generic/CONFIG_WM831X_POWER
index fb2ca593a..fb2ca593a 100644
--- a/baseconfig/CONFIG_WM831X_POWER
+++ b/configs/base-generic/CONFIG_WM831X_POWER
diff --git a/baseconfig/CONFIG_WM831X_WATCHDOG b/configs/base-generic/CONFIG_WM831X_WATCHDOG
index 4c6598200..4c6598200 100644
--- a/baseconfig/CONFIG_WM831X_WATCHDOG
+++ b/configs/base-generic/CONFIG_WM831X_WATCHDOG
diff --git a/baseconfig/CONFIG_WM8350_POWER b/configs/base-generic/CONFIG_WM8350_POWER
index b85d22dee..b85d22dee 100644
--- a/baseconfig/CONFIG_WM8350_POWER
+++ b/configs/base-generic/CONFIG_WM8350_POWER
diff --git a/baseconfig/CONFIG_WM8350_WATCHDOG b/configs/base-generic/CONFIG_WM8350_WATCHDOG
index 518b2662b..518b2662b 100644
--- a/baseconfig/CONFIG_WM8350_WATCHDOG
+++ b/configs/base-generic/CONFIG_WM8350_WATCHDOG
diff --git a/baseconfig/CONFIG_WQ_POWER_EFFICIENT_DEFAULT b/configs/base-generic/CONFIG_WQ_POWER_EFFICIENT_DEFAULT
index 6cf98a623..6cf98a623 100644
--- a/baseconfig/CONFIG_WQ_POWER_EFFICIENT_DEFAULT
+++ b/configs/base-generic/CONFIG_WQ_POWER_EFFICIENT_DEFAULT
diff --git a/baseconfig/CONFIG_WQ_WATCHDOG b/configs/base-generic/CONFIG_WQ_WATCHDOG
index 459eb0f79..459eb0f79 100644
--- a/baseconfig/CONFIG_WQ_WATCHDOG
+++ b/configs/base-generic/CONFIG_WQ_WATCHDOG
diff --git a/baseconfig/CONFIG_WW_MUTEX_SELFTEST b/configs/base-generic/CONFIG_WW_MUTEX_SELFTEST
index 014b2354c..014b2354c 100644
--- a/baseconfig/CONFIG_WW_MUTEX_SELFTEST
+++ b/configs/base-generic/CONFIG_WW_MUTEX_SELFTEST
diff --git a/baseconfig/CONFIG_X25 b/configs/base-generic/CONFIG_X25
index 928569482..928569482 100644
--- a/baseconfig/CONFIG_X25
+++ b/configs/base-generic/CONFIG_X25
diff --git a/baseconfig/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK b/configs/base-generic/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
index 9f86fd4f5..9f86fd4f5 100644
--- a/baseconfig/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
+++ b/configs/base-generic/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
diff --git a/baseconfig/CONFIG_X86_MCELOG_LEGACY b/configs/base-generic/CONFIG_X86_MCELOG_LEGACY
index 2a4755640..2a4755640 100644
--- a/baseconfig/CONFIG_X86_MCELOG_LEGACY
+++ b/configs/base-generic/CONFIG_X86_MCELOG_LEGACY
diff --git a/baseconfig/CONFIG_X86_PTDUMP b/configs/base-generic/CONFIG_X86_PTDUMP
index 74f8094eb..74f8094eb 100644
--- a/baseconfig/CONFIG_X86_PTDUMP
+++ b/configs/base-generic/CONFIG_X86_PTDUMP
diff --git a/baseconfig/CONFIG_XFRM b/configs/base-generic/CONFIG_XFRM
index 63f3578d2..63f3578d2 100644
--- a/baseconfig/CONFIG_XFRM
+++ b/configs/base-generic/CONFIG_XFRM
diff --git a/baseconfig/CONFIG_XFRM_MIGRATE b/configs/base-generic/CONFIG_XFRM_MIGRATE
index a0e219023..a0e219023 100644
--- a/baseconfig/CONFIG_XFRM_MIGRATE
+++ b/configs/base-generic/CONFIG_XFRM_MIGRATE
diff --git a/baseconfig/CONFIG_XFRM_STATISTICS b/configs/base-generic/CONFIG_XFRM_STATISTICS
index 27c7ef7a5..27c7ef7a5 100644
--- a/baseconfig/CONFIG_XFRM_STATISTICS
+++ b/configs/base-generic/CONFIG_XFRM_STATISTICS
diff --git a/baseconfig/CONFIG_XFRM_SUB_POLICY b/configs/base-generic/CONFIG_XFRM_SUB_POLICY
index 75c36f7a8..75c36f7a8 100644
--- a/baseconfig/CONFIG_XFRM_SUB_POLICY
+++ b/configs/base-generic/CONFIG_XFRM_SUB_POLICY
diff --git a/baseconfig/CONFIG_XFRM_USER b/configs/base-generic/CONFIG_XFRM_USER
index bfb1935c1..bfb1935c1 100644
--- a/baseconfig/CONFIG_XFRM_USER
+++ b/configs/base-generic/CONFIG_XFRM_USER
diff --git a/baseconfig/CONFIG_XFS_DEBUG b/configs/base-generic/CONFIG_XFS_DEBUG
index 63b3c69b3..63b3c69b3 100644
--- a/baseconfig/CONFIG_XFS_DEBUG
+++ b/configs/base-generic/CONFIG_XFS_DEBUG
diff --git a/baseconfig/CONFIG_XFS_FS b/configs/base-generic/CONFIG_XFS_FS
index 52766aeca..52766aeca 100644
--- a/baseconfig/CONFIG_XFS_FS
+++ b/configs/base-generic/CONFIG_XFS_FS
diff --git a/baseconfig/CONFIG_XFS_POSIX_ACL b/configs/base-generic/CONFIG_XFS_POSIX_ACL
index 3ec55ecb1..3ec55ecb1 100644
--- a/baseconfig/CONFIG_XFS_POSIX_ACL
+++ b/configs/base-generic/CONFIG_XFS_POSIX_ACL
diff --git a/baseconfig/CONFIG_XFS_QUOTA b/configs/base-generic/CONFIG_XFS_QUOTA
index 34757192a..34757192a 100644
--- a/baseconfig/CONFIG_XFS_QUOTA
+++ b/configs/base-generic/CONFIG_XFS_QUOTA
diff --git a/baseconfig/CONFIG_XFS_RT b/configs/base-generic/CONFIG_XFS_RT
index c6b8fc0c5..c6b8fc0c5 100644
--- a/baseconfig/CONFIG_XFS_RT
+++ b/configs/base-generic/CONFIG_XFS_RT
diff --git a/baseconfig/CONFIG_XFS_WARN b/configs/base-generic/CONFIG_XFS_WARN
index abdb2fd86..abdb2fd86 100644
--- a/baseconfig/CONFIG_XFS_WARN
+++ b/configs/base-generic/CONFIG_XFS_WARN
diff --git a/baseconfig/CONFIG_XILINX_DMA b/configs/base-generic/CONFIG_XILINX_DMA
index 67b50b087..67b50b087 100644
--- a/baseconfig/CONFIG_XILINX_DMA
+++ b/configs/base-generic/CONFIG_XILINX_DMA
diff --git a/baseconfig/CONFIG_XILINX_GMII2RGMII b/configs/base-generic/CONFIG_XILINX_GMII2RGMII
index c2901c6ea..c2901c6ea 100644
--- a/baseconfig/CONFIG_XILINX_GMII2RGMII
+++ b/configs/base-generic/CONFIG_XILINX_GMII2RGMII
diff --git a/baseconfig/CONFIG_XILINX_WATCHDOG b/configs/base-generic/CONFIG_XILINX_WATCHDOG
index b0f810054..b0f810054 100644
--- a/baseconfig/CONFIG_XILINX_WATCHDOG
+++ b/configs/base-generic/CONFIG_XILINX_WATCHDOG
diff --git a/baseconfig/CONFIG_XILLYBUS b/configs/base-generic/CONFIG_XILLYBUS
index 892625116..892625116 100644
--- a/baseconfig/CONFIG_XILLYBUS
+++ b/configs/base-generic/CONFIG_XILLYBUS
diff --git a/baseconfig/CONFIG_XILLYBUS_OF b/configs/base-generic/CONFIG_XILLYBUS_OF
index f34cc7b92..f34cc7b92 100644
--- a/baseconfig/CONFIG_XILLYBUS_OF
+++ b/configs/base-generic/CONFIG_XILLYBUS_OF
diff --git a/baseconfig/CONFIG_XILLYBUS_PCIE b/configs/base-generic/CONFIG_XILLYBUS_PCIE
index b7bdc9d35..b7bdc9d35 100644
--- a/baseconfig/CONFIG_XILLYBUS_PCIE
+++ b/configs/base-generic/CONFIG_XILLYBUS_PCIE
diff --git a/baseconfig/CONFIG_XZ_DEC b/configs/base-generic/CONFIG_XZ_DEC
index 42ed64a29..42ed64a29 100644
--- a/baseconfig/CONFIG_XZ_DEC
+++ b/configs/base-generic/CONFIG_XZ_DEC
diff --git a/baseconfig/CONFIG_XZ_DEC_IA64 b/configs/base-generic/CONFIG_XZ_DEC_IA64
index 34a4cb72e..34a4cb72e 100644
--- a/baseconfig/CONFIG_XZ_DEC_IA64
+++ b/configs/base-generic/CONFIG_XZ_DEC_IA64
diff --git a/baseconfig/CONFIG_XZ_DEC_POWERPC b/configs/base-generic/CONFIG_XZ_DEC_POWERPC
index 118f59ba1..118f59ba1 100644
--- a/baseconfig/CONFIG_XZ_DEC_POWERPC
+++ b/configs/base-generic/CONFIG_XZ_DEC_POWERPC
diff --git a/baseconfig/CONFIG_XZ_DEC_SPARC b/configs/base-generic/CONFIG_XZ_DEC_SPARC
index 328ae24e2..328ae24e2 100644
--- a/baseconfig/CONFIG_XZ_DEC_SPARC
+++ b/configs/base-generic/CONFIG_XZ_DEC_SPARC
diff --git a/baseconfig/CONFIG_XZ_DEC_TEST b/configs/base-generic/CONFIG_XZ_DEC_TEST
index bc04be3e6..bc04be3e6 100644
--- a/baseconfig/CONFIG_XZ_DEC_TEST
+++ b/configs/base-generic/CONFIG_XZ_DEC_TEST
diff --git a/baseconfig/CONFIG_XZ_DEC_X86 b/configs/base-generic/CONFIG_XZ_DEC_X86
index 1be802334..1be802334 100644
--- a/baseconfig/CONFIG_XZ_DEC_X86
+++ b/configs/base-generic/CONFIG_XZ_DEC_X86
diff --git a/baseconfig/CONFIG_YAM b/configs/base-generic/CONFIG_YAM
index 7c1ab0684..7c1ab0684 100644
--- a/baseconfig/CONFIG_YAM
+++ b/configs/base-generic/CONFIG_YAM
diff --git a/baseconfig/CONFIG_YELLOWFIN b/configs/base-generic/CONFIG_YELLOWFIN
index 526a45557..526a45557 100644
--- a/baseconfig/CONFIG_YELLOWFIN
+++ b/configs/base-generic/CONFIG_YELLOWFIN
diff --git a/baseconfig/CONFIG_YENTA b/configs/base-generic/CONFIG_YENTA
index fa07f12c4..fa07f12c4 100644
--- a/baseconfig/CONFIG_YENTA
+++ b/configs/base-generic/CONFIG_YENTA
diff --git a/baseconfig/CONFIG_Z3FOLD b/configs/base-generic/CONFIG_Z3FOLD
index 3f14fabba..3f14fabba 100644
--- a/baseconfig/CONFIG_Z3FOLD
+++ b/configs/base-generic/CONFIG_Z3FOLD
diff --git a/baseconfig/CONFIG_ZBUD b/configs/base-generic/CONFIG_ZBUD
index 87b4f7fec..87b4f7fec 100644
--- a/baseconfig/CONFIG_ZBUD
+++ b/configs/base-generic/CONFIG_ZBUD
diff --git a/baseconfig/CONFIG_ZD1211RW b/configs/base-generic/CONFIG_ZD1211RW
index 72dcdeca7..72dcdeca7 100644
--- a/baseconfig/CONFIG_ZD1211RW
+++ b/configs/base-generic/CONFIG_ZD1211RW
diff --git a/baseconfig/CONFIG_ZD1211RW_DEBUG b/configs/base-generic/CONFIG_ZD1211RW_DEBUG
index 478b6ea29..478b6ea29 100644
--- a/baseconfig/CONFIG_ZD1211RW_DEBUG
+++ b/configs/base-generic/CONFIG_ZD1211RW_DEBUG
diff --git a/baseconfig/CONFIG_ZEROPLUS_FF b/configs/base-generic/CONFIG_ZEROPLUS_FF
index aeaa3f376..aeaa3f376 100644
--- a/baseconfig/CONFIG_ZEROPLUS_FF
+++ b/configs/base-generic/CONFIG_ZEROPLUS_FF
diff --git a/baseconfig/CONFIG_ZIIRAVE_WATCHDOG b/configs/base-generic/CONFIG_ZIIRAVE_WATCHDOG
index db53f11b7..db53f11b7 100644
--- a/baseconfig/CONFIG_ZIIRAVE_WATCHDOG
+++ b/configs/base-generic/CONFIG_ZIIRAVE_WATCHDOG
diff --git a/baseconfig/CONFIG_ZISOFS b/configs/base-generic/CONFIG_ZISOFS
index ff0b58565..ff0b58565 100644
--- a/baseconfig/CONFIG_ZISOFS
+++ b/configs/base-generic/CONFIG_ZISOFS
diff --git a/baseconfig/CONFIG_ZLIB_DEFLATE b/configs/base-generic/CONFIG_ZLIB_DEFLATE
index 078cde4af..078cde4af 100644
--- a/baseconfig/CONFIG_ZLIB_DEFLATE
+++ b/configs/base-generic/CONFIG_ZLIB_DEFLATE
diff --git a/baseconfig/CONFIG_ZLIB_INFLATE b/configs/base-generic/CONFIG_ZLIB_INFLATE
index e23856bdc..e23856bdc 100644
--- a/baseconfig/CONFIG_ZLIB_INFLATE
+++ b/configs/base-generic/CONFIG_ZLIB_INFLATE
diff --git a/baseconfig/CONFIG_ZPA2326 b/configs/base-generic/CONFIG_ZPA2326
index a2a86f07a..a2a86f07a 100644
--- a/baseconfig/CONFIG_ZPA2326
+++ b/configs/base-generic/CONFIG_ZPA2326
diff --git a/baseconfig/CONFIG_ZRAM b/configs/base-generic/CONFIG_ZRAM
index 32adeab9e..32adeab9e 100644
--- a/baseconfig/CONFIG_ZRAM
+++ b/configs/base-generic/CONFIG_ZRAM
diff --git a/baseconfig/CONFIG_ZRAM_WRITEBACK b/configs/base-generic/CONFIG_ZRAM_WRITEBACK
index 9a566b71c..9a566b71c 100644
--- a/baseconfig/CONFIG_ZRAM_WRITEBACK
+++ b/configs/base-generic/CONFIG_ZRAM_WRITEBACK
diff --git a/baseconfig/CONFIG_ZSMALLOC b/configs/base-generic/CONFIG_ZSMALLOC
index c716bc70c..c716bc70c 100644
--- a/baseconfig/CONFIG_ZSMALLOC
+++ b/configs/base-generic/CONFIG_ZSMALLOC
diff --git a/baseconfig/CONFIG_ZSMALLOC_STAT b/configs/base-generic/CONFIG_ZSMALLOC_STAT
index b90d26cb5..b90d26cb5 100644
--- a/baseconfig/CONFIG_ZSMALLOC_STAT
+++ b/configs/base-generic/CONFIG_ZSMALLOC_STAT
diff --git a/baseconfig/CONFIG_ZSWAP b/configs/base-generic/CONFIG_ZSWAP
index 64b92172d..64b92172d 100644
--- a/baseconfig/CONFIG_ZSWAP
+++ b/configs/base-generic/CONFIG_ZSWAP
diff --git a/baseconfig/CONFIG_ZX_TDM b/configs/base-generic/CONFIG_ZX_TDM
index 9d2d9bf4c..9d2d9bf4c 100644
--- a/baseconfig/CONFIG_ZX_TDM
+++ b/configs/base-generic/CONFIG_ZX_TDM
diff --git a/baseconfig/arm/CONFIG_AFFS_FS b/configs/base-generic/arm/CONFIG_AFFS_FS
index 20d90af1c..20d90af1c 100644
--- a/baseconfig/arm/CONFIG_AFFS_FS
+++ b/configs/base-generic/arm/CONFIG_AFFS_FS
diff --git a/baseconfig/arm/CONFIG_AHCI_MVEBU b/configs/base-generic/arm/CONFIG_AHCI_MVEBU
index 17e587f8f..17e587f8f 100644
--- a/baseconfig/arm/CONFIG_AHCI_MVEBU
+++ b/configs/base-generic/arm/CONFIG_AHCI_MVEBU
diff --git a/baseconfig/arm/CONFIG_AHCI_TEGRA b/configs/base-generic/arm/CONFIG_AHCI_TEGRA
index d156192f4..d156192f4 100644
--- a/baseconfig/arm/CONFIG_AHCI_TEGRA
+++ b/configs/base-generic/arm/CONFIG_AHCI_TEGRA
diff --git a/baseconfig/arm/CONFIG_AK8975 b/configs/base-generic/arm/CONFIG_AK8975
index 547c21a99..547c21a99 100644
--- a/baseconfig/arm/CONFIG_AK8975
+++ b/configs/base-generic/arm/CONFIG_AK8975
diff --git a/baseconfig/arm/CONFIG_ARCH_ACTIONS b/configs/base-generic/arm/CONFIG_ARCH_ACTIONS
index 760663b50..760663b50 100644
--- a/baseconfig/arm/CONFIG_ARCH_ACTIONS
+++ b/configs/base-generic/arm/CONFIG_ARCH_ACTIONS
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM b/configs/base-generic/arm/CONFIG_ARCH_BCM
index 15f6c3565..15f6c3565 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM2835 b/configs/base-generic/arm/CONFIG_ARCH_BCM2835
index 5044e6362..5044e6362 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM2835
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM2835
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_21664 b/configs/base-generic/arm/CONFIG_ARCH_BCM_21664
index d05088e4f..d05088e4f 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_21664
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_21664
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_23550 b/configs/base-generic/arm/CONFIG_ARCH_BCM_23550
index b9e4063b0..b9e4063b0 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_23550
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_23550
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_281XX b/configs/base-generic/arm/CONFIG_ARCH_BCM_281XX
index b044dd183..b044dd183 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_281XX
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_281XX
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_5301X b/configs/base-generic/arm/CONFIG_ARCH_BCM_5301X
index c2fa5c53d..c2fa5c53d 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_5301X
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_5301X
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_53573 b/configs/base-generic/arm/CONFIG_ARCH_BCM_53573
index 7f606d5b9..7f606d5b9 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_53573
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_53573
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_63XX b/configs/base-generic/arm/CONFIG_ARCH_BCM_63XX
index 7ba9e2d1b..7ba9e2d1b 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_63XX
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_63XX
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_CYGNUS b/configs/base-generic/arm/CONFIG_ARCH_BCM_CYGNUS
index 588a5c5af..588a5c5af 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_CYGNUS
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_CYGNUS
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_IPROC b/configs/base-generic/arm/CONFIG_ARCH_BCM_IPROC
index d60fe565f..d60fe565f 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_IPROC
diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_NSP b/configs/base-generic/arm/CONFIG_ARCH_BCM_NSP
index 95a107b2d..95a107b2d 100644
--- a/baseconfig/arm/CONFIG_ARCH_BCM_NSP
+++ b/configs/base-generic/arm/CONFIG_ARCH_BCM_NSP
diff --git a/baseconfig/arm/CONFIG_ARCH_BERLIN b/configs/base-generic/arm/CONFIG_ARCH_BERLIN
index 9a647a4a1..9a647a4a1 100644
--- a/baseconfig/arm/CONFIG_ARCH_BERLIN
+++ b/configs/base-generic/arm/CONFIG_ARCH_BERLIN
diff --git a/baseconfig/arm/CONFIG_ARCH_BRCMSTB b/configs/base-generic/arm/CONFIG_ARCH_BRCMSTB
index a7fb1a6c1..a7fb1a6c1 100644
--- a/baseconfig/arm/CONFIG_ARCH_BRCMSTB
+++ b/configs/base-generic/arm/CONFIG_ARCH_BRCMSTB
diff --git a/baseconfig/arm/CONFIG_ARCH_MESON b/configs/base-generic/arm/CONFIG_ARCH_MESON
index d13ebc08a..d13ebc08a 100644
--- a/baseconfig/arm/CONFIG_ARCH_MESON
+++ b/configs/base-generic/arm/CONFIG_ARCH_MESON
diff --git a/baseconfig/arm/CONFIG_ARCH_MVEBU b/configs/base-generic/arm/CONFIG_ARCH_MVEBU
index d39b6cb65..d39b6cb65 100644
--- a/baseconfig/arm/CONFIG_ARCH_MVEBU
+++ b/configs/base-generic/arm/CONFIG_ARCH_MVEBU
diff --git a/baseconfig/arm/CONFIG_ARCH_ROCKCHIP b/configs/base-generic/arm/CONFIG_ARCH_ROCKCHIP
index d7fb4c2cd..d7fb4c2cd 100644
--- a/baseconfig/arm/CONFIG_ARCH_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_ARCH_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_ARCH_VEXPRESS b/configs/base-generic/arm/CONFIG_ARCH_VEXPRESS
index aa238e6be..aa238e6be 100644
--- a/baseconfig/arm/CONFIG_ARCH_VEXPRESS
+++ b/configs/base-generic/arm/CONFIG_ARCH_VEXPRESS
diff --git a/baseconfig/arm/CONFIG_ARMADA_THERMAL b/configs/base-generic/arm/CONFIG_ARMADA_THERMAL
index 8186f9995..8186f9995 100644
--- a/baseconfig/arm/CONFIG_ARMADA_THERMAL
+++ b/configs/base-generic/arm/CONFIG_ARMADA_THERMAL
diff --git a/baseconfig/arm/CONFIG_ARM_AMBA b/configs/base-generic/arm/CONFIG_ARM_AMBA
index ed20b0276..ed20b0276 100644
--- a/baseconfig/arm/CONFIG_ARM_AMBA
+++ b/configs/base-generic/arm/CONFIG_ARM_AMBA
diff --git a/baseconfig/arm/CONFIG_ARM_ARCH_TIMER b/configs/base-generic/arm/CONFIG_ARM_ARCH_TIMER
index f30148a82..f30148a82 100644
--- a/baseconfig/arm/CONFIG_ARM_ARCH_TIMER
+++ b/configs/base-generic/arm/CONFIG_ARM_ARCH_TIMER
diff --git a/baseconfig/arm/CONFIG_ARM_ARCH_TIMER_EVTSTREAM b/configs/base-generic/arm/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
index 1073ce86b..1073ce86b 100644
--- a/baseconfig/arm/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
+++ b/configs/base-generic/arm/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
diff --git a/baseconfig/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ b/configs/base-generic/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ
index 89d555289..89d555289 100644
--- a/baseconfig/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_BIG_LITTLE_CPUFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_BIG_LITTLE_CPUIDLE b/configs/base-generic/arm/CONFIG_ARM_BIG_LITTLE_CPUIDLE
index bff90d55e..bff90d55e 100644
--- a/baseconfig/arm/CONFIG_ARM_BIG_LITTLE_CPUIDLE
+++ b/configs/base-generic/arm/CONFIG_ARM_BIG_LITTLE_CPUIDLE
diff --git a/baseconfig/arm/CONFIG_ARM_CCI b/configs/base-generic/arm/CONFIG_ARM_CCI
index 8625c2178..8625c2178 100644
--- a/baseconfig/arm/CONFIG_ARM_CCI
+++ b/configs/base-generic/arm/CONFIG_ARM_CCI
diff --git a/baseconfig/arm/CONFIG_ARM_CCI400_PMU b/configs/base-generic/arm/CONFIG_ARM_CCI400_PMU
index c84d03ad8..c84d03ad8 100644
--- a/baseconfig/arm/CONFIG_ARM_CCI400_PMU
+++ b/configs/base-generic/arm/CONFIG_ARM_CCI400_PMU
diff --git a/baseconfig/arm/CONFIG_ARM_CCI5xx_PMU b/configs/base-generic/arm/CONFIG_ARM_CCI5xx_PMU
index e7f24a068..e7f24a068 100644
--- a/baseconfig/arm/CONFIG_ARM_CCI5xx_PMU
+++ b/configs/base-generic/arm/CONFIG_ARM_CCI5xx_PMU
diff --git a/baseconfig/arm/CONFIG_ARM_CCN b/configs/base-generic/arm/CONFIG_ARM_CCN
index af18c065a..af18c065a 100644
--- a/baseconfig/arm/CONFIG_ARM_CCN
+++ b/configs/base-generic/arm/CONFIG_ARM_CCN
diff --git a/baseconfig/arm/CONFIG_ARM_CHARLCD b/configs/base-generic/arm/CONFIG_ARM_CHARLCD
index ca8079bd8..ca8079bd8 100644
--- a/baseconfig/arm/CONFIG_ARM_CHARLCD
+++ b/configs/base-generic/arm/CONFIG_ARM_CHARLCD
diff --git a/baseconfig/arm/CONFIG_ARM_CPUIDLE b/configs/base-generic/arm/CONFIG_ARM_CPUIDLE
index 958eeae98..958eeae98 100644
--- a/baseconfig/arm/CONFIG_ARM_CPUIDLE
+++ b/configs/base-generic/arm/CONFIG_ARM_CPUIDLE
diff --git a/baseconfig/arm/CONFIG_ARM_CRYPTO b/configs/base-generic/arm/CONFIG_ARM_CRYPTO
index 5b165d5f4..5b165d5f4 100644
--- a/baseconfig/arm/CONFIG_ARM_CRYPTO
+++ b/configs/base-generic/arm/CONFIG_ARM_CRYPTO
diff --git a/baseconfig/arm/CONFIG_ARM_DMA_IOMMU_ALIGNMENT b/configs/base-generic/arm/CONFIG_ARM_DMA_IOMMU_ALIGNMENT
index 1a16ee77a..1a16ee77a 100644
--- a/baseconfig/arm/CONFIG_ARM_DMA_IOMMU_ALIGNMENT
+++ b/configs/base-generic/arm/CONFIG_ARM_DMA_IOMMU_ALIGNMENT
diff --git a/baseconfig/arm/CONFIG_ARM_DMA_USE_IOMMU b/configs/base-generic/arm/CONFIG_ARM_DMA_USE_IOMMU
index 0ff3d3105..0ff3d3105 100644
--- a/baseconfig/arm/CONFIG_ARM_DMA_USE_IOMMU
+++ b/configs/base-generic/arm/CONFIG_ARM_DMA_USE_IOMMU
diff --git a/baseconfig/arm/CONFIG_ARM_DT_BL_CPUFREQ b/configs/base-generic/arm/CONFIG_ARM_DT_BL_CPUFREQ
index af9b58a3e..af9b58a3e 100644
--- a/baseconfig/arm/CONFIG_ARM_DT_BL_CPUFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_DT_BL_CPUFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_GIC b/configs/base-generic/arm/CONFIG_ARM_GIC
index 2cb25cc89..2cb25cc89 100644
--- a/baseconfig/arm/CONFIG_ARM_GIC
+++ b/configs/base-generic/arm/CONFIG_ARM_GIC
diff --git a/baseconfig/arm/CONFIG_ARM_GIC_V2M b/configs/base-generic/arm/CONFIG_ARM_GIC_V2M
index b3eb7dd65..b3eb7dd65 100644
--- a/baseconfig/arm/CONFIG_ARM_GIC_V2M
+++ b/configs/base-generic/arm/CONFIG_ARM_GIC_V2M
diff --git a/baseconfig/arm/CONFIG_ARM_GIC_V3 b/configs/base-generic/arm/CONFIG_ARM_GIC_V3
index 424dd88e7..424dd88e7 100644
--- a/baseconfig/arm/CONFIG_ARM_GIC_V3
+++ b/configs/base-generic/arm/CONFIG_ARM_GIC_V3
diff --git a/baseconfig/arm/CONFIG_ARM_GIC_V3_ITS b/configs/base-generic/arm/CONFIG_ARM_GIC_V3_ITS
index d50b79f8d..d50b79f8d 100644
--- a/baseconfig/arm/CONFIG_ARM_GIC_V3_ITS
+++ b/configs/base-generic/arm/CONFIG_ARM_GIC_V3_ITS
diff --git a/baseconfig/arm/CONFIG_ARM_GLOBAL_TIMER b/configs/base-generic/arm/CONFIG_ARM_GLOBAL_TIMER
index affee18d8..affee18d8 100644
--- a/baseconfig/arm/CONFIG_ARM_GLOBAL_TIMER
+++ b/configs/base-generic/arm/CONFIG_ARM_GLOBAL_TIMER
diff --git a/baseconfig/arm/CONFIG_ARM_MHU b/configs/base-generic/arm/CONFIG_ARM_MHU
index fd6e8cc15..fd6e8cc15 100644
--- a/baseconfig/arm/CONFIG_ARM_MHU
+++ b/configs/base-generic/arm/CONFIG_ARM_MHU
diff --git a/baseconfig/arm/CONFIG_ARM_PL172_MPMC b/configs/base-generic/arm/CONFIG_ARM_PL172_MPMC
index 9c5719a69..9c5719a69 100644
--- a/baseconfig/arm/CONFIG_ARM_PL172_MPMC
+++ b/configs/base-generic/arm/CONFIG_ARM_PL172_MPMC
diff --git a/baseconfig/arm/CONFIG_ARM_PMU b/configs/base-generic/arm/CONFIG_ARM_PMU
index a9348c817..a9348c817 100644
--- a/baseconfig/arm/CONFIG_ARM_PMU
+++ b/configs/base-generic/arm/CONFIG_ARM_PMU
diff --git a/baseconfig/arm/CONFIG_ARM_PSCI b/configs/base-generic/arm/CONFIG_ARM_PSCI
index 4fd37fc3e..4fd37fc3e 100644
--- a/baseconfig/arm/CONFIG_ARM_PSCI
+++ b/configs/base-generic/arm/CONFIG_ARM_PSCI
diff --git a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER b/configs/base-generic/arm/CONFIG_ARM_PSCI_CHECKER
index 8d66ce36a..8d66ce36a 100644
--- a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
+++ b/configs/base-generic/arm/CONFIG_ARM_PSCI_CHECKER
diff --git a/baseconfig/arm/CONFIG_ARM_PTDUMP b/configs/base-generic/arm/CONFIG_ARM_PTDUMP
index a3ae8ffd6..a3ae8ffd6 100644
--- a/baseconfig/arm/CONFIG_ARM_PTDUMP
+++ b/configs/base-generic/arm/CONFIG_ARM_PTDUMP
diff --git a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ b/configs/base-generic/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
index cd4598a17..cd4598a17 100644
--- a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_SCPI_POWER_DOMAIN b/configs/base-generic/arm/CONFIG_ARM_SCPI_POWER_DOMAIN
index b1f92c0d4..b1f92c0d4 100644
--- a/baseconfig/arm/CONFIG_ARM_SCPI_POWER_DOMAIN
+++ b/configs/base-generic/arm/CONFIG_ARM_SCPI_POWER_DOMAIN
diff --git a/baseconfig/arm/CONFIG_ARM_SCPI_PROTOCOL b/configs/base-generic/arm/CONFIG_ARM_SCPI_PROTOCOL
index 29ef036c5..29ef036c5 100644
--- a/baseconfig/arm/CONFIG_ARM_SCPI_PROTOCOL
+++ b/configs/base-generic/arm/CONFIG_ARM_SCPI_PROTOCOL
diff --git a/baseconfig/arm/CONFIG_ARM_SMMU b/configs/base-generic/arm/CONFIG_ARM_SMMU
index 920fadc10..920fadc10 100644
--- a/baseconfig/arm/CONFIG_ARM_SMMU
+++ b/configs/base-generic/arm/CONFIG_ARM_SMMU
diff --git a/baseconfig/arm/CONFIG_ARM_SP805_WATCHDOG b/configs/base-generic/arm/CONFIG_ARM_SP805_WATCHDOG
index 24d9b92d0..24d9b92d0 100644
--- a/baseconfig/arm/CONFIG_ARM_SP805_WATCHDOG
+++ b/configs/base-generic/arm/CONFIG_ARM_SP805_WATCHDOG
diff --git a/baseconfig/arm/CONFIG_ARM_TEGRA124_CPUFREQ b/configs/base-generic/arm/CONFIG_ARM_TEGRA124_CPUFREQ
index 7cdcb20ad..7cdcb20ad 100644
--- a/baseconfig/arm/CONFIG_ARM_TEGRA124_CPUFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_TEGRA124_CPUFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_TEGRA20_CPUFREQ b/configs/base-generic/arm/CONFIG_ARM_TEGRA20_CPUFREQ
index 8170a4873..8170a4873 100644
--- a/baseconfig/arm/CONFIG_ARM_TEGRA20_CPUFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_TEGRA20_CPUFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_TEGRA_DEVFREQ b/configs/base-generic/arm/CONFIG_ARM_TEGRA_DEVFREQ
index d64e3e373..d64e3e373 100644
--- a/baseconfig/arm/CONFIG_ARM_TEGRA_DEVFREQ
+++ b/configs/base-generic/arm/CONFIG_ARM_TEGRA_DEVFREQ
diff --git a/baseconfig/arm/CONFIG_ARM_TIMER_SP804 b/configs/base-generic/arm/CONFIG_ARM_TIMER_SP804
index 94c9ede0a..94c9ede0a 100644
--- a/baseconfig/arm/CONFIG_ARM_TIMER_SP804
+++ b/configs/base-generic/arm/CONFIG_ARM_TIMER_SP804
diff --git a/baseconfig/arm/CONFIG_ASYMMETRIC_KEY_TYPE b/configs/base-generic/arm/CONFIG_ASYMMETRIC_KEY_TYPE
index c7d15a4b1..c7d15a4b1 100644
--- a/baseconfig/arm/CONFIG_ASYMMETRIC_KEY_TYPE
+++ b/configs/base-generic/arm/CONFIG_ASYMMETRIC_KEY_TYPE
diff --git a/baseconfig/arm/CONFIG_ATALK b/configs/base-generic/arm/CONFIG_ATALK
index 577083a7c..577083a7c 100644
--- a/baseconfig/arm/CONFIG_ATALK
+++ b/configs/base-generic/arm/CONFIG_ATALK
diff --git a/baseconfig/arm/CONFIG_ATM_DRIVERS b/configs/base-generic/arm/CONFIG_ATM_DRIVERS
index 9ef2a621b..9ef2a621b 100644
--- a/baseconfig/arm/CONFIG_ATM_DRIVERS
+++ b/configs/base-generic/arm/CONFIG_ATM_DRIVERS
diff --git a/baseconfig/arm/CONFIG_BACKLIGHT_GENERIC b/configs/base-generic/arm/CONFIG_BACKLIGHT_GENERIC
index e3f6f516e..e3f6f516e 100644
--- a/baseconfig/arm/CONFIG_BACKLIGHT_GENERIC
+++ b/configs/base-generic/arm/CONFIG_BACKLIGHT_GENERIC
diff --git a/baseconfig/arm/CONFIG_BACKLIGHT_GPIO b/configs/base-generic/arm/CONFIG_BACKLIGHT_GPIO
index e4776be5a..e4776be5a 100644
--- a/baseconfig/arm/CONFIG_BACKLIGHT_GPIO
+++ b/configs/base-generic/arm/CONFIG_BACKLIGHT_GPIO
diff --git a/baseconfig/arm/CONFIG_BACKLIGHT_PWM b/configs/base-generic/arm/CONFIG_BACKLIGHT_PWM
index 44737e214..44737e214 100644
--- a/baseconfig/arm/CONFIG_BACKLIGHT_PWM
+++ b/configs/base-generic/arm/CONFIG_BACKLIGHT_PWM
diff --git a/baseconfig/arm/CONFIG_BCM2835_MBOX b/configs/base-generic/arm/CONFIG_BCM2835_MBOX
index 2a536e9f6..2a536e9f6 100644
--- a/baseconfig/arm/CONFIG_BCM2835_MBOX
+++ b/configs/base-generic/arm/CONFIG_BCM2835_MBOX
diff --git a/baseconfig/arm/CONFIG_BCM2835_THERMAL b/configs/base-generic/arm/CONFIG_BCM2835_THERMAL
index a6e3c0a6d..a6e3c0a6d 100644
--- a/baseconfig/arm/CONFIG_BCM2835_THERMAL
+++ b/configs/base-generic/arm/CONFIG_BCM2835_THERMAL
diff --git a/baseconfig/arm/CONFIG_BCM2835_WDT b/configs/base-generic/arm/CONFIG_BCM2835_WDT
index 422ae33c2..422ae33c2 100644
--- a/baseconfig/arm/CONFIG_BCM2835_WDT
+++ b/configs/base-generic/arm/CONFIG_BCM2835_WDT
diff --git a/baseconfig/arm/CONFIG_BCM_SBA_RAID b/configs/base-generic/arm/CONFIG_BCM_SBA_RAID
index 516787c00..516787c00 100644
--- a/baseconfig/arm/CONFIG_BCM_SBA_RAID
+++ b/configs/base-generic/arm/CONFIG_BCM_SBA_RAID
diff --git a/baseconfig/arm/CONFIG_BCM_VIDEOCORE b/configs/base-generic/arm/CONFIG_BCM_VIDEOCORE
index 6897b418e..6897b418e 100644
--- a/baseconfig/arm/CONFIG_BCM_VIDEOCORE
+++ b/configs/base-generic/arm/CONFIG_BCM_VIDEOCORE
diff --git a/baseconfig/arm/CONFIG_BEFS_FS b/configs/base-generic/arm/CONFIG_BEFS_FS
index cdabc728d..cdabc728d 100644
--- a/baseconfig/arm/CONFIG_BEFS_FS
+++ b/configs/base-generic/arm/CONFIG_BEFS_FS
diff --git a/baseconfig/arm/CONFIG_BIG_LITTLE b/configs/base-generic/arm/CONFIG_BIG_LITTLE
index 0b4c30f0c..0b4c30f0c 100644
--- a/baseconfig/arm/CONFIG_BIG_LITTLE
+++ b/configs/base-generic/arm/CONFIG_BIG_LITTLE
diff --git a/baseconfig/arm/CONFIG_BLK_DEV_3W_XXXX_RAID b/configs/base-generic/arm/CONFIG_BLK_DEV_3W_XXXX_RAID
index 0fbe95ebc..0fbe95ebc 100644
--- a/baseconfig/arm/CONFIG_BLK_DEV_3W_XXXX_RAID
+++ b/configs/base-generic/arm/CONFIG_BLK_DEV_3W_XXXX_RAID
diff --git a/baseconfig/arm/CONFIG_BLK_DEV_DAC960 b/configs/base-generic/arm/CONFIG_BLK_DEV_DAC960
index 4cc1142cb..4cc1142cb 100644
--- a/baseconfig/arm/CONFIG_BLK_DEV_DAC960
+++ b/configs/base-generic/arm/CONFIG_BLK_DEV_DAC960
diff --git a/baseconfig/arm/CONFIG_BLK_DEV_SX8 b/configs/base-generic/arm/CONFIG_BLK_DEV_SX8
index 76e0342ed..76e0342ed 100644
--- a/baseconfig/arm/CONFIG_BLK_DEV_SX8
+++ b/configs/base-generic/arm/CONFIG_BLK_DEV_SX8
diff --git a/baseconfig/arm/CONFIG_CACHE_FEROCEON_L2 b/configs/base-generic/arm/CONFIG_CACHE_FEROCEON_L2
index 36581c774..36581c774 100644
--- a/baseconfig/arm/CONFIG_CACHE_FEROCEON_L2
+++ b/configs/base-generic/arm/CONFIG_CACHE_FEROCEON_L2
diff --git a/baseconfig/arm/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH b/configs/base-generic/arm/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
index 533b65fb7..533b65fb7 100644
--- a/baseconfig/arm/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
+++ b/configs/base-generic/arm/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
diff --git a/baseconfig/arm/CONFIG_CADENCE_WATCHDOG b/configs/base-generic/arm/CONFIG_CADENCE_WATCHDOG
index 3892db328..3892db328 100644
--- a/baseconfig/arm/CONFIG_CADENCE_WATCHDOG
+++ b/configs/base-generic/arm/CONFIG_CADENCE_WATCHDOG
diff --git a/baseconfig/arm/CONFIG_CC_STACKPROTECTOR b/configs/base-generic/arm/CONFIG_CC_STACKPROTECTOR
index 66c3e10d9..66c3e10d9 100644
--- a/baseconfig/arm/CONFIG_CC_STACKPROTECTOR
+++ b/configs/base-generic/arm/CONFIG_CC_STACKPROTECTOR
diff --git a/baseconfig/arm/CONFIG_CC_STACKPROTECTOR_NONE b/configs/base-generic/arm/CONFIG_CC_STACKPROTECTOR_NONE
index 952e08a9a..952e08a9a 100644
--- a/baseconfig/arm/CONFIG_CC_STACKPROTECTOR_NONE
+++ b/configs/base-generic/arm/CONFIG_CC_STACKPROTECTOR_NONE
diff --git a/baseconfig/arm/CONFIG_CHECKPOINT_RESTORE b/configs/base-generic/arm/CONFIG_CHECKPOINT_RESTORE
index c554a09ce..c554a09ce 100644
--- a/baseconfig/arm/CONFIG_CHECKPOINT_RESTORE
+++ b/configs/base-generic/arm/CONFIG_CHECKPOINT_RESTORE
diff --git a/baseconfig/arm/CONFIG_CLKSRC_VERSATILE b/configs/base-generic/arm/CONFIG_CLKSRC_VERSATILE
index 6d1bbd499..6d1bbd499 100644
--- a/baseconfig/arm/CONFIG_CLKSRC_VERSATILE
+++ b/configs/base-generic/arm/CONFIG_CLKSRC_VERSATILE
diff --git a/baseconfig/arm/CONFIG_CLK_SP810 b/configs/base-generic/arm/CONFIG_CLK_SP810
index ff341b3ab..ff341b3ab 100644
--- a/baseconfig/arm/CONFIG_CLK_SP810
+++ b/configs/base-generic/arm/CONFIG_CLK_SP810
diff --git a/baseconfig/arm/CONFIG_CLK_VEXPRESS_OSC b/configs/base-generic/arm/CONFIG_CLK_VEXPRESS_OSC
index 867fff294..867fff294 100644
--- a/baseconfig/arm/CONFIG_CLK_VEXPRESS_OSC
+++ b/configs/base-generic/arm/CONFIG_CLK_VEXPRESS_OSC
diff --git a/baseconfig/arm/CONFIG_CLOCK_THERMAL b/configs/base-generic/arm/CONFIG_CLOCK_THERMAL
index 0fccd0b23..0fccd0b23 100644
--- a/baseconfig/arm/CONFIG_CLOCK_THERMAL
+++ b/configs/base-generic/arm/CONFIG_CLOCK_THERMAL
diff --git a/baseconfig/arm/CONFIG_CMA b/configs/base-generic/arm/CONFIG_CMA
index 309c9e771..309c9e771 100644
--- a/baseconfig/arm/CONFIG_CMA
+++ b/configs/base-generic/arm/CONFIG_CMA
diff --git a/baseconfig/arm/CONFIG_CMA_ALIGNMENT b/configs/base-generic/arm/CONFIG_CMA_ALIGNMENT
index 7941445e7..7941445e7 100644
--- a/baseconfig/arm/CONFIG_CMA_ALIGNMENT
+++ b/configs/base-generic/arm/CONFIG_CMA_ALIGNMENT
diff --git a/baseconfig/arm/CONFIG_CMA_AREAS b/configs/base-generic/arm/CONFIG_CMA_AREAS
index 5474a48e9..5474a48e9 100644
--- a/baseconfig/arm/CONFIG_CMA_AREAS
+++ b/configs/base-generic/arm/CONFIG_CMA_AREAS
diff --git a/baseconfig/arm/CONFIG_CMA_DEBUG b/configs/base-generic/arm/CONFIG_CMA_DEBUG
index 64ff80c56..64ff80c56 100644
--- a/baseconfig/arm/CONFIG_CMA_DEBUG
+++ b/configs/base-generic/arm/CONFIG_CMA_DEBUG
diff --git a/baseconfig/arm/CONFIG_CMA_DEBUGFS b/configs/base-generic/arm/CONFIG_CMA_DEBUGFS
index 9e80ae2e1..9e80ae2e1 100644
--- a/baseconfig/arm/CONFIG_CMA_DEBUGFS
+++ b/configs/base-generic/arm/CONFIG_CMA_DEBUGFS
diff --git a/baseconfig/arm/CONFIG_CMA_SIZE_MBYTES b/configs/base-generic/arm/CONFIG_CMA_SIZE_MBYTES
index cc0c4e7ee..cc0c4e7ee 100644
--- a/baseconfig/arm/CONFIG_CMA_SIZE_MBYTES
+++ b/configs/base-generic/arm/CONFIG_CMA_SIZE_MBYTES
diff --git a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MAX b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MAX
index e8ad8cf05..e8ad8cf05 100644
--- a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MAX
+++ b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MAX
diff --git a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MBYTES b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MBYTES
index 2a76a105c..2a76a105c 100644
--- a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MBYTES
+++ b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MBYTES
diff --git a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MIN b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MIN
index 2748b1eb6..2748b1eb6 100644
--- a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_MIN
+++ b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_MIN
diff --git a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE
index a23118a96..a23118a96 100644
--- a/baseconfig/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE
+++ b/configs/base-generic/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE
diff --git a/baseconfig/arm/CONFIG_CODA_FS b/configs/base-generic/arm/CONFIG_CODA_FS
index f8fb39996..f8fb39996 100644
--- a/baseconfig/arm/CONFIG_CODA_FS
+++ b/configs/base-generic/arm/CONFIG_CODA_FS
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK b/configs/base-generic/arm/CONFIG_COMMON_CLK
index 3cbf93120..3cbf93120 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_MAX77686 b/configs/base-generic/arm/CONFIG_COMMON_CLK_MAX77686
index 71ba0b45c..71ba0b45c 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK_MAX77686
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK_MAX77686
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_PWM b/configs/base-generic/arm/CONFIG_COMMON_CLK_PWM
index 08193dd2c..08193dd2c 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK_PWM
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK_PWM
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_RK808 b/configs/base-generic/arm/CONFIG_COMMON_CLK_RK808
index 129ad891c..129ad891c 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK_RK808
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK_RK808
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_SCPI b/configs/base-generic/arm/CONFIG_COMMON_CLK_SCPI
index b6694a09c..b6694a09c 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK_SCPI
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK_SCPI
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_VERSATILE b/configs/base-generic/arm/CONFIG_COMMON_CLK_VERSATILE
index 5e5d567ef..5e5d567ef 100644
--- a/baseconfig/arm/CONFIG_COMMON_CLK_VERSATILE
+++ b/configs/base-generic/arm/CONFIG_COMMON_CLK_VERSATILE
diff --git a/baseconfig/arm/CONFIG_CORESIGHT b/configs/base-generic/arm/CONFIG_CORESIGHT
index a676f4744..a676f4744 100644
--- a/baseconfig/arm/CONFIG_CORESIGHT
+++ b/configs/base-generic/arm/CONFIG_CORESIGHT
diff --git a/baseconfig/arm/CONFIG_CPUFREQ_DT b/configs/base-generic/arm/CONFIG_CPUFREQ_DT
index 4b4848de3..4b4848de3 100644
--- a/baseconfig/arm/CONFIG_CPUFREQ_DT
+++ b/configs/base-generic/arm/CONFIG_CPUFREQ_DT
diff --git a/baseconfig/arm/CONFIG_CPUFREQ_DT_PLATDEV b/configs/base-generic/arm/CONFIG_CPUFREQ_DT_PLATDEV
index 68df37597..68df37597 100644
--- a/baseconfig/arm/CONFIG_CPUFREQ_DT_PLATDEV
+++ b/configs/base-generic/arm/CONFIG_CPUFREQ_DT_PLATDEV
diff --git a/baseconfig/arm/CONFIG_CPU_BIG_ENDIAN b/configs/base-generic/arm/CONFIG_CPU_BIG_ENDIAN
index be479cf38..be479cf38 100644
--- a/baseconfig/arm/CONFIG_CPU_BIG_ENDIAN
+++ b/configs/base-generic/arm/CONFIG_CPU_BIG_ENDIAN
diff --git a/baseconfig/arm/CONFIG_CPU_THERMAL b/configs/base-generic/arm/CONFIG_CPU_THERMAL
index fa1c22af3..fa1c22af3 100644
--- a/baseconfig/arm/CONFIG_CPU_THERMAL
+++ b/configs/base-generic/arm/CONFIG_CPU_THERMAL
diff --git a/baseconfig/arm/CONFIG_CROS_EC_CHARDEV b/configs/base-generic/arm/CONFIG_CROS_EC_CHARDEV
index a3df83240..a3df83240 100644
--- a/baseconfig/arm/CONFIG_CROS_EC_CHARDEV
+++ b/configs/base-generic/arm/CONFIG_CROS_EC_CHARDEV
diff --git a/baseconfig/arm/CONFIG_CROS_EC_PROTO b/configs/base-generic/arm/CONFIG_CROS_EC_PROTO
index 96a1e9bcb..96a1e9bcb 100644
--- a/baseconfig/arm/CONFIG_CROS_EC_PROTO
+++ b/configs/base-generic/arm/CONFIG_CROS_EC_PROTO
diff --git a/baseconfig/arm/CONFIG_CRYPTO_AES_ARM b/configs/base-generic/arm/CONFIG_CRYPTO_AES_ARM
index 3a2fcebc1..3a2fcebc1 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_AES_ARM
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_AES_ARM
diff --git a/baseconfig/arm/CONFIG_CRYPTO_AES_ARM_BS b/configs/base-generic/arm/CONFIG_CRYPTO_AES_ARM_BS
index 007c2368a..007c2368a 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_AES_ARM_BS
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_AES_ARM_BS
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CHACHA20_NEON b/configs/base-generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
index c680f1a05..c680f1a05 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CHACHA20_NEON
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CHACHA20_NEON
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE b/configs/base-generic/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
index ee9966699..ee9966699 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE b/configs/base-generic/arm/CONFIG_CRYPTO_CRC32_ARM_CE
index 242e37489..242e37489 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CRC32_ARM_CE
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE b/configs/base-generic/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
index c59d53cfb..c59d53cfb 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE b/configs/base-generic/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
index 6b13ea30c..6b13ea30c 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRYPTD b/configs/base-generic/arm/CONFIG_CRYPTO_CRYPTD
index 36649cff3..36649cff3 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_CRYPTD
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_CRYPTD
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_MARVELL_CESA b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_MARVELL_CESA
index 439e0fbd2..439e0fbd2 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_DEV_MARVELL_CESA
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_MARVELL_CESA
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_MV_CESA b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_MV_CESA
index 25ac0e90d..25ac0e90d 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_DEV_MV_CESA
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_MV_CESA
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_ROCKCHIP b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_ROCKCHIP
index 9f3a22627..9f3a22627 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_DEV_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
index 62fd0b85a..62fd0b85a 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
diff --git a/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE b/configs/base-generic/arm/CONFIG_CRYPTO_GHASH_ARM_CE
index 5c70cb19a..5c70cb19a 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_GHASH_ARM_CE
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA1_ARM b/configs/base-generic/arm/CONFIG_CRYPTO_SHA1_ARM
index 4b33be9bd..4b33be9bd 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA1_ARM
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA1_ARM
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA1_ARM_NEON b/configs/base-generic/arm/CONFIG_CRYPTO_SHA1_ARM_NEON
index 2e1077523..2e1077523 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA1_ARM_NEON
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA1_ARM_NEON
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM b/configs/base-generic/arm/CONFIG_CRYPTO_SHA256_ARM
index c910511c6..c910511c6 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA256_ARM
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64 b/configs/base-generic/arm/CONFIG_CRYPTO_SHA256_ARM64
index 3aa7dacbf..3aa7dacbf 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA256_ARM64
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM b/configs/base-generic/arm/CONFIG_CRYPTO_SHA512_ARM
index be0f8bed6..be0f8bed6 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA512_ARM
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64 b/configs/base-generic/arm/CONFIG_CRYPTO_SHA512_ARM64
index de1c4c957..de1c4c957 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64
+++ b/configs/base-generic/arm/CONFIG_CRYPTO_SHA512_ARM64
diff --git a/baseconfig/arm/CONFIG_CUSE b/configs/base-generic/arm/CONFIG_CUSE
index d89efc0e4..d89efc0e4 100644
--- a/baseconfig/arm/CONFIG_CUSE
+++ b/configs/base-generic/arm/CONFIG_CUSE
diff --git a/baseconfig/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR b/configs/base-generic/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR
index 03757767c..03757767c 100644
--- a/baseconfig/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ b/configs/base-generic/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR
diff --git a/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI b/configs/base-generic/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
index b6bc07970..b6bc07970 100644
--- a/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
+++ b/configs/base-generic/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
diff --git a/baseconfig/arm/CONFIG_DEVFREQ_THERMAL b/configs/base-generic/arm/CONFIG_DEVFREQ_THERMAL
index 4e2f2ba2e..4e2f2ba2e 100644
--- a/baseconfig/arm/CONFIG_DEVFREQ_THERMAL
+++ b/configs/base-generic/arm/CONFIG_DEVFREQ_THERMAL
diff --git a/baseconfig/arm/CONFIG_DEV_APPLETALK b/configs/base-generic/arm/CONFIG_DEV_APPLETALK
index e26ee96e8..e26ee96e8 100644
--- a/baseconfig/arm/CONFIG_DEV_APPLETALK
+++ b/configs/base-generic/arm/CONFIG_DEV_APPLETALK
diff --git a/baseconfig/arm/CONFIG_DMA_BCM2835 b/configs/base-generic/arm/CONFIG_DMA_BCM2835
index 92f08a0e2..92f08a0e2 100644
--- a/baseconfig/arm/CONFIG_DMA_BCM2835
+++ b/configs/base-generic/arm/CONFIG_DMA_BCM2835
diff --git a/baseconfig/arm/CONFIG_DMA_CMA b/configs/base-generic/arm/CONFIG_DMA_CMA
index c7c1c2c43..c7c1c2c43 100644
--- a/baseconfig/arm/CONFIG_DMA_CMA
+++ b/configs/base-generic/arm/CONFIG_DMA_CMA
diff --git a/baseconfig/arm/CONFIG_DMA_OF b/configs/base-generic/arm/CONFIG_DMA_OF
index ffc036120..ffc036120 100644
--- a/baseconfig/arm/CONFIG_DMA_OF
+++ b/configs/base-generic/arm/CONFIG_DMA_OF
diff --git a/baseconfig/arm/CONFIG_DMA_SUN6I b/configs/base-generic/arm/CONFIG_DMA_SUN6I
index 9c50f4fed..9c50f4fed 100644
--- a/baseconfig/arm/CONFIG_DMA_SUN6I
+++ b/configs/base-generic/arm/CONFIG_DMA_SUN6I
diff --git a/baseconfig/arm/CONFIG_DMA_VIRTUAL_CHANNELS b/configs/base-generic/arm/CONFIG_DMA_VIRTUAL_CHANNELS
index 2471fccb8..2471fccb8 100644
--- a/baseconfig/arm/CONFIG_DMA_VIRTUAL_CHANNELS
+++ b/configs/base-generic/arm/CONFIG_DMA_VIRTUAL_CHANNELS
diff --git a/baseconfig/arm/CONFIG_DMI b/configs/base-generic/arm/CONFIG_DMI
index f961d1678..f961d1678 100644
--- a/baseconfig/arm/CONFIG_DMI
+++ b/configs/base-generic/arm/CONFIG_DMI
diff --git a/baseconfig/arm/CONFIG_DMIID b/configs/base-generic/arm/CONFIG_DMIID
index d0ea3622a..d0ea3622a 100644
--- a/baseconfig/arm/CONFIG_DMIID
+++ b/configs/base-generic/arm/CONFIG_DMIID
diff --git a/baseconfig/arm/CONFIG_DMI_SYSFS b/configs/base-generic/arm/CONFIG_DMI_SYSFS
index 76565caf8..76565caf8 100644
--- a/baseconfig/arm/CONFIG_DMI_SYSFS
+++ b/configs/base-generic/arm/CONFIG_DMI_SYSFS
diff --git a/baseconfig/arm/CONFIG_DRM_ANALOGIX_DP b/configs/base-generic/arm/CONFIG_DRM_ANALOGIX_DP
index 10da5c446..10da5c446 100644
--- a/baseconfig/arm/CONFIG_DRM_ANALOGIX_DP
+++ b/configs/base-generic/arm/CONFIG_DRM_ANALOGIX_DP
diff --git a/baseconfig/arm/CONFIG_DRM_ARMADA b/configs/base-generic/arm/CONFIG_DRM_ARMADA
index 40d00d424..40d00d424 100644
--- a/baseconfig/arm/CONFIG_DRM_ARMADA
+++ b/configs/base-generic/arm/CONFIG_DRM_ARMADA
diff --git a/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC b/configs/base-generic/arm/CONFIG_DRM_DUMB_VGA_DAC
index 9bd8d9fd1..9bd8d9fd1 100644
--- a/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC
+++ b/configs/base-generic/arm/CONFIG_DRM_DUMB_VGA_DAC
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI
index 0be71f10f..0be71f10f 100644
--- a/baseconfig/arm/CONFIG_DRM_DW_HDMI
+++ b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO
index 679147e29..679147e29 100644
--- a/baseconfig/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO
+++ b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_AHB_AUDIO
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_CEC b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_CEC
index a3e178eae..a3e178eae 100644
--- a/baseconfig/arm/CONFIG_DRM_DW_HDMI_CEC
+++ b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_CEC
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO
index 34ecaf242..34ecaf242 100644
--- a/baseconfig/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO
+++ b/configs/base-generic/arm/CONFIG_DRM_DW_HDMI_I2S_AUDIO
diff --git a/baseconfig/arm/CONFIG_DRM_HDLCD b/configs/base-generic/arm/CONFIG_DRM_HDLCD
index b5c7730b6..b5c7730b6 100644
--- a/baseconfig/arm/CONFIG_DRM_HDLCD
+++ b/configs/base-generic/arm/CONFIG_DRM_HDLCD
diff --git a/baseconfig/arm/CONFIG_DRM_HDLCD_SHOW_UNDERRUN b/configs/base-generic/arm/CONFIG_DRM_HDLCD_SHOW_UNDERRUN
index b3ec5548e..b3ec5548e 100644
--- a/baseconfig/arm/CONFIG_DRM_HDLCD_SHOW_UNDERRUN
+++ b/configs/base-generic/arm/CONFIG_DRM_HDLCD_SHOW_UNDERRUN
diff --git a/baseconfig/arm/CONFIG_DRM_LVDS_ENCODER b/configs/base-generic/arm/CONFIG_DRM_LVDS_ENCODER
index 53f0efb59..53f0efb59 100644
--- a/baseconfig/arm/CONFIG_DRM_LVDS_ENCODER
+++ b/configs/base-generic/arm/CONFIG_DRM_LVDS_ENCODER
diff --git a/baseconfig/arm/CONFIG_DRM_MALI_DISPLAY b/configs/base-generic/arm/CONFIG_DRM_MALI_DISPLAY
index 2d6137af0..2d6137af0 100644
--- a/baseconfig/arm/CONFIG_DRM_MALI_DISPLAY
+++ b/configs/base-generic/arm/CONFIG_DRM_MALI_DISPLAY
diff --git a/baseconfig/arm/CONFIG_DRM_MESON b/configs/base-generic/arm/CONFIG_DRM_MESON
index 638714333..638714333 100644
--- a/baseconfig/arm/CONFIG_DRM_MESON
+++ b/configs/base-generic/arm/CONFIG_DRM_MESON
diff --git a/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI b/configs/base-generic/arm/CONFIG_DRM_MESON_DW_HDMI
index 2590929f1..2590929f1 100644
--- a/baseconfig/arm/CONFIG_DRM_MESON_DW_HDMI
+++ b/configs/base-generic/arm/CONFIG_DRM_MESON_DW_HDMI
diff --git a/baseconfig/arm/CONFIG_DRM_NXP_PTN3460 b/configs/base-generic/arm/CONFIG_DRM_NXP_PTN3460
index e4647af6c..e4647af6c 100644
--- a/baseconfig/arm/CONFIG_DRM_NXP_PTN3460
+++ b/configs/base-generic/arm/CONFIG_DRM_NXP_PTN3460
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL b/configs/base-generic/arm/CONFIG_DRM_PANEL
index de8a9c247..de8a9c247 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_LG_LG4573 b/configs/base-generic/arm/CONFIG_DRM_PANEL_LG_LG4573
index bdb9d96a2..bdb9d96a2 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_LG_LG4573
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_LG_LG4573
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_LVDS b/configs/base-generic/arm/CONFIG_DRM_PANEL_LVDS
index 6d4d3c7c6..6d4d3c7c6 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_LVDS
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_LVDS
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/configs/base-generic/arm/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
index 6a1aa6578..6a1aa6578 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_LD9040 b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_LD9040
index aa66847bb..aa66847bb 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_LD9040
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_LD9040
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
index 8334ac016..8334ac016 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
index 8e8122a2d..8e8122a2d 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 b/configs/base-generic/arm/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
index e5e36406d..e5e36406d 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SHARP_LS043T1LE01 b/configs/base-generic/arm/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
index e3649f9de..e3649f9de 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
diff --git a/baseconfig/arm/CONFIG_DRM_PANEL_SIMPLE b/configs/base-generic/arm/CONFIG_DRM_PANEL_SIMPLE
index 1c716c97c..1c716c97c 100644
--- a/baseconfig/arm/CONFIG_DRM_PANEL_SIMPLE
+++ b/configs/base-generic/arm/CONFIG_DRM_PANEL_SIMPLE
diff --git a/baseconfig/arm/CONFIG_DRM_PARADE_PS8622 b/configs/base-generic/arm/CONFIG_DRM_PARADE_PS8622
index ff6fd7e1b..ff6fd7e1b 100644
--- a/baseconfig/arm/CONFIG_DRM_PARADE_PS8622
+++ b/configs/base-generic/arm/CONFIG_DRM_PARADE_PS8622
diff --git a/baseconfig/arm/CONFIG_DRM_PL111 b/configs/base-generic/arm/CONFIG_DRM_PL111
index 8117110e8..8117110e8 100644
--- a/baseconfig/arm/CONFIG_DRM_PL111
+++ b/configs/base-generic/arm/CONFIG_DRM_PL111
diff --git a/baseconfig/arm/CONFIG_DRM_ROCKCHIP b/configs/base-generic/arm/CONFIG_DRM_ROCKCHIP
index 433e6f547..433e6f547 100644
--- a/baseconfig/arm/CONFIG_DRM_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_DRM_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_DRM_STM b/configs/base-generic/arm/CONFIG_DRM_STM
index d490eca03..d490eca03 100644
--- a/baseconfig/arm/CONFIG_DRM_STM
+++ b/configs/base-generic/arm/CONFIG_DRM_STM
diff --git a/baseconfig/arm/CONFIG_DRM_SUN8I_MIXER b/configs/base-generic/arm/CONFIG_DRM_SUN8I_MIXER
index cbd3e6b72..cbd3e6b72 100644
--- a/baseconfig/arm/CONFIG_DRM_SUN8I_MIXER
+++ b/configs/base-generic/arm/CONFIG_DRM_SUN8I_MIXER
diff --git a/baseconfig/arm/CONFIG_DRM_TEGRA b/configs/base-generic/arm/CONFIG_DRM_TEGRA
index e82b9be32..e82b9be32 100644
--- a/baseconfig/arm/CONFIG_DRM_TEGRA
+++ b/configs/base-generic/arm/CONFIG_DRM_TEGRA
diff --git a/baseconfig/arm/CONFIG_DRM_TEGRA_DEBUG b/configs/base-generic/arm/CONFIG_DRM_TEGRA_DEBUG
index 97d7e9f14..97d7e9f14 100644
--- a/baseconfig/arm/CONFIG_DRM_TEGRA_DEBUG
+++ b/configs/base-generic/arm/CONFIG_DRM_TEGRA_DEBUG
diff --git a/baseconfig/arm/CONFIG_DRM_TEGRA_STAGING b/configs/base-generic/arm/CONFIG_DRM_TEGRA_STAGING
index 5b2967fc9..5b2967fc9 100644
--- a/baseconfig/arm/CONFIG_DRM_TEGRA_STAGING
+++ b/configs/base-generic/arm/CONFIG_DRM_TEGRA_STAGING
diff --git a/baseconfig/arm/CONFIG_DRM_TINYDRM b/configs/base-generic/arm/CONFIG_DRM_TINYDRM
index 4e6e01bfe..4e6e01bfe 100644
--- a/baseconfig/arm/CONFIG_DRM_TINYDRM
+++ b/configs/base-generic/arm/CONFIG_DRM_TINYDRM
diff --git a/baseconfig/arm/CONFIG_DRM_TOSHIBA_TC358767 b/configs/base-generic/arm/CONFIG_DRM_TOSHIBA_TC358767
index dd9667384..dd9667384 100644
--- a/baseconfig/arm/CONFIG_DRM_TOSHIBA_TC358767
+++ b/configs/base-generic/arm/CONFIG_DRM_TOSHIBA_TC358767
diff --git a/baseconfig/arm/CONFIG_DRM_VC4 b/configs/base-generic/arm/CONFIG_DRM_VC4
index 8d2771986..8d2771986 100644
--- a/baseconfig/arm/CONFIG_DRM_VC4
+++ b/configs/base-generic/arm/CONFIG_DRM_VC4
diff --git a/baseconfig/arm/CONFIG_DRM_VC4_HDMI_CEC b/configs/base-generic/arm/CONFIG_DRM_VC4_HDMI_CEC
index da0132c1f..da0132c1f 100644
--- a/baseconfig/arm/CONFIG_DRM_VC4_HDMI_CEC
+++ b/configs/base-generic/arm/CONFIG_DRM_VC4_HDMI_CEC
diff --git a/baseconfig/arm/CONFIG_DTC b/configs/base-generic/arm/CONFIG_DTC
index 64dbfdd90..64dbfdd90 100644
--- a/baseconfig/arm/CONFIG_DTC
+++ b/configs/base-generic/arm/CONFIG_DTC
diff --git a/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH b/configs/base-generic/arm/CONFIG_DWMAC_DWC_QOS_ETH
index 6ed7a8e38..6ed7a8e38 100644
--- a/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH
+++ b/configs/base-generic/arm/CONFIG_DWMAC_DWC_QOS_ETH
diff --git a/baseconfig/arm/CONFIG_DWMAC_GENERIC b/configs/base-generic/arm/CONFIG_DWMAC_GENERIC
index fe2550e2b..fe2550e2b 100644
--- a/baseconfig/arm/CONFIG_DWMAC_GENERIC
+++ b/configs/base-generic/arm/CONFIG_DWMAC_GENERIC
diff --git a/baseconfig/arm/CONFIG_DWMAC_MESON b/configs/base-generic/arm/CONFIG_DWMAC_MESON
index ff4f84617..ff4f84617 100644
--- a/baseconfig/arm/CONFIG_DWMAC_MESON
+++ b/configs/base-generic/arm/CONFIG_DWMAC_MESON
diff --git a/baseconfig/arm/CONFIG_DWMAC_ROCKCHIP b/configs/base-generic/arm/CONFIG_DWMAC_ROCKCHIP
index 9ba6ec722..9ba6ec722 100644
--- a/baseconfig/arm/CONFIG_DWMAC_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_DWMAC_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_DW_WATCHDOG b/configs/base-generic/arm/CONFIG_DW_WATCHDOG
index da7b54194..da7b54194 100644
--- a/baseconfig/arm/CONFIG_DW_WATCHDOG
+++ b/configs/base-generic/arm/CONFIG_DW_WATCHDOG
diff --git a/baseconfig/arm/CONFIG_EARLY_PRINTK b/configs/base-generic/arm/CONFIG_EARLY_PRINTK
index d8c2487be..d8c2487be 100644
--- a/baseconfig/arm/CONFIG_EARLY_PRINTK
+++ b/configs/base-generic/arm/CONFIG_EARLY_PRINTK
diff --git a/baseconfig/arm/CONFIG_EDAC_MV64X60 b/configs/base-generic/arm/CONFIG_EDAC_MV64X60
index 9db988202..9db988202 100644
--- a/baseconfig/arm/CONFIG_EDAC_MV64X60
+++ b/configs/base-generic/arm/CONFIG_EDAC_MV64X60
diff --git a/baseconfig/arm/CONFIG_EEPROM_AT25 b/configs/base-generic/arm/CONFIG_EEPROM_AT25
index 90358f33c..90358f33c 100644
--- a/baseconfig/arm/CONFIG_EEPROM_AT25
+++ b/configs/base-generic/arm/CONFIG_EEPROM_AT25
diff --git a/baseconfig/arm/CONFIG_EFI b/configs/base-generic/arm/CONFIG_EFI
index 7dcf2966d..7dcf2966d 100644
--- a/baseconfig/arm/CONFIG_EFI
+++ b/configs/base-generic/arm/CONFIG_EFI
diff --git a/baseconfig/arm/CONFIG_EFIVAR_FS b/configs/base-generic/arm/CONFIG_EFIVAR_FS
index 4e151f100..4e151f100 100644
--- a/baseconfig/arm/CONFIG_EFIVAR_FS
+++ b/configs/base-generic/arm/CONFIG_EFIVAR_FS
diff --git a/baseconfig/arm/CONFIG_EFI_BOOTLOADER_CONTROL b/configs/base-generic/arm/CONFIG_EFI_BOOTLOADER_CONTROL
index ca42dfb42..ca42dfb42 100644
--- a/baseconfig/arm/CONFIG_EFI_BOOTLOADER_CONTROL
+++ b/configs/base-generic/arm/CONFIG_EFI_BOOTLOADER_CONTROL
diff --git a/baseconfig/arm/CONFIG_EFI_CAPSULE_LOADER b/configs/base-generic/arm/CONFIG_EFI_CAPSULE_LOADER
index 2cc063216..2cc063216 100644
--- a/baseconfig/arm/CONFIG_EFI_CAPSULE_LOADER
+++ b/configs/base-generic/arm/CONFIG_EFI_CAPSULE_LOADER
diff --git a/baseconfig/arm/CONFIG_EFI_VARS b/configs/base-generic/arm/CONFIG_EFI_VARS
index b9206d9f4..b9206d9f4 100644
--- a/baseconfig/arm/CONFIG_EFI_VARS
+++ b/configs/base-generic/arm/CONFIG_EFI_VARS
diff --git a/baseconfig/arm/CONFIG_EFI_VARS_PSTORE b/configs/base-generic/arm/CONFIG_EFI_VARS_PSTORE
index 231576abf..231576abf 100644
--- a/baseconfig/arm/CONFIG_EFI_VARS_PSTORE
+++ b/configs/base-generic/arm/CONFIG_EFI_VARS_PSTORE
diff --git a/baseconfig/arm/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE b/configs/base-generic/arm/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
index b26ce1fb9..b26ce1fb9 100644
--- a/baseconfig/arm/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
+++ b/configs/base-generic/arm/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
diff --git a/baseconfig/arm/CONFIG_EMAC_ROCKCHIP b/configs/base-generic/arm/CONFIG_EMAC_ROCKCHIP
index a3ecf9028..a3ecf9028 100644
--- a/baseconfig/arm/CONFIG_EMAC_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_EMAC_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_EXTCON_ADC_JACK b/configs/base-generic/arm/CONFIG_EXTCON_ADC_JACK
index d4e27bf7b..d4e27bf7b 100644
--- a/baseconfig/arm/CONFIG_EXTCON_ADC_JACK
+++ b/configs/base-generic/arm/CONFIG_EXTCON_ADC_JACK
diff --git a/baseconfig/arm/CONFIG_EXTCON_GPIO b/configs/base-generic/arm/CONFIG_EXTCON_GPIO
index 543d0e0d5..543d0e0d5 100644
--- a/baseconfig/arm/CONFIG_EXTCON_GPIO
+++ b/configs/base-generic/arm/CONFIG_EXTCON_GPIO
diff --git a/baseconfig/arm/CONFIG_EXTCON_MAX3355 b/configs/base-generic/arm/CONFIG_EXTCON_MAX3355
index 680b5a774..680b5a774 100644
--- a/baseconfig/arm/CONFIG_EXTCON_MAX3355
+++ b/configs/base-generic/arm/CONFIG_EXTCON_MAX3355
diff --git a/baseconfig/arm/CONFIG_EXTCON_RT8973A b/configs/base-generic/arm/CONFIG_EXTCON_RT8973A
index e5f7236c9..e5f7236c9 100644
--- a/baseconfig/arm/CONFIG_EXTCON_RT8973A
+++ b/configs/base-generic/arm/CONFIG_EXTCON_RT8973A
diff --git a/baseconfig/arm/CONFIG_EXTCON_SM5502 b/configs/base-generic/arm/CONFIG_EXTCON_SM5502
index 916994aa9..916994aa9 100644
--- a/baseconfig/arm/CONFIG_EXTCON_SM5502
+++ b/configs/base-generic/arm/CONFIG_EXTCON_SM5502
diff --git a/baseconfig/arm/CONFIG_EXTCON_USBC_CROS_EC b/configs/base-generic/arm/CONFIG_EXTCON_USBC_CROS_EC
index 831bc6ea7..831bc6ea7 100644
--- a/baseconfig/arm/CONFIG_EXTCON_USBC_CROS_EC
+++ b/configs/base-generic/arm/CONFIG_EXTCON_USBC_CROS_EC
diff --git a/baseconfig/arm/CONFIG_EXTCON_USB_GPIO b/configs/base-generic/arm/CONFIG_EXTCON_USB_GPIO
index 98ed5fb76..98ed5fb76 100644
--- a/baseconfig/arm/CONFIG_EXTCON_USB_GPIO
+++ b/configs/base-generic/arm/CONFIG_EXTCON_USB_GPIO
diff --git a/baseconfig/arm/CONFIG_FB_ARMCLCD b/configs/base-generic/arm/CONFIG_FB_ARMCLCD
index 6a246ab95..6a246ab95 100644
--- a/baseconfig/arm/CONFIG_FB_ARMCLCD
+++ b/configs/base-generic/arm/CONFIG_FB_ARMCLCD
diff --git a/baseconfig/arm/CONFIG_FB_DA8XX b/configs/base-generic/arm/CONFIG_FB_DA8XX
index ea60ebdc6..ea60ebdc6 100644
--- a/baseconfig/arm/CONFIG_FB_DA8XX
+++ b/configs/base-generic/arm/CONFIG_FB_DA8XX
diff --git a/baseconfig/arm/CONFIG_FB_MODE_HELPERS b/configs/base-generic/arm/CONFIG_FB_MODE_HELPERS
index 84f515748..84f515748 100644
--- a/baseconfig/arm/CONFIG_FB_MODE_HELPERS
+++ b/configs/base-generic/arm/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/arm/CONFIG_FB_SIMPLE b/configs/base-generic/arm/CONFIG_FB_SIMPLE
index 0eb3d0422..0eb3d0422 100644
--- a/baseconfig/arm/CONFIG_FB_SIMPLE
+++ b/configs/base-generic/arm/CONFIG_FB_SIMPLE
diff --git a/baseconfig/arm/CONFIG_FB_SSD1307 b/configs/base-generic/arm/CONFIG_FB_SSD1307
index efd995bdf..efd995bdf 100644
--- a/baseconfig/arm/CONFIG_FB_SSD1307
+++ b/configs/base-generic/arm/CONFIG_FB_SSD1307
diff --git a/baseconfig/arm/CONFIG_FIREWIRE b/configs/base-generic/arm/CONFIG_FIREWIRE
index d75b839c4..d75b839c4 100644
--- a/baseconfig/arm/CONFIG_FIREWIRE
+++ b/configs/base-generic/arm/CONFIG_FIREWIRE
diff --git a/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO b/configs/base-generic/arm/CONFIG_FSL_XGMAC_MDIO
index 9113f3294..9113f3294 100644
--- a/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO
+++ b/configs/base-generic/arm/CONFIG_FSL_XGMAC_MDIO
diff --git a/baseconfig/arm/CONFIG_FUSION b/configs/base-generic/arm/CONFIG_FUSION
index 116c04ea7..116c04ea7 100644
--- a/baseconfig/arm/CONFIG_FUSION
+++ b/configs/base-generic/arm/CONFIG_FUSION
diff --git a/baseconfig/arm/CONFIG_GENERIC_PHY b/configs/base-generic/arm/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/arm/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/arm/CONFIG_GENERIC_PHY
diff --git a/baseconfig/arm/CONFIG_GENERIC_PINCONF b/configs/base-generic/arm/CONFIG_GENERIC_PINCONF
index dededed2d..dededed2d 100644
--- a/baseconfig/arm/CONFIG_GENERIC_PINCONF
+++ b/configs/base-generic/arm/CONFIG_GENERIC_PINCONF
diff --git a/baseconfig/arm/CONFIG_GPIO_74XX_MMIO b/configs/base-generic/arm/CONFIG_GPIO_74XX_MMIO
index b761ec18a..b761ec18a 100644
--- a/baseconfig/arm/CONFIG_GPIO_74XX_MMIO
+++ b/configs/base-generic/arm/CONFIG_GPIO_74XX_MMIO
diff --git a/baseconfig/arm/CONFIG_GPIO_DEVRES b/configs/base-generic/arm/CONFIG_GPIO_DEVRES
index ec78c483d..ec78c483d 100644
--- a/baseconfig/arm/CONFIG_GPIO_DEVRES
+++ b/configs/base-generic/arm/CONFIG_GPIO_DEVRES
diff --git a/baseconfig/arm/CONFIG_GPIO_DWAPB b/configs/base-generic/arm/CONFIG_GPIO_DWAPB
index eabf56eff..eabf56eff 100644
--- a/baseconfig/arm/CONFIG_GPIO_DWAPB
+++ b/configs/base-generic/arm/CONFIG_GPIO_DWAPB
diff --git a/baseconfig/arm/CONFIG_GPIO_GENERIC b/configs/base-generic/arm/CONFIG_GPIO_GENERIC
index 9be88e4cf..9be88e4cf 100644
--- a/baseconfig/arm/CONFIG_GPIO_GENERIC
+++ b/configs/base-generic/arm/CONFIG_GPIO_GENERIC
diff --git a/baseconfig/arm/CONFIG_GPIO_GENERIC_PLATFORM b/configs/base-generic/arm/CONFIG_GPIO_GENERIC_PLATFORM
index fdcd75037..fdcd75037 100644
--- a/baseconfig/arm/CONFIG_GPIO_GENERIC_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_GPIO_GENERIC_PLATFORM
diff --git a/baseconfig/arm/CONFIG_GPIO_MVEBU b/configs/base-generic/arm/CONFIG_GPIO_MVEBU
index b9afa8411..b9afa8411 100644
--- a/baseconfig/arm/CONFIG_GPIO_MVEBU
+++ b/configs/base-generic/arm/CONFIG_GPIO_MVEBU
diff --git a/baseconfig/arm/CONFIG_GPIO_PCA953X b/configs/base-generic/arm/CONFIG_GPIO_PCA953X
index 9b39b5f32..9b39b5f32 100644
--- a/baseconfig/arm/CONFIG_GPIO_PCA953X
+++ b/configs/base-generic/arm/CONFIG_GPIO_PCA953X
diff --git a/baseconfig/arm/CONFIG_GPIO_PCA953X_IRQ b/configs/base-generic/arm/CONFIG_GPIO_PCA953X_IRQ
index 25c8a7c24..25c8a7c24 100644
--- a/baseconfig/arm/CONFIG_GPIO_PCA953X_IRQ
+++ b/configs/base-generic/arm/CONFIG_GPIO_PCA953X_IRQ
diff --git a/baseconfig/arm/CONFIG_GPIO_PL061 b/configs/base-generic/arm/CONFIG_GPIO_PL061
index 36d6b513b..36d6b513b 100644
--- a/baseconfig/arm/CONFIG_GPIO_PL061
+++ b/configs/base-generic/arm/CONFIG_GPIO_PL061
diff --git a/baseconfig/arm/CONFIG_GPIO_TEGRA b/configs/base-generic/arm/CONFIG_GPIO_TEGRA
index 72b59399c..72b59399c 100644
--- a/baseconfig/arm/CONFIG_GPIO_TEGRA
+++ b/configs/base-generic/arm/CONFIG_GPIO_TEGRA
diff --git a/baseconfig/arm/CONFIG_GPIO_WATCHDOG b/configs/base-generic/arm/CONFIG_GPIO_WATCHDOG
index 37cf2150c..37cf2150c 100644
--- a/baseconfig/arm/CONFIG_GPIO_WATCHDOG
+++ b/configs/base-generic/arm/CONFIG_GPIO_WATCHDOG
diff --git a/baseconfig/arm/CONFIG_HAVE_PERF_REGS b/configs/base-generic/arm/CONFIG_HAVE_PERF_REGS
index 300ba387b..300ba387b 100644
--- a/baseconfig/arm/CONFIG_HAVE_PERF_REGS
+++ b/configs/base-generic/arm/CONFIG_HAVE_PERF_REGS
diff --git a/baseconfig/arm/CONFIG_HAVE_PERF_USER_STACK_DUMP b/configs/base-generic/arm/CONFIG_HAVE_PERF_USER_STACK_DUMP
index 64793851e..64793851e 100644
--- a/baseconfig/arm/CONFIG_HAVE_PERF_USER_STACK_DUMP
+++ b/configs/base-generic/arm/CONFIG_HAVE_PERF_USER_STACK_DUMP
diff --git a/baseconfig/arm/CONFIG_HERMES b/configs/base-generic/arm/CONFIG_HERMES
index 18b5e1842..18b5e1842 100644
--- a/baseconfig/arm/CONFIG_HERMES
+++ b/configs/base-generic/arm/CONFIG_HERMES
diff --git a/baseconfig/arm/CONFIG_HISILICON_IRQ_MBIGEN b/configs/base-generic/arm/CONFIG_HISILICON_IRQ_MBIGEN
index 72ab88e11..72ab88e11 100644
--- a/baseconfig/arm/CONFIG_HISILICON_IRQ_MBIGEN
+++ b/configs/base-generic/arm/CONFIG_HISILICON_IRQ_MBIGEN
diff --git a/baseconfig/arm/CONFIG_HW_PERF_EVENTS b/configs/base-generic/arm/CONFIG_HW_PERF_EVENTS
index 10c0008c1..10c0008c1 100644
--- a/baseconfig/arm/CONFIG_HW_PERF_EVENTS
+++ b/configs/base-generic/arm/CONFIG_HW_PERF_EVENTS
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_BCM2835 b/configs/base-generic/arm/CONFIG_HW_RANDOM_BCM2835
index 8d457d435..8d457d435 100644
--- a/baseconfig/arm/CONFIG_HW_RANDOM_BCM2835
+++ b/configs/base-generic/arm/CONFIG_HW_RANDOM_BCM2835
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_IMX_RNGC b/configs/base-generic/arm/CONFIG_HW_RANDOM_IMX_RNGC
index e7b39a2c7..e7b39a2c7 100644
--- a/baseconfig/arm/CONFIG_HW_RANDOM_IMX_RNGC
+++ b/configs/base-generic/arm/CONFIG_HW_RANDOM_IMX_RNGC
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_MESON b/configs/base-generic/arm/CONFIG_HW_RANDOM_MESON
index 882698030..882698030 100644
--- a/baseconfig/arm/CONFIG_HW_RANDOM_MESON
+++ b/configs/base-generic/arm/CONFIG_HW_RANDOM_MESON
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_OMAP b/configs/base-generic/arm/CONFIG_HW_RANDOM_OMAP
index cf37a6e35..cf37a6e35 100644
--- a/baseconfig/arm/CONFIG_HW_RANDOM_OMAP
+++ b/configs/base-generic/arm/CONFIG_HW_RANDOM_OMAP
diff --git a/baseconfig/arm/CONFIG_I2C b/configs/base-generic/arm/CONFIG_I2C
index aafb657f5..aafb657f5 100644
--- a/baseconfig/arm/CONFIG_I2C
+++ b/configs/base-generic/arm/CONFIG_I2C
diff --git a/baseconfig/arm/CONFIG_I2C_ARB_GPIO_CHALLENGE b/configs/base-generic/arm/CONFIG_I2C_ARB_GPIO_CHALLENGE
index b828d6508..b828d6508 100644
--- a/baseconfig/arm/CONFIG_I2C_ARB_GPIO_CHALLENGE
+++ b/configs/base-generic/arm/CONFIG_I2C_ARB_GPIO_CHALLENGE
diff --git a/baseconfig/arm/CONFIG_I2C_BCM2835 b/configs/base-generic/arm/CONFIG_I2C_BCM2835
index 6032ad30a..6032ad30a 100644
--- a/baseconfig/arm/CONFIG_I2C_BCM2835
+++ b/configs/base-generic/arm/CONFIG_I2C_BCM2835
diff --git a/baseconfig/arm/CONFIG_I2C_BOARDINFO b/configs/base-generic/arm/CONFIG_I2C_BOARDINFO
index 8bb991a44..8bb991a44 100644
--- a/baseconfig/arm/CONFIG_I2C_BOARDINFO
+++ b/configs/base-generic/arm/CONFIG_I2C_BOARDINFO
diff --git a/baseconfig/arm/CONFIG_I2C_CROS_EC_TUNNEL b/configs/base-generic/arm/CONFIG_I2C_CROS_EC_TUNNEL
index f32c67849..f32c67849 100644
--- a/baseconfig/arm/CONFIG_I2C_CROS_EC_TUNNEL
+++ b/configs/base-generic/arm/CONFIG_I2C_CROS_EC_TUNNEL
diff --git a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE b/configs/base-generic/arm/CONFIG_I2C_DESIGNWARE_CORE
index f9cdc633b..f9cdc633b 100644
--- a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE
+++ b/configs/base-generic/arm/CONFIG_I2C_DESIGNWARE_CORE
diff --git a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM b/configs/base-generic/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
index 3d50a3e8a..3d50a3e8a 100644
--- a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
diff --git a/baseconfig/arm/CONFIG_I2C_GPIO b/configs/base-generic/arm/CONFIG_I2C_GPIO
index 99bcd1824..99bcd1824 100644
--- a/baseconfig/arm/CONFIG_I2C_GPIO
+++ b/configs/base-generic/arm/CONFIG_I2C_GPIO
diff --git a/baseconfig/arm/CONFIG_I2C_MESON b/configs/base-generic/arm/CONFIG_I2C_MESON
index 373686139..373686139 100644
--- a/baseconfig/arm/CONFIG_I2C_MESON
+++ b/configs/base-generic/arm/CONFIG_I2C_MESON
diff --git a/baseconfig/arm/CONFIG_I2C_MUX b/configs/base-generic/arm/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX
diff --git a/baseconfig/arm/CONFIG_I2C_MUX_GPIO b/configs/base-generic/arm/CONFIG_I2C_MUX_GPIO
index f9fcb2b2f..f9fcb2b2f 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX_GPIO
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX_GPIO
diff --git a/baseconfig/arm/CONFIG_I2C_MUX_PCA9541 b/configs/base-generic/arm/CONFIG_I2C_MUX_PCA9541
index 5b5fe6052..5b5fe6052 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX_PCA9541
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX_PCA9541
diff --git a/baseconfig/arm/CONFIG_I2C_MUX_PCA954x b/configs/base-generic/arm/CONFIG_I2C_MUX_PCA954x
index 24c8bfd0f..24c8bfd0f 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX_PCA954x
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX_PCA954x
diff --git a/baseconfig/arm/CONFIG_I2C_MUX_PINCTRL b/configs/base-generic/arm/CONFIG_I2C_MUX_PINCTRL
index eadba88bd..eadba88bd 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX_PINCTRL
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX_PINCTRL
diff --git a/baseconfig/arm/CONFIG_I2C_MUX_REG b/configs/base-generic/arm/CONFIG_I2C_MUX_REG
index 480f9e5c6..480f9e5c6 100644
--- a/baseconfig/arm/CONFIG_I2C_MUX_REG
+++ b/configs/base-generic/arm/CONFIG_I2C_MUX_REG
diff --git a/baseconfig/arm/CONFIG_I2C_MV64XXX b/configs/base-generic/arm/CONFIG_I2C_MV64XXX
index df88fddca..df88fddca 100644
--- a/baseconfig/arm/CONFIG_I2C_MV64XXX
+++ b/configs/base-generic/arm/CONFIG_I2C_MV64XXX
diff --git a/baseconfig/arm/CONFIG_I2C_NOMADIK b/configs/base-generic/arm/CONFIG_I2C_NOMADIK
index 244fb5321..244fb5321 100644
--- a/baseconfig/arm/CONFIG_I2C_NOMADIK
+++ b/configs/base-generic/arm/CONFIG_I2C_NOMADIK
diff --git a/baseconfig/arm/CONFIG_I2C_PXA b/configs/base-generic/arm/CONFIG_I2C_PXA
index 59d18f0cb..59d18f0cb 100644
--- a/baseconfig/arm/CONFIG_I2C_PXA
+++ b/configs/base-generic/arm/CONFIG_I2C_PXA
diff --git a/baseconfig/arm/CONFIG_I2C_PXA_SLAVE b/configs/base-generic/arm/CONFIG_I2C_PXA_SLAVE
index 7cc440320..7cc440320 100644
--- a/baseconfig/arm/CONFIG_I2C_PXA_SLAVE
+++ b/configs/base-generic/arm/CONFIG_I2C_PXA_SLAVE
diff --git a/baseconfig/arm/CONFIG_I2C_RK3X b/configs/base-generic/arm/CONFIG_I2C_RK3X
index 8a79fb30d..8a79fb30d 100644
--- a/baseconfig/arm/CONFIG_I2C_RK3X
+++ b/configs/base-generic/arm/CONFIG_I2C_RK3X
diff --git a/baseconfig/arm/CONFIG_I2C_TEGRA b/configs/base-generic/arm/CONFIG_I2C_TEGRA
index 487efbc6f..487efbc6f 100644
--- a/baseconfig/arm/CONFIG_I2C_TEGRA
+++ b/configs/base-generic/arm/CONFIG_I2C_TEGRA
diff --git a/baseconfig/arm/CONFIG_I2C_TEGRA_BPMP b/configs/base-generic/arm/CONFIG_I2C_TEGRA_BPMP
index 71099e082..71099e082 100644
--- a/baseconfig/arm/CONFIG_I2C_TEGRA_BPMP
+++ b/configs/base-generic/arm/CONFIG_I2C_TEGRA_BPMP
diff --git a/baseconfig/arm/CONFIG_I2C_VERSATILE b/configs/base-generic/arm/CONFIG_I2C_VERSATILE
index 3591505da..3591505da 100644
--- a/baseconfig/arm/CONFIG_I2C_VERSATILE
+++ b/configs/base-generic/arm/CONFIG_I2C_VERSATILE
diff --git a/baseconfig/arm/CONFIG_I2O b/configs/base-generic/arm/CONFIG_I2O
index c3064fb4b..c3064fb4b 100644
--- a/baseconfig/arm/CONFIG_I2O
+++ b/configs/base-generic/arm/CONFIG_I2O
diff --git a/baseconfig/arm/CONFIG_IIO_CROS_EC_BARO b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_BARO
index c64555bfa..c64555bfa 100644
--- a/baseconfig/arm/CONFIG_IIO_CROS_EC_BARO
+++ b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_BARO
diff --git a/baseconfig/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX
index deb1a6eb5..deb1a6eb5 100644
--- a/baseconfig/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX
+++ b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX
diff --git a/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_SENSORS
index e93e4c8f0..e93e4c8f0 100644
--- a/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS
+++ b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_SENSORS
diff --git a/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE
index baf78d1ad..baf78d1ad 100644
--- a/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE
+++ b/configs/base-generic/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE
diff --git a/baseconfig/arm/CONFIG_IIO_ST_PRESS b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS
index f31294e69..f31294e69 100644
--- a/baseconfig/arm/CONFIG_IIO_ST_PRESS
+++ b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS
diff --git a/baseconfig/arm/CONFIG_IIO_ST_PRESS_I2C b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS_I2C
index adc35b874..adc35b874 100644
--- a/baseconfig/arm/CONFIG_IIO_ST_PRESS_I2C
+++ b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS_I2C
diff --git a/baseconfig/arm/CONFIG_IIO_ST_PRESS_SPI b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS_SPI
index 12e7ec660..12e7ec660 100644
--- a/baseconfig/arm/CONFIG_IIO_ST_PRESS_SPI
+++ b/configs/base-generic/arm/CONFIG_IIO_ST_PRESS_SPI
diff --git a/baseconfig/arm/CONFIG_IIO_SYSFS_TRIGGER b/configs/base-generic/arm/CONFIG_IIO_SYSFS_TRIGGER
index ae94edc54..ae94edc54 100644
--- a/baseconfig/arm/CONFIG_IIO_SYSFS_TRIGGER
+++ b/configs/base-generic/arm/CONFIG_IIO_SYSFS_TRIGGER
diff --git a/baseconfig/arm/CONFIG_IMX_IPUV3_CORE b/configs/base-generic/arm/CONFIG_IMX_IPUV3_CORE
index 3e0183fa0..3e0183fa0 100644
--- a/baseconfig/arm/CONFIG_IMX_IPUV3_CORE
+++ b/configs/base-generic/arm/CONFIG_IMX_IPUV3_CORE
diff --git a/baseconfig/arm/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/arm/CONFIG_INPUT_MATRIXKMAP
index 0f1b2f168..0f1b2f168 100644
--- a/baseconfig/arm/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/arm/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/arm/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/arm/CONFIG_INPUT_PWM_BEEPER
index 59fdb225d..59fdb225d 100644
--- a/baseconfig/arm/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/arm/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/arm/CONFIG_INPUT_SOC_BUTTON_ARRAY b/configs/base-generic/arm/CONFIG_INPUT_SOC_BUTTON_ARRAY
index dec62a899..dec62a899 100644
--- a/baseconfig/arm/CONFIG_INPUT_SOC_BUTTON_ARRAY
+++ b/configs/base-generic/arm/CONFIG_INPUT_SOC_BUTTON_ARRAY
diff --git a/baseconfig/arm/CONFIG_IOMMU_DMA b/configs/base-generic/arm/CONFIG_IOMMU_DMA
index a9155fba1..a9155fba1 100644
--- a/baseconfig/arm/CONFIG_IOMMU_DMA
+++ b/configs/base-generic/arm/CONFIG_IOMMU_DMA
diff --git a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_ARMV7S b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_ARMV7S
index 9f8a9a2ca..9f8a9a2ca 100644
--- a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_ARMV7S
+++ b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_ARMV7S
diff --git a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE
index 73494e9d2..73494e9d2 100644
--- a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE
+++ b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE
diff --git a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST
index b6f514a3f..b6f514a3f 100644
--- a/baseconfig/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST
+++ b/configs/base-generic/arm/CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST
diff --git a/baseconfig/arm/CONFIG_IPQ_GCC_4019 b/configs/base-generic/arm/CONFIG_IPQ_GCC_4019
index 0a42afdce..0a42afdce 100644
--- a/baseconfig/arm/CONFIG_IPQ_GCC_4019
+++ b/configs/base-generic/arm/CONFIG_IPQ_GCC_4019
diff --git a/baseconfig/arm/CONFIG_IPQ_GCC_806X b/configs/base-generic/arm/CONFIG_IPQ_GCC_806X
index c25ba2b65..c25ba2b65 100644
--- a/baseconfig/arm/CONFIG_IPQ_GCC_806X
+++ b/configs/base-generic/arm/CONFIG_IPQ_GCC_806X
diff --git a/baseconfig/arm/CONFIG_IPQ_GCC_8074 b/configs/base-generic/arm/CONFIG_IPQ_GCC_8074
index 7e6a019d4..7e6a019d4 100644
--- a/baseconfig/arm/CONFIG_IPQ_GCC_8074
+++ b/configs/base-generic/arm/CONFIG_IPQ_GCC_8074
diff --git a/baseconfig/arm/CONFIG_IPQ_LCC_806X b/configs/base-generic/arm/CONFIG_IPQ_LCC_806X
index c32df992a..c32df992a 100644
--- a/baseconfig/arm/CONFIG_IPQ_LCC_806X
+++ b/configs/base-generic/arm/CONFIG_IPQ_LCC_806X
diff --git a/baseconfig/arm/CONFIG_IP_DCCP b/configs/base-generic/arm/CONFIG_IP_DCCP
index 6ecb43a3e..6ecb43a3e 100644
--- a/baseconfig/arm/CONFIG_IP_DCCP
+++ b/configs/base-generic/arm/CONFIG_IP_DCCP
diff --git a/baseconfig/arm/CONFIG_IRQ_DOMAIN_DEBUG b/configs/base-generic/arm/CONFIG_IRQ_DOMAIN_DEBUG
index fadfd90f4..fadfd90f4 100644
--- a/baseconfig/arm/CONFIG_IRQ_DOMAIN_DEBUG
+++ b/configs/base-generic/arm/CONFIG_IRQ_DOMAIN_DEBUG
diff --git a/baseconfig/arm/CONFIG_IR_MESON b/configs/base-generic/arm/CONFIG_IR_MESON
index e248de441..e248de441 100644
--- a/baseconfig/arm/CONFIG_IR_MESON
+++ b/configs/base-generic/arm/CONFIG_IR_MESON
diff --git a/baseconfig/arm/CONFIG_ISDN b/configs/base-generic/arm/CONFIG_ISDN
index 7cf059484..7cf059484 100644
--- a/baseconfig/arm/CONFIG_ISDN
+++ b/configs/base-generic/arm/CONFIG_ISDN
diff --git a/baseconfig/arm/CONFIG_IWMMXT b/configs/base-generic/arm/CONFIG_IWMMXT
index 6beeac73c..6beeac73c 100644
--- a/baseconfig/arm/CONFIG_IWMMXT
+++ b/configs/base-generic/arm/CONFIG_IWMMXT
diff --git a/baseconfig/arm/CONFIG_KERNEL_MODE_NEON b/configs/base-generic/arm/CONFIG_KERNEL_MODE_NEON
index 9f6b7232f..9f6b7232f 100644
--- a/baseconfig/arm/CONFIG_KERNEL_MODE_NEON
+++ b/configs/base-generic/arm/CONFIG_KERNEL_MODE_NEON
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_ADC b/configs/base-generic/arm/CONFIG_KEYBOARD_ADC
index d9b66de57..d9b66de57 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_ADC
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_ADC
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_BCM b/configs/base-generic/arm/CONFIG_KEYBOARD_BCM
index d904364b5..d904364b5 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_BCM
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_BCM
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_CROS_EC b/configs/base-generic/arm/CONFIG_KEYBOARD_CROS_EC
index 0444103f7..0444103f7 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_CROS_EC
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_CROS_EC
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_GPIO b/configs/base-generic/arm/CONFIG_KEYBOARD_GPIO
index 46a9f62ef..46a9f62ef 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_GPIO
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_GPIO
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_GPIO_POLLED b/configs/base-generic/arm/CONFIG_KEYBOARD_GPIO_POLLED
index 0d2397f0d..0d2397f0d 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_GPIO_POLLED
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_GPIO_POLLED
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_TEGRA b/configs/base-generic/arm/CONFIG_KEYBOARD_TEGRA
index bcfe36c81..bcfe36c81 100644
--- a/baseconfig/arm/CONFIG_KEYBOARD_TEGRA
+++ b/configs/base-generic/arm/CONFIG_KEYBOARD_TEGRA
diff --git a/baseconfig/arm/CONFIG_KUSER_HELPERS b/configs/base-generic/arm/CONFIG_KUSER_HELPERS
index b61b9dd53..b61b9dd53 100644
--- a/baseconfig/arm/CONFIG_KUSER_HELPERS
+++ b/configs/base-generic/arm/CONFIG_KUSER_HELPERS
diff --git a/baseconfig/arm/CONFIG_KXSD9 b/configs/base-generic/arm/CONFIG_KXSD9
index 090669c9c..090669c9c 100644
--- a/baseconfig/arm/CONFIG_KXSD9
+++ b/configs/base-generic/arm/CONFIG_KXSD9
diff --git a/baseconfig/arm/CONFIG_KXSD9_I2C b/configs/base-generic/arm/CONFIG_KXSD9_I2C
index 3d2256700..3d2256700 100644
--- a/baseconfig/arm/CONFIG_KXSD9_I2C
+++ b/configs/base-generic/arm/CONFIG_KXSD9_I2C
diff --git a/baseconfig/arm/CONFIG_KXSD9_SPI b/configs/base-generic/arm/CONFIG_KXSD9_SPI
index f4da57bbc..f4da57bbc 100644
--- a/baseconfig/arm/CONFIG_KXSD9_SPI
+++ b/configs/base-generic/arm/CONFIG_KXSD9_SPI
diff --git a/baseconfig/arm/CONFIG_LATTICE_ECP3_CONFIG b/configs/base-generic/arm/CONFIG_LATTICE_ECP3_CONFIG
index 7212e8899..7212e8899 100644
--- a/baseconfig/arm/CONFIG_LATTICE_ECP3_CONFIG
+++ b/configs/base-generic/arm/CONFIG_LATTICE_ECP3_CONFIG
diff --git a/baseconfig/arm/CONFIG_LEDS_GPIO b/configs/base-generic/arm/CONFIG_LEDS_GPIO
index 65a807afb..65a807afb 100644
--- a/baseconfig/arm/CONFIG_LEDS_GPIO
+++ b/configs/base-generic/arm/CONFIG_LEDS_GPIO
diff --git a/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER b/configs/base-generic/arm/CONFIG_LEDS_GPIO_REGISTER
index 101e4404f..101e4404f 100644
--- a/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER
+++ b/configs/base-generic/arm/CONFIG_LEDS_GPIO_REGISTER
diff --git a/baseconfig/arm/CONFIG_LEDS_PWM b/configs/base-generic/arm/CONFIG_LEDS_PWM
index fc4cfe6f7..fc4cfe6f7 100644
--- a/baseconfig/arm/CONFIG_LEDS_PWM
+++ b/configs/base-generic/arm/CONFIG_LEDS_PWM
diff --git a/baseconfig/arm/CONFIG_LEDS_SYSCON b/configs/base-generic/arm/CONFIG_LEDS_SYSCON
index c458741b6..c458741b6 100644
--- a/baseconfig/arm/CONFIG_LEDS_SYSCON
+++ b/configs/base-generic/arm/CONFIG_LEDS_SYSCON
diff --git a/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU b/configs/base-generic/arm/CONFIG_LEDS_TRIGGER_CPU
index b017fb086..b017fb086 100644
--- a/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU
+++ b/configs/base-generic/arm/CONFIG_LEDS_TRIGGER_CPU
diff --git a/debugconfig/arm/CONFIG_LOCK_STAT b/configs/base-generic/arm/CONFIG_LOCK_STAT
index ab733ddc2..ab733ddc2 100644
--- a/debugconfig/arm/CONFIG_LOCK_STAT
+++ b/configs/base-generic/arm/CONFIG_LOCK_STAT
diff --git a/baseconfig/arm/CONFIG_MAILBOX b/configs/base-generic/arm/CONFIG_MAILBOX
index f1a6342b4..f1a6342b4 100644
--- a/baseconfig/arm/CONFIG_MAILBOX
+++ b/configs/base-generic/arm/CONFIG_MAILBOX
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX
index 19416a6ca..19416a6ca 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX
+++ b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX_GPIO
index 5df332c5e..5df332c5e 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
index bbb54cf22..bbb54cf22 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/configs/base-generic/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/arm/CONFIG_MDIO_GPIO b/configs/base-generic/arm/CONFIG_MDIO_GPIO
index a317fa125..a317fa125 100644
--- a/baseconfig/arm/CONFIG_MDIO_GPIO
+++ b/configs/base-generic/arm/CONFIG_MDIO_GPIO
diff --git a/baseconfig/arm/CONFIG_MESON_EFUSE b/configs/base-generic/arm/CONFIG_MESON_EFUSE
index 832f28e6d..832f28e6d 100644
--- a/baseconfig/arm/CONFIG_MESON_EFUSE
+++ b/configs/base-generic/arm/CONFIG_MESON_EFUSE
diff --git a/baseconfig/arm/CONFIG_MESON_GX_SOCINFO b/configs/base-generic/arm/CONFIG_MESON_GX_SOCINFO
index ce5ba6f4a..ce5ba6f4a 100644
--- a/baseconfig/arm/CONFIG_MESON_GX_SOCINFO
+++ b/configs/base-generic/arm/CONFIG_MESON_GX_SOCINFO
diff --git a/baseconfig/arm/CONFIG_MESON_SARADC b/configs/base-generic/arm/CONFIG_MESON_SARADC
index cae134290..cae134290 100644
--- a/baseconfig/arm/CONFIG_MESON_SARADC
+++ b/configs/base-generic/arm/CONFIG_MESON_SARADC
diff --git a/baseconfig/arm/CONFIG_MESON_SM b/configs/base-generic/arm/CONFIG_MESON_SM
index 3cd5a9e30..3cd5a9e30 100644
--- a/baseconfig/arm/CONFIG_MESON_SM
+++ b/configs/base-generic/arm/CONFIG_MESON_SM
diff --git a/baseconfig/arm/CONFIG_MFD_AC100 b/configs/base-generic/arm/CONFIG_MFD_AC100
index 4decbd23b..4decbd23b 100644
--- a/baseconfig/arm/CONFIG_MFD_AC100
+++ b/configs/base-generic/arm/CONFIG_MFD_AC100
diff --git a/baseconfig/arm/CONFIG_MFD_CROS_EC b/configs/base-generic/arm/CONFIG_MFD_CROS_EC
index 3600231f6..3600231f6 100644
--- a/baseconfig/arm/CONFIG_MFD_CROS_EC
+++ b/configs/base-generic/arm/CONFIG_MFD_CROS_EC
diff --git a/baseconfig/arm/CONFIG_MFD_CROS_EC_I2C b/configs/base-generic/arm/CONFIG_MFD_CROS_EC_I2C
index e67f4a1e6..e67f4a1e6 100644
--- a/baseconfig/arm/CONFIG_MFD_CROS_EC_I2C
+++ b/configs/base-generic/arm/CONFIG_MFD_CROS_EC_I2C
diff --git a/baseconfig/arm/CONFIG_MFD_CROS_EC_SPI b/configs/base-generic/arm/CONFIG_MFD_CROS_EC_SPI
index 3b26eb47d..3b26eb47d 100644
--- a/baseconfig/arm/CONFIG_MFD_CROS_EC_SPI
+++ b/configs/base-generic/arm/CONFIG_MFD_CROS_EC_SPI
diff --git a/baseconfig/arm/CONFIG_MFD_MAX77686 b/configs/base-generic/arm/CONFIG_MFD_MAX77686
index e6791bf7e..e6791bf7e 100644
--- a/baseconfig/arm/CONFIG_MFD_MAX77686
+++ b/configs/base-generic/arm/CONFIG_MFD_MAX77686
diff --git a/baseconfig/arm/CONFIG_MFD_NVEC b/configs/base-generic/arm/CONFIG_MFD_NVEC
index a17523130..a17523130 100644
--- a/baseconfig/arm/CONFIG_MFD_NVEC
+++ b/configs/base-generic/arm/CONFIG_MFD_NVEC
diff --git a/baseconfig/arm/CONFIG_MFD_PM8XXX b/configs/base-generic/arm/CONFIG_MFD_PM8XXX
index 9f7f192d0..9f7f192d0 100644
--- a/baseconfig/arm/CONFIG_MFD_PM8XXX
+++ b/configs/base-generic/arm/CONFIG_MFD_PM8XXX
diff --git a/baseconfig/arm/CONFIG_MFD_RK808 b/configs/base-generic/arm/CONFIG_MFD_RK808
index 097860adb..097860adb 100644
--- a/baseconfig/arm/CONFIG_MFD_RK808
+++ b/configs/base-generic/arm/CONFIG_MFD_RK808
diff --git a/baseconfig/arm/CONFIG_MFD_SYSCON b/configs/base-generic/arm/CONFIG_MFD_SYSCON
index 9890ebdb9..9890ebdb9 100644
--- a/baseconfig/arm/CONFIG_MFD_SYSCON
+++ b/configs/base-generic/arm/CONFIG_MFD_SYSCON
diff --git a/baseconfig/arm/CONFIG_MFD_VEXPRESS_SYSREG b/configs/base-generic/arm/CONFIG_MFD_VEXPRESS_SYSREG
index 64c3ad00b..64c3ad00b 100644
--- a/baseconfig/arm/CONFIG_MFD_VEXPRESS_SYSREG
+++ b/configs/base-generic/arm/CONFIG_MFD_VEXPRESS_SYSREG
diff --git a/baseconfig/arm/CONFIG_MFD_WL1273_CORE b/configs/base-generic/arm/CONFIG_MFD_WL1273_CORE
index ed64c199e..ed64c199e 100644
--- a/baseconfig/arm/CONFIG_MFD_WL1273_CORE
+++ b/configs/base-generic/arm/CONFIG_MFD_WL1273_CORE
diff --git a/baseconfig/arm/CONFIG_MMC b/configs/base-generic/arm/CONFIG_MMC
index 7c2be178c..7c2be178c 100644
--- a/baseconfig/arm/CONFIG_MMC
+++ b/configs/base-generic/arm/CONFIG_MMC
diff --git a/baseconfig/arm/CONFIG_MMC_ARMMMCI b/configs/base-generic/arm/CONFIG_MMC_ARMMMCI
index 0b49cccef..0b49cccef 100644
--- a/baseconfig/arm/CONFIG_MMC_ARMMMCI
+++ b/configs/base-generic/arm/CONFIG_MMC_ARMMMCI
diff --git a/baseconfig/arm/CONFIG_MMC_BCM2835 b/configs/base-generic/arm/CONFIG_MMC_BCM2835
index b3750c1a7..b3750c1a7 100644
--- a/baseconfig/arm/CONFIG_MMC_BCM2835
+++ b/configs/base-generic/arm/CONFIG_MMC_BCM2835
diff --git a/baseconfig/arm/CONFIG_MMC_DW b/configs/base-generic/arm/CONFIG_MMC_DW
index 163b7bed5..163b7bed5 100644
--- a/baseconfig/arm/CONFIG_MMC_DW
+++ b/configs/base-generic/arm/CONFIG_MMC_DW
diff --git a/baseconfig/arm/CONFIG_MMC_DW_EXYNOS b/configs/base-generic/arm/CONFIG_MMC_DW_EXYNOS
index 36913703d..36913703d 100644
--- a/baseconfig/arm/CONFIG_MMC_DW_EXYNOS
+++ b/configs/base-generic/arm/CONFIG_MMC_DW_EXYNOS
diff --git a/baseconfig/arm/CONFIG_MMC_DW_K3 b/configs/base-generic/arm/CONFIG_MMC_DW_K3
index 3745aaa1c..3745aaa1c 100644
--- a/baseconfig/arm/CONFIG_MMC_DW_K3
+++ b/configs/base-generic/arm/CONFIG_MMC_DW_K3
diff --git a/baseconfig/arm/CONFIG_MMC_DW_PCI b/configs/base-generic/arm/CONFIG_MMC_DW_PCI
index 704ae00e6..704ae00e6 100644
--- a/baseconfig/arm/CONFIG_MMC_DW_PCI
+++ b/configs/base-generic/arm/CONFIG_MMC_DW_PCI
diff --git a/baseconfig/arm/CONFIG_MMC_DW_PLTFM b/configs/base-generic/arm/CONFIG_MMC_DW_PLTFM
index c9318bc4f..c9318bc4f 100644
--- a/baseconfig/arm/CONFIG_MMC_DW_PLTFM
+++ b/configs/base-generic/arm/CONFIG_MMC_DW_PLTFM
diff --git a/baseconfig/arm/CONFIG_MMC_DW_ROCKCHIP b/configs/base-generic/arm/CONFIG_MMC_DW_ROCKCHIP
index c21d6e6b7..c21d6e6b7 100644
--- a/baseconfig/arm/CONFIG_MMC_DW_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_MMC_DW_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_MMC_MVSDIO b/configs/base-generic/arm/CONFIG_MMC_MVSDIO
index fc877a976..fc877a976 100644
--- a/baseconfig/arm/CONFIG_MMC_MVSDIO
+++ b/configs/base-generic/arm/CONFIG_MMC_MVSDIO
diff --git a/baseconfig/arm/CONFIG_MMC_SDHCI_IPROC b/configs/base-generic/arm/CONFIG_MMC_SDHCI_IPROC
index bab3fdf3e..bab3fdf3e 100644
--- a/baseconfig/arm/CONFIG_MMC_SDHCI_IPROC
+++ b/configs/base-generic/arm/CONFIG_MMC_SDHCI_IPROC
diff --git a/baseconfig/arm/CONFIG_MMC_SDHCI_OF_ARASAN b/configs/base-generic/arm/CONFIG_MMC_SDHCI_OF_ARASAN
index 160add44a..160add44a 100644
--- a/baseconfig/arm/CONFIG_MMC_SDHCI_OF_ARASAN
+++ b/configs/base-generic/arm/CONFIG_MMC_SDHCI_OF_ARASAN
diff --git a/baseconfig/arm/CONFIG_MMC_SDHCI_PXAV3 b/configs/base-generic/arm/CONFIG_MMC_SDHCI_PXAV3
index f6e6fdd55..f6e6fdd55 100644
--- a/baseconfig/arm/CONFIG_MMC_SDHCI_PXAV3
+++ b/configs/base-generic/arm/CONFIG_MMC_SDHCI_PXAV3
diff --git a/baseconfig/arm/CONFIG_MMC_SDHCI_TEGRA b/configs/base-generic/arm/CONFIG_MMC_SDHCI_TEGRA
index 8b0cbf49a..8b0cbf49a 100644
--- a/baseconfig/arm/CONFIG_MMC_SDHCI_TEGRA
+++ b/configs/base-generic/arm/CONFIG_MMC_SDHCI_TEGRA
diff --git a/baseconfig/arm/CONFIG_MMC_SPI b/configs/base-generic/arm/CONFIG_MMC_SPI
index 04b40c54e..04b40c54e 100644
--- a/baseconfig/arm/CONFIG_MMC_SPI
+++ b/configs/base-generic/arm/CONFIG_MMC_SPI
diff --git a/baseconfig/arm/CONFIG_MTD_AFS_PARTS b/configs/base-generic/arm/CONFIG_MTD_AFS_PARTS
index 0abf6cc8e..0abf6cc8e 100644
--- a/baseconfig/arm/CONFIG_MTD_AFS_PARTS
+++ b/configs/base-generic/arm/CONFIG_MTD_AFS_PARTS
diff --git a/baseconfig/arm/CONFIG_MTD_BLKDEVS b/configs/base-generic/arm/CONFIG_MTD_BLKDEVS
index b59074744..b59074744 100644
--- a/baseconfig/arm/CONFIG_MTD_BLKDEVS
+++ b/configs/base-generic/arm/CONFIG_MTD_BLKDEVS
diff --git a/baseconfig/arm/CONFIG_MTD_BLOCK b/configs/base-generic/arm/CONFIG_MTD_BLOCK
index 74f992fda..74f992fda 100644
--- a/baseconfig/arm/CONFIG_MTD_BLOCK
+++ b/configs/base-generic/arm/CONFIG_MTD_BLOCK
diff --git a/baseconfig/arm/CONFIG_MTD_CFI b/configs/base-generic/arm/CONFIG_MTD_CFI
index bc8c1b815..bc8c1b815 100644
--- a/baseconfig/arm/CONFIG_MTD_CFI
+++ b/configs/base-generic/arm/CONFIG_MTD_CFI
diff --git a/baseconfig/arm/CONFIG_MTD_CFI_ADV_OPTIONS b/configs/base-generic/arm/CONFIG_MTD_CFI_ADV_OPTIONS
index 29d7bb0b3..29d7bb0b3 100644
--- a/baseconfig/arm/CONFIG_MTD_CFI_ADV_OPTIONS
+++ b/configs/base-generic/arm/CONFIG_MTD_CFI_ADV_OPTIONS
diff --git a/baseconfig/arm/CONFIG_MTD_CFI_AMDSTD b/configs/base-generic/arm/CONFIG_MTD_CFI_AMDSTD
index cbc688f2f..cbc688f2f 100644
--- a/baseconfig/arm/CONFIG_MTD_CFI_AMDSTD
+++ b/configs/base-generic/arm/CONFIG_MTD_CFI_AMDSTD
diff --git a/baseconfig/arm/CONFIG_MTD_CFI_INTELEXT b/configs/base-generic/arm/CONFIG_MTD_CFI_INTELEXT
index 01c8ff426..01c8ff426 100644
--- a/baseconfig/arm/CONFIG_MTD_CFI_INTELEXT
+++ b/configs/base-generic/arm/CONFIG_MTD_CFI_INTELEXT
diff --git a/baseconfig/arm/CONFIG_MTD_CFI_STAA b/configs/base-generic/arm/CONFIG_MTD_CFI_STAA
index 67ee4aed7..67ee4aed7 100644
--- a/baseconfig/arm/CONFIG_MTD_CFI_STAA
+++ b/configs/base-generic/arm/CONFIG_MTD_CFI_STAA
diff --git a/baseconfig/arm/CONFIG_MTD_LPDDR2_NVM b/configs/base-generic/arm/CONFIG_MTD_LPDDR2_NVM
index b1384f71d..b1384f71d 100644
--- a/baseconfig/arm/CONFIG_MTD_LPDDR2_NVM
+++ b/configs/base-generic/arm/CONFIG_MTD_LPDDR2_NVM
diff --git a/baseconfig/arm/CONFIG_MTD_NAND_PXA3xx b/configs/base-generic/arm/CONFIG_MTD_NAND_PXA3xx
index 584b57ea1..584b57ea1 100644
--- a/baseconfig/arm/CONFIG_MTD_NAND_PXA3xx
+++ b/configs/base-generic/arm/CONFIG_MTD_NAND_PXA3xx
diff --git a/baseconfig/arm/CONFIG_MTD_OF_PARTS b/configs/base-generic/arm/CONFIG_MTD_OF_PARTS
index bddcc3b5e..bddcc3b5e 100644
--- a/baseconfig/arm/CONFIG_MTD_OF_PARTS
+++ b/configs/base-generic/arm/CONFIG_MTD_OF_PARTS
diff --git a/baseconfig/arm/CONFIG_MTD_PHYSMAP b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP
index 8b99e3061..8b99e3061 100644
--- a/baseconfig/arm/CONFIG_MTD_PHYSMAP
+++ b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP
diff --git a/baseconfig/arm/CONFIG_MTD_PHYSMAP_COMPAT b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_COMPAT
index bbb6119b5..bbb6119b5 100644
--- a/baseconfig/arm/CONFIG_MTD_PHYSMAP_COMPAT
+++ b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_COMPAT
diff --git a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF
index 4558beae6..4558beae6 100644
--- a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF
+++ b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF
diff --git a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF_GEMINI b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF_GEMINI
index cbc329eea..cbc329eea 100644
--- a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF_GEMINI
+++ b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF_GEMINI
diff --git a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF_VERSATILE b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF_VERSATILE
index 2b717c218..2b717c218 100644
--- a/baseconfig/arm/CONFIG_MTD_PHYSMAP_OF_VERSATILE
+++ b/configs/base-generic/arm/CONFIG_MTD_PHYSMAP_OF_VERSATILE
diff --git a/baseconfig/arm/CONFIG_MUSB_PIO_ONLY b/configs/base-generic/arm/CONFIG_MUSB_PIO_ONLY
index f57d2c03e..f57d2c03e 100644
--- a/baseconfig/arm/CONFIG_MUSB_PIO_ONLY
+++ b/configs/base-generic/arm/CONFIG_MUSB_PIO_ONLY
diff --git a/baseconfig/arm/CONFIG_MV643XX_ETH b/configs/base-generic/arm/CONFIG_MV643XX_ETH
index 05c4d0518..05c4d0518 100644
--- a/baseconfig/arm/CONFIG_MV643XX_ETH
+++ b/configs/base-generic/arm/CONFIG_MV643XX_ETH
diff --git a/baseconfig/arm/CONFIG_MVEBU_CLK_CORE b/configs/base-generic/arm/CONFIG_MVEBU_CLK_CORE
index b893b6810..b893b6810 100644
--- a/baseconfig/arm/CONFIG_MVEBU_CLK_CORE
+++ b/configs/base-generic/arm/CONFIG_MVEBU_CLK_CORE
diff --git a/baseconfig/arm/CONFIG_MVEBU_CLK_COREDIV b/configs/base-generic/arm/CONFIG_MVEBU_CLK_COREDIV
index dadc665e6..dadc665e6 100644
--- a/baseconfig/arm/CONFIG_MVEBU_CLK_COREDIV
+++ b/configs/base-generic/arm/CONFIG_MVEBU_CLK_COREDIV
diff --git a/baseconfig/arm/CONFIG_MVEBU_DEVBUS b/configs/base-generic/arm/CONFIG_MVEBU_DEVBUS
index c313bb254..c313bb254 100644
--- a/baseconfig/arm/CONFIG_MVEBU_DEVBUS
+++ b/configs/base-generic/arm/CONFIG_MVEBU_DEVBUS
diff --git a/baseconfig/arm/CONFIG_MVEBU_MBUS b/configs/base-generic/arm/CONFIG_MVEBU_MBUS
index 5ea3245ab..5ea3245ab 100644
--- a/baseconfig/arm/CONFIG_MVEBU_MBUS
+++ b/configs/base-generic/arm/CONFIG_MVEBU_MBUS
diff --git a/baseconfig/arm/CONFIG_MVNETA b/configs/base-generic/arm/CONFIG_MVNETA
index a6a3e847f..a6a3e847f 100644
--- a/baseconfig/arm/CONFIG_MVNETA
+++ b/configs/base-generic/arm/CONFIG_MVNETA
diff --git a/baseconfig/arm/CONFIG_MVNETA_BM_ENABLE b/configs/base-generic/arm/CONFIG_MVNETA_BM_ENABLE
index 1ff49e95d..1ff49e95d 100644
--- a/baseconfig/arm/CONFIG_MVNETA_BM_ENABLE
+++ b/configs/base-generic/arm/CONFIG_MVNETA_BM_ENABLE
diff --git a/baseconfig/arm/CONFIG_MVPP2 b/configs/base-generic/arm/CONFIG_MVPP2
index e41ec5ca1..e41ec5ca1 100644
--- a/baseconfig/arm/CONFIG_MVPP2
+++ b/configs/base-generic/arm/CONFIG_MVPP2
diff --git a/baseconfig/arm/CONFIG_MV_XOR b/configs/base-generic/arm/CONFIG_MV_XOR
index 04bad4446..04bad4446 100644
--- a/baseconfig/arm/CONFIG_MV_XOR
+++ b/configs/base-generic/arm/CONFIG_MV_XOR
diff --git a/baseconfig/arm/CONFIG_NCP_FS b/configs/base-generic/arm/CONFIG_NCP_FS
index 62eb3bdd0..62eb3bdd0 100644
--- a/baseconfig/arm/CONFIG_NCP_FS
+++ b/configs/base-generic/arm/CONFIG_NCP_FS
diff --git a/baseconfig/arm/CONFIG_NET_TULIP b/configs/base-generic/arm/CONFIG_NET_TULIP
index 3a54ce6ff..3a54ce6ff 100644
--- a/baseconfig/arm/CONFIG_NET_TULIP
+++ b/configs/base-generic/arm/CONFIG_NET_TULIP
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_3COM b/configs/base-generic/arm/CONFIG_NET_VENDOR_3COM
index ed6108c18..ed6108c18 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_3COM
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_3COM
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_ADAPTEC b/configs/base-generic/arm/CONFIG_NET_VENDOR_ADAPTEC
index c96958732..c96958732 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_ADAPTEC
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_ADAPTEC
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_BROCADE b/configs/base-generic/arm/CONFIG_NET_VENDOR_BROCADE
index fed5e48a4..fed5e48a4 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_BROCADE
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_BROCADE
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_CISCO b/configs/base-generic/arm/CONFIG_NET_VENDOR_CISCO
index 7b4bdaa25..7b4bdaa25 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_CISCO
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_CISCO
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_DEC b/configs/base-generic/arm/CONFIG_NET_VENDOR_DEC
index 7c3a697fb..7c3a697fb 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_DEC
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_DEC
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_EXAR b/configs/base-generic/arm/CONFIG_NET_VENDOR_EXAR
index 90a6a31bb..90a6a31bb 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_EXAR
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_EXAR
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_MELLANOX b/configs/base-generic/arm/CONFIG_NET_VENDOR_MELLANOX
index e33e9ccf9..e33e9ccf9 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_MELLANOX
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_MELLANOX
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC b/configs/base-generic/arm/CONFIG_NET_VENDOR_QLOGIC
index 700f6a5e2..700f6a5e2 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_QLOGIC
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_SUN b/configs/base-generic/arm/CONFIG_NET_VENDOR_SUN
index a4ce77875..a4ce77875 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_SUN
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_SUN
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_WIZNET b/configs/base-generic/arm/CONFIG_NET_VENDOR_WIZNET
index 08efd75ae..08efd75ae 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_WIZNET
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_WIZNET
diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_XIRCOM b/configs/base-generic/arm/CONFIG_NET_VENDOR_XIRCOM
index 4c2e6f9fd..4c2e6f9fd 100644
--- a/baseconfig/arm/CONFIG_NET_VENDOR_XIRCOM
+++ b/configs/base-generic/arm/CONFIG_NET_VENDOR_XIRCOM
diff --git a/baseconfig/arm/CONFIG_NOUVEAU_PLATFORM_DRIVER b/configs/base-generic/arm/CONFIG_NOUVEAU_PLATFORM_DRIVER
index 5f06f4c60..5f06f4c60 100644
--- a/baseconfig/arm/CONFIG_NOUVEAU_PLATFORM_DRIVER
+++ b/configs/base-generic/arm/CONFIG_NOUVEAU_PLATFORM_DRIVER
diff --git a/baseconfig/arm/CONFIG_OCFS2_FS b/configs/base-generic/arm/CONFIG_OCFS2_FS
index 99fe2608d..99fe2608d 100644
--- a/baseconfig/arm/CONFIG_OCFS2_FS
+++ b/configs/base-generic/arm/CONFIG_OCFS2_FS
diff --git a/baseconfig/arm/CONFIG_OF b/configs/base-generic/arm/CONFIG_OF
index b7345dd59..b7345dd59 100644
--- a/baseconfig/arm/CONFIG_OF
+++ b/configs/base-generic/arm/CONFIG_OF
diff --git a/baseconfig/arm/CONFIG_OF_ADDRESS b/configs/base-generic/arm/CONFIG_OF_ADDRESS
index 1c5bd9918..1c5bd9918 100644
--- a/baseconfig/arm/CONFIG_OF_ADDRESS
+++ b/configs/base-generic/arm/CONFIG_OF_ADDRESS
diff --git a/baseconfig/arm/CONFIG_OF_DYNAMIC b/configs/base-generic/arm/CONFIG_OF_DYNAMIC
index b5c03535f..b5c03535f 100644
--- a/baseconfig/arm/CONFIG_OF_DYNAMIC
+++ b/configs/base-generic/arm/CONFIG_OF_DYNAMIC
diff --git a/baseconfig/arm/CONFIG_OF_EARLY_FLATTREE b/configs/base-generic/arm/CONFIG_OF_EARLY_FLATTREE
index f71bca86c..f71bca86c 100644
--- a/baseconfig/arm/CONFIG_OF_EARLY_FLATTREE
+++ b/configs/base-generic/arm/CONFIG_OF_EARLY_FLATTREE
diff --git a/baseconfig/arm/CONFIG_OF_FLATTREE b/configs/base-generic/arm/CONFIG_OF_FLATTREE
index 5738a15c0..5738a15c0 100644
--- a/baseconfig/arm/CONFIG_OF_FLATTREE
+++ b/configs/base-generic/arm/CONFIG_OF_FLATTREE
diff --git a/baseconfig/arm/CONFIG_OF_GPIO b/configs/base-generic/arm/CONFIG_OF_GPIO
index 13fbd11f9..13fbd11f9 100644
--- a/baseconfig/arm/CONFIG_OF_GPIO
+++ b/configs/base-generic/arm/CONFIG_OF_GPIO
diff --git a/baseconfig/arm/CONFIG_OF_IOMMU b/configs/base-generic/arm/CONFIG_OF_IOMMU
index 994e558ed..994e558ed 100644
--- a/baseconfig/arm/CONFIG_OF_IOMMU
+++ b/configs/base-generic/arm/CONFIG_OF_IOMMU
diff --git a/baseconfig/arm/CONFIG_OF_IRQ b/configs/base-generic/arm/CONFIG_OF_IRQ
index aa09892b4..aa09892b4 100644
--- a/baseconfig/arm/CONFIG_OF_IRQ
+++ b/configs/base-generic/arm/CONFIG_OF_IRQ
diff --git a/baseconfig/arm/CONFIG_OF_MDIO b/configs/base-generic/arm/CONFIG_OF_MDIO
index cbdf2ee2f..cbdf2ee2f 100644
--- a/baseconfig/arm/CONFIG_OF_MDIO
+++ b/configs/base-generic/arm/CONFIG_OF_MDIO
diff --git a/baseconfig/arm/CONFIG_OF_NET b/configs/base-generic/arm/CONFIG_OF_NET
index 5ae0cbb96..5ae0cbb96 100644
--- a/baseconfig/arm/CONFIG_OF_NET
+++ b/configs/base-generic/arm/CONFIG_OF_NET
diff --git a/baseconfig/arm/CONFIG_OF_OVERLAY b/configs/base-generic/arm/CONFIG_OF_OVERLAY
index 30ae0afc5..30ae0afc5 100644
--- a/baseconfig/arm/CONFIG_OF_OVERLAY
+++ b/configs/base-generic/arm/CONFIG_OF_OVERLAY
diff --git a/baseconfig/arm/CONFIG_OF_PCI b/configs/base-generic/arm/CONFIG_OF_PCI
index ed845e881..ed845e881 100644
--- a/baseconfig/arm/CONFIG_OF_PCI
+++ b/configs/base-generic/arm/CONFIG_OF_PCI
diff --git a/baseconfig/arm/CONFIG_OF_PCI_IRQ b/configs/base-generic/arm/CONFIG_OF_PCI_IRQ
index d0054d853..d0054d853 100644
--- a/baseconfig/arm/CONFIG_OF_PCI_IRQ
+++ b/configs/base-generic/arm/CONFIG_OF_PCI_IRQ
diff --git a/baseconfig/arm/CONFIG_OF_RESERVED_MEM b/configs/base-generic/arm/CONFIG_OF_RESERVED_MEM
index b826a1f71..b826a1f71 100644
--- a/baseconfig/arm/CONFIG_OF_RESERVED_MEM
+++ b/configs/base-generic/arm/CONFIG_OF_RESERVED_MEM
diff --git a/baseconfig/arm/CONFIG_OF_RESOLVE b/configs/base-generic/arm/CONFIG_OF_RESOLVE
index 2b68a809d..2b68a809d 100644
--- a/baseconfig/arm/CONFIG_OF_RESOLVE
+++ b/configs/base-generic/arm/CONFIG_OF_RESOLVE
diff --git a/baseconfig/arm/CONFIG_OF_UNITTEST b/configs/base-generic/arm/CONFIG_OF_UNITTEST
index f9773f73d..f9773f73d 100644
--- a/baseconfig/arm/CONFIG_OF_UNITTEST
+++ b/configs/base-generic/arm/CONFIG_OF_UNITTEST
diff --git a/baseconfig/arm/CONFIG_OMAP_GPMC_DEBUG b/configs/base-generic/arm/CONFIG_OMAP_GPMC_DEBUG
index af4ea9e82..af4ea9e82 100644
--- a/baseconfig/arm/CONFIG_OMAP_GPMC_DEBUG
+++ b/configs/base-generic/arm/CONFIG_OMAP_GPMC_DEBUG
diff --git a/baseconfig/arm/CONFIG_PARAVIRT b/configs/base-generic/arm/CONFIG_PARAVIRT
index 65d95d1e2..65d95d1e2 100644
--- a/baseconfig/arm/CONFIG_PARAVIRT
+++ b/configs/base-generic/arm/CONFIG_PARAVIRT
diff --git a/baseconfig/arm/CONFIG_PARAVIRT_TIME_ACCOUNTING b/configs/base-generic/arm/CONFIG_PARAVIRT_TIME_ACCOUNTING
index 176320ad5..176320ad5 100644
--- a/baseconfig/arm/CONFIG_PARAVIRT_TIME_ACCOUNTING
+++ b/configs/base-generic/arm/CONFIG_PARAVIRT_TIME_ACCOUNTING
diff --git a/baseconfig/arm/CONFIG_PATA_ALI b/configs/base-generic/arm/CONFIG_PATA_ALI
index 15c814454..15c814454 100644
--- a/baseconfig/arm/CONFIG_PATA_ALI
+++ b/configs/base-generic/arm/CONFIG_PATA_ALI
diff --git a/baseconfig/arm/CONFIG_PATA_AMD b/configs/base-generic/arm/CONFIG_PATA_AMD
index 33a58facc..33a58facc 100644
--- a/baseconfig/arm/CONFIG_PATA_AMD
+++ b/configs/base-generic/arm/CONFIG_PATA_AMD
diff --git a/baseconfig/arm/CONFIG_PATA_ARTOP b/configs/base-generic/arm/CONFIG_PATA_ARTOP
index a4e7eb3b0..a4e7eb3b0 100644
--- a/baseconfig/arm/CONFIG_PATA_ARTOP
+++ b/configs/base-generic/arm/CONFIG_PATA_ARTOP
diff --git a/baseconfig/arm/CONFIG_PATA_ATP867X b/configs/base-generic/arm/CONFIG_PATA_ATP867X
index 5e66402b8..5e66402b8 100644
--- a/baseconfig/arm/CONFIG_PATA_ATP867X
+++ b/configs/base-generic/arm/CONFIG_PATA_ATP867X
diff --git a/baseconfig/arm/CONFIG_PATA_CMD640_PCI b/configs/base-generic/arm/CONFIG_PATA_CMD640_PCI
index 9244705d2..9244705d2 100644
--- a/baseconfig/arm/CONFIG_PATA_CMD640_PCI
+++ b/configs/base-generic/arm/CONFIG_PATA_CMD640_PCI
diff --git a/baseconfig/arm/CONFIG_PATA_CMD64X b/configs/base-generic/arm/CONFIG_PATA_CMD64X
index eb4773083..eb4773083 100644
--- a/baseconfig/arm/CONFIG_PATA_CMD64X
+++ b/configs/base-generic/arm/CONFIG_PATA_CMD64X
diff --git a/baseconfig/arm/CONFIG_PATA_CS5520 b/configs/base-generic/arm/CONFIG_PATA_CS5520
index 2328c0724..2328c0724 100644
--- a/baseconfig/arm/CONFIG_PATA_CS5520
+++ b/configs/base-generic/arm/CONFIG_PATA_CS5520
diff --git a/baseconfig/arm/CONFIG_PATA_CS5530 b/configs/base-generic/arm/CONFIG_PATA_CS5530
index 106b33a1a..106b33a1a 100644
--- a/baseconfig/arm/CONFIG_PATA_CS5530
+++ b/configs/base-generic/arm/CONFIG_PATA_CS5530
diff --git a/baseconfig/arm/CONFIG_PATA_CS5535 b/configs/base-generic/arm/CONFIG_PATA_CS5535
index 331016055..331016055 100644
--- a/baseconfig/arm/CONFIG_PATA_CS5535
+++ b/configs/base-generic/arm/CONFIG_PATA_CS5535
diff --git a/baseconfig/arm/CONFIG_PATA_CS5536 b/configs/base-generic/arm/CONFIG_PATA_CS5536
index e82dab7f2..e82dab7f2 100644
--- a/baseconfig/arm/CONFIG_PATA_CS5536
+++ b/configs/base-generic/arm/CONFIG_PATA_CS5536
diff --git a/baseconfig/arm/CONFIG_PATA_EFAR b/configs/base-generic/arm/CONFIG_PATA_EFAR
index d1957bf57..d1957bf57 100644
--- a/baseconfig/arm/CONFIG_PATA_EFAR
+++ b/configs/base-generic/arm/CONFIG_PATA_EFAR
diff --git a/baseconfig/arm/CONFIG_PATA_HPT366 b/configs/base-generic/arm/CONFIG_PATA_HPT366
index b67ac339d..b67ac339d 100644
--- a/baseconfig/arm/CONFIG_PATA_HPT366
+++ b/configs/base-generic/arm/CONFIG_PATA_HPT366
diff --git a/baseconfig/arm/CONFIG_PATA_HPT37X b/configs/base-generic/arm/CONFIG_PATA_HPT37X
index 990af0509..990af0509 100644
--- a/baseconfig/arm/CONFIG_PATA_HPT37X
+++ b/configs/base-generic/arm/CONFIG_PATA_HPT37X
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X2N b/configs/base-generic/arm/CONFIG_PATA_HPT3X2N
index 471fcff45..471fcff45 100644
--- a/baseconfig/arm/CONFIG_PATA_HPT3X2N
+++ b/configs/base-generic/arm/CONFIG_PATA_HPT3X2N
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X3 b/configs/base-generic/arm/CONFIG_PATA_HPT3X3
index 9fc36a00b..9fc36a00b 100644
--- a/baseconfig/arm/CONFIG_PATA_HPT3X3
+++ b/configs/base-generic/arm/CONFIG_PATA_HPT3X3
diff --git a/baseconfig/arm/CONFIG_PATA_IT8213 b/configs/base-generic/arm/CONFIG_PATA_IT8213
index 47fbeb7f5..47fbeb7f5 100644
--- a/baseconfig/arm/CONFIG_PATA_IT8213
+++ b/configs/base-generic/arm/CONFIG_PATA_IT8213
diff --git a/baseconfig/arm/CONFIG_PATA_IT821X b/configs/base-generic/arm/CONFIG_PATA_IT821X
index c29d7f7cb..c29d7f7cb 100644
--- a/baseconfig/arm/CONFIG_PATA_IT821X
+++ b/configs/base-generic/arm/CONFIG_PATA_IT821X
diff --git a/baseconfig/arm/CONFIG_PATA_JMICRON b/configs/base-generic/arm/CONFIG_PATA_JMICRON
index 55695c65f..55695c65f 100644
--- a/baseconfig/arm/CONFIG_PATA_JMICRON
+++ b/configs/base-generic/arm/CONFIG_PATA_JMICRON
diff --git a/baseconfig/arm/CONFIG_PATA_NETCELL b/configs/base-generic/arm/CONFIG_PATA_NETCELL
index e598ae303..e598ae303 100644
--- a/baseconfig/arm/CONFIG_PATA_NETCELL
+++ b/configs/base-generic/arm/CONFIG_PATA_NETCELL
diff --git a/baseconfig/arm/CONFIG_PATA_NINJA32 b/configs/base-generic/arm/CONFIG_PATA_NINJA32
index 9deb5dff7..9deb5dff7 100644
--- a/baseconfig/arm/CONFIG_PATA_NINJA32
+++ b/configs/base-generic/arm/CONFIG_PATA_NINJA32
diff --git a/baseconfig/arm/CONFIG_PATA_NS87410 b/configs/base-generic/arm/CONFIG_PATA_NS87410
index 32f9c72e0..32f9c72e0 100644
--- a/baseconfig/arm/CONFIG_PATA_NS87410
+++ b/configs/base-generic/arm/CONFIG_PATA_NS87410
diff --git a/baseconfig/arm/CONFIG_PATA_NS87415 b/configs/base-generic/arm/CONFIG_PATA_NS87415
index d12f9010d..d12f9010d 100644
--- a/baseconfig/arm/CONFIG_PATA_NS87415
+++ b/configs/base-generic/arm/CONFIG_PATA_NS87415
diff --git a/baseconfig/arm/CONFIG_PATA_OPTI b/configs/base-generic/arm/CONFIG_PATA_OPTI
index f95b6c966..f95b6c966 100644
--- a/baseconfig/arm/CONFIG_PATA_OPTI
+++ b/configs/base-generic/arm/CONFIG_PATA_OPTI
diff --git a/baseconfig/arm/CONFIG_PATA_OPTIDMA b/configs/base-generic/arm/CONFIG_PATA_OPTIDMA
index 6bf1d2e8a..6bf1d2e8a 100644
--- a/baseconfig/arm/CONFIG_PATA_OPTIDMA
+++ b/configs/base-generic/arm/CONFIG_PATA_OPTIDMA
diff --git a/baseconfig/arm/CONFIG_PATA_PDC2027X b/configs/base-generic/arm/CONFIG_PATA_PDC2027X
index c8ad0b826..c8ad0b826 100644
--- a/baseconfig/arm/CONFIG_PATA_PDC2027X
+++ b/configs/base-generic/arm/CONFIG_PATA_PDC2027X
diff --git a/baseconfig/arm/CONFIG_PATA_PDC_OLD b/configs/base-generic/arm/CONFIG_PATA_PDC_OLD
index d77240fcf..d77240fcf 100644
--- a/baseconfig/arm/CONFIG_PATA_PDC_OLD
+++ b/configs/base-generic/arm/CONFIG_PATA_PDC_OLD
diff --git a/baseconfig/arm/CONFIG_PATA_PLATFORM b/configs/base-generic/arm/CONFIG_PATA_PLATFORM
index e385815ec..e385815ec 100644
--- a/baseconfig/arm/CONFIG_PATA_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_PATA_PLATFORM
diff --git a/baseconfig/arm/CONFIG_PATA_SERVERWORKS b/configs/base-generic/arm/CONFIG_PATA_SERVERWORKS
index 5cacac7a6..5cacac7a6 100644
--- a/baseconfig/arm/CONFIG_PATA_SERVERWORKS
+++ b/configs/base-generic/arm/CONFIG_PATA_SERVERWORKS
diff --git a/baseconfig/arm/CONFIG_PATA_SIL680 b/configs/base-generic/arm/CONFIG_PATA_SIL680
index 75224a38b..75224a38b 100644
--- a/baseconfig/arm/CONFIG_PATA_SIL680
+++ b/configs/base-generic/arm/CONFIG_PATA_SIL680
diff --git a/baseconfig/arm/CONFIG_PATA_SIS b/configs/base-generic/arm/CONFIG_PATA_SIS
index 8c547495a..8c547495a 100644
--- a/baseconfig/arm/CONFIG_PATA_SIS
+++ b/configs/base-generic/arm/CONFIG_PATA_SIS
diff --git a/baseconfig/arm/CONFIG_PATA_VIA b/configs/base-generic/arm/CONFIG_PATA_VIA
index 9deaa6c3c..9deaa6c3c 100644
--- a/baseconfig/arm/CONFIG_PATA_VIA
+++ b/configs/base-generic/arm/CONFIG_PATA_VIA
diff --git a/baseconfig/arm/CONFIG_PATA_WINBOND b/configs/base-generic/arm/CONFIG_PATA_WINBOND
index 9b3eb6289..9b3eb6289 100644
--- a/baseconfig/arm/CONFIG_PATA_WINBOND
+++ b/configs/base-generic/arm/CONFIG_PATA_WINBOND
diff --git a/baseconfig/arm/CONFIG_PCIE_ARMADA_8K b/configs/base-generic/arm/CONFIG_PCIE_ARMADA_8K
index 53fca9672..53fca9672 100644
--- a/baseconfig/arm/CONFIG_PCIE_ARMADA_8K
+++ b/configs/base-generic/arm/CONFIG_PCIE_ARMADA_8K
diff --git a/baseconfig/arm/CONFIG_PCIE_DW b/configs/base-generic/arm/CONFIG_PCIE_DW
index 8c266b96d..8c266b96d 100644
--- a/baseconfig/arm/CONFIG_PCIE_DW
+++ b/configs/base-generic/arm/CONFIG_PCIE_DW
diff --git a/baseconfig/arm/CONFIG_PCIE_DW_HOST b/configs/base-generic/arm/CONFIG_PCIE_DW_HOST
index 6aecdd9c1..6aecdd9c1 100644
--- a/baseconfig/arm/CONFIG_PCIE_DW_HOST
+++ b/configs/base-generic/arm/CONFIG_PCIE_DW_HOST
diff --git a/baseconfig/arm/CONFIG_PCIE_ROCKCHIP b/configs/base-generic/arm/CONFIG_PCIE_ROCKCHIP
index dc8453f93..dc8453f93 100644
--- a/baseconfig/arm/CONFIG_PCIE_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_PCIE_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_PCI_AARDVARK b/configs/base-generic/arm/CONFIG_PCI_AARDVARK
index f0ed0b4b6..f0ed0b4b6 100644
--- a/baseconfig/arm/CONFIG_PCI_AARDVARK
+++ b/configs/base-generic/arm/CONFIG_PCI_AARDVARK
diff --git a/baseconfig/arm/CONFIG_PCI_FTPCI100 b/configs/base-generic/arm/CONFIG_PCI_FTPCI100
index f9fe5b6ea..f9fe5b6ea 100644
--- a/baseconfig/arm/CONFIG_PCI_FTPCI100
+++ b/configs/base-generic/arm/CONFIG_PCI_FTPCI100
diff --git a/baseconfig/arm/CONFIG_PCI_HOST_GENERIC b/configs/base-generic/arm/CONFIG_PCI_HOST_GENERIC
index c9ebcff72..c9ebcff72 100644
--- a/baseconfig/arm/CONFIG_PCI_HOST_GENERIC
+++ b/configs/base-generic/arm/CONFIG_PCI_HOST_GENERIC
diff --git a/baseconfig/arm/CONFIG_PCI_MVEBU b/configs/base-generic/arm/CONFIG_PCI_MVEBU
index 3b34c5236..3b34c5236 100644
--- a/baseconfig/arm/CONFIG_PCI_MVEBU
+++ b/configs/base-generic/arm/CONFIG_PCI_MVEBU
diff --git a/baseconfig/arm/CONFIG_PCI_TEGRA b/configs/base-generic/arm/CONFIG_PCI_TEGRA
index 35d7eb505..35d7eb505 100644
--- a/baseconfig/arm/CONFIG_PCI_TEGRA
+++ b/configs/base-generic/arm/CONFIG_PCI_TEGRA
diff --git a/baseconfig/arm/CONFIG_PCMCIA b/configs/base-generic/arm/CONFIG_PCMCIA
index 3cf9bfbdc..3cf9bfbdc 100644
--- a/baseconfig/arm/CONFIG_PCMCIA
+++ b/configs/base-generic/arm/CONFIG_PCMCIA
diff --git a/baseconfig/arm/CONFIG_PHY_MESON8B_USB2 b/configs/base-generic/arm/CONFIG_PHY_MESON8B_USB2
index b238f12dc..b238f12dc 100644
--- a/baseconfig/arm/CONFIG_PHY_MESON8B_USB2
+++ b/configs/base-generic/arm/CONFIG_PHY_MESON8B_USB2
diff --git a/baseconfig/arm/CONFIG_PHY_MESON_GXL_USB2 b/configs/base-generic/arm/CONFIG_PHY_MESON_GXL_USB2
index ed8e9c323..ed8e9c323 100644
--- a/baseconfig/arm/CONFIG_PHY_MESON_GXL_USB2
+++ b/configs/base-generic/arm/CONFIG_PHY_MESON_GXL_USB2
diff --git a/baseconfig/arm/CONFIG_PHY_MVEBU_SATA b/configs/base-generic/arm/CONFIG_PHY_MVEBU_SATA
index 4266094cc..4266094cc 100644
--- a/baseconfig/arm/CONFIG_PHY_MVEBU_SATA
+++ b/configs/base-generic/arm/CONFIG_PHY_MVEBU_SATA
diff --git a/baseconfig/arm/CONFIG_PHY_QCOM_IPQ806X_SATA b/configs/base-generic/arm/CONFIG_PHY_QCOM_IPQ806X_SATA
index 360f73927..360f73927 100644
--- a/baseconfig/arm/CONFIG_PHY_QCOM_IPQ806X_SATA
+++ b/configs/base-generic/arm/CONFIG_PHY_QCOM_IPQ806X_SATA
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_DP b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_DP
index a01dec5ee..a01dec5ee 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_DP
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_DP
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_EMMC b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_EMMC
index 1ccd44a5c..1ccd44a5c 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_EMMC
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_EMMC
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_INNO_USB2 b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_INNO_USB2
index 3f1f3008a..3f1f3008a 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_INNO_USB2
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_INNO_USB2
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_PCIE b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_PCIE
index 20fb6074b..20fb6074b 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_PCIE
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_PCIE
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_TYPEC b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_TYPEC
index 3c936af0f..3c936af0f 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_TYPEC
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_TYPEC
diff --git a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_USB b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_USB
index 5bceaa681..5bceaa681 100644
--- a/baseconfig/arm/CONFIG_PHY_ROCKCHIP_USB
+++ b/configs/base-generic/arm/CONFIG_PHY_ROCKCHIP_USB
diff --git a/baseconfig/arm/CONFIG_PHY_SAMSUNG_USB2 b/configs/base-generic/arm/CONFIG_PHY_SAMSUNG_USB2
index fed8349fb..fed8349fb 100644
--- a/baseconfig/arm/CONFIG_PHY_SAMSUNG_USB2
+++ b/configs/base-generic/arm/CONFIG_PHY_SAMSUNG_USB2
diff --git a/baseconfig/arm/CONFIG_PHY_TEGRA_XUSB b/configs/base-generic/arm/CONFIG_PHY_TEGRA_XUSB
index 2631ba0ae..2631ba0ae 100644
--- a/baseconfig/arm/CONFIG_PHY_TEGRA_XUSB
+++ b/configs/base-generic/arm/CONFIG_PHY_TEGRA_XUSB
diff --git a/baseconfig/arm/CONFIG_PID_IN_CONTEXTIDR b/configs/base-generic/arm/CONFIG_PID_IN_CONTEXTIDR
index 8083b7778..8083b7778 100644
--- a/baseconfig/arm/CONFIG_PID_IN_CONTEXTIDR
+++ b/configs/base-generic/arm/CONFIG_PID_IN_CONTEXTIDR
diff --git a/baseconfig/arm/CONFIG_PINCONF b/configs/base-generic/arm/CONFIG_PINCONF
index 2f04b24a4..2f04b24a4 100644
--- a/baseconfig/arm/CONFIG_PINCONF
+++ b/configs/base-generic/arm/CONFIG_PINCONF
diff --git a/baseconfig/arm/CONFIG_PINCTRL b/configs/base-generic/arm/CONFIG_PINCTRL
index d8d83d561..d8d83d561 100644
--- a/baseconfig/arm/CONFIG_PINCTRL
+++ b/configs/base-generic/arm/CONFIG_PINCTRL
diff --git a/baseconfig/arm/CONFIG_PINCTRL_BAYTRAIL b/configs/base-generic/arm/CONFIG_PINCTRL_BAYTRAIL
index 5b3337f53..5b3337f53 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_BAYTRAIL
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_BAYTRAIL
diff --git a/baseconfig/arm/CONFIG_PINCTRL_BROXTON b/configs/base-generic/arm/CONFIG_PINCTRL_BROXTON
index 08af2a44b..08af2a44b 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_BROXTON
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_BROXTON
diff --git a/baseconfig/arm/CONFIG_PINCTRL_CHERRYVIEW b/configs/base-generic/arm/CONFIG_PINCTRL_CHERRYVIEW
index 6a7cb75e5..6a7cb75e5 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_CHERRYVIEW
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_CHERRYVIEW
diff --git a/baseconfig/arm/CONFIG_PINCTRL_GEMINILAKE b/configs/base-generic/arm/CONFIG_PINCTRL_GEMINILAKE
index deb3b301d..deb3b301d 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_GEMINILAKE
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_GEMINILAKE
diff --git a/baseconfig/arm/CONFIG_PINCTRL_IPQ4019 b/configs/base-generic/arm/CONFIG_PINCTRL_IPQ4019
index 5ace1b877..5ace1b877 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_IPQ4019
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_IPQ4019
diff --git a/baseconfig/arm/CONFIG_PINCTRL_IPQ8064 b/configs/base-generic/arm/CONFIG_PINCTRL_IPQ8064
index bcbab4047..bcbab4047 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_IPQ8064
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_IPQ8064
diff --git a/baseconfig/arm/CONFIG_PINCTRL_MSM8994 b/configs/base-generic/arm/CONFIG_PINCTRL_MSM8994
index 977b1c3c4..977b1c3c4 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_MSM8994
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_MSM8994
diff --git a/baseconfig/arm/CONFIG_PINCTRL_MVEBU b/configs/base-generic/arm/CONFIG_PINCTRL_MVEBU
index 2ce957ec0..2ce957ec0 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_MVEBU
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_MVEBU
diff --git a/baseconfig/arm/CONFIG_PINCTRL_SINGLE b/configs/base-generic/arm/CONFIG_PINCTRL_SINGLE
index 7fbc98bd9..7fbc98bd9 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_SINGLE
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_SINGLE
diff --git a/baseconfig/arm/CONFIG_PINCTRL_SUNRISEPOINT b/configs/base-generic/arm/CONFIG_PINCTRL_SUNRISEPOINT
index 65dae4805..65dae4805 100644
--- a/baseconfig/arm/CONFIG_PINCTRL_SUNRISEPOINT
+++ b/configs/base-generic/arm/CONFIG_PINCTRL_SUNRISEPOINT
diff --git a/baseconfig/arm/CONFIG_PINMUX b/configs/base-generic/arm/CONFIG_PINMUX
index 2e704c683..2e704c683 100644
--- a/baseconfig/arm/CONFIG_PINMUX
+++ b/configs/base-generic/arm/CONFIG_PINMUX
diff --git a/baseconfig/arm/CONFIG_PL320_MBOX b/configs/base-generic/arm/CONFIG_PL320_MBOX
index 1cdbb24bb..1cdbb24bb 100644
--- a/baseconfig/arm/CONFIG_PL320_MBOX
+++ b/configs/base-generic/arm/CONFIG_PL320_MBOX
diff --git a/baseconfig/arm/CONFIG_PL330_DMA b/configs/base-generic/arm/CONFIG_PL330_DMA
index 2098a02d7..2098a02d7 100644
--- a/baseconfig/arm/CONFIG_PL330_DMA
+++ b/configs/base-generic/arm/CONFIG_PL330_DMA
diff --git a/baseconfig/arm/CONFIG_PLATFORM_MHU b/configs/base-generic/arm/CONFIG_PLATFORM_MHU
index 4c29f9874..4c29f9874 100644
--- a/baseconfig/arm/CONFIG_PLATFORM_MHU
+++ b/configs/base-generic/arm/CONFIG_PLATFORM_MHU
diff --git a/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT b/configs/base-generic/arm/CONFIG_PM_DEVFREQ_EVENT
index af91a2b50..af91a2b50 100644
--- a/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT
+++ b/configs/base-generic/arm/CONFIG_PM_DEVFREQ_EVENT
diff --git a/baseconfig/arm/CONFIG_PM_GENERIC_DOMAINS_OF b/configs/base-generic/arm/CONFIG_PM_GENERIC_DOMAINS_OF
index e878dafb6..e878dafb6 100644
--- a/baseconfig/arm/CONFIG_PM_GENERIC_DOMAINS_OF
+++ b/configs/base-generic/arm/CONFIG_PM_GENERIC_DOMAINS_OF
diff --git a/baseconfig/arm/CONFIG_PM_OPP b/configs/base-generic/arm/CONFIG_PM_OPP
index bbe2b56ba..bbe2b56ba 100644
--- a/baseconfig/arm/CONFIG_PM_OPP
+++ b/configs/base-generic/arm/CONFIG_PM_OPP
diff --git a/baseconfig/arm/CONFIG_POWER_AVS b/configs/base-generic/arm/CONFIG_POWER_AVS
index f58c71a0d..f58c71a0d 100644
--- a/baseconfig/arm/CONFIG_POWER_AVS
+++ b/configs/base-generic/arm/CONFIG_POWER_AVS
diff --git a/baseconfig/arm/CONFIG_POWER_RESET_GPIO b/configs/base-generic/arm/CONFIG_POWER_RESET_GPIO
index dac784d6c..dac784d6c 100644
--- a/baseconfig/arm/CONFIG_POWER_RESET_GPIO
+++ b/configs/base-generic/arm/CONFIG_POWER_RESET_GPIO
diff --git a/baseconfig/arm/CONFIG_POWER_RESET_GPIO_RESTART b/configs/base-generic/arm/CONFIG_POWER_RESET_GPIO_RESTART
index cb0a3228b..cb0a3228b 100644
--- a/baseconfig/arm/CONFIG_POWER_RESET_GPIO_RESTART
+++ b/configs/base-generic/arm/CONFIG_POWER_RESET_GPIO_RESTART
diff --git a/baseconfig/arm/CONFIG_POWER_RESET_RESTART b/configs/base-generic/arm/CONFIG_POWER_RESET_RESTART
index 5b8c6398d..5b8c6398d 100644
--- a/baseconfig/arm/CONFIG_POWER_RESET_RESTART
+++ b/configs/base-generic/arm/CONFIG_POWER_RESET_RESTART
diff --git a/baseconfig/arm/CONFIG_POWER_RESET_VERSATILE b/configs/base-generic/arm/CONFIG_POWER_RESET_VERSATILE
index aa2f07622..aa2f07622 100644
--- a/baseconfig/arm/CONFIG_POWER_RESET_VERSATILE
+++ b/configs/base-generic/arm/CONFIG_POWER_RESET_VERSATILE
diff --git a/baseconfig/arm/CONFIG_POWER_RESET_VEXPRESS b/configs/base-generic/arm/CONFIG_POWER_RESET_VEXPRESS
index b311a55fd..b311a55fd 100644
--- a/baseconfig/arm/CONFIG_POWER_RESET_VEXPRESS
+++ b/configs/base-generic/arm/CONFIG_POWER_RESET_VEXPRESS
diff --git a/baseconfig/arm/CONFIG_PWM b/configs/base-generic/arm/CONFIG_PWM
index 346c909b6..346c909b6 100644
--- a/baseconfig/arm/CONFIG_PWM
+++ b/configs/base-generic/arm/CONFIG_PWM
diff --git a/baseconfig/arm/CONFIG_PWM_BCM2835 b/configs/base-generic/arm/CONFIG_PWM_BCM2835
index b8b78e661..b8b78e661 100644
--- a/baseconfig/arm/CONFIG_PWM_BCM2835
+++ b/configs/base-generic/arm/CONFIG_PWM_BCM2835
diff --git a/baseconfig/arm/CONFIG_PWM_CROS_EC b/configs/base-generic/arm/CONFIG_PWM_CROS_EC
index b3e721134..b3e721134 100644
--- a/baseconfig/arm/CONFIG_PWM_CROS_EC
+++ b/configs/base-generic/arm/CONFIG_PWM_CROS_EC
diff --git a/baseconfig/arm/CONFIG_PWM_FSL_FTM b/configs/base-generic/arm/CONFIG_PWM_FSL_FTM
index 8bd1025ee..8bd1025ee 100644
--- a/baseconfig/arm/CONFIG_PWM_FSL_FTM
+++ b/configs/base-generic/arm/CONFIG_PWM_FSL_FTM
diff --git a/baseconfig/arm/CONFIG_PWM_MESON b/configs/base-generic/arm/CONFIG_PWM_MESON
index bc2a778e3..bc2a778e3 100644
--- a/baseconfig/arm/CONFIG_PWM_MESON
+++ b/configs/base-generic/arm/CONFIG_PWM_MESON
diff --git a/baseconfig/arm/CONFIG_PWM_ROCKCHIP b/configs/base-generic/arm/CONFIG_PWM_ROCKCHIP
index 840ed056a..840ed056a 100644
--- a/baseconfig/arm/CONFIG_PWM_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_PWM_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_PWM_SYSFS b/configs/base-generic/arm/CONFIG_PWM_SYSFS
index 27e302076..27e302076 100644
--- a/baseconfig/arm/CONFIG_PWM_SYSFS
+++ b/configs/base-generic/arm/CONFIG_PWM_SYSFS
diff --git a/baseconfig/arm/CONFIG_PWM_TEGRA b/configs/base-generic/arm/CONFIG_PWM_TEGRA
index 8751d2ead..8751d2ead 100644
--- a/baseconfig/arm/CONFIG_PWM_TEGRA
+++ b/configs/base-generic/arm/CONFIG_PWM_TEGRA
diff --git a/baseconfig/arm/CONFIG_PWRSEQ_EMMC b/configs/base-generic/arm/CONFIG_PWRSEQ_EMMC
index 29e883d93..29e883d93 100644
--- a/baseconfig/arm/CONFIG_PWRSEQ_EMMC
+++ b/configs/base-generic/arm/CONFIG_PWRSEQ_EMMC
diff --git a/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE b/configs/base-generic/arm/CONFIG_PWRSEQ_SIMPLE
index 7c8ad9b8a..7c8ad9b8a 100644
--- a/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE
+++ b/configs/base-generic/arm/CONFIG_PWRSEQ_SIMPLE
diff --git a/baseconfig/arm/CONFIG_QORIQ_CPUFREQ b/configs/base-generic/arm/CONFIG_QORIQ_CPUFREQ
index e8e355ba3..e8e355ba3 100644
--- a/baseconfig/arm/CONFIG_QORIQ_CPUFREQ
+++ b/configs/base-generic/arm/CONFIG_QORIQ_CPUFREQ
diff --git a/baseconfig/arm/CONFIG_QORIQ_THERMAL b/configs/base-generic/arm/CONFIG_QORIQ_THERMAL
index f9ab12959..f9ab12959 100644
--- a/baseconfig/arm/CONFIG_QORIQ_THERMAL
+++ b/configs/base-generic/arm/CONFIG_QORIQ_THERMAL
diff --git a/baseconfig/arm/CONFIG_QRTR b/configs/base-generic/arm/CONFIG_QRTR
index 19f911ca5..19f911ca5 100644
--- a/baseconfig/arm/CONFIG_QRTR
+++ b/configs/base-generic/arm/CONFIG_QRTR
diff --git a/baseconfig/arm/CONFIG_RASPBERRYPI_FIRMWARE b/configs/base-generic/arm/CONFIG_RASPBERRYPI_FIRMWARE
index 6c1b34d99..6c1b34d99 100644
--- a/baseconfig/arm/CONFIG_RASPBERRYPI_FIRMWARE
+++ b/configs/base-generic/arm/CONFIG_RASPBERRYPI_FIRMWARE
diff --git a/baseconfig/arm/CONFIG_RASPBERRYPI_POWER b/configs/base-generic/arm/CONFIG_RASPBERRYPI_POWER
index 1c8ef1072..1c8ef1072 100644
--- a/baseconfig/arm/CONFIG_RASPBERRYPI_POWER
+++ b/configs/base-generic/arm/CONFIG_RASPBERRYPI_POWER
diff --git a/baseconfig/arm/CONFIG_RCU_FANOUT_LEAF b/configs/base-generic/arm/CONFIG_RCU_FANOUT_LEAF
index 147351a49..147351a49 100644
--- a/baseconfig/arm/CONFIG_RCU_FANOUT_LEAF
+++ b/configs/base-generic/arm/CONFIG_RCU_FANOUT_LEAF
diff --git a/baseconfig/arm/CONFIG_RDS b/configs/base-generic/arm/CONFIG_RDS
index ba0653e70..ba0653e70 100644
--- a/baseconfig/arm/CONFIG_RDS
+++ b/configs/base-generic/arm/CONFIG_RDS
diff --git a/baseconfig/arm/CONFIG_REGMAP_I2C b/configs/base-generic/arm/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/arm/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/arm/CONFIG_REGMAP_I2C
diff --git a/baseconfig/arm/CONFIG_REGULATOR b/configs/base-generic/arm/CONFIG_REGULATOR
index 5b7c35c8f..5b7c35c8f 100644
--- a/baseconfig/arm/CONFIG_REGULATOR
+++ b/configs/base-generic/arm/CONFIG_REGULATOR
diff --git a/baseconfig/arm/CONFIG_REGULATOR_ACT8865 b/configs/base-generic/arm/CONFIG_REGULATOR_ACT8865
index 112956dbf..112956dbf 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_ACT8865
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_ACT8865
diff --git a/baseconfig/arm/CONFIG_REGULATOR_AD5398 b/configs/base-generic/arm/CONFIG_REGULATOR_AD5398
index 83b596823..83b596823 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_AD5398
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_AD5398
diff --git a/baseconfig/arm/CONFIG_REGULATOR_ANATOP b/configs/base-generic/arm/CONFIG_REGULATOR_ANATOP
index 909e86360..909e86360 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_ANATOP
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_ANATOP
diff --git a/baseconfig/arm/CONFIG_REGULATOR_DA9210 b/configs/base-generic/arm/CONFIG_REGULATOR_DA9210
index ed858d92d..ed858d92d 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_DA9210
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_DA9210
diff --git a/baseconfig/arm/CONFIG_REGULATOR_DA9211 b/configs/base-generic/arm/CONFIG_REGULATOR_DA9211
index 5f4b883da..5f4b883da 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_DA9211
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_DA9211
diff --git a/baseconfig/arm/CONFIG_REGULATOR_FAN53555 b/configs/base-generic/arm/CONFIG_REGULATOR_FAN53555
index 3f2a9b30f..3f2a9b30f 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_FAN53555
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_FAN53555
diff --git a/baseconfig/arm/CONFIG_REGULATOR_FIXED_VOLTAGE b/configs/base-generic/arm/CONFIG_REGULATOR_FIXED_VOLTAGE
index d4ef92729..d4ef92729 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_FIXED_VOLTAGE
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_FIXED_VOLTAGE
diff --git a/baseconfig/arm/CONFIG_REGULATOR_GPIO b/configs/base-generic/arm/CONFIG_REGULATOR_GPIO
index fb17a24d4..fb17a24d4 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_GPIO
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_GPIO
diff --git a/baseconfig/arm/CONFIG_REGULATOR_ISL6271A b/configs/base-generic/arm/CONFIG_REGULATOR_ISL6271A
index f2507c882..f2507c882 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_ISL6271A
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_ISL6271A
diff --git a/baseconfig/arm/CONFIG_REGULATOR_ISL9305 b/configs/base-generic/arm/CONFIG_REGULATOR_ISL9305
index 70ade2e4d..70ade2e4d 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_ISL9305
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_ISL9305
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LP3971 b/configs/base-generic/arm/CONFIG_REGULATOR_LP3971
index e5bd8a9e8..e5bd8a9e8 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LP3971
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LP3971
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LP3972 b/configs/base-generic/arm/CONFIG_REGULATOR_LP3972
index 3820f4be8..3820f4be8 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LP3972
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LP3972
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LP872X b/configs/base-generic/arm/CONFIG_REGULATOR_LP872X
index a41e5d369..a41e5d369 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LP872X
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LP872X
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LP8755 b/configs/base-generic/arm/CONFIG_REGULATOR_LP8755
index 3d3d38b77..3d3d38b77 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LP8755
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LP8755
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LTC3589 b/configs/base-generic/arm/CONFIG_REGULATOR_LTC3589
index d14c63b54..d14c63b54 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LTC3589
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LTC3589
diff --git a/baseconfig/arm/CONFIG_REGULATOR_LTC3676 b/configs/base-generic/arm/CONFIG_REGULATOR_LTC3676
index a8f50af1c..a8f50af1c 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_LTC3676
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_LTC3676
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX1586 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX1586
index a97539613..a97539613 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX1586
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX1586
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX77686 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX77686
index 69bd2bdd7..69bd2bdd7 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX77686
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX77686
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX77802 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX77802
index 3f55c214c..3f55c214c 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX77802
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX77802
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX8649 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8649
index 79620946a..79620946a 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX8649
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8649
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX8660 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8660
index 6b033e3b6..6b033e3b6 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX8660
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8660
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX8952 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8952
index f8346c0fc..f8346c0fc 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX8952
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8952
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MAX8973 b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8973
index 27d82cb78..27d82cb78 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MAX8973
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MAX8973
diff --git a/baseconfig/arm/CONFIG_REGULATOR_MT6311 b/configs/base-generic/arm/CONFIG_REGULATOR_MT6311
index 884c0d452..884c0d452 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_MT6311
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_MT6311
diff --git a/baseconfig/arm/CONFIG_REGULATOR_PFUZE100 b/configs/base-generic/arm/CONFIG_REGULATOR_PFUZE100
index 726541598..726541598 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_PFUZE100
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_PFUZE100
diff --git a/baseconfig/arm/CONFIG_REGULATOR_PV88060 b/configs/base-generic/arm/CONFIG_REGULATOR_PV88060
index 6c69caa24..6c69caa24 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_PV88060
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_PV88060
diff --git a/baseconfig/arm/CONFIG_REGULATOR_PV88080 b/configs/base-generic/arm/CONFIG_REGULATOR_PV88080
index 4b024f4ba..4b024f4ba 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_PV88080
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_PV88080
diff --git a/baseconfig/arm/CONFIG_REGULATOR_PV88090 b/configs/base-generic/arm/CONFIG_REGULATOR_PV88090
index 009707021..009707021 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_PV88090
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_PV88090
diff --git a/baseconfig/arm/CONFIG_REGULATOR_PWM b/configs/base-generic/arm/CONFIG_REGULATOR_PWM
index e41417821..e41417821 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_PWM
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_PWM
diff --git a/baseconfig/arm/CONFIG_REGULATOR_RK808 b/configs/base-generic/arm/CONFIG_REGULATOR_RK808
index 171bdf44e..171bdf44e 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_RK808
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_RK808
diff --git a/baseconfig/arm/CONFIG_REGULATOR_TPS51632 b/configs/base-generic/arm/CONFIG_REGULATOR_TPS51632
index b586678e3..b586678e3 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_TPS51632
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_TPS51632
diff --git a/baseconfig/arm/CONFIG_REGULATOR_TPS62360 b/configs/base-generic/arm/CONFIG_REGULATOR_TPS62360
index b6904c247..b6904c247 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_TPS62360
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_TPS62360
diff --git a/baseconfig/arm/CONFIG_REGULATOR_TPS65023 b/configs/base-generic/arm/CONFIG_REGULATOR_TPS65023
index 7e5697b53..7e5697b53 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_TPS65023
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_TPS65023
diff --git a/baseconfig/arm/CONFIG_REGULATOR_TPS6507X b/configs/base-generic/arm/CONFIG_REGULATOR_TPS6507X
index bcb7b9d40..bcb7b9d40 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_TPS6507X
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_TPS6507X
diff --git a/baseconfig/arm/CONFIG_REGULATOR_TPS6524X b/configs/base-generic/arm/CONFIG_REGULATOR_TPS6524X
index a7363878b..a7363878b 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_TPS6524X
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_TPS6524X
diff --git a/baseconfig/arm/CONFIG_REGULATOR_USERSPACE_CONSUMER b/configs/base-generic/arm/CONFIG_REGULATOR_USERSPACE_CONSUMER
index dec152183..dec152183 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_USERSPACE_CONSUMER
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_USERSPACE_CONSUMER
diff --git a/baseconfig/arm/CONFIG_REGULATOR_VEXPRESS b/configs/base-generic/arm/CONFIG_REGULATOR_VEXPRESS
index e673cf906..e673cf906 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_VEXPRESS
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_VEXPRESS
diff --git a/baseconfig/arm/CONFIG_REGULATOR_VIRTUAL_CONSUMER b/configs/base-generic/arm/CONFIG_REGULATOR_VIRTUAL_CONSUMER
index f0bb34cf6..f0bb34cf6 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_VIRTUAL_CONSUMER
+++ b/configs/base-generic/arm/CONFIG_REGULATOR_VIRTUAL_CONSUMER
diff --git a/baseconfig/arm/CONFIG_RESET_CONTROLLER b/configs/base-generic/arm/CONFIG_RESET_CONTROLLER
index a268c67a9..a268c67a9 100644
--- a/baseconfig/arm/CONFIG_RESET_CONTROLLER
+++ b/configs/base-generic/arm/CONFIG_RESET_CONTROLLER
diff --git a/baseconfig/arm/CONFIG_RESET_GPIO b/configs/base-generic/arm/CONFIG_RESET_GPIO
index ce7f81995..ce7f81995 100644
--- a/baseconfig/arm/CONFIG_RESET_GPIO
+++ b/configs/base-generic/arm/CONFIG_RESET_GPIO
diff --git a/baseconfig/arm/CONFIG_RESET_TI_SCI b/configs/base-generic/arm/CONFIG_RESET_TI_SCI
index 2a2526769..2a2526769 100644
--- a/baseconfig/arm/CONFIG_RESET_TI_SCI
+++ b/configs/base-generic/arm/CONFIG_RESET_TI_SCI
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP b/configs/base-generic/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
index 4f8576d47..4f8576d47 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_ANALOGIX_DP
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP b/configs/base-generic/arm/CONFIG_ROCKCHIP_CDN_DP
index 86d2137bd..86d2137bd 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_CDN_DP
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI b/configs/base-generic/arm/CONFIG_ROCKCHIP_DW_HDMI
index 80c330104..80c330104 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_DW_HDMI
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_DW_HDMI
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI b/configs/base-generic/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
index 6c00423c8..6c00423c8 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_DW_MIPI_DSI
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_EFUSE b/configs/base-generic/arm/CONFIG_ROCKCHIP_EFUSE
index eddd102f3..eddd102f3 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_EFUSE
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_EFUSE
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI b/configs/base-generic/arm/CONFIG_ROCKCHIP_INNO_HDMI
index 50cf998df..50cf998df 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_INNO_HDMI
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_INNO_HDMI
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_IODOMAIN b/configs/base-generic/arm/CONFIG_ROCKCHIP_IODOMAIN
index 33e2f5572..33e2f5572 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_IODOMAIN
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_IODOMAIN
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_IOMMU b/configs/base-generic/arm/CONFIG_ROCKCHIP_IOMMU
index dd652bc9f..dd652bc9f 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_IOMMU
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_IOMMU
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_MBOX b/configs/base-generic/arm/CONFIG_ROCKCHIP_MBOX
index 167dd2158..167dd2158 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_MBOX
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_MBOX
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_PHY b/configs/base-generic/arm/CONFIG_ROCKCHIP_PHY
index e49faf8f9..e49faf8f9 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_PHY
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_PHY
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_PM_DOMAINS b/configs/base-generic/arm/CONFIG_ROCKCHIP_PM_DOMAINS
index fe406daff..fe406daff 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_PM_DOMAINS
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_PM_DOMAINS
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_SARADC b/configs/base-generic/arm/CONFIG_ROCKCHIP_SARADC
index 4c425a33c..4c425a33c 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_SARADC
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_SARADC
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_THERMAL b/configs/base-generic/arm/CONFIG_ROCKCHIP_THERMAL
index 9e6b6f65d..9e6b6f65d 100644
--- a/baseconfig/arm/CONFIG_ROCKCHIP_THERMAL
+++ b/configs/base-generic/arm/CONFIG_ROCKCHIP_THERMAL
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_88PM80X b/configs/base-generic/arm/CONFIG_RTC_DRV_88PM80X
index 105a0dcdd..105a0dcdd 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_88PM80X
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_88PM80X
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_AC100 b/configs/base-generic/arm/CONFIG_RTC_DRV_AC100
index 3fbf952f3..3fbf952f3 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_AC100
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_AC100
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_ARMADA38X b/configs/base-generic/arm/CONFIG_RTC_DRV_ARMADA38X
index 7dcdafcbb..7dcdafcbb 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_ARMADA38X
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_ARMADA38X
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_HYM8563 b/configs/base-generic/arm/CONFIG_RTC_DRV_HYM8563
index 2ee14f5f3..2ee14f5f3 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_HYM8563
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_HYM8563
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_ISL12057 b/configs/base-generic/arm/CONFIG_RTC_DRV_ISL12057
index b04911d4c..b04911d4c 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_ISL12057
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_ISL12057
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_MAX77686 b/configs/base-generic/arm/CONFIG_RTC_DRV_MAX77686
index 509fab55c..509fab55c 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_MAX77686
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_MAX77686
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_MV b/configs/base-generic/arm/CONFIG_RTC_DRV_MV
index ce73027e6..ce73027e6 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_MV
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_MV
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_PL031 b/configs/base-generic/arm/CONFIG_RTC_DRV_PL031
index 42990f0de..42990f0de 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_PL031
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_PL031
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_RK808 b/configs/base-generic/arm/CONFIG_RTC_DRV_RK808
index 6e0366f7f..6e0366f7f 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_RK808
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_RK808
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_S35390A b/configs/base-generic/arm/CONFIG_RTC_DRV_S35390A
index 30976fd26..30976fd26 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_S35390A
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_S35390A
diff --git a/baseconfig/arm/CONFIG_RTC_DRV_TEGRA b/configs/base-generic/arm/CONFIG_RTC_DRV_TEGRA
index cae8095d2..cae8095d2 100644
--- a/baseconfig/arm/CONFIG_RTC_DRV_TEGRA
+++ b/configs/base-generic/arm/CONFIG_RTC_DRV_TEGRA
diff --git a/baseconfig/arm/CONFIG_SATA_INIC162X b/configs/base-generic/arm/CONFIG_SATA_INIC162X
index 6abf495a0..6abf495a0 100644
--- a/baseconfig/arm/CONFIG_SATA_INIC162X
+++ b/configs/base-generic/arm/CONFIG_SATA_INIC162X
diff --git a/baseconfig/arm/CONFIG_SATA_NV b/configs/base-generic/arm/CONFIG_SATA_NV
index c8419327a..c8419327a 100644
--- a/baseconfig/arm/CONFIG_SATA_NV
+++ b/configs/base-generic/arm/CONFIG_SATA_NV
diff --git a/baseconfig/arm/CONFIG_SATA_PROMISE b/configs/base-generic/arm/CONFIG_SATA_PROMISE
index 2af59fe8e..2af59fe8e 100644
--- a/baseconfig/arm/CONFIG_SATA_PROMISE
+++ b/configs/base-generic/arm/CONFIG_SATA_PROMISE
diff --git a/baseconfig/arm/CONFIG_SATA_QSTOR b/configs/base-generic/arm/CONFIG_SATA_QSTOR
index 8b3cce9ab..8b3cce9ab 100644
--- a/baseconfig/arm/CONFIG_SATA_QSTOR
+++ b/configs/base-generic/arm/CONFIG_SATA_QSTOR
diff --git a/baseconfig/arm/CONFIG_SATA_SIL b/configs/base-generic/arm/CONFIG_SATA_SIL
index 5d551ee6a..5d551ee6a 100644
--- a/baseconfig/arm/CONFIG_SATA_SIL
+++ b/configs/base-generic/arm/CONFIG_SATA_SIL
diff --git a/baseconfig/arm/CONFIG_SATA_SIL24 b/configs/base-generic/arm/CONFIG_SATA_SIL24
index 7526a06a0..7526a06a0 100644
--- a/baseconfig/arm/CONFIG_SATA_SIL24
+++ b/configs/base-generic/arm/CONFIG_SATA_SIL24
diff --git a/baseconfig/arm/CONFIG_SATA_SIS b/configs/base-generic/arm/CONFIG_SATA_SIS
index 1cd4ae75f..1cd4ae75f 100644
--- a/baseconfig/arm/CONFIG_SATA_SIS
+++ b/configs/base-generic/arm/CONFIG_SATA_SIS
diff --git a/baseconfig/arm/CONFIG_SATA_SVW b/configs/base-generic/arm/CONFIG_SATA_SVW
index 625275c8d..625275c8d 100644
--- a/baseconfig/arm/CONFIG_SATA_SVW
+++ b/configs/base-generic/arm/CONFIG_SATA_SVW
diff --git a/baseconfig/arm/CONFIG_SATA_SX4 b/configs/base-generic/arm/CONFIG_SATA_SX4
index abbd89112..abbd89112 100644
--- a/baseconfig/arm/CONFIG_SATA_SX4
+++ b/configs/base-generic/arm/CONFIG_SATA_SX4
diff --git a/baseconfig/arm/CONFIG_SATA_ULI b/configs/base-generic/arm/CONFIG_SATA_ULI
index b50271fc3..b50271fc3 100644
--- a/baseconfig/arm/CONFIG_SATA_ULI
+++ b/configs/base-generic/arm/CONFIG_SATA_ULI
diff --git a/baseconfig/arm/CONFIG_SATA_VIA b/configs/base-generic/arm/CONFIG_SATA_VIA
index f5754463a..f5754463a 100644
--- a/baseconfig/arm/CONFIG_SATA_VIA
+++ b/configs/base-generic/arm/CONFIG_SATA_VIA
diff --git a/baseconfig/arm/CONFIG_SATA_VITESSE b/configs/base-generic/arm/CONFIG_SATA_VITESSE
index 59856ec7b..59856ec7b 100644
--- a/baseconfig/arm/CONFIG_SATA_VITESSE
+++ b/configs/base-generic/arm/CONFIG_SATA_VITESSE
diff --git a/baseconfig/arm/CONFIG_SCHED_MC b/configs/base-generic/arm/CONFIG_SCHED_MC
index 348674403..348674403 100644
--- a/baseconfig/arm/CONFIG_SCHED_MC
+++ b/configs/base-generic/arm/CONFIG_SCHED_MC
diff --git a/baseconfig/arm/CONFIG_SCHED_SMT b/configs/base-generic/arm/CONFIG_SCHED_SMT
index ed3f04a20..ed3f04a20 100644
--- a/baseconfig/arm/CONFIG_SCHED_SMT
+++ b/configs/base-generic/arm/CONFIG_SCHED_SMT
diff --git a/baseconfig/arm/CONFIG_SCSI_3W_9XXX b/configs/base-generic/arm/CONFIG_SCSI_3W_9XXX
index 00de6f158..00de6f158 100644
--- a/baseconfig/arm/CONFIG_SCSI_3W_9XXX
+++ b/configs/base-generic/arm/CONFIG_SCSI_3W_9XXX
diff --git a/baseconfig/arm/CONFIG_SCSI_3W_SAS b/configs/base-generic/arm/CONFIG_SCSI_3W_SAS
index 06a89f918..06a89f918 100644
--- a/baseconfig/arm/CONFIG_SCSI_3W_SAS
+++ b/configs/base-generic/arm/CONFIG_SCSI_3W_SAS
diff --git a/baseconfig/arm/CONFIG_SCSI_AACRAID b/configs/base-generic/arm/CONFIG_SCSI_AACRAID
index 5686e689d..5686e689d 100644
--- a/baseconfig/arm/CONFIG_SCSI_AACRAID
+++ b/configs/base-generic/arm/CONFIG_SCSI_AACRAID
diff --git a/baseconfig/arm/CONFIG_SCSI_ACARD b/configs/base-generic/arm/CONFIG_SCSI_ACARD
index d4002ddd0..d4002ddd0 100644
--- a/baseconfig/arm/CONFIG_SCSI_ACARD
+++ b/configs/base-generic/arm/CONFIG_SCSI_ACARD
diff --git a/baseconfig/arm/CONFIG_SCSI_AIC79XX b/configs/base-generic/arm/CONFIG_SCSI_AIC79XX
index 801fade38..801fade38 100644
--- a/baseconfig/arm/CONFIG_SCSI_AIC79XX
+++ b/configs/base-generic/arm/CONFIG_SCSI_AIC79XX
diff --git a/baseconfig/arm/CONFIG_SCSI_AIC7XXX b/configs/base-generic/arm/CONFIG_SCSI_AIC7XXX
index f305031d0..f305031d0 100644
--- a/baseconfig/arm/CONFIG_SCSI_AIC7XXX
+++ b/configs/base-generic/arm/CONFIG_SCSI_AIC7XXX
diff --git a/baseconfig/arm/CONFIG_SCSI_BFA_FC b/configs/base-generic/arm/CONFIG_SCSI_BFA_FC
index 8568e1ec8..8568e1ec8 100644
--- a/baseconfig/arm/CONFIG_SCSI_BFA_FC
+++ b/configs/base-generic/arm/CONFIG_SCSI_BFA_FC
diff --git a/baseconfig/arm/CONFIG_SCSI_IPS b/configs/base-generic/arm/CONFIG_SCSI_IPS
index 32e4abe67..32e4abe67 100644
--- a/baseconfig/arm/CONFIG_SCSI_IPS
+++ b/configs/base-generic/arm/CONFIG_SCSI_IPS
diff --git a/baseconfig/arm/CONFIG_SCSI_MPT2SAS b/configs/base-generic/arm/CONFIG_SCSI_MPT2SAS
index aca3c70c3..aca3c70c3 100644
--- a/baseconfig/arm/CONFIG_SCSI_MPT2SAS
+++ b/configs/base-generic/arm/CONFIG_SCSI_MPT2SAS
diff --git a/baseconfig/arm/CONFIG_SCSI_MPT3SAS b/configs/base-generic/arm/CONFIG_SCSI_MPT3SAS
index 887255096..887255096 100644
--- a/baseconfig/arm/CONFIG_SCSI_MPT3SAS
+++ b/configs/base-generic/arm/CONFIG_SCSI_MPT3SAS
diff --git a/baseconfig/arm/CONFIG_SCSI_PM8001 b/configs/base-generic/arm/CONFIG_SCSI_PM8001
index ddafafd46..ddafafd46 100644
--- a/baseconfig/arm/CONFIG_SCSI_PM8001
+++ b/configs/base-generic/arm/CONFIG_SCSI_PM8001
diff --git a/baseconfig/arm/CONFIG_SENSORS_ARM_SCPI b/configs/base-generic/arm/CONFIG_SENSORS_ARM_SCPI
index 37da65383..37da65383 100644
--- a/baseconfig/arm/CONFIG_SENSORS_ARM_SCPI
+++ b/configs/base-generic/arm/CONFIG_SENSORS_ARM_SCPI
diff --git a/baseconfig/arm/CONFIG_SENSORS_IIO_HWMON b/configs/base-generic/arm/CONFIG_SENSORS_IIO_HWMON
index 74e61a58c..74e61a58c 100644
--- a/baseconfig/arm/CONFIG_SENSORS_IIO_HWMON
+++ b/configs/base-generic/arm/CONFIG_SENSORS_IIO_HWMON
diff --git a/baseconfig/arm/CONFIG_SENSORS_VEXPRESS b/configs/base-generic/arm/CONFIG_SENSORS_VEXPRESS
index a24ba02a8..a24ba02a8 100644
--- a/baseconfig/arm/CONFIG_SENSORS_VEXPRESS
+++ b/configs/base-generic/arm/CONFIG_SENSORS_VEXPRESS
diff --git a/baseconfig/arm/CONFIG_SERIAL_8250_BCM2835AUX b/configs/base-generic/arm/CONFIG_SERIAL_8250_BCM2835AUX
index 1acbb9505..1acbb9505 100644
--- a/baseconfig/arm/CONFIG_SERIAL_8250_BCM2835AUX
+++ b/configs/base-generic/arm/CONFIG_SERIAL_8250_BCM2835AUX
diff --git a/baseconfig/arm/CONFIG_SERIAL_AMBA_PL011 b/configs/base-generic/arm/CONFIG_SERIAL_AMBA_PL011
index 1e7631992..1e7631992 100644
--- a/baseconfig/arm/CONFIG_SERIAL_AMBA_PL011
+++ b/configs/base-generic/arm/CONFIG_SERIAL_AMBA_PL011
diff --git a/baseconfig/arm/CONFIG_SERIAL_AMBA_PL011_CONSOLE b/configs/base-generic/arm/CONFIG_SERIAL_AMBA_PL011_CONSOLE
index 498816601..498816601 100644
--- a/baseconfig/arm/CONFIG_SERIAL_AMBA_PL011_CONSOLE
+++ b/configs/base-generic/arm/CONFIG_SERIAL_AMBA_PL011_CONSOLE
diff --git a/baseconfig/arm/CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST b/configs/base-generic/arm/CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST
index eafcc2f35..eafcc2f35 100644
--- a/baseconfig/arm/CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST
+++ b/configs/base-generic/arm/CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST
diff --git a/baseconfig/arm/CONFIG_SERIAL_IFX6X60 b/configs/base-generic/arm/CONFIG_SERIAL_IFX6X60
index b456384e1..b456384e1 100644
--- a/baseconfig/arm/CONFIG_SERIAL_IFX6X60
+++ b/configs/base-generic/arm/CONFIG_SERIAL_IFX6X60
diff --git a/baseconfig/arm/CONFIG_SERIAL_MAX3100 b/configs/base-generic/arm/CONFIG_SERIAL_MAX3100
index 5fb197ebc..5fb197ebc 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MAX3100
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MAX3100
diff --git a/baseconfig/arm/CONFIG_SERIAL_MAX310X b/configs/base-generic/arm/CONFIG_SERIAL_MAX310X
index 10f39f7fa..10f39f7fa 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MAX310X
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MAX310X
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON b/configs/base-generic/arm/CONFIG_SERIAL_MESON
index aebe1f2c7..aebe1f2c7 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MESON
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MESON
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE b/configs/base-generic/arm/CONFIG_SERIAL_MESON_CONSOLE
index 0b1831e77..0b1831e77 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MESON_CONSOLE
diff --git a/baseconfig/arm/CONFIG_SERIAL_MVEBU_CONSOLE b/configs/base-generic/arm/CONFIG_SERIAL_MVEBU_CONSOLE
index cbd37f60b..cbd37f60b 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MVEBU_CONSOLE
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MVEBU_CONSOLE
diff --git a/baseconfig/arm/CONFIG_SERIAL_MVEBU_UART b/configs/base-generic/arm/CONFIG_SERIAL_MVEBU_UART
index 6129e6a0d..6129e6a0d 100644
--- a/baseconfig/arm/CONFIG_SERIAL_MVEBU_UART
+++ b/configs/base-generic/arm/CONFIG_SERIAL_MVEBU_UART
diff --git a/baseconfig/arm/CONFIG_SERIAL_NONSTANDARD b/configs/base-generic/arm/CONFIG_SERIAL_NONSTANDARD
index 57688cbec..57688cbec 100644
--- a/baseconfig/arm/CONFIG_SERIAL_NONSTANDARD
+++ b/configs/base-generic/arm/CONFIG_SERIAL_NONSTANDARD
diff --git a/baseconfig/arm/CONFIG_SERIAL_OF_PLATFORM b/configs/base-generic/arm/CONFIG_SERIAL_OF_PLATFORM
index 837a43b2e..837a43b2e 100644
--- a/baseconfig/arm/CONFIG_SERIAL_OF_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_SERIAL_OF_PLATFORM
diff --git a/baseconfig/arm/CONFIG_SERIAL_TEGRA b/configs/base-generic/arm/CONFIG_SERIAL_TEGRA
index 712dd5a67..712dd5a67 100644
--- a/baseconfig/arm/CONFIG_SERIAL_TEGRA
+++ b/configs/base-generic/arm/CONFIG_SERIAL_TEGRA
diff --git a/baseconfig/arm/CONFIG_SERIO_AMBAKMI b/configs/base-generic/arm/CONFIG_SERIO_AMBAKMI
index c135f7455..c135f7455 100644
--- a/baseconfig/arm/CONFIG_SERIO_AMBAKMI
+++ b/configs/base-generic/arm/CONFIG_SERIO_AMBAKMI
diff --git a/baseconfig/arm/CONFIG_SMC911X b/configs/base-generic/arm/CONFIG_SMC911X
index 55204b214..55204b214 100644
--- a/baseconfig/arm/CONFIG_SMC911X
+++ b/configs/base-generic/arm/CONFIG_SMC911X
diff --git a/baseconfig/arm/CONFIG_SMC91X b/configs/base-generic/arm/CONFIG_SMC91X
index aeffae17b..aeffae17b 100644
--- a/baseconfig/arm/CONFIG_SMC91X
+++ b/configs/base-generic/arm/CONFIG_SMC91X
diff --git a/baseconfig/arm/CONFIG_SND_AUDIO_GRAPH_CARD b/configs/base-generic/arm/CONFIG_SND_AUDIO_GRAPH_CARD
index 01b3c1590..01b3c1590 100644
--- a/baseconfig/arm/CONFIG_SND_AUDIO_GRAPH_CARD
+++ b/configs/base-generic/arm/CONFIG_SND_AUDIO_GRAPH_CARD
diff --git a/baseconfig/arm/CONFIG_SND_BCM2835_SOC_I2S b/configs/base-generic/arm/CONFIG_SND_BCM2835_SOC_I2S
index bb5b3ce18..bb5b3ce18 100644
--- a/baseconfig/arm/CONFIG_SND_BCM2835_SOC_I2S
+++ b/configs/base-generic/arm/CONFIG_SND_BCM2835_SOC_I2S
diff --git a/baseconfig/arm/CONFIG_SND_HDA_TEGRA b/configs/base-generic/arm/CONFIG_SND_HDA_TEGRA
index b8aaf64b1..b8aaf64b1 100644
--- a/baseconfig/arm/CONFIG_SND_HDA_TEGRA
+++ b/configs/base-generic/arm/CONFIG_SND_HDA_TEGRA
diff --git a/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC b/configs/base-generic/arm/CONFIG_SND_SOC_AC97_CODEC
index f2388a7c0..f2388a7c0 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_AC97_CODEC
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ES8328 b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328
index 806f698e1..806f698e1 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ES8328
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328_I2C
index 9f90cb7e0..9f90cb7e0 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328_I2C
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328_SPI
index 0eb8f755c..0eb8f755c 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ES8328_SPI
diff --git a/baseconfig/arm/CONFIG_SND_SOC_PCM512x b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x
index aae16168c..aae16168c 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_PCM512x
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x
diff --git a/baseconfig/arm/CONFIG_SND_SOC_PCM512x_I2C b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x_I2C
index dc0ba2922..dc0ba2922 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_PCM512x_I2C
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x_I2C
diff --git a/baseconfig/arm/CONFIG_SND_SOC_PCM512x_SPI b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x_SPI
index 1828db038..1828db038 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_PCM512x_SPI
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_PCM512x_SPI
diff --git a/baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG b/configs/base-generic/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
index 8034e86d4..8034e86d4 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
diff --git a/baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND b/configs/base-generic/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND
index a1f8108ff..a1f8108ff 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP
index 30c696522..30c696522 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_I2S b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_I2S
index 23cd059bf..23cd059bf 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_I2S
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_I2S
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_MAX98090 b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_MAX98090
index 6d3f70ed5..6d3f70ed5 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_MAX98090
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_MAX98090
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_PDM b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_PDM
index 858c70c98..858c70c98 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_PDM
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_PDM
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_RT5645 b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_RT5645
index d8ead42ed..d8ead42ed 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_RT5645
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_RT5645
diff --git a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_SPDIF b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_SPDIF
index 55d00e382..55d00e382 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_ROCKCHIP_SPDIF
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_ROCKCHIP_SPDIF
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_AC97 b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_AC97
index fa8e0e012..fa8e0e012 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_AC97
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_AC97
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_DAS b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_DAS
index 82205dc43..82205dc43 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_DAS
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_DAS
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_I2S b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_I2S
index abfe22877..abfe22877 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_I2S
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_I2S
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_SPDIF b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_SPDIF
index 0f05cfffa..0f05cfffa 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_SPDIF
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA20_SPDIF
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_AHUB b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA30_AHUB
index d5632de51..d5632de51 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_AHUB
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA30_AHUB
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_I2S b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA30_I2S
index c7fabc77b..c7fabc77b 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_I2S
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA30_I2S
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632 b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_ALC5632
index 63a5d40d0..63a5d40d0 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_ALC5632
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE
index 23a6b3005..23a6b3005 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903 b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_WM8903
index ff10de901..ff10de901 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_WM8903
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712 b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_WM9712
index 3ced427a6..3ced427a6 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TEGRA_WM9712
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TPA6130A2 b/configs/base-generic/arm/CONFIG_SND_SOC_TPA6130A2
index 5645037fa..5645037fa 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TPA6130A2
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TPA6130A2
diff --git a/baseconfig/arm/CONFIG_SND_SOC_TS3A227E b/configs/base-generic/arm/CONFIG_SND_SOC_TS3A227E
index 1d3522517..1d3522517 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_TS3A227E
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_TS3A227E
diff --git a/baseconfig/arm/CONFIG_SND_SOC_WM8804 b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804
index 04b89d9ff..04b89d9ff 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_WM8804
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804
diff --git a/baseconfig/arm/CONFIG_SND_SOC_WM8804_I2C b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804_I2C
index efb9f2f12..efb9f2f12 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_WM8804_I2C
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804_I2C
diff --git a/baseconfig/arm/CONFIG_SND_SOC_WM8804_SPI b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804_SPI
index 2accedeb7..2accedeb7 100644
--- a/baseconfig/arm/CONFIG_SND_SOC_WM8804_SPI
+++ b/configs/base-generic/arm/CONFIG_SND_SOC_WM8804_SPI
diff --git a/baseconfig/arm/CONFIG_SOC_BRCMSTB b/configs/base-generic/arm/CONFIG_SOC_BRCMSTB
index 7b8f8dcbb..7b8f8dcbb 100644
--- a/baseconfig/arm/CONFIG_SOC_BRCMSTB
+++ b/configs/base-generic/arm/CONFIG_SOC_BRCMSTB
diff --git a/baseconfig/arm/CONFIG_SPI b/configs/base-generic/arm/CONFIG_SPI
index 5616bfc48..5616bfc48 100644
--- a/baseconfig/arm/CONFIG_SPI
+++ b/configs/base-generic/arm/CONFIG_SPI
diff --git a/baseconfig/arm/CONFIG_SPI_ARMADA_3700 b/configs/base-generic/arm/CONFIG_SPI_ARMADA_3700
index f245ed398..f245ed398 100644
--- a/baseconfig/arm/CONFIG_SPI_ARMADA_3700
+++ b/configs/base-generic/arm/CONFIG_SPI_ARMADA_3700
diff --git a/baseconfig/arm/CONFIG_SPI_BCM2835 b/configs/base-generic/arm/CONFIG_SPI_BCM2835
index 7d8a90055..7d8a90055 100644
--- a/baseconfig/arm/CONFIG_SPI_BCM2835
+++ b/configs/base-generic/arm/CONFIG_SPI_BCM2835
diff --git a/baseconfig/arm/CONFIG_SPI_BCM2835AUX b/configs/base-generic/arm/CONFIG_SPI_BCM2835AUX
index f71daa33a..f71daa33a 100644
--- a/baseconfig/arm/CONFIG_SPI_BCM2835AUX
+++ b/configs/base-generic/arm/CONFIG_SPI_BCM2835AUX
diff --git a/baseconfig/arm/CONFIG_SPI_BCM_QSPI b/configs/base-generic/arm/CONFIG_SPI_BCM_QSPI
index 383d220ba..383d220ba 100644
--- a/baseconfig/arm/CONFIG_SPI_BCM_QSPI
+++ b/configs/base-generic/arm/CONFIG_SPI_BCM_QSPI
diff --git a/baseconfig/arm/CONFIG_SPI_BITBANG b/configs/base-generic/arm/CONFIG_SPI_BITBANG
index fc078ca41..fc078ca41 100644
--- a/baseconfig/arm/CONFIG_SPI_BITBANG
+++ b/configs/base-generic/arm/CONFIG_SPI_BITBANG
diff --git a/baseconfig/arm/CONFIG_SPI_CADENCE b/configs/base-generic/arm/CONFIG_SPI_CADENCE
index 78e16ec97..78e16ec97 100644
--- a/baseconfig/arm/CONFIG_SPI_CADENCE
+++ b/configs/base-generic/arm/CONFIG_SPI_CADENCE
diff --git a/baseconfig/arm/CONFIG_SPI_DESIGNWARE b/configs/base-generic/arm/CONFIG_SPI_DESIGNWARE
index 9f92cba69..9f92cba69 100644
--- a/baseconfig/arm/CONFIG_SPI_DESIGNWARE
+++ b/configs/base-generic/arm/CONFIG_SPI_DESIGNWARE
diff --git a/baseconfig/arm/CONFIG_SPI_DW_MID_DMA b/configs/base-generic/arm/CONFIG_SPI_DW_MID_DMA
index ecce093f0..ecce093f0 100644
--- a/baseconfig/arm/CONFIG_SPI_DW_MID_DMA
+++ b/configs/base-generic/arm/CONFIG_SPI_DW_MID_DMA
diff --git a/baseconfig/arm/CONFIG_SPI_DW_MMIO b/configs/base-generic/arm/CONFIG_SPI_DW_MMIO
index 12b554155..12b554155 100644
--- a/baseconfig/arm/CONFIG_SPI_DW_MMIO
+++ b/configs/base-generic/arm/CONFIG_SPI_DW_MMIO
diff --git a/baseconfig/arm/CONFIG_SPI_DW_PCI b/configs/base-generic/arm/CONFIG_SPI_DW_PCI
index 1ae97db72..1ae97db72 100644
--- a/baseconfig/arm/CONFIG_SPI_DW_PCI
+++ b/configs/base-generic/arm/CONFIG_SPI_DW_PCI
diff --git a/baseconfig/arm/CONFIG_SPI_GPIO b/configs/base-generic/arm/CONFIG_SPI_GPIO
index 7ad42326d..7ad42326d 100644
--- a/baseconfig/arm/CONFIG_SPI_GPIO
+++ b/configs/base-generic/arm/CONFIG_SPI_GPIO
diff --git a/baseconfig/arm/CONFIG_SPI_MASTER b/configs/base-generic/arm/CONFIG_SPI_MASTER
index 63f789d5b..63f789d5b 100644
--- a/baseconfig/arm/CONFIG_SPI_MASTER
+++ b/configs/base-generic/arm/CONFIG_SPI_MASTER
diff --git a/baseconfig/arm/CONFIG_SPI_MESON_SPICC b/configs/base-generic/arm/CONFIG_SPI_MESON_SPICC
index c78be8577..c78be8577 100644
--- a/baseconfig/arm/CONFIG_SPI_MESON_SPICC
+++ b/configs/base-generic/arm/CONFIG_SPI_MESON_SPICC
diff --git a/baseconfig/arm/CONFIG_SPI_MESON_SPIFC b/configs/base-generic/arm/CONFIG_SPI_MESON_SPIFC
index a0f6a6247..a0f6a6247 100644
--- a/baseconfig/arm/CONFIG_SPI_MESON_SPIFC
+++ b/configs/base-generic/arm/CONFIG_SPI_MESON_SPIFC
diff --git a/baseconfig/arm/CONFIG_SPI_ORION b/configs/base-generic/arm/CONFIG_SPI_ORION
index f3b2b2d19..f3b2b2d19 100644
--- a/baseconfig/arm/CONFIG_SPI_ORION
+++ b/configs/base-generic/arm/CONFIG_SPI_ORION
diff --git a/baseconfig/arm/CONFIG_SPI_PL022 b/configs/base-generic/arm/CONFIG_SPI_PL022
index 67bd507db..67bd507db 100644
--- a/baseconfig/arm/CONFIG_SPI_PL022
+++ b/configs/base-generic/arm/CONFIG_SPI_PL022
diff --git a/baseconfig/arm/CONFIG_SPI_ROCKCHIP b/configs/base-generic/arm/CONFIG_SPI_ROCKCHIP
index 7c7c61b79..7c7c61b79 100644
--- a/baseconfig/arm/CONFIG_SPI_ROCKCHIP
+++ b/configs/base-generic/arm/CONFIG_SPI_ROCKCHIP
diff --git a/baseconfig/arm/CONFIG_SPI_SPIDEV b/configs/base-generic/arm/CONFIG_SPI_SPIDEV
index a7c3a239f..a7c3a239f 100644
--- a/baseconfig/arm/CONFIG_SPI_SPIDEV
+++ b/configs/base-generic/arm/CONFIG_SPI_SPIDEV
diff --git a/baseconfig/arm/CONFIG_SPI_SUN4I b/configs/base-generic/arm/CONFIG_SPI_SUN4I
index eedddfc90..eedddfc90 100644
--- a/baseconfig/arm/CONFIG_SPI_SUN4I
+++ b/configs/base-generic/arm/CONFIG_SPI_SUN4I
diff --git a/baseconfig/arm/CONFIG_SPI_SUN6I b/configs/base-generic/arm/CONFIG_SPI_SUN6I
index 4ff64c12e..4ff64c12e 100644
--- a/baseconfig/arm/CONFIG_SPI_SUN6I
+++ b/configs/base-generic/arm/CONFIG_SPI_SUN6I
diff --git a/baseconfig/arm/CONFIG_SPI_TEGRA114 b/configs/base-generic/arm/CONFIG_SPI_TEGRA114
index 555027fa7..555027fa7 100644
--- a/baseconfig/arm/CONFIG_SPI_TEGRA114
+++ b/configs/base-generic/arm/CONFIG_SPI_TEGRA114
diff --git a/baseconfig/arm/CONFIG_SPI_TEGRA20_SFLASH b/configs/base-generic/arm/CONFIG_SPI_TEGRA20_SFLASH
index 446ce0728..446ce0728 100644
--- a/baseconfig/arm/CONFIG_SPI_TEGRA20_SFLASH
+++ b/configs/base-generic/arm/CONFIG_SPI_TEGRA20_SFLASH
diff --git a/baseconfig/arm/CONFIG_SPI_TEGRA20_SLINK b/configs/base-generic/arm/CONFIG_SPI_TEGRA20_SLINK
index 05c720ddc..05c720ddc 100644
--- a/baseconfig/arm/CONFIG_SPI_TEGRA20_SLINK
+++ b/configs/base-generic/arm/CONFIG_SPI_TEGRA20_SLINK
diff --git a/baseconfig/arm/CONFIG_SPI_ZYNQMP_GQSPI b/configs/base-generic/arm/CONFIG_SPI_ZYNQMP_GQSPI
index 48e520fd6..48e520fd6 100644
--- a/baseconfig/arm/CONFIG_SPI_ZYNQMP_GQSPI
+++ b/configs/base-generic/arm/CONFIG_SPI_ZYNQMP_GQSPI
diff --git a/baseconfig/arm/CONFIG_SRAM b/configs/base-generic/arm/CONFIG_SRAM
index 7f0757486..7f0757486 100644
--- a/baseconfig/arm/CONFIG_SRAM
+++ b/configs/base-generic/arm/CONFIG_SRAM
diff --git a/baseconfig/arm/CONFIG_STMMAC_PLATFORM b/configs/base-generic/arm/CONFIG_STMMAC_PLATFORM
index 2ad238de4..2ad238de4 100644
--- a/baseconfig/arm/CONFIG_STMMAC_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_STMMAC_PLATFORM
diff --git a/baseconfig/arm/CONFIG_SUN8I_A83T_CCU b/configs/base-generic/arm/CONFIG_SUN8I_A83T_CCU
index 9f34630e8..9f34630e8 100644
--- a/baseconfig/arm/CONFIG_SUN8I_A83T_CCU
+++ b/configs/base-generic/arm/CONFIG_SUN8I_A83T_CCU
diff --git a/baseconfig/arm/CONFIG_SUN8I_DE2_CCU b/configs/base-generic/arm/CONFIG_SUN8I_DE2_CCU
index 41a3847ad..41a3847ad 100644
--- a/baseconfig/arm/CONFIG_SUN8I_DE2_CCU
+++ b/configs/base-generic/arm/CONFIG_SUN8I_DE2_CCU
diff --git a/baseconfig/arm/CONFIG_SUN8I_H3_CCU b/configs/base-generic/arm/CONFIG_SUN8I_H3_CCU
index 542d6fc7d..542d6fc7d 100644
--- a/baseconfig/arm/CONFIG_SUN8I_H3_CCU
+++ b/configs/base-generic/arm/CONFIG_SUN8I_H3_CCU
diff --git a/baseconfig/arm/CONFIG_SUN8I_R_CCU b/configs/base-generic/arm/CONFIG_SUN8I_R_CCU
index 0b88df0dc..0b88df0dc 100644
--- a/baseconfig/arm/CONFIG_SUN8I_R_CCU
+++ b/configs/base-generic/arm/CONFIG_SUN8I_R_CCU
diff --git a/baseconfig/arm/CONFIG_SUN8I_V3S_CCU b/configs/base-generic/arm/CONFIG_SUN8I_V3S_CCU
index da333f583..da333f583 100644
--- a/baseconfig/arm/CONFIG_SUN8I_V3S_CCU
+++ b/configs/base-generic/arm/CONFIG_SUN8I_V3S_CCU
diff --git a/baseconfig/arm/CONFIG_SUNXI_RSB b/configs/base-generic/arm/CONFIG_SUNXI_RSB
index 64558bbea..64558bbea 100644
--- a/baseconfig/arm/CONFIG_SUNXI_RSB
+++ b/configs/base-generic/arm/CONFIG_SUNXI_RSB
diff --git a/baseconfig/arm/CONFIG_SUNXI_SRAM b/configs/base-generic/arm/CONFIG_SUNXI_SRAM
index 526bd5868..526bd5868 100644
--- a/baseconfig/arm/CONFIG_SUNXI_SRAM
+++ b/configs/base-generic/arm/CONFIG_SUNXI_SRAM
diff --git a/baseconfig/arm/CONFIG_SWIOTLB b/configs/base-generic/arm/CONFIG_SWIOTLB
index 5405b65b4..5405b65b4 100644
--- a/baseconfig/arm/CONFIG_SWIOTLB
+++ b/configs/base-generic/arm/CONFIG_SWIOTLB
diff --git a/baseconfig/arm/CONFIG_SYNC_FILE b/configs/base-generic/arm/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/arm/CONFIG_SYNC_FILE
+++ b/configs/base-generic/arm/CONFIG_SYNC_FILE
diff --git a/baseconfig/arm/CONFIG_SYSCON_REBOOT_MODE b/configs/base-generic/arm/CONFIG_SYSCON_REBOOT_MODE
index b391f88cb..b391f88cb 100644
--- a/baseconfig/arm/CONFIG_SYSCON_REBOOT_MODE
+++ b/configs/base-generic/arm/CONFIG_SYSCON_REBOOT_MODE
diff --git a/baseconfig/arm/CONFIG_SYSV_FS b/configs/base-generic/arm/CONFIG_SYSV_FS
index 1304fb157..1304fb157 100644
--- a/baseconfig/arm/CONFIG_SYSV_FS
+++ b/configs/base-generic/arm/CONFIG_SYSV_FS
diff --git a/baseconfig/arm/CONFIG_TCG_TIS_I2C_ATMEL b/configs/base-generic/arm/CONFIG_TCG_TIS_I2C_ATMEL
index d7bd6a50d..d7bd6a50d 100644
--- a/baseconfig/arm/CONFIG_TCG_TIS_I2C_ATMEL
+++ b/configs/base-generic/arm/CONFIG_TCG_TIS_I2C_ATMEL
diff --git a/baseconfig/arm/CONFIG_TCS3472 b/configs/base-generic/arm/CONFIG_TCS3472
index fd85ed25e..fd85ed25e 100644
--- a/baseconfig/arm/CONFIG_TCS3472
+++ b/configs/base-generic/arm/CONFIG_TCS3472
diff --git a/baseconfig/arm/CONFIG_TEGRA124_EMC b/configs/base-generic/arm/CONFIG_TEGRA124_EMC
index b0e4b1157..b0e4b1157 100644
--- a/baseconfig/arm/CONFIG_TEGRA124_EMC
+++ b/configs/base-generic/arm/CONFIG_TEGRA124_EMC
diff --git a/baseconfig/arm/CONFIG_TEGRA20_APB_DMA b/configs/base-generic/arm/CONFIG_TEGRA20_APB_DMA
index b2150da7d..b2150da7d 100644
--- a/baseconfig/arm/CONFIG_TEGRA20_APB_DMA
+++ b/configs/base-generic/arm/CONFIG_TEGRA20_APB_DMA
diff --git a/baseconfig/arm/CONFIG_TEGRA_AHB b/configs/base-generic/arm/CONFIG_TEGRA_AHB
index e11cec707..e11cec707 100644
--- a/baseconfig/arm/CONFIG_TEGRA_AHB
+++ b/configs/base-generic/arm/CONFIG_TEGRA_AHB
diff --git a/baseconfig/arm/CONFIG_TEGRA_BPMP b/configs/base-generic/arm/CONFIG_TEGRA_BPMP
index 348002b0b..348002b0b 100644
--- a/baseconfig/arm/CONFIG_TEGRA_BPMP
+++ b/configs/base-generic/arm/CONFIG_TEGRA_BPMP
diff --git a/baseconfig/arm/CONFIG_TEGRA_HOST1X b/configs/base-generic/arm/CONFIG_TEGRA_HOST1X
index 3d9b9d3f1..3d9b9d3f1 100644
--- a/baseconfig/arm/CONFIG_TEGRA_HOST1X
+++ b/configs/base-generic/arm/CONFIG_TEGRA_HOST1X
diff --git a/baseconfig/arm/CONFIG_TEGRA_HOST1X_FIREWALL b/configs/base-generic/arm/CONFIG_TEGRA_HOST1X_FIREWALL
index 211e767cf..211e767cf 100644
--- a/baseconfig/arm/CONFIG_TEGRA_HOST1X_FIREWALL
+++ b/configs/base-generic/arm/CONFIG_TEGRA_HOST1X_FIREWALL
diff --git a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX b/configs/base-generic/arm/CONFIG_TEGRA_HSP_MBOX
index 3d46b7c93..3d46b7c93 100644
--- a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX
+++ b/configs/base-generic/arm/CONFIG_TEGRA_HSP_MBOX
diff --git a/baseconfig/arm/CONFIG_TEGRA_IOMMU_SMMU b/configs/base-generic/arm/CONFIG_TEGRA_IOMMU_SMMU
index cda4a22a2..cda4a22a2 100644
--- a/baseconfig/arm/CONFIG_TEGRA_IOMMU_SMMU
+++ b/configs/base-generic/arm/CONFIG_TEGRA_IOMMU_SMMU
diff --git a/baseconfig/arm/CONFIG_TEGRA_IVC b/configs/base-generic/arm/CONFIG_TEGRA_IVC
index cdcacbec2..cdcacbec2 100644
--- a/baseconfig/arm/CONFIG_TEGRA_IVC
+++ b/configs/base-generic/arm/CONFIG_TEGRA_IVC
diff --git a/baseconfig/arm/CONFIG_TEGRA_MC b/configs/base-generic/arm/CONFIG_TEGRA_MC
index 16e9db0a3..16e9db0a3 100644
--- a/baseconfig/arm/CONFIG_TEGRA_MC
+++ b/configs/base-generic/arm/CONFIG_TEGRA_MC
diff --git a/baseconfig/arm/CONFIG_TEGRA_SOCTHERM b/configs/base-generic/arm/CONFIG_TEGRA_SOCTHERM
index 2873e6fed..2873e6fed 100644
--- a/baseconfig/arm/CONFIG_TEGRA_SOCTHERM
+++ b/configs/base-generic/arm/CONFIG_TEGRA_SOCTHERM
diff --git a/baseconfig/arm/CONFIG_TEGRA_WATCHDOG b/configs/base-generic/arm/CONFIG_TEGRA_WATCHDOG
index 0dae7c011..0dae7c011 100644
--- a/baseconfig/arm/CONFIG_TEGRA_WATCHDOG
+++ b/configs/base-generic/arm/CONFIG_TEGRA_WATCHDOG
diff --git a/baseconfig/arm/CONFIG_THERMAL b/configs/base-generic/arm/CONFIG_THERMAL
index 42356be7d..42356be7d 100644
--- a/baseconfig/arm/CONFIG_THERMAL
+++ b/configs/base-generic/arm/CONFIG_THERMAL
diff --git a/baseconfig/arm/CONFIG_THERMAL_GOV_USER_SPACE b/configs/base-generic/arm/CONFIG_THERMAL_GOV_USER_SPACE
index 040cf3947..040cf3947 100644
--- a/baseconfig/arm/CONFIG_THERMAL_GOV_USER_SPACE
+++ b/configs/base-generic/arm/CONFIG_THERMAL_GOV_USER_SPACE
diff --git a/baseconfig/arm/CONFIG_THERMAL_OF b/configs/base-generic/arm/CONFIG_THERMAL_OF
index e8ba034f7..e8ba034f7 100644
--- a/baseconfig/arm/CONFIG_THERMAL_OF
+++ b/configs/base-generic/arm/CONFIG_THERMAL_OF
diff --git a/baseconfig/arm/CONFIG_TINYDRM_MI0283QT b/configs/base-generic/arm/CONFIG_TINYDRM_MI0283QT
index 98bb3288d..98bb3288d 100644
--- a/baseconfig/arm/CONFIG_TINYDRM_MI0283QT
+++ b/configs/base-generic/arm/CONFIG_TINYDRM_MI0283QT
diff --git a/baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI b/configs/base-generic/arm/CONFIG_TINYDRM_MIPI_DBI
index bb0235842..bb0235842 100644
--- a/baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI
+++ b/configs/base-generic/arm/CONFIG_TINYDRM_MIPI_DBI
diff --git a/baseconfig/arm/CONFIG_TINYDRM_REPAPER b/configs/base-generic/arm/CONFIG_TINYDRM_REPAPER
index c4d2874fa..c4d2874fa 100644
--- a/baseconfig/arm/CONFIG_TINYDRM_REPAPER
+++ b/configs/base-generic/arm/CONFIG_TINYDRM_REPAPER
diff --git a/baseconfig/arm/CONFIG_TINYDRM_ST7586 b/configs/base-generic/arm/CONFIG_TINYDRM_ST7586
index 2b9e29f63..2b9e29f63 100644
--- a/baseconfig/arm/CONFIG_TINYDRM_ST7586
+++ b/configs/base-generic/arm/CONFIG_TINYDRM_ST7586
diff --git a/baseconfig/arm/CONFIG_TI_DAC7512 b/configs/base-generic/arm/CONFIG_TI_DAC7512
index 30609953c..30609953c 100644
--- a/baseconfig/arm/CONFIG_TI_DAC7512
+++ b/configs/base-generic/arm/CONFIG_TI_DAC7512
diff --git a/baseconfig/arm/CONFIG_TI_SCI_CLK b/configs/base-generic/arm/CONFIG_TI_SCI_CLK
index 1cf634689..1cf634689 100644
--- a/baseconfig/arm/CONFIG_TI_SCI_CLK
+++ b/configs/base-generic/arm/CONFIG_TI_SCI_CLK
diff --git a/baseconfig/arm/CONFIG_TLAN b/configs/base-generic/arm/CONFIG_TLAN
index b78035370..b78035370 100644
--- a/baseconfig/arm/CONFIG_TLAN
+++ b/configs/base-generic/arm/CONFIG_TLAN
diff --git a/baseconfig/arm/CONFIG_TMP006 b/configs/base-generic/arm/CONFIG_TMP006
index 00652eec9..00652eec9 100644
--- a/baseconfig/arm/CONFIG_TMP006
+++ b/configs/base-generic/arm/CONFIG_TMP006
diff --git a/baseconfig/arm/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/arm/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..4874a851b 100644
--- a/baseconfig/arm/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/arm/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/arm/CONFIG_TRUSTED_FOUNDATIONS b/configs/base-generic/arm/CONFIG_TRUSTED_FOUNDATIONS
index b51562114..b51562114 100644
--- a/baseconfig/arm/CONFIG_TRUSTED_FOUNDATIONS
+++ b/configs/base-generic/arm/CONFIG_TRUSTED_FOUNDATIONS
diff --git a/baseconfig/arm/CONFIG_UFS_FS b/configs/base-generic/arm/CONFIG_UFS_FS
index 768c9ac9e..768c9ac9e 100644
--- a/baseconfig/arm/CONFIG_UFS_FS
+++ b/configs/base-generic/arm/CONFIG_UFS_FS
diff --git a/baseconfig/arm/CONFIG_USB_AMD5536UDC b/configs/base-generic/arm/CONFIG_USB_AMD5536UDC
index cf7f156b2..cf7f156b2 100644
--- a/baseconfig/arm/CONFIG_USB_AMD5536UDC
+++ b/configs/base-generic/arm/CONFIG_USB_AMD5536UDC
diff --git a/baseconfig/arm/CONFIG_USB_BDC_UDC b/configs/base-generic/arm/CONFIG_USB_BDC_UDC
index cc3f838c3..cc3f838c3 100644
--- a/baseconfig/arm/CONFIG_USB_BDC_UDC
+++ b/configs/base-generic/arm/CONFIG_USB_BDC_UDC
diff --git a/baseconfig/arm/CONFIG_USB_CHIPIDEA b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA
index 0b76e3525..0b76e3525 100644
--- a/baseconfig/arm/CONFIG_USB_CHIPIDEA
+++ b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA
diff --git a/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_HOST
index 1c14a4a6c..1c14a4a6c 100644
--- a/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST
+++ b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_HOST
diff --git a/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_UDC
index 320052607..320052607 100644
--- a/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC
+++ b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_UDC
diff --git a/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_ULPI
index d1a5cf9eb..d1a5cf9eb 100644
--- a/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI
+++ b/configs/base-generic/arm/CONFIG_USB_CHIPIDEA_ULPI
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS b/configs/base-generic/arm/CONFIG_USB_CONFIGFS
index 2e8b5756c..2e8b5756c 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_ACM b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ACM
index 244e61c58..244e61c58 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_ACM
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ACM
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_ECM b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ECM
index 375c4e088..375c4e088 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_ECM
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ECM
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_ECM_SUBSET b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ECM_SUBSET
index 66192faa5..66192faa5 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_ECM_SUBSET
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_ECM_SUBSET
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_EEM b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_EEM
index 0f7b93533..0f7b93533 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_EEM
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_EEM
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_FS b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_FS
index 821ebd35e..821ebd35e 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_FS
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_FS
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_HID b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_HID
index d8173d6b6..d8173d6b6 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_HID
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_HID
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_LB_SS b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_LB_SS
index 213edb5a1..213edb5a1 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_LB_SS
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_LB_SS
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_MIDI b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_MIDI
index c45ad7d46..c45ad7d46 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_MIDI
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_MIDI
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_PRINTER b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_PRINTER
index 547d3cb1e..547d3cb1e 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_PRINTER
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_PRINTER
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_TCM b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_TCM
index 393a314ac..393a314ac 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_TCM
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_TCM
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UAC1 b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UAC1
index b4e152f78..b4e152f78 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UAC1
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UAC1
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UAC2 b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UAC2
index fe6588620..fe6588620 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UAC2
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UAC2
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UVC b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UVC
index f40145aac..f40145aac 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_F_UVC
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_F_UVC
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_MASS_STORAGE b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_MASS_STORAGE
index c4b6a0f26..c4b6a0f26 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_MASS_STORAGE
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_MASS_STORAGE
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_NCM b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_NCM
index af9e21404..af9e21404 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_NCM
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_NCM
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_OBEX b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_OBEX
index 5e760b8bd..5e760b8bd 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_OBEX
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_OBEX
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_RNDIS b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_RNDIS
index 9df2735b4..9df2735b4 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_RNDIS
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_RNDIS
diff --git a/baseconfig/arm/CONFIG_USB_CONFIGFS_SERIAL b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_SERIAL
index 691141627..691141627 100644
--- a/baseconfig/arm/CONFIG_USB_CONFIGFS_SERIAL
+++ b/configs/base-generic/arm/CONFIG_USB_CONFIGFS_SERIAL
diff --git a/baseconfig/arm/CONFIG_USB_DUMMY_HCD b/configs/base-generic/arm/CONFIG_USB_DUMMY_HCD
index a110f539b..a110f539b 100644
--- a/baseconfig/arm/CONFIG_USB_DUMMY_HCD
+++ b/configs/base-generic/arm/CONFIG_USB_DUMMY_HCD
diff --git a/baseconfig/arm/CONFIG_USB_DWC2 b/configs/base-generic/arm/CONFIG_USB_DWC2
index 4355bc3f5..4355bc3f5 100644
--- a/baseconfig/arm/CONFIG_USB_DWC2
+++ b/configs/base-generic/arm/CONFIG_USB_DWC2
diff --git a/baseconfig/arm/CONFIG_USB_DWC2_DEBUG b/configs/base-generic/arm/CONFIG_USB_DWC2_DEBUG
index c9547df3d..c9547df3d 100644
--- a/baseconfig/arm/CONFIG_USB_DWC2_DEBUG
+++ b/configs/base-generic/arm/CONFIG_USB_DWC2_DEBUG
diff --git a/baseconfig/arm/CONFIG_USB_DWC2_DUAL_ROLE b/configs/base-generic/arm/CONFIG_USB_DWC2_DUAL_ROLE
index ea5add18c..ea5add18c 100644
--- a/baseconfig/arm/CONFIG_USB_DWC2_DUAL_ROLE
+++ b/configs/base-generic/arm/CONFIG_USB_DWC2_DUAL_ROLE
diff --git a/baseconfig/arm/CONFIG_USB_DWC2_PCI b/configs/base-generic/arm/CONFIG_USB_DWC2_PCI
index f333e4ae6..f333e4ae6 100644
--- a/baseconfig/arm/CONFIG_USB_DWC2_PCI
+++ b/configs/base-generic/arm/CONFIG_USB_DWC2_PCI
diff --git a/baseconfig/arm/CONFIG_USB_DWC2_TRACK_MISSED_SOFS b/configs/base-generic/arm/CONFIG_USB_DWC2_TRACK_MISSED_SOFS
index 553717e42..553717e42 100644
--- a/baseconfig/arm/CONFIG_USB_DWC2_TRACK_MISSED_SOFS
+++ b/configs/base-generic/arm/CONFIG_USB_DWC2_TRACK_MISSED_SOFS
diff --git a/baseconfig/arm/CONFIG_USB_DWC3 b/configs/base-generic/arm/CONFIG_USB_DWC3
index bd08b18ba..bd08b18ba 100644
--- a/baseconfig/arm/CONFIG_USB_DWC3
+++ b/configs/base-generic/arm/CONFIG_USB_DWC3
diff --git a/baseconfig/arm/CONFIG_USB_DWC3_DUAL_ROLE b/configs/base-generic/arm/CONFIG_USB_DWC3_DUAL_ROLE
index a12d6d8c8..a12d6d8c8 100644
--- a/baseconfig/arm/CONFIG_USB_DWC3_DUAL_ROLE
+++ b/configs/base-generic/arm/CONFIG_USB_DWC3_DUAL_ROLE
diff --git a/baseconfig/arm/CONFIG_USB_DWC3_OF_SIMPLE b/configs/base-generic/arm/CONFIG_USB_DWC3_OF_SIMPLE
index cae90e389..cae90e389 100644
--- a/baseconfig/arm/CONFIG_USB_DWC3_OF_SIMPLE
+++ b/configs/base-generic/arm/CONFIG_USB_DWC3_OF_SIMPLE
diff --git a/baseconfig/arm/CONFIG_USB_DWC3_PCI b/configs/base-generic/arm/CONFIG_USB_DWC3_PCI
index d6e2ae538..d6e2ae538 100644
--- a/baseconfig/arm/CONFIG_USB_DWC3_PCI
+++ b/configs/base-generic/arm/CONFIG_USB_DWC3_PCI
diff --git a/baseconfig/arm/CONFIG_USB_DWC3_ULPI b/configs/base-generic/arm/CONFIG_USB_DWC3_ULPI
index 631571301..631571301 100644
--- a/baseconfig/arm/CONFIG_USB_DWC3_ULPI
+++ b/configs/base-generic/arm/CONFIG_USB_DWC3_ULPI
diff --git a/baseconfig/arm/CONFIG_USB_EG20T b/configs/base-generic/arm/CONFIG_USB_EG20T
index b4b20356b..b4b20356b 100644
--- a/baseconfig/arm/CONFIG_USB_EG20T
+++ b/configs/base-generic/arm/CONFIG_USB_EG20T
diff --git a/baseconfig/arm/CONFIG_USB_EHCI_HCD_ORION b/configs/base-generic/arm/CONFIG_USB_EHCI_HCD_ORION
index eee05e763..eee05e763 100644
--- a/baseconfig/arm/CONFIG_USB_EHCI_HCD_ORION
+++ b/configs/base-generic/arm/CONFIG_USB_EHCI_HCD_ORION
diff --git a/baseconfig/arm/CONFIG_USB_EHCI_HCD_PLATFORM b/configs/base-generic/arm/CONFIG_USB_EHCI_HCD_PLATFORM
index b8939d990..b8939d990 100644
--- a/baseconfig/arm/CONFIG_USB_EHCI_HCD_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_USB_EHCI_HCD_PLATFORM
diff --git a/baseconfig/arm/CONFIG_USB_EHCI_TEGRA b/configs/base-generic/arm/CONFIG_USB_EHCI_TEGRA
index e21efb47a..e21efb47a 100644
--- a/baseconfig/arm/CONFIG_USB_EHCI_TEGRA
+++ b/configs/base-generic/arm/CONFIG_USB_EHCI_TEGRA
diff --git a/baseconfig/arm/CONFIG_USB_FOTG210_UDC b/configs/base-generic/arm/CONFIG_USB_FOTG210_UDC
index 1428d0379..1428d0379 100644
--- a/baseconfig/arm/CONFIG_USB_FOTG210_UDC
+++ b/configs/base-generic/arm/CONFIG_USB_FOTG210_UDC
diff --git a/baseconfig/arm/CONFIG_USB_FUSB300 b/configs/base-generic/arm/CONFIG_USB_FUSB300
index b443c7083..b443c7083 100644
--- a/baseconfig/arm/CONFIG_USB_FUSB300
+++ b/configs/base-generic/arm/CONFIG_USB_FUSB300
diff --git a/baseconfig/arm/CONFIG_USB_GADGET b/configs/base-generic/arm/CONFIG_USB_GADGET
index a5c34d3af..a5c34d3af 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG
index c12341631..c12341631 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG_FILES b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG_FILES
index 6da78ad92..6da78ad92 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG_FILES
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG_FILES
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG_FS b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG_FS
index ca2aa0529..ca2aa0529 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_DEBUG_FS
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_DEBUG_FS
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS b/configs/base-generic/arm/CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS
index 3975fabf4..3975fabf4 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_VBUS_DRAW b/configs/base-generic/arm/CONFIG_USB_GADGET_VBUS_DRAW
index 8d19043ff..8d19043ff 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_VBUS_DRAW
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_VBUS_DRAW
diff --git a/baseconfig/arm/CONFIG_USB_GADGET_XILINX b/configs/base-generic/arm/CONFIG_USB_GADGET_XILINX
index 8c779ba26..8c779ba26 100644
--- a/baseconfig/arm/CONFIG_USB_GADGET_XILINX
+++ b/configs/base-generic/arm/CONFIG_USB_GADGET_XILINX
diff --git a/baseconfig/arm/CONFIG_USB_GOKU b/configs/base-generic/arm/CONFIG_USB_GOKU
index 1086217d5..1086217d5 100644
--- a/baseconfig/arm/CONFIG_USB_GOKU
+++ b/configs/base-generic/arm/CONFIG_USB_GOKU
diff --git a/baseconfig/arm/CONFIG_USB_GPIO_VBUS b/configs/base-generic/arm/CONFIG_USB_GPIO_VBUS
index 3e93fb75e..3e93fb75e 100644
--- a/baseconfig/arm/CONFIG_USB_GPIO_VBUS
+++ b/configs/base-generic/arm/CONFIG_USB_GPIO_VBUS
diff --git a/baseconfig/arm/CONFIG_USB_ISP1760 b/configs/base-generic/arm/CONFIG_USB_ISP1760
index e8fa30e98..e8fa30e98 100644
--- a/baseconfig/arm/CONFIG_USB_ISP1760
+++ b/configs/base-generic/arm/CONFIG_USB_ISP1760
diff --git a/baseconfig/arm/CONFIG_USB_M66592 b/configs/base-generic/arm/CONFIG_USB_M66592
index e24bc961c..e24bc961c 100644
--- a/baseconfig/arm/CONFIG_USB_M66592
+++ b/configs/base-generic/arm/CONFIG_USB_M66592
diff --git a/baseconfig/arm/CONFIG_USB_MUSB_DSPS b/configs/base-generic/arm/CONFIG_USB_MUSB_DSPS
index 382eab4a8..382eab4a8 100644
--- a/baseconfig/arm/CONFIG_USB_MUSB_DSPS
+++ b/configs/base-generic/arm/CONFIG_USB_MUSB_DSPS
diff --git a/baseconfig/arm/CONFIG_USB_MUSB_DUAL_ROLE b/configs/base-generic/arm/CONFIG_USB_MUSB_DUAL_ROLE
index 3ddbfd134..3ddbfd134 100644
--- a/baseconfig/arm/CONFIG_USB_MUSB_DUAL_ROLE
+++ b/configs/base-generic/arm/CONFIG_USB_MUSB_DUAL_ROLE
diff --git a/baseconfig/arm/CONFIG_USB_MUSB_HDRC b/configs/base-generic/arm/CONFIG_USB_MUSB_HDRC
index 5d3fb7988..5d3fb7988 100644
--- a/baseconfig/arm/CONFIG_USB_MUSB_HDRC
+++ b/configs/base-generic/arm/CONFIG_USB_MUSB_HDRC
diff --git a/baseconfig/arm/CONFIG_USB_MUSB_TUSB6010 b/configs/base-generic/arm/CONFIG_USB_MUSB_TUSB6010
index 082e32f32..082e32f32 100644
--- a/baseconfig/arm/CONFIG_USB_MUSB_TUSB6010
+++ b/configs/base-generic/arm/CONFIG_USB_MUSB_TUSB6010
diff --git a/baseconfig/arm/CONFIG_USB_MV_U3D b/configs/base-generic/arm/CONFIG_USB_MV_U3D
index 7da7f9818..7da7f9818 100644
--- a/baseconfig/arm/CONFIG_USB_MV_U3D
+++ b/configs/base-generic/arm/CONFIG_USB_MV_U3D
diff --git a/baseconfig/arm/CONFIG_USB_MV_UDC b/configs/base-generic/arm/CONFIG_USB_MV_UDC
index 92f015cad..92f015cad 100644
--- a/baseconfig/arm/CONFIG_USB_MV_UDC
+++ b/configs/base-generic/arm/CONFIG_USB_MV_UDC
diff --git a/baseconfig/arm/CONFIG_USB_NET2272 b/configs/base-generic/arm/CONFIG_USB_NET2272
index 758a29eb0..758a29eb0 100644
--- a/baseconfig/arm/CONFIG_USB_NET2272
+++ b/configs/base-generic/arm/CONFIG_USB_NET2272
diff --git a/baseconfig/arm/CONFIG_USB_NET2280 b/configs/base-generic/arm/CONFIG_USB_NET2280
index 8cc159972..8cc159972 100644
--- a/baseconfig/arm/CONFIG_USB_NET2280
+++ b/configs/base-generic/arm/CONFIG_USB_NET2280
diff --git a/baseconfig/arm/CONFIG_USB_OHCI_HCD_PLATFORM b/configs/base-generic/arm/CONFIG_USB_OHCI_HCD_PLATFORM
index 1862d96cf..1862d96cf 100644
--- a/baseconfig/arm/CONFIG_USB_OHCI_HCD_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_USB_OHCI_HCD_PLATFORM
diff --git a/baseconfig/arm/CONFIG_USB_OTG b/configs/base-generic/arm/CONFIG_USB_OTG
index 3157000e0..3157000e0 100644
--- a/baseconfig/arm/CONFIG_USB_OTG
+++ b/configs/base-generic/arm/CONFIG_USB_OTG
diff --git a/baseconfig/arm/CONFIG_USB_OTG_BLACKLIST_HUB b/configs/base-generic/arm/CONFIG_USB_OTG_BLACKLIST_HUB
index 461a020a8..461a020a8 100644
--- a/baseconfig/arm/CONFIG_USB_OTG_BLACKLIST_HUB
+++ b/configs/base-generic/arm/CONFIG_USB_OTG_BLACKLIST_HUB
diff --git a/baseconfig/arm/CONFIG_USB_PXA27X b/configs/base-generic/arm/CONFIG_USB_PXA27X
index e42f14cb2..e42f14cb2 100644
--- a/baseconfig/arm/CONFIG_USB_PXA27X
+++ b/configs/base-generic/arm/CONFIG_USB_PXA27X
diff --git a/baseconfig/arm/CONFIG_USB_R8A66597 b/configs/base-generic/arm/CONFIG_USB_R8A66597
index 8c908ab75..8c908ab75 100644
--- a/baseconfig/arm/CONFIG_USB_R8A66597
+++ b/configs/base-generic/arm/CONFIG_USB_R8A66597
diff --git a/baseconfig/arm/CONFIG_USB_ULPI b/configs/base-generic/arm/CONFIG_USB_ULPI
index 345bcfb49..345bcfb49 100644
--- a/baseconfig/arm/CONFIG_USB_ULPI
+++ b/configs/base-generic/arm/CONFIG_USB_ULPI
diff --git a/baseconfig/arm/CONFIG_USB_XHCI_MVEBU b/configs/base-generic/arm/CONFIG_USB_XHCI_MVEBU
index 1badaefa3..1badaefa3 100644
--- a/baseconfig/arm/CONFIG_USB_XHCI_MVEBU
+++ b/configs/base-generic/arm/CONFIG_USB_XHCI_MVEBU
diff --git a/baseconfig/arm/CONFIG_USB_XHCI_PLATFORM b/configs/base-generic/arm/CONFIG_USB_XHCI_PLATFORM
index 060ebfc94..060ebfc94 100644
--- a/baseconfig/arm/CONFIG_USB_XHCI_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_USB_XHCI_PLATFORM
diff --git a/baseconfig/arm/CONFIG_USB_XHCI_TEGRA b/configs/base-generic/arm/CONFIG_USB_XHCI_TEGRA
index 8e85472a9..8e85472a9 100644
--- a/baseconfig/arm/CONFIG_USB_XHCI_TEGRA
+++ b/configs/base-generic/arm/CONFIG_USB_XHCI_TEGRA
diff --git a/baseconfig/arm/CONFIG_USB_ZERO_HNPTEST b/configs/base-generic/arm/CONFIG_USB_ZERO_HNPTEST
index abfbd3e7e..abfbd3e7e 100644
--- a/baseconfig/arm/CONFIG_USB_ZERO_HNPTEST
+++ b/configs/base-generic/arm/CONFIG_USB_ZERO_HNPTEST
diff --git a/baseconfig/arm/CONFIG_U_SERIAL_CONSOLE b/configs/base-generic/arm/CONFIG_U_SERIAL_CONSOLE
index 1efa1eede..1efa1eede 100644
--- a/baseconfig/arm/CONFIG_U_SERIAL_CONSOLE
+++ b/configs/base-generic/arm/CONFIG_U_SERIAL_CONSOLE
diff --git a/baseconfig/arm/CONFIG_VDSO b/configs/base-generic/arm/CONFIG_VDSO
index e02955ffa..e02955ffa 100644
--- a/baseconfig/arm/CONFIG_VDSO
+++ b/configs/base-generic/arm/CONFIG_VDSO
diff --git a/baseconfig/arm/CONFIG_VEXPRESS_SYSCFG b/configs/base-generic/arm/CONFIG_VEXPRESS_SYSCFG
index 5893cc256..5893cc256 100644
--- a/baseconfig/arm/CONFIG_VEXPRESS_SYSCFG
+++ b/configs/base-generic/arm/CONFIG_VEXPRESS_SYSCFG
diff --git a/baseconfig/arm/CONFIG_VFIO_AMBA b/configs/base-generic/arm/CONFIG_VFIO_AMBA
index 38d1fde64..38d1fde64 100644
--- a/baseconfig/arm/CONFIG_VFIO_AMBA
+++ b/configs/base-generic/arm/CONFIG_VFIO_AMBA
diff --git a/baseconfig/arm/CONFIG_VFIO_PLATFORM b/configs/base-generic/arm/CONFIG_VFIO_PLATFORM
index c05b69e84..c05b69e84 100644
--- a/baseconfig/arm/CONFIG_VFIO_PLATFORM
+++ b/configs/base-generic/arm/CONFIG_VFIO_PLATFORM
diff --git a/baseconfig/arm/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET b/configs/base-generic/arm/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
index 7c71659cf..7c71659cf 100644
--- a/baseconfig/arm/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
+++ b/configs/base-generic/arm/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
diff --git a/baseconfig/arm/CONFIG_VIDEO_BCM2835 b/configs/base-generic/arm/CONFIG_VIDEO_BCM2835
index 192fdf645..192fdf645 100644
--- a/baseconfig/arm/CONFIG_VIDEO_BCM2835
+++ b/configs/base-generic/arm/CONFIG_VIDEO_BCM2835
diff --git a/baseconfig/arm/CONFIG_VIDEO_MESON_AO_CEC b/configs/base-generic/arm/CONFIG_VIDEO_MESON_AO_CEC
index 499a44076..499a44076 100644
--- a/baseconfig/arm/CONFIG_VIDEO_MESON_AO_CEC
+++ b/configs/base-generic/arm/CONFIG_VIDEO_MESON_AO_CEC
diff --git a/baseconfig/arm/CONFIG_XEN b/configs/base-generic/arm/CONFIG_XEN
index f154fee42..f154fee42 100644
--- a/baseconfig/arm/CONFIG_XEN
+++ b/configs/base-generic/arm/CONFIG_XEN
diff --git a/baseconfig/arm/CONFIG_XILINX_ZYNQMP_DMA b/configs/base-generic/arm/CONFIG_XILINX_ZYNQMP_DMA
index 462b390f4..462b390f4 100644
--- a/baseconfig/arm/CONFIG_XILINX_ZYNQMP_DMA
+++ b/configs/base-generic/arm/CONFIG_XILINX_ZYNQMP_DMA
diff --git a/baseconfig/arm/CONFIG_XZ_DEC_ARM b/configs/base-generic/arm/CONFIG_XZ_DEC_ARM
index 52cbc2d10..52cbc2d10 100644
--- a/baseconfig/arm/CONFIG_XZ_DEC_ARM
+++ b/configs/base-generic/arm/CONFIG_XZ_DEC_ARM
diff --git a/baseconfig/arm/CONFIG_XZ_DEC_ARMTHUMB b/configs/base-generic/arm/CONFIG_XZ_DEC_ARMTHUMB
index 50b05d115..50b05d115 100644
--- a/baseconfig/arm/CONFIG_XZ_DEC_ARMTHUMB
+++ b/configs/base-generic/arm/CONFIG_XZ_DEC_ARMTHUMB
diff --git a/baseconfig/arm/README b/configs/base-generic/arm/README
index d83e0a8bd..d83e0a8bd 100644
--- a/baseconfig/arm/README
+++ b/configs/base-generic/arm/README
diff --git a/baseconfig/arm/arm64/CONFIG_64BIT b/configs/base-generic/arm/aarch64/CONFIG_64BIT
index 06a94e48b..06a94e48b 100644
--- a/baseconfig/arm/arm64/CONFIG_64BIT
+++ b/configs/base-generic/arm/aarch64/CONFIG_64BIT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI b/configs/base-generic/arm/aarch64/CONFIG_ACPI
index 839566bae..839566bae 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI
index 9ab33facf..9ab33facf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_EINJ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
index 2d03b69a1..2d03b69a1 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_EINJ
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_ERST_DEBUG b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
index 235760d40..235760d40 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_ERST_DEBUG
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_GHES b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
index 8fd037d8f..8fd037d8f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_GHES
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
index 46aa1579f..46aa1579f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_PCIEAER b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
index 26f3e9129..26f3e9129 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_PCIEAER
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_SEA
index db573ffb8..db573ffb8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_APEI_SEA
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_BGRT b/configs/base-generic/arm/aarch64/CONFIG_ACPI_BGRT
index 13035dd82..13035dd82 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_BGRT
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_BGRT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_BUTTON b/configs/base-generic/arm/aarch64/CONFIG_ACPI_BUTTON
index e40dff40b..e40dff40b 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_BUTTON
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_BUTTON
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CONFIGFS b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
index fc2af2c0b..fc2af2c0b 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CONFIGFS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CONTAINER b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CONTAINER
index 24287daf8..24287daf8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CONTAINER
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CONTAINER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CPPC_CPUFREQ
index 5cc88132a..5cc88132a 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CPPC_CPUFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CUSTOM_METHOD b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
index 76853b6d8..76853b6d8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CUSTOM_METHOD
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_DOCK b/configs/base-generic/arm/aarch64/CONFIG_ACPI_DOCK
index e4d916353..e4d916353 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_DOCK
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_DOCK
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_EC_DEBUGFS b/configs/base-generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
index df1424cee..df1424cee 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_EC_DEBUGFS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_FAN b/configs/base-generic/arm/aarch64/CONFIG_ACPI_FAN
index f45a96673..f45a96673 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_FAN
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_FAN
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_HED b/configs/base-generic/arm/aarch64/CONFIG_ACPI_HED
index 06042df5a..06042df5a 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_HED
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_HED
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION b/configs/base-generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
index 92036b975..92036b975 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_IPMI b/configs/base-generic/arm/aarch64/CONFIG_ACPI_IPMI
index e40fb9aea..e40fb9aea 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_IPMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_IPMI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NFIT
index 922b719bf..922b719bf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NFIT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT_DEBUG b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NFIT_DEBUG
index fc829324f..fc829324f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT_DEBUG
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NFIT_DEBUG
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NUMA b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NUMA
index 19881f440..19881f440 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NUMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_NUMA
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_PROCESSOR b/configs/base-generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
index a24416dcf..a24416dcf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_PROCESSOR
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_PROCFS_POWER b/configs/base-generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
index 26cea3179..26cea3179 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_PROCFS_POWER
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_TABLE_UPGRADE b/configs/base-generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
index 276233fba..276233fba 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_TABLE_UPGRADE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_THERMAL b/configs/base-generic/arm/aarch64/CONFIG_ACPI_THERMAL
index 1bd7964b4..1bd7964b4 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_THERMAL
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_ACPI_WATCHDOG
index d82966e07..d82966e07 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_ACPI_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_AHCI_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_AHCI_SUNXI
index 91560d628..91560d628 100644
--- a/baseconfig/arm/arm64/CONFIG_AHCI_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_AHCI_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_AHCI_XGENE b/configs/base-generic/arm/aarch64/CONFIG_AHCI_XGENE
index 7e02b9914..7e02b9914 100644
--- a/baseconfig/arm/arm64/CONFIG_AHCI_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_AHCI_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_AMBA_PL08X b/configs/base-generic/arm/aarch64/CONFIG_AMBA_PL08X
index a13d91b90..a13d91b90 100644
--- a/baseconfig/arm/arm64/CONFIG_AMBA_PL08X
+++ b/configs/base-generic/arm/aarch64/CONFIG_AMBA_PL08X
diff --git a/baseconfig/arm/arm64/CONFIG_AMD_XGBE b/configs/base-generic/arm/aarch64/CONFIG_AMD_XGBE
index 27be1a7ee..27be1a7ee 100644
--- a/baseconfig/arm/arm64/CONFIG_AMD_XGBE
+++ b/configs/base-generic/arm/aarch64/CONFIG_AMD_XGBE
diff --git a/baseconfig/arm/arm64/CONFIG_AMD_XGBE_DCB b/configs/base-generic/arm/aarch64/CONFIG_AMD_XGBE_DCB
index f3cdcca89..f3cdcca89 100644
--- a/baseconfig/arm/arm64/CONFIG_AMD_XGBE_DCB
+++ b/configs/base-generic/arm/aarch64/CONFIG_AMD_XGBE_DCB
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084 b/configs/base-generic/arm/aarch64/CONFIG_APQ_GCC_8084
index bacb61e5e..bacb61e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
+++ b/configs/base-generic/arm/aarch64/CONFIG_APQ_GCC_8084
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_MMCC_8084 b/configs/base-generic/arm/aarch64/CONFIG_APQ_MMCC_8084
index 05c8d0c7b..05c8d0c7b 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_MMCC_8084
+++ b/configs/base-generic/arm/aarch64/CONFIG_APQ_MMCC_8084
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ALPINE b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ALPINE
index a347a04fc..a347a04fc 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ALPINE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ALPINE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_BERLIN b/configs/base-generic/arm/aarch64/CONFIG_ARCH_BERLIN
index 9a647a4a1..9a647a4a1 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_BERLIN
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_BERLIN
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_EXYNOS b/configs/base-generic/arm/aarch64/CONFIG_ARCH_EXYNOS
index 1ee894dd8..1ee894dd8 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_EXYNOS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_EXYNOS
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL b/configs/base-generic/arm/aarch64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
index e87b4da10..e87b4da10 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_HISI b/configs/base-generic/arm/aarch64/CONFIG_ARCH_HISI
index 9afa5dcee..9afa5dcee 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_HISI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_LAYERSCAPE b/configs/base-generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
index 257f6f91d..257f6f91d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_LAYERSCAPE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_LG1K b/configs/base-generic/arm/aarch64/CONFIG_ARCH_LG1K
index 0d73af4e2..0d73af4e2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_LG1K
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_LG1K
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_MEDIATEK b/configs/base-generic/arm/aarch64/CONFIG_ARCH_MEDIATEK
index 62b0a1f19..62b0a1f19 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_MEDIATEK
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_MEDIATEK
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_QCOM b/configs/base-generic/arm/aarch64/CONFIG_ARCH_QCOM
index e51a38aa6..e51a38aa6 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_QCOM
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_REALTEK b/configs/base-generic/arm/aarch64/CONFIG_ARCH_REALTEK
index 49536f6d5..49536f6d5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_REALTEK
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_REALTEK
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_RENESAS b/configs/base-generic/arm/aarch64/CONFIG_ARCH_RENESAS
index 0fa3a2ec3..0fa3a2ec3 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_RENESAS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_RENESAS
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SEATTLE b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SEATTLE
index 83c1e8bc4..83c1e8bc4 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SEATTLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SEATTLE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SPRD b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SPRD
index a090576de..a090576de 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SPRD
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SPRD
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_STRATIX10 b/configs/base-generic/arm/aarch64/CONFIG_ARCH_STRATIX10
index ef575bb37..ef575bb37 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_STRATIX10
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_STRATIX10
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SUNXI
index 6cf4026fd..6cf4026fd 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA
index 3b74d56f4..3b74d56f4 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_132_SOC b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_132_SOC
index b6d3de856..b6d3de856 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_132_SOC
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_132_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_186_SOC
index 1cafdb24f..1cafdb24f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_186_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_210_SOC b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_210_SOC
index 0750c3ec0..0750c3ec0 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_210_SOC
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_TEGRA_210_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER b/configs/base-generic/arm/aarch64/CONFIG_ARCH_THUNDER
index fc1527e5e..fc1527e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_THUNDER
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER2 b/configs/base-generic/arm/aarch64/CONFIG_ARCH_THUNDER2
index aa0f1f319..aa0f1f319 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER2
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_THUNDER2
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_UNIPHIER b/configs/base-generic/arm/aarch64/CONFIG_ARCH_UNIPHIER
index 2c1103337..2c1103337 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_UNIPHIER
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_UNIPHIER
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_XGENE b/configs/base-generic/arm/aarch64/CONFIG_ARCH_XGENE
index c1bd4d116..c1bd4d116 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ZX b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ZX
index ec10bbf1d..ec10bbf1d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ZX
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ZX
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ZYNQMP b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ZYNQMP
index f92a386c6..f92a386c6 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ZYNQMP
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARCH_ZYNQMP
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64 b/configs/base-generic/arm/aarch64/CONFIG_ARM64
index e40393f9a..e40393f9a 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES b/configs/base-generic/arm/aarch64/CONFIG_ARM64_4K_PAGES
index 5df91df1a..5df91df1a 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_4K_PAGES
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
index bdb51423d..bdb51423d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_CRYPTO b/configs/base-generic/arm/aarch64/CONFIG_ARM64_CRYPTO
index 3e9856e5e..3e9856e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_CRYPTO
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_CRYPTO
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_819472 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_819472
index e53fbbbe5..e53fbbbe5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_819472
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_819472
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_824069 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_824069
index 2b4897f44..2b4897f44 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_824069
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_824069
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_826319 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_826319
index 8a3b9aaaf..8a3b9aaaf 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_826319
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_826319
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_827319 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_827319
index d341b420c..d341b420c 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_827319
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_827319
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_832075 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_832075
index 9d1f8fcd7..9d1f8fcd7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_832075
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_832075
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_834220 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_834220
index a4bf47d17..a4bf47d17 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_834220
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_834220
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_843419 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_843419
index 303cae762..303cae762 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_843419
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_ERRATUM_843419
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_HW_AFDBM b/configs/base-generic/arm/aarch64/CONFIG_ARM64_HW_AFDBM
index 4fc9f03d7..4fc9f03d7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_HW_AFDBM
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_HW_AFDBM
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_LSE_ATOMICS b/configs/base-generic/arm/aarch64/CONFIG_ARM64_LSE_ATOMICS
index a54d60033..a54d60033 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_LSE_ATOMICS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_LSE_ATOMICS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PAN b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PAN
index ac8c85ac7..ac8c85ac7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PAN
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PAN
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PMEM b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PMEM
index 9325600d1..9325600d1 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PMEM
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PMEM
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PTDUMP
index 5090299f2..5090299f2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PTDUMP
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP_DEBUGFS b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PTDUMP_DEBUGFS
index 2d698a99e..2d698a99e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP_DEBUGFS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_PTDUMP_DEBUGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET b/configs/base-generic/arm/aarch64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
index a7f7cd778..a7f7cd778 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_RELOC_TEST b/configs/base-generic/arm/aarch64/CONFIG_ARM64_RELOC_TEST
index 864fc6a6b..864fc6a6b 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_RELOC_TEST
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_RELOC_TEST
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN b/configs/base-generic/arm/aarch64/CONFIG_ARM64_SW_TTBR0_PAN
index 294c8ec50..294c8ec50 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_SW_TTBR0_PAN
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_UAO b/configs/base-generic/arm/aarch64/CONFIG_ARM64_UAO
index 1b63cd45c..1b63cd45c 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_UAO
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_UAO
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VA_BITS
index 3a2764df2..3a2764df2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VA_BITS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS_48 b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VA_BITS_48
index 1bafe6e58..1bafe6e58 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS_48
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VA_BITS_48
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VHE b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VHE
index 340b2bf98..340b2bf98 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VHE
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM64_VHE
diff --git a/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON b/configs/base-generic/arm/aarch64/CONFIG_ARMADA_AP806_SYSCON
index c0741cab5..c0741cab5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARMADA_AP806_SYSCON
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_SBSA_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_ARM_SBSA_WATCHDOG
index 01aa8f152..01aa8f152 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_SBSA_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM_SBSA_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_SMMU_V3 b/configs/base-generic/arm/aarch64/CONFIG_ARM_SMMU_V3
index 83d144ae0..83d144ae0 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_SMMU_V3
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM_SMMU_V3
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ b/configs/base-generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
index f0e165dfb..f0e165dfb 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ b/configs/base-generic/arm/aarch64/CONFIG_ARM_TEGRA_DEVFREQ
index d64e3e373..d64e3e373 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
+++ b/configs/base-generic/arm/aarch64/CONFIG_ARM_TEGRA_DEVFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ATA_ACPI b/configs/base-generic/arm/aarch64/CONFIG_ATA_ACPI
index a0be76e56..a0be76e56 100644
--- a/baseconfig/arm/arm64/CONFIG_ATA_ACPI
+++ b/configs/base-generic/arm/aarch64/CONFIG_ATA_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_ADC b/configs/base-generic/arm/aarch64/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP20X_ADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_AXP20X_ADC
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER b/configs/base-generic/arm/aarch64/CONFIG_AXP20X_POWER
index ddf89f551..ddf89f551 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
+++ b/configs/base-generic/arm/aarch64/CONFIG_AXP20X_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_ADC b/configs/base-generic/arm/aarch64/CONFIG_AXP288_ADC
index e138f36af..e138f36af 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_ADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_AXP288_ADC
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER b/configs/base-generic/arm/aarch64/CONFIG_AXP288_CHARGER
index 0418f962c..0418f962c 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
+++ b/configs/base-generic/arm/aarch64/CONFIG_AXP288_CHARGER
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE b/configs/base-generic/arm/aarch64/CONFIG_AXP288_FUEL_GAUGE
index e171b954b..e171b954b 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
+++ b/configs/base-generic/arm/aarch64/CONFIG_AXP288_FUEL_GAUGE
diff --git a/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X b/configs/base-generic/arm/aarch64/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X
+++ b/configs/base-generic/arm/aarch64/CONFIG_BATTERY_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_BCMA_POSSIBLE b/configs/base-generic/arm/aarch64/CONFIG_BCMA_POSSIBLE
index aa4a92690..aa4a92690 100644
--- a/baseconfig/arm/arm64/CONFIG_BCMA_POSSIBLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_BCMA_POSSIBLE
diff --git a/baseconfig/arm/arm64/CONFIG_BCM_PDC_MBOX b/configs/base-generic/arm/aarch64/CONFIG_BCM_PDC_MBOX
index 23c2457df..23c2457df 100644
--- a/baseconfig/arm/arm64/CONFIG_BCM_PDC_MBOX
+++ b/configs/base-generic/arm/aarch64/CONFIG_BCM_PDC_MBOX
diff --git a/baseconfig/arm/arm64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE b/configs/base-generic/arm/aarch64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
index 71343dc66..71343dc66 100644
--- a/baseconfig/arm/arm64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
+++ b/configs/base-generic/arm/aarch64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
diff --git a/baseconfig/arm/arm64/CONFIG_BRCMUTIL b/configs/base-generic/arm/aarch64/CONFIG_BRCMUTIL
index 66c5eac06..66c5eac06 100644
--- a/baseconfig/arm/arm64/CONFIG_BRCMUTIL
+++ b/configs/base-generic/arm/aarch64/CONFIG_BRCMUTIL
diff --git a/baseconfig/arm/arm64/CONFIG_BTT b/configs/base-generic/arm/aarch64/CONFIG_BTT
index 9cfddf1b9..9cfddf1b9 100644
--- a/baseconfig/arm/arm64/CONFIG_BTT
+++ b/configs/base-generic/arm/aarch64/CONFIG_BTT
diff --git a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD b/configs/base-generic/arm/aarch64/CONFIG_BT_QCOMSMD
index 9f36fb6a8..9f36fb6a8 100644
--- a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
+++ b/configs/base-generic/arm/aarch64/CONFIG_BT_QCOMSMD
diff --git a/baseconfig/arm/arm64/CONFIG_BUG b/configs/base-generic/arm/aarch64/CONFIG_BUG
index 7a3a7bf96..7a3a7bf96 100644
--- a/baseconfig/arm/arm64/CONFIG_BUG
+++ b/configs/base-generic/arm/aarch64/CONFIG_BUG
diff --git a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I b/configs/base-generic/arm/aarch64/CONFIG_CAN_SUN4I
index 925f02a15..925f02a15 100644
--- a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAN_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_CPT b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_CPT
index 183805687..183805687 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_CPT
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_CPT
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_22375 b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_22375
index e173734bd..e173734bd 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_22375
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_22375
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23144 b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23144
index 59e70bcee..59e70bcee 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23144
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23144
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23154 b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23154
index 04080e787..04080e787 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23154
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23154
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_27456 b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_27456
index 540c84307..540c84307 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_27456
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_27456
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_30115 b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
index e3f4218af..e3f4218af 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_30115
+++ b/configs/base-generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_AXP20X
index 2e64e7733..2e64e7733 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X
+++ b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_MANAGER b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_MANAGER
index 51fe252eb..51fe252eb 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_MANAGER
+++ b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_MANAGER
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_QCOM_SMBB
index 43a91eb0e..43a91eb0e 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
+++ b/configs/base-generic/arm/aarch64/CONFIG_CHARGER_QCOM_SMBB
diff --git a/baseconfig/arm/arm64/CONFIG_CLKDEV_LOOKUP b/configs/base-generic/arm/aarch64/CONFIG_CLKDEV_LOOKUP
index 90b1babeb..90b1babeb 100644
--- a/baseconfig/arm/arm64/CONFIG_CLKDEV_LOOKUP
+++ b/configs/base-generic/arm/aarch64/CONFIG_CLKDEV_LOOKUP
diff --git a/baseconfig/arm/arm64/CONFIG_CMDLINE b/configs/base-generic/arm/aarch64/CONFIG_CMDLINE
index f218410dc..f218410dc 100644
--- a/baseconfig/arm/arm64/CONFIG_CMDLINE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CMDLINE
diff --git a/baseconfig/arm/arm64/CONFIG_CMDLINE_FORCE b/configs/base-generic/arm/aarch64/CONFIG_CMDLINE_FORCE
index db59f3770..db59f3770 100644
--- a/baseconfig/arm/arm64/CONFIG_CMDLINE_FORCE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CMDLINE_FORCE
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3516CV300
index 2c50858a5..2c50858a5 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3516CV300
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3519
index 5484a59ba..5484a59ba 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3519
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3660
index 44693544d..44693544d 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3660
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3798CV200
index 8d91e10e1..8d91e10e1 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI3798CV200
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI6220 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI6220
index 440b714f5..440b714f5 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI6220
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI655X
index 18ddc0770..18ddc0770 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_HI655X
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_PWM
index 08193dd2c..08193dd2c 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_PWM
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_QCOM
index 2b7c64357..2b7c64357 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_XGENE b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_XGENE
index 44d0a9d9b..44d0a9d9b 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_CLK_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_RESET_HI6220 b/configs/base-generic/arm/aarch64/CONFIG_COMMON_RESET_HI6220
index a603d7319..a603d7319 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_RESET_HI6220
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMMON_RESET_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_COMPAT b/configs/base-generic/arm/aarch64/CONFIG_COMPAT
index 3e041f1b6..3e041f1b6 100644
--- a/baseconfig/arm/arm64/CONFIG_COMPAT
+++ b/configs/base-generic/arm/aarch64/CONFIG_COMPAT
diff --git a/baseconfig/arm/arm64/CONFIG_CONSOLE_TRANSLATIONS b/configs/base-generic/arm/aarch64/CONFIG_CONSOLE_TRANSLATIONS
index 983fcc993..983fcc993 100644
--- a/baseconfig/arm/arm64/CONFIG_CONSOLE_TRANSLATIONS
+++ b/configs/base-generic/arm/aarch64/CONFIG_CONSOLE_TRANSLATIONS
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64 b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64
index dd0ae2c1d..dd0ae2c1d 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_BS b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_BS
index 6e0427353..6e0427353 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_BS
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_BS
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE
index 720099599..720099599 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_BLK b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
index b07b273c0..b07b273c0 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_CCM b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
index 20ef5afff..20ef5afff 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
index 2ac813860..2ac813860 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_CRC32_ARM64 b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64
index 845ef5159..845ef5159 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_CRC32_ARM64
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
index d5226e157..d5226e157 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP
index d2f5497f2..d2f5497f2 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
index 4887c6d76..4887c6d76 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_DD b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_DD
index 18c7b900e..18c7b900e 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_DD
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_DD
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_QCE b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_QCE
index 27a3f7204..27a3f7204 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_QCE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_QCE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_SAFEXCEL
index 61cb97435..61cb97435 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_DEV_SAFEXCEL
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_GHASH_ARM64_CE b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_GHASH_ARM64_CE
index f2db2f21a..f2db2f21a 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_GHASH_ARM64_CE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_GHASH_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA1_ARM64_CE b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_SHA1_ARM64_CE
index 3fe882cad..3fe882cad 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA1_ARM64_CE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_SHA1_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA2_ARM64_CE b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_SHA2_ARM64_CE
index 5d79a86a6..5d79a86a6 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA2_ARM64_CE
+++ b/configs/base-generic/arm/aarch64/CONFIG_CRYPTO_SHA2_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_ALIGN_RODATA b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_ALIGN_RODATA
index 4b5ff5066..4b5ff5066 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_ALIGN_RODATA
+++ b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_ALIGN_RODATA
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_EFI b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_EFI
index 68b7b8a1e..68b7b8a1e 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_EFI
+++ b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_EFI
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_SECTION_MISMATCH b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_SECTION_MISMATCH
index 441e3464c..441e3464c 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_SECTION_MISMATCH
+++ b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_SECTION_MISMATCH
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_WX b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_WX
index 95e08f44b..95e08f44b 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_WX
+++ b/configs/base-generic/arm/aarch64/CONFIG_DEBUG_WX
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_HISI_KIRIN b/configs/base-generic/arm/aarch64/CONFIG_DRM_HISI_KIRIN
index 271def0dd..271def0dd 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_HISI_KIRIN
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_HISI_KIRIN
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM
index 0a1adfc20..0a1adfc20 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI
index 87b627906..87b627906 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_14NM_PHY
index 397f69094..397f69094 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_14NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_20NM_PHY
index 7595ae205..7595ae205 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_20NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
index 5d86a4597..5d86a4597 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_PHY
index ea1c4f918..ea1c4f918 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_PLL
index 16ac280e6..16ac280e6 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_DSI_PLL
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_HDMI_HDCP b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_HDMI_HDCP
index 2adc35b99..2adc35b99 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_HDMI_HDCP
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_HDMI_HDCP
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_REGISTER_LOGGING b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_REGISTER_LOGGING
index 83c03d92d..83c03d92d 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_REGISTER_LOGGING
+++ b/configs/base-generic/arm/aarch64/CONFIG_DRM_MSM_REGISTER_LOGGING
diff --git a/baseconfig/arm/arm64/CONFIG_DVB_B2C2_FLEXCOP_USB b/configs/base-generic/arm/aarch64/CONFIG_DVB_B2C2_FLEXCOP_USB
index 5f48affe6..5f48affe6 100644
--- a/baseconfig/arm/arm64/CONFIG_DVB_B2C2_FLEXCOP_USB
+++ b/configs/base-generic/arm/aarch64/CONFIG_DVB_B2C2_FLEXCOP_USB
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_IPQ806X
index 49177a6db..49177a6db 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X
+++ b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_IPQ806X
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_SUN8I
index ce05f93b3..ce05f93b3 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I
+++ b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_SUN8I
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_SUNXI
index 254fc7d8a..254fc7d8a 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_DWMAC_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_EDAC_THUNDERX b/configs/base-generic/arm/aarch64/CONFIG_EDAC_THUNDERX
index dae44bb02..dae44bb02 100644
--- a/baseconfig/arm/arm64/CONFIG_EDAC_THUNDERX
+++ b/configs/base-generic/arm/aarch64/CONFIG_EDAC_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_EDAC_XGENE b/configs/base-generic/arm/aarch64/CONFIG_EDAC_XGENE
index dbadc3572..dbadc3572 100644
--- a/baseconfig/arm/arm64/CONFIG_EDAC_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_EDAC_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288 b/configs/base-generic/arm/aarch64/CONFIG_EXTCON_AXP288
index 7fadeb58d..7fadeb58d 100644
--- a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
+++ b/configs/base-generic/arm/aarch64/CONFIG_EXTCON_AXP288
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC b/configs/base-generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC
index b52487909..b52487909 100644
--- a/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC
+++ b/configs/base-generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC
diff --git a/baseconfig/arm/arm64/CONFIG_FB_MODE_HELPERS b/configs/base-generic/arm/aarch64/CONFIG_FB_MODE_HELPERS
index 84f515748..84f515748 100644
--- a/baseconfig/arm/arm64/CONFIG_FB_MODE_HELPERS
+++ b/configs/base-generic/arm/aarch64/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER b/configs/base-generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
index 6d42a47fc..6d42a47fc 100644
--- a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER
+++ b/configs/base-generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
diff --git a/baseconfig/arm/arm64/CONFIG_FSL_ERRATUM_A008585 b/configs/base-generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
index 8dce0afd8..8dce0afd8 100644
--- a/baseconfig/arm/arm64/CONFIG_FSL_ERRATUM_A008585
+++ b/configs/base-generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
diff --git a/baseconfig/arm/arm64/CONFIG_FSL_MC_BUS b/configs/base-generic/arm/aarch64/CONFIG_FSL_MC_BUS
index dddc2f1f3..dddc2f1f3 100644
--- a/baseconfig/arm/arm64/CONFIG_FSL_MC_BUS
+++ b/configs/base-generic/arm/aarch64/CONFIG_FSL_MC_BUS
diff --git a/baseconfig/arm/arm64/CONFIG_FUJITSU_ES b/configs/base-generic/arm/aarch64/CONFIG_FUJITSU_ES
index 39b50c904..39b50c904 100644
--- a/baseconfig/arm/arm64/CONFIG_FUJITSU_ES
+++ b/configs/base-generic/arm/aarch64/CONFIG_FUJITSU_ES
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209 b/configs/base-generic/arm/aarch64/CONFIG_GPIO_AXP209
index 2365ae707..2365ae707 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_AXP209
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_MAX77620 b/configs/base-generic/arm/aarch64/CONFIG_GPIO_MAX77620
index fd5e22a31..fd5e22a31 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_MAX77620
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX b/configs/base-generic/arm/aarch64/CONFIG_GPIO_THUNDERX
index 6895cc045..6895cc045 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XGENE
index f210ebcce..f210ebcce 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE_SB b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XGENE_SB
index 01e294075..01e294075 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE_SB
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XGENE_SB
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XLP b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XLP
index f99cd41f3..f99cd41f3 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XLP
+++ b/configs/base-generic/arm/aarch64/CONFIG_GPIO_XLP
diff --git a/baseconfig/arm/arm64/CONFIG_HI6220_MBOX b/configs/base-generic/arm/aarch64/CONFIG_HI6220_MBOX
index 5fd48c60e..5fd48c60e 100644
--- a/baseconfig/arm/arm64/CONFIG_HI6220_MBOX
+++ b/configs/base-generic/arm/aarch64/CONFIG_HI6220_MBOX
diff --git a/baseconfig/arm/arm64/CONFIG_HISILICON_ERRATUM_161010101 b/configs/base-generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
index b5914254a..b5914254a 100644
--- a/baseconfig/arm/arm64/CONFIG_HISILICON_ERRATUM_161010101
+++ b/configs/base-generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
diff --git a/baseconfig/arm/arm64/CONFIG_HISILICON_IRQ_MBIGEN b/configs/base-generic/arm/aarch64/CONFIG_HISILICON_IRQ_MBIGEN
index 5ca6d30d1..5ca6d30d1 100644
--- a/baseconfig/arm/arm64/CONFIG_HISILICON_IRQ_MBIGEN
+++ b/configs/base-generic/arm/aarch64/CONFIG_HISILICON_IRQ_MBIGEN
diff --git a/baseconfig/arm/arm64/CONFIG_HISI_KIRIN_DW_DSI b/configs/base-generic/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
index cef60968e..cef60968e 100644
--- a/baseconfig/arm/arm64/CONFIG_HISI_KIRIN_DW_DSI
+++ b/configs/base-generic/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
diff --git a/baseconfig/arm/arm64/CONFIG_HISI_THERMAL b/configs/base-generic/arm/aarch64/CONFIG_HISI_THERMAL
index 05fc96b89..05fc96b89 100644
--- a/baseconfig/arm/arm64/CONFIG_HISI_THERMAL
+++ b/configs/base-generic/arm/aarch64/CONFIG_HISI_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
index f03be8a8f..f03be8a8f 100644
--- a/baseconfig/arm/arm64/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/arm/arm64/CONFIG_HVC_DCC b/configs/base-generic/arm/aarch64/CONFIG_HVC_DCC
index b2e800764..b2e800764 100644
--- a/baseconfig/arm/arm64/CONFIG_HVC_DCC
+++ b/configs/base-generic/arm/aarch64/CONFIG_HVC_DCC
diff --git a/baseconfig/arm/arm64/CONFIG_HVC_DRIVER b/configs/base-generic/arm/aarch64/CONFIG_HVC_DRIVER
index 2b13a0cc9..2b13a0cc9 100644
--- a/baseconfig/arm/arm64/CONFIG_HVC_DRIVER
+++ b/configs/base-generic/arm/aarch64/CONFIG_HVC_DRIVER
diff --git a/baseconfig/arm/arm64/CONFIG_HWSPINLOCK_QCOM b/configs/base-generic/arm/aarch64/CONFIG_HWSPINLOCK_QCOM
index 5dfdf858e..5dfdf858e 100644
--- a/baseconfig/arm/arm64/CONFIG_HWSPINLOCK_QCOM
+++ b/configs/base-generic/arm/aarch64/CONFIG_HWSPINLOCK_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_CAVIUM b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_CAVIUM
index e3bec9744..e3bec9744 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_CAVIUM
+++ b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_CAVIUM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_HISI b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
index 3f6b707f6..3f6b707f6 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_HISI
+++ b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_MSM b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_MSM
index b95d5cb24..b95d5cb24 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_OMAP
index cf37a6e35..cf37a6e35 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
+++ b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_OMAP
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_XGENE b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_XGENE
index 85af60d35..85af60d35 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_HW_RANDOM_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_HZ b/configs/base-generic/arm/aarch64/CONFIG_HZ
index bfc405e03..bfc405e03 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ
+++ b/configs/base-generic/arm/aarch64/CONFIG_HZ
diff --git a/baseconfig/arm/arm64/CONFIG_HZ_100 b/configs/base-generic/arm/aarch64/CONFIG_HZ_100
index 11bd2afa2..11bd2afa2 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ_100
+++ b/configs/base-generic/arm/aarch64/CONFIG_HZ_100
diff --git a/baseconfig/arm/arm64/CONFIG_HZ_1000 b/configs/base-generic/arm/aarch64/CONFIG_HZ_1000
index c211724d6..c211724d6 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ_1000
+++ b/configs/base-generic/arm/aarch64/CONFIG_HZ_1000
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_HIX5HD2 b/configs/base-generic/arm/aarch64/CONFIG_I2C_HIX5HD2
index 7b16fe2e5..7b16fe2e5 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_HIX5HD2
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_HIX5HD2
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_QUP b/configs/base-generic/arm/aarch64/CONFIG_I2C_QUP
index 7fb7cd350..7fb7cd350 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_QUP
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_QUP
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_SCMI b/configs/base-generic/arm/aarch64/CONFIG_I2C_SCMI
index 6e60bd4e1..6e60bd4e1 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_SCMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_SCMI
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_THUNDERX b/configs/base-generic/arm/aarch64/CONFIG_I2C_THUNDERX
index c544a8c68..c544a8c68 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_THUNDERX
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_XGENE_SLIMPRO b/configs/base-generic/arm/aarch64/CONFIG_I2C_XGENE_SLIMPRO
index 44af582d4..44af582d4 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_XGENE_SLIMPRO
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_XGENE_SLIMPRO
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX b/configs/base-generic/arm/aarch64/CONFIG_I2C_XLP9XX
index bcc41c376..bcc41c376 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX
+++ b/configs/base-generic/arm/aarch64/CONFIG_I2C_XLP9XX
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK b/configs/base-generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
+++ b/configs/base-generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_HISI_POWERKEY b/configs/base-generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
index bd59856f3..bd59856f3 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_HISI_POWERKEY
+++ b/configs/base-generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_PM8941_PWRKEY b/configs/base-generic/arm/aarch64/CONFIG_INPUT_PM8941_PWRKEY
index 24fb62b20..24fb62b20 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_PM8941_PWRKEY
+++ b/configs/base-generic/arm/aarch64/CONFIG_INPUT_PM8941_PWRKEY
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_REGULATOR_HAPTIC b/configs/base-generic/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
index 4230eab6f..4230eab6f 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_REGULATOR_HAPTIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
diff --git a/baseconfig/arm/arm64/CONFIG_IR_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_IR_SUNXI
index fe2dc68a6..fe2dc68a6 100644
--- a/baseconfig/arm/arm64/CONFIG_IR_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_IR_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_K3_DMA b/configs/base-generic/arm/aarch64/CONFIG_K3_DMA
index c64ec401c..c64ec401c 100644
--- a/baseconfig/arm/arm64/CONFIG_K3_DMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_K3_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_KEYBOARD_SUN4I_LRADC b/configs/base-generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
index 8fcbd86b6..8fcbd86b6 100644
--- a/baseconfig/arm/arm64/CONFIG_KEYBOARD_SUN4I_LRADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
diff --git a/baseconfig/arm/arm64/CONFIG_KVM b/configs/base-generic/arm/aarch64/CONFIG_KVM
index 14f90d8d6..14f90d8d6 100644
--- a/baseconfig/arm/arm64/CONFIG_KVM
+++ b/configs/base-generic/arm/aarch64/CONFIG_KVM
diff --git a/baseconfig/arm/arm64/CONFIG_LIBNVDIMM b/configs/base-generic/arm/aarch64/CONFIG_LIBNVDIMM
index aeaaefec7..aeaaefec7 100644
--- a/baseconfig/arm/arm64/CONFIG_LIBNVDIMM
+++ b/configs/base-generic/arm/aarch64/CONFIG_LIBNVDIMM
diff --git a/baseconfig/arm/arm64/CONFIG_LIQUIDIO b/configs/base-generic/arm/aarch64/CONFIG_LIQUIDIO
index 75356625e..75356625e 100644
--- a/baseconfig/arm/arm64/CONFIG_LIQUIDIO
+++ b/configs/base-generic/arm/aarch64/CONFIG_LIQUIDIO
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL b/configs/base-generic/arm/aarch64/CONFIG_MAX77620_THERMAL
index d334d3f90..d334d3f90 100644
--- a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
+++ b/configs/base-generic/arm/aarch64/CONFIG_MAX77620_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG
index f998244fd..f998244fd 100644
--- a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_HISI_FEMAC b/configs/base-generic/arm/aarch64/CONFIG_MDIO_HISI_FEMAC
index 6e4c16cf9..6e4c16cf9 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_HISI_FEMAC
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDIO_HISI_FEMAC
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_OCTEON b/configs/base-generic/arm/aarch64/CONFIG_MDIO_OCTEON
index e14c4b041..e14c4b041 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_OCTEON
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDIO_OCTEON
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_SUN4I b/configs/base-generic/arm/aarch64/CONFIG_MDIO_SUN4I
index 5bf147832..5bf147832 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_SUN4I
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDIO_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_THUNDER b/configs/base-generic/arm/aarch64/CONFIG_MDIO_THUNDER
index 00eb9a6ba..00eb9a6ba 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_THUNDER
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDIO_THUNDER
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_XGENE b/configs/base-generic/arm/aarch64/CONFIG_MDIO_XGENE
index 8a6b53a5b..8a6b53a5b 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDIO_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_MDM_GCC_9615 b/configs/base-generic/arm/aarch64/CONFIG_MDM_GCC_9615
index 4d972aff3..4d972aff3 100644
--- a/baseconfig/arm/arm64/CONFIG_MDM_GCC_9615
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDM_GCC_9615
diff --git a/baseconfig/arm/arm64/CONFIG_MDM_LCC_9615 b/configs/base-generic/arm/aarch64/CONFIG_MDM_LCC_9615
index 72f159f99..72f159f99 100644
--- a/baseconfig/arm/arm64/CONFIG_MDM_LCC_9615
+++ b/configs/base-generic/arm/aarch64/CONFIG_MDM_LCC_9615
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_MESON_GXBB_WATCHDOG
index a9c8de737..a9c8de737 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_MESON_GXBB_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY b/configs/base-generic/arm/aarch64/CONFIG_MESON_GXL_PHY
index cc59580cc..cc59580cc 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_MESON_GXL_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_MESON_WATCHDOG
index 2e5c153a9..2e5c153a9 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_MESON_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB
index 29150d51b..29150d51b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_HI655X_PMIC b/configs/base-generic/arm/aarch64/CONFIG_MFD_HI655X_PMIC
index 650829c00..650829c00 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_HI655X_PMIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_HI655X_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_MAX77620 b/configs/base-generic/arm/aarch64/CONFIG_MFD_MAX77620
index be2ba084b..be2ba084b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_MAX77620
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_QCOM_RPM b/configs/base-generic/arm/aarch64/CONFIG_MFD_QCOM_RPM
index d88a4c4c7..d88a4c4c7 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_QCOM_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_QCOM_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC b/configs/base-generic/arm/aarch64/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC b/configs/base-generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
index d156cb188..d156cb188 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SUN6I_PRCM b/configs/base-generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
index 1784bb288..1784bb288 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SUN6I_PRCM
+++ b/configs/base-generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_CAVIUM_THUNDERX b/configs/base-generic/arm/aarch64/CONFIG_MMC_CAVIUM_THUNDERX
index 8c4640a79..8c4640a79 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_CAVIUM_THUNDERX
+++ b/configs/base-generic/arm/aarch64/CONFIG_MMC_CAVIUM_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX b/configs/base-generic/arm/aarch64/CONFIG_MMC_MESON_GX
index f6d05988f..f6d05988f 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
+++ b/configs/base-generic/arm/aarch64/CONFIG_MMC_MESON_GX
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML b/configs/base-generic/arm/aarch64/CONFIG_MMC_QCOM_DML
index 48facf367..48facf367 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
+++ b/configs/base-generic/arm/aarch64/CONFIG_MMC_QCOM_DML
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_SDHCI_MSM b/configs/base-generic/arm/aarch64/CONFIG_MMC_SDHCI_MSM
index 512d452ed..512d452ed 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_SDHCI_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_MMC_SDHCI_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_MMC_SUNXI
index 0f6eda36b..0f6eda36b 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_MMC_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660 b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8660
index 9effe8611..9effe8611 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8660
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916 b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8916
index 87cf3fd89..87cf3fd89 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8916
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960 b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8960
index 03ba44b34..03ba44b34 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974 b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8974
index 8ffbd8055..8ffbd8055 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8974
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996 b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8996
index 4b01d318d..4b01d318d 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_GCC_8996
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_LCC_8960 b/configs/base-generic/arm/aarch64/CONFIG_MSM_LCC_8960
index 696554428..696554428 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_LCC_8960
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_LCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8960 b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8960
index c2ccb9997..c2ccb9997 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8960
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8974 b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8974
index 04b9f7550..04b9f7550 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8974
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8974
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8996 b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8996
index e40293af5..e40293af5 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8996
+++ b/configs/base-generic/arm/aarch64/CONFIG_MSM_MMCC_8996
diff --git a/baseconfig/arm/arm64/CONFIG_MV_XOR_V2 b/configs/base-generic/arm/aarch64/CONFIG_MV_XOR_V2
index a6e590eb8..a6e590eb8 100644
--- a/baseconfig/arm/arm64/CONFIG_MV_XOR_V2
+++ b/configs/base-generic/arm/aarch64/CONFIG_MV_XOR_V2
diff --git a/baseconfig/arm/arm64/CONFIG_ND_BLK b/configs/base-generic/arm/aarch64/CONFIG_ND_BLK
index 8a6c237d7..8a6c237d7 100644
--- a/baseconfig/arm/arm64/CONFIG_ND_BLK
+++ b/configs/base-generic/arm/aarch64/CONFIG_ND_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_ND_BTT b/configs/base-generic/arm/aarch64/CONFIG_ND_BTT
index d4e20e237..d4e20e237 100644
--- a/baseconfig/arm/arm64/CONFIG_ND_BTT
+++ b/configs/base-generic/arm/aarch64/CONFIG_ND_BTT
diff --git a/baseconfig/arm/arm64/CONFIG_NET_SB1000 b/configs/base-generic/arm/aarch64/CONFIG_NET_SB1000
index 53ead8cd1..53ead8cd1 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_SB1000
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_SB1000
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_ALLWINNER b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_ALLWINNER
index 2ff45074a..2ff45074a 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_ALLWINNER
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_ALLWINNER
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_CAVIUM b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
index 5ae580523..5ae580523 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_CAVIUM
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_QUALCOMM
index 46be71a90..46be71a90 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_QUALCOMM
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_SNI
index bb77206de..bb77206de 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_VENDOR_SNI
diff --git a/baseconfig/arm/arm64/CONFIG_NET_XGENE b/configs/base-generic/arm/aarch64/CONFIG_NET_XGENE
index 57527a616..57527a616 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_NET_XGENE_V2 b/configs/base-generic/arm/aarch64/CONFIG_NET_XGENE_V2
index 7d5cbcdbf..7d5cbcdbf 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_XGENE_V2
+++ b/configs/base-generic/arm/aarch64/CONFIG_NET_XGENE_V2
diff --git a/baseconfig/arm/arm64/CONFIG_NODES_SHIFT b/configs/base-generic/arm/aarch64/CONFIG_NODES_SHIFT
index 7647492ca..7647492ca 100644
--- a/baseconfig/arm/arm64/CONFIG_NODES_SHIFT
+++ b/configs/base-generic/arm/aarch64/CONFIG_NODES_SHIFT
diff --git a/baseconfig/arm/arm64/CONFIG_NR_CPUS b/configs/base-generic/arm/aarch64/CONFIG_NR_CPUS
index 0c4b1d904..0c4b1d904 100644
--- a/baseconfig/arm/arm64/CONFIG_NR_CPUS
+++ b/configs/base-generic/arm/aarch64/CONFIG_NR_CPUS
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA b/configs/base-generic/arm/aarch64/CONFIG_NUMA
index e480f0c04..e480f0c04 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_NUMA
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING b/configs/base-generic/arm/aarch64/CONFIG_NUMA_BALANCING
index 9de89d51d..9de89d51d 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING
+++ b/configs/base-generic/arm/aarch64/CONFIG_NUMA_BALANCING
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/configs/base-generic/arm/aarch64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 5f7402180..5f7402180 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/configs/base-generic/arm/aarch64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
diff --git a/baseconfig/arm/arm64/CONFIG_NVMEM_SUNXI_SID b/configs/base-generic/arm/aarch64/CONFIG_NVMEM_SUNXI_SID
index 454644aac..454644aac 100644
--- a/baseconfig/arm/arm64/CONFIG_NVMEM_SUNXI_SID
+++ b/configs/base-generic/arm/aarch64/CONFIG_NVMEM_SUNXI_SID
diff --git a/baseconfig/arm/arm64/CONFIG_PATA_ACPI b/configs/base-generic/arm/aarch64/CONFIG_PATA_ACPI
index c3bc7866f..c3bc7866f 100644
--- a/baseconfig/arm/arm64/CONFIG_PATA_ACPI
+++ b/configs/base-generic/arm/aarch64/CONFIG_PATA_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_PCC b/configs/base-generic/arm/aarch64/CONFIG_PCC
index 36eb8c2ab..36eb8c2ab 100644
--- a/baseconfig/arm/arm64/CONFIG_PCC
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCC
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM b/configs/base-generic/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
index cdb6169bd..cdb6169bd 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_KIRIN b/configs/base-generic/arm/aarch64/CONFIG_PCIE_KIRIN
index be6e297ea..be6e297ea 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_KIRIN
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCIE_KIRIN
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_QCOM b/configs/base-generic/arm/aarch64/CONFIG_PCIE_QCOM
index 61886f19a..61886f19a 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_QCOM
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCIE_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HISI b/configs/base-generic/arm/aarch64/CONFIG_PCI_HISI
index 468f3e431..468f3e431 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HISI
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCI_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_ECAM b/configs/base-generic/arm/aarch64/CONFIG_PCI_HOST_THUNDER_ECAM
index a812c3179..a812c3179 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_ECAM
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCI_HOST_THUNDER_ECAM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_PEM b/configs/base-generic/arm/aarch64/CONFIG_PCI_HOST_THUNDER_PEM
index 6c45e0930..6c45e0930 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_PEM
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCI_HOST_THUNDER_PEM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_XGENE b/configs/base-generic/arm/aarch64/CONFIG_PCI_XGENE
index 85317304c..85317304c 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCI_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_XGENE_MSI b/configs/base-generic/arm/aarch64/CONFIG_PCI_XGENE_MSI
index ce07c62c8..ce07c62c8 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_XGENE_MSI
+++ b/configs/base-generic/arm/aarch64/CONFIG_PCI_XGENE_MSI
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_HI6220_USB b/configs/base-generic/arm/aarch64/CONFIG_PHY_HI6220_USB
index 462bb7c31..462bb7c31 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_HI6220_USB
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_HI6220_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY b/configs/base-generic/arm/aarch64/CONFIG_PHY_MVEBU_CP110_COMPHY
index 1902b0c1f..1902b0c1f 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_MVEBU_CP110_COMPHY
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_APQ8064_SATA b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_APQ8064_SATA
index bb25b4634..bb25b4634 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_APQ8064_SATA
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_APQ8064_SATA
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_QMP
index cba57faf8..cba57faf8 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_QMP
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2 b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_QUSB2
index 6512e59d2..6512e59d2 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_QUSB2
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_UFS b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
index 50ac1d830..50ac1d830 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_UFS
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_USB_HS
index 61e98f856..61e98f856 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_USB_HS
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_USB_HSIC
index 0b25aa233..0b25aa233 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_QCOM_USB_HSIC
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB b/configs/base-generic/arm/aarch64/CONFIG_PHY_SUN4I_USB
index f619228c3..f619228c3 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_SUN4I_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN9I_USB b/configs/base-generic/arm/aarch64/CONFIG_PHY_SUN9I_USB
index 98d002535..98d002535 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_SUN9I_USB
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_SUN9I_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_XGENE b/configs/base-generic/arm/aarch64/CONFIG_PHY_XGENE
index 8d9f368f3..8d9f368f3 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_PHY_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_AMD b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_AMD
index 41cff133f..41cff133f 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_AMD
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_AMD
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8064 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_APQ8064
index 0c95df841..0c95df841 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8064
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_APQ8064
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8084 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_APQ8084
index dc701bb1f..dc701bb1f 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8084
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_APQ8084
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MAX77620 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MAX77620
index 3b44d6941..3b44d6941 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MAX77620
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MDM9615 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MDM9615
index aa3be1054..aa3be1054 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MDM9615
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MDM9615
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM
index b042dc93b..b042dc93b 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8660 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8660
index 905c9f434..905c9f434 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8660
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8660
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8916 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8916
index a7a8bd9d4..a7a8bd9d4 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8916
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8916
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8960 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8960
index 167d89960..167d89960 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8960
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8960
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8996 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8996
index 805a439d5..805a439d5 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8996
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8996
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8X74 b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8X74
index 2d68ec700..2d68ec700 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8X74
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_MSM8X74
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
index d24825e16..d24825e16 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SSBI_PMIC b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
index bc00fae73..bc00fae73 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QDF2XXX
index e8dca820d..e8dca820d 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX
+++ b/configs/base-generic/arm/aarch64/CONFIG_PINCTRL_QDF2XXX
diff --git a/baseconfig/arm/arm64/CONFIG_PMIC_OPREGION b/configs/base-generic/arm/aarch64/CONFIG_PMIC_OPREGION
index 15102fe45..15102fe45 100644
--- a/baseconfig/arm/arm64/CONFIG_PMIC_OPREGION
+++ b/configs/base-generic/arm/aarch64/CONFIG_PMIC_OPREGION
diff --git a/baseconfig/arm/arm64/CONFIG_PNP_DEBUG_MESSAGES b/configs/base-generic/arm/aarch64/CONFIG_PNP_DEBUG_MESSAGES
index cb591885f..cb591885f 100644
--- a/baseconfig/arm/arm64/CONFIG_PNP_DEBUG_MESSAGES
+++ b/configs/base-generic/arm/aarch64/CONFIG_PNP_DEBUG_MESSAGES
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_HISI b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_HISI
index c5516db40..c5516db40 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_HISI
+++ b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_MSM b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_MSM
index a7db0a2e3..a7db0a2e3 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_XGENE b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_XGENE
index 4e363c24d..4e363c24d 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_POWER_RESET_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PWM_SUN4I b/configs/base-generic/arm/aarch64/CONFIG_PWM_SUN4I
index d4f562f3f..d4f562f3f 100644
--- a/baseconfig/arm/arm64/CONFIG_PWM_SUN4I
+++ b/configs/base-generic/arm/aarch64/CONFIG_PWM_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL b/configs/base-generic/arm/aarch64/CONFIG_QCOM_ADSP_PIL
index 0aa258124..0aa258124 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_ADSP_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_APCS_IPC b/configs/base-generic/arm/aarch64/CONFIG_QCOM_APCS_IPC
index f8a0514ba..f8a0514ba 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_APCS_IPC
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_APCS_IPC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_BAM_DMA b/configs/base-generic/arm/aarch64/CONFIG_QCOM_BAM_DMA
index 84fb1a98e..84fb1a98e 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_BAM_DMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_BAM_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_CLK_RPM
index 5650c8603..5650c8603 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_CLK_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_CLK_SMD_RPM
index d355533c9..d355533c9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_CLK_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_COINCELL b/configs/base-generic/arm/aarch64/CONFIG_QCOM_COINCELL
index 6b43aa0aa..6b43aa0aa 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_COINCELL
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_COINCELL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_EBI2 b/configs/base-generic/arm/aarch64/CONFIG_QCOM_EBI2
index e96b3544e..e96b3544e 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_EBI2
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_EBI2
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_EMAC b/configs/base-generic/arm/aarch64/CONFIG_QCOM_EMAC
index 4e3fa019b..4e3fa019b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_EMAC
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_EMAC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1003 b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
index 94d6b177a..94d6b177a 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1003
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1009 b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
index 1449efafb..1449efafb 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1009
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_GSBI b/configs/base-generic/arm/aarch64/CONFIG_QCOM_GSBI
index 2711cb77b..2711cb77b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_GSBI
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_GSBI
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA b/configs/base-generic/arm/aarch64/CONFIG_QCOM_HIDMA
index a5442952f..a5442952f 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_HIDMA
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT b/configs/base-generic/arm/aarch64/CONFIG_QCOM_HIDMA_MGMT
index 8085b2ae4..8085b2ae4 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_HIDMA_MGMT
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_IOMMU b/configs/base-generic/arm/aarch64/CONFIG_QCOM_IOMMU
index b7e99b882..b7e99b882 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_IOMMU
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_IOMMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER b/configs/base-generic/arm/aarch64/CONFIG_QCOM_IRQ_COMBINER
index 6c23d15f7..6c23d15f7 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_IRQ_COMBINER
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_L2_PMU b/configs/base-generic/arm/aarch64/CONFIG_QCOM_L2_PMU
index 2a553c8b1..2a553c8b1 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_L2_PMU
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_L2_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_L3_PMU b/configs/base-generic/arm/aarch64/CONFIG_QCOM_L3_PMU
index ed899d66b..ed899d66b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_L3_PMU
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_L3_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL b/configs/base-generic/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
index 18d8fb792..18d8fb792 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_QDF2400_ERRATUM_0065 b/configs/base-generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
index dec9be970..dec9be970 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_QDF2400_ERRATUM_0065
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_QFPROM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_QFPROM
index 9df0fc659..9df0fc659 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_QFPROM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_QFPROM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMD_RPM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMD_RPM
index 4610581b9..4610581b9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMD_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMEM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMEM
index f91ef8cda..f91ef8cda 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMEM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMEM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMP2P b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMP2P
index 5fa221f74..5fa221f74 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMP2P
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMP2P
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMSM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMSM
index 210a649f7..210a649f7 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SMSM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_IADC b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_IADC
index d8601ce79..d8601ce79 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_IADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_IADC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_TEMP_ALARM b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_TEMP_ALARM
index 7155372b9..7155372b9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_TEMP_ALARM
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_TEMP_ALARM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_VADC b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_VADC
index fcc1196df..fcc1196df 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_VADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_SPMI_VADC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS b/configs/base-generic/arm/aarch64/CONFIG_QCOM_TSENS
index 0d43fc907..0d43fc907 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_TSENS
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_CTRL b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WCNSS_CTRL
index e5469ca8a..e5469ca8a 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_CTRL
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WCNSS_CTRL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WCNSS_PIL
index b13cefb38..b13cefb38 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WCNSS_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WDT b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WDT
index e4c7f9d37..e4c7f9d37 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WDT
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_WDT
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE b/configs/base-generic/arm/aarch64/CONFIG_RANDOMIZE_BASE
index 20610a95a..20610a95a 100644
--- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE
+++ b/configs/base-generic/arm/aarch64/CONFIG_RANDOMIZE_BASE
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL b/configs/base-generic/arm/aarch64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
index 7645a371e..7645a371e 100644
--- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
+++ b/configs/base-generic/arm/aarch64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
diff --git a/baseconfig/arm/arm64/CONFIG_RCU_FANOUT b/configs/base-generic/arm/aarch64/CONFIG_RCU_FANOUT
index e95447c12..e95447c12 100644
--- a/baseconfig/arm/arm64/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/arm/aarch64/CONFIG_RCU_FANOUT
diff --git a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI b/configs/base-generic/arm/aarch64/CONFIG_REGMAP_SPMI
index eba374b73..eba374b73 100644
--- a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGMAP_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_AXP20X
index 6694810a6..6694810a6 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_HI655X b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_HI655X
index c267fff85..c267fff85 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_HI655X
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_HI655X
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_MAX77620 b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_MAX77620
index db0158399..db0158399 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_MAX77620
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_RPM b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM
index 3d002cac5..3d002cac5 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SMD_RPM b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_SMD_RPM
index aae961c4b..aae961c4b 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SMD_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SPMI b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_SPMI
index c83be7aec..c83be7aec 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SPMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_REGULATOR_QCOM_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_RELOCATABLE b/configs/base-generic/arm/aarch64/CONFIG_RELOCATABLE
index 36808edb3..36808edb3 100644
--- a/baseconfig/arm/arm64/CONFIG_RELOCATABLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_RELOCATABLE
diff --git a/baseconfig/arm/arm64/CONFIG_RESET_HISI b/configs/base-generic/arm/aarch64/CONFIG_RESET_HISI
index af17d8a85..af17d8a85 100644
--- a/baseconfig/arm/arm64/CONFIG_RESET_HISI
+++ b/configs/base-generic/arm/aarch64/CONFIG_RESET_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG b/configs/base-generic/arm/aarch64/CONFIG_RPMSG
index 7cc8785d0..7cc8785d0 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG
+++ b/configs/base-generic/arm/aarch64/CONFIG_RPMSG
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_GLINK_RPM b/configs/base-generic/arm/aarch64/CONFIG_RPMSG_QCOM_GLINK_RPM
index 1f5ac58f2..1f5ac58f2 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_GLINK_RPM
+++ b/configs/base-generic/arm/aarch64/CONFIG_RPMSG_QCOM_GLINK_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD b/configs/base-generic/arm/aarch64/CONFIG_RPMSG_QCOM_SMD
index f65af3d10..f65af3d10 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD
+++ b/configs/base-generic/arm/aarch64/CONFIG_RPMSG_QCOM_SMD
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_EFI b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_EFI
index e2a2dcd64..e2a2dcd64 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_EFI
+++ b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_EFI
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PL030 b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_PL030
index 6f6f4ec88..6f6f4ec88 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PL030
+++ b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_PL030
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PM8XXX b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_PM8XXX
index adc778ea4..adc778ea4 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PM8XXX
+++ b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_PM8XXX
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I
index 54410db09..54410db09 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
+++ b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_XGENE b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_XGENE
index f6897ba60..f6897ba60 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_RTC_DRV_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_SATA_AHCI_SEATTLE b/configs/base-generic/arm/aarch64/CONFIG_SATA_AHCI_SEATTLE
index dfcf03f07..dfcf03f07 100644
--- a/baseconfig/arm/arm64/CONFIG_SATA_AHCI_SEATTLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_SATA_AHCI_SEATTLE
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_ACPI_POWER b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
index dbb45c01b..dbb45c01b 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_ACPI_POWER
+++ b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_LTC2978_REGULATOR b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_LTC2978_REGULATOR
index 54d82ddb6..54d82ddb6 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_LTC2978_REGULATOR
+++ b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_LTC2978_REGULATOR
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_XGENE b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_XGENE
index 84ffdf1e9..84ffdf1e9 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_XGENE
+++ b/configs/base-generic/arm/aarch64/CONFIG_SENSORS_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_AMBA_PL010 b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_AMBA_PL010
index ee4b9d52a..ee4b9d52a 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_AMBA_PL010
+++ b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_AMBA_PL010
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_MSM
index d9bd71619..d9bd71619 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM_CONSOLE b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_MSM_CONSOLE
index 5aeaebb23..5aeaebb23 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM_CONSOLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_SERIAL_MSM_CONSOLE
diff --git a/baseconfig/arm/arm64/CONFIG_SERIO_SUN4I_PS2 b/configs/base-generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
index aa105b326..aa105b326 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIO_SUN4I_PS2
+++ b/configs/base-generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
diff --git a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC b/configs/base-generic/arm/aarch64/CONFIG_SND_KIRKWOOD_SOC
index 05e82f2e9..05e82f2e9 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_KIRKWOOD_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_APQ8016_SBC
index dfe53b84d..dfe53b84d 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_APQ8016_SBC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index 207a5e523..207a5e523 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
index db12f036e..db12f036e 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_QCOM
index 719eb4e3d..719eb4e3d 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_SGTL5000
index ea71dece1..ea71dece1 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_STORM
index adab3ae82..adab3ae82 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_STORM
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA
index b32a04ff3..b32a04ff3 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_MAX98090
index 55f327a38..55f327a38 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_MAX98090
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5640
index 3370b8ec2..3370b8ec2 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5640
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5677
index 24298d93b..24298d93b 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5677
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_SGTL5000
index 4706a31c1..4706a31c1 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_SGTL5000
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_WM8753
index 9039b1695..9039b1695 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SOC_TEGRA_WM8753
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC
index 6cce5a1f7..6cce5a1f7 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_I2S
index d9270e25b..d9270e25b 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_I2S
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
index c0b108aba..c0b108aba 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC
index c30f94369..c30f94369 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG
index 28ea30190..28ea30190 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG
diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/configs/base-generic/arm/aarch64/CONFIG_SNI_NETSEC
index c348519ff..c348519ff 100644
--- a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SNI_NETSEC
diff --git a/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS b/configs/base-generic/arm/aarch64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
index ded5c358e..ded5c358e 100644
--- a/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
+++ b/configs/base-generic/arm/aarch64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
diff --git a/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL b/configs/base-generic/arm/aarch64/CONFIG_SOC_TEGRA_FLOWCTRL
index 00413d459..00413d459 100644
--- a/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL
+++ b/configs/base-generic/arm/aarch64/CONFIG_SOC_TEGRA_FLOWCTRL
diff --git a/baseconfig/arm/arm64/CONFIG_SPARSEMEM_VMEMMAP b/configs/base-generic/arm/aarch64/CONFIG_SPARSEMEM_VMEMMAP
index a2826dacd..a2826dacd 100644
--- a/baseconfig/arm/arm64/CONFIG_SPARSEMEM_VMEMMAP
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPARSEMEM_VMEMMAP
diff --git a/baseconfig/arm/arm64/CONFIG_SPARSE_IRQ b/configs/base-generic/arm/aarch64/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/arm/arm64/CONFIG_SPARSE_IRQ
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_QUP b/configs/base-generic/arm/aarch64/CONFIG_SPI_QUP
index 4cfdd1db0..4cfdd1db0 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_QUP
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPI_QUP
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I b/configs/base-generic/arm/aarch64/CONFIG_SPI_SUN6I
index 031cd17b9..031cd17b9 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPI_SUN6I
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_THUNDERX b/configs/base-generic/arm/aarch64/CONFIG_SPI_THUNDERX
index 054a83114..054a83114 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_THUNDERX
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPI_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_XLP b/configs/base-generic/arm/aarch64/CONFIG_SPI_XLP
index 6026d5f51..6026d5f51 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_XLP
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPI_XLP
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI b/configs/base-generic/arm/aarch64/CONFIG_SPMI
index 4ce4dfde9..4ce4dfde9 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB b/configs/base-generic/arm/aarch64/CONFIG_SPMI_MSM_PMIC_ARB
index bd46b497a..bd46b497a 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB
+++ b/configs/base-generic/arm/aarch64/CONFIG_SPMI_MSM_PMIC_ARB
diff --git a/baseconfig/arm/arm64/CONFIG_STUB_CLK_HI6220 b/configs/base-generic/arm/aarch64/CONFIG_STUB_CLK_HI6220
index 89a60a424..89a60a424 100644
--- a/baseconfig/arm/arm64/CONFIG_STUB_CLK_HI6220
+++ b/configs/base-generic/arm/aarch64/CONFIG_STUB_CLK_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_SUN4I_EMAC b/configs/base-generic/arm/aarch64/CONFIG_SUN4I_EMAC
index 7c44fecee..7c44fecee 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN4I_EMAC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SUN4I_EMAC
diff --git a/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC b/configs/base-generic/arm/aarch64/CONFIG_SUN4I_GPADC
index 97139c216..97139c216 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC
+++ b/configs/base-generic/arm/aarch64/CONFIG_SUN4I_GPADC
diff --git a/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU b/configs/base-generic/arm/aarch64/CONFIG_SUN50I_A64_CCU
index 7b6c7a687..7b6c7a687 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU
+++ b/configs/base-generic/arm/aarch64/CONFIG_SUN50I_A64_CCU
diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_CCU b/configs/base-generic/arm/aarch64/CONFIG_SUNXI_CCU
index 30e6d69d1..30e6d69d1 100644
--- a/baseconfig/arm/arm64/CONFIG_SUNXI_CCU
+++ b/configs/base-generic/arm/aarch64/CONFIG_SUNXI_CCU
diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_WATCHDOG b/configs/base-generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG
index 9b58f97fb..9b58f97fb 100644
--- a/baseconfig/arm/arm64/CONFIG_SUNXI_WATCHDOG
+++ b/configs/base-generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_SYS_HYPERVISOR b/configs/base-generic/arm/aarch64/CONFIG_SYS_HYPERVISOR
index b5668db06..b5668db06 100644
--- a/baseconfig/arm/arm64/CONFIG_SYS_HYPERVISOR
+++ b/configs/base-generic/arm/aarch64/CONFIG_SYS_HYPERVISOR
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA210_ADMA b/configs/base-generic/arm/aarch64/CONFIG_TEGRA210_ADMA
index 7f82adad1..7f82adad1 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA210_ADMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_TEGRA210_ADMA
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_ACONNECT b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_ACONNECT
index 251550c81..251550c81 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_ACONNECT
+++ b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_ACONNECT
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_GMI
index 5def3e891..5def3e891 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
+++ b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_GMI
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_IVC b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_IVC
index cdcacbec2..cdcacbec2 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_IVC
+++ b/configs/base-generic/arm/aarch64/CONFIG_TEGRA_IVC
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_BGX b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
index 123fe6f48..123fe6f48 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_BGX
+++ b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_PF b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
index 6b047a13c..6b047a13c 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_PF
+++ b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_RGX b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
index c50ae013f..c50ae013f 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_RGX
+++ b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_VF b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
index 5fdfca5db..5fdfca5db 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_VF
+++ b/configs/base-generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
diff --git a/baseconfig/arm/arm64/CONFIG_TOUCHSCREEN_SUN4I b/configs/base-generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
index af15c1f8c..af15c1f8c 100644
--- a/baseconfig/arm/arm64/CONFIG_TOUCHSCREEN_SUN4I
+++ b/configs/base-generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS b/configs/base-generic/arm/aarch64/CONFIG_USB_CONFIGFS_F_LB_SS
index 213edb5a1..213edb5a1 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_CONFIGFS_F_LB_SS
diff --git a/baseconfig/arm/arm64/CONFIG_USB_EHCI_MSM b/configs/base-generic/arm/aarch64/CONFIG_USB_EHCI_MSM
index 7397a0f15..7397a0f15 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_EHCI_MSM
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_EHCI_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MSM_OTG b/configs/base-generic/arm/aarch64/CONFIG_USB_MSM_OTG
index 043abcf37..043abcf37 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_MSM_OTG
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_MSM_OTG
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI b/configs/base-generic/arm/aarch64/CONFIG_USB_MUSB_SUNXI
index 258e716ab..258e716ab 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_MUSB_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_USB_QCOM_8X16_PHY b/configs/base-generic/arm/aarch64/CONFIG_USB_QCOM_8X16_PHY
index 79fac4fdc..79fac4fdc 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_QCOM_8X16_PHY
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_QCOM_8X16_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_USB_SPEEDTOUCH b/configs/base-generic/arm/aarch64/CONFIG_USB_SPEEDTOUCH
index e34bebc62..e34bebc62 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_SPEEDTOUCH
+++ b/configs/base-generic/arm/aarch64/CONFIG_USB_SPEEDTOUCH
diff --git a/baseconfig/arm/arm64/CONFIG_VDSO b/configs/base-generic/arm/aarch64/CONFIG_VDSO
index cab5ebafb..cab5ebafb 100644
--- a/baseconfig/arm/arm64/CONFIG_VDSO
+++ b/configs/base-generic/arm/aarch64/CONFIG_VDSO
diff --git a/baseconfig/arm/arm64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET b/configs/base-generic/arm/aarch64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
index b6b1ee3b0..b6b1ee3b0 100644
--- a/baseconfig/arm/arm64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
+++ b/configs/base-generic/arm/aarch64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
diff --git a/baseconfig/arm/arm64/CONFIG_VGA_CONSOLE b/configs/base-generic/arm/aarch64/CONFIG_VGA_CONSOLE
index 5b00b2f22..5b00b2f22 100644
--- a/baseconfig/arm/arm64/CONFIG_VGA_CONSOLE
+++ b/configs/base-generic/arm/aarch64/CONFIG_VGA_CONSOLE
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS b/configs/base-generic/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
index 5e2512c4c..5e2512c4c 100644
--- a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
+++ b/configs/base-generic/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_VENUS b/configs/base-generic/arm/aarch64/CONFIG_VIDEO_QCOM_VENUS
index 68082fdff..68082fdff 100644
--- a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_VENUS
+++ b/configs/base-generic/arm/aarch64/CONFIG_VIDEO_QCOM_VENUS
diff --git a/baseconfig/arm/arm64/CONFIG_VMAP_STACK b/configs/base-generic/arm/aarch64/CONFIG_VMAP_STACK
index 8bd986875..8bd986875 100644
--- a/baseconfig/arm/arm64/CONFIG_VMAP_STACK
+++ b/configs/base-generic/arm/aarch64/CONFIG_VMAP_STACK
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_DMA b/configs/base-generic/arm/aarch64/CONFIG_XGENE_DMA
index 7c67d5b57..7c67d5b57 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_DMA
+++ b/configs/base-generic/arm/aarch64/CONFIG_XGENE_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_PMU b/configs/base-generic/arm/aarch64/CONFIG_XGENE_PMU
index df5afee9f..df5afee9f 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_PMU
+++ b/configs/base-generic/arm/aarch64/CONFIG_XGENE_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_SLIMPRO_MBOX b/configs/base-generic/arm/aarch64/CONFIG_XGENE_SLIMPRO_MBOX
index cbc486395..cbc486395 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_SLIMPRO_MBOX
+++ b/configs/base-generic/arm/aarch64/CONFIG_XGENE_SLIMPRO_MBOX
diff --git a/baseconfig/arm/arm64/README b/configs/base-generic/arm/aarch64/README
index c2aec64b2..c2aec64b2 100644
--- a/baseconfig/arm/arm64/README
+++ b/configs/base-generic/arm/aarch64/README
diff --git a/baseconfig/arm/armv7/CONFIG_88EU_AP_MODE b/configs/base-generic/arm/armv7/CONFIG_88EU_AP_MODE
index 55fc5ec1e..55fc5ec1e 100644
--- a/baseconfig/arm/armv7/CONFIG_88EU_AP_MODE
+++ b/configs/base-generic/arm/armv7/CONFIG_88EU_AP_MODE
diff --git a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT
index 276716ea2..276716ea2 100644
--- a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT
+++ b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT
diff --git a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT_I2C b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT_I2C
index 121234256..121234256 100644
--- a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT_SPI b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT_SPI
index 27c1ece96..27c1ece96 100644
--- a/baseconfig/arm/armv7/CONFIG_AD525X_DPOT_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_AD525X_DPOT_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_AEABI b/configs/base-generic/arm/armv7/CONFIG_AEABI
index 1d6fccef4..1d6fccef4 100644
--- a/baseconfig/arm/armv7/CONFIG_AEABI
+++ b/configs/base-generic/arm/armv7/CONFIG_AEABI
diff --git a/baseconfig/arm/armv7/CONFIG_AHCI_DM816 b/configs/base-generic/arm/armv7/CONFIG_AHCI_DM816
index ba4b51891..ba4b51891 100644
--- a/baseconfig/arm/armv7/CONFIG_AHCI_DM816
+++ b/configs/base-generic/arm/armv7/CONFIG_AHCI_DM816
diff --git a/baseconfig/arm/armv7/CONFIG_AHCI_SUNXI b/configs/base-generic/arm/armv7/CONFIG_AHCI_SUNXI
index 91560d628..91560d628 100644
--- a/baseconfig/arm/armv7/CONFIG_AHCI_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_AHCI_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_AMBA_PL08X b/configs/base-generic/arm/armv7/CONFIG_AMBA_PL08X
index 1a5efbf95..1a5efbf95 100644
--- a/baseconfig/arm/armv7/CONFIG_AMBA_PL08X
+++ b/configs/base-generic/arm/armv7/CONFIG_AMBA_PL08X
diff --git a/baseconfig/arm/armv7/CONFIG_APM_EMULATION b/configs/base-generic/arm/armv7/CONFIG_APM_EMULATION
index 8b5b00cd8..8b5b00cd8 100644
--- a/baseconfig/arm/armv7/CONFIG_APM_EMULATION
+++ b/configs/base-generic/arm/armv7/CONFIG_APM_EMULATION
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_ALPINE b/configs/base-generic/arm/armv7/CONFIG_ARCH_ALPINE
index a347a04fc..a347a04fc 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_ALPINE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_ALPINE
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_ARTPEC b/configs/base-generic/arm/armv7/CONFIG_ARCH_ARTPEC
index 450cb8c55..450cb8c55 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_ARTPEC
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_ARTPEC
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_AT91 b/configs/base-generic/arm/armv7/CONFIG_ARCH_AT91
index 066d1573e..066d1573e 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_AT91
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_AT91
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_DIGICOLOR b/configs/base-generic/arm/armv7/CONFIG_ARCH_DIGICOLOR
index 794f793ae..794f793ae 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_DIGICOLOR
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_DIGICOLOR
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS
index 0f78bbea3..0f78bbea3 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS3 b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS3
index 7ee4d6f72..7ee4d6f72 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS3
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS3
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS4 b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS4
index b57151914..b57151914 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS4
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS4
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS5 b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS5
index 4b844f850..4b844f850 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_EXYNOS5
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_EXYNOS5
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_HAS_TICK_BROADCAST b/configs/base-generic/arm/armv7/CONFIG_ARCH_HAS_TICK_BROADCAST
index 869e3ebc6..869e3ebc6 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_HAS_TICK_BROADCAST
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_HAS_TICK_BROADCAST
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_HI3xxx b/configs/base-generic/arm/armv7/CONFIG_ARCH_HI3xxx
index 0730b81e5..0730b81e5 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_HI3xxx
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_HI3xxx
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_HIGHBANK b/configs/base-generic/arm/armv7/CONFIG_ARCH_HIGHBANK
index fa428ad09..fa428ad09 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_HIGHBANK
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_HIGHBANK
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_HISI b/configs/base-generic/arm/armv7/CONFIG_ARCH_HISI
index b15280045..b15280045 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_HISI
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_HISI
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MEDIATEK b/configs/base-generic/arm/armv7/CONFIG_ARCH_MEDIATEK
index 62b0a1f19..62b0a1f19 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MEDIATEK
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_MEDIATEK
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MMP b/configs/base-generic/arm/armv7/CONFIG_ARCH_MMP
index 2e98031f4..2e98031f4 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MMP
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_MMP
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MULTI_V6 b/configs/base-generic/arm/armv7/CONFIG_ARCH_MULTI_V6
index a405e69af..a405e69af 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MULTI_V6
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_MULTI_V6
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MULTI_V7 b/configs/base-generic/arm/armv7/CONFIG_ARCH_MULTI_V7
index 109933e66..109933e66 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MULTI_V7
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_MULTI_V7
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_QCOM b/configs/base-generic/arm/armv7/CONFIG_ARCH_QCOM
index 7d7502c0e..7d7502c0e 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_QCOM
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_QCOM
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_REALVIEW b/configs/base-generic/arm/armv7/CONFIG_ARCH_REALVIEW
index c6275cedc..c6275cedc 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_REALVIEW
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_REALVIEW
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_RENESAS b/configs/base-generic/arm/armv7/CONFIG_ARCH_RENESAS
index 0fa3a2ec3..0fa3a2ec3 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_RENESAS
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_RENESAS
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_S5PV210 b/configs/base-generic/arm/armv7/CONFIG_ARCH_S5PV210
index d6b8179a3..d6b8179a3 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_S5PV210
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_S5PV210
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI b/configs/base-generic/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI
index a65e4de45..a65e4de45 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_SIRF b/configs/base-generic/arm/armv7/CONFIG_ARCH_SIRF
index fddefe0a2..fddefe0a2 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_SIRF
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_SIRF
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_SOCFPGA b/configs/base-generic/arm/armv7/CONFIG_ARCH_SOCFPGA
index e00c4c507..e00c4c507 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_SOCFPGA
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_SOCFPGA
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_STI b/configs/base-generic/arm/armv7/CONFIG_ARCH_STI
index 285a52f23..285a52f23 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_STI
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_STI
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_SUNXI b/configs/base-generic/arm/armv7/CONFIG_ARCH_SUNXI
index 6cf4026fd..6cf4026fd 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_TANGO b/configs/base-generic/arm/armv7/CONFIG_ARCH_TANGO
index 36da18643..36da18643 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_TANGO
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_TANGO
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA
index 3b74d56f4..3b74d56f4 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA_114_SOC b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA_114_SOC
index f9b6c42c8..f9b6c42c8 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA_114_SOC
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA_114_SOC
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA_124_SOC b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA_124_SOC
index 91073facb..91073facb 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_TEGRA_124_SOC
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_TEGRA_124_SOC
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_U8500 b/configs/base-generic/arm/armv7/CONFIG_ARCH_U8500
index 0f4f5a020..0f4f5a020 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_U8500
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_U8500
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_UNIPHIER b/configs/base-generic/arm/armv7/CONFIG_ARCH_UNIPHIER
index 2c1103337..2c1103337 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_UNIPHIER
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_UNIPHIER
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
index d62efe1f5..d62efe1f5 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_DCSCB b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_DCSCB
index e21d3b97d..e21d3b97d 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_DCSCB
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_DCSCB
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_SPC b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_SPC
index 8b8b11688..8b8b11688 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_SPC
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_SPC
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_TC2_PM b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_TC2_PM
index 409b80a82..409b80a82 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_VEXPRESS_TC2_PM
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_VEXPRESS_TC2_PM
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_VIRT b/configs/base-generic/arm/armv7/CONFIG_ARCH_VIRT
index 7b41203d8..7b41203d8 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_VIRT
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_VIRT
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_WM8850 b/configs/base-generic/arm/armv7/CONFIG_ARCH_WM8850
index 880f60bcf..880f60bcf 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_WM8850
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_WM8850
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_ZX b/configs/base-generic/arm/armv7/CONFIG_ARCH_ZX
index ec10bbf1d..ec10bbf1d 100644
--- a/baseconfig/arm/armv7/CONFIG_ARCH_ZX
+++ b/configs/base-generic/arm/armv7/CONFIG_ARCH_ZX
diff --git a/baseconfig/arm/armv7/CONFIG_ARM b/configs/base-generic/arm/armv7/CONFIG_ARM
index a2666cde3..a2666cde3 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_APPENDED_DTB b/configs/base-generic/arm/armv7/CONFIG_ARM_APPENDED_DTB
index d120f726d..d120f726d 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_APPENDED_DTB
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_APPENDED_DTB
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ASM_UNIFIED b/configs/base-generic/arm/armv7/CONFIG_ARM_ASM_UNIFIED
index c25f08497..c25f08497 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ASM_UNIFIED
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ASM_UNIFIED
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ATAG_DTB_COMPAT b/configs/base-generic/arm/armv7/CONFIG_ARM_ATAG_DTB_COMPAT
index f3aa315a5..f3aa315a5 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ATAG_DTB_COMPAT
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ATAG_DTB_COMPAT
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUFREQ
index 8b76dfa84..8b76dfa84 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUIDLE b/configs/base-generic/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUIDLE
index 6bcbdd554..6bcbdd554 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUIDLE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_BIG_LITTLE_CPUIDLE
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_CPU_SUSPEND b/configs/base-generic/arm/armv7/CONFIG_ARM_CPU_SUSPEND
index 8598c86dd..8598c86dd 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_CPU_SUSPEND
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_CPU_SUSPEND
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_CPU_TOPOLOGY b/configs/base-generic/arm/armv7/CONFIG_ARM_CPU_TOPOLOGY
index 1578fa4a2..1578fa4a2 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_CPU_TOPOLOGY
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_CPU_TOPOLOGY
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_326103 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_326103
index 61c20ab26..61c20ab26 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_326103
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_326103
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_411920 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_411920
index 3b3af3caa..3b3af3caa 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_411920
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_411920
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_430973 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_430973
index e0c23c886..e0c23c886 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_430973
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_430973
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_458693 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_458693
index 87b4db118..87b4db118 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_458693
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_458693
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_460075 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_460075
index c10fc16c6..c10fc16c6 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_460075
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_460075
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_643719 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_643719
index e87186e7e..e87186e7e 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_643719
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_643719
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_720789 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_720789
index 67ab1927a..67ab1927a 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_720789
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_720789
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_742230 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_742230
index cab5fc4f3..cab5fc4f3 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_742230
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_742230
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_742231 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_742231
index 4d3c9b1ee..4d3c9b1ee 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_742231
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_742231
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_743622 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_743622
index 680242c39..680242c39 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_743622
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_743622
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_751472 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_751472
index b7add96f0..b7add96f0 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_751472
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_751472
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_754322 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_754322
index e187c2f33..e187c2f33 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_754322
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_754322
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_754327 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_754327
index 3f04d2636..3f04d2636 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_754327
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_754327
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_764369 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_764369
index 970af5c73..970af5c73 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_764369
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_764369
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_773022 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_773022
index a9a65a362..a9a65a362 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_773022
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_773022
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_775420 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_775420
index 17baf333c..17baf333c 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_775420
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_775420
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_798181 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_798181
index 6e621e98f..6e621e98f 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_798181
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_798181
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_818325_852422 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_818325_852422
index b69685a46..b69685a46 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_818325_852422
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_818325_852422
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_821420 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_821420
index c6f28f9c8..c6f28f9c8 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_821420
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_821420
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_825619 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_825619
index bde99ebb9..bde99ebb9 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_825619
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_825619
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_852421 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_852421
index 00aefd28e..00aefd28e 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_852421
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_852421
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_852423 b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_852423
index 721f0e7a1..721f0e7a1 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_ERRATA_852423
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_ERRATA_852423
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ
index 67452f022..67452f022 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
index ab6fb6341..ab6fb6341 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_CPUIDLE b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS_CPUIDLE
index f57f77b8a..f57f77b8a 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_CPUIDLE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_EXYNOS_CPUIDLE
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_HIGHBANK_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_HIGHBANK_CPUFREQ
index 6f1a306ba..6f1a306ba 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_HIGHBANK_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_HIGHBANK_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_HIGHBANK_CPUIDLE b/configs/base-generic/arm/armv7/CONFIG_ARM_HIGHBANK_CPUIDLE
index d5ec835a4..d5ec835a4 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_HIGHBANK_CPUIDLE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_HIGHBANK_CPUIDLE
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_KPROBES_TEST b/configs/base-generic/arm/armv7/CONFIG_ARM_KPROBES_TEST
index edbf1e178..edbf1e178 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_KPROBES_TEST
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_KPROBES_TEST
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_MODULE_PLTS b/configs/base-generic/arm/armv7/CONFIG_ARM_MODULE_PLTS
index 0affc862e..0affc862e 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_MODULE_PLTS
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_MODULE_PLTS
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_MVEBU_V7_CPUIDLE b/configs/base-generic/arm/armv7/CONFIG_ARM_MVEBU_V7_CPUIDLE
index 11e3a8cab..11e3a8cab 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_MVEBU_V7_CPUIDLE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_MVEBU_V7_CPUIDLE
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_PATCH_IDIV b/configs/base-generic/arm/armv7/CONFIG_ARM_PATCH_IDIV
index e715e3c23..e715e3c23 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_PATCH_IDIV
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_PATCH_IDIV
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_SCPI_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_SCPI_CPUFREQ
index f2b7060d6..f2b7060d6 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_SCPI_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_SCPI_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
index d64e3e373..d64e3e373 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_THUMB b/configs/base-generic/arm/armv7/CONFIG_ARM_THUMB
index c295f6069..c295f6069 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_THUMB
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_THUMB
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_THUMBEE b/configs/base-generic/arm/armv7/CONFIG_ARM_THUMBEE
index d7d3213ee..d7d3213ee 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_THUMBEE
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_THUMBEE
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_UNWIND b/configs/base-generic/arm/armv7/CONFIG_ARM_UNWIND
index c8410cea2..c8410cea2 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_UNWIND
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_UNWIND
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_VEXPRESS_SPC_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_ARM_VEXPRESS_SPC_CPUFREQ
index 2dd99b972..2dd99b972 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_VEXPRESS_SPC_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_VEXPRESS_SPC_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_VIRT_EXT b/configs/base-generic/arm/armv7/CONFIG_ARM_VIRT_EXT
index f3e65c73a..f3e65c73a 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_VIRT_EXT
+++ b/configs/base-generic/arm/armv7/CONFIG_ARM_VIRT_EXT
diff --git a/baseconfig/arm/armv7/CONFIG_ATAGS b/configs/base-generic/arm/armv7/CONFIG_ATAGS
index 391f42be6..391f42be6 100644
--- a/baseconfig/arm/armv7/CONFIG_ATAGS
+++ b/configs/base-generic/arm/armv7/CONFIG_ATAGS
diff --git a/baseconfig/arm/armv7/CONFIG_ATAGS_PROC b/configs/base-generic/arm/armv7/CONFIG_ATAGS_PROC
index b17760bde..b17760bde 100644
--- a/baseconfig/arm/armv7/CONFIG_ATAGS_PROC
+++ b/configs/base-generic/arm/armv7/CONFIG_ATAGS_PROC
diff --git a/baseconfig/arm/armv7/CONFIG_ATM_HE b/configs/base-generic/arm/armv7/CONFIG_ATM_HE
index 99db55bf0..99db55bf0 100644
--- a/baseconfig/arm/armv7/CONFIG_ATM_HE
+++ b/configs/base-generic/arm/armv7/CONFIG_ATM_HE
diff --git a/baseconfig/arm/armv7/CONFIG_AUTO_ZRELADDR b/configs/base-generic/arm/armv7/CONFIG_AUTO_ZRELADDR
index 6a3f4d99c..6a3f4d99c 100644
--- a/baseconfig/arm/armv7/CONFIG_AUTO_ZRELADDR
+++ b/configs/base-generic/arm/armv7/CONFIG_AUTO_ZRELADDR
diff --git a/baseconfig/arm/armv7/CONFIG_AX88796 b/configs/base-generic/arm/armv7/CONFIG_AX88796
index 6770cb2a9..6770cb2a9 100644
--- a/baseconfig/arm/armv7/CONFIG_AX88796
+++ b/configs/base-generic/arm/armv7/CONFIG_AX88796
diff --git a/baseconfig/arm/armv7/CONFIG_AX88796_93CX6 b/configs/base-generic/arm/armv7/CONFIG_AX88796_93CX6
index e945c9697..e945c9697 100644
--- a/baseconfig/arm/armv7/CONFIG_AX88796_93CX6
+++ b/configs/base-generic/arm/armv7/CONFIG_AX88796_93CX6
diff --git a/baseconfig/arm/armv7/CONFIG_AXP20X_ADC b/configs/base-generic/arm/armv7/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/baseconfig/arm/armv7/CONFIG_AXP20X_ADC
+++ b/configs/base-generic/arm/armv7/CONFIG_AXP20X_ADC
diff --git a/baseconfig/arm/armv7/CONFIG_AXP20X_POWER b/configs/base-generic/arm/armv7/CONFIG_AXP20X_POWER
index ddf89f551..ddf89f551 100644
--- a/baseconfig/arm/armv7/CONFIG_AXP20X_POWER
+++ b/configs/base-generic/arm/armv7/CONFIG_AXP20X_POWER
diff --git a/baseconfig/arm/armv7/CONFIG_AXP288_ADC b/configs/base-generic/arm/armv7/CONFIG_AXP288_ADC
index e138f36af..e138f36af 100644
--- a/baseconfig/arm/armv7/CONFIG_AXP288_ADC
+++ b/configs/base-generic/arm/armv7/CONFIG_AXP288_ADC
diff --git a/baseconfig/arm/armv7/CONFIG_AXP288_CHARGER b/configs/base-generic/arm/armv7/CONFIG_AXP288_CHARGER
index 0418f962c..0418f962c 100644
--- a/baseconfig/arm/armv7/CONFIG_AXP288_CHARGER
+++ b/configs/base-generic/arm/armv7/CONFIG_AXP288_CHARGER
diff --git a/baseconfig/arm/armv7/CONFIG_AXP288_FUEL_GAUGE b/configs/base-generic/arm/armv7/CONFIG_AXP288_FUEL_GAUGE
index e171b954b..e171b954b 100644
--- a/baseconfig/arm/armv7/CONFIG_AXP288_FUEL_GAUGE
+++ b/configs/base-generic/arm/armv7/CONFIG_AXP288_FUEL_GAUGE
diff --git a/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X b/configs/base-generic/arm/armv7/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X
+++ b/configs/base-generic/arm/armv7/CONFIG_BATTERY_AXP20X
diff --git a/baseconfig/arm/armv7/CONFIG_BATTERY_SBS b/configs/base-generic/arm/armv7/CONFIG_BATTERY_SBS
index b364b07f0..b364b07f0 100644
--- a/baseconfig/arm/armv7/CONFIG_BATTERY_SBS
+++ b/configs/base-generic/arm/armv7/CONFIG_BATTERY_SBS
diff --git a/baseconfig/arm/armv7/CONFIG_BIG_LITTLE b/configs/base-generic/arm/armv7/CONFIG_BIG_LITTLE
index e8077c8f9..e8077c8f9 100644
--- a/baseconfig/arm/armv7/CONFIG_BIG_LITTLE
+++ b/configs/base-generic/arm/armv7/CONFIG_BIG_LITTLE
diff --git a/baseconfig/arm/armv7/CONFIG_BL_SWITCHER b/configs/base-generic/arm/armv7/CONFIG_BL_SWITCHER
index e237c0265..e237c0265 100644
--- a/baseconfig/arm/armv7/CONFIG_BL_SWITCHER
+++ b/configs/base-generic/arm/armv7/CONFIG_BL_SWITCHER
diff --git a/baseconfig/arm/armv7/CONFIG_BL_SWITCHER_DUMMY_IF b/configs/base-generic/arm/armv7/CONFIG_BL_SWITCHER_DUMMY_IF
index 8636a9707..8636a9707 100644
--- a/baseconfig/arm/armv7/CONFIG_BL_SWITCHER_DUMMY_IF
+++ b/configs/base-generic/arm/armv7/CONFIG_BL_SWITCHER_DUMMY_IF
diff --git a/baseconfig/arm/armv7/CONFIG_BRCMSTB_GISB_ARB b/configs/base-generic/arm/armv7/CONFIG_BRCMSTB_GISB_ARB
index 36e31edd2..36e31edd2 100644
--- a/baseconfig/arm/armv7/CONFIG_BRCMSTB_GISB_ARB
+++ b/configs/base-generic/arm/armv7/CONFIG_BRCMSTB_GISB_ARB
diff --git a/baseconfig/arm/armv7/CONFIG_CACHE_FEROCEON_L2 b/configs/base-generic/arm/armv7/CONFIG_CACHE_FEROCEON_L2
index 36581c774..36581c774 100644
--- a/baseconfig/arm/armv7/CONFIG_CACHE_FEROCEON_L2
+++ b/configs/base-generic/arm/armv7/CONFIG_CACHE_FEROCEON_L2
diff --git a/baseconfig/arm/armv7/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH b/configs/base-generic/arm/armv7/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
index 533b65fb7..533b65fb7 100644
--- a/baseconfig/arm/armv7/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
+++ b/configs/base-generic/arm/armv7/CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
diff --git a/baseconfig/arm/armv7/CONFIG_CACHE_L2X0 b/configs/base-generic/arm/armv7/CONFIG_CACHE_L2X0
index 6d1f543da..6d1f543da 100644
--- a/baseconfig/arm/armv7/CONFIG_CACHE_L2X0
+++ b/configs/base-generic/arm/armv7/CONFIG_CACHE_L2X0
diff --git a/baseconfig/arm/armv7/CONFIG_CACHE_L2X0_PMU b/configs/base-generic/arm/armv7/CONFIG_CACHE_L2X0_PMU
index 87747258a..87747258a 100644
--- a/baseconfig/arm/armv7/CONFIG_CACHE_L2X0_PMU
+++ b/configs/base-generic/arm/armv7/CONFIG_CACHE_L2X0_PMU
diff --git a/baseconfig/arm/armv7/CONFIG_CACHE_TAUROS2 b/configs/base-generic/arm/armv7/CONFIG_CACHE_TAUROS2
index fbd8e2848..fbd8e2848 100644
--- a/baseconfig/arm/armv7/CONFIG_CACHE_TAUROS2
+++ b/configs/base-generic/arm/armv7/CONFIG_CACHE_TAUROS2
diff --git a/baseconfig/arm/armv7/CONFIG_CAN_FLEXCAN b/configs/base-generic/arm/armv7/CONFIG_CAN_FLEXCAN
index 3ba377ce4..3ba377ce4 100644
--- a/baseconfig/arm/armv7/CONFIG_CAN_FLEXCAN
+++ b/configs/base-generic/arm/armv7/CONFIG_CAN_FLEXCAN
diff --git a/baseconfig/arm/armv7/CONFIG_CAN_RCAR b/configs/base-generic/arm/armv7/CONFIG_CAN_RCAR
index 544408972..544408972 100644
--- a/baseconfig/arm/armv7/CONFIG_CAN_RCAR
+++ b/configs/base-generic/arm/armv7/CONFIG_CAN_RCAR
diff --git a/baseconfig/arm/armv7/CONFIG_CAN_RCAR_CANFD b/configs/base-generic/arm/armv7/CONFIG_CAN_RCAR_CANFD
index ad04caba3..ad04caba3 100644
--- a/baseconfig/arm/armv7/CONFIG_CAN_RCAR_CANFD
+++ b/configs/base-generic/arm/armv7/CONFIG_CAN_RCAR_CANFD
diff --git a/baseconfig/arm/armv7/CONFIG_CAN_SUN4I b/configs/base-generic/arm/armv7/CONFIG_CAN_SUN4I
index 925f02a15..925f02a15 100644
--- a/baseconfig/arm/armv7/CONFIG_CAN_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_CAN_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_CAN_TI_HECC b/configs/base-generic/arm/armv7/CONFIG_CAN_TI_HECC
index f13443720..f13443720 100644
--- a/baseconfig/arm/armv7/CONFIG_CAN_TI_HECC
+++ b/configs/base-generic/arm/armv7/CONFIG_CAN_TI_HECC
diff --git a/baseconfig/arm/armv7/CONFIG_CC_OPTIMIZE_FOR_SIZE b/configs/base-generic/arm/armv7/CONFIG_CC_OPTIMIZE_FOR_SIZE
index 7a224853a..7a224853a 100644
--- a/baseconfig/arm/armv7/CONFIG_CC_OPTIMIZE_FOR_SIZE
+++ b/configs/base-generic/arm/armv7/CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git a/baseconfig/arm/armv7/CONFIG_CGROUP_RDMA b/configs/base-generic/arm/armv7/CONFIG_CGROUP_RDMA
index 94ae4f4bc..94ae4f4bc 100644
--- a/baseconfig/arm/armv7/CONFIG_CGROUP_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_CGROUP_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X b/configs/base-generic/arm/armv7/CONFIG_CHARGER_AXP20X
index 2e64e7733..2e64e7733 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_AXP20X
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ2415X b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ2415X
index 6886de4eb..6886de4eb 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ2415X
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ2415X
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ24190 b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ24190
index 3128bb676..3128bb676 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ24190
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ24190
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ24735 b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ24735
index 658d71eb4..658d71eb4 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_BQ24735
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_BQ24735
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_GPIO b/configs/base-generic/arm/armv7/CONFIG_CHARGER_GPIO
index cd5f987c4..cd5f987c4 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_GPIO
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_GPIO
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_MANAGER b/configs/base-generic/arm/armv7/CONFIG_CHARGER_MANAGER
index 9d17a0b87..9d17a0b87 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_MANAGER
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_MANAGER
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_CHARGER_MAX8997
index 99a640f0e..99a640f0e 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_TPS65090 b/configs/base-generic/arm/armv7/CONFIG_CHARGER_TPS65090
index 2de1c9d3e..2de1c9d3e 100644
--- a/baseconfig/arm/armv7/CONFIG_CHARGER_TPS65090
+++ b/configs/base-generic/arm/armv7/CONFIG_CHARGER_TPS65090
diff --git a/baseconfig/arm/armv7/CONFIG_CLK_QORIQ b/configs/base-generic/arm/armv7/CONFIG_CLK_QORIQ
index b05638e5c..b05638e5c 100644
--- a/baseconfig/arm/armv7/CONFIG_CLK_QORIQ
+++ b/configs/base-generic/arm/armv7/CONFIG_CLK_QORIQ
diff --git a/baseconfig/arm/armv7/CONFIG_CMDLINE b/configs/base-generic/arm/armv7/CONFIG_CMDLINE
index f3083e1e5..f3083e1e5 100644
--- a/baseconfig/arm/armv7/CONFIG_CMDLINE
+++ b/configs/base-generic/arm/armv7/CONFIG_CMDLINE
diff --git a/baseconfig/arm/armv7/CONFIG_CMDLINE_FROM_BOOTLOADER b/configs/base-generic/arm/armv7/CONFIG_CMDLINE_FROM_BOOTLOADER
index 251fe61ac..251fe61ac 100644
--- a/baseconfig/arm/armv7/CONFIG_CMDLINE_FROM_BOOTLOADER
+++ b/configs/base-generic/arm/armv7/CONFIG_CMDLINE_FROM_BOOTLOADER
diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_S2MPS11 b/configs/base-generic/arm/armv7/CONFIG_COMMON_CLK_S2MPS11
index 8595bd036..8595bd036 100644
--- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_S2MPS11
+++ b/configs/base-generic/arm/armv7/CONFIG_COMMON_CLK_S2MPS11
diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_SI5351 b/configs/base-generic/arm/armv7/CONFIG_COMMON_CLK_SI5351
index 8e1d47ee4..8e1d47ee4 100644
--- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_SI5351
+++ b/configs/base-generic/arm/armv7/CONFIG_COMMON_CLK_SI5351
diff --git a/baseconfig/arm/armv7/CONFIG_CPU_BPREDICT_DISABLE b/configs/base-generic/arm/armv7/CONFIG_CPU_BPREDICT_DISABLE
index 3444a14c5..3444a14c5 100644
--- a/baseconfig/arm/armv7/CONFIG_CPU_BPREDICT_DISABLE
+++ b/configs/base-generic/arm/armv7/CONFIG_CPU_BPREDICT_DISABLE
diff --git a/baseconfig/arm/armv7/CONFIG_CPU_DCACHE_DISABLE b/configs/base-generic/arm/armv7/CONFIG_CPU_DCACHE_DISABLE
index 77aced7a4..77aced7a4 100644
--- a/baseconfig/arm/armv7/CONFIG_CPU_DCACHE_DISABLE
+++ b/configs/base-generic/arm/armv7/CONFIG_CPU_DCACHE_DISABLE
diff --git a/baseconfig/arm/armv7/CONFIG_CPU_ICACHE_DISABLE b/configs/base-generic/arm/armv7/CONFIG_CPU_ICACHE_DISABLE
index f1a4cd01b..f1a4cd01b 100644
--- a/baseconfig/arm/armv7/CONFIG_CPU_ICACHE_DISABLE
+++ b/configs/base-generic/arm/armv7/CONFIG_CPU_ICACHE_DISABLE
diff --git a/baseconfig/arm/armv7/CONFIG_CPU_SW_DOMAIN_PAN b/configs/base-generic/arm/armv7/CONFIG_CPU_SW_DOMAIN_PAN
index e85ec6d09..e85ec6d09 100644
--- a/baseconfig/arm/armv7/CONFIG_CPU_SW_DOMAIN_PAN
+++ b/configs/base-generic/arm/armv7/CONFIG_CPU_SW_DOMAIN_PAN
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_AES_ARM_CE b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_AES_ARM_CE
index 32c881e6b..32c881e6b 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_AES_ARM_CE
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_AES_ARM_CE
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG
index f60ff08ee..f60ff08ee 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_S5P b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_S5P
index 946dbede6..946dbede6 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_S5P
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_S5P
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS
index 957fb4e1d..957fb4e1d 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_SHA1_ARM_CE b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_SHA1_ARM_CE
index 16c6961ef..16c6961ef 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_SHA1_ARM_CE
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_SHA1_ARM_CE
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_SHA2_ARM_CE b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_SHA2_ARM_CE
index 9f2c3c6df..9f2c3c6df 100644
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_SHA2_ARM_CE
+++ b/configs/base-generic/arm/armv7/CONFIG_CRYPTO_SHA2_ARM_CE
diff --git a/baseconfig/arm/armv7/CONFIG_CS89x0 b/configs/base-generic/arm/armv7/CONFIG_CS89x0
index 38beaaa52..38beaaa52 100644
--- a/baseconfig/arm/armv7/CONFIG_CS89x0
+++ b/configs/base-generic/arm/armv7/CONFIG_CS89x0
diff --git a/baseconfig/arm/armv7/CONFIG_DEBUG_ALIGN_RODATA b/configs/base-generic/arm/armv7/CONFIG_DEBUG_ALIGN_RODATA
index 4b5ff5066..4b5ff5066 100644
--- a/baseconfig/arm/armv7/CONFIG_DEBUG_ALIGN_RODATA
+++ b/configs/base-generic/arm/armv7/CONFIG_DEBUG_ALIGN_RODATA
diff --git a/baseconfig/arm/armv7/CONFIG_DEBUG_LL b/configs/base-generic/arm/armv7/CONFIG_DEBUG_LL
index 69e3629f5..69e3629f5 100644
--- a/baseconfig/arm/armv7/CONFIG_DEBUG_LL
+++ b/configs/base-generic/arm/armv7/CONFIG_DEBUG_LL
diff --git a/baseconfig/arm/armv7/CONFIG_DEBUG_USER b/configs/base-generic/arm/armv7/CONFIG_DEBUG_USER
index 9e2f6b499..9e2f6b499 100644
--- a/baseconfig/arm/armv7/CONFIG_DEBUG_USER
+++ b/configs/base-generic/arm/armv7/CONFIG_DEBUG_USER
diff --git a/baseconfig/arm/armv7/CONFIG_DEPRECATED_PARAM_STRUCT b/configs/base-generic/arm/armv7/CONFIG_DEPRECATED_PARAM_STRUCT
index 35c722181..35c722181 100644
--- a/baseconfig/arm/armv7/CONFIG_DEPRECATED_PARAM_STRUCT
+++ b/configs/base-generic/arm/armv7/CONFIG_DEPRECATED_PARAM_STRUCT
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
index 6ebace316..6ebace316 100644
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
+++ b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU
index 68fc6da8d..68fc6da8d 100644
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU
+++ b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
index 149aea920..149aea920 100644
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
+++ b/configs/base-generic/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
diff --git a/baseconfig/arm/armv7/CONFIG_DM9000 b/configs/base-generic/arm/armv7/CONFIG_DM9000
index 82b0600a1..82b0600a1 100644
--- a/baseconfig/arm/armv7/CONFIG_DM9000
+++ b/configs/base-generic/arm/armv7/CONFIG_DM9000
diff --git a/debugconfig/arm/CONFIG_DMADEVICES_DEBUG b/configs/base-generic/arm/armv7/CONFIG_DMADEVICES_DEBUG
index 7cd4fec86..7cd4fec86 100644
--- a/debugconfig/arm/CONFIG_DMADEVICES_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_DMADEVICES_DEBUG
diff --git a/debugconfig/CONFIG_DMADEVICES_VDEBUG b/configs/base-generic/arm/armv7/CONFIG_DMADEVICES_VDEBUG
index b1584ee3b..b1584ee3b 100644
--- a/debugconfig/CONFIG_DMADEVICES_VDEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_DMADEVICES_VDEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_DMA_CACHE_RWFO b/configs/base-generic/arm/armv7/CONFIG_DMA_CACHE_RWFO
index 587d66810..587d66810 100644
--- a/baseconfig/arm/armv7/CONFIG_DMA_CACHE_RWFO
+++ b/configs/base-generic/arm/armv7/CONFIG_DMA_CACHE_RWFO
diff --git a/baseconfig/arm/armv7/CONFIG_DMA_SUN4I b/configs/base-generic/arm/armv7/CONFIG_DMA_SUN4I
index 0f63ec162..0f63ec162 100644
--- a/baseconfig/arm/armv7/CONFIG_DMA_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_DMA_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_DMA_SUN6I b/configs/base-generic/arm/armv7/CONFIG_DMA_SUN6I
index 83eeb271f..83eeb271f 100644
--- a/baseconfig/arm/armv7/CONFIG_DMA_SUN6I
+++ b/configs/base-generic/arm/armv7/CONFIG_DMA_SUN6I
diff --git a/baseconfig/arm/armv7/CONFIG_DOVE_THERMAL b/configs/base-generic/arm/armv7/CONFIG_DOVE_THERMAL
index cd72800b2..cd72800b2 100644
--- a/baseconfig/arm/armv7/CONFIG_DOVE_THERMAL
+++ b/configs/base-generic/arm/armv7/CONFIG_DOVE_THERMAL
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_ARMADA b/configs/base-generic/arm/armv7/CONFIG_DRM_ARMADA
index 670b87c4b..670b87c4b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_ARMADA
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_ARMADA
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS
index 25be6cdf6..25be6cdf6 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS5433_DECON b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS5433_DECON
index 1b0d78abe..1b0d78abe 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS5433_DECON
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS5433_DECON
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS7_DECON b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS7_DECON
index 588fc8d52..588fc8d52 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS7_DECON
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS7_DECON
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DP b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DP
index 386e9a8ea..386e9a8ea 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DP
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DP
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DPI b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DPI
index df8feccaa..df8feccaa 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DPI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DPI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DSI b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DSI
index 325626f92..325626f92 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_DSI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_DSI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_FIMC b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMC
index 761cf114e..761cf114e 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_FIMC
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMC
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_FIMD b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMD
index 9b7eb2938..9b7eb2938 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_FIMD
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMD
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_G2D b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_G2D
index eacc6174d..eacc6174d 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_G2D
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_G2D
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_GSC b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_GSC
index cf2c394a6..cf2c394a6 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_GSC
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_GSC
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_HDMI b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_HDMI
index dba9e209b..dba9e209b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_HDMI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_HDMI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
index 1c741aa22..1c741aa22 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_IOMMU
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_IPP b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_IPP
index 0d547a2f8..0d547a2f8 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_IPP
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_IPP
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_MIC b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_MIC
index d3a0af78c..d3a0af78c 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_MIC
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_MIC
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_MIXER b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_MIXER
index 619960621..619960621 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_MIXER
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_MIXER
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR
index b994e95b5..b994e95b5 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_VIDI b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_VIDI
index 4a30ef8dc..4a30ef8dc 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_EXYNOS_VIDI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_EXYNOS_VIDI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_FSL_DCU b/configs/base-generic/arm/armv7/CONFIG_DRM_FSL_DCU
index 487f49d7a..487f49d7a 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_FSL_DCU
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_FSL_DCU
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_IMX b/configs/base-generic/arm/armv7/CONFIG_DRM_IMX
index 453bfb8bb..453bfb8bb 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_IMX
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_IMX
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_STI b/configs/base-generic/arm/armv7/CONFIG_DRM_STI
index d16e09b9b..d16e09b9b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_STI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_STI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I
index 2eb966e5b..2eb966e5b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
index c1d1d2121..c1d1d2121 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI
index cda1f60f8..cda1f60f8 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
index 8ba73409c..8ba73409c 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_TILCDC b/configs/base-generic/arm/armv7/CONFIG_DRM_TILCDC
index f567e9821..f567e9821 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_TILCDC
+++ b/configs/base-generic/arm/armv7/CONFIG_DRM_TILCDC
diff --git a/baseconfig/arm/armv7/CONFIG_DVB_USB_PCTV452E b/configs/base-generic/arm/armv7/CONFIG_DVB_USB_PCTV452E
index 629f6233a..629f6233a 100644
--- a/baseconfig/arm/armv7/CONFIG_DVB_USB_PCTV452E
+++ b/configs/base-generic/arm/armv7/CONFIG_DVB_USB_PCTV452E
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I b/configs/base-generic/arm/armv7/CONFIG_DWMAC_SUN8I
index ce05f93b3..ce05f93b3 100644
--- a/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I
+++ b/configs/base-generic/arm/armv7/CONFIG_DWMAC_SUN8I
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_SUNXI b/configs/base-generic/arm/armv7/CONFIG_DWMAC_SUNXI
index 254fc7d8a..254fc7d8a 100644
--- a/baseconfig/arm/armv7/CONFIG_DWMAC_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_DWMAC_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_EDAC_HIGHBANK_L2 b/configs/base-generic/arm/armv7/CONFIG_EDAC_HIGHBANK_L2
index 7680ddfcc..7680ddfcc 100644
--- a/baseconfig/arm/armv7/CONFIG_EDAC_HIGHBANK_L2
+++ b/configs/base-generic/arm/armv7/CONFIG_EDAC_HIGHBANK_L2
diff --git a/baseconfig/arm/armv7/CONFIG_EDAC_HIGHBANK_MC b/configs/base-generic/arm/armv7/CONFIG_EDAC_HIGHBANK_MC
index 0c4b654af..0c4b654af 100644
--- a/baseconfig/arm/armv7/CONFIG_EDAC_HIGHBANK_MC
+++ b/configs/base-generic/arm/armv7/CONFIG_EDAC_HIGHBANK_MC
diff --git a/baseconfig/arm/armv7/CONFIG_EEPROM_93XX46 b/configs/base-generic/arm/armv7/CONFIG_EEPROM_93XX46
index 7a5dc3d41..7a5dc3d41 100644
--- a/baseconfig/arm/armv7/CONFIG_EEPROM_93XX46
+++ b/configs/base-generic/arm/armv7/CONFIG_EEPROM_93XX46
diff --git a/baseconfig/arm/armv7/CONFIG_EEPROM_AT25 b/configs/base-generic/arm/armv7/CONFIG_EEPROM_AT25
index 90358f33c..90358f33c 100644
--- a/baseconfig/arm/armv7/CONFIG_EEPROM_AT25
+++ b/configs/base-generic/arm/armv7/CONFIG_EEPROM_AT25
diff --git a/baseconfig/arm/armv7/CONFIG_ENC28J60 b/configs/base-generic/arm/armv7/CONFIG_ENC28J60
index 837340acd..837340acd 100644
--- a/baseconfig/arm/armv7/CONFIG_ENC28J60
+++ b/configs/base-generic/arm/armv7/CONFIG_ENC28J60
diff --git a/baseconfig/arm/armv7/CONFIG_EXTCON_AXP288 b/configs/base-generic/arm/armv7/CONFIG_EXTCON_AXP288
index 7fadeb58d..7fadeb58d 100644
--- a/baseconfig/arm/armv7/CONFIG_EXTCON_AXP288
+++ b/configs/base-generic/arm/armv7/CONFIG_EXTCON_AXP288
diff --git a/baseconfig/arm/armv7/CONFIG_EXTCON_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_EXTCON_MAX8997
index adf348121..adf348121 100644
--- a/baseconfig/arm/armv7/CONFIG_EXTCON_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_EXTCON_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM b/configs/base-generic/arm/armv7/CONFIG_EXYNOS5420_MCPM
index 0f72ec362..0f72ec362 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS5420_MCPM
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_ADC b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_ADC
index 64438339d..64438339d 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_ADC
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_ADC
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_AUDSS_CLK_CON b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_AUDSS_CLK_CON
index 127922ffd..127922ffd 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_AUDSS_CLK_CON
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_AUDSS_CLK_CON
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_IOMMU b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_IOMMU
index 76ab03ad5..76ab03ad5 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_IOMMU
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_IOMMU
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_IOMMU_DEBUG b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_IOMMU_DEBUG
index f19791a78..f19791a78 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_IOMMU_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_IOMMU_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_THERMAL b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_THERMAL
index ff2bc6dfe..ff2bc6dfe 100644
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_THERMAL
+++ b/configs/base-generic/arm/armv7/CONFIG_EXYNOS_THERMAL
diff --git a/baseconfig/arm/armv7/CONFIG_EZX_PCAP b/configs/base-generic/arm/armv7/CONFIG_EZX_PCAP
index f4ac470bd..f4ac470bd 100644
--- a/baseconfig/arm/armv7/CONFIG_EZX_PCAP
+++ b/configs/base-generic/arm/armv7/CONFIG_EZX_PCAP
diff --git a/baseconfig/arm/armv7/CONFIG_FB_RADEON b/configs/base-generic/arm/armv7/CONFIG_FB_RADEON
index 844570e81..844570e81 100644
--- a/baseconfig/arm/armv7/CONFIG_FB_RADEON
+++ b/configs/base-generic/arm/armv7/CONFIG_FB_RADEON
diff --git a/baseconfig/arm/armv7/CONFIG_FB_S3C b/configs/base-generic/arm/armv7/CONFIG_FB_S3C
index 2dce2a49f..2dce2a49f 100644
--- a/baseconfig/arm/armv7/CONFIG_FB_S3C
+++ b/configs/base-generic/arm/armv7/CONFIG_FB_S3C
diff --git a/baseconfig/arm/armv7/CONFIG_FB_SAVAGE b/configs/base-generic/arm/armv7/CONFIG_FB_SAVAGE
index 7512c54c6..7512c54c6 100644
--- a/baseconfig/arm/armv7/CONFIG_FB_SAVAGE
+++ b/configs/base-generic/arm/armv7/CONFIG_FB_SAVAGE
diff --git a/baseconfig/arm/armv7/CONFIG_FB_XILINX b/configs/base-generic/arm/armv7/CONFIG_FB_XILINX
index ef25a3427..ef25a3427 100644
--- a/baseconfig/arm/armv7/CONFIG_FB_XILINX
+++ b/configs/base-generic/arm/armv7/CONFIG_FB_XILINX
diff --git a/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER b/configs/base-generic/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
index bdbd3377f..bdbd3377f 100644
--- a/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
+++ b/configs/base-generic/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
diff --git a/baseconfig/arm/armv7/CONFIG_GENERIC_ADC_BATTERY b/configs/base-generic/arm/armv7/CONFIG_GENERIC_ADC_BATTERY
index 356728ffd..356728ffd 100644
--- a/baseconfig/arm/armv7/CONFIG_GENERIC_ADC_BATTERY
+++ b/configs/base-generic/arm/armv7/CONFIG_GENERIC_ADC_BATTERY
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_74X164 b/configs/base-generic/arm/armv7/CONFIG_GPIO_74X164
index f8bd32bb6..f8bd32bb6 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_74X164
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_74X164
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209 b/configs/base-generic/arm/armv7/CONFIG_GPIO_AXP209
index 2365ae707..2365ae707 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_AXP209
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_MAX7301 b/configs/base-generic/arm/armv7/CONFIG_GPIO_MAX7301
index e9fe88049..e9fe88049 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_MAX7301
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_MAX7301
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_MC33880 b/configs/base-generic/arm/armv7/CONFIG_GPIO_MC33880
index f1fe54049..f1fe54049 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_MC33880
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_MC33880
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_PCF857X b/configs/base-generic/arm/armv7/CONFIG_GPIO_PCF857X
index a5a82a6b0..a5a82a6b0 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_PCF857X
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_PCF857X
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_SYSCON b/configs/base-generic/arm/armv7/CONFIG_GPIO_SYSCON
index 969b6baba..969b6baba 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_SYSCON
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_SYSCON
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_TPS65910 b/configs/base-generic/arm/armv7/CONFIG_GPIO_TPS65910
index 08a256f63..08a256f63 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_TPS65910
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_TPS65910
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_TPS65912 b/configs/base-generic/arm/armv7/CONFIG_GPIO_TPS65912
index ef78289f4..ef78289f4 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_TPS65912
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_TPS65912
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_WM8994 b/configs/base-generic/arm/armv7/CONFIG_GPIO_WM8994
index d03c00592..d03c00592 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_WM8994
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_WM8994
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_ZEVIO b/configs/base-generic/arm/armv7/CONFIG_GPIO_ZEVIO
index 7ce3d19af..7ce3d19af 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_ZEVIO
+++ b/configs/base-generic/arm/armv7/CONFIG_GPIO_ZEVIO
diff --git a/baseconfig/arm/armv7/CONFIG_HAVE_ARM_ARCH_TIMER b/configs/base-generic/arm/armv7/CONFIG_HAVE_ARM_ARCH_TIMER
index 7aa04a058..7aa04a058 100644
--- a/baseconfig/arm/armv7/CONFIG_HAVE_ARM_ARCH_TIMER
+++ b/configs/base-generic/arm/armv7/CONFIG_HAVE_ARM_ARCH_TIMER
diff --git a/baseconfig/arm/armv7/CONFIG_HAVE_ARM_TWD b/configs/base-generic/arm/armv7/CONFIG_HAVE_ARM_TWD
index f7baeb99d..f7baeb99d 100644
--- a/baseconfig/arm/armv7/CONFIG_HAVE_ARM_TWD
+++ b/configs/base-generic/arm/armv7/CONFIG_HAVE_ARM_TWD
diff --git a/baseconfig/arm/armv7/CONFIG_HIGHMEM b/configs/base-generic/arm/armv7/CONFIG_HIGHMEM
index ae91367ff..ae91367ff 100644
--- a/baseconfig/arm/armv7/CONFIG_HIGHMEM
+++ b/configs/base-generic/arm/armv7/CONFIG_HIGHMEM
diff --git a/baseconfig/arm/armv7/CONFIG_HIGHPTE b/configs/base-generic/arm/armv7/CONFIG_HIGHPTE
index e11904f2f..e11904f2f 100644
--- a/baseconfig/arm/armv7/CONFIG_HIGHPTE
+++ b/configs/base-generic/arm/armv7/CONFIG_HIGHPTE
diff --git a/baseconfig/arm/armv7/CONFIG_HVC_DCC b/configs/base-generic/arm/armv7/CONFIG_HVC_DCC
index b2e800764..b2e800764 100644
--- a/baseconfig/arm/armv7/CONFIG_HVC_DCC
+++ b/configs/base-generic/arm/armv7/CONFIG_HVC_DCC
diff --git a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP b/configs/base-generic/arm/armv7/CONFIG_HW_RANDOM_OMAP
index cf37a6e35..cf37a6e35 100644
--- a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP
+++ b/configs/base-generic/arm/armv7/CONFIG_HW_RANDOM_OMAP
diff --git a/baseconfig/arm/armv7/CONFIG_I2C b/configs/base-generic/arm/armv7/CONFIG_I2C
index aafb657f5..aafb657f5 100644
--- a/baseconfig/arm/armv7/CONFIG_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_I2C_EXYNOS5 b/configs/base-generic/arm/armv7/CONFIG_I2C_EXYNOS5
index 52685422a..52685422a 100644
--- a/baseconfig/arm/armv7/CONFIG_I2C_EXYNOS5
+++ b/configs/base-generic/arm/armv7/CONFIG_I2C_EXYNOS5
diff --git a/baseconfig/arm/armv7/CONFIG_I2C_S3C2410 b/configs/base-generic/arm/armv7/CONFIG_I2C_S3C2410
index da040c25b..da040c25b 100644
--- a/baseconfig/arm/armv7/CONFIG_I2C_S3C2410
+++ b/configs/base-generic/arm/armv7/CONFIG_I2C_S3C2410
diff --git a/baseconfig/arm/armv7/CONFIG_I2C_SUN6I_P2WI b/configs/base-generic/arm/armv7/CONFIG_I2C_SUN6I_P2WI
index eae733aec..eae733aec 100644
--- a/baseconfig/arm/armv7/CONFIG_I2C_SUN6I_P2WI
+++ b/configs/base-generic/arm/armv7/CONFIG_I2C_SUN6I_P2WI
diff --git a/baseconfig/arm/armv7/CONFIG_IEEE802154_MRF24J40 b/configs/base-generic/arm/armv7/CONFIG_IEEE802154_MRF24J40
index dc61c11fd..dc61c11fd 100644
--- a/baseconfig/arm/armv7/CONFIG_IEEE802154_MRF24J40
+++ b/configs/base-generic/arm/armv7/CONFIG_IEEE802154_MRF24J40
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND
index b475048ed..b475048ed 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB3 b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_CXGB3
index f06c87360..f06c87360 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB3
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_CXGB3
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB4 b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_CXGB4
index 40ff06894..40ff06894 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_CXGB4
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_CXGB4
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_I40IW b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_I40IW
index 39998dbd7..39998dbd7 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_I40IW
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_I40IW
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB
index 5f27e681e..5f27e681e 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM
index b26396a7e..b26396a7e 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_CM
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG
index f1a19d66a..f1a19d66a 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
index 00e419c17..00e419c17 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISER b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ISER
index 89d63b0a5..89d63b0a5 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISER
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ISER
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISERT b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ISERT
index a8c9bda68..a8c9bda68 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ISERT
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ISERT
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_MTHCA b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_MTHCA
index a134e36a3..a134e36a3 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_MTHCA
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_MTHCA
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_NES b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_NES
index eee505590..eee505590 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_NES
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_NES
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_OCRDMA b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_OCRDMA
index 12ff35161..12ff35161 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_OCRDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_OCRDMA
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING
index 80be02a8b..80be02a8b 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_ON_DEMAND_PAGING
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_QIB
index 591f4e962..591f4e962 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_QIB
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB_DCA b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_QIB_DCA
index 810520ecc..810520ecc 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_QIB_DCA
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_QIB_DCA
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_RDMAVT b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_RDMAVT
index b32d29489..b32d29489 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_RDMAVT
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_RDMAVT
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRP b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_SRP
index 27e9c13e6..27e9c13e6 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRP
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_SRP
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRPT b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_SRPT
index ad99ea1ea..ad99ea1ea 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_SRPT
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_SRPT
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS
index e59e563c4..e59e563c4 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USER_ACCESS
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_MAD b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USER_MAD
index 2dd5ad05d..2dd5ad05d 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USER_MAD
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USER_MAD
diff --git a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USNIC b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USNIC
index 3624c0fd6..3624c0fd6 100644
--- a/baseconfig/arm/armv7/CONFIG_INFINIBAND_USNIC
+++ b/configs/base-generic/arm/armv7/CONFIG_INFINIBAND_USNIC
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_ARIZONA_HAPTICS b/configs/base-generic/arm/armv7/CONFIG_INPUT_ARIZONA_HAPTICS
index 74650bea7..74650bea7 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_ARIZONA_HAPTICS
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_ARIZONA_HAPTICS
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_AXP20X_PEK b/configs/base-generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_AXP20X_PEK
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_GP2A b/configs/base-generic/arm/armv7/CONFIG_INPUT_GP2A
index deca0f105..deca0f105 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_GP2A
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_GP2A
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO
index 3c7b8e540..3c7b8e540 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO_BEEPER b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO_BEEPER
index 690012dfd..690012dfd 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO_BEEPER
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO_BEEPER
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO_TILT_POLLED b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO_TILT_POLLED
index c04d1c4e0..c04d1c4e0 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_GPIO_TILT_POLLED
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_GPIO_TILT_POLLED
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_MAX8997_HAPTIC b/configs/base-generic/arm/armv7/CONFIG_INPUT_MAX8997_HAPTIC
index e6e85ef37..e6e85ef37 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_MAX8997_HAPTIC
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_MAX8997_HAPTIC
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_MC13783_PWRBUTTON b/configs/base-generic/arm/armv7/CONFIG_INPUT_MC13783_PWRBUTTON
index 9476ac898..9476ac898 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_MC13783_PWRBUTTON
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_MC13783_PWRBUTTON
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_REGULATOR_HAPTIC b/configs/base-generic/arm/armv7/CONFIG_INPUT_REGULATOR_HAPTIC
index 4230eab6f..4230eab6f 100644
--- a/baseconfig/arm/armv7/CONFIG_INPUT_REGULATOR_HAPTIC
+++ b/configs/base-generic/arm/armv7/CONFIG_INPUT_REGULATOR_HAPTIC
diff --git a/baseconfig/arm/armv7/CONFIG_IRQ_CROSSBAR b/configs/base-generic/arm/armv7/CONFIG_IRQ_CROSSBAR
index 40c53486d..40c53486d 100644
--- a/baseconfig/arm/armv7/CONFIG_IRQ_CROSSBAR
+++ b/configs/base-generic/arm/armv7/CONFIG_IRQ_CROSSBAR
diff --git a/baseconfig/arm/armv7/CONFIG_IR_SUNXI b/configs/base-generic/arm/armv7/CONFIG_IR_SUNXI
index fe2dc68a6..fe2dc68a6 100644
--- a/baseconfig/arm/armv7/CONFIG_IR_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_IR_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_IWMMXT b/configs/base-generic/arm/armv7/CONFIG_IWMMXT
index 45b48ddbe..45b48ddbe 100644
--- a/baseconfig/arm/armv7/CONFIG_IWMMXT
+++ b/configs/base-generic/arm/armv7/CONFIG_IWMMXT
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS b/configs/base-generic/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS
index 947761785..947761785 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS
index 4ccb0a39c..4ccb0a39c 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_DEBUG b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG
index 48fceb8b1..48fceb8b1 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL
index 90c0295ac..90c0295ac 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_SECURITY b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY
index 77ee2b1ab..77ee2b1ab 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_SECURITY
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY
index eb19dca3e..eb19dca3e 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER
index 67da74d2a..67da74d2a 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_XATTR b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_XATTR
index 61257de9d..61257de9d 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_FS_XATTR
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_FS_XATTR
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_LZO b/configs/base-generic/arm/armv7/CONFIG_JFFS2_LZO
index ec14e80ac..ec14e80ac 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_LZO
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_LZO
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_RTIME b/configs/base-generic/arm/armv7/CONFIG_JFFS2_RTIME
index 3d2ed3bd7..3d2ed3bd7 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_RTIME
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_RTIME
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_RUBIN b/configs/base-generic/arm/armv7/CONFIG_JFFS2_RUBIN
index 2e8d29c45..2e8d29c45 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_RUBIN
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_RUBIN
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_SUMMARY b/configs/base-generic/arm/armv7/CONFIG_JFFS2_SUMMARY
index 5df8532b8..5df8532b8 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_SUMMARY
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_SUMMARY
diff --git a/baseconfig/arm/armv7/CONFIG_JFFS2_ZLIB b/configs/base-generic/arm/armv7/CONFIG_JFFS2_ZLIB
index 961313691..961313691 100644
--- a/baseconfig/arm/armv7/CONFIG_JFFS2_ZLIB
+++ b/configs/base-generic/arm/armv7/CONFIG_JFFS2_ZLIB
diff --git a/baseconfig/arm/armv7/CONFIG_KEYBOARD_MATRIX b/configs/base-generic/arm/armv7/CONFIG_KEYBOARD_MATRIX
index 6abab8067..6abab8067 100644
--- a/baseconfig/arm/armv7/CONFIG_KEYBOARD_MATRIX
+++ b/configs/base-generic/arm/armv7/CONFIG_KEYBOARD_MATRIX
diff --git a/baseconfig/arm/armv7/CONFIG_KEYBOARD_SUN4I_LRADC b/configs/base-generic/arm/armv7/CONFIG_KEYBOARD_SUN4I_LRADC
index 76dd06182..76dd06182 100644
--- a/baseconfig/arm/armv7/CONFIG_KEYBOARD_SUN4I_LRADC
+++ b/configs/base-generic/arm/armv7/CONFIG_KEYBOARD_SUN4I_LRADC
diff --git a/baseconfig/arm/armv7/CONFIG_KEYSTONE_REMOTEPROC b/configs/base-generic/arm/armv7/CONFIG_KEYSTONE_REMOTEPROC
index c6ded13d3..c6ded13d3 100644
--- a/baseconfig/arm/armv7/CONFIG_KEYSTONE_REMOTEPROC
+++ b/configs/base-generic/arm/armv7/CONFIG_KEYSTONE_REMOTEPROC
diff --git a/baseconfig/arm/armv7/CONFIG_KS8851 b/configs/base-generic/arm/armv7/CONFIG_KS8851
index 6ff32db21..6ff32db21 100644
--- a/baseconfig/arm/armv7/CONFIG_KS8851
+++ b/configs/base-generic/arm/armv7/CONFIG_KS8851
diff --git a/baseconfig/arm/armv7/CONFIG_KS8851_MLL b/configs/base-generic/arm/armv7/CONFIG_KS8851_MLL
index 157419b10..157419b10 100644
--- a/baseconfig/arm/armv7/CONFIG_KS8851_MLL
+++ b/configs/base-generic/arm/armv7/CONFIG_KS8851_MLL
diff --git a/baseconfig/arm/armv7/CONFIG_LATTICE_ECP3_CONFIG b/configs/base-generic/arm/armv7/CONFIG_LATTICE_ECP3_CONFIG
index 7212e8899..7212e8899 100644
--- a/baseconfig/arm/armv7/CONFIG_LATTICE_ECP3_CONFIG
+++ b/configs/base-generic/arm/armv7/CONFIG_LATTICE_ECP3_CONFIG
diff --git a/baseconfig/arm/armv7/CONFIG_LBDAF b/configs/base-generic/arm/armv7/CONFIG_LBDAF
index b3fae707a..b3fae707a 100644
--- a/baseconfig/arm/armv7/CONFIG_LBDAF
+++ b/configs/base-generic/arm/armv7/CONFIG_LBDAF
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_AMS369FG06 b/configs/base-generic/arm/armv7/CONFIG_LCD_AMS369FG06
index 797f7bb12..797f7bb12 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_AMS369FG06
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_AMS369FG06
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_HX8357 b/configs/base-generic/arm/armv7/CONFIG_LCD_HX8357
index 9db6e88da..9db6e88da 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_HX8357
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_HX8357
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_ILI922X b/configs/base-generic/arm/armv7/CONFIG_LCD_ILI922X
index ddb5a6af0..ddb5a6af0 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_ILI922X
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_ILI922X
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_ILI9320 b/configs/base-generic/arm/armv7/CONFIG_LCD_ILI9320
index 271b03d6f..271b03d6f 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_ILI9320
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_ILI9320
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_L4F00242T03 b/configs/base-generic/arm/armv7/CONFIG_LCD_L4F00242T03
index 9dcc2293d..9dcc2293d 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_L4F00242T03
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_L4F00242T03
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_LD9040 b/configs/base-generic/arm/armv7/CONFIG_LCD_LD9040
index fe70c624e..fe70c624e 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_LD9040
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_LD9040
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_LMS283GF05 b/configs/base-generic/arm/armv7/CONFIG_LCD_LMS283GF05
index 89bc814a1..89bc814a1 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_LMS283GF05
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_LMS283GF05
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_LMS501KF03 b/configs/base-generic/arm/armv7/CONFIG_LCD_LMS501KF03
index 14110dac3..14110dac3 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_LMS501KF03
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_LMS501KF03
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_LTV350QV b/configs/base-generic/arm/armv7/CONFIG_LCD_LTV350QV
index f2af910b0..f2af910b0 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_LTV350QV
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_LTV350QV
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_S6E63M0 b/configs/base-generic/arm/armv7/CONFIG_LCD_S6E63M0
index 1d2cf3547..1d2cf3547 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_S6E63M0
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_S6E63M0
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_TDO24M b/configs/base-generic/arm/armv7/CONFIG_LCD_TDO24M
index 54abe7461..54abe7461 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_TDO24M
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_TDO24M
diff --git a/baseconfig/arm/armv7/CONFIG_LCD_VGG2432A4 b/configs/base-generic/arm/armv7/CONFIG_LCD_VGG2432A4
index 6389e1f03..6389e1f03 100644
--- a/baseconfig/arm/armv7/CONFIG_LCD_VGG2432A4
+++ b/configs/base-generic/arm/armv7/CONFIG_LCD_VGG2432A4
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_DAC124S085 b/configs/base-generic/arm/armv7/CONFIG_LEDS_DAC124S085
index 44aef82f1..44aef82f1 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_DAC124S085
+++ b/configs/base-generic/arm/armv7/CONFIG_LEDS_DAC124S085
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_LEDS_MAX8997
index 6274bfcad..6274bfcad 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_LEDS_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_NS2 b/configs/base-generic/arm/armv7/CONFIG_LEDS_NS2
index 9a6302bee..9a6302bee 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_NS2
+++ b/configs/base-generic/arm/armv7/CONFIG_LEDS_NS2
diff --git a/baseconfig/arm/armv7/CONFIG_LIBERTAS_SPI b/configs/base-generic/arm/armv7/CONFIG_LIBERTAS_SPI
index b62e37573..b62e37573 100644
--- a/baseconfig/arm/armv7/CONFIG_LIBERTAS_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_LIBERTAS_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_LSM_MMAP_MIN_ADDR b/configs/base-generic/arm/armv7/CONFIG_LSM_MMAP_MIN_ADDR
index fe5dac4d4..fe5dac4d4 100644
--- a/baseconfig/arm/armv7/CONFIG_LSM_MMAP_MIN_ADDR
+++ b/configs/base-generic/arm/armv7/CONFIG_LSM_MMAP_MIN_ADDR
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_370 b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_370
index de9a2a0ed..de9a2a0ed 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_370
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_370
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_375 b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_375
index 4e13b8390..4e13b8390 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_375
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_375
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_38X b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_38X
index 236fd10e6..236fd10e6 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_38X
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_38X
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_39X b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_39X
index fb283f932..fb283f932 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_39X
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_39X
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_XP b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_XP
index ab5152129..ab5152129 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_ARMADA_XP
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_ARMADA_XP
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_DOVE b/configs/base-generic/arm/armv7/CONFIG_MACH_DOVE
index efc5b6b03..efc5b6b03 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_DOVE
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_DOVE
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON6 b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON6
index aff440cc5..aff440cc5 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_MESON6
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON6
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8 b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON8
index e55c72211..e55c72211 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_MESON8
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON8
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON8B
index 5212d2aca..5212d2aca 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_MESON8B
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN4I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN4I
index 5ffc9dc6a..5ffc9dc6a 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN5I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN5I
index dc2a5650f..dc2a5650f 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN5I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN5I
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN6I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN6I
index 0a2dddfc6..0a2dddfc6 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN6I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN6I
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN7I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN7I
index 7499605f2..7499605f2 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN7I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN7I
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN8I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN8I
index e557a899e..e557a899e 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN8I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN8I
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_SUN9I b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN9I
index 53b2c64ac..53b2c64ac 100644
--- a/baseconfig/arm/armv7/CONFIG_MACH_SUN9I
+++ b/configs/base-generic/arm/armv7/CONFIG_MACH_SUN9I
diff --git a/baseconfig/arm/armv7/CONFIG_MCPM b/configs/base-generic/arm/armv7/CONFIG_MCPM
index 703e9f9ce..703e9f9ce 100644
--- a/baseconfig/arm/armv7/CONFIG_MCPM
+++ b/configs/base-generic/arm/armv7/CONFIG_MCPM
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX b/configs/base-generic/arm/armv7/CONFIG_MDIO_BUS_MUX
index 19416a6ca..19416a6ca 100644
--- a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX
+++ b/configs/base-generic/arm/armv7/CONFIG_MDIO_BUS_MUX
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_SUN4I b/configs/base-generic/arm/armv7/CONFIG_MDIO_SUN4I
index 2909169bd..2909169bd 100644
--- a/baseconfig/arm/armv7/CONFIG_MDIO_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_MDIO_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_MEMORY b/configs/base-generic/arm/armv7/CONFIG_MEMORY
index e69bfe7d7..e69bfe7d7 100644
--- a/baseconfig/arm/armv7/CONFIG_MEMORY
+++ b/configs/base-generic/arm/armv7/CONFIG_MEMORY
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG b/configs/base-generic/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
index 05aa86754..05aa86754 100644
--- a/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
+++ b/configs/base-generic/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY b/configs/base-generic/arm/armv7/CONFIG_MESON_GXL_PHY
index 5e3300106..5e3300106 100644
--- a/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY
+++ b/configs/base-generic/arm/armv7/CONFIG_MESON_GXL_PHY
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG b/configs/base-generic/arm/armv7/CONFIG_MESON_WATCHDOG
index 477ce5e06..477ce5e06 100644
--- a/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG
+++ b/configs/base-generic/arm/armv7/CONFIG_MESON_WATCHDOG
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_88PM800 b/configs/base-generic/arm/armv7/CONFIG_MFD_88PM800
index 858dc2db1..858dc2db1 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_88PM800
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_88PM800
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_88PM805 b/configs/base-generic/arm/armv7/CONFIG_MFD_88PM805
index f3cd46c90..f3cd46c90 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_88PM805
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_88PM805
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AAT2870_CORE b/configs/base-generic/arm/armv7/CONFIG_MFD_AAT2870_CORE
index 9d4cf9056..9d4cf9056 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AAT2870_CORE
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AAT2870_CORE
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_ARIZONA_SPI b/configs/base-generic/arm/armv7/CONFIG_MFD_ARIZONA_SPI
index e3e9c6758..e3e9c6758 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_ARIZONA_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_ARIZONA_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AS3711 b/configs/base-generic/arm/armv7/CONFIG_MFD_AS3711
index 53b3b04f1..53b3b04f1 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AS3711
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AS3711
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AS3722 b/configs/base-generic/arm/armv7/CONFIG_MFD_AS3722
index 6aa06bd4b..6aa06bd4b 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AS3722
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AS3722
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X_I2C b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X_RSB b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
index 29150d51b..29150d51b 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_AXP20X_RSB
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_DA9052_I2C b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9052_I2C
index c294bc24d..c294bc24d 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_DA9052_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9052_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_DA9052_SPI b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9052_SPI
index 095062683..095062683 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_DA9052_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9052_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_DA9055 b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9055
index 3f7ae6423..3f7ae6423 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_DA9055
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_DA9055
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_EXYNOS_LPASS b/configs/base-generic/arm/armv7/CONFIG_MFD_EXYNOS_LPASS
index 66fadb14e..66fadb14e 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_EXYNOS_LPASS
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_EXYNOS_LPASS
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_LP8788 b/configs/base-generic/arm/armv7/CONFIG_MFD_LP8788
index 4600a154f..4600a154f 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_LP8788
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_LP8788
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MAX14577 b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX14577
index ebbae1997..ebbae1997 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_MAX14577
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX14577
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MAX77693 b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX77693
index 35769bd83..35769bd83 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_MAX77693
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX77693
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX8997
index 6d12d3c93..6d12d3c93 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MC13XXX_SPI b/configs/base-generic/arm/armv7/CONFIG_MFD_MC13XXX_SPI
index a368bc8e6..a368bc8e6 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_MC13XXX_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_MC13XXX_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_PALMAS b/configs/base-generic/arm/armv7/CONFIG_MFD_PALMAS
index e09bcbf18..e09bcbf18 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_PALMAS
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_PALMAS
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_RC5T583 b/configs/base-generic/arm/armv7/CONFIG_MFD_RC5T583
index f3976be09..f3976be09 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_RC5T583
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_RC5T583
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_SEC_CORE b/configs/base-generic/arm/armv7/CONFIG_MFD_SEC_CORE
index cda340515..cda340515 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_SEC_CORE
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_SEC_CORE
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_SMSC b/configs/base-generic/arm/armv7/CONFIG_MFD_SMSC
index 998701017..998701017 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_SMSC
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_SMSC
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC b/configs/base-generic/arm/armv7/CONFIG_MFD_SUN4I_GPADC
index d156cb188..d156cb188 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_SUN4I_GPADC
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_T7L66XB b/configs/base-generic/arm/armv7/CONFIG_MFD_T7L66XB
index 2c759fb22..2c759fb22 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_T7L66XB
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_T7L66XB
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TC6387XB b/configs/base-generic/arm/armv7/CONFIG_MFD_TC6387XB
index dec5c1ef2..dec5c1ef2 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TC6387XB
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TC6387XB
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS65090 b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65090
index 2fdd3dc55..2fdd3dc55 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS65090
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65090
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS65910 b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65910
index cb49186e5..cb49186e5 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS65910
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65910
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912 b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912
index ada31704c..ada31704c 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912_I2C b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912_I2C
index d8ab53f28..d8ab53f28 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912_SPI b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912_SPI
index 0f0bba4f4..0f0bba4f4 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS65912_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS65912_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_TPS80031 b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS80031
index be3acd867..be3acd867 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_TPS80031
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_TPS80031
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_WM831X_SPI b/configs/base-generic/arm/armv7/CONFIG_MFD_WM831X_SPI
index 443939c2d..443939c2d 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_WM831X_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_WM831X_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_WM8994 b/configs/base-generic/arm/armv7/CONFIG_MFD_WM8994
index d17d210ea..d17d210ea 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_WM8994
+++ b/configs/base-generic/arm/armv7/CONFIG_MFD_WM8994
diff --git a/baseconfig/arm/armv7/CONFIG_MG_DISK b/configs/base-generic/arm/armv7/CONFIG_MG_DISK
index 7929989c6..7929989c6 100644
--- a/baseconfig/arm/armv7/CONFIG_MG_DISK
+++ b/configs/base-generic/arm/armv7/CONFIG_MG_DISK
diff --git a/baseconfig/arm/armv7/CONFIG_MICREL_KS8995MA b/configs/base-generic/arm/armv7/CONFIG_MICREL_KS8995MA
index cba7a233f..cba7a233f 100644
--- a/baseconfig/arm/armv7/CONFIG_MICREL_KS8995MA
+++ b/configs/base-generic/arm/armv7/CONFIG_MICREL_KS8995MA
diff --git a/baseconfig/arm/armv7/CONFIG_MLX4_INFINIBAND b/configs/base-generic/arm/armv7/CONFIG_MLX4_INFINIBAND
index 84f627ee6..84f627ee6 100644
--- a/baseconfig/arm/armv7/CONFIG_MLX4_INFINIBAND
+++ b/configs/base-generic/arm/armv7/CONFIG_MLX4_INFINIBAND
diff --git a/baseconfig/arm/armv7/CONFIG_MLX5_INFINIBAND b/configs/base-generic/arm/armv7/CONFIG_MLX5_INFINIBAND
index c09ba1a61..c09ba1a61 100644
--- a/baseconfig/arm/armv7/CONFIG_MLX5_INFINIBAND
+++ b/configs/base-generic/arm/armv7/CONFIG_MLX5_INFINIBAND
diff --git a/baseconfig/arm/armv7/CONFIG_MMA8452 b/configs/base-generic/arm/armv7/CONFIG_MMA8452
index 44b2d2ae8..44b2d2ae8 100644
--- a/baseconfig/arm/armv7/CONFIG_MMA8452
+++ b/configs/base-generic/arm/armv7/CONFIG_MMA8452
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_DW_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_MMC_DW_EXYNOS
index 232be4c10..232be4c10 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_DW_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_DW_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX b/configs/base-generic/arm/armv7/CONFIG_MMC_MESON_GX
index 92f0e7e77..92f0e7e77 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_MESON_GX
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_OMAP_HS b/configs/base-generic/arm/armv7/CONFIG_MMC_OMAP_HS
index 065308aed..065308aed 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_OMAP_HS
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_OMAP_HS
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_DOVE b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_DOVE
index 569aaf2c2..569aaf2c2 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_DOVE
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_DOVE
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_S3C b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_S3C
index 170081aa0..170081aa0 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_S3C
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_S3C
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_S3C_DMA b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_S3C_DMA
index 9cb88a48f..9cb88a48f 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_SDHCI_S3C_DMA
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_SDHCI_S3C_DMA
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_SUNXI b/configs/base-generic/arm/armv7/CONFIG_MMC_SUNXI
index 0f6eda36b..0f6eda36b 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_TMIO b/configs/base-generic/arm/armv7/CONFIG_MMC_TMIO
index 8bafcaf67..8bafcaf67 100644
--- a/baseconfig/arm/armv7/CONFIG_MMC_TMIO
+++ b/configs/base-generic/arm/armv7/CONFIG_MMC_TMIO
diff --git a/baseconfig/arm/armv7/CONFIG_MPL115 b/configs/base-generic/arm/armv7/CONFIG_MPL115
index 991553744..991553744 100644
--- a/baseconfig/arm/armv7/CONFIG_MPL115
+++ b/configs/base-generic/arm/armv7/CONFIG_MPL115
diff --git a/baseconfig/arm/armv7/CONFIG_MPL3115 b/configs/base-generic/arm/armv7/CONFIG_MPL3115
index 1e03fe728..1e03fe728 100644
--- a/baseconfig/arm/armv7/CONFIG_MPL3115
+++ b/configs/base-generic/arm/armv7/CONFIG_MPL3115
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_AFS_PARTS b/configs/base-generic/arm/armv7/CONFIG_MTD_AFS_PARTS
index 0abf6cc8e..0abf6cc8e 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_AFS_PARTS
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_AFS_PARTS
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH
index 811074928..811074928 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH_OTP b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH_OTP
index 9b951bd56..9b951bd56 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH_OTP
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH_OTP
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
index 8549afbbc..8549afbbc 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_DATAFLASH_WRITE_VERIFY
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_M25P80 b/configs/base-generic/arm/armv7/CONFIG_MTD_M25P80
index 9e4ab3f0b..9e4ab3f0b 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_M25P80
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_M25P80
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_MT81xx_NOR b/configs/base-generic/arm/armv7/CONFIG_MTD_MT81xx_NOR
index 204cf13ab..204cf13ab 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_MT81xx_NOR
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_MT81xx_NOR
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND
index 2d7c71efd..2d7c71efd 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_BRCMNAND b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_BRCMNAND
index 2a517c5a8..2a517c5a8 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_BRCMNAND
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_BRCMNAND
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_CAFE b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_CAFE
index ae5227871..ae5227871 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_CAFE
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_CAFE
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_DENALI b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_DENALI
index 2d570d8c3..2d570d8c3 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_DENALI
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_DENALI
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_DOCG4 b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_DOCG4
index 8e0d6a1f4..8e0d6a1f4 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_DOCG4
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_DOCG4
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_ECC_SMC b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC
index 96cbf1c99..96cbf1c99 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_ECC_SMC
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_ECC_SMC
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_FSMC b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_FSMC
index 1121fce08..1121fce08 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_FSMC
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_FSMC
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_GPIO b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_GPIO
index 87a53f38b..87a53f38b 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_GPIO
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_GPIO
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_MTK b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_MTK
index 98d0060ca..98d0060ca 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_MTK
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_MTK
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_MXC b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_MXC
index 14f2605b6..14f2605b6 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_MXC
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_MXC
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_NANDSIM b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
index 500e1e796..500e1e796 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_NANDSIM
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_ORION b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_ORION
index 69c19052b..69c19052b 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_ORION
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_ORION
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_PLATFORM b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_PLATFORM
index 1490783c2..1490783c2 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_PLATFORM
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_PLATFORM
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_RICOH b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_RICOH
index d1731d3a4..d1731d3a4 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_RICOH
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_RICOH
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_SUNXI b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_SUNXI
index 8a9d036fb..8a9d036fb 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_TMIO b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_TMIO
index 53d33533e..53d33533e 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_TMIO
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_NAND_TMIO
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_SPINAND_MT29F b/configs/base-generic/arm/armv7/CONFIG_MTD_SPINAND_MT29F
index b01240117..b01240117 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_SPINAND_MT29F
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_SPINAND_MT29F
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_SPINAND_ONDIEECC b/configs/base-generic/arm/armv7/CONFIG_MTD_SPINAND_ONDIEECC
index 9f1b4bcac..9f1b4bcac 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_SPINAND_ONDIEECC
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_SPINAND_ONDIEECC
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_SPI_NOR b/configs/base-generic/arm/armv7/CONFIG_MTD_SPI_NOR
index 913b13234..913b13234 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_SPI_NOR
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_SPI_NOR
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS b/configs/base-generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
index 347ef2dc3..347ef2dc3 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_SST25L b/configs/base-generic/arm/armv7/CONFIG_MTD_SST25L
index b1da0c467..b1da0c467 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_SST25L
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_SST25L
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_ST_SPI_FSM b/configs/base-generic/arm/armv7/CONFIG_MTD_ST_SPI_FSM
index ed8467877..ed8467877 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_ST_SPI_FSM
+++ b/configs/base-generic/arm/armv7/CONFIG_MTD_ST_SPI_FSM
diff --git a/baseconfig/arm/armv7/CONFIG_NEON b/configs/base-generic/arm/armv7/CONFIG_NEON
index eb6220b11..eb6220b11 100644
--- a/baseconfig/arm/armv7/CONFIG_NEON
+++ b/configs/base-generic/arm/armv7/CONFIG_NEON
diff --git a/baseconfig/arm/armv7/CONFIG_NET_9P_RDMA b/configs/base-generic/arm/armv7/CONFIG_NET_9P_RDMA
index fce5acb9a..fce5acb9a 100644
--- a/baseconfig/arm/armv7/CONFIG_NET_9P_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_NET_9P_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_ALLWINNER b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_ALLWINNER
index 2ff45074a..2ff45074a 100644
--- a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_ALLWINNER
+++ b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_ALLWINNER
diff --git a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_CIRRUS b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_CIRRUS
index 2a5e0f458..2a5e0f458 100644
--- a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_CIRRUS
+++ b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_CIRRUS
diff --git a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP
index 8a7b69b77..8a7b69b77 100644
--- a/baseconfig/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP
+++ b/configs/base-generic/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP
diff --git a/baseconfig/arm/armv7/CONFIG_NR_CPUS b/configs/base-generic/arm/armv7/CONFIG_NR_CPUS
index 1d82a8537..1d82a8537 100644
--- a/baseconfig/arm/armv7/CONFIG_NR_CPUS
+++ b/configs/base-generic/arm/armv7/CONFIG_NR_CPUS
diff --git a/baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM b/configs/base-generic/arm/armv7/CONFIG_NVMEM_IMX_IIM
index 9407e7a4b..9407e7a4b 100644
--- a/baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM
+++ b/configs/base-generic/arm/armv7/CONFIG_NVMEM_IMX_IIM
diff --git a/baseconfig/arm/armv7/CONFIG_NVMEM_SUNXI_SID b/configs/base-generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID
index 454644aac..454644aac 100644
--- a/baseconfig/arm/armv7/CONFIG_NVMEM_SUNXI_SID
+++ b/configs/base-generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID
diff --git a/baseconfig/arm/armv7/CONFIG_NVME_RDMA b/configs/base-generic/arm/armv7/CONFIG_NVME_RDMA
index 5815bee55..5815bee55 100644
--- a/baseconfig/arm/armv7/CONFIG_NVME_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_NVME_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_NVME_TARGET_RDMA b/configs/base-generic/arm/armv7/CONFIG_NVME_TARGET_RDMA
index e57c5b285..e57c5b285 100644
--- a/baseconfig/arm/armv7/CONFIG_NVME_TARGET_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_NVME_TARGET_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_OABI_COMPAT b/configs/base-generic/arm/armv7/CONFIG_OABI_COMPAT
index a6c13b79b..a6c13b79b 100644
--- a/baseconfig/arm/armv7/CONFIG_OABI_COMPAT
+++ b/configs/base-generic/arm/armv7/CONFIG_OABI_COMPAT
diff --git a/baseconfig/arm/armv7/CONFIG_OMAP3_THERMAL b/configs/base-generic/arm/armv7/CONFIG_OMAP3_THERMAL
index 08493e07f..08493e07f 100644
--- a/baseconfig/arm/armv7/CONFIG_OMAP3_THERMAL
+++ b/configs/base-generic/arm/armv7/CONFIG_OMAP3_THERMAL
diff --git a/baseconfig/arm/armv7/CONFIG_ORION_WATCHDOG b/configs/base-generic/arm/armv7/CONFIG_ORION_WATCHDOG
index 5393ef9eb..5393ef9eb 100644
--- a/baseconfig/arm/armv7/CONFIG_ORION_WATCHDOG
+++ b/configs/base-generic/arm/armv7/CONFIG_ORION_WATCHDOG
diff --git a/baseconfig/arm/armv7/CONFIG_P54_SPI b/configs/base-generic/arm/armv7/CONFIG_P54_SPI
index 8c1b47cd2..8c1b47cd2 100644
--- a/baseconfig/arm/armv7/CONFIG_P54_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_P54_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_P54_SPI_DEFAULT_EEPROM b/configs/base-generic/arm/armv7/CONFIG_P54_SPI_DEFAULT_EEPROM
index 57d1f8db6..57d1f8db6 100644
--- a/baseconfig/arm/armv7/CONFIG_P54_SPI_DEFAULT_EEPROM
+++ b/configs/base-generic/arm/armv7/CONFIG_P54_SPI_DEFAULT_EEPROM
diff --git a/baseconfig/arm/armv7/CONFIG_PCIE_ALTERA b/configs/base-generic/arm/armv7/CONFIG_PCIE_ALTERA
index 98cb6dd64..98cb6dd64 100644
--- a/baseconfig/arm/armv7/CONFIG_PCIE_ALTERA
+++ b/configs/base-generic/arm/armv7/CONFIG_PCIE_ALTERA
diff --git a/baseconfig/arm/armv7/CONFIG_PCIE_ARMADA_8K b/configs/base-generic/arm/armv7/CONFIG_PCIE_ARMADA_8K
index c8579be6d..c8579be6d 100644
--- a/baseconfig/arm/armv7/CONFIG_PCIE_ARMADA_8K
+++ b/configs/base-generic/arm/armv7/CONFIG_PCIE_ARMADA_8K
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX
index b401f79fb..b401f79fb 100644
--- a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX
+++ b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX_EP
index 8a6a68062..8a6a68062 100644
--- a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP
+++ b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX_EP
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX_HOST
index 7bbb2fd97..7bbb2fd97 100644
--- a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST
+++ b/configs/base-generic/arm/armv7/CONFIG_PCI_DRA7XX_HOST
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_PCI_EXYNOS
index b2bef3046..b2bef3046 100644
--- a/baseconfig/arm/armv7/CONFIG_PCI_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_PCI_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_LAYERSCAPE b/configs/base-generic/arm/armv7/CONFIG_PCI_LAYERSCAPE
index 1aa678b49..1aa678b49 100644
--- a/baseconfig/arm/armv7/CONFIG_PCI_LAYERSCAPE
+++ b/configs/base-generic/arm/armv7/CONFIG_PCI_LAYERSCAPE
diff --git a/baseconfig/arm/armv7/CONFIG_PDA_POWER b/configs/base-generic/arm/armv7/CONFIG_PDA_POWER
index eb028ff67..eb028ff67 100644
--- a/baseconfig/arm/armv7/CONFIG_PDA_POWER
+++ b/configs/base-generic/arm/armv7/CONFIG_PDA_POWER
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS5250_SATA b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS5250_SATA
index 73463bb46..73463bb46 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS5250_SATA
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS5250_SATA
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS5_USBDRD b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS5_USBDRD
index c4c924d3e..c4c924d3e 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS5_USBDRD
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS5_USBDRD
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_DP_VIDEO b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_DP_VIDEO
index bbf21fcbd..bbf21fcbd 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_DP_VIDEO
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_DP_VIDEO
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_MIPI_VIDEO b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_MIPI_VIDEO
index b8418ffe8..b8418ffe8 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_MIPI_VIDEO
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_MIPI_VIDEO
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
index 26417e932..26417e932 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_SAMSUNG_USB2 b/configs/base-generic/arm/armv7/CONFIG_PHY_SAMSUNG_USB2
index 2927a1445..2927a1445 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_SAMSUNG_USB2
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_SAMSUNG_USB2
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_SUN4I_USB b/configs/base-generic/arm/armv7/CONFIG_PHY_SUN4I_USB
index f619228c3..f619228c3 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_SUN4I_USB
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_SUN4I_USB
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_SUN9I_USB b/configs/base-generic/arm/armv7/CONFIG_PHY_SUN9I_USB
index 5781bb81c..5781bb81c 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_SUN9I_USB
+++ b/configs/base-generic/arm/armv7/CONFIG_PHY_SUN9I_USB
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_AMD b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_AMD
index 02626b835..02626b835 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_AMD
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_AMD
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_ARMADA_370 b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_ARMADA_370
index eefb01d83..eefb01d83 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_ARMADA_370
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_ARMADA_370
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_ARMADA_XP b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_ARMADA_XP
index 8c47713c7..8c47713c7 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_ARMADA_XP
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_ARMADA_XP
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_AS3722 b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_AS3722
index c620f49f9..c620f49f9 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_AS3722
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_AS3722
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_DOVE b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_DOVE
index 60c78ed16..60c78ed16 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_DOVE
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_DOVE
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_MDM9615 b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_MDM9615
index aa3be1054..aa3be1054 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_MDM9615
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_MDM9615
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_MSM8996 b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_MSM8996
index dc49ba08c..dc49ba08c 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_MSM8996
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_MSM8996
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_SAMSUNG b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_SAMSUNG
index 787af2535..787af2535 100644
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_SAMSUNG
+++ b/configs/base-generic/arm/armv7/CONFIG_PINCTRL_SAMSUNG
diff --git a/baseconfig/arm/armv7/CONFIG_PJ4B_ERRATA_4742 b/configs/base-generic/arm/armv7/CONFIG_PJ4B_ERRATA_4742
index 4f9851475..4f9851475 100644
--- a/baseconfig/arm/armv7/CONFIG_PJ4B_ERRATA_4742
+++ b/configs/base-generic/arm/armv7/CONFIG_PJ4B_ERRATA_4742
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369 b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_588369
index a821768d1..a821768d1 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369
+++ b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_588369
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915 b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_727915
index 4e4e5453f..4e4e5453f 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915
+++ b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_727915
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_753970 b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_753970
index d7148e529..d7148e529 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_753970
+++ b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_753970
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_769419 b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_769419
index f49374bc8..f49374bc8 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_769419
+++ b/configs/base-generic/arm/armv7/CONFIG_PL310_ERRATA_769419
diff --git a/baseconfig/arm/armv7/CONFIG_PL320_MBOX b/configs/base-generic/arm/armv7/CONFIG_PL320_MBOX
index 165aa0f05..165aa0f05 100644
--- a/baseconfig/arm/armv7/CONFIG_PL320_MBOX
+++ b/configs/base-generic/arm/armv7/CONFIG_PL320_MBOX
diff --git a/baseconfig/arm/armv7/CONFIG_PLAT_SPEAR b/configs/base-generic/arm/armv7/CONFIG_PLAT_SPEAR
index b600e005e..b600e005e 100644
--- a/baseconfig/arm/armv7/CONFIG_PLAT_SPEAR
+++ b/configs/base-generic/arm/armv7/CONFIG_PLAT_SPEAR
diff --git a/baseconfig/arm/armv7/CONFIG_PMIC_ADP5520 b/configs/base-generic/arm/armv7/CONFIG_PMIC_ADP5520
index 8664194c8..8664194c8 100644
--- a/baseconfig/arm/armv7/CONFIG_PMIC_ADP5520
+++ b/configs/base-generic/arm/armv7/CONFIG_PMIC_ADP5520
diff --git a/baseconfig/arm/armv7/CONFIG_PMIC_DA903X b/configs/base-generic/arm/armv7/CONFIG_PMIC_DA903X
index 875cd2580..875cd2580 100644
--- a/baseconfig/arm/armv7/CONFIG_PMIC_DA903X
+++ b/configs/base-generic/arm/armv7/CONFIG_PMIC_DA903X
diff --git a/baseconfig/arm/armv7/CONFIG_PM_DEVFREQ_EVENT b/configs/base-generic/arm/armv7/CONFIG_PM_DEVFREQ_EVENT
index af91a2b50..af91a2b50 100644
--- a/baseconfig/arm/armv7/CONFIG_PM_DEVFREQ_EVENT
+++ b/configs/base-generic/arm/armv7/CONFIG_PM_DEVFREQ_EVENT
diff --git a/baseconfig/arm/armv7/CONFIG_POWER_RESET_AS3722 b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_AS3722
index d73cd6d68..d73cd6d68 100644
--- a/baseconfig/arm/armv7/CONFIG_POWER_RESET_AS3722
+++ b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_AS3722
diff --git a/baseconfig/arm/armv7/CONFIG_POWER_RESET_BRCMSTB b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_BRCMSTB
index 35f35e595..35f35e595 100644
--- a/baseconfig/arm/armv7/CONFIG_POWER_RESET_BRCMSTB
+++ b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_BRCMSTB
diff --git a/baseconfig/arm/armv7/CONFIG_POWER_RESET_QNAP b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_QNAP
index fc7400266..fc7400266 100644
--- a/baseconfig/arm/armv7/CONFIG_POWER_RESET_QNAP
+++ b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_QNAP
diff --git a/baseconfig/arm/armv7/CONFIG_POWER_RESET_SYSCON b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_SYSCON
index d0db15703..d0db15703 100644
--- a/baseconfig/arm/armv7/CONFIG_POWER_RESET_SYSCON
+++ b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_SYSCON
diff --git a/baseconfig/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF
index 5965461f4..5965461f4 100644
--- a/baseconfig/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF
+++ b/configs/base-generic/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF
diff --git a/baseconfig/arm/armv7/CONFIG_PWM_SAMSUNG b/configs/base-generic/arm/armv7/CONFIG_PWM_SAMSUNG
index 474732f75..474732f75 100644
--- a/baseconfig/arm/armv7/CONFIG_PWM_SAMSUNG
+++ b/configs/base-generic/arm/armv7/CONFIG_PWM_SAMSUNG
diff --git a/baseconfig/arm/armv7/CONFIG_PWM_SUN4I b/configs/base-generic/arm/armv7/CONFIG_PWM_SUN4I
index d4f562f3f..d4f562f3f 100644
--- a/baseconfig/arm/armv7/CONFIG_PWM_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_PWM_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_PWM_TIECAP b/configs/base-generic/arm/armv7/CONFIG_PWM_TIECAP
index 84f1e9b57..84f1e9b57 100644
--- a/baseconfig/arm/armv7/CONFIG_PWM_TIECAP
+++ b/configs/base-generic/arm/armv7/CONFIG_PWM_TIECAP
diff --git a/baseconfig/arm/armv7/CONFIG_QCOM_EBI2 b/configs/base-generic/arm/armv7/CONFIG_QCOM_EBI2
index e96b3544e..e96b3544e 100644
--- a/baseconfig/arm/armv7/CONFIG_QCOM_EBI2
+++ b/configs/base-generic/arm/armv7/CONFIG_QCOM_EBI2
diff --git a/baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC b/configs/base-generic/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC
index 1060913dd..1060913dd 100644
--- a/baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC
+++ b/configs/base-generic/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC
diff --git a/baseconfig/arm/armv7/CONFIG_QORIQ_CPUFREQ b/configs/base-generic/arm/armv7/CONFIG_QORIQ_CPUFREQ
index e8e355ba3..e8e355ba3 100644
--- a/baseconfig/arm/armv7/CONFIG_QORIQ_CPUFREQ
+++ b/configs/base-generic/arm/armv7/CONFIG_QORIQ_CPUFREQ
diff --git a/baseconfig/arm/armv7/CONFIG_R8188EU b/configs/base-generic/arm/armv7/CONFIG_R8188EU
index ed7c3546e..ed7c3546e 100644
--- a/baseconfig/arm/armv7/CONFIG_R8188EU
+++ b/configs/base-generic/arm/armv7/CONFIG_R8188EU
diff --git a/baseconfig/arm/armv7/CONFIG_RCU_FANOUT b/configs/base-generic/arm/armv7/CONFIG_RCU_FANOUT
index f80f8cbe6..f80f8cbe6 100644
--- a/baseconfig/arm/armv7/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/arm/armv7/CONFIG_RCU_FANOUT
diff --git a/baseconfig/arm/armv7/CONFIG_RDMA_RXE b/configs/base-generic/arm/armv7/CONFIG_RDMA_RXE
index 66d4cbe32..66d4cbe32 100644
--- a/baseconfig/arm/armv7/CONFIG_RDMA_RXE
+++ b/configs/base-generic/arm/armv7/CONFIG_RDMA_RXE
diff --git a/baseconfig/arm/armv7/CONFIG_RDS_RDMA b/configs/base-generic/arm/armv7/CONFIG_RDS_RDMA
index 169ffb921..169ffb921 100644
--- a/baseconfig/arm/armv7/CONFIG_RDS_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_RDS_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_REGMAP_I2C b/configs/base-generic/arm/armv7/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/arm/armv7/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/arm/armv7/CONFIG_REGMAP_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_REGMAP_IRQ b/configs/base-generic/arm/armv7/CONFIG_REGMAP_IRQ
index 7320141ea..7320141ea 100644
--- a/baseconfig/arm/armv7/CONFIG_REGMAP_IRQ
+++ b/configs/base-generic/arm/armv7/CONFIG_REGMAP_IRQ
diff --git a/baseconfig/arm/armv7/CONFIG_REGMAP_MMIO b/configs/base-generic/arm/armv7/CONFIG_REGMAP_MMIO
index 2e7e1299d..2e7e1299d 100644
--- a/baseconfig/arm/armv7/CONFIG_REGMAP_MMIO
+++ b/configs/base-generic/arm/armv7/CONFIG_REGMAP_MMIO
diff --git a/baseconfig/arm/armv7/CONFIG_REGMAP_SPI b/configs/base-generic/arm/armv7/CONFIG_REGMAP_SPI
index eb9c6a3f7..eb9c6a3f7 100644
--- a/baseconfig/arm/armv7/CONFIG_REGMAP_SPI
+++ b/configs/base-generic/arm/armv7/CONFIG_REGMAP_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_AD5398 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AD5398
index 50bafa94c..50bafa94c 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_AD5398
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AD5398
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_AS3722 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AS3722
index 8eececb2a..8eececb2a 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_AS3722
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AS3722
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_AXP20X b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AXP20X
index 6694810a6..6694810a6 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_AXP20X
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_AXP20X
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_DA9210 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_DA9210
index 833208162..833208162 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_DA9210
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_DA9210
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_DA9211 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_DA9211
index f14cbf03f..f14cbf03f 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_DA9211
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_DA9211
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ISL6271A b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_ISL6271A
index 12da84ace..12da84ace 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ISL6271A
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_ISL6271A
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ISL9305 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_ISL9305
index 6c9699328..6c9699328 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ISL9305
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_ISL9305
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP3971 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP3971
index c122849bb..c122849bb 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP3971
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP3971
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP3972 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP3972
index 32cc87cd5..32cc87cd5 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP3972
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP3972
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP872X b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP872X
index f86c86bc7..f86c86bc7 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP872X
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP872X
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP8755 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP8755
index 12816a7af..12816a7af 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_LP8755
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LP8755
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_LTC3589 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LTC3589
index d7729a404..d7729a404 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_LTC3589
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_LTC3589
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX1586 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX1586
index 45b6c017d..45b6c017d 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX1586
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX1586
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8649 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8649
index 204519196..204519196 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8649
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8649
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8660 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8660
index 628f64fea..628f64fea 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8660
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8660
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8952 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8952
index 7998d5171..7998d5171 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8952
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8952
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8973 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8973
index 23c18b1fb..23c18b1fb 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8973
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8973
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8997
index 0b0734e50..0b0734e50 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MT6311 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MT6311
index 884c0d452..884c0d452 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MT6311
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_MT6311
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_PFUZE100 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PFUZE100
index 28b060a04..28b060a04 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_PFUZE100
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PFUZE100
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88060 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88060
index 845195a40..845195a40 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88060
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88060
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88080 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88080
index 4b024f4ba..4b024f4ba 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88080
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88080
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88090 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88090
index e5c81b954..e5c81b954 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_PV88090
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_PV88090
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_S2MPA01 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S2MPA01
index e47ad64c5..e47ad64c5 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_S2MPA01
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S2MPA01
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_S2MPS11 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S2MPS11
index ec92478d3..ec92478d3 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_S2MPS11
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S2MPS11
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_S5M8767 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S5M8767
index 705edd350..705edd350 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_S5M8767
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_S5M8767
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS51632 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS51632
index fd9d90a65..fd9d90a65 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS51632
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS51632
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS62360 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS62360
index fbe8f930e..fbe8f930e 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS62360
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS62360
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65023 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65023
index c6fcc0180..c6fcc0180 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65023
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65023
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6507X b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6507X
index 74cf8b3a0..74cf8b3a0 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6507X
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6507X
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65090 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65090
index edfcf90da..edfcf90da 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65090
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65090
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65217 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65217
index 3773f756b..3773f756b 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65217
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65217
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6524X b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6524X
index 763753cd6..763753cd6 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6524X
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6524X
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6586X b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6586X
index 44d6c89c2..44d6c89c2 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS6586X
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS6586X
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65910 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65910
index 8cfa4aa52..8cfa4aa52 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65910
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65910
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65912 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65912
index 1ed511ed7..1ed511ed7 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS65912
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS65912
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS80031 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS80031
index a4f52b209..a4f52b209 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_TPS80031
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_TPS80031
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_WM8994 b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_WM8994
index 21ac327aa..21ac327aa 100644
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_WM8994
+++ b/configs/base-generic/arm/armv7/CONFIG_REGULATOR_WM8994
diff --git a/baseconfig/arm/armv7/CONFIG_RPMSG_CHAR b/configs/base-generic/arm/armv7/CONFIG_RPMSG_CHAR
index 3aa998906..3aa998906 100644
--- a/baseconfig/arm/armv7/CONFIG_RPMSG_CHAR
+++ b/configs/base-generic/arm/armv7/CONFIG_RPMSG_CHAR
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_AS3722 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_AS3722
index 2b582bcab..2b582bcab 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_AS3722
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_AS3722
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1305 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1305
index 37b8971b4..37b8971b4 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1305
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1305
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1343 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1343
index ace147d2e..ace147d2e 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1343
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1343
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1347 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1347
index b0b49f400..b0b49f400 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1347
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1347
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1390 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1390
index 9c4133771..9c4133771 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_DS1390
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_DS1390
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_M41T93 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_M41T93
index c2255ff15..c2255ff15 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_M41T93
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_M41T93
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_M41T94 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_M41T94
index 85abd7c6a..85abd7c6a 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_M41T94
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_M41T94
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MAX6902 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MAX6902
index 4bfa40bf0..4bfa40bf0 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MAX6902
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MAX6902
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MAX8997 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MAX8997
index 09617c375..09617c375 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MAX8997
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MAX8997
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MCP795 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MCP795
index ccef49963..ccef49963 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_MCP795
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_MCP795
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_PL030 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_PL030
index c253fa8df..c253fa8df 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_PL030
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_PL030
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_R9701 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_R9701
index 3a1cb4f3a..3a1cb4f3a 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_R9701
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_R9701
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_RS5C348 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_RS5C348
index 56e73e950..56e73e950 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_RS5C348
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_RS5C348
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_RX4581 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_RX4581
index 9d1489894..9d1489894 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_RX4581
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_RX4581
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_S3C b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_S3C
index 3dc819ede..3dc819ede 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_S3C
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_S3C
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_S5M b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_S5M
index bda3335ed..bda3335ed 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_S5M
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_S5M
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
index 54410db09..54410db09 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUNXI b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_SUNXI
index dca6dc314..dca6dc314 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_TPS65910 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_TPS65910
index 530f46204..530f46204 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_TPS65910
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_TPS65910
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_TPS80031 b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_TPS80031
index a7a2105af..a7a2105af 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_TPS80031
+++ b/configs/base-generic/arm/armv7/CONFIG_RTC_DRV_TPS80031
diff --git a/baseconfig/arm/armv7/CONFIG_S3C2410_WATCHDOG b/configs/base-generic/arm/armv7/CONFIG_S3C2410_WATCHDOG
index f1f654595..f1f654595 100644
--- a/baseconfig/arm/armv7/CONFIG_S3C2410_WATCHDOG
+++ b/configs/base-generic/arm/armv7/CONFIG_S3C2410_WATCHDOG
diff --git a/baseconfig/arm/armv7/CONFIG_SAMSUNG_PM_CHECK b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_PM_CHECK
index cdc716117..cdc716117 100644
--- a/baseconfig/arm/armv7/CONFIG_SAMSUNG_PM_CHECK
+++ b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_PM_CHECK
diff --git a/baseconfig/arm/armv7/CONFIG_SAMSUNG_PM_DEBUG b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_PM_DEBUG
index d2f4277ef..d2f4277ef 100644
--- a/baseconfig/arm/armv7/CONFIG_SAMSUNG_PM_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_PM_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_SAMSUNG_USBPHY b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_USBPHY
index 242ef4fde..242ef4fde 100644
--- a/baseconfig/arm/armv7/CONFIG_SAMSUNG_USBPHY
+++ b/configs/base-generic/arm/armv7/CONFIG_SAMSUNG_USBPHY
diff --git a/baseconfig/arm/armv7/CONFIG_SATA_HIGHBANK b/configs/base-generic/arm/armv7/CONFIG_SATA_HIGHBANK
index 86d458ffd..86d458ffd 100644
--- a/baseconfig/arm/armv7/CONFIG_SATA_HIGHBANK
+++ b/configs/base-generic/arm/armv7/CONFIG_SATA_HIGHBANK
diff --git a/baseconfig/arm/armv7/CONFIG_SCSI_ACARD b/configs/base-generic/arm/armv7/CONFIG_SCSI_ACARD
index d4002ddd0..d4002ddd0 100644
--- a/baseconfig/arm/armv7/CONFIG_SCSI_ACARD
+++ b/configs/base-generic/arm/armv7/CONFIG_SCSI_ACARD
diff --git a/baseconfig/arm/armv7/CONFIG_SECURITY_INFINIBAND b/configs/base-generic/arm/armv7/CONFIG_SECURITY_INFINIBAND
index 8bcc67164..8bcc67164 100644
--- a/baseconfig/arm/armv7/CONFIG_SECURITY_INFINIBAND
+++ b/configs/base-generic/arm/armv7/CONFIG_SECURITY_INFINIBAND
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_AD7314 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_AD7314
index b5581b798..b5581b798 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_AD7314
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_AD7314
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_ADS7871 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ADS7871
index 9a4091fb8..9a4091fb8 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_ADS7871
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ADS7871
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_GPIO_FAN b/configs/base-generic/arm/armv7/CONFIG_SENSORS_GPIO_FAN
index 9331ff3d7..9331ff3d7 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_GPIO_FAN
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_GPIO_FAN
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_ISL29018 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ISL29018
index 320ffdd2a..320ffdd2a 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_ISL29018
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ISL29018
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_ISL29028 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ISL29028
index 7b7b44eb9..7b7b44eb9 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_ISL29028
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_ISL29028
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_LM70 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_LM70
index d8626cc07..d8626cc07 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_LM70
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_LM70
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_LTC2978_REGULATOR b/configs/base-generic/arm/armv7/CONFIG_SENSORS_LTC2978_REGULATOR
index f0d685383..f0d685383 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_LTC2978_REGULATOR
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_LTC2978_REGULATOR
diff --git a/baseconfig/arm/armv7/CONFIG_SENSORS_MAX1111 b/configs/base-generic/arm/armv7/CONFIG_SENSORS_MAX1111
index fdefcc26b..fdefcc26b 100644
--- a/baseconfig/arm/armv7/CONFIG_SENSORS_MAX1111
+++ b/configs/base-generic/arm/armv7/CONFIG_SENSORS_MAX1111
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_8250_EM b/configs/base-generic/arm/armv7/CONFIG_SERIAL_8250_EM
index c5a682da7..c5a682da7 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_8250_EM
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_8250_EM
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_AMBA_PL010 b/configs/base-generic/arm/armv7/CONFIG_SERIAL_AMBA_PL010
index 9b1b87ebd..9b1b87ebd 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_AMBA_PL010
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_AMBA_PL010
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_AMBA_PL010_CONSOLE b/configs/base-generic/arm/armv7/CONFIG_SERIAL_AMBA_PL010_CONSOLE
index c3cf9644d..c3cf9644d 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_AMBA_PL010_CONSOLE
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_AMBA_PL010_CONSOLE
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_BCM63XX b/configs/base-generic/arm/armv7/CONFIG_SERIAL_BCM63XX
index 514d69a6d..514d69a6d 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_BCM63XX
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_BCM63XX
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_IFX6X60 b/configs/base-generic/arm/armv7/CONFIG_SERIAL_IFX6X60
index b456384e1..b456384e1 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_IFX6X60
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_IFX6X60
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_MAX3100 b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MAX3100
index 5fb197ebc..5fb197ebc 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_MAX3100
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MAX3100
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_MAX310X b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MAX310X
index 10f39f7fa..10f39f7fa 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_MAX310X
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MAX310X
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_MPS2_UART b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MPS2_UART
index 1d57880de..1d57880de 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_MPS2_UART
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_MPS2_UART
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG
index f82d78bcf..f82d78bcf 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG_CONSOLE b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG_CONSOLE
index 528736854..528736854 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG_CONSOLE
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG_CONSOLE
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG_DEBUG b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG_DEBUG
index 11f3f2678..11f3f2678 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_SAMSUNG_DEBUG
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_SAMSUNG_DEBUG
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC b/configs/base-generic/arm/armv7/CONFIG_SERIAL_ST_ASC
index 9ac7f69ac..9ac7f69ac 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_ST_ASC
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE b/configs/base-generic/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
index 4f7f87761..4f7f87761 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
diff --git a/baseconfig/arm/armv7/CONFIG_SERIO_SUN4I_PS2 b/configs/base-generic/arm/armv7/CONFIG_SERIO_SUN4I_PS2
index c1c0dd5ee..c1c0dd5ee 100644
--- a/baseconfig/arm/armv7/CONFIG_SERIO_SUN4I_PS2
+++ b/configs/base-generic/arm/armv7/CONFIG_SERIO_SUN4I_PS2
diff --git a/baseconfig/arm/armv7/CONFIG_SFC b/configs/base-generic/arm/armv7/CONFIG_SFC
index fdc60b90f..fdc60b90f 100644
--- a/baseconfig/arm/armv7/CONFIG_SFC
+++ b/configs/base-generic/arm/armv7/CONFIG_SFC
diff --git a/baseconfig/arm/armv7/CONFIG_SI7005 b/configs/base-generic/arm/armv7/CONFIG_SI7005
index bb43bf191..bb43bf191 100644
--- a/baseconfig/arm/armv7/CONFIG_SI7005
+++ b/configs/base-generic/arm/armv7/CONFIG_SI7005
diff --git a/baseconfig/arm/armv7/CONFIG_SI7020 b/configs/base-generic/arm/armv7/CONFIG_SI7020
index 57cab28ab..57cab28ab 100644
--- a/baseconfig/arm/armv7/CONFIG_SI7020
+++ b/configs/base-generic/arm/armv7/CONFIG_SI7020
diff --git a/baseconfig/arm/armv7/CONFIG_SMP_ON_UP b/configs/base-generic/arm/armv7/CONFIG_SMP_ON_UP
index b0a92aa01..b0a92aa01 100644
--- a/baseconfig/arm/armv7/CONFIG_SMP_ON_UP
+++ b/configs/base-generic/arm/armv7/CONFIG_SMP_ON_UP
diff --git a/baseconfig/arm/armv7/CONFIG_SND_ALI5451 b/configs/base-generic/arm/armv7/CONFIG_SND_ALI5451
index 293781cd6..293781cd6 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_ALI5451
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_ALI5451
diff --git a/baseconfig/arm/armv7/CONFIG_SND_ARM b/configs/base-generic/arm/armv7/CONFIG_SND_ARM
index 6e5bf1c20..6e5bf1c20 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_ARM
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_ARM
diff --git a/baseconfig/arm/armv7/CONFIG_SND_ARMAACI b/configs/base-generic/arm/armv7/CONFIG_SND_ARMAACI
index a29ad5d51..a29ad5d51 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_ARMAACI
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_ARMAACI
diff --git a/baseconfig/arm/armv7/CONFIG_SND_KIRKWOOD_SOC b/configs/base-generic/arm/armv7/CONFIG_SND_KIRKWOOD_SOC
index a0068dcdc..a0068dcdc 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_KIRKWOOD_SOC
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_KIRKWOOD_SOC
diff --git a/baseconfig/arm/armv7/CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB b/configs/base-generic/arm/armv7/CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB
index 4dd6f95c5..4dd6f95c5 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SAMSUNG_PCM b/configs/base-generic/arm/armv7/CONFIG_SND_SAMSUNG_PCM
index 7199394cf..7199394cf 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SAMSUNG_PCM
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SAMSUNG_PCM
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SAMSUNG_SPDIF b/configs/base-generic/arm/armv7/CONFIG_SND_SAMSUNG_SPDIF
index 64398f5ee..64398f5ee 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SAMSUNG_SPDIF
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SAMSUNG_SPDIF
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_BUS b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_AC97_BUS
index 35bf38d18..35bf38d18 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_BUS
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_AC97_BUS
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_APQ8016_SBC b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_APQ8016_SBC
index 2ec73cecf..2ec73cecf 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_APQ8016_SBC
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_APQ8016_SBC
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
index cbf1d012f..cbf1d012f 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_MAX98090
index c22ad4a46..c22ad4a46 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_MAX98090
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_ODROID
index ece6cf56f..ece6cf56f 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_ODROID
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_RT5631 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_RT5631
index 43071e025..43071e025 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_RT5631
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_RT5631
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG
index 9f289b9ad..9f289b9ad 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF
index f6d55c010..f6d55c010 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994
index cfa4e92bd..cfa4e92bd 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SGTL5000
index ea71dece1..ea71dece1 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SMDK_WM8994_PCM b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SMDK_WM8994_PCM
index d203f1896..d203f1896 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SMDK_WM8994_PCM
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SMDK_WM8994_PCM
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_SNOW b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SNOW
index 000a62176..000a62176 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_SNOW
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_SNOW
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA
index b32a04ff3..b32a04ff3 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_MAX98090 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_MAX98090
index 55f327a38..55f327a38 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_MAX98090
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_MAX98090
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5640 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5640
index 3370b8ec2..3370b8ec2 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5640
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5640
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5677 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5677
index 24298d93b..24298d93b 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5677
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_RT5677
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
index 4706a31c1..4706a31c1 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753 b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753
index 9039b1695..9039b1695 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_CODEC b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
index 6cce5a1f7..6cce5a1f7 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_CODEC
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_I2S b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_I2S
index d9270e25b..d9270e25b 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_I2S
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_I2S
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_SPDIF b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
index c0b108aba..c0b108aba 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN4I_SPDIF
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC b/configs/base-generic/arm/armv7/CONFIG_SND_SUN8I_CODEC
index c30f94369..c30f94369 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SUN8I_CODEC
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG b/configs/base-generic/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
index 28ea30190..28ea30190 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ b/configs/base-generic/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_BRCMSTB b/configs/base-generic/arm/armv7/CONFIG_SOC_BRCMSTB
index 7b8f8dcbb..7b8f8dcbb 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_BRCMSTB
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_BRCMSTB
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX b/configs/base-generic/arm/armv7/CONFIG_SOC_DRA7XX
index a11bb6971..a11bb6971 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_DRA7XX
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS3250 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS3250
index fc841d40c..fc841d40c 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS3250
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS3250
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5250 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5250
index 6c0982d35..6c0982d35 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5250
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5250
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5260 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5260
index 2d9dea269..2d9dea269 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5260
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5260
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5410 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5410
index e9ffc8cd1..e9ffc8cd1 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5410
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5410
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5420 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5420
index 5777504e0..5777504e0 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5420
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5420
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5440 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5440
index a5227c119..a5227c119 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5440
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5440
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5800 b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5800
index b67da9c23..b67da9c23 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_EXYNOS5800
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_EXYNOS5800
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL b/configs/base-generic/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
index 00413d459..00413d459 100644
--- a/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
+++ b/configs/base-generic/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
diff --git a/baseconfig/arm/armv7/CONFIG_SPI_CADENCE_QUADSPI b/configs/base-generic/arm/armv7/CONFIG_SPI_CADENCE_QUADSPI
index 7c242fd0d..7c242fd0d 100644
--- a/baseconfig/arm/armv7/CONFIG_SPI_CADENCE_QUADSPI
+++ b/configs/base-generic/arm/armv7/CONFIG_SPI_CADENCE_QUADSPI
diff --git a/baseconfig/arm/armv7/CONFIG_SPI_S3C64XX b/configs/base-generic/arm/armv7/CONFIG_SPI_S3C64XX
index 8a95aa05d..8a95aa05d 100644
--- a/baseconfig/arm/armv7/CONFIG_SPI_S3C64XX
+++ b/configs/base-generic/arm/armv7/CONFIG_SPI_S3C64XX
diff --git a/baseconfig/arm/armv7/CONFIG_SPI_SUN4I b/configs/base-generic/arm/armv7/CONFIG_SPI_SUN4I
index c190b21eb..c190b21eb 100644
--- a/baseconfig/arm/armv7/CONFIG_SPI_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_SPI_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_SPI_SUN6I b/configs/base-generic/arm/armv7/CONFIG_SPI_SUN6I
index 031cd17b9..031cd17b9 100644
--- a/baseconfig/arm/armv7/CONFIG_SPI_SUN6I
+++ b/configs/base-generic/arm/armv7/CONFIG_SPI_SUN6I
diff --git a/baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX b/configs/base-generic/arm/armv7/CONFIG_STRICT_KERNEL_RWX
index 8c57b454a..8c57b454a 100644
--- a/baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX
+++ b/configs/base-generic/arm/armv7/CONFIG_STRICT_KERNEL_RWX
diff --git a/baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX b/configs/base-generic/arm/armv7/CONFIG_STRICT_MODULE_RWX
index 2f1f100d7..2f1f100d7 100644
--- a/baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX
+++ b/configs/base-generic/arm/armv7/CONFIG_STRICT_MODULE_RWX
diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN4I_A10_CCU
index 3b2ba681a..3b2ba681a 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN4I_A10_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_EMAC b/configs/base-generic/arm/armv7/CONFIG_SUN4I_EMAC
index 4804d8959..4804d8959 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN4I_EMAC
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN4I_EMAC
diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC b/configs/base-generic/arm/armv7/CONFIG_SUN4I_GPADC
index 97139c216..97139c216 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN4I_GPADC
diff --git a/baseconfig/arm/armv7/CONFIG_SUN5I_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN5I_CCU
index 7001f3dd4..7001f3dd4 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN5I_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN5I_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN6I_A31_CCU
index 7bf2b1a47..7bf2b1a47 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN6I_A31_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A23_CCU
index 46d0fa87e..46d0fa87e 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A23_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A33_CCU
index 907c87d04..907c87d04 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A33_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A83T_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A83T_CCU
index a4e88a43c..a4e88a43c 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_A83T_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_A83T_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_DE2_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_DE2_CCU
index 1729d1f68..1729d1f68 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_DE2_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_DE2_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_R40_CCU
index 149900927..149900927 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_R40_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN8I_V3S_CCU
index 030c5de49..030c5de49 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN8I_V3S_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU b/configs/base-generic/arm/armv7/CONFIG_SUN9I_A80_CCU
index d203816e6..d203816e6 100644
--- a/baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUN9I_A80_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUNGEM b/configs/base-generic/arm/armv7/CONFIG_SUNGEM
index 762ffc2b6..762ffc2b6 100644
--- a/baseconfig/arm/armv7/CONFIG_SUNGEM
+++ b/configs/base-generic/arm/armv7/CONFIG_SUNGEM
diff --git a/baseconfig/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA b/configs/base-generic/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA
index f0616cc93..f0616cc93 100644
--- a/baseconfig/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_SUNRPC_XPRT_RDMA
diff --git a/baseconfig/arm/armv7/CONFIG_SUNXI_CCU b/configs/base-generic/arm/armv7/CONFIG_SUNXI_CCU
index 30e6d69d1..30e6d69d1 100644
--- a/baseconfig/arm/armv7/CONFIG_SUNXI_CCU
+++ b/configs/base-generic/arm/armv7/CONFIG_SUNXI_CCU
diff --git a/baseconfig/arm/armv7/CONFIG_SUNXI_WATCHDOG b/configs/base-generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
index 9b58f97fb..9b58f97fb 100644
--- a/baseconfig/arm/armv7/CONFIG_SUNXI_WATCHDOG
+++ b/configs/base-generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
diff --git a/baseconfig/arm/armv7/CONFIG_SWP_EMULATE b/configs/base-generic/arm/armv7/CONFIG_SWP_EMULATE
index 74b49fd51..74b49fd51 100644
--- a/baseconfig/arm/armv7/CONFIG_SWP_EMULATE
+++ b/configs/base-generic/arm/armv7/CONFIG_SWP_EMULATE
diff --git a/baseconfig/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON b/configs/base-generic/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON
index c4409f95b..c4409f95b 100644
--- a/baseconfig/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON
+++ b/configs/base-generic/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_GMI b/configs/base-generic/arm/armv7/CONFIG_TEGRA_GMI
index 5def3e891..5def3e891 100644
--- a/baseconfig/arm/armv7/CONFIG_TEGRA_GMI
+++ b/configs/base-generic/arm/armv7/CONFIG_TEGRA_GMI
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/configs/base-generic/arm/armv7/CONFIG_TEGRA_IVC
index cdcacbec2..cdcacbec2 100644
--- a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC
+++ b/configs/base-generic/arm/armv7/CONFIG_TEGRA_IVC
diff --git a/baseconfig/arm/armv7/CONFIG_THUMB2_KERNEL b/configs/base-generic/arm/armv7/CONFIG_THUMB2_KERNEL
index e18884731..e18884731 100644
--- a/baseconfig/arm/armv7/CONFIG_THUMB2_KERNEL
+++ b/configs/base-generic/arm/armv7/CONFIG_THUMB2_KERNEL
diff --git a/baseconfig/arm/armv7/CONFIG_TI_DAC7512 b/configs/base-generic/arm/armv7/CONFIG_TI_DAC7512
index 30609953c..30609953c 100644
--- a/baseconfig/arm/armv7/CONFIG_TI_DAC7512
+++ b/configs/base-generic/arm/armv7/CONFIG_TI_DAC7512
diff --git a/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO b/configs/base-generic/arm/armv7/CONFIG_TI_DAVINCI_MDIO
index aee3112bc..aee3112bc 100644
--- a/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO
+++ b/configs/base-generic/arm/armv7/CONFIG_TI_DAVINCI_MDIO
diff --git a/baseconfig/arm/armv7/CONFIG_TI_EDMA b/configs/base-generic/arm/armv7/CONFIG_TI_EDMA
index 88de1ef56..88de1ef56 100644
--- a/baseconfig/arm/armv7/CONFIG_TI_EDMA
+++ b/configs/base-generic/arm/armv7/CONFIG_TI_EDMA
diff --git a/baseconfig/arm/armv7/CONFIG_TI_SOC_THERMAL b/configs/base-generic/arm/armv7/CONFIG_TI_SOC_THERMAL
index dbba1f5ae..dbba1f5ae 100644
--- a/baseconfig/arm/armv7/CONFIG_TI_SOC_THERMAL
+++ b/configs/base-generic/arm/armv7/CONFIG_TI_SOC_THERMAL
diff --git a/baseconfig/arm/armv7/CONFIG_TI_THERMAL b/configs/base-generic/arm/armv7/CONFIG_TI_THERMAL
index c2de34a76..c2de34a76 100644
--- a/baseconfig/arm/armv7/CONFIG_TI_THERMAL
+++ b/configs/base-generic/arm/armv7/CONFIG_TI_THERMAL
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_AD7877 b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_AD7877
index c96a9057c..c96a9057c 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_AD7877
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_AD7877
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_ADS7846 b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_ADS7846
index 739ad5dee..739ad5dee 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_ADS7846
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_ADS7846
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
index 166a3b101..166a3b101 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_CHIPONE_ICN8318
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_MC13783 b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_MC13783
index e9b80d3bd..e9b80d3bd 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_MC13783
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_MC13783
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_SUN4I b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_SUN4I
index a5835fd5f..a5835fd5f 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_SUN4I
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_SUN4I
diff --git a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_TSC2005 b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_TSC2005
index 4a547c034..4a547c034 100644
--- a/baseconfig/arm/armv7/CONFIG_TOUCHSCREEN_TSC2005
+++ b/configs/base-generic/arm/armv7/CONFIG_TOUCHSCREEN_TSC2005
diff --git a/baseconfig/arm/armv7/CONFIG_TWL6040_CORE b/configs/base-generic/arm/armv7/CONFIG_TWL6040_CORE
index d44fdc15f..d44fdc15f 100644
--- a/baseconfig/arm/armv7/CONFIG_TWL6040_CORE
+++ b/configs/base-generic/arm/armv7/CONFIG_TWL6040_CORE
diff --git a/baseconfig/arm/armv7/CONFIG_UACCESS_WITH_MEMCPY b/configs/base-generic/arm/armv7/CONFIG_UACCESS_WITH_MEMCPY
index 16ef05a6c..16ef05a6c 100644
--- a/baseconfig/arm/armv7/CONFIG_UACCESS_WITH_MEMCPY
+++ b/configs/base-generic/arm/armv7/CONFIG_UACCESS_WITH_MEMCPY
diff --git a/baseconfig/arm/armv7/CONFIG_USB_DWC3_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_USB_DWC3_EXYNOS
index 360643461..360643461 100644
--- a/baseconfig/arm/armv7/CONFIG_USB_DWC3_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_USB_DWC3_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_USB_EHCI_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_USB_EHCI_EXYNOS
index f7828466c..f7828466c 100644
--- a/baseconfig/arm/armv7/CONFIG_USB_EHCI_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_USB_EHCI_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_USB_MUSB_SUNXI b/configs/base-generic/arm/armv7/CONFIG_USB_MUSB_SUNXI
index 258e716ab..258e716ab 100644
--- a/baseconfig/arm/armv7/CONFIG_USB_MUSB_SUNXI
+++ b/configs/base-generic/arm/armv7/CONFIG_USB_MUSB_SUNXI
diff --git a/baseconfig/arm/armv7/CONFIG_USB_OHCI_EXYNOS b/configs/base-generic/arm/armv7/CONFIG_USB_OHCI_EXYNOS
index 3669d49ee..3669d49ee 100644
--- a/baseconfig/arm/armv7/CONFIG_USB_OHCI_EXYNOS
+++ b/configs/base-generic/arm/armv7/CONFIG_USB_OHCI_EXYNOS
diff --git a/baseconfig/arm/armv7/CONFIG_USE_OF b/configs/base-generic/arm/armv7/CONFIG_USE_OF
index 3b7d41550..3b7d41550 100644
--- a/baseconfig/arm/armv7/CONFIG_USE_OF
+++ b/configs/base-generic/arm/armv7/CONFIG_USE_OF
diff --git a/baseconfig/arm/armv7/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET b/configs/base-generic/arm/armv7/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
index 1662b48c3..1662b48c3 100644
--- a/baseconfig/arm/armv7/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
+++ b/configs/base-generic/arm/armv7/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
diff --git a/baseconfig/arm/armv7/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET b/configs/base-generic/arm/armv7/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
index d785a326f..d785a326f 100644
--- a/baseconfig/arm/armv7/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
+++ b/configs/base-generic/arm/armv7/CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET
diff --git a/baseconfig/arm/armv7/CONFIG_VFP b/configs/base-generic/arm/armv7/CONFIG_VFP
index f7115ba40..f7115ba40 100644
--- a/baseconfig/arm/armv7/CONFIG_VFP
+++ b/configs/base-generic/arm/armv7/CONFIG_VFP
diff --git a/baseconfig/arm/armv7/CONFIG_VFPv3 b/configs/base-generic/arm/armv7/CONFIG_VFPv3
index 05063905b..05063905b 100644
--- a/baseconfig/arm/armv7/CONFIG_VFPv3
+++ b/configs/base-generic/arm/armv7/CONFIG_VFPv3
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS4_FIMC_IS b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS4_FIMC_IS
index 03d9451c6..03d9451c6 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS4_FIMC_IS
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS4_FIMC_IS
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE
index fdf4e58dd..fdf4e58dd 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS_FIMC_LITE b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS_FIMC_LITE
index d41e4ee3c..d41e4ee3c 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_EXYNOS_FIMC_LITE
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_EXYNOS_FIMC_LITE
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_IMX_MEDIA b/configs/base-generic/arm/armv7/CONFIG_VIDEO_IMX_MEDIA
index fb99bb91a..fb99bb91a 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_IMX_MEDIA
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_IMX_MEDIA
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_MUX b/configs/base-generic/arm/armv7/CONFIG_VIDEO_MUX
index b01b0b424..b01b0b424 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_MUX
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_MUX
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_S5P_FIMC b/configs/base-generic/arm/armv7/CONFIG_VIDEO_S5P_FIMC
index 9cd878242..9cd878242 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_S5P_FIMC
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_S5P_FIMC
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_S5P_MIPI_CSIS b/configs/base-generic/arm/armv7/CONFIG_VIDEO_S5P_MIPI_CSIS
index b12110d12..b12110d12 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_S5P_MIPI_CSIS
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_S5P_MIPI_CSIS
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
index 65db40667..65db40667 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
index d56f76146..d56f76146 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
index 67462a76e..67462a76e 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_G2D b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_G2D
index 73412c891..73412c891 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_G2D
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_G2D
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_JPEG b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_JPEG
index 094e6c3d7..094e6c3d7 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_JPEG
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_JPEG
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_MFC b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_MFC
index 6c6dc9d6c..6c6dc9d6c 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_MFC
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_MFC
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_TV b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_TV
index 2ad6f273b..2ad6f273b 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_TV
+++ b/configs/base-generic/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_TV
diff --git a/baseconfig/arm/armv7/CONFIG_W1_MASTER_GPIO b/configs/base-generic/arm/armv7/CONFIG_W1_MASTER_GPIO
index ba7c7ebc4..ba7c7ebc4 100644
--- a/baseconfig/arm/armv7/CONFIG_W1_MASTER_GPIO
+++ b/configs/base-generic/arm/armv7/CONFIG_W1_MASTER_GPIO
diff --git a/baseconfig/arm/armv7/CONFIG_XIP_KERNEL b/configs/base-generic/arm/armv7/CONFIG_XIP_KERNEL
index 846229d0d..846229d0d 100644
--- a/baseconfig/arm/armv7/CONFIG_XIP_KERNEL
+++ b/configs/base-generic/arm/armv7/CONFIG_XIP_KERNEL
diff --git a/baseconfig/arm/armv7/CONFIG_ZBOOT_ROM_BSS b/configs/base-generic/arm/armv7/CONFIG_ZBOOT_ROM_BSS
index 8680649d3..8680649d3 100644
--- a/baseconfig/arm/armv7/CONFIG_ZBOOT_ROM_BSS
+++ b/configs/base-generic/arm/armv7/CONFIG_ZBOOT_ROM_BSS
diff --git a/baseconfig/arm/armv7/CONFIG_ZBOOT_ROM_TEXT b/configs/base-generic/arm/armv7/CONFIG_ZBOOT_ROM_TEXT
index c61e3903c..c61e3903c 100644
--- a/baseconfig/arm/armv7/CONFIG_ZBOOT_ROM_TEXT
+++ b/configs/base-generic/arm/armv7/CONFIG_ZBOOT_ROM_TEXT
diff --git a/baseconfig/arm/armv7/README b/configs/base-generic/arm/armv7/README
index d5d438ffe..d5d438ffe 100644
--- a/baseconfig/arm/armv7/README
+++ b/configs/base-generic/arm/armv7/README
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_AHCI_IMX
index 924631145..924631145 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_AHCI_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_AHCI_ST
index 975ecd425..975ecd425 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_AHCI_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB
index 6ee8077c4..6ee8077c4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_PHY_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
index b3f86e351..b3f86e351 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084 b/configs/base-generic/arm/armv7/armv7/CONFIG_APQ_GCC_8084
index bacb61e5e..bacb61e5e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_APQ_GCC_8084
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_MMCC_8084 b/configs/base-generic/arm/armv7/armv7/CONFIG_APQ_MMCC_8084
index 05c8d0c7b..05c8d0c7b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_MMCC_8084
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_APQ_MMCC_8084
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_BERLIN b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_BERLIN
index 9a647a4a1..9a647a4a1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_BERLIN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_BERLIN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4
index 61b192a72..61b192a72 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE
index 7a2faa3bf..7a2faa3bf 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MDM9615 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MDM9615
index 8d39d37d9..8d39d37d9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MDM9615
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MDM9615
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MMP b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MMP
index df1b1f323..df1b1f323 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MMP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MMP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8960
index aa7448c34..aa7448c34 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8974 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8974
index d1983189e..d1983189e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8974
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8974
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8X60 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8X60
index 5848aefa4..5848aefa4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8X60
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MSM8X60
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MXC b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MXC
index 5568226d1..5568226d1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MXC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_MXC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL
index c27327f91..c27327f91 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP3 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP3
index c5555b514..c5555b514 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP4 b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP4
index 8b2dee0fd..8b2dee0fd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP4
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_OMAP4
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_QCOM
index e51a38aa6..e51a38aa6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_STI
index 7a253ecf5..7a253ecf5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA
index 3b74d56f4..3b74d56f4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC
index 1b82454da..1b82454da 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC
index 97399b00b..97399b00b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_ZYNQ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_ZYNQ
index 6397585ca..6397585ca 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_ZYNQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARCH_ZYNQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ
index 9cdade71b..9cdade71b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_LPAE b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_LPAE
index 6fd138b99..6fd138b99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_LPAE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_LPAE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ
index 5b86d6cba..5b86d6cba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
index 0e26a51f0..0e26a51f0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
index ca125040d..ca125040d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT
index 7f469ba88..7f469ba88 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE
index ce556911b..ce556911b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AXI_DMAC b/configs/base-generic/arm/armv7/armv7/CONFIG_AXI_DMAC
index 565eb6e6e..565eb6e6e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AXI_DMAC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_AXI_DMAC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052
index 10f4ffe68..10f4ffe68 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA
index 746923749..746923749 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217 b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
index a07a30140..a07a30140 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX
index 70c971363..70c971363 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
index 13f2e3d86..13f2e3d86 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
index 2be078588..2be078588 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C
index 574be81f5..574be81f5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_DA9052
index 31f2c8c10..31f2c8c10 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_RX51 b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_RX51
index f204d74e2..f204d74e2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_RX51
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_RX51
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC
index c30155320..c30155320 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD b/configs/base-generic/arm/armv7/armv7/CONFIG_BT_QCOMSMD
index 9f36fb6a8..9f36fb6a8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_BT_QCOMSMD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
index 85b4e115d..85b4e115d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_C_CAN
index bf0bc15df..bf0bc15df 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_C_CAN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM
index 386c5e4ca..386c5e4ca 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_FLEXCAN b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_FLEXCAN
index b18a38008..b18a38008 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_FLEXCAN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CAN_FLEXCAN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X
index 6886de4eb..6886de4eb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_ISP1704 b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_ISP1704
index f9ba02e8b..f9ba02e8b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_ISP1704
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_ISP1704
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
index 43a91eb0e..43a91eb0e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217 b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
index e77c2fc05..e77c2fc05 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_TWL4030
index 5f7138059..5f7138059 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CHARGER_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CLK_TWL6040 b/configs/base-generic/arm/armv7/armv7/CONFIG_CLK_TWL6040
index ec6153158..ec6153158 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CLK_TWL6040
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CLK_TWL6040
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CM36651 b/configs/base-generic/arm/armv7/armv7/CONFIG_CM36651
index d13a155f9..d13a155f9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CM36651
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CM36651
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN
index a347b8f34..a347b8f34 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS
index 695bed39b..695bed39b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
index 2b7c64357..2b7c64357 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL
index b9697f113..b9697f113 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD
index 69d344ce6..69d344ce6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
index 9432ae930..9432ae930 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
index 513a57a7c..513a57a7c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
index 88195c95c..88195c95c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
index a2ebce907..a2ebce907 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
index e9a418ac8..e9a418ac8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
index 2ce83fc68..2ce83fc68 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
index 626039201..626039201 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
index 367a3c834..367a3c834 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
index 668bf43f6..668bf43f6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
index ee310393e..ee310393e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
index 9e6e91b74..9e6e91b74 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC
index 3195253f1..3195253f1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
index 7e925a191..7e925a191 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
index 98ff565f8..98ff565f8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
index 1b126b18e..1b126b18e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
index b359a5c3f..b359a5c3f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
index 58d162aba..58d162aba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL
index d953a326b..d953a326b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE
index 27a3f7204..27a3f7204 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA
index 992c3e8c5..992c3e8c5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG
index 30e84a0e2..30e84a0e2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG
index dd19d9cec..dd19d9cec 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DDR b/configs/base-generic/arm/armv7/armv7/CONFIG_DDR
index ef2dd72e5..ef2dd72e5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DDR
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DDR
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DMA_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_DMA_OMAP
index e11f15c99..e11f15c99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DMA_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DMA_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV
index 699299fab..699299fab 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING
index 68356e1a5..68356e1a5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX
index 3195e3e11..3195e3e11 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI
index 653ebbd4d..653ebbd4d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3
index af7cff715..af7cff715 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_LDB b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_LDB
index acae5a47a..acae5a47a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_LDB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_LDB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY
index 57cbdd3a3..57cbdd3a3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_TVE b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_TVE
index dee0256f4..dee0256f4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_TVE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_IMX_TVE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM
index 0a1adfc20..0a1adfc20 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
index 87b627906..87b627906 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
index 397f69094..397f69094 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
index 7595ae205..7595ae205 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
index 5d86a4597..5d86a4597 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
index ea1c4f918..ea1c4f918 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
index 16ac280e6..16ac280e6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP
index 2adc35b99..2adc35b99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING
index 83c03d92d..83c03d92d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MXSFB
index e24a8952c..e24a8952c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_MXSFB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP
index 5e6027954..5e6027954 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV
index b1c910b41..b1c910b41 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
index 8b78fee27..8b78fee27 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI
index c32d551d3..c32d551d3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362
index 266b225c4..266b225c4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
index cc463415e..cc463415e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015
index c7fe3823b..c7fe3823b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS
index d6760eb74..d6760eb74 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
index 2255168f6..2255168f6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM
index 3ddf71e55..3ddf71e55 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
index 59d16a459..59d16a459 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
index 8751af145..8751af145 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
index fe01d0a37..fe01d0a37 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
index d4629e2b7..d4629e2b7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
index de91d35b4..de91d35b4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1 b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
index 9a503f8e7..9a503f8e7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_TILCDC
index 19e7aedf6..19e7aedf6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_TILCDC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT
index a6818d45b..a6818d45b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X b/configs/base-generic/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
index 49177a6db..49177a6db 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_DWMAC_STI
index b0da5ddbc..b0da5ddbc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_DWMAC_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS b/configs/base-generic/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS
index 01b6ce8d4..01b6ce8d4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON
index bde29bcfc..bde29bcfc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON_PALMAS
index 9d44d9149..9d44d9149 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC
index b52487909..b52487909 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_IMX
index 3b317d265..3b317d265 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_MX3 b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_MX3
index 71d6457ed..71d6457ed 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_MX3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_MX3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_MXS b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_MXS
index d179e9f9d..d179e9f9d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_MXS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FB_MXS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FEC b/configs/base-generic/arm/armv7/armv7/CONFIG_FEC
index 0791662d1..0791662d1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FEC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FEC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO b/configs/base-generic/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO
index f7952819a..f7952819a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO b/configs/base-generic/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO
index 9113f3294..9113f3294 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GIANFAR b/configs/base-generic/arm/armv7/armv7/CONFIG_GIANFAR
index 9227c7a80..9227c7a80 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GIANFAR
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GIANFAR
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_DA9052
index 5cf28e3da..5cf28e3da 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9055 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_DA9055
index 297dfa4df..297dfa4df 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9055
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_DA9055
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_OMAP
index 7c593d352..7c593d352 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_PALMAS
index 3d3301bcf..3d3301bcf 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_STMPE b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_STMPE
index 14d1708e2..14d1708e2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_STMPE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_STMPE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TPS65218
index 0b01e2387..0b01e2387 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TPS65218
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS6586X b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
index c8f2da811..c8f2da811 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4800 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TS4800
index a0d83a680..a0d83a680 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4800
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TS4800
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TS4900
index 0104290a1..0104290a1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TS4900
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TWL4030
index fc3bcf854..fc3bcf854 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL6040 b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TWL6040
index 9a0126117..9a0126117 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL6040
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_TWL6040
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_XILINX
index 654c7ea7f..654c7ea7f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_ZYNQ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_ZYNQ
index 2f9ba2067..2f9ba2067 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_ZYNQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GPIO_ZYNQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GS_FPGABOOT b/configs/base-generic/arm/armv7/armv7/CONFIG_GS_FPGABOOT
index 68aef042b..68aef042b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_GS_FPGABOOT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_GS_FPGABOOT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP
index a51d799ba..a51d799ba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HUGETLB_PAGE b/configs/base-generic/arm/armv7/armv7/CONFIG_HUGETLB_PAGE
index bea38c303..bea38c303 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HUGETLB_PAGE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HUGETLB_PAGE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP
index 869da47ed..869da47ed 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM
index 5dfdf858e..5dfdf858e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
index b95d5cb24..b95d5cb24 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA
index 22e8ad7fc..22e8ad7fc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP
index cf37a6e35..cf37a6e35 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM
index b2145880d..b2145880d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
index e908df516..e908df516 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_CADENCE
index 8e1eefa5c..8e1eefa5c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_CADENCE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_IMX
index 295dda355..295dda355 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
index 2d866d55f..2d866d55f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_OMAP
index 7d49cccbd..7d49cccbd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_QUP b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_QUP
index 7fb7cd350..7fb7cd350 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_QUP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_QUP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_ST
index dac85894e..dac85894e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_XILINX
index c2bfd9c5e..c2bfd9c5e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_I2C_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX2_WDT b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX2_WDT
index bf5eaba02..bf5eaba02 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX2_WDT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX2_WDT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX7D_ADC b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX7D_ADC
index 00e36d3d8..00e36d3d8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX7D_ADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX7D_ADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
index 33e5c6a93..33e5c6a93 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_DMA
index 47814badb..47814badb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_GPCV2 b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_GPCV2
index af127227d..af127227d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_GPCV2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_GPCV2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE
index 070060333..070060333 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
index 53983d8af..53983d8af 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_SDMA b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_SDMA
index 6f1c8b431..6f1c8b431 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_SDMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_SDMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_THERMAL b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_THERMAL
index 9720f0876..9720f0876 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_THERMAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_THERMAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_WEIM b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_WEIM
index 051fd96c3..051fd96c3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_WEIM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IMX_WEIM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY
index 20510b969..20510b969 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY
index 3e92ddfa6..3e92ddfa6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY
index 46198e804..46198e804 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP
index 8dbcc42bb..8dbcc42bb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON
index 001a8cf96..001a8cf96 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY
index a591c1274..a591c1274 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR
index 2a1af2b4e..2a1af2b4e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY
index f14705e77..f14705e77 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER
index 59fdb225d..59fdb225d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
index 1f55158fa..1f55158fa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON
index 8dbe98c01..8dbe98c01 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA
index 10c5c90f2..10c5c90f2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA
index 6708e39c6..6708e39c6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IR_RX51 b/configs/base-generic/arm/armv7/armv7/CONFIG_IR_RX51
index e671fe0a5..e671fe0a5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_IR_RX51
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_IR_RX51
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX
index ef9fc6544..ef9fc6544 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC
index b261424ef..b261424ef 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4 b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4
index 565ca1c01..565ca1c01 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX
index 6f1ac5483..6f1ac5483 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x
index c7122eaaa..c7122eaaa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG
index 9aeb2d31a..9aeb2d31a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY
index 3e207e298..3e207e298 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
index ee2c5bbb8..ee2c5bbb8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
index 5ad9d0409..5ad9d0409 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030
index a36fb019e..a36fb019e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG b/configs/base-generic/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG
index 0922ca2f1..0922ca2f1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_DA9052
index 44159d0bc..44159d0bc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_MC13783 b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_MC13783
index 7d9f3bd9c..7d9f3bd9c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_MC13783
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_MC13783
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058 b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_PM8058
index 301ef0606..301ef0606 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_PM8058
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_TCA6507 b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_TCA6507
index 22d416949..22d416949 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_TCA6507
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_LEDS_TCA6507
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE
index 3d59e384c..3d59e384c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_FLINT b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_FLINT
index c874cd628..c874cd628 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_FLINT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_FLINT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER
index f70d80426..f70d80426 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MMP2_DT b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_MMP2_DT
index 523a4bfcc..523a4bfcc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MMP2_DT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_MMP2_DT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM
index 044901e6c..044901e6c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA
index b9ee3458a..b9ee3458a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP
index e35637633..e35637633 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN4I b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_SUN4I
index 3fe5f88b6..3fe5f88b6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN4I
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_SUN4I
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN5I b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_SUN5I
index 28d69ce87..28d69ce87 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN5I
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MACH_SUN5I
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MDM_GCC_9615 b/configs/base-generic/arm/armv7/armv7/CONFIG_MDM_GCC_9615
index 4d972aff3..4d972aff3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MDM_GCC_9615
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MDM_GCC_9615
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MDM_LCC_9615 b/configs/base-generic/arm/armv7/armv7/CONFIG_MDM_LCC_9615
index 72f159f99..72f159f99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MDM_LCC_9615
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MDM_LCC_9615
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM800 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_88PM800
index 98ea8db42..98ea8db42 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM800
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_88PM800
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM805 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_88PM805
index c1de4af44..c1de4af44 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM805
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_88PM805
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C
index e40ccb3b9..e40ccb3b9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI
index 9f420ba7c..9f420ba7c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9055 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9055
index eacc445e1..eacc445e1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9055
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_DA9055
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MAX8907 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_MAX8907
index 2876fad5a..2876fad5a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MAX8907
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_MAX8907
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI
index 814896865..814896865 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_NVEC b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_NVEC
index 4c63032da..4c63032da 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_NVEC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_NVEC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST
index 8150f987a..8150f987a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_PALMAS
index 27f2b3a1f..27f2b3a1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8XXX b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_PM8XXX
index c20d0cb19..c20d0cb19 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8XXX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_PM8XXX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM
index d88a4c4c7..d88a4c4c7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_STMPE b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_STMPE
index a076cddc3..a076cddc3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_STMPE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_STMPE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_T7L66XB b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_T7L66XB
index 6fe775b4f..6fe775b4f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_T7L66XB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_T7L66XB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TC6387XB b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TC6387XB
index cf7da4bfb..cf7da4bfb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TC6387XB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TC6387XB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC
index 7db3d8445..7db3d8445 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65217 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS65217
index 54a061854..54a061854 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65217
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS65217
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65218 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS65218
index 86e28df2f..86e28df2f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65218
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS65218
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS6586X b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS6586X
index a7745c769..a7745c769 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS6586X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS6586X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS80031 b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS80031
index e9113ef67..e9113ef67 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS80031
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MFD_TPS80031
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_MXC b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_MXC
index 2d42c24fc..2d42c24fc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_MXC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_MXC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_OMAP
index cc3c5a021..cc3c5a021 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
index 48facf367..48facf367 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX
index 2749f16b8..2749f16b8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM
index 512d452ed..512d452ed 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
index 40e2f68cb..40e2f68cb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2 b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2
index 0572be193..0572be193 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
index 4a513a669..4a513a669 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMP_PDMA b/configs/base-generic/arm/armv7/armv7/CONFIG_MMP_PDMA
index 8b95d78fe..8b95d78fe 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMP_PDMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMP_PDMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMP_TDMA b/configs/base-generic/arm/armv7/armv7/CONFIG_MMP_TDMA
index c3ea0d888..c3ea0d888 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMP_TDMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MMP_TDMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8660
index 9effe8611..9effe8611 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8660
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8916 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8916
index f65dc3662..f65dc3662 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8916
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8916
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8960
index 03ba44b34..03ba44b34 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8974
index 8ffbd8055..8ffbd8055 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8974
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8996
index 4b01d318d..4b01d318d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_GCC_8996
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_IOMMU b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_IOMMU
index e07f46220..e07f46220 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_IOMMU
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_IOMMU
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_LCC_8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_LCC_8960
index 696554428..696554428 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_LCC_8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_LCC_8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8960
index c2ccb9997..c2ccb9997 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8974 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8974
index 04b9f7550..04b9f7550 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8974
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8974
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8996 b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8996
index e40293af5..e40293af5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8996
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MSM_MMCC_8996
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND
index 6fd7c9ccd..6fd7c9ccd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2 b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2
index ad5a64465..ad5a64465 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH
index 88fc10255..88fc10255 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM
index 819bf21fd..819bf21fd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2 b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2
index 0d7647896..0d7647896 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU b/configs/base-generic/arm/armv7/armv7/CONFIG_MX3_IPU
index 523f19699..523f19699 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MX3_IPU
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS b/configs/base-generic/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS
index b337babb8..b337babb8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD b/configs/base-generic/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD
index 137ef475f..137ef475f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MXS_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_MXS_DMA
index f423496a4..f423496a4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MXS_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_MXS_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE b/configs/base-generic/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE
index 2ac235a8e..2ac235a8e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
index 46ccaba73..46ccaba73 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NFC_WILINK b/configs/base-generic/arm/armv7/armv7/CONFIG_NFC_WILINK
index fd087e25f..fd087e25f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NFC_WILINK
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NFC_WILINK
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_PAZ00 b/configs/base-generic/arm/armv7/armv7/CONFIG_NVEC_PAZ00
index 74258488a..74258488a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_PAZ00
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NVEC_PAZ00
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_POWER b/configs/base-generic/arm/armv7/armv7/CONFIG_NVEC_POWER
index 8aa895d46..8aa895d46 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_POWER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NVEC_POWER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP b/configs/base-generic/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
index b5e278063..b5e278063 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX
index 58f6d5fee..58f6d5fee 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS
index 3f2725c06..3f2725c06 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
index 17a1805f3..17a1805f3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG
index 8b8ba13e8..8b8ba13e8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS
index d60f0708f..d60f0708f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI
index b8eceeafb..b8eceeafb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI
index f1114bc76..f1114bc76 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
index 534b6bde0..534b6bde0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI
index d8195c366..d8195c366 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI
index 5114208ee..5114208ee 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
index cb20af7dd..cb20af7dd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC
index 0c33d2d2c..0c33d2d2c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_VRFB b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_VRFB
index 1158d7440..1158d7440 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_VRFB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP2_VRFB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
index 6d1fe4d03..6d1fe4d03 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING
index 8d4c34773..8d4c34773 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI
index 65e7cde52..65e7cde52 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_THERMAL b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP4_THERMAL
index e4667306d..e4667306d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_THERMAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP4_THERMAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI
index a5b8e7897..a5b8e7897 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819 b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819
index c40e91ac8..c40e91ac8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_THERMAL b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_THERMAL
index 3cb93da28..3cb93da28 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_THERMAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP5_THERMAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER
index f1169a7ac..f1169a7ac 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY
index 3d903235a..3d903235a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT
index 52c0fedd9..52c0fedd9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_IOMMU
index fcac8d138..fcac8d138 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_IOMMU
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG
index b8525c479..b8525c479 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE
index 14bbf7fbb..14bbf7fbb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MUX
index ac0115315..ac0115315 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MUX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
index b6c2ad2cf..b6c2ad2cf 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP
index 1f6d1c274..1f6d1c274 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB
index 48ad9270c..48ad9270c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS
index 080c7a94b..080c7a94b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC
index a757f3837..a757f3837 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS
index eac23206d..eac23206d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_USB2 b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_USB2
index 83f69e987..83f69e987 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_USB2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_USB2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG
index 420033d44..420033d44 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PALMAS_GPADC b/configs/base-generic/arm/armv7/armv7/CONFIG_PALMAS_GPADC
index 3e8465ae4..3e8465ae4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PALMAS_GPADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PALMAS_GPADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PATA_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_PATA_IMX
index ea39339ce..ea39339ce 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PATA_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PATA_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_PCIE_QCOM
index 61886f19a..61886f19a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PCIE_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_PCIE_XILINX
index e25e6ef81..e25e6ef81 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PCIE_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_IMX6 b/configs/base-generic/arm/armv7/armv7/CONFIG_PCI_IMX6
index 8cf6634a2..8cf6634a2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_IMX6
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PCI_IMX6
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_DM816X_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_DM816X_USB
index d226f92a3..d226f92a3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_DM816X_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_DM816X_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
index c0b002711..c0b002711 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
index b824f4d74..b824f4d74 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA
index 9549199e7..9549199e7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
index cba57faf8..cba57faf8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
index 6512e59d2..6512e59d2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
index 936bcab6c..936bcab6c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
index 61e98f856..61e98f856 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
index 0b25aa233..0b25aa233 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
index 62d71519e..62d71519e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
index 65f0bc9b7..65f0bc9b7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064
index d9ef7c187..d9ef7c187 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084
index 86b266746..86b266746 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL
index d4f25f735..d4f25f735 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660
index ba1fac392..ba1fac392 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916
index 939f6b4eb..939f6b4eb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960
index d3310f251..d3310f251 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74 b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74
index e711e6d38..e711e6d38 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS
index fa7630ca2..fa7630ca2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC
index 42b81a044..42b81a044 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC
index f5aefcc3a..f5aefcc3a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ
index 00e9d8a2d..00e9d8a2d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS
index f58c71a0d..f58c71a0d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP
index d5eb6401e..d5eb6401e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3 b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3
index a0d5a2082..a0d5a2082 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
index 25d1d5570..25d1d5570 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_MSM
index a7db0a2e3..a7db0a2e3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_ST
index e14ee1ac1..e14ee1ac1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_POWER_RESET_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_IMX
index 693d520a6..693d520a6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER
index 2a71f21e9..2a71f21e9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_STI
index 8aaff84cb..8aaff84cb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STMPE b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_STMPE
index 4c2b7c562..4c2b7c562 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STMPE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_STMPE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIECAP b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIECAP
index 84f1e9b57..84f1e9b57 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIECAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIECAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM
index 412fe4734..412fe4734 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIPWMSS b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIPWMSS
index c90d79f1b..c90d79f1b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIPWMSS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TIPWMSS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TWL
index 06b68be28..06b68be28 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TWL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL_LED b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TWL_LED
index 937abc81d..937abc81d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL_LED
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PWM_TWL_LED
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PXA_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_PXA_DMA
index 6497f852a..6497f852a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_PXA_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_PXA_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
index 0aa258124..0aa258124 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC
index f8a0514ba..f8a0514ba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA
index 194583213..194583213 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
index 5650c8603..5650c8603 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
index d355533c9..d355533c9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_COINCELL b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_COINCELL
index 6b43aa0aa..6b43aa0aa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_COINCELL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_COINCELL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_GSBI b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_GSBI
index 1fa5a5f73..1fa5a5f73 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_GSBI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_GSBI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_IOMMU
index b7e99b882..b7e99b882 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_IOMMU
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_PM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_PM
index 6089674be..6089674be 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_PM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_PM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
index 18d8fb792..18d8fb792 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_QFPROM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_QFPROM
index 9df0fc659..9df0fc659 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_QFPROM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_QFPROM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM
index 4610581b9..4610581b9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMEM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMEM
index f91ef8cda..f91ef8cda 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMEM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMEM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMP2P b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMP2P
index 5fa221f74..5fa221f74 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMP2P
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMP2P
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMSM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMSM
index 210a649f7..210a649f7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SMSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC
index d8601ce79..d8601ce79 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
index 7155372b9..7155372b9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC
index fcc1196df..fcc1196df 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_TSENS
index 0d43fc907..0d43fc907 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_TSENS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL
index e5469ca8a..e5469ca8a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
index b13cefb38..b13cefb38 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WDT b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WDT
index e4c7f9d37..e4c7f9d37 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WDT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_QCOM_WDT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RC_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_RC_ST
index 878dd631d..878dd631d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RC_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RC_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI b/configs/base-generic/arm/armv7/armv7/CONFIG_REGMAP_SPMI
index 0c319596b..0c319596b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGMAP_SPMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_88PM800 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
index 68e334db0..68e334db0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_AD5398 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_AD5398
index 50bafa94c..50bafa94c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_AD5398
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_AD5398
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP
index 14c5f9e64..14c5f9e64 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9052
index 4248a9686..4248a9686 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9055 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9055
index 5fe95389b..5fe95389b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9055
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9055
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A
index 12da84ace..12da84ace 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305
index 6c9699328..6c9699328 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3971 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP3971
index c122849bb..c122849bb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3971
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP3971
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3972 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP3972
index 32cc87cd5..32cc87cd5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3972
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP3972
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP872X b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP872X
index a826923d4..a826923d4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP872X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP872X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP8755 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP8755
index 12816a7af..12816a7af 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP8755
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_LP8755
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586
index 45b6c017d..45b6c017d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649
index 204519196..204519196 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660
index 628f64fea..628f64fea 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907
index 9f4e534f1..9f4e534f1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
index 7998d5171..7998d5171 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13783 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MC13783
index bd16e10fc..bd16e10fc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13783
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MC13783
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13892 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MC13892
index 9a3725de3..9a3725de3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13892
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_MC13892
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS
index 4a99c54ad..4a99c54ad 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS
index 062775d51..062775d51 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM
index 3d002cac5..3d002cac5 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM
index aae961c4b..aae961c4b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI
index c83be7aec..c83be7aec 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB
index a602d1ebe..a602d1ebe 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
index 1843491ff..1843491ff 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218
index 0e50c0d6c..0e50c0d6c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030
index 63a8298e7..63a8298e7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REMOTEPROC b/configs/base-generic/arm/armv7/armv7/CONFIG_REMOTEPROC
index 5a1f9df99..5a1f9df99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_REMOTEPROC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_REMOTEPROC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG
index 7cc8785d0..7cc8785d0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM
index 1f5ac58f2..1f5ac58f2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
index f65af3d10..f65af3d10 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052
index a8ee59bd3..a8ee59bd3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055 b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055
index 10c253c41..10c253c41 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI
index 8e6794d69..8e6794d69 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907 b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907
index 32524a0b2..32524a0b2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX
index c73110af7..c73110af7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC
index f1a8235ba..f1a8235ba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
index 479a6f546..479a6f546 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS
index e25c3751b..e25c3751b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX
index adc778ea4..adc778ea4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
index bb8eb9dbc..bb8eb9dbc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
index 548d6d6c9..548d6d6c9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X
index ef916c3f0..ef916c3f0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
index 5716e825c..5716e825c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330 b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330
index f03e88ba7..f03e88ba7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC
index 3e6e37f9b..3e6e37f9b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9055 b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_DA9055
index 5e09d8397..5e09d8397 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9055
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_DA9055
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC
index 5dfec60f3..5dfec60f3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC
index f1ce2d798..f1ce2d798 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
index 582053b2d..582053b2d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_IMX
index ce6d59eca..ce6d59eca 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE
index c2858836b..c2858836b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_MSM
index d9bd71619..d9bd71619 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE
index 5aeaebb23..5aeaebb23 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_OMAP
index 0dbd205b2..0dbd205b2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
index 84ab44f7f..84ab44f7f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_PXA
index 9e51d92bb..9e51d92bb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_PXA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
index 66ca5b372..66ca5b372 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE
index c9a206329..c9a206329 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE
index c96e01c72..c96e01c72 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
index 37161086e..37161086e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART
index 96b1d5471..96b1d5471 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
index 6bf59901d..6bf59901d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2 b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2
index f4da02ef8..f4da02ef8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP
index dd4081561..dd4081561 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM
index fff102371..fff102371 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC
index 13c20145f..13c20145f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM
index ba82d0346..ba82d0346 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S
index 2ae9b1146..2ae9b1146 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP
index 1c9fa3a1b..1c9fa3a1b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF
index 71efbe513..71efbe513 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_EDMA_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_EDMA_SOC
index fcca70a99..fcca70a99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_EDMA_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_EDMA_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_IMX_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_IMX_SOC
index 25cc80938..25cc80938 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_IMX_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_IMX_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_MMP_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_MMP_SOC
index 7efe5db08..7efe5db08 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_MMP_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_MMP_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC
index 17faba2a6..17faba2a6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM
index 048070caa..048070caa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC
index 475fdbc0b..475fdbc0b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO
index eb05b9ab4..eb05b9ab4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP
index 28851f4fd..28851f4fd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM
index 1f83faa0c..1f83faa0c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA
index ad6986bc7..ad6986bc7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040
index b43e28027..b43e28027 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030
index e6b46c847..e6b46c847 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51
index 78b45c501..78b45c501 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_PXA910_SOC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_PXA910_SOC
index 882e1d892..882e1d892 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_PXA910_SOC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_PXA910_SOC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI
index c780ceef1..c780ceef1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S
index 9519f2d73..9519f2d73 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF
index bd4f2465d..bd4f2465d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C
index f5db15237..f5db15237 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320
index 318aa6c9f..318aa6c9f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD
index 8c6673b1c..8c6673b1c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC
index 157167b9e..157167b9e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI
index 4afe3edee..4afe3edee 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI
index ccf4345c2..ccf4345c2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF
index 9c1123316..9c1123316 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI
index 175877081..175877081 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS
index 4a976f56b..4a976f56b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI
index 58cf24a3c..58cf24a3c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
index efa06fed2..efa06fed2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328
index 04b56d426..04b56d426 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783
index 6f74ac751..6f74ac751 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA
index fd13aa0c9..fd13aa0c9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ
index e91b185bd..e91b185bd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
index 9bc19346c..9bc19346c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
index 58a211e43..58a211e43 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI
index 39e51be10..39e51be10 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
index f9530246c..f9530246c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU
index 8ba1b4be9..8ba1b4be9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM
index f5837c9c1..f5837c9c1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index f862f05a7..f862f05a7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
index db12f036e..db12f036e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_QCOM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_QCOM
index 719eb4e3d..719eb4e3d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_QCOM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_QCOM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STI
index af73428f9..af73428f9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
index 99ae102fc..99ae102fc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STORM b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STORM
index 4c4eca4d4..4c4eca4d4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STORM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_STORM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632
index 2ccf32e1f..2ccf32e1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE
index 2100fada9..2100fada9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903
index 5065d5de3..5065d5de3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712
index fbac8d716..fbac8d716 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23
index 6f39daa7e..6f39daa7e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C
index f131b6f76..f131b6f76 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI
index 312955e99..312955e99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX
index d358e546f..d358e546f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X
index 2c862d8c0..2c862d8c0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030
index 1a24fef50..1a24fef50 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040
index e9faf5d6f..e9faf5d6f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8731 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8731
index be7329279..be7329279 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8731
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8731
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8753 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8753
index 82e701fd1..82e701fd1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8753
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8753
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8903 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8903
index 2961dcc76..2961dcc76 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8903
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8903
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
index 8a053dc4d..8a053dc4d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8962 b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
index cfebf5ded..cfebf5ded 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM33XX b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_AM33XX
index 2fa1847aa..2fa1847aa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM33XX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_AM33XX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM43XX b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_AM43XX
index 18d0e25c0..18d0e25c0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM43XX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_AM43XX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212
index a38749ca6..a38749ca6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412
index 5de6d0908..5de6d0908 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415
index 47e0f5b97..47e0f5b97 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER
index bccf956d9..bccf956d9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX50 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX50
index 2c6280123..2c6280123 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX50
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX50
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX51 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX51
index ab614614c..ab614614c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX51
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX51
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX53 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX53
index 4253c2b9c..4253c2b9c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX53
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX53
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6
index 8b1fd41fe..8b1fd41fe 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6Q b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6Q
index 9c1774537..9c1774537 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6Q
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6Q
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SL b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6SL
index 0cc25f1c2..0cc25f1c2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6SL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SX b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6SX
index 922a55b0e..922a55b0e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6SX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6UL b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6UL
index 18a700196..18a700196 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6UL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX6UL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX7D b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX7D
index 8b8a1ae2d..8b8a1ae2d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX7D
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_IMX7D
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_LS1021A b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_LS1021A
index 3df043f0c..3df043f0c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_LS1021A
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_LS1021A
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP3430 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_OMAP3430
index 5cbc6aca9..5cbc6aca9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP3430
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_OMAP3430
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP5 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_OMAP5
index dab53582a..dab53582a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP5
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_OMAP5
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH407
index e1a2ca5a6..e1a2ca5a6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH407
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH415
index 41502f339..41502f339 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH415
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH416
index 9835ddfc1..9835ddfc1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_STIH416
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_TI81XX b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_TI81XX
index 255ee768e..255ee768e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_TI81XX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_TI81XX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_VF610 b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_VF610
index 8a41c0aa0..8a41c0aa0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_VF610
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SOC_VF610
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
index 3a8bb168c..3a8bb168c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_DAVINCI b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_DAVINCI
index fb2368a08..fb2368a08 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_DAVINCI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_DAVINCI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI
index 2eaefc798..2eaefc798 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_IMX b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_IMX
index 9276464a3..9276464a3 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_IMX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_IMX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_MXS b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_MXS
index 49119eb18..49119eb18 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_MXS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_MXS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_OMAP24XX b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_OMAP24XX
index 5d7e38bfc..5d7e38bfc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_OMAP24XX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_OMAP24XX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_QUP b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_QUP
index 4cfdd1db0..4cfdd1db0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_QUP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_QUP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4 b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
index 87403eb57..87403eb57 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH
index c7e910e18..c7e910e18 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK
index 3fcd32c7d..3fcd32c7d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TI_QSPI b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TI_QSPI
index 8bcd1efe9..8bcd1efe9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TI_QSPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_TI_QSPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_XILINX
index 9544de35b..9544de35b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPI_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPMI b/configs/base-generic/arm/armv7/armv7/CONFIG_SPMI
index b340c89e6..b340c89e6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPMI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPMI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB b/configs/base-generic/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB
index 813a8d1d9..813a8d1d9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX b/configs/base-generic/arm/armv7/armv7/CONFIG_STI_MBOX
index 60dd9ded6..60dd9ded6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_STI_MBOX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_I2C b/configs/base-generic/arm/armv7/armv7/CONFIG_STMPE_I2C
index ae0f5fdc0..ae0f5fdc0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_I2C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_STMPE_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_SPI b/configs/base-generic/arm/armv7/armv7/CONFIG_STMPE_SPI
index 7adaed89f..7adaed89f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_SPI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_STMPE_SPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_FDMA
index 73c09775d..73c09775d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_FDMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
index 5e0a376a8..5e0a376a8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
index 73ad95532..73ad95532 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL
index 62b32ecb6..62b32ecb6 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
index 22f120d14..22f120d14 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
index 865418b83..865418b83 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA20_MC b/configs/base-generic/arm/armv7/armv7/CONFIG_TEGRA20_MC
index c627c9d0c..c627c9d0c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA20_MC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TEGRA20_MC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART b/configs/base-generic/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART
index 14aac087a..14aac087a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_ADC081C b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_ADC081C
index 53474529a..53474529a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_ADC081C
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_ADC081C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_AM335X_ADC b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_AM335X_ADC
index 72f215341..72f215341 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_AM335X_ADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_AM335X_ADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPPI41 b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPPI41
index 666dd68c1..666dd68c1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPPI41
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPPI41
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW
index d8770d1c7..d8770d1c7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_ALE b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
index 00c8a8700..00c8a8700 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL
index dd3d67842..dd3d67842 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPTS
index f2dd7ea1f..f2dd7ea1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPTS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
index b81356e32..b81356e32 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAC7512 b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAC7512
index 65f1da6ac..65f1da6ac 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAC7512
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAC7512
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
index 9501e2333..9501e2333 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC
index e262f73ba..e262f73ba 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO
index aee3112bc..aee3112bc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_EMIF
index 95caa8707..95caa8707 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_EMIF
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_PIPE3 b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_PIPE3
index 93443fcb0..93443fcb0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_PIPE3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TI_PIPE3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052 b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052
index b535783a4..b535783a4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC
index c2fa52f20..c2fa52f20 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
index be64613d7..be64613d7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_CORE b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_CORE
index 36f230e25..36f230e25 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_CORE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_CORE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_MADC b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_MADC
index eee015d1f..eee015d1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_MADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_MADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_POWER b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_POWER
index 357614499..357614499 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_POWER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_POWER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_USB
index 4af7e5919..4af7e5919 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG
index fc6343480..fc6343480 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_GPADC b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6030_GPADC
index d635f2f49..d635f2f49 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_GPADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6030_GPADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_USB b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6030_USB
index 393dc0926..393dc0926 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_USB
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6030_USB
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6040_CORE b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6040_CORE
index 44aff900b..44aff900b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6040_CORE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_TWL6040_CORE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_UIO_PRUSS b/configs/base-generic/arm/armv7/armv7/CONFIG_UIO_PRUSS
index f0676cc4e..f0676cc4e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_UIO_PRUSS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_UIO_PRUSS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP
index 266a83b35..266a83b35 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_DWC3_ST
index 8c2b8b403..8c2b8b403 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_DWC3_ST
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP
index 461fb3344..461fb3344 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
index 7f13c6b05..7f13c6b05 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
index 7397a0f15..7397a0f15 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MXC b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_MXC
index 42bd81e3b..42bd81e3b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MXC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_EHCI_MXC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_FSL_USB2 b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_FSL_USB2
index 1bb9e606c..1bb9e606c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_FSL_USB2
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_FSL_USB2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX
index 8479db57e..8479db57e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_IMX21_HCD b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_IMX21_HCD
index 9f1ec8ccd..9f1ec8ccd 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_IMX21_HCD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_IMX21_HCD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA
index fb617333e..fb617333e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MSM_OTG
index 043abcf37..043abcf37 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MSM_OTG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD
index e16720b6a..e16720b6a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X
index e861ad528..e861ad528 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS
index 131bb577c..131bb577c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MXS_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MXS_PHY
index 7cd82a168..7cd82a168 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MXS_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_MXS_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3 b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3
index f4286c5b1..f4286c5b1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
index ac20563d8..ac20563d8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
index 79fac4fdc..79fac4fdc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA
index 49f6c27e8..49f6c27e8 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS b/configs/base-generic/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
index ba1d871fc..ba1d871fc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_ADP1653 b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_ADP1653
index fd09e94fa..fd09e94fa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_ADP1653
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_ADP1653
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE
index 17a6c69ab..17a6c69ab 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_CODA b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_CODA
index 13e238170..13e238170 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_CODA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_CODA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC
index c1b306606..c1b306606 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC
index cfbe3dcfa..cfbe3dcfa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
index 034c99572..034c99572 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT
index 03f7cfb09..03f7cfb09 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3 b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP3
index d0fd9c978..d0fd9c978 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG
index f1c2b1856..f1c2b1856 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP4 b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP4
index dfd5bf1c9..dfd5bf1c9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP4
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_OMAP4
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
index 5e2512c4c..5e2512c4c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS
index 68082fdff..68082fdff 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
index 430657aeb..430657aeb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
index 8bb71fa96..8bb71fa96 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
index 0292f4baa..0292f4baa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
index f847894b9..f847894b9 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
index a1d5539f7..a1d5539f7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
index 7058385d2..7058385d2 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
index 637bf6eb4..637bf6eb4 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_W1_MASTER_MXC b/configs/base-generic/arm/armv7/armv7/CONFIG_W1_MASTER_MXC
index 8cca542fa..8cca542fa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_W1_MASTER_MXC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_W1_MASTER_MXC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_IPC b/configs/base-generic/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
index fa524826b..fa524826b 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC b/configs/base-generic/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
index e49f0132a..e49f0132a 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XEN b/configs/base-generic/arm/armv7/armv7/CONFIG_XEN
index f154fee42..f154fee42 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_XEN
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_XEN
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_EMACLITE b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_EMACLITE
index 1737a9867..1737a9867 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_EMACLITE
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_EMACLITE
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG
index bc24257fb..bc24257fb 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_XADC b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_XADC
index 53ab8251f..53ab8251f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_XADC
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_XILINX_XADC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILLYBUS_OF b/configs/base-generic/arm/armv7/armv7/CONFIG_XILLYBUS_OF
index 673d17364..673d17364 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILLYBUS_OF
+++ b/configs/base-generic/arm/armv7/armv7/CONFIG_XILLYBUS_OF
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_AM335X_PHY_USB b/configs/base-generic/arm/armv7/lpae/CONFIG_AM335X_PHY_USB
index 26554650a..26554650a 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_AM335X_PHY_USB
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_AM335X_PHY_USB
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_AXXIA b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_AXXIA
index 741b73a29..741b73a29 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_AXXIA
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_AXXIA
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_KEYSTONE b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_KEYSTONE
index 8518b0c71..8518b0c71 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_KEYSTONE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_KEYSTONE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_MXC b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_MXC
index 6d6aca346..6d6aca346 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_MXC
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_MXC
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_OMAP3 b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_OMAP3
index 129c9e09a..129c9e09a 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_OMAP3
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_OMAP3
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_OMAP4 b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_OMAP4
index 4fec6030d..4fec6030d 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_OMAP4
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_OMAP4
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_TEGRA_2x_SOC b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_TEGRA_2x_SOC
index 12b2827c4..12b2827c4 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_TEGRA_2x_SOC
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_TEGRA_2x_SOC
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_TEGRA_3x_SOC b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_TEGRA_3x_SOC
index 0be768d6c..0be768d6c 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_TEGRA_3x_SOC
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_TEGRA_3x_SOC
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_ZYNQ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_ZYNQ
index 03f8d8aac..03f8d8aac 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARCH_ZYNQ
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARCH_ZYNQ
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARM_LPAE b/configs/base-generic/arm/armv7/lpae/CONFIG_ARM_LPAE
index 19bab134e..19bab134e 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARM_LPAE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARM_LPAE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_ARM_VIRT_EXT b/configs/base-generic/arm/armv7/lpae/CONFIG_ARM_VIRT_EXT
index 7f469ba88..7f469ba88 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_ARM_VIRT_EXT
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_ARM_VIRT_EXT
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_CPU_SW_DOMAIN_PAN b/configs/base-generic/arm/armv7/lpae/CONFIG_CPU_SW_DOMAIN_PAN
index c9dc42cab..c9dc42cab 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_CPU_SW_DOMAIN_PAN
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_CPU_SW_DOMAIN_PAN
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_DAVINCI_WATCHDOG b/configs/base-generic/arm/armv7/lpae/CONFIG_DAVINCI_WATCHDOG
index 4cce9cae0..4cce9cae0 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_DAVINCI_WATCHDOG
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_DAVINCI_WATCHDOG
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_DRM_OMAP b/configs/base-generic/arm/armv7/lpae/CONFIG_DRM_OMAP
index 1506b3d55..1506b3d55 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_DRM_OMAP
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_DRM_OMAP
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_EXTCON b/configs/base-generic/arm/armv7/lpae/CONFIG_EXTCON
index bde29bcfc..bde29bcfc 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_EXTCON
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_EXTCON
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_GPIO_DAVINCI b/configs/base-generic/arm/armv7/lpae/CONFIG_GPIO_DAVINCI
index 2ac2ae236..2ac2ae236 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_GPIO_DAVINCI
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_GPIO_DAVINCI
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_GPIO_SYSCON b/configs/base-generic/arm/armv7/lpae/CONFIG_GPIO_SYSCON
index 969b6baba..969b6baba 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_GPIO_SYSCON
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_GPIO_SYSCON
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE b/configs/base-generic/arm/armv7/lpae/CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE
index 6e840a347..6e840a347 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_HVC_XEN b/configs/base-generic/arm/armv7/lpae/CONFIG_HVC_XEN
index df97a05c7..df97a05c7 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_HVC_XEN
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_HVC_XEN
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND b/configs/base-generic/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND
index 02ccaac13..02ccaac13 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_I2C_DAVINCI b/configs/base-generic/arm/armv7/lpae/CONFIG_I2C_DAVINCI
index 2eb80630b..2eb80630b 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_I2C_DAVINCI
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_I2C_DAVINCI
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND b/configs/base-generic/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
index 9703adaf4..9703adaf4 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_KEYSTONE_IRQ b/configs/base-generic/arm/armv7/lpae/CONFIG_KEYSTONE_IRQ
index cfbce3d52..cfbce3d52 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_KEYSTONE_IRQ
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_KEYSTONE_IRQ
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_KEYSTONE_USB_PHY b/configs/base-generic/arm/armv7/lpae/CONFIG_KEYSTONE_USB_PHY
index f51b397d9..f51b397d9 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_KEYSTONE_USB_PHY
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_KEYSTONE_USB_PHY
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_KVM b/configs/base-generic/arm/armv7/lpae/CONFIG_KVM
index 14f90d8d6..14f90d8d6 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_KVM
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_KVM
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_KVM_ARM_HOST b/configs/base-generic/arm/armv7/lpae/CONFIG_KVM_ARM_HOST
index d3851282d..d3851282d 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_KVM_ARM_HOST
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_KVM_ARM_HOST
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_MFD_MAX8907 b/configs/base-generic/arm/armv7/lpae/CONFIG_MFD_MAX8907
index 7921e7b73..7921e7b73 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_MFD_MAX8907
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_MFD_MAX8907
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_MTD_NAND_DAVINCI b/configs/base-generic/arm/armv7/lpae/CONFIG_MTD_NAND_DAVINCI
index 75748ae50..75748ae50 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_MTD_NAND_DAVINCI
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_MTD_NAND_DAVINCI
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_PCI_KEYSTONE b/configs/base-generic/arm/armv7/lpae/CONFIG_PCI_KEYSTONE
index 72bc43290..72bc43290 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_PCI_KEYSTONE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_PCI_KEYSTONE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_POWER_RESET_KEYSTONE b/configs/base-generic/arm/armv7/lpae/CONFIG_POWER_RESET_KEYSTONE
index 89a5d4474..89a5d4474 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_POWER_RESET_KEYSTONE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_POWER_RESET_KEYSTONE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_AC97 b/configs/base-generic/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_AC97
index 2ea812487..2ea812487 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_AC97
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_AC97
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_SPDIF b/configs/base-generic/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_SPDIF
index 00f844968..00f844968 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_SPDIF
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_SPDIF
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SOC_AM33XX b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_AM33XX
index abf375a67..abf375a67 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SOC_AM33XX
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_AM33XX
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SOC_AM43XX b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_AM43XX
index 4761c4279..4761c4279 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SOC_AM43XX
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_AM43XX
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SOC_OMAP5 b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_OMAP5
index 0f9cdbc7a..0f9cdbc7a 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SOC_OMAP5
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SOC_OMAP5
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SPI_DAVINCI b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_DAVINCI
index fb2368a08..fb2368a08 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SPI_DAVINCI
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_DAVINCI
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SFLASH b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SFLASH
index 446ce0728..446ce0728 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SFLASH
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SFLASH
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SLINK b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SLINK
index 05c720ddc..05c720ddc 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SLINK
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SPI_TEGRA20_SLINK
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SYNC_FILE b/configs/base-generic/arm/armv7/lpae/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SYNC_FILE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SYNC_FILE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SYS_SUPPORTS_HUGETLBFS b/configs/base-generic/arm/armv7/lpae/CONFIG_SYS_SUPPORTS_HUGETLBFS
index 475c82205..475c82205 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SYS_SUPPORTS_HUGETLBFS
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_SYS_SUPPORTS_HUGETLBFS
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TEGRA20_MC b/configs/base-generic/arm/armv7/lpae/CONFIG_TEGRA20_MC
index e046eac20..e046eac20 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TEGRA20_MC
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_TEGRA20_MC
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TEGRA_IOMMU_GART b/configs/base-generic/arm/armv7/lpae/CONFIG_TEGRA_IOMMU_GART
index e17092437..e17092437 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TEGRA_IOMMU_GART
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_TEGRA_IOMMU_GART
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_AEMIF b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_AEMIF
index f2a52007b..f2a52007b 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_AEMIF
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_AEMIF
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_MESSAGE_MANAGER b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_MESSAGE_MANAGER
index 9b9951e37..9b9951e37 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_MESSAGE_MANAGER
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_MESSAGE_MANAGER
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
index 10dfa04f9..10dfa04f9 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_USB_DWC3_KEYSTONE b/configs/base-generic/arm/armv7/lpae/CONFIG_USB_DWC3_KEYSTONE
index 95bd01cab..95bd01cab 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_USB_DWC3_KEYSTONE
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_USB_DWC3_KEYSTONE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_VDSO b/configs/base-generic/arm/armv7/lpae/CONFIG_VDSO
index cab5ebafb..cab5ebafb 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_VDSO
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_VDSO
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN
index f154fee42..f154fee42 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XENFS b/configs/base-generic/arm/armv7/lpae/CONFIG_XENFS
index 2a9db2ee7..2a9db2ee7 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XENFS
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XENFS
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BACKEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BACKEND
index b15ca354b..b15ca354b 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BACKEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BACKEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BALLOON b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BALLOON
index 1210e9672..1210e9672 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BALLOON
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BALLOON
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND
index 214dd3c75..214dd3c75 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND
index 5b1ec5f14..5b1ec5f14 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS
index 280bc95c8..280bc95c8 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN
index a198d3b62..a198d3b62 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND
index a0d0c69b8..a0d0c69b8 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_GNTDEV b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_GNTDEV
index 423af3d00..423af3d00 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_GNTDEV
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_GNTDEV
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC
index 9c4e42ad1..9c4e42ad1 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND
index 8f3e152d3..8f3e152d3 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND
index eb86ad0f8..eb86ad0f8 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR
index a8ff9c8e6..a8ff9c8e6 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_XEN_WDT b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_WDT
index 333aa5528..333aa5528 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_XEN_WDT
+++ b/configs/base-generic/arm/armv7/lpae/CONFIG_XEN_WDT
diff --git a/baseconfig/arm/armv7/lpae/README b/configs/base-generic/arm/armv7/lpae/README
index bcd644db1..bcd644db1 100644
--- a/baseconfig/arm/armv7/lpae/README
+++ b/configs/base-generic/arm/armv7/lpae/README
diff --git a/baseconfig/powerpc/CONFIG_3C515 b/configs/base-generic/powerpc/CONFIG_3C515
index 12e4e9eb2..12e4e9eb2 100644
--- a/baseconfig/powerpc/CONFIG_3C515
+++ b/configs/base-generic/powerpc/CONFIG_3C515
diff --git a/baseconfig/powerpc/CONFIG_AGP b/configs/base-generic/powerpc/CONFIG_AGP
index f7332ef53..f7332ef53 100644
--- a/baseconfig/powerpc/CONFIG_AGP
+++ b/configs/base-generic/powerpc/CONFIG_AGP
diff --git a/baseconfig/powerpc/CONFIG_ALTIVEC b/configs/base-generic/powerpc/CONFIG_ALTIVEC
index 58a697cb5..58a697cb5 100644
--- a/baseconfig/powerpc/CONFIG_ALTIVEC
+++ b/configs/base-generic/powerpc/CONFIG_ALTIVEC
diff --git a/baseconfig/powerpc/CONFIG_AMIGAONE b/configs/base-generic/powerpc/CONFIG_AMIGAONE
index 43d1629ed..43d1629ed 100644
--- a/baseconfig/powerpc/CONFIG_AMIGAONE
+++ b/configs/base-generic/powerpc/CONFIG_AMIGAONE
diff --git a/baseconfig/powerpc/CONFIG_ASYMMETRIC_KEY_TYPE b/configs/base-generic/powerpc/CONFIG_ASYMMETRIC_KEY_TYPE
index c7d15a4b1..c7d15a4b1 100644
--- a/baseconfig/powerpc/CONFIG_ASYMMETRIC_KEY_TYPE
+++ b/configs/base-generic/powerpc/CONFIG_ASYMMETRIC_KEY_TYPE
diff --git a/baseconfig/powerpc/CONFIG_ATM_AMBASSADOR b/configs/base-generic/powerpc/CONFIG_ATM_AMBASSADOR
index bb0583114..bb0583114 100644
--- a/baseconfig/powerpc/CONFIG_ATM_AMBASSADOR
+++ b/configs/base-generic/powerpc/CONFIG_ATM_AMBASSADOR
diff --git a/baseconfig/powerpc/CONFIG_ATM_FIRESTREAM b/configs/base-generic/powerpc/CONFIG_ATM_FIRESTREAM
index 82670901d..82670901d 100644
--- a/baseconfig/powerpc/CONFIG_ATM_FIRESTREAM
+++ b/configs/base-generic/powerpc/CONFIG_ATM_FIRESTREAM
diff --git a/baseconfig/powerpc/CONFIG_ATM_HORIZON b/configs/base-generic/powerpc/CONFIG_ATM_HORIZON
index 54be0dfd3..54be0dfd3 100644
--- a/baseconfig/powerpc/CONFIG_ATM_HORIZON
+++ b/configs/base-generic/powerpc/CONFIG_ATM_HORIZON
diff --git a/baseconfig/powerpc/CONFIG_AXON_RAM b/configs/base-generic/powerpc/CONFIG_AXON_RAM
index fc4fb047c..fc4fb047c 100644
--- a/baseconfig/powerpc/CONFIG_AXON_RAM
+++ b/configs/base-generic/powerpc/CONFIG_AXON_RAM
diff --git a/baseconfig/powerpc/CONFIG_BACKLIGHT_PWM b/configs/base-generic/powerpc/CONFIG_BACKLIGHT_PWM
index 44737e214..44737e214 100644
--- a/baseconfig/powerpc/CONFIG_BACKLIGHT_PWM
+++ b/configs/base-generic/powerpc/CONFIG_BACKLIGHT_PWM
diff --git a/baseconfig/powerpc/CONFIG_BLK_DEV_IT8172 b/configs/base-generic/powerpc/CONFIG_BLK_DEV_IT8172
index 83b806c61..83b806c61 100644
--- a/baseconfig/powerpc/CONFIG_BLK_DEV_IT8172
+++ b/configs/base-generic/powerpc/CONFIG_BLK_DEV_IT8172
diff --git a/baseconfig/powerpc/CONFIG_BLK_DEV_PLATFORM b/configs/base-generic/powerpc/CONFIG_BLK_DEV_PLATFORM
index eac78afde..eac78afde 100644
--- a/baseconfig/powerpc/CONFIG_BLK_DEV_PLATFORM
+++ b/configs/base-generic/powerpc/CONFIG_BLK_DEV_PLATFORM
diff --git a/baseconfig/powerpc/CONFIG_BLK_DEV_RSXX b/configs/base-generic/powerpc/CONFIG_BLK_DEV_RSXX
index 46e47aa01..46e47aa01 100644
--- a/baseconfig/powerpc/CONFIG_BLK_DEV_RSXX
+++ b/configs/base-generic/powerpc/CONFIG_BLK_DEV_RSXX
diff --git a/baseconfig/powerpc/CONFIG_BOOTX_TEXT b/configs/base-generic/powerpc/CONFIG_BOOTX_TEXT
index 0da5a8a42..0da5a8a42 100644
--- a/baseconfig/powerpc/CONFIG_BOOTX_TEXT
+++ b/configs/base-generic/powerpc/CONFIG_BOOTX_TEXT
diff --git a/baseconfig/powerpc/CONFIG_CAN_FLEXCAN b/configs/base-generic/powerpc/CONFIG_CAN_FLEXCAN
index 3ba377ce4..3ba377ce4 100644
--- a/baseconfig/powerpc/CONFIG_CAN_FLEXCAN
+++ b/configs/base-generic/powerpc/CONFIG_CAN_FLEXCAN
diff --git a/baseconfig/powerpc/CONFIG_CAN_MPC5XXX b/configs/base-generic/powerpc/CONFIG_CAN_MPC5XXX
index d4fd0f486..d4fd0f486 100644
--- a/baseconfig/powerpc/CONFIG_CAN_MPC5XXX
+++ b/configs/base-generic/powerpc/CONFIG_CAN_MPC5XXX
diff --git a/baseconfig/powerpc/CONFIG_CAN_MSCAN b/configs/base-generic/powerpc/CONFIG_CAN_MSCAN
index 4ec2191f0..4ec2191f0 100644
--- a/baseconfig/powerpc/CONFIG_CAN_MSCAN
+++ b/configs/base-generic/powerpc/CONFIG_CAN_MSCAN
diff --git a/baseconfig/powerpc/CONFIG_CAPI_EICON b/configs/base-generic/powerpc/CONFIG_CAPI_EICON
index 70c2616e4..70c2616e4 100644
--- a/baseconfig/powerpc/CONFIG_CAPI_EICON
+++ b/configs/base-generic/powerpc/CONFIG_CAPI_EICON
diff --git a/baseconfig/powerpc/CONFIG_CGROUP_HUGETLB b/configs/base-generic/powerpc/CONFIG_CGROUP_HUGETLB
index 0e9e34b4c..0e9e34b4c 100644
--- a/baseconfig/powerpc/CONFIG_CGROUP_HUGETLB
+++ b/configs/base-generic/powerpc/CONFIG_CGROUP_HUGETLB
diff --git a/baseconfig/powerpc/CONFIG_CMA b/configs/base-generic/powerpc/CONFIG_CMA
index 309c9e771..309c9e771 100644
--- a/baseconfig/powerpc/CONFIG_CMA
+++ b/configs/base-generic/powerpc/CONFIG_CMA
diff --git a/baseconfig/powerpc/CONFIG_CMA_AREAS b/configs/base-generic/powerpc/CONFIG_CMA_AREAS
index 5474a48e9..5474a48e9 100644
--- a/baseconfig/powerpc/CONFIG_CMA_AREAS
+++ b/configs/base-generic/powerpc/CONFIG_CMA_AREAS
diff --git a/baseconfig/powerpc/CONFIG_CMA_DEBUG b/configs/base-generic/powerpc/CONFIG_CMA_DEBUG
index 64ff80c56..64ff80c56 100644
--- a/baseconfig/powerpc/CONFIG_CMA_DEBUG
+++ b/configs/base-generic/powerpc/CONFIG_CMA_DEBUG
diff --git a/baseconfig/powerpc/CONFIG_CMA_DEBUGFS b/configs/base-generic/powerpc/CONFIG_CMA_DEBUGFS
index fba89903a..fba89903a 100644
--- a/baseconfig/powerpc/CONFIG_CMA_DEBUGFS
+++ b/configs/base-generic/powerpc/CONFIG_CMA_DEBUGFS
diff --git a/baseconfig/powerpc/CONFIG_CMDLINE_BOOL b/configs/base-generic/powerpc/CONFIG_CMDLINE_BOOL
index ca23a06ea..ca23a06ea 100644
--- a/baseconfig/powerpc/CONFIG_CMDLINE_BOOL
+++ b/configs/base-generic/powerpc/CONFIG_CMDLINE_BOOL
diff --git a/baseconfig/powerpc/CONFIG_CMM b/configs/base-generic/powerpc/CONFIG_CMM
index d1ba1563c..d1ba1563c 100644
--- a/baseconfig/powerpc/CONFIG_CMM
+++ b/configs/base-generic/powerpc/CONFIG_CMM
diff --git a/baseconfig/powerpc/CONFIG_CODE_PATCHING_SELFTEST b/configs/base-generic/powerpc/CONFIG_CODE_PATCHING_SELFTEST
index f6122e9b5..f6122e9b5 100644
--- a/baseconfig/powerpc/CONFIG_CODE_PATCHING_SELFTEST
+++ b/configs/base-generic/powerpc/CONFIG_CODE_PATCHING_SELFTEST
diff --git a/baseconfig/powerpc/CONFIG_CONSISTENT_SIZE_BOOL b/configs/base-generic/powerpc/CONFIG_CONSISTENT_SIZE_BOOL
index 4b5cbab51..4b5cbab51 100644
--- a/baseconfig/powerpc/CONFIG_CONSISTENT_SIZE_BOOL
+++ b/configs/base-generic/powerpc/CONFIG_CONSISTENT_SIZE_BOOL
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM b/configs/base-generic/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
index 8d0ade331..8d0ade331 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_CRCT10DIF_VPMSUM b/configs/base-generic/powerpc/CONFIG_CRYPTO_CRCT10DIF_VPMSUM
index eb0464d08..eb0464d08 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_CRCT10DIF_VPMSUM
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_CRCT10DIF_VPMSUM
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_FSL_CAAM b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_FSL_CAAM
index d95b811c3..d95b811c3 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_FSL_CAAM
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_FSL_CAAM
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX
index fd145f04f..fd145f04f 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS
index 1f5f5cd37..1f5f5cd37 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV
index 1e7b1400c..1e7b1400c 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES
index 7ec7b0c3f..7ec7b0c3f 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_ENCRYPT b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_ENCRYPT
index cadd33191..cadd33191 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_NX_ENCRYPT
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_NX_ENCRYPT
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_VMX b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_VMX
index 086ee9aa0..086ee9aa0 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_VMX
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_VMX
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_VMX_ENCRYPT b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_VMX_ENCRYPT
index 92d971418..92d971418 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_DEV_VMX_ENCRYPT
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_DEV_VMX_ENCRYPT
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_MD5_PPC b/configs/base-generic/powerpc/CONFIG_CRYPTO_MD5_PPC
index ec064c369..ec064c369 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_MD5_PPC
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_MD5_PPC
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_SHA1_PPC b/configs/base-generic/powerpc/CONFIG_CRYPTO_SHA1_PPC
index cc0cd67bd..cc0cd67bd 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_SHA1_PPC
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_SHA1_PPC
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_VPMSUM_TESTER b/configs/base-generic/powerpc/CONFIG_CRYPTO_VPMSUM_TESTER
index a3acefe62..a3acefe62 100644
--- a/baseconfig/powerpc/CONFIG_CRYPTO_VPMSUM_TESTER
+++ b/configs/base-generic/powerpc/CONFIG_CRYPTO_VPMSUM_TESTER
diff --git a/baseconfig/powerpc/CONFIG_CXL b/configs/base-generic/powerpc/CONFIG_CXL
index c83d7cc30..c83d7cc30 100644
--- a/baseconfig/powerpc/CONFIG_CXL
+++ b/configs/base-generic/powerpc/CONFIG_CXL
diff --git a/baseconfig/powerpc/CONFIG_CXLFLASH b/configs/base-generic/powerpc/CONFIG_CXLFLASH
index d6eb9122b..d6eb9122b 100644
--- a/baseconfig/powerpc/CONFIG_CXLFLASH
+++ b/configs/base-generic/powerpc/CONFIG_CXLFLASH
diff --git a/baseconfig/powerpc/CONFIG_DEBUGGER b/configs/base-generic/powerpc/CONFIG_DEBUGGER
index 134d116eb..134d116eb 100644
--- a/baseconfig/powerpc/CONFIG_DEBUGGER
+++ b/configs/base-generic/powerpc/CONFIG_DEBUGGER
diff --git a/baseconfig/powerpc/CONFIG_DEBUG_GPIO b/configs/base-generic/powerpc/CONFIG_DEBUG_GPIO
index c278d8cce..c278d8cce 100644
--- a/baseconfig/powerpc/CONFIG_DEBUG_GPIO
+++ b/configs/base-generic/powerpc/CONFIG_DEBUG_GPIO
diff --git a/baseconfig/powerpc/CONFIG_DEBUG_STACKOVERFLOW b/configs/base-generic/powerpc/CONFIG_DEBUG_STACKOVERFLOW
index 09bb42611..09bb42611 100644
--- a/baseconfig/powerpc/CONFIG_DEBUG_STACKOVERFLOW
+++ b/configs/base-generic/powerpc/CONFIG_DEBUG_STACKOVERFLOW
diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX b/configs/base-generic/powerpc/CONFIG_DEV_DAX
index 77478a213..77478a213 100644
--- a/baseconfig/powerpc/CONFIG_DEV_DAX
+++ b/configs/base-generic/powerpc/CONFIG_DEV_DAX
diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM b/configs/base-generic/powerpc/CONFIG_DEV_DAX_PMEM
index 8c7fd6732..8c7fd6732 100644
--- a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM
+++ b/configs/base-generic/powerpc/CONFIG_DEV_DAX_PMEM
diff --git a/baseconfig/powerpc/CONFIG_DMADEVICES b/configs/base-generic/powerpc/CONFIG_DMADEVICES
index 169d6c3d0..169d6c3d0 100644
--- a/baseconfig/powerpc/CONFIG_DMADEVICES
+++ b/configs/base-generic/powerpc/CONFIG_DMADEVICES
diff --git a/baseconfig/powerpc/CONFIG_DRM_PANEL b/configs/base-generic/powerpc/CONFIG_DRM_PANEL
index de8a9c247..de8a9c247 100644
--- a/baseconfig/powerpc/CONFIG_DRM_PANEL
+++ b/configs/base-generic/powerpc/CONFIG_DRM_PANEL
diff --git a/baseconfig/powerpc/CONFIG_DTL b/configs/base-generic/powerpc/CONFIG_DTL
index 8506a00db..8506a00db 100644
--- a/baseconfig/powerpc/CONFIG_DTL
+++ b/configs/base-generic/powerpc/CONFIG_DTL
diff --git a/baseconfig/powerpc/CONFIG_EDAC_CPC925 b/configs/base-generic/powerpc/CONFIG_EDAC_CPC925
index 6676940a8..6676940a8 100644
--- a/baseconfig/powerpc/CONFIG_EDAC_CPC925
+++ b/configs/base-generic/powerpc/CONFIG_EDAC_CPC925
diff --git a/baseconfig/powerpc/CONFIG_EDAC_MPC85XX b/configs/base-generic/powerpc/CONFIG_EDAC_MPC85XX
index 07640afdc..07640afdc 100644
--- a/baseconfig/powerpc/CONFIG_EDAC_MPC85XX
+++ b/configs/base-generic/powerpc/CONFIG_EDAC_MPC85XX
diff --git a/baseconfig/powerpc/CONFIG_EHEA b/configs/base-generic/powerpc/CONFIG_EHEA
index d2fdb58b6..d2fdb58b6 100644
--- a/baseconfig/powerpc/CONFIG_EHEA
+++ b/configs/base-generic/powerpc/CONFIG_EHEA
diff --git a/baseconfig/powerpc/CONFIG_EXTRA_TARGETS b/configs/base-generic/powerpc/CONFIG_EXTRA_TARGETS
index 851c11ace..851c11ace 100644
--- a/baseconfig/powerpc/CONFIG_EXTRA_TARGETS
+++ b/configs/base-generic/powerpc/CONFIG_EXTRA_TARGETS
diff --git a/baseconfig/powerpc/CONFIG_FAIL_IOMMU b/configs/base-generic/powerpc/CONFIG_FAIL_IOMMU
index bb8c786d5..bb8c786d5 100644
--- a/baseconfig/powerpc/CONFIG_FAIL_IOMMU
+++ b/configs/base-generic/powerpc/CONFIG_FAIL_IOMMU
diff --git a/baseconfig/powerpc/CONFIG_FA_DUMP b/configs/base-generic/powerpc/CONFIG_FA_DUMP
index 545d9e6c6..545d9e6c6 100644
--- a/baseconfig/powerpc/CONFIG_FA_DUMP
+++ b/configs/base-generic/powerpc/CONFIG_FA_DUMP
diff --git a/baseconfig/powerpc/CONFIG_FB_ATY b/configs/base-generic/powerpc/CONFIG_FB_ATY
index cae8eee36..cae8eee36 100644
--- a/baseconfig/powerpc/CONFIG_FB_ATY
+++ b/configs/base-generic/powerpc/CONFIG_FB_ATY
diff --git a/baseconfig/powerpc/CONFIG_FB_ATY128 b/configs/base-generic/powerpc/CONFIG_FB_ATY128
index da6946555..da6946555 100644
--- a/baseconfig/powerpc/CONFIG_FB_ATY128
+++ b/configs/base-generic/powerpc/CONFIG_FB_ATY128
diff --git a/baseconfig/powerpc/CONFIG_FB_CONTROL b/configs/base-generic/powerpc/CONFIG_FB_CONTROL
index f9bec2e49..f9bec2e49 100644
--- a/baseconfig/powerpc/CONFIG_FB_CONTROL
+++ b/configs/base-generic/powerpc/CONFIG_FB_CONTROL
diff --git a/baseconfig/powerpc/CONFIG_FB_CT65550 b/configs/base-generic/powerpc/CONFIG_FB_CT65550
index 68a44a2bc..68a44a2bc 100644
--- a/baseconfig/powerpc/CONFIG_FB_CT65550
+++ b/configs/base-generic/powerpc/CONFIG_FB_CT65550
diff --git a/baseconfig/powerpc/CONFIG_FB_IBM_GXT4500 b/configs/base-generic/powerpc/CONFIG_FB_IBM_GXT4500
index 5c48588fb..5c48588fb 100644
--- a/baseconfig/powerpc/CONFIG_FB_IBM_GXT4500
+++ b/configs/base-generic/powerpc/CONFIG_FB_IBM_GXT4500
diff --git a/baseconfig/powerpc/CONFIG_FB_MATROX b/configs/base-generic/powerpc/CONFIG_FB_MATROX
index 8673592aa..8673592aa 100644
--- a/baseconfig/powerpc/CONFIG_FB_MATROX
+++ b/configs/base-generic/powerpc/CONFIG_FB_MATROX
diff --git a/baseconfig/powerpc/CONFIG_FB_MATROX_G b/configs/base-generic/powerpc/CONFIG_FB_MATROX_G
index 6f2ed4141..6f2ed4141 100644
--- a/baseconfig/powerpc/CONFIG_FB_MATROX_G
+++ b/configs/base-generic/powerpc/CONFIG_FB_MATROX_G
diff --git a/baseconfig/powerpc/CONFIG_FB_MB862XX b/configs/base-generic/powerpc/CONFIG_FB_MB862XX
index b2ea119f3..b2ea119f3 100644
--- a/baseconfig/powerpc/CONFIG_FB_MB862XX
+++ b/configs/base-generic/powerpc/CONFIG_FB_MB862XX
diff --git a/baseconfig/powerpc/CONFIG_FB_MB862XX_I2C b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_I2C
index 27b3ed906..27b3ed906 100644
--- a/baseconfig/powerpc/CONFIG_FB_MB862XX_I2C
+++ b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_I2C
diff --git a/baseconfig/powerpc/CONFIG_FB_MB862XX_LIME b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_LIME
index 51ec79c6a..51ec79c6a 100644
--- a/baseconfig/powerpc/CONFIG_FB_MB862XX_LIME
+++ b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_LIME
diff --git a/baseconfig/powerpc/CONFIG_FB_MB862XX_PCI_GDC b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_PCI_GDC
index 58a07df84..58a07df84 100644
--- a/baseconfig/powerpc/CONFIG_FB_MB862XX_PCI_GDC
+++ b/configs/base-generic/powerpc/CONFIG_FB_MB862XX_PCI_GDC
diff --git a/baseconfig/powerpc/CONFIG_FB_OF b/configs/base-generic/powerpc/CONFIG_FB_OF
index 126d0f9f3..126d0f9f3 100644
--- a/baseconfig/powerpc/CONFIG_FB_OF
+++ b/configs/base-generic/powerpc/CONFIG_FB_OF
diff --git a/baseconfig/powerpc/CONFIG_FB_PLATINUM b/configs/base-generic/powerpc/CONFIG_FB_PLATINUM
index 391db507e..391db507e 100644
--- a/baseconfig/powerpc/CONFIG_FB_PLATINUM
+++ b/configs/base-generic/powerpc/CONFIG_FB_PLATINUM
diff --git a/baseconfig/powerpc/CONFIG_FB_SSD1307 b/configs/base-generic/powerpc/CONFIG_FB_SSD1307
index efd995bdf..efd995bdf 100644
--- a/baseconfig/powerpc/CONFIG_FB_SSD1307
+++ b/configs/base-generic/powerpc/CONFIG_FB_SSD1307
diff --git a/baseconfig/powerpc/CONFIG_FB_VALKYRIE b/configs/base-generic/powerpc/CONFIG_FB_VALKYRIE
index 99609737a..99609737a 100644
--- a/baseconfig/powerpc/CONFIG_FB_VALKYRIE
+++ b/configs/base-generic/powerpc/CONFIG_FB_VALKYRIE
diff --git a/baseconfig/powerpc/CONFIG_FB_VGA16 b/configs/base-generic/powerpc/CONFIG_FB_VGA16
index d933f13d7..d933f13d7 100644
--- a/baseconfig/powerpc/CONFIG_FB_VGA16
+++ b/configs/base-generic/powerpc/CONFIG_FB_VGA16
diff --git a/baseconfig/powerpc/CONFIG_FHCI_DEBUG b/configs/base-generic/powerpc/CONFIG_FHCI_DEBUG
index 0fddb3484..0fddb3484 100644
--- a/baseconfig/powerpc/CONFIG_FHCI_DEBUG
+++ b/configs/base-generic/powerpc/CONFIG_FHCI_DEBUG
diff --git a/baseconfig/powerpc/CONFIG_FORCE_MAX_ZONEORDER b/configs/base-generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
index b6d20b8ee..b6d20b8ee 100644
--- a/baseconfig/powerpc/CONFIG_FORCE_MAX_ZONEORDER
+++ b/configs/base-generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
diff --git a/baseconfig/powerpc/CONFIG_FRAME_WARN b/configs/base-generic/powerpc/CONFIG_FRAME_WARN
index 6826578df..6826578df 100644
--- a/baseconfig/powerpc/CONFIG_FRAME_WARN
+++ b/configs/base-generic/powerpc/CONFIG_FRAME_WARN
diff --git a/baseconfig/powerpc/CONFIG_FSL_DMA b/configs/base-generic/powerpc/CONFIG_FSL_DMA
index 0b2fa4a6b..0b2fa4a6b 100644
--- a/baseconfig/powerpc/CONFIG_FSL_DMA
+++ b/configs/base-generic/powerpc/CONFIG_FSL_DMA
diff --git a/baseconfig/powerpc/CONFIG_FSL_LBC b/configs/base-generic/powerpc/CONFIG_FSL_LBC
index 81d34fde3..81d34fde3 100644
--- a/baseconfig/powerpc/CONFIG_FSL_LBC
+++ b/configs/base-generic/powerpc/CONFIG_FSL_LBC
diff --git a/baseconfig/powerpc/CONFIG_FS_ENET b/configs/base-generic/powerpc/CONFIG_FS_ENET
index 7520c726e..7520c726e 100644
--- a/baseconfig/powerpc/CONFIG_FS_ENET
+++ b/configs/base-generic/powerpc/CONFIG_FS_ENET
diff --git a/baseconfig/powerpc/CONFIG_FTR_FIXUP_SELFTEST b/configs/base-generic/powerpc/CONFIG_FTR_FIXUP_SELFTEST
index e5c00ee96..e5c00ee96 100644
--- a/baseconfig/powerpc/CONFIG_FTR_FIXUP_SELFTEST
+++ b/configs/base-generic/powerpc/CONFIG_FTR_FIXUP_SELFTEST
diff --git a/baseconfig/powerpc/CONFIG_GEF_PPC9A b/configs/base-generic/powerpc/CONFIG_GEF_PPC9A
index aba817bb6..aba817bb6 100644
--- a/baseconfig/powerpc/CONFIG_GEF_PPC9A
+++ b/configs/base-generic/powerpc/CONFIG_GEF_PPC9A
diff --git a/baseconfig/powerpc/CONFIG_GEF_SBC310 b/configs/base-generic/powerpc/CONFIG_GEF_SBC310
index 112a7227e..112a7227e 100644
--- a/baseconfig/powerpc/CONFIG_GEF_SBC310
+++ b/configs/base-generic/powerpc/CONFIG_GEF_SBC310
diff --git a/baseconfig/powerpc/CONFIG_GEF_SBC610 b/configs/base-generic/powerpc/CONFIG_GEF_SBC610
index 5c0a3d8aa..5c0a3d8aa 100644
--- a/baseconfig/powerpc/CONFIG_GEF_SBC610
+++ b/configs/base-generic/powerpc/CONFIG_GEF_SBC610
diff --git a/baseconfig/powerpc/CONFIG_GENWQE b/configs/base-generic/powerpc/CONFIG_GENWQE
index f1f996ac1..f1f996ac1 100644
--- a/baseconfig/powerpc/CONFIG_GENWQE
+++ b/configs/base-generic/powerpc/CONFIG_GENWQE
diff --git a/baseconfig/powerpc/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY b/configs/base-generic/powerpc/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
index b14ba84fb..b14ba84fb 100644
--- a/baseconfig/powerpc/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
+++ b/configs/base-generic/powerpc/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
diff --git a/baseconfig/powerpc/CONFIG_GEN_RTC b/configs/base-generic/powerpc/CONFIG_GEN_RTC
index 313481994..313481994 100644
--- a/baseconfig/powerpc/CONFIG_GEN_RTC
+++ b/configs/base-generic/powerpc/CONFIG_GEN_RTC
diff --git a/baseconfig/powerpc/CONFIG_GPIO_74XX_MMIO b/configs/base-generic/powerpc/CONFIG_GPIO_74XX_MMIO
index b761ec18a..b761ec18a 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_74XX_MMIO
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_74XX_MMIO
diff --git a/baseconfig/powerpc/CONFIG_GPIO_PCA953X b/configs/base-generic/powerpc/CONFIG_GPIO_PCA953X
index 15f1c9373..15f1c9373 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_PCA953X
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_PCA953X
diff --git a/baseconfig/powerpc/CONFIG_GPIO_PCF857X b/configs/base-generic/powerpc/CONFIG_GPIO_PCF857X
index a5a82a6b0..a5a82a6b0 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_PCF857X
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_PCF857X
diff --git a/baseconfig/powerpc/CONFIG_GPIO_UCB1400 b/configs/base-generic/powerpc/CONFIG_GPIO_UCB1400
index af9a55185..af9a55185 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_UCB1400
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_UCB1400
diff --git a/baseconfig/powerpc/CONFIG_GPIO_WM831X b/configs/base-generic/powerpc/CONFIG_GPIO_WM831X
index dd99424f1..dd99424f1 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_WM831X
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_WM831X
diff --git a/baseconfig/powerpc/CONFIG_GPIO_XILINX b/configs/base-generic/powerpc/CONFIG_GPIO_XILINX
index d7769012b..d7769012b 100644
--- a/baseconfig/powerpc/CONFIG_GPIO_XILINX
+++ b/configs/base-generic/powerpc/CONFIG_GPIO_XILINX
diff --git a/baseconfig/powerpc/CONFIG_HARDLOCKUP_DETECTOR b/configs/base-generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
index dc5ae5ce3..dc5ae5ce3 100644
--- a/baseconfig/powerpc/CONFIG_HARDLOCKUP_DETECTOR
+++ b/configs/base-generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
diff --git a/baseconfig/powerpc/CONFIG_HAVE_BOOTMEM_INFO_NODE b/configs/base-generic/powerpc/CONFIG_HAVE_BOOTMEM_INFO_NODE
index ee51a6582..ee51a6582 100644
--- a/baseconfig/powerpc/CONFIG_HAVE_BOOTMEM_INFO_NODE
+++ b/configs/base-generic/powerpc/CONFIG_HAVE_BOOTMEM_INFO_NODE
diff --git a/baseconfig/powerpc/CONFIG_HCALL_STATS b/configs/base-generic/powerpc/CONFIG_HCALL_STATS
index 6e211762f..6e211762f 100644
--- a/baseconfig/powerpc/CONFIG_HCALL_STATS
+++ b/configs/base-generic/powerpc/CONFIG_HCALL_STATS
diff --git a/baseconfig/powerpc/CONFIG_HIBERNATION b/configs/base-generic/powerpc/CONFIG_HIBERNATION
index 6fed85f47..6fed85f47 100644
--- a/baseconfig/powerpc/CONFIG_HIBERNATION
+++ b/configs/base-generic/powerpc/CONFIG_HIBERNATION
diff --git a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_POWERNV b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_POWERNV
index d304d6073..d304d6073 100644
--- a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_RPA b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_RPA
index 531c06b02..531c06b02 100644
--- a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_RPA
+++ b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_RPA
diff --git a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_RPA_DLPAR b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_RPA_DLPAR
index 5cff41d05..5cff41d05 100644
--- a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_RPA_DLPAR
+++ b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_RPA_DLPAR
diff --git a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_SHPC
index baec74561..baec74561 100644
--- a/baseconfig/powerpc/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/powerpc/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/powerpc/CONFIG_HVCS b/configs/base-generic/powerpc/CONFIG_HVCS
index 75e5cce53..75e5cce53 100644
--- a/baseconfig/powerpc/CONFIG_HVCS
+++ b/configs/base-generic/powerpc/CONFIG_HVCS
diff --git a/baseconfig/powerpc/CONFIG_HVC_CONSOLE b/configs/base-generic/powerpc/CONFIG_HVC_CONSOLE
index 0aebaebce..0aebaebce 100644
--- a/baseconfig/powerpc/CONFIG_HVC_CONSOLE
+++ b/configs/base-generic/powerpc/CONFIG_HVC_CONSOLE
diff --git a/baseconfig/powerpc/CONFIG_HVC_OLD_HVSI b/configs/base-generic/powerpc/CONFIG_HVC_OLD_HVSI
index b881a2816..b881a2816 100644
--- a/baseconfig/powerpc/CONFIG_HVC_OLD_HVSI
+++ b/configs/base-generic/powerpc/CONFIG_HVC_OLD_HVSI
diff --git a/baseconfig/powerpc/CONFIG_HVC_OPAL b/configs/base-generic/powerpc/CONFIG_HVC_OPAL
index 5494ac36d..5494ac36d 100644
--- a/baseconfig/powerpc/CONFIG_HVC_OPAL
+++ b/configs/base-generic/powerpc/CONFIG_HVC_OPAL
diff --git a/baseconfig/powerpc/CONFIG_HVC_RTAS b/configs/base-generic/powerpc/CONFIG_HVC_RTAS
index 6f19aa3ab..6f19aa3ab 100644
--- a/baseconfig/powerpc/CONFIG_HVC_RTAS
+++ b/configs/base-generic/powerpc/CONFIG_HVC_RTAS
diff --git a/baseconfig/powerpc/CONFIG_HVC_UDBG b/configs/base-generic/powerpc/CONFIG_HVC_UDBG
index 5e2d5eda0..5e2d5eda0 100644
--- a/baseconfig/powerpc/CONFIG_HVC_UDBG
+++ b/configs/base-generic/powerpc/CONFIG_HVC_UDBG
diff --git a/baseconfig/powerpc/CONFIG_HV_PERF_CTRS b/configs/base-generic/powerpc/CONFIG_HV_PERF_CTRS
index 1ecf8734e..1ecf8734e 100644
--- a/baseconfig/powerpc/CONFIG_HV_PERF_CTRS
+++ b/configs/base-generic/powerpc/CONFIG_HV_PERF_CTRS
diff --git a/baseconfig/powerpc/CONFIG_HW_RANDOM_POWERNV b/configs/base-generic/powerpc/CONFIG_HW_RANDOM_POWERNV
index 7edb0baa0..7edb0baa0 100644
--- a/baseconfig/powerpc/CONFIG_HW_RANDOM_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_HW_RANDOM_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_HW_RANDOM_PSERIES b/configs/base-generic/powerpc/CONFIG_HW_RANDOM_PSERIES
index d92fbf1a5..d92fbf1a5 100644
--- a/baseconfig/powerpc/CONFIG_HW_RANDOM_PSERIES
+++ b/configs/base-generic/powerpc/CONFIG_HW_RANDOM_PSERIES
diff --git a/baseconfig/powerpc/CONFIG_HZ b/configs/base-generic/powerpc/CONFIG_HZ
index bfc405e03..bfc405e03 100644
--- a/baseconfig/powerpc/CONFIG_HZ
+++ b/configs/base-generic/powerpc/CONFIG_HZ
diff --git a/baseconfig/powerpc/CONFIG_HZ_100 b/configs/base-generic/powerpc/CONFIG_HZ_100
index 11bd2afa2..11bd2afa2 100644
--- a/baseconfig/powerpc/CONFIG_HZ_100
+++ b/configs/base-generic/powerpc/CONFIG_HZ_100
diff --git a/baseconfig/powerpc/CONFIG_HZ_1000 b/configs/base-generic/powerpc/CONFIG_HZ_1000
index c211724d6..c211724d6 100644
--- a/baseconfig/powerpc/CONFIG_HZ_1000
+++ b/configs/base-generic/powerpc/CONFIG_HZ_1000
diff --git a/baseconfig/powerpc/CONFIG_I2C_CPM b/configs/base-generic/powerpc/CONFIG_I2C_CPM
index db65ea08a..db65ea08a 100644
--- a/baseconfig/powerpc/CONFIG_I2C_CPM
+++ b/configs/base-generic/powerpc/CONFIG_I2C_CPM
diff --git a/baseconfig/powerpc/CONFIG_I2C_MPC b/configs/base-generic/powerpc/CONFIG_I2C_MPC
index 23317bb80..23317bb80 100644
--- a/baseconfig/powerpc/CONFIG_I2C_MPC
+++ b/configs/base-generic/powerpc/CONFIG_I2C_MPC
diff --git a/baseconfig/powerpc/CONFIG_I2C_OPAL b/configs/base-generic/powerpc/CONFIG_I2C_OPAL
index c9e888e5c..c9e888e5c 100644
--- a/baseconfig/powerpc/CONFIG_I2C_OPAL
+++ b/configs/base-generic/powerpc/CONFIG_I2C_OPAL
diff --git a/baseconfig/powerpc/CONFIG_IBMEBUS b/configs/base-generic/powerpc/CONFIG_IBMEBUS
index 295010d53..295010d53 100644
--- a/baseconfig/powerpc/CONFIG_IBMEBUS
+++ b/configs/base-generic/powerpc/CONFIG_IBMEBUS
diff --git a/baseconfig/powerpc/CONFIG_IBMVETH b/configs/base-generic/powerpc/CONFIG_IBMVETH
index d1ce2bd47..d1ce2bd47 100644
--- a/baseconfig/powerpc/CONFIG_IBMVETH
+++ b/configs/base-generic/powerpc/CONFIG_IBMVETH
diff --git a/baseconfig/powerpc/CONFIG_IBMVNIC b/configs/base-generic/powerpc/CONFIG_IBMVNIC
index 9c0dd395c..9c0dd395c 100644
--- a/baseconfig/powerpc/CONFIG_IBMVNIC
+++ b/configs/base-generic/powerpc/CONFIG_IBMVNIC
diff --git a/baseconfig/powerpc/CONFIG_IBM_BSR b/configs/base-generic/powerpc/CONFIG_IBM_BSR
index 7cec732e1..7cec732e1 100644
--- a/baseconfig/powerpc/CONFIG_IBM_BSR
+++ b/configs/base-generic/powerpc/CONFIG_IBM_BSR
diff --git a/baseconfig/powerpc/CONFIG_IBM_EMAC b/configs/base-generic/powerpc/CONFIG_IBM_EMAC
index 74d2d166c..74d2d166c 100644
--- a/baseconfig/powerpc/CONFIG_IBM_EMAC
+++ b/configs/base-generic/powerpc/CONFIG_IBM_EMAC
diff --git a/baseconfig/powerpc/CONFIG_IDEPCI_PCIBUS_ORDER b/configs/base-generic/powerpc/CONFIG_IDEPCI_PCIBUS_ORDER
index 455150a3f..455150a3f 100644
--- a/baseconfig/powerpc/CONFIG_IDEPCI_PCIBUS_ORDER
+++ b/configs/base-generic/powerpc/CONFIG_IDEPCI_PCIBUS_ORDER
diff --git a/baseconfig/powerpc/CONFIG_IMA b/configs/base-generic/powerpc/CONFIG_IMA
index 83a06345b..83a06345b 100644
--- a/baseconfig/powerpc/CONFIG_IMA
+++ b/configs/base-generic/powerpc/CONFIG_IMA
diff --git a/baseconfig/powerpc/CONFIG_INPUT_GP2A b/configs/base-generic/powerpc/CONFIG_INPUT_GP2A
index 221036349..221036349 100644
--- a/baseconfig/powerpc/CONFIG_INPUT_GP2A
+++ b/configs/base-generic/powerpc/CONFIG_INPUT_GP2A
diff --git a/baseconfig/powerpc/CONFIG_INPUT_GPIO_TILT_POLLED b/configs/base-generic/powerpc/CONFIG_INPUT_GPIO_TILT_POLLED
index 8b1ef8c62..8b1ef8c62 100644
--- a/baseconfig/powerpc/CONFIG_INPUT_GPIO_TILT_POLLED
+++ b/configs/base-generic/powerpc/CONFIG_INPUT_GPIO_TILT_POLLED
diff --git a/baseconfig/powerpc/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/powerpc/CONFIG_INPUT_MATRIXKMAP
index 0f1b2f168..0f1b2f168 100644
--- a/baseconfig/powerpc/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/powerpc/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/powerpc/CONFIG_INPUT_PCSPKR b/configs/base-generic/powerpc/CONFIG_INPUT_PCSPKR
index 296560896..296560896 100644
--- a/baseconfig/powerpc/CONFIG_INPUT_PCSPKR
+++ b/configs/base-generic/powerpc/CONFIG_INPUT_PCSPKR
diff --git a/baseconfig/powerpc/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/powerpc/CONFIG_INPUT_PWM_BEEPER
index 59fdb225d..59fdb225d 100644
--- a/baseconfig/powerpc/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/powerpc/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/powerpc/CONFIG_IO_EVENT_IRQ b/configs/base-generic/powerpc/CONFIG_IO_EVENT_IRQ
index b63a5a9de..b63a5a9de 100644
--- a/baseconfig/powerpc/CONFIG_IO_EVENT_IRQ
+++ b/configs/base-generic/powerpc/CONFIG_IO_EVENT_IRQ
diff --git a/baseconfig/powerpc/CONFIG_IPMI_POWERNV b/configs/base-generic/powerpc/CONFIG_IPMI_POWERNV
index c96af1a18..c96af1a18 100644
--- a/baseconfig/powerpc/CONFIG_IPMI_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_IPMI_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_IRQSTACKS b/configs/base-generic/powerpc/CONFIG_IRQSTACKS
index bc7c8f2f1..bc7c8f2f1 100644
--- a/baseconfig/powerpc/CONFIG_IRQSTACKS
+++ b/configs/base-generic/powerpc/CONFIG_IRQSTACKS
diff --git a/baseconfig/powerpc/CONFIG_IRQ_ALL_CPUS b/configs/base-generic/powerpc/CONFIG_IRQ_ALL_CPUS
index 58e766b18..58e766b18 100644
--- a/baseconfig/powerpc/CONFIG_IRQ_ALL_CPUS
+++ b/configs/base-generic/powerpc/CONFIG_IRQ_ALL_CPUS
diff --git a/baseconfig/powerpc/CONFIG_IRQ_DOMAIN_DEBUG b/configs/base-generic/powerpc/CONFIG_IRQ_DOMAIN_DEBUG
index fadfd90f4..fadfd90f4 100644
--- a/baseconfig/powerpc/CONFIG_IRQ_DOMAIN_DEBUG
+++ b/configs/base-generic/powerpc/CONFIG_IRQ_DOMAIN_DEBUG
diff --git a/baseconfig/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECKS b/configs/base-generic/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECKS
index 1fe016d04..1fe016d04 100644
--- a/baseconfig/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECKS
+++ b/configs/base-generic/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECKS
diff --git a/baseconfig/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG b/configs/base-generic/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
index 8a0597ffc..8a0597ffc 100644
--- a/baseconfig/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
+++ b/configs/base-generic/powerpc/CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
diff --git a/baseconfig/powerpc/CONFIG_KEYBOARD_MATRIX b/configs/base-generic/powerpc/CONFIG_KEYBOARD_MATRIX
index 47a15a463..47a15a463 100644
--- a/baseconfig/powerpc/CONFIG_KEYBOARD_MATRIX
+++ b/configs/base-generic/powerpc/CONFIG_KEYBOARD_MATRIX
diff --git a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64 b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64
index e9e9d634d..e9e9d634d 100644
--- a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64
+++ b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64
diff --git a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64_HV b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64_HV
index 93770679a..93770679a 100644
--- a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64_HV
+++ b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64_HV
diff --git a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64_PR b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64_PR
index a954aa659..a954aa659 100644
--- a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_64_PR
+++ b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_64_PR
diff --git a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_HV_EXIT_TIMING b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_HV_EXIT_TIMING
index ada2fe9d8..ada2fe9d8 100644
--- a/baseconfig/powerpc/CONFIG_KVM_BOOK3S_HV_EXIT_TIMING
+++ b/configs/base-generic/powerpc/CONFIG_KVM_BOOK3S_HV_EXIT_TIMING
diff --git a/baseconfig/powerpc/CONFIG_KVM_EXIT_TIMING b/configs/base-generic/powerpc/CONFIG_KVM_EXIT_TIMING
index e49311c58..e49311c58 100644
--- a/baseconfig/powerpc/CONFIG_KVM_EXIT_TIMING
+++ b/configs/base-generic/powerpc/CONFIG_KVM_EXIT_TIMING
diff --git a/baseconfig/powerpc/CONFIG_KVM_GUEST b/configs/base-generic/powerpc/CONFIG_KVM_GUEST
index 133da0424..133da0424 100644
--- a/baseconfig/powerpc/CONFIG_KVM_GUEST
+++ b/configs/base-generic/powerpc/CONFIG_KVM_GUEST
diff --git a/baseconfig/powerpc/CONFIG_KVM_XICS b/configs/base-generic/powerpc/CONFIG_KVM_XICS
index e71b3ebd7..e71b3ebd7 100644
--- a/baseconfig/powerpc/CONFIG_KVM_XICS
+++ b/configs/base-generic/powerpc/CONFIG_KVM_XICS
diff --git a/baseconfig/powerpc/CONFIG_LANCE b/configs/base-generic/powerpc/CONFIG_LANCE
index 77e1508fe..77e1508fe 100644
--- a/baseconfig/powerpc/CONFIG_LANCE
+++ b/configs/base-generic/powerpc/CONFIG_LANCE
diff --git a/baseconfig/powerpc/CONFIG_LEDS_POWERNV b/configs/base-generic/powerpc/CONFIG_LEDS_POWERNV
index 2ccb2b18e..2ccb2b18e 100644
--- a/baseconfig/powerpc/CONFIG_LEDS_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_LEDS_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_HEARTBEAT b/configs/base-generic/powerpc/CONFIG_LEDS_TRIGGER_HEARTBEAT
index f1aa15726..f1aa15726 100644
--- a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_HEARTBEAT
+++ b/configs/base-generic/powerpc/CONFIG_LEDS_TRIGGER_HEARTBEAT
diff --git a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_TIMER b/configs/base-generic/powerpc/CONFIG_LEDS_TRIGGER_TIMER
index b274bc418..b274bc418 100644
--- a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_TIMER
+++ b/configs/base-generic/powerpc/CONFIG_LEDS_TRIGGER_TIMER
diff --git a/baseconfig/powerpc/CONFIG_LPARCFG b/configs/base-generic/powerpc/CONFIG_LPARCFG
index c2a0c5bbf..c2a0c5bbf 100644
--- a/baseconfig/powerpc/CONFIG_LPARCFG
+++ b/configs/base-generic/powerpc/CONFIG_LPARCFG
diff --git a/baseconfig/powerpc/CONFIG_MACINTOSH_DRIVERS b/configs/base-generic/powerpc/CONFIG_MACINTOSH_DRIVERS
index 234d40f8e..234d40f8e 100644
--- a/baseconfig/powerpc/CONFIG_MACINTOSH_DRIVERS
+++ b/configs/base-generic/powerpc/CONFIG_MACINTOSH_DRIVERS
diff --git a/baseconfig/powerpc/CONFIG_MATH_EMULATION b/configs/base-generic/powerpc/CONFIG_MATH_EMULATION
index be33a6a76..be33a6a76 100644
--- a/baseconfig/powerpc/CONFIG_MATH_EMULATION
+++ b/configs/base-generic/powerpc/CONFIG_MATH_EMULATION
diff --git a/baseconfig/powerpc/CONFIG_MCU_MPC8349EMITX b/configs/base-generic/powerpc/CONFIG_MCU_MPC8349EMITX
index 274d37de3..274d37de3 100644
--- a/baseconfig/powerpc/CONFIG_MCU_MPC8349EMITX
+++ b/configs/base-generic/powerpc/CONFIG_MCU_MPC8349EMITX
diff --git a/baseconfig/powerpc/CONFIG_MDIO_BUS_MUX_GPIO b/configs/base-generic/powerpc/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..27b93466f 100644
--- a/baseconfig/powerpc/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/configs/base-generic/powerpc/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/powerpc/CONFIG_MDIO_BUS_MUX_MMIOREG b/configs/base-generic/powerpc/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..4d738fd98 100644
--- a/baseconfig/powerpc/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/configs/base-generic/powerpc/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/powerpc/CONFIG_MDIO_GPIO b/configs/base-generic/powerpc/CONFIG_MDIO_GPIO
index a317fa125..a317fa125 100644
--- a/baseconfig/powerpc/CONFIG_MDIO_GPIO
+++ b/configs/base-generic/powerpc/CONFIG_MDIO_GPIO
diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTPLUG
index ff75139e0..ff75139e0 100644
--- a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG
+++ b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTPLUG
diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
index e7fe50c39..e7fe50c39 100644
--- a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTREMOVE b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTREMOVE
index 362150e69..362150e69 100644
--- a/baseconfig/powerpc/CONFIG_MEMORY_HOTREMOVE
+++ b/configs/base-generic/powerpc/CONFIG_MEMORY_HOTREMOVE
diff --git a/baseconfig/powerpc/CONFIG_MEM_SOFT_DIRTY b/configs/base-generic/powerpc/CONFIG_MEM_SOFT_DIRTY
index 356f2edd8..356f2edd8 100644
--- a/baseconfig/powerpc/CONFIG_MEM_SOFT_DIRTY
+++ b/configs/base-generic/powerpc/CONFIG_MEM_SOFT_DIRTY
diff --git a/baseconfig/powerpc/CONFIG_MFD_AAT2870_CORE b/configs/base-generic/powerpc/CONFIG_MFD_AAT2870_CORE
index 9d4cf9056..9d4cf9056 100644
--- a/baseconfig/powerpc/CONFIG_MFD_AAT2870_CORE
+++ b/configs/base-generic/powerpc/CONFIG_MFD_AAT2870_CORE
diff --git a/baseconfig/powerpc/CONFIG_MGCOGE b/configs/base-generic/powerpc/CONFIG_MGCOGE
index 4c8eeb3df..4c8eeb3df 100644
--- a/baseconfig/powerpc/CONFIG_MGCOGE
+++ b/configs/base-generic/powerpc/CONFIG_MGCOGE
diff --git a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF_HLWD b/configs/base-generic/powerpc/CONFIG_MMC_SDHCI_OF_HLWD
index 89cf8b5b0..89cf8b5b0 100644
--- a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF_HLWD
+++ b/configs/base-generic/powerpc/CONFIG_MMC_SDHCI_OF_HLWD
diff --git a/baseconfig/powerpc/CONFIG_MPC5121_ADS b/configs/base-generic/powerpc/CONFIG_MPC5121_ADS
index 05abaf343..05abaf343 100644
--- a/baseconfig/powerpc/CONFIG_MPC5121_ADS
+++ b/configs/base-generic/powerpc/CONFIG_MPC5121_ADS
diff --git a/baseconfig/powerpc/CONFIG_MPIC_MSGR b/configs/base-generic/powerpc/CONFIG_MPIC_MSGR
index c2f28112f..c2f28112f 100644
--- a/baseconfig/powerpc/CONFIG_MPIC_MSGR
+++ b/configs/base-generic/powerpc/CONFIG_MPIC_MSGR
diff --git a/baseconfig/powerpc/CONFIG_MSI_BITMAP_SELFTEST b/configs/base-generic/powerpc/CONFIG_MSI_BITMAP_SELFTEST
index d90fac952..d90fac952 100644
--- a/baseconfig/powerpc/CONFIG_MSI_BITMAP_SELFTEST
+++ b/configs/base-generic/powerpc/CONFIG_MSI_BITMAP_SELFTEST
diff --git a/baseconfig/powerpc/CONFIG_MTD_NAND_FSL_ELBC b/configs/base-generic/powerpc/CONFIG_MTD_NAND_FSL_ELBC
index 9dd5cc778..9dd5cc778 100644
--- a/baseconfig/powerpc/CONFIG_MTD_NAND_FSL_ELBC
+++ b/configs/base-generic/powerpc/CONFIG_MTD_NAND_FSL_ELBC
diff --git a/baseconfig/powerpc/CONFIG_MTD_OF_PARTS b/configs/base-generic/powerpc/CONFIG_MTD_OF_PARTS
index bddcc3b5e..bddcc3b5e 100644
--- a/baseconfig/powerpc/CONFIG_MTD_OF_PARTS
+++ b/configs/base-generic/powerpc/CONFIG_MTD_OF_PARTS
diff --git a/baseconfig/powerpc/CONFIG_MTD_POWERNV_FLASH b/configs/base-generic/powerpc/CONFIG_MTD_POWERNV_FLASH
index 61c58061d..61c58061d 100644
--- a/baseconfig/powerpc/CONFIG_MTD_POWERNV_FLASH
+++ b/configs/base-generic/powerpc/CONFIG_MTD_POWERNV_FLASH
diff --git a/baseconfig/powerpc/CONFIG_NET_VENDOR_IBM b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_IBM
index 658675c8b..658675c8b 100644
--- a/baseconfig/powerpc/CONFIG_NET_VENDOR_IBM
+++ b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_IBM
diff --git a/baseconfig/powerpc/CONFIG_NET_VENDOR_PASEMI b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_PASEMI
index 2ae8bd67f..2ae8bd67f 100644
--- a/baseconfig/powerpc/CONFIG_NET_VENDOR_PASEMI
+++ b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_PASEMI
diff --git a/baseconfig/powerpc/CONFIG_NET_VENDOR_TOSHIBA b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_TOSHIBA
index bb39f71b4..bb39f71b4 100644
--- a/baseconfig/powerpc/CONFIG_NET_VENDOR_TOSHIBA
+++ b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_TOSHIBA
diff --git a/baseconfig/powerpc/CONFIG_NET_VENDOR_XILINX b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_XILINX
index 5e7257181..5e7257181 100644
--- a/baseconfig/powerpc/CONFIG_NET_VENDOR_XILINX
+++ b/configs/base-generic/powerpc/CONFIG_NET_VENDOR_XILINX
diff --git a/baseconfig/powerpc/CONFIG_NI65 b/configs/base-generic/powerpc/CONFIG_NI65
index 39d7b8510..39d7b8510 100644
--- a/baseconfig/powerpc/CONFIG_NI65
+++ b/configs/base-generic/powerpc/CONFIG_NI65
diff --git a/baseconfig/powerpc/CONFIG_NR_CPUS b/configs/base-generic/powerpc/CONFIG_NR_CPUS
index 27d187f4d..27d187f4d 100644
--- a/baseconfig/powerpc/CONFIG_NR_CPUS
+++ b/configs/base-generic/powerpc/CONFIG_NR_CPUS
diff --git a/baseconfig/powerpc/CONFIG_NR_IRQS b/configs/base-generic/powerpc/CONFIG_NR_IRQS
index d58c7e207..d58c7e207 100644
--- a/baseconfig/powerpc/CONFIG_NR_IRQS
+++ b/configs/base-generic/powerpc/CONFIG_NR_IRQS
diff --git a/baseconfig/powerpc/CONFIG_NUMA b/configs/base-generic/powerpc/CONFIG_NUMA
index e480f0c04..e480f0c04 100644
--- a/baseconfig/powerpc/CONFIG_NUMA
+++ b/configs/base-generic/powerpc/CONFIG_NUMA
diff --git a/baseconfig/powerpc/CONFIG_NUMA_BALANCING b/configs/base-generic/powerpc/CONFIG_NUMA_BALANCING
index 9de89d51d..9de89d51d 100644
--- a/baseconfig/powerpc/CONFIG_NUMA_BALANCING
+++ b/configs/base-generic/powerpc/CONFIG_NUMA_BALANCING
diff --git a/baseconfig/powerpc/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/configs/base-generic/powerpc/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 5f7402180..5f7402180 100644
--- a/baseconfig/powerpc/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/configs/base-generic/powerpc/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
diff --git a/baseconfig/powerpc/CONFIG_OF_OVERLAY b/configs/base-generic/powerpc/CONFIG_OF_OVERLAY
index d87a96c0f..d87a96c0f 100644
--- a/baseconfig/powerpc/CONFIG_OF_OVERLAY
+++ b/configs/base-generic/powerpc/CONFIG_OF_OVERLAY
diff --git a/baseconfig/powerpc/CONFIG_OF_UNITTEST b/configs/base-generic/powerpc/CONFIG_OF_UNITTEST
index f9773f73d..f9773f73d 100644
--- a/baseconfig/powerpc/CONFIG_OF_UNITTEST
+++ b/configs/base-generic/powerpc/CONFIG_OF_UNITTEST
diff --git a/baseconfig/powerpc/CONFIG_OPAL_PRD b/configs/base-generic/powerpc/CONFIG_OPAL_PRD
index 4e2c14e2d..4e2c14e2d 100644
--- a/baseconfig/powerpc/CONFIG_OPAL_PRD
+++ b/configs/base-generic/powerpc/CONFIG_OPAL_PRD
diff --git a/baseconfig/powerpc/CONFIG_PATA_PLATFORM b/configs/base-generic/powerpc/CONFIG_PATA_PLATFORM
index e385815ec..e385815ec 100644
--- a/baseconfig/powerpc/CONFIG_PATA_PLATFORM
+++ b/configs/base-generic/powerpc/CONFIG_PATA_PLATFORM
diff --git a/baseconfig/powerpc/CONFIG_PCIEPORTBUS b/configs/base-generic/powerpc/CONFIG_PCIEPORTBUS
index 5a533919c..5a533919c 100644
--- a/baseconfig/powerpc/CONFIG_PCIEPORTBUS
+++ b/configs/base-generic/powerpc/CONFIG_PCIEPORTBUS
diff --git a/baseconfig/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN b/configs/base-generic/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN
index 2d1ad5bb1..2d1ad5bb1 100644
--- a/baseconfig/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN
+++ b/configs/base-generic/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN
diff --git a/baseconfig/powerpc/CONFIG_PMIC_ADP5520 b/configs/base-generic/powerpc/CONFIG_PMIC_ADP5520
index 8664194c8..8664194c8 100644
--- a/baseconfig/powerpc/CONFIG_PMIC_ADP5520
+++ b/configs/base-generic/powerpc/CONFIG_PMIC_ADP5520
diff --git a/baseconfig/powerpc/CONFIG_PMIC_DA903X b/configs/base-generic/powerpc/CONFIG_PMIC_DA903X
index 875cd2580..875cd2580 100644
--- a/baseconfig/powerpc/CONFIG_PMIC_DA903X
+++ b/configs/base-generic/powerpc/CONFIG_PMIC_DA903X
diff --git a/baseconfig/powerpc/CONFIG_POWERNV_CPUFREQ b/configs/base-generic/powerpc/CONFIG_POWERNV_CPUFREQ
index f6db5b5be..f6db5b5be 100644
--- a/baseconfig/powerpc/CONFIG_POWERNV_CPUFREQ
+++ b/configs/base-generic/powerpc/CONFIG_POWERNV_CPUFREQ
diff --git a/baseconfig/powerpc/CONFIG_POWERNV_CPUIDLE b/configs/base-generic/powerpc/CONFIG_POWERNV_CPUIDLE
index 088ffc994..088ffc994 100644
--- a/baseconfig/powerpc/CONFIG_POWERNV_CPUIDLE
+++ b/configs/base-generic/powerpc/CONFIG_POWERNV_CPUIDLE
diff --git a/baseconfig/powerpc/CONFIG_POWERNV_OP_PANEL b/configs/base-generic/powerpc/CONFIG_POWERNV_OP_PANEL
index 8c981b211..8c981b211 100644
--- a/baseconfig/powerpc/CONFIG_POWERNV_OP_PANEL
+++ b/configs/base-generic/powerpc/CONFIG_POWERNV_OP_PANEL
diff --git a/baseconfig/powerpc/CONFIG_POWER_RESET_GPIO b/configs/base-generic/powerpc/CONFIG_POWER_RESET_GPIO
index dac784d6c..dac784d6c 100644
--- a/baseconfig/powerpc/CONFIG_POWER_RESET_GPIO
+++ b/configs/base-generic/powerpc/CONFIG_POWER_RESET_GPIO
diff --git a/baseconfig/powerpc/CONFIG_POWER_RESET_GPIO_RESTART b/configs/base-generic/powerpc/CONFIG_POWER_RESET_GPIO_RESTART
index cb0a3228b..cb0a3228b 100644
--- a/baseconfig/powerpc/CONFIG_POWER_RESET_GPIO_RESTART
+++ b/configs/base-generic/powerpc/CONFIG_POWER_RESET_GPIO_RESTART
diff --git a/baseconfig/powerpc/CONFIG_PPC b/configs/base-generic/powerpc/CONFIG_PPC
index 05de7bca0..05de7bca0 100644
--- a/baseconfig/powerpc/CONFIG_PPC
+++ b/configs/base-generic/powerpc/CONFIG_PPC
diff --git a/baseconfig/powerpc/CONFIG_PPC64 b/configs/base-generic/powerpc/CONFIG_PPC64
index 0fe640692..0fe640692 100644
--- a/baseconfig/powerpc/CONFIG_PPC64
+++ b/configs/base-generic/powerpc/CONFIG_PPC64
diff --git a/baseconfig/powerpc/CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE b/configs/base-generic/powerpc/CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE
index b3ed5ef32..b3ed5ef32 100644
--- a/baseconfig/powerpc/CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE
+++ b/configs/base-generic/powerpc/CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE
diff --git a/baseconfig/powerpc/CONFIG_PPC_64K_PAGES b/configs/base-generic/powerpc/CONFIG_PPC_64K_PAGES
index 9ddc318ca..9ddc318ca 100644
--- a/baseconfig/powerpc/CONFIG_PPC_64K_PAGES
+++ b/configs/base-generic/powerpc/CONFIG_PPC_64K_PAGES
diff --git a/baseconfig/powerpc/CONFIG_PPC_82xx b/configs/base-generic/powerpc/CONFIG_PPC_82xx
index bc2fb18c8..bc2fb18c8 100644
--- a/baseconfig/powerpc/CONFIG_PPC_82xx
+++ b/configs/base-generic/powerpc/CONFIG_PPC_82xx
diff --git a/baseconfig/powerpc/CONFIG_PPC_83xx b/configs/base-generic/powerpc/CONFIG_PPC_83xx
index 55b6aa7f4..55b6aa7f4 100644
--- a/baseconfig/powerpc/CONFIG_PPC_83xx
+++ b/configs/base-generic/powerpc/CONFIG_PPC_83xx
diff --git a/baseconfig/powerpc/CONFIG_PPC_86xx b/configs/base-generic/powerpc/CONFIG_PPC_86xx
index b3c12894b..b3c12894b 100644
--- a/baseconfig/powerpc/CONFIG_PPC_86xx
+++ b/configs/base-generic/powerpc/CONFIG_PPC_86xx
diff --git a/baseconfig/powerpc/CONFIG_PPC_CELL b/configs/base-generic/powerpc/CONFIG_PPC_CELL
index efbebda5f..efbebda5f 100644
--- a/baseconfig/powerpc/CONFIG_PPC_CELL
+++ b/configs/base-generic/powerpc/CONFIG_PPC_CELL
diff --git a/baseconfig/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN b/configs/base-generic/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN
index 46354e6a9..46354e6a9 100644
--- a/baseconfig/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN
+++ b/configs/base-generic/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN
diff --git a/baseconfig/powerpc/CONFIG_PPC_DENORMALISATION b/configs/base-generic/powerpc/CONFIG_PPC_DENORMALISATION
index 8c5b0a3e9..8c5b0a3e9 100644
--- a/baseconfig/powerpc/CONFIG_PPC_DENORMALISATION
+++ b/configs/base-generic/powerpc/CONFIG_PPC_DENORMALISATION
diff --git a/baseconfig/powerpc/CONFIG_PPC_DISABLE_WERROR b/configs/base-generic/powerpc/CONFIG_PPC_DISABLE_WERROR
index 6ea12a124..6ea12a124 100644
--- a/baseconfig/powerpc/CONFIG_PPC_DISABLE_WERROR
+++ b/configs/base-generic/powerpc/CONFIG_PPC_DISABLE_WERROR
diff --git a/baseconfig/powerpc/CONFIG_PPC_DT_CPU_FTRS b/configs/base-generic/powerpc/CONFIG_PPC_DT_CPU_FTRS
index aa61b1ff3..aa61b1ff3 100644
--- a/baseconfig/powerpc/CONFIG_PPC_DT_CPU_FTRS
+++ b/configs/base-generic/powerpc/CONFIG_PPC_DT_CPU_FTRS
diff --git a/baseconfig/powerpc/CONFIG_PPC_EARLY_DEBUG b/configs/base-generic/powerpc/CONFIG_PPC_EARLY_DEBUG
index 27e9ef7db..27e9ef7db 100644
--- a/baseconfig/powerpc/CONFIG_PPC_EARLY_DEBUG
+++ b/configs/base-generic/powerpc/CONFIG_PPC_EARLY_DEBUG
diff --git a/baseconfig/powerpc/CONFIG_PPC_EMULATED_STATS b/configs/base-generic/powerpc/CONFIG_PPC_EMULATED_STATS
index 713065187..713065187 100644
--- a/baseconfig/powerpc/CONFIG_PPC_EMULATED_STATS
+++ b/configs/base-generic/powerpc/CONFIG_PPC_EMULATED_STATS
diff --git a/baseconfig/powerpc/CONFIG_PPC_EPAPR_HV_BYTECHAN b/configs/base-generic/powerpc/CONFIG_PPC_EPAPR_HV_BYTECHAN
index bfb083792..bfb083792 100644
--- a/baseconfig/powerpc/CONFIG_PPC_EPAPR_HV_BYTECHAN
+++ b/configs/base-generic/powerpc/CONFIG_PPC_EPAPR_HV_BYTECHAN
diff --git a/baseconfig/powerpc/CONFIG_PPC_IBM_CELL_BLADE b/configs/base-generic/powerpc/CONFIG_PPC_IBM_CELL_BLADE
index 52fb992d1..52fb992d1 100644
--- a/baseconfig/powerpc/CONFIG_PPC_IBM_CELL_BLADE
+++ b/configs/base-generic/powerpc/CONFIG_PPC_IBM_CELL_BLADE
diff --git a/baseconfig/powerpc/CONFIG_PPC_ICSWX b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX
index 9e2c7737e..9e2c7737e 100644
--- a/baseconfig/powerpc/CONFIG_PPC_ICSWX
+++ b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX
diff --git a/baseconfig/powerpc/CONFIG_PPC_ICSWX_PID b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX_PID
index 33f8f2c0c..33f8f2c0c 100644
--- a/baseconfig/powerpc/CONFIG_PPC_ICSWX_PID
+++ b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX_PID
diff --git a/baseconfig/powerpc/CONFIG_PPC_ICSWX_USE_SIGILL b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX_USE_SIGILL
index 844fd8b9d..844fd8b9d 100644
--- a/baseconfig/powerpc/CONFIG_PPC_ICSWX_USE_SIGILL
+++ b/configs/base-generic/powerpc/CONFIG_PPC_ICSWX_USE_SIGILL
diff --git a/baseconfig/powerpc/CONFIG_PPC_MAPLE b/configs/base-generic/powerpc/CONFIG_PPC_MAPLE
index 9c1a87606..9c1a87606 100644
--- a/baseconfig/powerpc/CONFIG_PPC_MAPLE
+++ b/configs/base-generic/powerpc/CONFIG_PPC_MAPLE
diff --git a/baseconfig/powerpc/CONFIG_PPC_MEMTRACE b/configs/base-generic/powerpc/CONFIG_PPC_MEMTRACE
index c783714d8..c783714d8 100644
--- a/baseconfig/powerpc/CONFIG_PPC_MEMTRACE
+++ b/configs/base-generic/powerpc/CONFIG_PPC_MEMTRACE
diff --git a/baseconfig/powerpc/CONFIG_PPC_MPC5200_LPBFIFO b/configs/base-generic/powerpc/CONFIG_PPC_MPC5200_LPBFIFO
index 9ead74995..9ead74995 100644
--- a/baseconfig/powerpc/CONFIG_PPC_MPC5200_LPBFIFO
+++ b/configs/base-generic/powerpc/CONFIG_PPC_MPC5200_LPBFIFO
diff --git a/baseconfig/powerpc/CONFIG_PPC_OF_BOOT_TRAMPOLINE b/configs/base-generic/powerpc/CONFIG_PPC_OF_BOOT_TRAMPOLINE
index 7195e65f4..7195e65f4 100644
--- a/baseconfig/powerpc/CONFIG_PPC_OF_BOOT_TRAMPOLINE
+++ b/configs/base-generic/powerpc/CONFIG_PPC_OF_BOOT_TRAMPOLINE
diff --git a/baseconfig/powerpc/CONFIG_PPC_PASEMI b/configs/base-generic/powerpc/CONFIG_PPC_PASEMI
index a2f1c9da8..a2f1c9da8 100644
--- a/baseconfig/powerpc/CONFIG_PPC_PASEMI
+++ b/configs/base-generic/powerpc/CONFIG_PPC_PASEMI
diff --git a/baseconfig/powerpc/CONFIG_PPC_PMAC b/configs/base-generic/powerpc/CONFIG_PPC_PMAC
index 1bb983f49..1bb983f49 100644
--- a/baseconfig/powerpc/CONFIG_PPC_PMAC
+++ b/configs/base-generic/powerpc/CONFIG_PPC_PMAC
diff --git a/baseconfig/powerpc/CONFIG_PPC_PMAC64 b/configs/base-generic/powerpc/CONFIG_PPC_PMAC64
index 68f980fcf..68f980fcf 100644
--- a/baseconfig/powerpc/CONFIG_PPC_PMAC64
+++ b/configs/base-generic/powerpc/CONFIG_PPC_PMAC64
diff --git a/baseconfig/powerpc/CONFIG_PPC_POWERNV b/configs/base-generic/powerpc/CONFIG_PPC_POWERNV
index 7c824c55f..7c824c55f 100644
--- a/baseconfig/powerpc/CONFIG_PPC_POWERNV
+++ b/configs/base-generic/powerpc/CONFIG_PPC_POWERNV
diff --git a/baseconfig/powerpc/CONFIG_PPC_PS3 b/configs/base-generic/powerpc/CONFIG_PPC_PS3
index c60040fde..c60040fde 100644
--- a/baseconfig/powerpc/CONFIG_PPC_PS3
+++ b/configs/base-generic/powerpc/CONFIG_PPC_PS3
diff --git a/baseconfig/powerpc/CONFIG_PPC_PSERIES b/configs/base-generic/powerpc/CONFIG_PPC_PSERIES
index d0cfced71..d0cfced71 100644
--- a/baseconfig/powerpc/CONFIG_PPC_PSERIES
+++ b/configs/base-generic/powerpc/CONFIG_PPC_PSERIES
diff --git a/baseconfig/powerpc/CONFIG_PPC_RADIX_MMU b/configs/base-generic/powerpc/CONFIG_PPC_RADIX_MMU
index eced515d8..eced515d8 100644
--- a/baseconfig/powerpc/CONFIG_PPC_RADIX_MMU
+++ b/configs/base-generic/powerpc/CONFIG_PPC_RADIX_MMU
diff --git a/baseconfig/powerpc/CONFIG_PPC_SMLPAR b/configs/base-generic/powerpc/CONFIG_PPC_SMLPAR
index e11960b0d..e11960b0d 100644
--- a/baseconfig/powerpc/CONFIG_PPC_SMLPAR
+++ b/configs/base-generic/powerpc/CONFIG_PPC_SMLPAR
diff --git a/baseconfig/powerpc/CONFIG_PPC_SPLPAR b/configs/base-generic/powerpc/CONFIG_PPC_SPLPAR
index 63f5f7a60..63f5f7a60 100644
--- a/baseconfig/powerpc/CONFIG_PPC_SPLPAR
+++ b/configs/base-generic/powerpc/CONFIG_PPC_SPLPAR
diff --git a/baseconfig/powerpc/CONFIG_PPC_SUBPAGE_PROT b/configs/base-generic/powerpc/CONFIG_PPC_SUBPAGE_PROT
index c978f0474..c978f0474 100644
--- a/baseconfig/powerpc/CONFIG_PPC_SUBPAGE_PROT
+++ b/configs/base-generic/powerpc/CONFIG_PPC_SUBPAGE_PROT
diff --git a/baseconfig/powerpc/CONFIG_PPC_TRANSACTIONAL_MEM b/configs/base-generic/powerpc/CONFIG_PPC_TRANSACTIONAL_MEM
index 43e322011..43e322011 100644
--- a/baseconfig/powerpc/CONFIG_PPC_TRANSACTIONAL_MEM
+++ b/configs/base-generic/powerpc/CONFIG_PPC_TRANSACTIONAL_MEM
diff --git a/baseconfig/powerpc/CONFIG_PPC_VAS b/configs/base-generic/powerpc/CONFIG_PPC_VAS
index ec767da00..ec767da00 100644
--- a/baseconfig/powerpc/CONFIG_PPC_VAS
+++ b/configs/base-generic/powerpc/CONFIG_PPC_VAS
diff --git a/baseconfig/powerpc/CONFIG_PRINT_STACK_DEPTH b/configs/base-generic/powerpc/CONFIG_PRINT_STACK_DEPTH
index abaea79a0..abaea79a0 100644
--- a/baseconfig/powerpc/CONFIG_PRINT_STACK_DEPTH
+++ b/configs/base-generic/powerpc/CONFIG_PRINT_STACK_DEPTH
diff --git a/baseconfig/powerpc/CONFIG_PS3_VRAM b/configs/base-generic/powerpc/CONFIG_PS3_VRAM
index 20a0fd26a..20a0fd26a 100644
--- a/baseconfig/powerpc/CONFIG_PS3_VRAM
+++ b/configs/base-generic/powerpc/CONFIG_PS3_VRAM
diff --git a/baseconfig/powerpc/CONFIG_PSERIES_CPUIDLE b/configs/base-generic/powerpc/CONFIG_PSERIES_CPUIDLE
index 81b9749e0..81b9749e0 100644
--- a/baseconfig/powerpc/CONFIG_PSERIES_CPUIDLE
+++ b/configs/base-generic/powerpc/CONFIG_PSERIES_CPUIDLE
diff --git a/baseconfig/powerpc/CONFIG_PSERIES_ENERGY b/configs/base-generic/powerpc/CONFIG_PSERIES_ENERGY
index e8ce18b6e..e8ce18b6e 100644
--- a/baseconfig/powerpc/CONFIG_PSERIES_ENERGY
+++ b/configs/base-generic/powerpc/CONFIG_PSERIES_ENERGY
diff --git a/baseconfig/powerpc/CONFIG_RAPIDIO b/configs/base-generic/powerpc/CONFIG_RAPIDIO
index 79892b190..79892b190 100644
--- a/baseconfig/powerpc/CONFIG_RAPIDIO
+++ b/configs/base-generic/powerpc/CONFIG_RAPIDIO
diff --git a/baseconfig/powerpc/CONFIG_RCU_FANOUT b/configs/base-generic/powerpc/CONFIG_RCU_FANOUT
index e95447c12..e95447c12 100644
--- a/baseconfig/powerpc/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/powerpc/CONFIG_RCU_FANOUT
diff --git a/baseconfig/powerpc/CONFIG_RCU_FANOUT_LEAF b/configs/base-generic/powerpc/CONFIG_RCU_FANOUT_LEAF
index 147351a49..147351a49 100644
--- a/baseconfig/powerpc/CONFIG_RCU_FANOUT_LEAF
+++ b/configs/base-generic/powerpc/CONFIG_RCU_FANOUT_LEAF
diff --git a/baseconfig/powerpc/CONFIG_RELOCATABLE b/configs/base-generic/powerpc/CONFIG_RELOCATABLE
index 36808edb3..36808edb3 100644
--- a/baseconfig/powerpc/CONFIG_RELOCATABLE
+++ b/configs/base-generic/powerpc/CONFIG_RELOCATABLE
diff --git a/baseconfig/powerpc/CONFIG_RTAS_FLASH b/configs/base-generic/powerpc/CONFIG_RTAS_FLASH
index 6471fdaa4..6471fdaa4 100644
--- a/baseconfig/powerpc/CONFIG_RTAS_FLASH
+++ b/configs/base-generic/powerpc/CONFIG_RTAS_FLASH
diff --git a/baseconfig/powerpc/CONFIG_RTAS_PROC b/configs/base-generic/powerpc/CONFIG_RTAS_PROC
index 4ae3cedcc..4ae3cedcc 100644
--- a/baseconfig/powerpc/CONFIG_RTAS_PROC
+++ b/configs/base-generic/powerpc/CONFIG_RTAS_PROC
diff --git a/baseconfig/powerpc/CONFIG_RTC b/configs/base-generic/powerpc/CONFIG_RTC
index 6b706c9d8..6b706c9d8 100644
--- a/baseconfig/powerpc/CONFIG_RTC
+++ b/configs/base-generic/powerpc/CONFIG_RTC
diff --git a/baseconfig/powerpc/CONFIG_RTC_DRV_GENERIC b/configs/base-generic/powerpc/CONFIG_RTC_DRV_GENERIC
index 9f7f82c05..9f7f82c05 100644
--- a/baseconfig/powerpc/CONFIG_RTC_DRV_GENERIC
+++ b/configs/base-generic/powerpc/CONFIG_RTC_DRV_GENERIC
diff --git a/baseconfig/powerpc/CONFIG_RTC_DRV_OPAL b/configs/base-generic/powerpc/CONFIG_RTC_DRV_OPAL
index 023b00144..023b00144 100644
--- a/baseconfig/powerpc/CONFIG_RTC_DRV_OPAL
+++ b/configs/base-generic/powerpc/CONFIG_RTC_DRV_OPAL
diff --git a/baseconfig/powerpc/CONFIG_SCANLOG b/configs/base-generic/powerpc/CONFIG_SCANLOG
index 2e74556ae..2e74556ae 100644
--- a/baseconfig/powerpc/CONFIG_SCANLOG
+++ b/configs/base-generic/powerpc/CONFIG_SCANLOG
diff --git a/baseconfig/powerpc/CONFIG_SCHED_SMT b/configs/base-generic/powerpc/CONFIG_SCHED_SMT
index ed3f04a20..ed3f04a20 100644
--- a/baseconfig/powerpc/CONFIG_SCHED_SMT
+++ b/configs/base-generic/powerpc/CONFIG_SCHED_SMT
diff --git a/baseconfig/powerpc/CONFIG_SCOM_DEBUGFS b/configs/base-generic/powerpc/CONFIG_SCOM_DEBUGFS
index a14ae1f20..a14ae1f20 100644
--- a/baseconfig/powerpc/CONFIG_SCOM_DEBUGFS
+++ b/configs/base-generic/powerpc/CONFIG_SCOM_DEBUGFS
diff --git a/baseconfig/powerpc/CONFIG_SCSI_AHA1542 b/configs/base-generic/powerpc/CONFIG_SCSI_AHA1542
index e3b8b23f4..e3b8b23f4 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_AHA1542
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_AHA1542
diff --git a/baseconfig/powerpc/CONFIG_SCSI_BUSLOGIC b/configs/base-generic/powerpc/CONFIG_SCSI_BUSLOGIC
index c1a96e3d8..c1a96e3d8 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_BUSLOGIC
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_BUSLOGIC
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IBMVFC b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVFC
index 6b80ad743..6b80ad743 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IBMVFC
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVFC
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IBMVFC_TRACE b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVFC_TRACE
index ba53a8b75..ba53a8b75 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IBMVFC_TRACE
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVFC_TRACE
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IBMVSCSI b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVSCSI
index 280e2c7a5..280e2c7a5 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IBMVSCSI
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVSCSI
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IBMVSCSIS b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVSCSIS
index 5247d77c2..5247d77c2 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IBMVSCSIS
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IBMVSCSIS
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IN2000 b/configs/base-generic/powerpc/CONFIG_SCSI_IN2000
index 2de6e838d..2de6e838d 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IN2000
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IN2000
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IPR b/configs/base-generic/powerpc/CONFIG_SCSI_IPR
index ce2ee5618..ce2ee5618 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IPR
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IPR
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IPR_DUMP b/configs/base-generic/powerpc/CONFIG_SCSI_IPR_DUMP
index e9892cabf..e9892cabf 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IPR_DUMP
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IPR_DUMP
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IPR_TRACE b/configs/base-generic/powerpc/CONFIG_SCSI_IPR_TRACE
index 126c699b6..126c699b6 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IPR_TRACE
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IPR_TRACE
diff --git a/baseconfig/powerpc/CONFIG_SCSI_IPS b/configs/base-generic/powerpc/CONFIG_SCSI_IPS
index 32e4abe67..32e4abe67 100644
--- a/baseconfig/powerpc/CONFIG_SCSI_IPS
+++ b/configs/base-generic/powerpc/CONFIG_SCSI_IPS
diff --git a/baseconfig/powerpc/CONFIG_SENSORS_IBMPOWERNV b/configs/base-generic/powerpc/CONFIG_SENSORS_IBMPOWERNV
index 2ee084d9f..2ee084d9f 100644
--- a/baseconfig/powerpc/CONFIG_SENSORS_IBMPOWERNV
+++ b/configs/base-generic/powerpc/CONFIG_SENSORS_IBMPOWERNV
diff --git a/baseconfig/powerpc/CONFIG_SENSORS_IBM_CFFPS b/configs/base-generic/powerpc/CONFIG_SENSORS_IBM_CFFPS
index 31f260384..31f260384 100644
--- a/baseconfig/powerpc/CONFIG_SENSORS_IBM_CFFPS
+++ b/configs/base-generic/powerpc/CONFIG_SENSORS_IBM_CFFPS
diff --git a/baseconfig/powerpc/CONFIG_SERIAL_8250 b/configs/base-generic/powerpc/CONFIG_SERIAL_8250
index 4dd74a78b..4dd74a78b 100644
--- a/baseconfig/powerpc/CONFIG_SERIAL_8250
+++ b/configs/base-generic/powerpc/CONFIG_SERIAL_8250
diff --git a/baseconfig/powerpc/CONFIG_SERIAL_CPM b/configs/base-generic/powerpc/CONFIG_SERIAL_CPM
index 37e19a983..37e19a983 100644
--- a/baseconfig/powerpc/CONFIG_SERIAL_CPM
+++ b/configs/base-generic/powerpc/CONFIG_SERIAL_CPM
diff --git a/baseconfig/powerpc/CONFIG_SERIAL_ICOM b/configs/base-generic/powerpc/CONFIG_SERIAL_ICOM
index 38ef146f1..38ef146f1 100644
--- a/baseconfig/powerpc/CONFIG_SERIAL_ICOM
+++ b/configs/base-generic/powerpc/CONFIG_SERIAL_ICOM
diff --git a/baseconfig/powerpc/CONFIG_SERIAL_OF_PLATFORM b/configs/base-generic/powerpc/CONFIG_SERIAL_OF_PLATFORM
index 46bc74d49..46bc74d49 100644
--- a/baseconfig/powerpc/CONFIG_SERIAL_OF_PLATFORM
+++ b/configs/base-generic/powerpc/CONFIG_SERIAL_OF_PLATFORM
diff --git a/baseconfig/powerpc/CONFIG_SERIAL_QE b/configs/base-generic/powerpc/CONFIG_SERIAL_QE
index 1700d95d1..1700d95d1 100644
--- a/baseconfig/powerpc/CONFIG_SERIAL_QE
+++ b/configs/base-generic/powerpc/CONFIG_SERIAL_QE
diff --git a/baseconfig/powerpc/CONFIG_SERIO_XILINX_XPS_PS2 b/configs/base-generic/powerpc/CONFIG_SERIO_XILINX_XPS_PS2
index 1492ee7fd..1492ee7fd 100644
--- a/baseconfig/powerpc/CONFIG_SERIO_XILINX_XPS_PS2
+++ b/configs/base-generic/powerpc/CONFIG_SERIO_XILINX_XPS_PS2
diff --git a/baseconfig/powerpc/CONFIG_SIMPLE_GPIO b/configs/base-generic/powerpc/CONFIG_SIMPLE_GPIO
index 5719f4fc1..5719f4fc1 100644
--- a/baseconfig/powerpc/CONFIG_SIMPLE_GPIO
+++ b/configs/base-generic/powerpc/CONFIG_SIMPLE_GPIO
diff --git a/baseconfig/powerpc/CONFIG_SND_HDA_INTEL b/configs/base-generic/powerpc/CONFIG_SND_HDA_INTEL
index 6f057ecfe..6f057ecfe 100644
--- a/baseconfig/powerpc/CONFIG_SND_HDA_INTEL
+++ b/configs/base-generic/powerpc/CONFIG_SND_HDA_INTEL
diff --git a/baseconfig/powerpc/CONFIG_SND_PPC b/configs/base-generic/powerpc/CONFIG_SND_PPC
index e854bd754..e854bd754 100644
--- a/baseconfig/powerpc/CONFIG_SND_PPC
+++ b/configs/base-generic/powerpc/CONFIG_SND_PPC
diff --git a/baseconfig/powerpc/CONFIG_SND_SOC b/configs/base-generic/powerpc/CONFIG_SND_SOC
index a161b8e18..a161b8e18 100644
--- a/baseconfig/powerpc/CONFIG_SND_SOC
+++ b/configs/base-generic/powerpc/CONFIG_SND_SOC
diff --git a/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU b/configs/base-generic/powerpc/CONFIG_SPAPR_TCE_IOMMU
index ffe83031d..ffe83031d 100644
--- a/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU
+++ b/configs/base-generic/powerpc/CONFIG_SPAPR_TCE_IOMMU
diff --git a/baseconfig/powerpc/CONFIG_SPARSEMEM_VMEMMAP b/configs/base-generic/powerpc/CONFIG_SPARSEMEM_VMEMMAP
index a2826dacd..a2826dacd 100644
--- a/baseconfig/powerpc/CONFIG_SPARSEMEM_VMEMMAP
+++ b/configs/base-generic/powerpc/CONFIG_SPARSEMEM_VMEMMAP
diff --git a/baseconfig/powerpc/CONFIG_SPARSE_IRQ b/configs/base-generic/powerpc/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/powerpc/CONFIG_SPARSE_IRQ
+++ b/configs/base-generic/powerpc/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/powerpc/CONFIG_SUSPEND_FREEZER b/configs/base-generic/powerpc/CONFIG_SUSPEND_FREEZER
index f816da7cd..f816da7cd 100644
--- a/baseconfig/powerpc/CONFIG_SUSPEND_FREEZER
+++ b/configs/base-generic/powerpc/CONFIG_SUSPEND_FREEZER
diff --git a/baseconfig/powerpc/CONFIG_SWIOTLB b/configs/base-generic/powerpc/CONFIG_SWIOTLB
index ac62bf35e..ac62bf35e 100644
--- a/baseconfig/powerpc/CONFIG_SWIOTLB
+++ b/configs/base-generic/powerpc/CONFIG_SWIOTLB
diff --git a/baseconfig/powerpc/CONFIG_SYNC_FILE b/configs/base-generic/powerpc/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/powerpc/CONFIG_SYNC_FILE
+++ b/configs/base-generic/powerpc/CONFIG_SYNC_FILE
diff --git a/baseconfig/powerpc/CONFIG_TCG_TPM b/configs/base-generic/powerpc/CONFIG_TCG_TPM
index c547d097c..c547d097c 100644
--- a/baseconfig/powerpc/CONFIG_TCG_TPM
+++ b/configs/base-generic/powerpc/CONFIG_TCG_TPM
diff --git a/baseconfig/powerpc/CONFIG_THERMAL b/configs/base-generic/powerpc/CONFIG_THERMAL
index 42356be7d..42356be7d 100644
--- a/baseconfig/powerpc/CONFIG_THERMAL
+++ b/configs/base-generic/powerpc/CONFIG_THERMAL
diff --git a/baseconfig/powerpc/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/configs/base-generic/powerpc/CONFIG_TOUCHSCREEN_AUO_PIXCIR
index b33f61f37..b33f61f37 100644
--- a/baseconfig/powerpc/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ b/configs/base-generic/powerpc/CONFIG_TOUCHSCREEN_AUO_PIXCIR
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
index 75d999c66..75d999c66 100644
--- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/configs/base-generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
index f9a942f2c..f9a942f2c 100644
--- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
+++ b/configs/base-generic/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
diff --git a/baseconfig/powerpc/CONFIG_UCC_GETH b/configs/base-generic/powerpc/CONFIG_UCC_GETH
index a52f59da8..a52f59da8 100644
--- a/baseconfig/powerpc/CONFIG_UCC_GETH
+++ b/configs/base-generic/powerpc/CONFIG_UCC_GETH
diff --git a/baseconfig/powerpc/CONFIG_UDBG_RTAS_CONSOLE b/configs/base-generic/powerpc/CONFIG_UDBG_RTAS_CONSOLE
index 91d9d1261..91d9d1261 100644
--- a/baseconfig/powerpc/CONFIG_UDBG_RTAS_CONSOLE
+++ b/configs/base-generic/powerpc/CONFIG_UDBG_RTAS_CONSOLE
diff --git a/baseconfig/powerpc/CONFIG_USB_EHCI_HCD_PPC_OF b/configs/base-generic/powerpc/CONFIG_USB_EHCI_HCD_PPC_OF
index 252da8da0..252da8da0 100644
--- a/baseconfig/powerpc/CONFIG_USB_EHCI_HCD_PPC_OF
+++ b/configs/base-generic/powerpc/CONFIG_USB_EHCI_HCD_PPC_OF
diff --git a/baseconfig/powerpc/CONFIG_USB_FHCI_HCD b/configs/base-generic/powerpc/CONFIG_USB_FHCI_HCD
index b5701190e..b5701190e 100644
--- a/baseconfig/powerpc/CONFIG_USB_FHCI_HCD
+++ b/configs/base-generic/powerpc/CONFIG_USB_FHCI_HCD
diff --git a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF
index a3f956199..a3f956199 100644
--- a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF
+++ b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF
diff --git a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_BE b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_BE
index cf3364a04..cf3364a04 100644
--- a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_BE
+++ b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_BE
diff --git a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_LE b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_LE
index a917cdf94..a917cdf94 100644
--- a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_LE
+++ b/configs/base-generic/powerpc/CONFIG_USB_OHCI_HCD_PPC_OF_LE
diff --git a/baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE1 b/configs/base-generic/powerpc/CONFIG_VFIO_IOMMU_TYPE1
index 9f1df8c24..9f1df8c24 100644
--- a/baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE1
+++ b/configs/base-generic/powerpc/CONFIG_VFIO_IOMMU_TYPE1
diff --git a/baseconfig/powerpc/CONFIG_VIDEO_ZORAN b/configs/base-generic/powerpc/CONFIG_VIDEO_ZORAN
index e6a8d5656..e6a8d5656 100644
--- a/baseconfig/powerpc/CONFIG_VIDEO_ZORAN
+++ b/configs/base-generic/powerpc/CONFIG_VIDEO_ZORAN
diff --git a/baseconfig/powerpc/CONFIG_VSX b/configs/base-generic/powerpc/CONFIG_VSX
index 6d3324bbb..6d3324bbb 100644
--- a/baseconfig/powerpc/CONFIG_VSX
+++ b/configs/base-generic/powerpc/CONFIG_VSX
diff --git a/baseconfig/powerpc/CONFIG_WATCHDOG_RTAS b/configs/base-generic/powerpc/CONFIG_WATCHDOG_RTAS
index c1f3b00d3..c1f3b00d3 100644
--- a/baseconfig/powerpc/CONFIG_WATCHDOG_RTAS
+++ b/configs/base-generic/powerpc/CONFIG_WATCHDOG_RTAS
diff --git a/baseconfig/powerpc/CONFIG_WINDFARM b/configs/base-generic/powerpc/CONFIG_WINDFARM
index cdebfc697..cdebfc697 100644
--- a/baseconfig/powerpc/CONFIG_WINDFARM
+++ b/configs/base-generic/powerpc/CONFIG_WINDFARM
diff --git a/baseconfig/powerpc/CONFIG_XILINX_EMACLITE b/configs/base-generic/powerpc/CONFIG_XILINX_EMACLITE
index ce6f11720..ce6f11720 100644
--- a/baseconfig/powerpc/CONFIG_XILINX_EMACLITE
+++ b/configs/base-generic/powerpc/CONFIG_XILINX_EMACLITE
diff --git a/baseconfig/powerpc/CONFIG_XILINX_LL_TEMAC b/configs/base-generic/powerpc/CONFIG_XILINX_LL_TEMAC
index 01a4f19cc..01a4f19cc 100644
--- a/baseconfig/powerpc/CONFIG_XILINX_LL_TEMAC
+++ b/configs/base-generic/powerpc/CONFIG_XILINX_LL_TEMAC
diff --git a/baseconfig/powerpc/CONFIG_XMON b/configs/base-generic/powerpc/CONFIG_XMON
index a9fb3381c..a9fb3381c 100644
--- a/baseconfig/powerpc/CONFIG_XMON
+++ b/configs/base-generic/powerpc/CONFIG_XMON
diff --git a/baseconfig/powerpc/CONFIG_XMON_DEFAULT b/configs/base-generic/powerpc/CONFIG_XMON_DEFAULT
index 23ba4c0a9..23ba4c0a9 100644
--- a/baseconfig/powerpc/CONFIG_XMON_DEFAULT
+++ b/configs/base-generic/powerpc/CONFIG_XMON_DEFAULT
diff --git a/baseconfig/powerpc/CONFIG_XMON_DISASSEMBLY b/configs/base-generic/powerpc/CONFIG_XMON_DISASSEMBLY
index 96982990f..96982990f 100644
--- a/baseconfig/powerpc/CONFIG_XMON_DISASSEMBLY
+++ b/configs/base-generic/powerpc/CONFIG_XMON_DISASSEMBLY
diff --git a/baseconfig/powerpc/CONFIG_XPS_USB_HCD_XILINX b/configs/base-generic/powerpc/CONFIG_XPS_USB_HCD_XILINX
index b724c56d2..b724c56d2 100644
--- a/baseconfig/powerpc/CONFIG_XPS_USB_HCD_XILINX
+++ b/configs/base-generic/powerpc/CONFIG_XPS_USB_HCD_XILINX
diff --git a/baseconfig/powerpc/CONFIG_XZ_DEC_POWERPC b/configs/base-generic/powerpc/CONFIG_XZ_DEC_POWERPC
index 118f59ba1..118f59ba1 100644
--- a/baseconfig/powerpc/CONFIG_XZ_DEC_POWERPC
+++ b/configs/base-generic/powerpc/CONFIG_XZ_DEC_POWERPC
diff --git a/baseconfig/powerpc/CONFIG_ZONE_DEVICE b/configs/base-generic/powerpc/CONFIG_ZONE_DEVICE
index ee4f1b8b2..ee4f1b8b2 100644
--- a/baseconfig/powerpc/CONFIG_ZONE_DEVICE
+++ b/configs/base-generic/powerpc/CONFIG_ZONE_DEVICE
diff --git a/baseconfig/powerpc/README b/configs/base-generic/powerpc/README
index 84a67e208..84a67e208 100644
--- a/baseconfig/powerpc/README
+++ b/configs/base-generic/powerpc/README
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_ADB b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB
index 204f34a80..204f34a80 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_ADB
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU
index 9cfc2b0a6..9cfc2b0a6 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU_LED
index 3b11ac370..3b11ac370 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU_LED
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK
index 74be3ced5..74be3ced5 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_AGP b/configs/base-generic/powerpc/powerpc64/CONFIG_AGP
index ea543fee8..ea543fee8 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_AGP
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_AGP
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_AGP_UNINORTH b/configs/base-generic/powerpc/powerpc64/CONFIG_AGP_UNINORTH
index 69056cacc..69056cacc 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_AGP_UNINORTH
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_AGP_UNINORTH
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_APM_EMULATION b/configs/base-generic/powerpc/powerpc64/CONFIG_APM_EMULATION
index 51976f181..51976f181 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_APM_EMULATION
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_APM_EMULATION
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_APPLE_AIRPORT b/configs/base-generic/powerpc/powerpc64/CONFIG_APPLE_AIRPORT
index 0ca1d3374..0ca1d3374 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_APPLE_AIRPORT
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_APPLE_AIRPORT
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_AEC62XX b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_AEC62XX
index a4aa2172d..a4aa2172d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_AEC62XX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_AEC62XX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_ALI15X3 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_ALI15X3
index f0ebde50d..f0ebde50d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_ALI15X3
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_ALI15X3
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_AMD74XX b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_AMD74XX
index 5ce3ca487..5ce3ca487 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_AMD74XX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_AMD74XX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CMD64X b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CMD64X
index cfb1c83fa..cfb1c83fa 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CMD64X
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CMD64X
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CS5520 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CS5520
index 9d3d33c71..9d3d33c71 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CS5520
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CS5520
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CS5530 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CS5530
index 2b2e38f13..2b2e38f13 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CS5530
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CS5530
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CY82C693 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CY82C693
index 5ea95a493..5ea95a493 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_CY82C693
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_CY82C693
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_DELKIN b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_DELKIN
index d470e3a62..d470e3a62 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_DELKIN
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_DELKIN
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_GENERIC b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_GENERIC
index 4c6472ac6..4c6472ac6 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_GENERIC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_GENERIC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_HPT366 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_HPT366
index 3b9b8601d..3b9b8601d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_HPT366
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_HPT366
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE
index 04ed7d4dc..04ed7d4dc 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDECD b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDECD
index bebad1ffd..bebad1ffd 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDECD
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDECD
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDECS b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDECS
index ce511779f..ce511779f 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDECS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDECS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEDMA b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEDMA
index f6eb0d7bc..f6eb0d7bc 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEDMA
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEDMA
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPCI b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPCI
index 97295204c..97295204c 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPCI
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPCI
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPNP b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPNP
index 4e0fefc0e..4e0fefc0e 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPNP
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDEPNP
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDETAPE b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDETAPE
index 553d6f554..553d6f554 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDETAPE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDETAPE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_PMAC b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_PMAC
index 0fb501a92..0fb501a92 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_PMAC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_PMAC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_SATA b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_SATA
index 2d1626063..2d1626063 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_SATA
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IDE_SATA
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IT8213 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IT8213
index 8cd322d4b..8cd322d4b 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IT8213
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IT8213
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IT821X b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IT821X
index 592716ebb..592716ebb 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_IT821X
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_IT821X
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_JMICRON b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_JMICRON
index 5ef22655a..5ef22655a 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_JMICRON
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_JMICRON
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_NS87415 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_NS87415
index ef66bfd6a..ef66bfd6a 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_NS87415
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_NS87415
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_OFFBOARD b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_OFFBOARD
index bd2779f87..bd2779f87 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_OFFBOARD
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_OFFBOARD
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_OPTI621 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_OPTI621
index 54d8d3a34..54d8d3a34 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_OPTI621
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_OPTI621
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_NEW b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_NEW
index b0b14adad..b0b14adad 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_NEW
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_NEW
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_OLD b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_OLD
index 8e4cc558d..8e4cc558d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_OLD
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PDC202XX_OLD
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PIIX b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PIIX
index c05858618..c05858618 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_PIIX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_PIIX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SC1200 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SC1200
index 58a313cbc..58a313cbc 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SC1200
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SC1200
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SIIMAGE b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SIIMAGE
index b61b541f4..b61b541f4 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SIIMAGE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SIIMAGE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SL82C105 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SL82C105
index 80f58e383..80f58e383 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SL82C105
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SL82C105
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SLC90E66 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SLC90E66
index 49d55bae7..49d55bae7 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SLC90E66
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SLC90E66
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SVWKS b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SVWKS
index cfe6bd2b5..cfe6bd2b5 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_SVWKS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_SVWKS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TC86C001 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TC86C001
index 43cbcce0b..43cbcce0b 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TC86C001
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TC86C001
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TRIFLEX b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TRIFLEX
index 1ae9f1df0..1ae9f1df0 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TRIFLEX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TRIFLEX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TRM290 b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TRM290
index ed7d6a019..ed7d6a019 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_TRM290
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_TRM290
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_VIA82CXXX b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_VIA82CXXX
index 9fd35dff9..9fd35dff9 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_BLK_DEV_VIA82CXXX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_BLK_DEV_VIA82CXXX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_CPU_FREQ_MAPLE b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_FREQ_MAPLE
index 7caacb88e..7caacb88e 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_CPU_FREQ_MAPLE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_FREQ_MAPLE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_CPU_FREQ_PMAC64 b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_FREQ_PMAC64
index e5c7b7c21..e5c7b7c21 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_CPU_FREQ_PMAC64
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_FREQ_PMAC64
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_CPU_LITTLE_ENDIAN b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_LITTLE_ENDIAN
index 57d623ff2..57d623ff2 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_CPU_LITTLE_ENDIAN
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_CPU_LITTLE_ENDIAN
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_AMD8111 b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_AMD8111
index b191efff8..b191efff8 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_AMD8111
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_AMD8111
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_AMD8131 b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_AMD8131
index 63a058c5b..63a058c5b 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_AMD8131
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_AMD8131
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_CPC925 b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_CPC925
index 15ed3e3b0..15ed3e3b0 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_EDAC_CPC925
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_EDAC_CPC925
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_GENERIC_PHY b/configs/base-generic/powerpc/powerpc64/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_GENERIC_PHY
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_HW_RANDOM_AMD b/configs/base-generic/powerpc/powerpc64/CONFIG_HW_RANDOM_AMD
index dd7a51f3d..dd7a51f3d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_HW_RANDOM_AMD
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_HW_RANDOM_AMD
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_I2C_MUX b/configs/base-generic/powerpc/powerpc64/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_I2C_MUX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_I2C_MUX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_I2C_POWERMAC b/configs/base-generic/powerpc/powerpc64/CONFIG_I2C_POWERMAC
index 887766506..887766506 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_I2C_POWERMAC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_I2C_POWERMAC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE
index a4ae16196..a4ae16196 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDEPCI_PCIBUS_ORDER b/configs/base-generic/powerpc/powerpc64/CONFIG_IDEPCI_PCIBUS_ORDER
index 455150a3f..455150a3f 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDEPCI_PCIBUS_ORDER
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDEPCI_PCIBUS_ORDER
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD
index f31363c93..f31363c93 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD_ATA b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD_ATA
index 0d1aecad4..0d1aecad4 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD_ATA
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD_ATA
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD_ATAPI b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD_ATAPI
index a8fac43f9..a8fac43f9 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GD_ATAPI
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GD_ATAPI
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GENERIC b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GENERIC
index da1fd3123..da1fd3123 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_GENERIC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_GENERIC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_PROC_FS b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_PROC_FS
index f57c3edfd..f57c3edfd 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_PROC_FS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_PROC_FS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_IDE_TASK_IOCTL b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_TASK_IOCTL
index e59e0b7d8..e59e0b7d8 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_IDE_TASK_IOCTL
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_IDE_TASK_IOCTL
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_MACINTOSH_DRIVERS b/configs/base-generic/powerpc/powerpc64/CONFIG_MACINTOSH_DRIVERS
index 105442f40..105442f40 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_MACINTOSH_DRIVERS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_MACINTOSH_DRIVERS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_MAC_EMUMOUSEBTN b/configs/base-generic/powerpc/powerpc64/CONFIG_MAC_EMUMOUSEBTN
index 76b30caa5..76b30caa5 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_MAC_EMUMOUSEBTN
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_MAC_EMUMOUSEBTN
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_MFD_CORE b/configs/base-generic/powerpc/powerpc64/CONFIG_MFD_CORE
index c8855e8a0..c8855e8a0 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_MFD_CORE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_MFD_CORE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_MMIO_NVRAM b/configs/base-generic/powerpc/powerpc64/CONFIG_MMIO_NVRAM
index da8939163..da8939163 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_MMIO_NVRAM
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_MMIO_NVRAM
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PATA_MACIO b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_MACIO
index d22f5ca02..d22f5ca02 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PATA_MACIO
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_MACIO
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PATA_OF_PLATFORM b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_OF_PLATFORM
index 5354705f9..5354705f9 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PATA_OF_PLATFORM
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_OF_PLATFORM
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PATA_PLATFORM b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_PLATFORM
index 7ba5e3bb4..7ba5e3bb4 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PATA_PLATFORM
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PATA_PLATFORM
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_APM_EMU b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_APM_EMU
index 9919b89e6..9919b89e6 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_APM_EMU
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_APM_EMU
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_BACKLIGHT_LEGACY b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_BACKLIGHT_LEGACY
index 15cad7a68..15cad7a68 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_BACKLIGHT_LEGACY
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_BACKLIGHT_LEGACY
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_RACKMETER b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_RACKMETER
index bb1a81090..bb1a81090 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_RACKMETER
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_RACKMETER
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_SMU b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_SMU
index 8a9e15655..8a9e15655 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PMAC_SMU
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PMAC_SMU
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PPC_MAPLE b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_MAPLE
index e452fe5d7..e452fe5d7 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PPC_MAPLE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_MAPLE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PPC_PMAC b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_PMAC
index fb821ff1d..fb821ff1d 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PPC_PMAC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_PMAC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_PPC_PMAC64 b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_PMAC64
index 066670e74..066670e74 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_PPC_PMAC64
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_PPC_PMAC64
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_CORE b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_CORE
index 32ecde504..32ecde504 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_CORE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_CORE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG
index 967dc4177..967dc4177 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG_TTYS b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG_TTYS
index 0f2a21819..0f2a21819 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG_TTYS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SERIAL_PMACZILOG_TTYS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA
index aebc37b11..aebc37b11 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_FABRIC_LAYOUT b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_FABRIC_LAYOUT
index 633abaa64..633abaa64 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_FABRIC_LAYOUT
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_FABRIC_LAYOUT
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_ONYX b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_ONYX
index 0171dc7e2..0171dc7e2 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_ONYX
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_ONYX
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS
index 43b8dbca5..43b8dbca5 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS_I2S b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS_I2S
index b4c5a3788..b4c5a3788 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS_I2S
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_SOUNDBUS_I2S
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_TAS b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_TAS
index f6edcdc2e..f6edcdc2e 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_TAS
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_TAS
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_TOONIE b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_TOONIE
index d0edbc4da..d0edbc4da 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_AOA_TOONIE
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_AOA_TOONIE
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_POWERMAC b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_POWERMAC
index 428bd3478..428bd3478 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_POWERMAC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_POWERMAC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_SND_POWERMAC_AUTO_DRC b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_POWERMAC_AUTO_DRC
index a2b637655..a2b637655 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_SND_POWERMAC_AUTO_DRC
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_SND_POWERMAC_AUTO_DRC
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM
index d10da3c7c..d10da3c7c 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM112 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM112
index 551e98801..551e98801 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM112
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM112
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM121 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM121
index e4f5cc6f9..e4f5cc6f9 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM121
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM121
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM72 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM72
index 1715b2cc8..1715b2cc8 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM72
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM72
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM81 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM81
index 2d8c1d1aa..2d8c1d1aa 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM81
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM81
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM91 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM91
index b78eaf20b..b78eaf20b 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_PM91
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_PM91
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_RM31 b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_RM31
index 9ff3559f0..9ff3559f0 100644
--- a/baseconfig/powerpc/powerpc64/CONFIG_WINDFARM_RM31
+++ b/configs/base-generic/powerpc/powerpc64/CONFIG_WINDFARM_RM31
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE b/configs/base-generic/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE
index c554a09ce..c554a09ce 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN b/configs/base-generic/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN
index ee43fdb3b..ee43fdb3b 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_DISABLE_MPROFILE_KERNEL b/configs/base-generic/powerpc/powerpc64le/CONFIG_DISABLE_MPROFILE_KERNEL
index afdb7e32a..afdb7e32a 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_DISABLE_MPROFILE_KERNEL
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_DISABLE_MPROFILE_KERNEL
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_GENERIC_PHY b/configs/base-generic/powerpc/powerpc64le/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_GENERIC_PHY
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_I2C_MUX b/configs/base-generic/powerpc/powerpc64le/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_I2C_MUX
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_I2C_MUX
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_MFD_CORE b/configs/base-generic/powerpc/powerpc64le/CONFIG_MFD_CORE
index c8855e8a0..c8855e8a0 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_MFD_CORE
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_MFD_CORE
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_POWER7_CPU b/configs/base-generic/powerpc/powerpc64le/CONFIG_POWER7_CPU
index 40eb65bc2..40eb65bc2 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_POWER7_CPU
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_POWER7_CPU
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_SERIAL_CORE b/configs/base-generic/powerpc/powerpc64le/CONFIG_SERIAL_CORE
index 32ecde504..32ecde504 100644
--- a/baseconfig/powerpc/powerpc64le/CONFIG_SERIAL_CORE
+++ b/configs/base-generic/powerpc/powerpc64le/CONFIG_SERIAL_CORE
diff --git a/baseconfig/s390x/CONFIG_64BIT b/configs/base-generic/s390x/CONFIG_64BIT
index 06a94e48b..06a94e48b 100644
--- a/baseconfig/s390x/CONFIG_64BIT
+++ b/configs/base-generic/s390x/CONFIG_64BIT
diff --git a/baseconfig/s390x/CONFIG_ACCESSIBILITY b/configs/base-generic/s390x/CONFIG_ACCESSIBILITY
index 9047179a2..9047179a2 100644
--- a/baseconfig/s390x/CONFIG_ACCESSIBILITY
+++ b/configs/base-generic/s390x/CONFIG_ACCESSIBILITY
diff --git a/baseconfig/s390x/CONFIG_AFIUCV b/configs/base-generic/s390x/CONFIG_AFIUCV
index cf9b10c4c..cf9b10c4c 100644
--- a/baseconfig/s390x/CONFIG_AFIUCV
+++ b/configs/base-generic/s390x/CONFIG_AFIUCV
diff --git a/baseconfig/s390x/CONFIG_ALIM7101_WDT b/configs/base-generic/s390x/CONFIG_ALIM7101_WDT
index b5ad49883..b5ad49883 100644
--- a/baseconfig/s390x/CONFIG_ALIM7101_WDT
+++ b/configs/base-generic/s390x/CONFIG_ALIM7101_WDT
diff --git a/baseconfig/s390x/CONFIG_ALTERA_STAPL b/configs/base-generic/s390x/CONFIG_ALTERA_STAPL
index f454734fa..f454734fa 100644
--- a/baseconfig/s390x/CONFIG_ALTERA_STAPL
+++ b/configs/base-generic/s390x/CONFIG_ALTERA_STAPL
diff --git a/baseconfig/s390x/CONFIG_ALTERA_TSE b/configs/base-generic/s390x/CONFIG_ALTERA_TSE
index f803036e8..f803036e8 100644
--- a/baseconfig/s390x/CONFIG_ALTERA_TSE
+++ b/configs/base-generic/s390x/CONFIG_ALTERA_TSE
diff --git a/baseconfig/s390x/CONFIG_APDS9802ALS b/configs/base-generic/s390x/CONFIG_APDS9802ALS
index c40795bfa..c40795bfa 100644
--- a/baseconfig/s390x/CONFIG_APDS9802ALS
+++ b/configs/base-generic/s390x/CONFIG_APDS9802ALS
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_BASE b/configs/base-generic/s390x/CONFIG_APPLDATA_BASE
index 047d81b72..047d81b72 100644
--- a/baseconfig/s390x/CONFIG_APPLDATA_BASE
+++ b/configs/base-generic/s390x/CONFIG_APPLDATA_BASE
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_MEM b/configs/base-generic/s390x/CONFIG_APPLDATA_MEM
index f76cca7ee..f76cca7ee 100644
--- a/baseconfig/s390x/CONFIG_APPLDATA_MEM
+++ b/configs/base-generic/s390x/CONFIG_APPLDATA_MEM
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_NET_SUM b/configs/base-generic/s390x/CONFIG_APPLDATA_NET_SUM
index 227cf0fd7..227cf0fd7 100644
--- a/baseconfig/s390x/CONFIG_APPLDATA_NET_SUM
+++ b/configs/base-generic/s390x/CONFIG_APPLDATA_NET_SUM
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_OS b/configs/base-generic/s390x/CONFIG_APPLDATA_OS
index 367849374..367849374 100644
--- a/baseconfig/s390x/CONFIG_APPLDATA_OS
+++ b/configs/base-generic/s390x/CONFIG_APPLDATA_OS
diff --git a/baseconfig/s390x/CONFIG_ARCH_RANDOM b/configs/base-generic/s390x/CONFIG_ARCH_RANDOM
index 51658fe1c..51658fe1c 100644
--- a/baseconfig/s390x/CONFIG_ARCH_RANDOM
+++ b/configs/base-generic/s390x/CONFIG_ARCH_RANDOM
diff --git a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE b/configs/base-generic/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
index c7d15a4b1..c7d15a4b1 100644
--- a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
+++ b/configs/base-generic/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
diff --git a/baseconfig/s390x/CONFIG_ATA_OVER_ETH b/configs/base-generic/s390x/CONFIG_ATA_OVER_ETH
index 4742a6278..4742a6278 100644
--- a/baseconfig/s390x/CONFIG_ATA_OVER_ETH
+++ b/configs/base-generic/s390x/CONFIG_ATA_OVER_ETH
diff --git a/baseconfig/s390x/CONFIG_ATM_DRIVERS b/configs/base-generic/s390x/CONFIG_ATM_DRIVERS
index 9ef2a621b..9ef2a621b 100644
--- a/baseconfig/s390x/CONFIG_ATM_DRIVERS
+++ b/configs/base-generic/s390x/CONFIG_ATM_DRIVERS
diff --git a/baseconfig/s390x/CONFIG_AUXDISPLAY b/configs/base-generic/s390x/CONFIG_AUXDISPLAY
index 36da27ae2..36da27ae2 100644
--- a/baseconfig/s390x/CONFIG_AUXDISPLAY
+++ b/configs/base-generic/s390x/CONFIG_AUXDISPLAY
diff --git a/baseconfig/s390x/CONFIG_B44 b/configs/base-generic/s390x/CONFIG_B44
index f1e41b307..f1e41b307 100644
--- a/baseconfig/s390x/CONFIG_B44
+++ b/configs/base-generic/s390x/CONFIG_B44
diff --git a/baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE b/configs/base-generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
index 9cd604bc5..9cd604bc5 100644
--- a/baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
+++ b/configs/base-generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
diff --git a/baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT b/configs/base-generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
index 3ee77acd7..3ee77acd7 100644
--- a/baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ b/configs/base-generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
diff --git a/baseconfig/s390x/CONFIG_BCMA b/configs/base-generic/s390x/CONFIG_BCMA
index 826862de6..826862de6 100644
--- a/baseconfig/s390x/CONFIG_BCMA
+++ b/configs/base-generic/s390x/CONFIG_BCMA
diff --git a/baseconfig/s390x/CONFIG_BE2ISCSI b/configs/base-generic/s390x/CONFIG_BE2ISCSI
index 49fffd76e..49fffd76e 100644
--- a/baseconfig/s390x/CONFIG_BE2ISCSI
+++ b/configs/base-generic/s390x/CONFIG_BE2ISCSI
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID b/configs/base-generic/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID
index 0fbe95ebc..0fbe95ebc 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_DAC960 b/configs/base-generic/s390x/CONFIG_BLK_DEV_DAC960
index 4cc1142cb..4cc1142cb 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_DAC960
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_DAC960
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_SKD b/configs/base-generic/s390x/CONFIG_BLK_DEV_SKD
index cc05158fb..cc05158fb 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_SKD
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_SKD
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_SX8 b/configs/base-generic/s390x/CONFIG_BLK_DEV_SX8
index 76e0342ed..76e0342ed 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_SX8
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_SX8
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_UMEM b/configs/base-generic/s390x/CONFIG_BLK_DEV_UMEM
index 6265b8162..6265b8162 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_UMEM
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_UMEM
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_XPRAM b/configs/base-generic/s390x/CONFIG_BLK_DEV_XPRAM
index efd128be7..efd128be7 100644
--- a/baseconfig/s390x/CONFIG_BLK_DEV_XPRAM
+++ b/configs/base-generic/s390x/CONFIG_BLK_DEV_XPRAM
diff --git a/baseconfig/s390x/CONFIG_BT b/configs/base-generic/s390x/CONFIG_BT
index ce6ddb435..ce6ddb435 100644
--- a/baseconfig/s390x/CONFIG_BT
+++ b/configs/base-generic/s390x/CONFIG_BT
diff --git a/baseconfig/s390x/CONFIG_CAN b/configs/base-generic/s390x/CONFIG_CAN
index 37ca11c95..37ca11c95 100644
--- a/baseconfig/s390x/CONFIG_CAN
+++ b/configs/base-generic/s390x/CONFIG_CAN
diff --git a/baseconfig/s390x/CONFIG_CB710_CORE b/configs/base-generic/s390x/CONFIG_CB710_CORE
index 9ef43951f..9ef43951f 100644
--- a/baseconfig/s390x/CONFIG_CB710_CORE
+++ b/configs/base-generic/s390x/CONFIG_CB710_CORE
diff --git a/baseconfig/s390x/CONFIG_CCW b/configs/base-generic/s390x/CONFIG_CCW
index 400afc59d..400afc59d 100644
--- a/baseconfig/s390x/CONFIG_CCW
+++ b/configs/base-generic/s390x/CONFIG_CCW
diff --git a/baseconfig/s390x/CONFIG_CCWGROUP b/configs/base-generic/s390x/CONFIG_CCWGROUP
index d991b6148..d991b6148 100644
--- a/baseconfig/s390x/CONFIG_CCWGROUP
+++ b/configs/base-generic/s390x/CONFIG_CCWGROUP
diff --git a/baseconfig/s390x/CONFIG_CCW_CONSOLE b/configs/base-generic/s390x/CONFIG_CCW_CONSOLE
index 42dc8edb7..42dc8edb7 100644
--- a/baseconfig/s390x/CONFIG_CCW_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_CCW_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE b/configs/base-generic/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE
index 781657e57..781657e57 100644
--- a/baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE
+++ b/configs/base-generic/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git a/baseconfig/s390x/CONFIG_CDROM_PKTCDVD b/configs/base-generic/s390x/CONFIG_CDROM_PKTCDVD
index db486cc44..db486cc44 100644
--- a/baseconfig/s390x/CONFIG_CDROM_PKTCDVD
+++ b/configs/base-generic/s390x/CONFIG_CDROM_PKTCDVD
diff --git a/baseconfig/s390x/CONFIG_CHARGER_SMB347 b/configs/base-generic/s390x/CONFIG_CHARGER_SMB347
index d7b8424a8..d7b8424a8 100644
--- a/baseconfig/s390x/CONFIG_CHARGER_SMB347
+++ b/configs/base-generic/s390x/CONFIG_CHARGER_SMB347
diff --git a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE b/configs/base-generic/s390x/CONFIG_CHECKPOINT_RESTORE
index c554a09ce..c554a09ce 100644
--- a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE
+++ b/configs/base-generic/s390x/CONFIG_CHECKPOINT_RESTORE
diff --git a/baseconfig/s390x/CONFIG_CHECK_STACK b/configs/base-generic/s390x/CONFIG_CHECK_STACK
index abad841c1..abad841c1 100644
--- a/baseconfig/s390x/CONFIG_CHECK_STACK
+++ b/configs/base-generic/s390x/CONFIG_CHECK_STACK
diff --git a/baseconfig/s390x/CONFIG_CHSC_SCH b/configs/base-generic/s390x/CONFIG_CHSC_SCH
index dae83ee85..dae83ee85 100644
--- a/baseconfig/s390x/CONFIG_CHSC_SCH
+++ b/configs/base-generic/s390x/CONFIG_CHSC_SCH
diff --git a/baseconfig/s390x/CONFIG_CMA b/configs/base-generic/s390x/CONFIG_CMA
index 309c9e771..309c9e771 100644
--- a/baseconfig/s390x/CONFIG_CMA
+++ b/configs/base-generic/s390x/CONFIG_CMA
diff --git a/baseconfig/s390x/CONFIG_CMA_AREAS b/configs/base-generic/s390x/CONFIG_CMA_AREAS
index 5474a48e9..5474a48e9 100644
--- a/baseconfig/s390x/CONFIG_CMA_AREAS
+++ b/configs/base-generic/s390x/CONFIG_CMA_AREAS
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUG b/configs/base-generic/s390x/CONFIG_CMA_DEBUG
index 64ff80c56..64ff80c56 100644
--- a/baseconfig/s390x/CONFIG_CMA_DEBUG
+++ b/configs/base-generic/s390x/CONFIG_CMA_DEBUG
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUGFS b/configs/base-generic/s390x/CONFIG_CMA_DEBUGFS
index fba89903a..fba89903a 100644
--- a/baseconfig/s390x/CONFIG_CMA_DEBUGFS
+++ b/configs/base-generic/s390x/CONFIG_CMA_DEBUGFS
diff --git a/baseconfig/s390x/CONFIG_CMM b/configs/base-generic/s390x/CONFIG_CMM
index 7d44d9928..7d44d9928 100644
--- a/baseconfig/s390x/CONFIG_CMM
+++ b/configs/base-generic/s390x/CONFIG_CMM
diff --git a/baseconfig/s390x/CONFIG_CMM_IUCV b/configs/base-generic/s390x/CONFIG_CMM_IUCV
index 8c8a337aa..8c8a337aa 100644
--- a/baseconfig/s390x/CONFIG_CMM_IUCV
+++ b/configs/base-generic/s390x/CONFIG_CMM_IUCV
diff --git a/baseconfig/s390x/CONFIG_COMPAT b/configs/base-generic/s390x/CONFIG_COMPAT
index 9b072bae7..9b072bae7 100644
--- a/baseconfig/s390x/CONFIG_COMPAT
+++ b/configs/base-generic/s390x/CONFIG_COMPAT
diff --git a/baseconfig/s390x/CONFIG_CPU_IDLE b/configs/base-generic/s390x/CONFIG_CPU_IDLE
index 624103e09..624103e09 100644
--- a/baseconfig/s390x/CONFIG_CPU_IDLE
+++ b/configs/base-generic/s390x/CONFIG_CPU_IDLE
diff --git a/baseconfig/s390x/CONFIG_CRC7 b/configs/base-generic/s390x/CONFIG_CRC7
index 51fff909f..51fff909f 100644
--- a/baseconfig/s390x/CONFIG_CRC7
+++ b/configs/base-generic/s390x/CONFIG_CRC7
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_AES_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_AES_S390
index d86bd34c9..d86bd34c9 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_AES_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_AES_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_CRC32_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_CRC32_S390
index d8d9c528f..d8d9c528f 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_CRC32_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_CRC32_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_DES_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_DES_S390
index 55160e0e0..55160e0e0 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_DES_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_DES_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_GHASH_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_GHASH_S390
index 4f1c7a6a5..4f1c7a6a5 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_GHASH_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_GHASH_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_PAES_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_PAES_S390
index f7071dfd3..f7071dfd3 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_PAES_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_PAES_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA1_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA1_S390
index d2c456c8d..d2c456c8d 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA1_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA1_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA256_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA256_S390
index 5fb3e354f..5fb3e354f 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA256_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA256_S390
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA512_S390 b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA512_S390
index 484db3b6d..484db3b6d 100644
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA512_S390
+++ b/configs/base-generic/s390x/CONFIG_CRYPTO_SHA512_S390
diff --git a/baseconfig/s390x/CONFIG_CTC b/configs/base-generic/s390x/CONFIG_CTC
index c2fb96b74..c2fb96b74 100644
--- a/baseconfig/s390x/CONFIG_CTC
+++ b/configs/base-generic/s390x/CONFIG_CTC
diff --git a/baseconfig/s390x/CONFIG_CTCM b/configs/base-generic/s390x/CONFIG_CTCM
index b1b25e672..b1b25e672 100644
--- a/baseconfig/s390x/CONFIG_CTCM
+++ b/configs/base-generic/s390x/CONFIG_CTCM
diff --git a/baseconfig/s390x/CONFIG_DASD b/configs/base-generic/s390x/CONFIG_DASD
index 3dccde2b2..3dccde2b2 100644
--- a/baseconfig/s390x/CONFIG_DASD
+++ b/configs/base-generic/s390x/CONFIG_DASD
diff --git a/baseconfig/s390x/CONFIG_DASD_DIAG b/configs/base-generic/s390x/CONFIG_DASD_DIAG
index 1c7d85b1a..1c7d85b1a 100644
--- a/baseconfig/s390x/CONFIG_DASD_DIAG
+++ b/configs/base-generic/s390x/CONFIG_DASD_DIAG
diff --git a/baseconfig/s390x/CONFIG_DASD_ECKD b/configs/base-generic/s390x/CONFIG_DASD_ECKD
index 9e75bd150..9e75bd150 100644
--- a/baseconfig/s390x/CONFIG_DASD_ECKD
+++ b/configs/base-generic/s390x/CONFIG_DASD_ECKD
diff --git a/baseconfig/s390x/CONFIG_DASD_EER b/configs/base-generic/s390x/CONFIG_DASD_EER
index 084fbc195..084fbc195 100644
--- a/baseconfig/s390x/CONFIG_DASD_EER
+++ b/configs/base-generic/s390x/CONFIG_DASD_EER
diff --git a/baseconfig/s390x/CONFIG_DASD_FBA b/configs/base-generic/s390x/CONFIG_DASD_FBA
index a237f2b12..a237f2b12 100644
--- a/baseconfig/s390x/CONFIG_DASD_FBA
+++ b/configs/base-generic/s390x/CONFIG_DASD_FBA
diff --git a/baseconfig/s390x/CONFIG_DASD_PROFILE b/configs/base-generic/s390x/CONFIG_DASD_PROFILE
index 0f763f1b1..0f763f1b1 100644
--- a/baseconfig/s390x/CONFIG_DASD_PROFILE
+++ b/configs/base-generic/s390x/CONFIG_DASD_PROFILE
diff --git a/baseconfig/s390x/CONFIG_DCSSBLK b/configs/base-generic/s390x/CONFIG_DCSSBLK
index ddad256fb..ddad256fb 100644
--- a/baseconfig/s390x/CONFIG_DCSSBLK
+++ b/configs/base-generic/s390x/CONFIG_DCSSBLK
diff --git a/baseconfig/s390x/CONFIG_DIAG288_WATCHDOG b/configs/base-generic/s390x/CONFIG_DIAG288_WATCHDOG
index b5287c558..b5287c558 100644
--- a/baseconfig/s390x/CONFIG_DIAG288_WATCHDOG
+++ b/configs/base-generic/s390x/CONFIG_DIAG288_WATCHDOG
diff --git a/baseconfig/s390x/CONFIG_DMADEVICES b/configs/base-generic/s390x/CONFIG_DMADEVICES
index 6596e80fc..6596e80fc 100644
--- a/baseconfig/s390x/CONFIG_DMADEVICES
+++ b/configs/base-generic/s390x/CONFIG_DMADEVICES
diff --git a/baseconfig/s390x/CONFIG_DNET b/configs/base-generic/s390x/CONFIG_DNET
index f8ac68f29..f8ac68f29 100644
--- a/baseconfig/s390x/CONFIG_DNET
+++ b/configs/base-generic/s390x/CONFIG_DNET
diff --git a/baseconfig/s390x/CONFIG_DP83640_PHY b/configs/base-generic/s390x/CONFIG_DP83640_PHY
index 24a3a8f31..24a3a8f31 100644
--- a/baseconfig/s390x/CONFIG_DP83640_PHY
+++ b/configs/base-generic/s390x/CONFIG_DP83640_PHY
diff --git a/baseconfig/s390x/CONFIG_DRM b/configs/base-generic/s390x/CONFIG_DRM
index c9d4b0f66..c9d4b0f66 100644
--- a/baseconfig/s390x/CONFIG_DRM
+++ b/configs/base-generic/s390x/CONFIG_DRM
diff --git a/baseconfig/s390x/CONFIG_DW_DMAC b/configs/base-generic/s390x/CONFIG_DW_DMAC
index 3e9fc9b1e..3e9fc9b1e 100644
--- a/baseconfig/s390x/CONFIG_DW_DMAC
+++ b/configs/base-generic/s390x/CONFIG_DW_DMAC
diff --git a/baseconfig/s390x/CONFIG_EADM_SCH b/configs/base-generic/s390x/CONFIG_EADM_SCH
index edf22b79f..edf22b79f 100644
--- a/baseconfig/s390x/CONFIG_EADM_SCH
+++ b/configs/base-generic/s390x/CONFIG_EADM_SCH
diff --git a/baseconfig/s390x/CONFIG_ECHO b/configs/base-generic/s390x/CONFIG_ECHO
index b84a07b07..b84a07b07 100644
--- a/baseconfig/s390x/CONFIG_ECHO
+++ b/configs/base-generic/s390x/CONFIG_ECHO
diff --git a/baseconfig/s390x/CONFIG_EMU_SIZE b/configs/base-generic/s390x/CONFIG_EMU_SIZE
index 116273f0c..116273f0c 100644
--- a/baseconfig/s390x/CONFIG_EMU_SIZE
+++ b/configs/base-generic/s390x/CONFIG_EMU_SIZE
diff --git a/baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES b/configs/base-generic/s390x/CONFIG_ENCLOSURE_SERVICES
index b463632aa..b463632aa 100644
--- a/baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES
+++ b/configs/base-generic/s390x/CONFIG_ENCLOSURE_SERVICES
diff --git a/baseconfig/s390x/CONFIG_ETHOC b/configs/base-generic/s390x/CONFIG_ETHOC
index 15370ca02..15370ca02 100644
--- a/baseconfig/s390x/CONFIG_ETHOC
+++ b/configs/base-generic/s390x/CONFIG_ETHOC
diff --git a/baseconfig/s390x/CONFIG_FB b/configs/base-generic/s390x/CONFIG_FB
index 7310c1a02..7310c1a02 100644
--- a/baseconfig/s390x/CONFIG_FB
+++ b/configs/base-generic/s390x/CONFIG_FB
diff --git a/baseconfig/s390x/CONFIG_FCOE b/configs/base-generic/s390x/CONFIG_FCOE
index 5b97d8ed5..5b97d8ed5 100644
--- a/baseconfig/s390x/CONFIG_FCOE
+++ b/configs/base-generic/s390x/CONFIG_FCOE
diff --git a/baseconfig/s390x/CONFIG_FDDI b/configs/base-generic/s390x/CONFIG_FDDI
index e13f968a5..e13f968a5 100644
--- a/baseconfig/s390x/CONFIG_FDDI
+++ b/configs/base-generic/s390x/CONFIG_FDDI
diff --git a/baseconfig/s390x/CONFIG_FEALNX b/configs/base-generic/s390x/CONFIG_FEALNX
index 4cca6a26d..4cca6a26d 100644
--- a/baseconfig/s390x/CONFIG_FEALNX
+++ b/configs/base-generic/s390x/CONFIG_FEALNX
diff --git a/baseconfig/s390x/CONFIG_FIREWIRE b/configs/base-generic/s390x/CONFIG_FIREWIRE
index d75b839c4..d75b839c4 100644
--- a/baseconfig/s390x/CONFIG_FIREWIRE
+++ b/configs/base-generic/s390x/CONFIG_FIREWIRE
diff --git a/baseconfig/s390x/CONFIG_FIREWIRE_NOSY b/configs/base-generic/s390x/CONFIG_FIREWIRE_NOSY
index 0b48c48d1..0b48c48d1 100644
--- a/baseconfig/s390x/CONFIG_FIREWIRE_NOSY
+++ b/configs/base-generic/s390x/CONFIG_FIREWIRE_NOSY
diff --git a/baseconfig/s390x/CONFIG_FIXED_PHY b/configs/base-generic/s390x/CONFIG_FIXED_PHY
index 89309ed1e..89309ed1e 100644
--- a/baseconfig/s390x/CONFIG_FIXED_PHY
+++ b/configs/base-generic/s390x/CONFIG_FIXED_PHY
diff --git a/baseconfig/s390x/CONFIG_FMC b/configs/base-generic/s390x/CONFIG_FMC
index 674cd4432..674cd4432 100644
--- a/baseconfig/s390x/CONFIG_FMC
+++ b/configs/base-generic/s390x/CONFIG_FMC
diff --git a/baseconfig/s390x/CONFIG_FUSION b/configs/base-generic/s390x/CONFIG_FUSION
index 116c04ea7..116c04ea7 100644
--- a/baseconfig/s390x/CONFIG_FUSION
+++ b/configs/base-generic/s390x/CONFIG_FUSION
diff --git a/baseconfig/s390x/CONFIG_GAMEPORT b/configs/base-generic/s390x/CONFIG_GAMEPORT
index 03c782bf3..03c782bf3 100644
--- a/baseconfig/s390x/CONFIG_GAMEPORT
+++ b/configs/base-generic/s390x/CONFIG_GAMEPORT
diff --git a/baseconfig/s390x/CONFIG_GENERIC_PHY b/configs/base-generic/s390x/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/s390x/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/s390x/CONFIG_GENERIC_PHY
diff --git a/baseconfig/s390x/CONFIG_GENWQE b/configs/base-generic/s390x/CONFIG_GENWQE
index f1f996ac1..f1f996ac1 100644
--- a/baseconfig/s390x/CONFIG_GENWQE
+++ b/configs/base-generic/s390x/CONFIG_GENWQE
diff --git a/baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY b/configs/base-generic/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
index b7d077774..b7d077774 100644
--- a/baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
+++ b/configs/base-generic/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
diff --git a/baseconfig/s390x/CONFIG_GPIOLIB b/configs/base-generic/s390x/CONFIG_GPIOLIB
index 6e685b2be..6e685b2be 100644
--- a/baseconfig/s390x/CONFIG_GPIOLIB
+++ b/configs/base-generic/s390x/CONFIG_GPIOLIB
diff --git a/baseconfig/s390x/CONFIG_HID b/configs/base-generic/s390x/CONFIG_HID
index befe82811..befe82811 100644
--- a/baseconfig/s390x/CONFIG_HID
+++ b/configs/base-generic/s390x/CONFIG_HID
diff --git a/baseconfig/s390x/CONFIG_HID_GENERIC b/configs/base-generic/s390x/CONFIG_HID_GENERIC
index a281e1c08..a281e1c08 100644
--- a/baseconfig/s390x/CONFIG_HID_GENERIC
+++ b/configs/base-generic/s390x/CONFIG_HID_GENERIC
diff --git a/baseconfig/s390x/CONFIG_HID_MAGICMOUSE b/configs/base-generic/s390x/CONFIG_HID_MAGICMOUSE
index 60e3719f1..60e3719f1 100644
--- a/baseconfig/s390x/CONFIG_HID_MAGICMOUSE
+++ b/configs/base-generic/s390x/CONFIG_HID_MAGICMOUSE
diff --git a/baseconfig/s390x/CONFIG_HIPPI b/configs/base-generic/s390x/CONFIG_HIPPI
index 8f4d0983a..8f4d0983a 100644
--- a/baseconfig/s390x/CONFIG_HIPPI
+++ b/configs/base-generic/s390x/CONFIG_HIPPI
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_CPCI
index f8bcc7104..f8bcc7104 100644
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI
+++ b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_CPCI
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_S390 b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_S390
index 4231dadcb..4231dadcb 100644
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_S390
+++ b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_S390
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
index 4380a9717..4380a9717 100644
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/s390x/CONFIG_HVC_IUCV b/configs/base-generic/s390x/CONFIG_HVC_IUCV
index 1ba599113..1ba599113 100644
--- a/baseconfig/s390x/CONFIG_HVC_IUCV
+++ b/configs/base-generic/s390x/CONFIG_HVC_IUCV
diff --git a/baseconfig/s390x/CONFIG_HWMON b/configs/base-generic/s390x/CONFIG_HWMON
index 65c3ac9f5..65c3ac9f5 100644
--- a/baseconfig/s390x/CONFIG_HWMON
+++ b/configs/base-generic/s390x/CONFIG_HWMON
diff --git a/baseconfig/s390x/CONFIG_HW_RANDOM_S390 b/configs/base-generic/s390x/CONFIG_HW_RANDOM_S390
index 7108db8ff..7108db8ff 100644
--- a/baseconfig/s390x/CONFIG_HW_RANDOM_S390
+++ b/configs/base-generic/s390x/CONFIG_HW_RANDOM_S390
diff --git a/baseconfig/s390x/CONFIG_HZ_100 b/configs/base-generic/s390x/CONFIG_HZ_100
index 11bd2afa2..11bd2afa2 100644
--- a/baseconfig/s390x/CONFIG_HZ_100
+++ b/configs/base-generic/s390x/CONFIG_HZ_100
diff --git a/baseconfig/s390x/CONFIG_HZ_1000 b/configs/base-generic/s390x/CONFIG_HZ_1000
index c211724d6..c211724d6 100644
--- a/baseconfig/s390x/CONFIG_HZ_1000
+++ b/configs/base-generic/s390x/CONFIG_HZ_1000
diff --git a/baseconfig/s390x/CONFIG_I2C b/configs/base-generic/s390x/CONFIG_I2C
index 063fe8213..063fe8213 100644
--- a/baseconfig/s390x/CONFIG_I2C
+++ b/configs/base-generic/s390x/CONFIG_I2C
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOBIT b/configs/base-generic/s390x/CONFIG_I2C_ALGOBIT
index e374ebd3c..e374ebd3c 100644
--- a/baseconfig/s390x/CONFIG_I2C_ALGOBIT
+++ b/configs/base-generic/s390x/CONFIG_I2C_ALGOBIT
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOPCA b/configs/base-generic/s390x/CONFIG_I2C_ALGOPCA
index 545b72f08..545b72f08 100644
--- a/baseconfig/s390x/CONFIG_I2C_ALGOPCA
+++ b/configs/base-generic/s390x/CONFIG_I2C_ALGOPCA
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOPCF b/configs/base-generic/s390x/CONFIG_I2C_ALGOPCF
index cdb960f9c..cdb960f9c 100644
--- a/baseconfig/s390x/CONFIG_I2C_ALGOPCF
+++ b/configs/base-generic/s390x/CONFIG_I2C_ALGOPCF
diff --git a/baseconfig/s390x/CONFIG_I2C_CHARDEV b/configs/base-generic/s390x/CONFIG_I2C_CHARDEV
index 78053559f..78053559f 100644
--- a/baseconfig/s390x/CONFIG_I2C_CHARDEV
+++ b/configs/base-generic/s390x/CONFIG_I2C_CHARDEV
diff --git a/baseconfig/s390x/CONFIG_I2C_COMPAT b/configs/base-generic/s390x/CONFIG_I2C_COMPAT
index c82c4eb35..c82c4eb35 100644
--- a/baseconfig/s390x/CONFIG_I2C_COMPAT
+++ b/configs/base-generic/s390x/CONFIG_I2C_COMPAT
diff --git a/baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI b/configs/base-generic/s390x/CONFIG_I2C_DESIGNWARE_PCI
index 7f371b4dc..7f371b4dc 100644
--- a/baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI
+++ b/configs/base-generic/s390x/CONFIG_I2C_DESIGNWARE_PCI
diff --git a/baseconfig/s390x/CONFIG_I2C_HELPER_AUTO b/configs/base-generic/s390x/CONFIG_I2C_HELPER_AUTO
index 335f57499..335f57499 100644
--- a/baseconfig/s390x/CONFIG_I2C_HELPER_AUTO
+++ b/configs/base-generic/s390x/CONFIG_I2C_HELPER_AUTO
diff --git a/baseconfig/s390x/CONFIG_I2C_HID b/configs/base-generic/s390x/CONFIG_I2C_HID
index 30ca18a84..30ca18a84 100644
--- a/baseconfig/s390x/CONFIG_I2C_HID
+++ b/configs/base-generic/s390x/CONFIG_I2C_HID
diff --git a/baseconfig/s390x/CONFIG_I2C_NFORCE2 b/configs/base-generic/s390x/CONFIG_I2C_NFORCE2
index e5e898994..e5e898994 100644
--- a/baseconfig/s390x/CONFIG_I2C_NFORCE2
+++ b/configs/base-generic/s390x/CONFIG_I2C_NFORCE2
diff --git a/baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM b/configs/base-generic/s390x/CONFIG_I2C_PCA_PLATFORM
index e371d1a8e..e371d1a8e 100644
--- a/baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM
+++ b/configs/base-generic/s390x/CONFIG_I2C_PCA_PLATFORM
diff --git a/baseconfig/s390x/CONFIG_I2C_SIMTEC b/configs/base-generic/s390x/CONFIG_I2C_SIMTEC
index 1fe634955..1fe634955 100644
--- a/baseconfig/s390x/CONFIG_I2C_SIMTEC
+++ b/configs/base-generic/s390x/CONFIG_I2C_SIMTEC
diff --git a/baseconfig/s390x/CONFIG_I2C_SLAVE b/configs/base-generic/s390x/CONFIG_I2C_SLAVE
index 364b36792..364b36792 100644
--- a/baseconfig/s390x/CONFIG_I2C_SLAVE
+++ b/configs/base-generic/s390x/CONFIG_I2C_SLAVE
diff --git a/baseconfig/s390x/CONFIG_I2C_SMBUS b/configs/base-generic/s390x/CONFIG_I2C_SMBUS
index 52c7942fc..52c7942fc 100644
--- a/baseconfig/s390x/CONFIG_I2C_SMBUS
+++ b/configs/base-generic/s390x/CONFIG_I2C_SMBUS
diff --git a/baseconfig/s390x/CONFIG_I2C_STUB b/configs/base-generic/s390x/CONFIG_I2C_STUB
index a8b196bb9..a8b196bb9 100644
--- a/baseconfig/s390x/CONFIG_I2C_STUB
+++ b/configs/base-generic/s390x/CONFIG_I2C_STUB
diff --git a/baseconfig/s390x/CONFIG_I6300ESB_WDT b/configs/base-generic/s390x/CONFIG_I6300ESB_WDT
index 8c7bc0f55..8c7bc0f55 100644
--- a/baseconfig/s390x/CONFIG_I6300ESB_WDT
+++ b/configs/base-generic/s390x/CONFIG_I6300ESB_WDT
diff --git a/baseconfig/s390x/CONFIG_IBM_PARTITION b/configs/base-generic/s390x/CONFIG_IBM_PARTITION
index 185080d3d..185080d3d 100644
--- a/baseconfig/s390x/CONFIG_IBM_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_IBM_PARTITION
diff --git a/baseconfig/s390x/CONFIG_IEEE802154_DRIVERS b/configs/base-generic/s390x/CONFIG_IEEE802154_DRIVERS
index 60a8297da..60a8297da 100644
--- a/baseconfig/s390x/CONFIG_IEEE802154_DRIVERS
+++ b/configs/base-generic/s390x/CONFIG_IEEE802154_DRIVERS
diff --git a/baseconfig/s390x/CONFIG_IIO b/configs/base-generic/s390x/CONFIG_IIO
index 80d289815..80d289815 100644
--- a/baseconfig/s390x/CONFIG_IIO
+++ b/configs/base-generic/s390x/CONFIG_IIO
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB3 b/configs/base-generic/s390x/CONFIG_INFINIBAND_CXGB3
index f06c87360..f06c87360 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB3
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_CXGB3
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB4 b/configs/base-generic/s390x/CONFIG_INFINIBAND_CXGB4
index 40ff06894..40ff06894 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB4
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_CXGB4
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_MTHCA b/configs/base-generic/s390x/CONFIG_INFINIBAND_MTHCA
index a134e36a3..a134e36a3 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_MTHCA
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_MTHCA
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_NES b/configs/base-generic/s390x/CONFIG_INFINIBAND_NES
index eee505590..eee505590 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_NES
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_NES
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA b/configs/base-generic/s390x/CONFIG_INFINIBAND_OCRDMA
index 12ff35161..12ff35161 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_OCRDMA
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_QIB b/configs/base-generic/s390x/CONFIG_INFINIBAND_QIB
index 591f4e962..591f4e962 100644
--- a/baseconfig/s390x/CONFIG_INFINIBAND_QIB
+++ b/configs/base-generic/s390x/CONFIG_INFINIBAND_QIB
diff --git a/baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS b/configs/base-generic/s390x/CONFIG_INPUT_FF_MEMLESS
index 340af6632..340af6632 100644
--- a/baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS
+++ b/configs/base-generic/s390x/CONFIG_INPUT_FF_MEMLESS
diff --git a/baseconfig/s390x/CONFIG_INPUT_JOYDEV b/configs/base-generic/s390x/CONFIG_INPUT_JOYDEV
index f0730fa08..f0730fa08 100644
--- a/baseconfig/s390x/CONFIG_INPUT_JOYDEV
+++ b/configs/base-generic/s390x/CONFIG_INPUT_JOYDEV
diff --git a/baseconfig/s390x/CONFIG_INPUT_JOYSTICK b/configs/base-generic/s390x/CONFIG_INPUT_JOYSTICK
index 6f75cf815..6f75cf815 100644
--- a/baseconfig/s390x/CONFIG_INPUT_JOYSTICK
+++ b/configs/base-generic/s390x/CONFIG_INPUT_JOYSTICK
diff --git a/baseconfig/s390x/CONFIG_INPUT_KEYBOARD b/configs/base-generic/s390x/CONFIG_INPUT_KEYBOARD
index 261c77fab..261c77fab 100644
--- a/baseconfig/s390x/CONFIG_INPUT_KEYBOARD
+++ b/configs/base-generic/s390x/CONFIG_INPUT_KEYBOARD
diff --git a/baseconfig/s390x/CONFIG_INPUT_MISC b/configs/base-generic/s390x/CONFIG_INPUT_MISC
index f9ad3d4b7..f9ad3d4b7 100644
--- a/baseconfig/s390x/CONFIG_INPUT_MISC
+++ b/configs/base-generic/s390x/CONFIG_INPUT_MISC
diff --git a/baseconfig/s390x/CONFIG_INPUT_MOUSE b/configs/base-generic/s390x/CONFIG_INPUT_MOUSE
index f66060a96..f66060a96 100644
--- a/baseconfig/s390x/CONFIG_INPUT_MOUSE
+++ b/configs/base-generic/s390x/CONFIG_INPUT_MOUSE
diff --git a/baseconfig/s390x/CONFIG_INPUT_MOUSEDEV b/configs/base-generic/s390x/CONFIG_INPUT_MOUSEDEV
index 1afcd1e58..1afcd1e58 100644
--- a/baseconfig/s390x/CONFIG_INPUT_MOUSEDEV
+++ b/configs/base-generic/s390x/CONFIG_INPUT_MOUSEDEV
diff --git a/baseconfig/s390x/CONFIG_INPUT_POLLDEV b/configs/base-generic/s390x/CONFIG_INPUT_POLLDEV
index 3d67d3920..3d67d3920 100644
--- a/baseconfig/s390x/CONFIG_INPUT_POLLDEV
+++ b/configs/base-generic/s390x/CONFIG_INPUT_POLLDEV
diff --git a/baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP b/configs/base-generic/s390x/CONFIG_INPUT_SPARSEKMAP
index dce3d03cc..dce3d03cc 100644
--- a/baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP
+++ b/configs/base-generic/s390x/CONFIG_INPUT_SPARSEKMAP
diff --git a/baseconfig/s390x/CONFIG_INPUT_TABLET b/configs/base-generic/s390x/CONFIG_INPUT_TABLET
index ea8f01dfa..ea8f01dfa 100644
--- a/baseconfig/s390x/CONFIG_INPUT_TABLET
+++ b/configs/base-generic/s390x/CONFIG_INPUT_TABLET
diff --git a/baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN b/configs/base-generic/s390x/CONFIG_INPUT_TOUCHSCREEN
index e74a7dfb0..e74a7dfb0 100644
--- a/baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN
+++ b/configs/base-generic/s390x/CONFIG_INPUT_TOUCHSCREEN
diff --git a/baseconfig/s390x/CONFIG_IP1000 b/configs/base-generic/s390x/CONFIG_IP1000
index 179adb3cc..179adb3cc 100644
--- a/baseconfig/s390x/CONFIG_IP1000
+++ b/configs/base-generic/s390x/CONFIG_IP1000
diff --git a/baseconfig/s390x/CONFIG_IPL b/configs/base-generic/s390x/CONFIG_IPL
index a2b627a25..a2b627a25 100644
--- a/baseconfig/s390x/CONFIG_IPL
+++ b/configs/base-generic/s390x/CONFIG_IPL
diff --git a/baseconfig/s390x/CONFIG_IRDA b/configs/base-generic/s390x/CONFIG_IRDA
index 54366a325..54366a325 100644
--- a/baseconfig/s390x/CONFIG_IRDA
+++ b/configs/base-generic/s390x/CONFIG_IRDA
diff --git a/baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG b/configs/base-generic/s390x/CONFIG_IRQ_DOMAIN_DEBUG
index a5e0c1f27..a5e0c1f27 100644
--- a/baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG
+++ b/configs/base-generic/s390x/CONFIG_IRQ_DOMAIN_DEBUG
diff --git a/baseconfig/s390x/CONFIG_ISL29003 b/configs/base-generic/s390x/CONFIG_ISL29003
index 266725319..266725319 100644
--- a/baseconfig/s390x/CONFIG_ISL29003
+++ b/configs/base-generic/s390x/CONFIG_ISL29003
diff --git a/baseconfig/s390x/CONFIG_ISL29020 b/configs/base-generic/s390x/CONFIG_ISL29020
index abf4d72ad..abf4d72ad 100644
--- a/baseconfig/s390x/CONFIG_ISL29020
+++ b/configs/base-generic/s390x/CONFIG_ISL29020
diff --git a/baseconfig/s390x/CONFIG_IUCV b/configs/base-generic/s390x/CONFIG_IUCV
index 2ee374ce1..2ee374ce1 100644
--- a/baseconfig/s390x/CONFIG_IUCV
+++ b/configs/base-generic/s390x/CONFIG_IUCV
diff --git a/baseconfig/s390x/CONFIG_JME b/configs/base-generic/s390x/CONFIG_JME
index 63c5aeb65..63c5aeb65 100644
--- a/baseconfig/s390x/CONFIG_JME
+++ b/configs/base-generic/s390x/CONFIG_JME
diff --git a/baseconfig/s390x/CONFIG_KVM b/configs/base-generic/s390x/CONFIG_KVM
index cf9bf67a6..cf9bf67a6 100644
--- a/baseconfig/s390x/CONFIG_KVM
+++ b/configs/base-generic/s390x/CONFIG_KVM
diff --git a/baseconfig/s390x/CONFIG_KVM_S390_UCONTROL b/configs/base-generic/s390x/CONFIG_KVM_S390_UCONTROL
index f3f4b4f19..f3f4b4f19 100644
--- a/baseconfig/s390x/CONFIG_KVM_S390_UCONTROL
+++ b/configs/base-generic/s390x/CONFIG_KVM_S390_UCONTROL
diff --git a/baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE b/configs/base-generic/s390x/CONFIG_LCD_CLASS_DEVICE
index 31706ec23..31706ec23 100644
--- a/baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE
+++ b/configs/base-generic/s390x/CONFIG_LCD_CLASS_DEVICE
diff --git a/baseconfig/s390x/CONFIG_LCD_PLATFORM b/configs/base-generic/s390x/CONFIG_LCD_PLATFORM
index 893e27a06..893e27a06 100644
--- a/baseconfig/s390x/CONFIG_LCD_PLATFORM
+++ b/configs/base-generic/s390x/CONFIG_LCD_PLATFORM
diff --git a/baseconfig/s390x/CONFIG_LCS b/configs/base-generic/s390x/CONFIG_LCS
index 3bfb17f62..3bfb17f62 100644
--- a/baseconfig/s390x/CONFIG_LCS
+++ b/configs/base-generic/s390x/CONFIG_LCS
diff --git a/baseconfig/s390x/CONFIG_LOG_BUF_SHIFT b/configs/base-generic/s390x/CONFIG_LOG_BUF_SHIFT
index ab5954c55..ab5954c55 100644
--- a/baseconfig/s390x/CONFIG_LOG_BUF_SHIFT
+++ b/configs/base-generic/s390x/CONFIG_LOG_BUF_SHIFT
diff --git a/baseconfig/s390x/CONFIG_MAC80211 b/configs/base-generic/s390x/CONFIG_MAC80211
index c7003d712..c7003d712 100644
--- a/baseconfig/s390x/CONFIG_MAC80211
+++ b/configs/base-generic/s390x/CONFIG_MAC80211
diff --git a/baseconfig/s390x/CONFIG_MAC_PARTITION b/configs/base-generic/s390x/CONFIG_MAC_PARTITION
index b6cee5057..b6cee5057 100644
--- a/baseconfig/s390x/CONFIG_MAC_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_MAC_PARTITION
diff --git a/baseconfig/s390x/CONFIG_MARCH_ZEC12 b/configs/base-generic/s390x/CONFIG_MARCH_ZEC12
index 7dbcbb3f9..7dbcbb3f9 100644
--- a/baseconfig/s390x/CONFIG_MARCH_ZEC12
+++ b/configs/base-generic/s390x/CONFIG_MARCH_ZEC12
diff --git a/baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS b/configs/base-generic/s390x/CONFIG_MAX_PHYSMEM_BITS
index 6ace7a163..6ace7a163 100644
--- a/baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS
+++ b/configs/base-generic/s390x/CONFIG_MAX_PHYSMEM_BITS
diff --git a/baseconfig/s390x/CONFIG_MDIO_DEVICE b/configs/base-generic/s390x/CONFIG_MDIO_DEVICE
index 67ac6bad8..67ac6bad8 100644
--- a/baseconfig/s390x/CONFIG_MDIO_DEVICE
+++ b/configs/base-generic/s390x/CONFIG_MDIO_DEVICE
diff --git a/baseconfig/s390x/CONFIG_MEDIA_SUPPORT b/configs/base-generic/s390x/CONFIG_MEDIA_SUPPORT
index 0348bacd1..0348bacd1 100644
--- a/baseconfig/s390x/CONFIG_MEDIA_SUPPORT
+++ b/configs/base-generic/s390x/CONFIG_MEDIA_SUPPORT
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_LEGACY b/configs/base-generic/s390x/CONFIG_MEGARAID_LEGACY
index 3109de7c1..3109de7c1 100644
--- a/baseconfig/s390x/CONFIG_MEGARAID_LEGACY
+++ b/configs/base-generic/s390x/CONFIG_MEGARAID_LEGACY
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_NEWGEN b/configs/base-generic/s390x/CONFIG_MEGARAID_NEWGEN
index a132e5f39..a132e5f39 100644
--- a/baseconfig/s390x/CONFIG_MEGARAID_NEWGEN
+++ b/configs/base-generic/s390x/CONFIG_MEGARAID_NEWGEN
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_SAS b/configs/base-generic/s390x/CONFIG_MEGARAID_SAS
index 94dae93a5..94dae93a5 100644
--- a/baseconfig/s390x/CONFIG_MEGARAID_SAS
+++ b/configs/base-generic/s390x/CONFIG_MEGARAID_SAS
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG b/configs/base-generic/s390x/CONFIG_MEMORY_HOTPLUG
index ff75139e0..ff75139e0 100644
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG
+++ b/configs/base-generic/s390x/CONFIG_MEMORY_HOTPLUG
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/configs/base-generic/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
index bbbf7d364..bbbf7d364 100644
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ b/configs/base-generic/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE b/configs/base-generic/s390x/CONFIG_MEMORY_HOTREMOVE
index 362150e69..362150e69 100644
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE
+++ b/configs/base-generic/s390x/CONFIG_MEMORY_HOTREMOVE
diff --git a/baseconfig/s390x/CONFIG_MEMSTICK b/configs/base-generic/s390x/CONFIG_MEMSTICK
index c18606e43..c18606e43 100644
--- a/baseconfig/s390x/CONFIG_MEMSTICK
+++ b/configs/base-generic/s390x/CONFIG_MEMSTICK
diff --git a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY b/configs/base-generic/s390x/CONFIG_MEM_SOFT_DIRTY
index 356f2edd8..356f2edd8 100644
--- a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY
+++ b/configs/base-generic/s390x/CONFIG_MEM_SOFT_DIRTY
diff --git a/baseconfig/s390x/CONFIG_MFD_BD9571MWV b/configs/base-generic/s390x/CONFIG_MFD_BD9571MWV
index d321ad3c6..d321ad3c6 100644
--- a/baseconfig/s390x/CONFIG_MFD_BD9571MWV
+++ b/configs/base-generic/s390x/CONFIG_MFD_BD9571MWV
diff --git a/baseconfig/s390x/CONFIG_MFD_CORE b/configs/base-generic/s390x/CONFIG_MFD_CORE
index 61d91aa6e..61d91aa6e 100644
--- a/baseconfig/s390x/CONFIG_MFD_CORE
+++ b/configs/base-generic/s390x/CONFIG_MFD_CORE
diff --git a/baseconfig/s390x/CONFIG_MFD_RTSX_PCI b/configs/base-generic/s390x/CONFIG_MFD_RTSX_PCI
index 03cefd786..03cefd786 100644
--- a/baseconfig/s390x/CONFIG_MFD_RTSX_PCI
+++ b/configs/base-generic/s390x/CONFIG_MFD_RTSX_PCI
diff --git a/baseconfig/s390x/CONFIG_MFD_RTSX_USB b/configs/base-generic/s390x/CONFIG_MFD_RTSX_USB
index b6efa65e7..b6efa65e7 100644
--- a/baseconfig/s390x/CONFIG_MFD_RTSX_USB
+++ b/configs/base-generic/s390x/CONFIG_MFD_RTSX_USB
diff --git a/baseconfig/s390x/CONFIG_MFD_SM501 b/configs/base-generic/s390x/CONFIG_MFD_SM501
index 1a0ec3f74..1a0ec3f74 100644
--- a/baseconfig/s390x/CONFIG_MFD_SM501
+++ b/configs/base-generic/s390x/CONFIG_MFD_SM501
diff --git a/baseconfig/s390x/CONFIG_MFD_TPS68470 b/configs/base-generic/s390x/CONFIG_MFD_TPS68470
index e82f415aa..e82f415aa 100644
--- a/baseconfig/s390x/CONFIG_MFD_TPS68470
+++ b/configs/base-generic/s390x/CONFIG_MFD_TPS68470
diff --git a/baseconfig/s390x/CONFIG_MFD_VIPERBOARD b/configs/base-generic/s390x/CONFIG_MFD_VIPERBOARD
index 1d4d00579..1d4d00579 100644
--- a/baseconfig/s390x/CONFIG_MFD_VIPERBOARD
+++ b/configs/base-generic/s390x/CONFIG_MFD_VIPERBOARD
diff --git a/baseconfig/s390x/CONFIG_MFD_VX855 b/configs/base-generic/s390x/CONFIG_MFD_VX855
index 8c01f8ec1..8c01f8ec1 100644
--- a/baseconfig/s390x/CONFIG_MFD_VX855
+++ b/configs/base-generic/s390x/CONFIG_MFD_VX855
diff --git a/baseconfig/s390x/CONFIG_MFD_WL1273_CORE b/configs/base-generic/s390x/CONFIG_MFD_WL1273_CORE
index cfdc6c17b..cfdc6c17b 100644
--- a/baseconfig/s390x/CONFIG_MFD_WL1273_CORE
+++ b/configs/base-generic/s390x/CONFIG_MFD_WL1273_CORE
diff --git a/baseconfig/s390x/CONFIG_MISDN_HFCMULTI b/configs/base-generic/s390x/CONFIG_MISDN_HFCMULTI
index c09baa6b4..c09baa6b4 100644
--- a/baseconfig/s390x/CONFIG_MISDN_HFCMULTI
+++ b/configs/base-generic/s390x/CONFIG_MISDN_HFCMULTI
diff --git a/baseconfig/s390x/CONFIG_MLXSW_CORE b/configs/base-generic/s390x/CONFIG_MLXSW_CORE
index 31431cecf..31431cecf 100644
--- a/baseconfig/s390x/CONFIG_MLXSW_CORE
+++ b/configs/base-generic/s390x/CONFIG_MLXSW_CORE
diff --git a/baseconfig/s390x/CONFIG_MMC b/configs/base-generic/s390x/CONFIG_MMC
index 5174d5475..5174d5475 100644
--- a/baseconfig/s390x/CONFIG_MMC
+++ b/configs/base-generic/s390x/CONFIG_MMC
diff --git a/baseconfig/s390x/CONFIG_MONREADER b/configs/base-generic/s390x/CONFIG_MONREADER
index e5e7e6da0..e5e7e6da0 100644
--- a/baseconfig/s390x/CONFIG_MONREADER
+++ b/configs/base-generic/s390x/CONFIG_MONREADER
diff --git a/baseconfig/s390x/CONFIG_MONWRITER b/configs/base-generic/s390x/CONFIG_MONWRITER
index ba2b6533f..ba2b6533f 100644
--- a/baseconfig/s390x/CONFIG_MONWRITER
+++ b/configs/base-generic/s390x/CONFIG_MONWRITER
diff --git a/baseconfig/s390x/CONFIG_MSDOS_PARTITION b/configs/base-generic/s390x/CONFIG_MSDOS_PARTITION
index dda339291..dda339291 100644
--- a/baseconfig/s390x/CONFIG_MSDOS_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_MSDOS_PARTITION
diff --git a/baseconfig/s390x/CONFIG_MTD b/configs/base-generic/s390x/CONFIG_MTD
index f29845573..f29845573 100644
--- a/baseconfig/s390x/CONFIG_MTD
+++ b/configs/base-generic/s390x/CONFIG_MTD
diff --git a/baseconfig/s390x/CONFIG_NETCONSOLE b/configs/base-generic/s390x/CONFIG_NETCONSOLE
index 37ec75b06..37ec75b06 100644
--- a/baseconfig/s390x/CONFIG_NETCONSOLE
+++ b/configs/base-generic/s390x/CONFIG_NETCONSOLE
diff --git a/baseconfig/s390x/CONFIG_NETIUCV b/configs/base-generic/s390x/CONFIG_NETIUCV
index d2de263dc..d2de263dc 100644
--- a/baseconfig/s390x/CONFIG_NETIUCV
+++ b/configs/base-generic/s390x/CONFIG_NETIUCV
diff --git a/baseconfig/s390x/CONFIG_NET_CADENCE b/configs/base-generic/s390x/CONFIG_NET_CADENCE
index 8d2c645c2..8d2c645c2 100644
--- a/baseconfig/s390x/CONFIG_NET_CADENCE
+++ b/configs/base-generic/s390x/CONFIG_NET_CADENCE
diff --git a/baseconfig/s390x/CONFIG_NET_PACKET_ENGINE b/configs/base-generic/s390x/CONFIG_NET_PACKET_ENGINE
index 3ed79f437..3ed79f437 100644
--- a/baseconfig/s390x/CONFIG_NET_PACKET_ENGINE
+++ b/configs/base-generic/s390x/CONFIG_NET_PACKET_ENGINE
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_3COM b/configs/base-generic/s390x/CONFIG_NET_VENDOR_3COM
index ed6108c18..ed6108c18 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_3COM
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_3COM
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_8390 b/configs/base-generic/s390x/CONFIG_NET_VENDOR_8390
index d0b9f3592..d0b9f3592 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_8390
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_8390
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ADAPTEC
index c96958732..c96958732 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ADAPTEC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AGERE b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AGERE
index 3647271ce..3647271ce 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AGERE
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AGERE
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ALTEON
index 88beca48e..88beca48e 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ALTEON
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AMAZON
index 707bb5a54..707bb5a54 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AMAZON
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AMD b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AMD
index 606381824..606381824 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AMD
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_AMD
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ARC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ARC
index 98de35136..98de35136 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ARC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ARC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ATHEROS
index 9a99ac7fc..9a99ac7fc 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ATHEROS
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM b/configs/base-generic/s390x/CONFIG_NET_VENDOR_BROADCOM
index 7cd9cb32f..7cd9cb32f 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_BROADCOM
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE b/configs/base-generic/s390x/CONFIG_NET_VENDOR_BROCADE
index fed5e48a4..fed5e48a4 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_BROCADE
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO b/configs/base-generic/s390x/CONFIG_NET_VENDOR_CHELSIO
index 71374072a..71374072a 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_CHELSIO
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_CISCO b/configs/base-generic/s390x/CONFIG_NET_VENDOR_CISCO
index 7b4bdaa25..7b4bdaa25 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_CISCO
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_CISCO
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_DEC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_DEC
index 7c3a697fb..7c3a697fb 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_DEC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_DEC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_DLINK b/configs/base-generic/s390x/CONFIG_NET_VENDOR_DLINK
index 181e6a008..181e6a008 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_DLINK
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_DLINK
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX b/configs/base-generic/s390x/CONFIG_NET_VENDOR_EMULEX
index e48620d8d..e48620d8d 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_EMULEX
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_EXAR b/configs/base-generic/s390x/CONFIG_NET_VENDOR_EXAR
index 90a6a31bb..90a6a31bb 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_EXAR
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_EXAR
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_HP b/configs/base-generic/s390x/CONFIG_NET_VENDOR_HP
index 30f3b4050..30f3b4050 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_HP
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_HP
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_INTEL b/configs/base-generic/s390x/CONFIG_NET_VENDOR_INTEL
index 201973acd..201973acd 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_INTEL
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_INTEL
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MARVELL
index ebe703be2..ebe703be2 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MARVELL
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MICREL b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MICREL
index d359479e3..d359479e3 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MICREL
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MICREL
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MYRI b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MYRI
index 03d6c850f..03d6c850f 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MYRI
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_MYRI
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NATSEMI
index f2bf134ab..f2bf134ab 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NATSEMI
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NETRONOME
index d08e277d0..d08e277d0 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NETRONOME
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NVIDIA
index 27ee4d58c..27ee4d58c 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_NVIDIA
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_OKI b/configs/base-generic/s390x/CONFIG_NET_VENDOR_OKI
index e6b6bc896..e6b6bc896 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_OKI
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_OKI
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_QLOGIC
index 700f6a5e2..700f6a5e2 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_QLOGIC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_RDC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_RDC
index 4d84f77dc..4d84f77dc 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_RDC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_RDC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK b/configs/base-generic/s390x/CONFIG_NET_VENDOR_REALTEK
index f21c4dcb0..f21c4dcb0 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_REALTEK
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ROCKER
index ab286d286..ab286d286 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_ROCKER
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SEEQ
index 6fe8245eb..6fe8245eb 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SEEQ
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SILAN b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SILAN
index 07a129493..07a129493 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SILAN
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SILAN
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SIS b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SIS
index 5ff2e309b..5ff2e309b 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SIS
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SIS
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SMSC b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SMSC
index 4e3e7aec8..4e3e7aec8 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SMSC
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SMSC
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO b/configs/base-generic/s390x/CONFIG_NET_VENDOR_STMICRO
index 040f835c6..040f835c6 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_STMICRO
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SUN b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SUN
index a4ce77875..a4ce77875 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SUN
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_SUN
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI b/configs/base-generic/s390x/CONFIG_NET_VENDOR_TEHUTI
index 7c0c6ee39..7c0c6ee39 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_TEHUTI
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_TI b/configs/base-generic/s390x/CONFIG_NET_VENDOR_TI
index a9395e8cc..a9395e8cc 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_TI
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_TI
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_VIA b/configs/base-generic/s390x/CONFIG_NET_VENDOR_VIA
index ddca33bb4..ddca33bb4 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_VIA
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_VIA
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET b/configs/base-generic/s390x/CONFIG_NET_VENDOR_WIZNET
index 08efd75ae..08efd75ae 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_WIZNET
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM b/configs/base-generic/s390x/CONFIG_NET_VENDOR_XIRCOM
index 4c2e6f9fd..4c2e6f9fd 100644
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM
+++ b/configs/base-generic/s390x/CONFIG_NET_VENDOR_XIRCOM
diff --git a/baseconfig/s390x/CONFIG_NEW_LEDS b/configs/base-generic/s390x/CONFIG_NEW_LEDS
index 3d1c33f73..3d1c33f73 100644
--- a/baseconfig/s390x/CONFIG_NEW_LEDS
+++ b/configs/base-generic/s390x/CONFIG_NEW_LEDS
diff --git a/baseconfig/s390x/CONFIG_NFC b/configs/base-generic/s390x/CONFIG_NFC
index 73cd9395e..73cd9395e 100644
--- a/baseconfig/s390x/CONFIG_NFC
+++ b/configs/base-generic/s390x/CONFIG_NFC
diff --git a/baseconfig/s390x/CONFIG_NODES_SHIFT b/configs/base-generic/s390x/CONFIG_NODES_SHIFT
index 747517623..747517623 100644
--- a/baseconfig/s390x/CONFIG_NODES_SHIFT
+++ b/configs/base-generic/s390x/CONFIG_NODES_SHIFT
diff --git a/baseconfig/s390x/CONFIG_NOZOMI b/configs/base-generic/s390x/CONFIG_NOZOMI
index 35ef1afd5..35ef1afd5 100644
--- a/baseconfig/s390x/CONFIG_NOZOMI
+++ b/configs/base-generic/s390x/CONFIG_NOZOMI
diff --git a/baseconfig/s390x/CONFIG_NR_CPUS b/configs/base-generic/s390x/CONFIG_NR_CPUS
index fa1ab7e94..fa1ab7e94 100644
--- a/baseconfig/s390x/CONFIG_NR_CPUS
+++ b/configs/base-generic/s390x/CONFIG_NR_CPUS
diff --git a/baseconfig/s390x/CONFIG_NUMA b/configs/base-generic/s390x/CONFIG_NUMA
index e480f0c04..e480f0c04 100644
--- a/baseconfig/s390x/CONFIG_NUMA
+++ b/configs/base-generic/s390x/CONFIG_NUMA
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING b/configs/base-generic/s390x/CONFIG_NUMA_BALANCING
index 9de89d51d..9de89d51d 100644
--- a/baseconfig/s390x/CONFIG_NUMA_BALANCING
+++ b/configs/base-generic/s390x/CONFIG_NUMA_BALANCING
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/configs/base-generic/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 4b6d5fcee..4b6d5fcee 100644
--- a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/configs/base-generic/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
diff --git a/baseconfig/s390x/CONFIG_NUMA_EMU b/configs/base-generic/s390x/CONFIG_NUMA_EMU
index a444d47bb..a444d47bb 100644
--- a/baseconfig/s390x/CONFIG_NUMA_EMU
+++ b/configs/base-generic/s390x/CONFIG_NUMA_EMU
diff --git a/baseconfig/s390x/CONFIG_N_GSM b/configs/base-generic/s390x/CONFIG_N_GSM
index e00ec7e28..e00ec7e28 100644
--- a/baseconfig/s390x/CONFIG_N_GSM
+++ b/configs/base-generic/s390x/CONFIG_N_GSM
diff --git a/baseconfig/s390x/CONFIG_OF b/configs/base-generic/s390x/CONFIG_OF
index d15176e9c..d15176e9c 100644
--- a/baseconfig/s390x/CONFIG_OF
+++ b/configs/base-generic/s390x/CONFIG_OF
diff --git a/baseconfig/s390x/CONFIG_OSF_PARTITION b/configs/base-generic/s390x/CONFIG_OSF_PARTITION
index 50b3cb64e..50b3cb64e 100644
--- a/baseconfig/s390x/CONFIG_OSF_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_OSF_PARTITION
diff --git a/baseconfig/s390x/CONFIG_PACK_STACK b/configs/base-generic/s390x/CONFIG_PACK_STACK
index 8182d4c4f..8182d4c4f 100644
--- a/baseconfig/s390x/CONFIG_PACK_STACK
+++ b/configs/base-generic/s390x/CONFIG_PACK_STACK
diff --git a/baseconfig/s390x/CONFIG_PARTITION_ADVANCED b/configs/base-generic/s390x/CONFIG_PARTITION_ADVANCED
index 313ee5586..313ee5586 100644
--- a/baseconfig/s390x/CONFIG_PARTITION_ADVANCED
+++ b/configs/base-generic/s390x/CONFIG_PARTITION_ADVANCED
diff --git a/baseconfig/s390x/CONFIG_PCI b/configs/base-generic/s390x/CONFIG_PCI
index c499609c3..c499609c3 100644
--- a/baseconfig/s390x/CONFIG_PCI
+++ b/configs/base-generic/s390x/CONFIG_PCI
diff --git a/baseconfig/s390x/CONFIG_PCIPCWATCHDOG b/configs/base-generic/s390x/CONFIG_PCIPCWATCHDOG
index 717da169d..717da169d 100644
--- a/baseconfig/s390x/CONFIG_PCIPCWATCHDOG
+++ b/configs/base-generic/s390x/CONFIG_PCIPCWATCHDOG
diff --git a/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN b/configs/base-generic/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN
index 2d1ad5bb1..2d1ad5bb1 100644
--- a/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN
+++ b/configs/base-generic/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN
diff --git a/baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS b/configs/base-generic/s390x/CONFIG_PCI_NR_FUNCTIONS
index 5d60ce184..5d60ce184 100644
--- a/baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS
+++ b/configs/base-generic/s390x/CONFIG_PCI_NR_FUNCTIONS
diff --git a/baseconfig/s390x/CONFIG_PCMCIA b/configs/base-generic/s390x/CONFIG_PCMCIA
index 3cf9bfbdc..3cf9bfbdc 100644
--- a/baseconfig/s390x/CONFIG_PCMCIA
+++ b/configs/base-generic/s390x/CONFIG_PCMCIA
diff --git a/baseconfig/s390x/CONFIG_PFAULT b/configs/base-generic/s390x/CONFIG_PFAULT
index 3b8378a03..3b8378a03 100644
--- a/baseconfig/s390x/CONFIG_PFAULT
+++ b/configs/base-generic/s390x/CONFIG_PFAULT
diff --git a/baseconfig/s390x/CONFIG_PHYLIB b/configs/base-generic/s390x/CONFIG_PHYLIB
index 9ecd6c079..9ecd6c079 100644
--- a/baseconfig/s390x/CONFIG_PHYLIB
+++ b/configs/base-generic/s390x/CONFIG_PHYLIB
diff --git a/baseconfig/s390x/CONFIG_PKEY b/configs/base-generic/s390x/CONFIG_PKEY
index ec0fc60b1..ec0fc60b1 100644
--- a/baseconfig/s390x/CONFIG_PKEY
+++ b/configs/base-generic/s390x/CONFIG_PKEY
diff --git a/baseconfig/s390x/CONFIG_PM_DEVFREQ b/configs/base-generic/s390x/CONFIG_PM_DEVFREQ
index ada3814f1..ada3814f1 100644
--- a/baseconfig/s390x/CONFIG_PM_DEVFREQ
+++ b/configs/base-generic/s390x/CONFIG_PM_DEVFREQ
diff --git a/baseconfig/s390x/CONFIG_POWER_RESET b/configs/base-generic/s390x/CONFIG_POWER_RESET
index ecb8fc786..ecb8fc786 100644
--- a/baseconfig/s390x/CONFIG_POWER_RESET
+++ b/configs/base-generic/s390x/CONFIG_POWER_RESET
diff --git a/baseconfig/s390x/CONFIG_PREEMPT_TRACER b/configs/base-generic/s390x/CONFIG_PREEMPT_TRACER
index 42ab34971..42ab34971 100644
--- a/baseconfig/s390x/CONFIG_PREEMPT_TRACER
+++ b/configs/base-generic/s390x/CONFIG_PREEMPT_TRACER
diff --git a/baseconfig/s390x/CONFIG_PWM b/configs/base-generic/s390x/CONFIG_PWM
index 650ee865d..650ee865d 100644
--- a/baseconfig/s390x/CONFIG_PWM
+++ b/configs/base-generic/s390x/CONFIG_PWM
diff --git a/baseconfig/s390x/CONFIG_QDIO b/configs/base-generic/s390x/CONFIG_QDIO
index c024224b5..c024224b5 100644
--- a/baseconfig/s390x/CONFIG_QDIO
+++ b/configs/base-generic/s390x/CONFIG_QDIO
diff --git a/baseconfig/s390x/CONFIG_QETH b/configs/base-generic/s390x/CONFIG_QETH
index 8d10b2b02..8d10b2b02 100644
--- a/baseconfig/s390x/CONFIG_QETH
+++ b/configs/base-generic/s390x/CONFIG_QETH
diff --git a/baseconfig/s390x/CONFIG_QETH_IPV6 b/configs/base-generic/s390x/CONFIG_QETH_IPV6
index 167c02d00..167c02d00 100644
--- a/baseconfig/s390x/CONFIG_QETH_IPV6
+++ b/configs/base-generic/s390x/CONFIG_QETH_IPV6
diff --git a/baseconfig/s390x/CONFIG_QETH_L2 b/configs/base-generic/s390x/CONFIG_QETH_L2
index fb872ff9a..fb872ff9a 100644
--- a/baseconfig/s390x/CONFIG_QETH_L2
+++ b/configs/base-generic/s390x/CONFIG_QETH_L2
diff --git a/baseconfig/s390x/CONFIG_QETH_L3 b/configs/base-generic/s390x/CONFIG_QETH_L3
index 248169a7b..248169a7b 100644
--- a/baseconfig/s390x/CONFIG_QETH_L3
+++ b/configs/base-generic/s390x/CONFIG_QETH_L3
diff --git a/baseconfig/s390x/CONFIG_R3964 b/configs/base-generic/s390x/CONFIG_R3964
index cca74303c..cca74303c 100644
--- a/baseconfig/s390x/CONFIG_R3964
+++ b/configs/base-generic/s390x/CONFIG_R3964
diff --git a/baseconfig/s390x/CONFIG_RCU_FANOUT b/configs/base-generic/s390x/CONFIG_RCU_FANOUT
index e95447c12..e95447c12 100644
--- a/baseconfig/s390x/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/s390x/CONFIG_RCU_FANOUT
diff --git a/baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF b/configs/base-generic/s390x/CONFIG_RCU_FANOUT_LEAF
index 147351a49..147351a49 100644
--- a/baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF
+++ b/configs/base-generic/s390x/CONFIG_RCU_FANOUT_LEAF
diff --git a/baseconfig/s390x/CONFIG_RESET_CONTROLLER b/configs/base-generic/s390x/CONFIG_RESET_CONTROLLER
index 0f97f3f23..0f97f3f23 100644
--- a/baseconfig/s390x/CONFIG_RESET_CONTROLLER
+++ b/configs/base-generic/s390x/CONFIG_RESET_CONTROLLER
diff --git a/baseconfig/s390x/CONFIG_RFKILL b/configs/base-generic/s390x/CONFIG_RFKILL
index f840ecd26..f840ecd26 100644
--- a/baseconfig/s390x/CONFIG_RFKILL
+++ b/configs/base-generic/s390x/CONFIG_RFKILL
diff --git a/baseconfig/s390x/CONFIG_RMI4_CORE b/configs/base-generic/s390x/CONFIG_RMI4_CORE
index 94b27f88c..94b27f88c 100644
--- a/baseconfig/s390x/CONFIG_RMI4_CORE
+++ b/configs/base-generic/s390x/CONFIG_RMI4_CORE
diff --git a/baseconfig/s390x/CONFIG_S390_CCW_IOMMU b/configs/base-generic/s390x/CONFIG_S390_CCW_IOMMU
index 7dd58dfa7..7dd58dfa7 100644
--- a/baseconfig/s390x/CONFIG_S390_CCW_IOMMU
+++ b/configs/base-generic/s390x/CONFIG_S390_CCW_IOMMU
diff --git a/baseconfig/s390x/CONFIG_S390_GUEST b/configs/base-generic/s390x/CONFIG_S390_GUEST
index 6c2fd6328..6c2fd6328 100644
--- a/baseconfig/s390x/CONFIG_S390_GUEST
+++ b/configs/base-generic/s390x/CONFIG_S390_GUEST
diff --git a/baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT b/configs/base-generic/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT
index e69010cb7..e69010cb7 100644
--- a/baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT
+++ b/configs/base-generic/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT
diff --git a/baseconfig/s390x/CONFIG_S390_HYPFS_FS b/configs/base-generic/s390x/CONFIG_S390_HYPFS_FS
index 335ddc330..335ddc330 100644
--- a/baseconfig/s390x/CONFIG_S390_HYPFS_FS
+++ b/configs/base-generic/s390x/CONFIG_S390_HYPFS_FS
diff --git a/baseconfig/s390x/CONFIG_S390_PRNG b/configs/base-generic/s390x/CONFIG_S390_PRNG
index 657a61496..657a61496 100644
--- a/baseconfig/s390x/CONFIG_S390_PRNG
+++ b/configs/base-generic/s390x/CONFIG_S390_PRNG
diff --git a/baseconfig/s390x/CONFIG_S390_PTDUMP b/configs/base-generic/s390x/CONFIG_S390_PTDUMP
index b268bbaed..b268bbaed 100644
--- a/baseconfig/s390x/CONFIG_S390_PTDUMP
+++ b/configs/base-generic/s390x/CONFIG_S390_PTDUMP
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE b/configs/base-generic/s390x/CONFIG_S390_TAPE
index eafaa7dc0..eafaa7dc0 100644
--- a/baseconfig/s390x/CONFIG_S390_TAPE
+++ b/configs/base-generic/s390x/CONFIG_S390_TAPE
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE_34XX b/configs/base-generic/s390x/CONFIG_S390_TAPE_34XX
index 03374a3f0..03374a3f0 100644
--- a/baseconfig/s390x/CONFIG_S390_TAPE_34XX
+++ b/configs/base-generic/s390x/CONFIG_S390_TAPE_34XX
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE_3590 b/configs/base-generic/s390x/CONFIG_S390_TAPE_3590
index 275b3e5bc..275b3e5bc 100644
--- a/baseconfig/s390x/CONFIG_S390_TAPE_3590
+++ b/configs/base-generic/s390x/CONFIG_S390_TAPE_3590
diff --git a/baseconfig/s390x/CONFIG_S390_VMUR b/configs/base-generic/s390x/CONFIG_S390_VMUR
index 7672ac928..7672ac928 100644
--- a/baseconfig/s390x/CONFIG_S390_VMUR
+++ b/configs/base-generic/s390x/CONFIG_S390_VMUR
diff --git a/baseconfig/s390x/CONFIG_SCHED_BOOK b/configs/base-generic/s390x/CONFIG_SCHED_BOOK
index ef8a1d29c..ef8a1d29c 100644
--- a/baseconfig/s390x/CONFIG_SCHED_BOOK
+++ b/configs/base-generic/s390x/CONFIG_SCHED_BOOK
diff --git a/baseconfig/s390x/CONFIG_SCHED_MC b/configs/base-generic/s390x/CONFIG_SCHED_MC
index 348674403..348674403 100644
--- a/baseconfig/s390x/CONFIG_SCHED_MC
+++ b/configs/base-generic/s390x/CONFIG_SCHED_MC
diff --git a/baseconfig/s390x/CONFIG_SCHED_TOPOLOGY b/configs/base-generic/s390x/CONFIG_SCHED_TOPOLOGY
index f26c78761..f26c78761 100644
--- a/baseconfig/s390x/CONFIG_SCHED_TOPOLOGY
+++ b/configs/base-generic/s390x/CONFIG_SCHED_TOPOLOGY
diff --git a/baseconfig/s390x/CONFIG_SCLP_ASYNC b/configs/base-generic/s390x/CONFIG_SCLP_ASYNC
index b4408b75a..b4408b75a 100644
--- a/baseconfig/s390x/CONFIG_SCLP_ASYNC
+++ b/configs/base-generic/s390x/CONFIG_SCLP_ASYNC
diff --git a/baseconfig/s390x/CONFIG_SCLP_ASYNC_ID b/configs/base-generic/s390x/CONFIG_SCLP_ASYNC_ID
index c99c14855..c99c14855 100644
--- a/baseconfig/s390x/CONFIG_SCLP_ASYNC_ID
+++ b/configs/base-generic/s390x/CONFIG_SCLP_ASYNC_ID
diff --git a/baseconfig/s390x/CONFIG_SCLP_CONSOLE b/configs/base-generic/s390x/CONFIG_SCLP_CONSOLE
index f254d3f46..f254d3f46 100644
--- a/baseconfig/s390x/CONFIG_SCLP_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_SCLP_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_SCLP_OFB b/configs/base-generic/s390x/CONFIG_SCLP_OFB
index 62cca9859..62cca9859 100644
--- a/baseconfig/s390x/CONFIG_SCLP_OFB
+++ b/configs/base-generic/s390x/CONFIG_SCLP_OFB
diff --git a/baseconfig/s390x/CONFIG_SCLP_TTY b/configs/base-generic/s390x/CONFIG_SCLP_TTY
index 6761090ee..6761090ee 100644
--- a/baseconfig/s390x/CONFIG_SCLP_TTY
+++ b/configs/base-generic/s390x/CONFIG_SCLP_TTY
diff --git a/baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE b/configs/base-generic/s390x/CONFIG_SCLP_VT220_CONSOLE
index 881f42dc0..881f42dc0 100644
--- a/baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_SCLP_VT220_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_SCLP_VT220_TTY b/configs/base-generic/s390x/CONFIG_SCLP_VT220_TTY
index 788261706..788261706 100644
--- a/baseconfig/s390x/CONFIG_SCLP_VT220_TTY
+++ b/configs/base-generic/s390x/CONFIG_SCLP_VT220_TTY
diff --git a/baseconfig/s390x/CONFIG_SCM_BLOCK b/configs/base-generic/s390x/CONFIG_SCM_BLOCK
index bcad0f536..bcad0f536 100644
--- a/baseconfig/s390x/CONFIG_SCM_BLOCK
+++ b/configs/base-generic/s390x/CONFIG_SCM_BLOCK
diff --git a/baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE b/configs/base-generic/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE
index 1461f92ad..1461f92ad 100644
--- a/baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE
+++ b/configs/base-generic/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE
diff --git a/baseconfig/s390x/CONFIG_SCM_BUS b/configs/base-generic/s390x/CONFIG_SCM_BUS
index 5e2adaef4..5e2adaef4 100644
--- a/baseconfig/s390x/CONFIG_SCM_BUS
+++ b/configs/base-generic/s390x/CONFIG_SCM_BUS
diff --git a/baseconfig/s390x/CONFIG_SCSI_3W_9XXX b/configs/base-generic/s390x/CONFIG_SCSI_3W_9XXX
index 00de6f158..00de6f158 100644
--- a/baseconfig/s390x/CONFIG_SCSI_3W_9XXX
+++ b/configs/base-generic/s390x/CONFIG_SCSI_3W_9XXX
diff --git a/baseconfig/s390x/CONFIG_SCSI_3W_SAS b/configs/base-generic/s390x/CONFIG_SCSI_3W_SAS
index 06a89f918..06a89f918 100644
--- a/baseconfig/s390x/CONFIG_SCSI_3W_SAS
+++ b/configs/base-generic/s390x/CONFIG_SCSI_3W_SAS
diff --git a/baseconfig/s390x/CONFIG_SCSI_AACRAID b/configs/base-generic/s390x/CONFIG_SCSI_AACRAID
index 5686e689d..5686e689d 100644
--- a/baseconfig/s390x/CONFIG_SCSI_AACRAID
+++ b/configs/base-generic/s390x/CONFIG_SCSI_AACRAID
diff --git a/baseconfig/s390x/CONFIG_SCSI_ACARD b/configs/base-generic/s390x/CONFIG_SCSI_ACARD
index d4002ddd0..d4002ddd0 100644
--- a/baseconfig/s390x/CONFIG_SCSI_ACARD
+++ b/configs/base-generic/s390x/CONFIG_SCSI_ACARD
diff --git a/baseconfig/s390x/CONFIG_SCSI_AIC79XX b/configs/base-generic/s390x/CONFIG_SCSI_AIC79XX
index 801fade38..801fade38 100644
--- a/baseconfig/s390x/CONFIG_SCSI_AIC79XX
+++ b/configs/base-generic/s390x/CONFIG_SCSI_AIC79XX
diff --git a/baseconfig/s390x/CONFIG_SCSI_AIC7XXX b/configs/base-generic/s390x/CONFIG_SCSI_AIC7XXX
index f305031d0..f305031d0 100644
--- a/baseconfig/s390x/CONFIG_SCSI_AIC7XXX
+++ b/configs/base-generic/s390x/CONFIG_SCSI_AIC7XXX
diff --git a/baseconfig/s390x/CONFIG_SCSI_AM53C974 b/configs/base-generic/s390x/CONFIG_SCSI_AM53C974
index ce64864a7..ce64864a7 100644
--- a/baseconfig/s390x/CONFIG_SCSI_AM53C974
+++ b/configs/base-generic/s390x/CONFIG_SCSI_AM53C974
diff --git a/baseconfig/s390x/CONFIG_SCSI_ARCMSR b/configs/base-generic/s390x/CONFIG_SCSI_ARCMSR
index 425f89f74..425f89f74 100644
--- a/baseconfig/s390x/CONFIG_SCSI_ARCMSR
+++ b/configs/base-generic/s390x/CONFIG_SCSI_ARCMSR
diff --git a/baseconfig/s390x/CONFIG_SCSI_BFA_FC b/configs/base-generic/s390x/CONFIG_SCSI_BFA_FC
index 8568e1ec8..8568e1ec8 100644
--- a/baseconfig/s390x/CONFIG_SCSI_BFA_FC
+++ b/configs/base-generic/s390x/CONFIG_SCSI_BFA_FC
diff --git a/baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE b/configs/base-generic/s390x/CONFIG_SCSI_BNX2X_FCOE
index 5d36d085f..5d36d085f 100644
--- a/baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE
+++ b/configs/base-generic/s390x/CONFIG_SCSI_BNX2X_FCOE
diff --git a/baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI b/configs/base-generic/s390x/CONFIG_SCSI_BNX2_ISCSI
index d400977df..d400977df 100644
--- a/baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI
+++ b/configs/base-generic/s390x/CONFIG_SCSI_BNX2_ISCSI
diff --git a/baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE b/configs/base-generic/s390x/CONFIG_SCSI_CHELSIO_FCOE
index ad8110de9..ad8110de9 100644
--- a/baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE
+++ b/configs/base-generic/s390x/CONFIG_SCSI_CHELSIO_FCOE
diff --git a/baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI b/configs/base-generic/s390x/CONFIG_SCSI_CXGB3_ISCSI
index d1e803258..d1e803258 100644
--- a/baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI
+++ b/configs/base-generic/s390x/CONFIG_SCSI_CXGB3_ISCSI
diff --git a/baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI b/configs/base-generic/s390x/CONFIG_SCSI_CXGB4_ISCSI
index 27a4bb985..27a4bb985 100644
--- a/baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI
+++ b/configs/base-generic/s390x/CONFIG_SCSI_CXGB4_ISCSI
diff --git a/baseconfig/s390x/CONFIG_SCSI_DC395x b/configs/base-generic/s390x/CONFIG_SCSI_DC395x
index 04438189f..04438189f 100644
--- a/baseconfig/s390x/CONFIG_SCSI_DC395x
+++ b/configs/base-generic/s390x/CONFIG_SCSI_DC395x
diff --git a/baseconfig/s390x/CONFIG_SCSI_DH b/configs/base-generic/s390x/CONFIG_SCSI_DH
index e5b8a74ea..e5b8a74ea 100644
--- a/baseconfig/s390x/CONFIG_SCSI_DH
+++ b/configs/base-generic/s390x/CONFIG_SCSI_DH
diff --git a/baseconfig/s390x/CONFIG_SCSI_DMX3191D b/configs/base-generic/s390x/CONFIG_SCSI_DMX3191D
index 291b9196e..291b9196e 100644
--- a/baseconfig/s390x/CONFIG_SCSI_DMX3191D
+++ b/configs/base-generic/s390x/CONFIG_SCSI_DMX3191D
diff --git a/baseconfig/s390x/CONFIG_SCSI_ESAS2R b/configs/base-generic/s390x/CONFIG_SCSI_ESAS2R
index 190cb39db..190cb39db 100644
--- a/baseconfig/s390x/CONFIG_SCSI_ESAS2R
+++ b/configs/base-generic/s390x/CONFIG_SCSI_ESAS2R
diff --git a/baseconfig/s390x/CONFIG_SCSI_HPSA b/configs/base-generic/s390x/CONFIG_SCSI_HPSA
index e2d1a299c..e2d1a299c 100644
--- a/baseconfig/s390x/CONFIG_SCSI_HPSA
+++ b/configs/base-generic/s390x/CONFIG_SCSI_HPSA
diff --git a/baseconfig/s390x/CONFIG_SCSI_HPTIOP b/configs/base-generic/s390x/CONFIG_SCSI_HPTIOP
index e92d4a91f..e92d4a91f 100644
--- a/baseconfig/s390x/CONFIG_SCSI_HPTIOP
+++ b/configs/base-generic/s390x/CONFIG_SCSI_HPTIOP
diff --git a/baseconfig/s390x/CONFIG_SCSI_INIA100 b/configs/base-generic/s390x/CONFIG_SCSI_INIA100
index 50f5dd42b..50f5dd42b 100644
--- a/baseconfig/s390x/CONFIG_SCSI_INIA100
+++ b/configs/base-generic/s390x/CONFIG_SCSI_INIA100
diff --git a/baseconfig/s390x/CONFIG_SCSI_INITIO b/configs/base-generic/s390x/CONFIG_SCSI_INITIO
index 7abe6c2d9..7abe6c2d9 100644
--- a/baseconfig/s390x/CONFIG_SCSI_INITIO
+++ b/configs/base-generic/s390x/CONFIG_SCSI_INITIO
diff --git a/baseconfig/s390x/CONFIG_SCSI_IPS b/configs/base-generic/s390x/CONFIG_SCSI_IPS
index 32e4abe67..32e4abe67 100644
--- a/baseconfig/s390x/CONFIG_SCSI_IPS
+++ b/configs/base-generic/s390x/CONFIG_SCSI_IPS
diff --git a/baseconfig/s390x/CONFIG_SCSI_LPFC b/configs/base-generic/s390x/CONFIG_SCSI_LPFC
index 2bbb943d3..2bbb943d3 100644
--- a/baseconfig/s390x/CONFIG_SCSI_LPFC
+++ b/configs/base-generic/s390x/CONFIG_SCSI_LPFC
diff --git a/baseconfig/s390x/CONFIG_SCSI_MPT2SAS b/configs/base-generic/s390x/CONFIG_SCSI_MPT2SAS
index aca3c70c3..aca3c70c3 100644
--- a/baseconfig/s390x/CONFIG_SCSI_MPT2SAS
+++ b/configs/base-generic/s390x/CONFIG_SCSI_MPT2SAS
diff --git a/baseconfig/s390x/CONFIG_SCSI_MPT3SAS b/configs/base-generic/s390x/CONFIG_SCSI_MPT3SAS
index 887255096..887255096 100644
--- a/baseconfig/s390x/CONFIG_SCSI_MPT3SAS
+++ b/configs/base-generic/s390x/CONFIG_SCSI_MPT3SAS
diff --git a/baseconfig/s390x/CONFIG_SCSI_MVSAS b/configs/base-generic/s390x/CONFIG_SCSI_MVSAS
index dd17532f6..dd17532f6 100644
--- a/baseconfig/s390x/CONFIG_SCSI_MVSAS
+++ b/configs/base-generic/s390x/CONFIG_SCSI_MVSAS
diff --git a/baseconfig/s390x/CONFIG_SCSI_MVUMI b/configs/base-generic/s390x/CONFIG_SCSI_MVUMI
index a9b158a85..a9b158a85 100644
--- a/baseconfig/s390x/CONFIG_SCSI_MVUMI
+++ b/configs/base-generic/s390x/CONFIG_SCSI_MVUMI
diff --git a/baseconfig/s390x/CONFIG_SCSI_PM8001 b/configs/base-generic/s390x/CONFIG_SCSI_PM8001
index ddafafd46..ddafafd46 100644
--- a/baseconfig/s390x/CONFIG_SCSI_PM8001
+++ b/configs/base-generic/s390x/CONFIG_SCSI_PM8001
diff --git a/baseconfig/s390x/CONFIG_SCSI_PMCRAID b/configs/base-generic/s390x/CONFIG_SCSI_PMCRAID
index 91c798c43..91c798c43 100644
--- a/baseconfig/s390x/CONFIG_SCSI_PMCRAID
+++ b/configs/base-generic/s390x/CONFIG_SCSI_PMCRAID
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLA_FC b/configs/base-generic/s390x/CONFIG_SCSI_QLA_FC
index f8042094e..f8042094e 100644
--- a/baseconfig/s390x/CONFIG_SCSI_QLA_FC
+++ b/configs/base-generic/s390x/CONFIG_SCSI_QLA_FC
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI b/configs/base-generic/s390x/CONFIG_SCSI_QLA_ISCSI
index 14ad3035a..14ad3035a 100644
--- a/baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI
+++ b/configs/base-generic/s390x/CONFIG_SCSI_QLA_ISCSI
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLOGIC_1280 b/configs/base-generic/s390x/CONFIG_SCSI_QLOGIC_1280
index 98bf0179a..98bf0179a 100644
--- a/baseconfig/s390x/CONFIG_SCSI_QLOGIC_1280
+++ b/configs/base-generic/s390x/CONFIG_SCSI_QLOGIC_1280
diff --git a/baseconfig/s390x/CONFIG_SCSI_SNIC b/configs/base-generic/s390x/CONFIG_SCSI_SNIC
index 5fa55adc9..5fa55adc9 100644
--- a/baseconfig/s390x/CONFIG_SCSI_SNIC
+++ b/configs/base-generic/s390x/CONFIG_SCSI_SNIC
diff --git a/baseconfig/s390x/CONFIG_SCSI_STEX b/configs/base-generic/s390x/CONFIG_SCSI_STEX
index 51be1d1eb..51be1d1eb 100644
--- a/baseconfig/s390x/CONFIG_SCSI_STEX
+++ b/configs/base-generic/s390x/CONFIG_SCSI_STEX
diff --git a/baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_2 b/configs/base-generic/s390x/CONFIG_SCSI_SYM53C8XX_2
index 1cb592105..1cb592105 100644
--- a/baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_2
+++ b/configs/base-generic/s390x/CONFIG_SCSI_SYM53C8XX_2
diff --git a/baseconfig/s390x/CONFIG_SCSI_UFSHCD b/configs/base-generic/s390x/CONFIG_SCSI_UFSHCD
index 542c89fc7..542c89fc7 100644
--- a/baseconfig/s390x/CONFIG_SCSI_UFSHCD
+++ b/configs/base-generic/s390x/CONFIG_SCSI_UFSHCD
diff --git a/baseconfig/s390x/CONFIG_SCSI_WD719X b/configs/base-generic/s390x/CONFIG_SCSI_WD719X
index 96273e303..96273e303 100644
--- a/baseconfig/s390x/CONFIG_SCSI_WD719X
+++ b/configs/base-generic/s390x/CONFIG_SCSI_WD719X
diff --git a/baseconfig/s390x/CONFIG_SENSORS_APDS990X b/configs/base-generic/s390x/CONFIG_SENSORS_APDS990X
index 3aa738be2..3aa738be2 100644
--- a/baseconfig/s390x/CONFIG_SENSORS_APDS990X
+++ b/configs/base-generic/s390x/CONFIG_SENSORS_APDS990X
diff --git a/baseconfig/s390x/CONFIG_SENSORS_BH1770 b/configs/base-generic/s390x/CONFIG_SENSORS_BH1770
index f6d8bfafa..f6d8bfafa 100644
--- a/baseconfig/s390x/CONFIG_SENSORS_BH1770
+++ b/configs/base-generic/s390x/CONFIG_SENSORS_BH1770
diff --git a/baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D b/configs/base-generic/s390x/CONFIG_SENSORS_LIS3LV02D
index 37a6cf6ac..37a6cf6ac 100644
--- a/baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D
+++ b/configs/base-generic/s390x/CONFIG_SENSORS_LIS3LV02D
diff --git a/baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C b/configs/base-generic/s390x/CONFIG_SENSORS_LIS3_I2C
index 3086c9ed5..3086c9ed5 100644
--- a/baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C
+++ b/configs/base-generic/s390x/CONFIG_SENSORS_LIS3_I2C
diff --git a/baseconfig/s390x/CONFIG_SENSORS_TSL2550 b/configs/base-generic/s390x/CONFIG_SENSORS_TSL2550
index c2702cc2c..c2702cc2c 100644
--- a/baseconfig/s390x/CONFIG_SENSORS_TSL2550
+++ b/configs/base-generic/s390x/CONFIG_SENSORS_TSL2550
diff --git a/baseconfig/s390x/CONFIG_SERIAL_8250 b/configs/base-generic/s390x/CONFIG_SERIAL_8250
index 4dd74a78b..4dd74a78b 100644
--- a/baseconfig/s390x/CONFIG_SERIAL_8250
+++ b/configs/base-generic/s390x/CONFIG_SERIAL_8250
diff --git a/baseconfig/s390x/CONFIG_SERIAL_CORE b/configs/base-generic/s390x/CONFIG_SERIAL_CORE
index 32ecde504..32ecde504 100644
--- a/baseconfig/s390x/CONFIG_SERIAL_CORE
+++ b/configs/base-generic/s390x/CONFIG_SERIAL_CORE
diff --git a/baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD b/configs/base-generic/s390x/CONFIG_SERIAL_NONSTANDARD
index 57688cbec..57688cbec 100644
--- a/baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD
+++ b/configs/base-generic/s390x/CONFIG_SERIAL_NONSTANDARD
diff --git a/baseconfig/s390x/CONFIG_SERIO b/configs/base-generic/s390x/CONFIG_SERIO
index a0fb6e359..a0fb6e359 100644
--- a/baseconfig/s390x/CONFIG_SERIO
+++ b/configs/base-generic/s390x/CONFIG_SERIO
diff --git a/baseconfig/s390x/CONFIG_SERIO_LIBPS2 b/configs/base-generic/s390x/CONFIG_SERIO_LIBPS2
index b4e848291..b4e848291 100644
--- a/baseconfig/s390x/CONFIG_SERIO_LIBPS2
+++ b/configs/base-generic/s390x/CONFIG_SERIO_LIBPS2
diff --git a/baseconfig/s390x/CONFIG_SERIO_SERPORT b/configs/base-generic/s390x/CONFIG_SERIO_SERPORT
index 80a07531f..80a07531f 100644
--- a/baseconfig/s390x/CONFIG_SERIO_SERPORT
+++ b/configs/base-generic/s390x/CONFIG_SERIO_SERPORT
diff --git a/baseconfig/s390x/CONFIG_SFC b/configs/base-generic/s390x/CONFIG_SFC
index fdc60b90f..fdc60b90f 100644
--- a/baseconfig/s390x/CONFIG_SFC
+++ b/configs/base-generic/s390x/CONFIG_SFC
diff --git a/baseconfig/s390x/CONFIG_SGI_PARTITION b/configs/base-generic/s390x/CONFIG_SGI_PARTITION
index 49a58fc9b..49a58fc9b 100644
--- a/baseconfig/s390x/CONFIG_SGI_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_SGI_PARTITION
diff --git a/baseconfig/s390x/CONFIG_SHARED_KERNEL b/configs/base-generic/s390x/CONFIG_SHARED_KERNEL
index 93d100cb3..93d100cb3 100644
--- a/baseconfig/s390x/CONFIG_SHARED_KERNEL
+++ b/configs/base-generic/s390x/CONFIG_SHARED_KERNEL
diff --git a/baseconfig/s390x/CONFIG_SH_ETH b/configs/base-generic/s390x/CONFIG_SH_ETH
index 9c77b55e3..9c77b55e3 100644
--- a/baseconfig/s390x/CONFIG_SH_ETH
+++ b/configs/base-generic/s390x/CONFIG_SH_ETH
diff --git a/baseconfig/s390x/CONFIG_SLIP b/configs/base-generic/s390x/CONFIG_SLIP
index 953347ac5..953347ac5 100644
--- a/baseconfig/s390x/CONFIG_SLIP
+++ b/configs/base-generic/s390x/CONFIG_SLIP
diff --git a/baseconfig/s390x/CONFIG_SMSGIUCV b/configs/base-generic/s390x/CONFIG_SMSGIUCV
index 0375207cd..0375207cd 100644
--- a/baseconfig/s390x/CONFIG_SMSGIUCV
+++ b/configs/base-generic/s390x/CONFIG_SMSGIUCV
diff --git a/baseconfig/s390x/CONFIG_SMSGIUCV_EVENT b/configs/base-generic/s390x/CONFIG_SMSGIUCV_EVENT
index d29cad660..d29cad660 100644
--- a/baseconfig/s390x/CONFIG_SMSGIUCV_EVENT
+++ b/configs/base-generic/s390x/CONFIG_SMSGIUCV_EVENT
diff --git a/baseconfig/s390x/CONFIG_SOUND b/configs/base-generic/s390x/CONFIG_SOUND
index c4f3666c2..c4f3666c2 100644
--- a/baseconfig/s390x/CONFIG_SOUND
+++ b/configs/base-generic/s390x/CONFIG_SOUND
diff --git a/baseconfig/s390x/CONFIG_SSB b/configs/base-generic/s390x/CONFIG_SSB
index 7b1e39107..7b1e39107 100644
--- a/baseconfig/s390x/CONFIG_SSB
+++ b/configs/base-generic/s390x/CONFIG_SSB
diff --git a/baseconfig/s390x/CONFIG_STACK_GUARD b/configs/base-generic/s390x/CONFIG_STACK_GUARD
index f1b5117e8..f1b5117e8 100644
--- a/baseconfig/s390x/CONFIG_STACK_GUARD
+++ b/configs/base-generic/s390x/CONFIG_STACK_GUARD
diff --git a/baseconfig/s390x/CONFIG_STAGING b/configs/base-generic/s390x/CONFIG_STAGING
index 9f033d229..9f033d229 100644
--- a/baseconfig/s390x/CONFIG_STAGING
+++ b/configs/base-generic/s390x/CONFIG_STAGING
diff --git a/baseconfig/s390x/CONFIG_SUN_PARTITION b/configs/base-generic/s390x/CONFIG_SUN_PARTITION
index ba5270328..ba5270328 100644
--- a/baseconfig/s390x/CONFIG_SUN_PARTITION
+++ b/configs/base-generic/s390x/CONFIG_SUN_PARTITION
diff --git a/baseconfig/s390x/CONFIG_SUSPEND b/configs/base-generic/s390x/CONFIG_SUSPEND
index b7b33c1e5..b7b33c1e5 100644
--- a/baseconfig/s390x/CONFIG_SUSPEND
+++ b/configs/base-generic/s390x/CONFIG_SUSPEND
diff --git a/baseconfig/s390x/CONFIG_THERMAL b/configs/base-generic/s390x/CONFIG_THERMAL
index 2fbe48c5d..2fbe48c5d 100644
--- a/baseconfig/s390x/CONFIG_THERMAL
+++ b/configs/base-generic/s390x/CONFIG_THERMAL
diff --git a/baseconfig/s390x/CONFIG_TIFM_CORE b/configs/base-generic/s390x/CONFIG_TIFM_CORE
index 69a12a978..69a12a978 100644
--- a/baseconfig/s390x/CONFIG_TIFM_CORE
+++ b/configs/base-generic/s390x/CONFIG_TIFM_CORE
diff --git a/baseconfig/s390x/CONFIG_TN3215 b/configs/base-generic/s390x/CONFIG_TN3215
index 93adc9abe..93adc9abe 100644
--- a/baseconfig/s390x/CONFIG_TN3215
+++ b/configs/base-generic/s390x/CONFIG_TN3215
diff --git a/baseconfig/s390x/CONFIG_TN3215_CONSOLE b/configs/base-generic/s390x/CONFIG_TN3215_CONSOLE
index 2371f9b22..2371f9b22 100644
--- a/baseconfig/s390x/CONFIG_TN3215_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_TN3215_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_TN3270 b/configs/base-generic/s390x/CONFIG_TN3270
index 05b757507..05b757507 100644
--- a/baseconfig/s390x/CONFIG_TN3270
+++ b/configs/base-generic/s390x/CONFIG_TN3270
diff --git a/baseconfig/s390x/CONFIG_TN3270_CONSOLE b/configs/base-generic/s390x/CONFIG_TN3270_CONSOLE
index d85def357..d85def357 100644
--- a/baseconfig/s390x/CONFIG_TN3270_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_TN3270_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_TN3270_FS b/configs/base-generic/s390x/CONFIG_TN3270_FS
index 2750f71e6..2750f71e6 100644
--- a/baseconfig/s390x/CONFIG_TN3270_FS
+++ b/configs/base-generic/s390x/CONFIG_TN3270_FS
diff --git a/baseconfig/s390x/CONFIG_TN3270_TTY b/configs/base-generic/s390x/CONFIG_TN3270_TTY
index ce688a480..ce688a480 100644
--- a/baseconfig/s390x/CONFIG_TN3270_TTY
+++ b/configs/base-generic/s390x/CONFIG_TN3270_TTY
diff --git a/baseconfig/s390x/CONFIG_TR b/configs/base-generic/s390x/CONFIG_TR
index f354bfa01..f354bfa01 100644
--- a/baseconfig/s390x/CONFIG_TR
+++ b/configs/base-generic/s390x/CONFIG_TR
diff --git a/baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/s390x/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..4874a851b 100644
--- a/baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/s390x/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/s390x/CONFIG_UIO b/configs/base-generic/s390x/CONFIG_UIO
index 566183b75..566183b75 100644
--- a/baseconfig/s390x/CONFIG_UIO
+++ b/configs/base-generic/s390x/CONFIG_UIO
diff --git a/baseconfig/s390x/CONFIG_USB_SUPPORT b/configs/base-generic/s390x/CONFIG_USB_SUPPORT
index c56052a7a..c56052a7a 100644
--- a/baseconfig/s390x/CONFIG_USB_SUPPORT
+++ b/configs/base-generic/s390x/CONFIG_USB_SUPPORT
diff --git a/baseconfig/s390x/CONFIG_UWB b/configs/base-generic/s390x/CONFIG_UWB
index 3ef31c4bc..3ef31c4bc 100644
--- a/baseconfig/s390x/CONFIG_UWB
+++ b/configs/base-generic/s390x/CONFIG_UWB
diff --git a/baseconfig/s390x/CONFIG_VFIO_CCW b/configs/base-generic/s390x/CONFIG_VFIO_CCW
index 15f7493a4..15f7493a4 100644
--- a/baseconfig/s390x/CONFIG_VFIO_CCW
+++ b/configs/base-generic/s390x/CONFIG_VFIO_CCW
diff --git a/baseconfig/s390x/CONFIG_VIRTIO_CONSOLE b/configs/base-generic/s390x/CONFIG_VIRTIO_CONSOLE
index 390e7e6d8..390e7e6d8 100644
--- a/baseconfig/s390x/CONFIG_VIRTIO_CONSOLE
+++ b/configs/base-generic/s390x/CONFIG_VIRTIO_CONSOLE
diff --git a/baseconfig/s390x/CONFIG_VMCP b/configs/base-generic/s390x/CONFIG_VMCP
index 1b28cf4a6..1b28cf4a6 100644
--- a/baseconfig/s390x/CONFIG_VMCP
+++ b/configs/base-generic/s390x/CONFIG_VMCP
diff --git a/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE b/configs/base-generic/s390x/CONFIG_VMCP_CMA_SIZE
index aee0667ac..aee0667ac 100644
--- a/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE
+++ b/configs/base-generic/s390x/CONFIG_VMCP_CMA_SIZE
diff --git a/baseconfig/s390x/CONFIG_VMLOGRDR b/configs/base-generic/s390x/CONFIG_VMLOGRDR
index 2257784e9..2257784e9 100644
--- a/baseconfig/s390x/CONFIG_VMLOGRDR
+++ b/configs/base-generic/s390x/CONFIG_VMLOGRDR
diff --git a/baseconfig/s390x/CONFIG_W1 b/configs/base-generic/s390x/CONFIG_W1
index c224e25f0..c224e25f0 100644
--- a/baseconfig/s390x/CONFIG_W1
+++ b/configs/base-generic/s390x/CONFIG_W1
diff --git a/baseconfig/s390x/CONFIG_WAN b/configs/base-generic/s390x/CONFIG_WAN
index d4ab57e1a..d4ab57e1a 100644
--- a/baseconfig/s390x/CONFIG_WAN
+++ b/configs/base-generic/s390x/CONFIG_WAN
diff --git a/baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK b/configs/base-generic/s390x/CONFIG_WARN_DYNAMIC_STACK
index 641f31747..641f31747 100644
--- a/baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK
+++ b/configs/base-generic/s390x/CONFIG_WARN_DYNAMIC_STACK
diff --git a/baseconfig/s390x/CONFIG_WDTPCI b/configs/base-generic/s390x/CONFIG_WDTPCI
index ca556694d..ca556694d 100644
--- a/baseconfig/s390x/CONFIG_WDTPCI
+++ b/configs/base-generic/s390x/CONFIG_WDTPCI
diff --git a/baseconfig/s390x/CONFIG_WIRELESS_EXT b/configs/base-generic/s390x/CONFIG_WIRELESS_EXT
index 2e1670401..2e1670401 100644
--- a/baseconfig/s390x/CONFIG_WIRELESS_EXT
+++ b/configs/base-generic/s390x/CONFIG_WIRELESS_EXT
diff --git a/baseconfig/s390x/CONFIG_XILLYBUS b/configs/base-generic/s390x/CONFIG_XILLYBUS
index ce2448ee6..ce2448ee6 100644
--- a/baseconfig/s390x/CONFIG_XILLYBUS
+++ b/configs/base-generic/s390x/CONFIG_XILLYBUS
diff --git a/baseconfig/s390x/CONFIG_ZCRYPT b/configs/base-generic/s390x/CONFIG_ZCRYPT
index 854d9232d..854d9232d 100644
--- a/baseconfig/s390x/CONFIG_ZCRYPT
+++ b/configs/base-generic/s390x/CONFIG_ZCRYPT
diff --git a/baseconfig/s390x/CONFIG_ZFCP b/configs/base-generic/s390x/CONFIG_ZFCP
index 332f53868..332f53868 100644
--- a/baseconfig/s390x/CONFIG_ZFCP
+++ b/configs/base-generic/s390x/CONFIG_ZFCP
diff --git a/baseconfig/x86/CONFIG_ACERHDF b/configs/base-generic/x86/CONFIG_ACERHDF
index 53c61f3c7..53c61f3c7 100644
--- a/baseconfig/x86/CONFIG_ACERHDF
+++ b/configs/base-generic/x86/CONFIG_ACERHDF
diff --git a/baseconfig/x86/CONFIG_ACER_WMI b/configs/base-generic/x86/CONFIG_ACER_WMI
index 06ff5c76d..06ff5c76d 100644
--- a/baseconfig/x86/CONFIG_ACER_WMI
+++ b/configs/base-generic/x86/CONFIG_ACER_WMI
diff --git a/baseconfig/x86/CONFIG_ACPI b/configs/base-generic/x86/CONFIG_ACPI
index 839566bae..839566bae 100644
--- a/baseconfig/x86/CONFIG_ACPI
+++ b/configs/base-generic/x86/CONFIG_ACPI
diff --git a/baseconfig/x86/CONFIG_ACPI_AC b/configs/base-generic/x86/CONFIG_ACPI_AC
index 5dbaee1a8..5dbaee1a8 100644
--- a/baseconfig/x86/CONFIG_ACPI_AC
+++ b/configs/base-generic/x86/CONFIG_ACPI_AC
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI b/configs/base-generic/x86/CONFIG_ACPI_APEI
index 9ab33facf..9ab33facf 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_EINJ b/configs/base-generic/x86/CONFIG_ACPI_APEI_EINJ
index 2d03b69a1..2d03b69a1 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI_EINJ
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI_EINJ
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG b/configs/base-generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
index 235760d40..235760d40 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_GHES b/configs/base-generic/x86/CONFIG_ACPI_APEI_GHES
index 8fd037d8f..8fd037d8f 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI_GHES
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI_GHES
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE b/configs/base-generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
index 46aa1579f..46aa1579f 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER b/configs/base-generic/x86/CONFIG_ACPI_APEI_PCIEAER
index 26f3e9129..26f3e9129 100644
--- a/baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER
+++ b/configs/base-generic/x86/CONFIG_ACPI_APEI_PCIEAER
diff --git a/baseconfig/x86/CONFIG_ACPI_BATTERY b/configs/base-generic/x86/CONFIG_ACPI_BATTERY
index eb3286698..eb3286698 100644
--- a/baseconfig/x86/CONFIG_ACPI_BATTERY
+++ b/configs/base-generic/x86/CONFIG_ACPI_BATTERY
diff --git a/baseconfig/x86/CONFIG_ACPI_BGRT b/configs/base-generic/x86/CONFIG_ACPI_BGRT
index 13035dd82..13035dd82 100644
--- a/baseconfig/x86/CONFIG_ACPI_BGRT
+++ b/configs/base-generic/x86/CONFIG_ACPI_BGRT
diff --git a/baseconfig/x86/CONFIG_ACPI_BUTTON b/configs/base-generic/x86/CONFIG_ACPI_BUTTON
index 1f552016b..1f552016b 100644
--- a/baseconfig/x86/CONFIG_ACPI_BUTTON
+++ b/configs/base-generic/x86/CONFIG_ACPI_BUTTON
diff --git a/baseconfig/x86/CONFIG_ACPI_CMPC b/configs/base-generic/x86/CONFIG_ACPI_CMPC
index 72ad5cede..72ad5cede 100644
--- a/baseconfig/x86/CONFIG_ACPI_CMPC
+++ b/configs/base-generic/x86/CONFIG_ACPI_CMPC
diff --git a/baseconfig/x86/CONFIG_ACPI_CONFIGFS b/configs/base-generic/x86/CONFIG_ACPI_CONFIGFS
index fc2af2c0b..fc2af2c0b 100644
--- a/baseconfig/x86/CONFIG_ACPI_CONFIGFS
+++ b/configs/base-generic/x86/CONFIG_ACPI_CONFIGFS
diff --git a/baseconfig/x86/CONFIG_ACPI_CONTAINER b/configs/base-generic/x86/CONFIG_ACPI_CONTAINER
index 24287daf8..24287daf8 100644
--- a/baseconfig/x86/CONFIG_ACPI_CONTAINER
+++ b/configs/base-generic/x86/CONFIG_ACPI_CONTAINER
diff --git a/baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD b/configs/base-generic/x86/CONFIG_ACPI_CUSTOM_METHOD
index 76853b6d8..76853b6d8 100644
--- a/baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD
+++ b/configs/base-generic/x86/CONFIG_ACPI_CUSTOM_METHOD
diff --git a/baseconfig/x86/CONFIG_ACPI_DOCK b/configs/base-generic/x86/CONFIG_ACPI_DOCK
index e4d916353..e4d916353 100644
--- a/baseconfig/x86/CONFIG_ACPI_DOCK
+++ b/configs/base-generic/x86/CONFIG_ACPI_DOCK
diff --git a/baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS b/configs/base-generic/x86/CONFIG_ACPI_EC_DEBUGFS
index dfc6b278f..dfc6b278f 100644
--- a/baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS
+++ b/configs/base-generic/x86/CONFIG_ACPI_EC_DEBUGFS
diff --git a/baseconfig/x86/CONFIG_ACPI_EXTLOG b/configs/base-generic/x86/CONFIG_ACPI_EXTLOG
index 7e48ccedb..7e48ccedb 100644
--- a/baseconfig/x86/CONFIG_ACPI_EXTLOG
+++ b/configs/base-generic/x86/CONFIG_ACPI_EXTLOG
diff --git a/baseconfig/x86/CONFIG_ACPI_FAN b/configs/base-generic/x86/CONFIG_ACPI_FAN
index 0feefba7b..0feefba7b 100644
--- a/baseconfig/x86/CONFIG_ACPI_FAN
+++ b/configs/base-generic/x86/CONFIG_ACPI_FAN
diff --git a/baseconfig/x86/CONFIG_ACPI_HED b/configs/base-generic/x86/CONFIG_ACPI_HED
index 06042df5a..06042df5a 100644
--- a/baseconfig/x86/CONFIG_ACPI_HED
+++ b/configs/base-generic/x86/CONFIG_ACPI_HED
diff --git a/baseconfig/x86/CONFIG_ACPI_I2C_OPREGION b/configs/base-generic/x86/CONFIG_ACPI_I2C_OPREGION
index 92036b975..92036b975 100644
--- a/baseconfig/x86/CONFIG_ACPI_I2C_OPREGION
+++ b/configs/base-generic/x86/CONFIG_ACPI_I2C_OPREGION
diff --git a/baseconfig/x86/CONFIG_ACPI_IPMI b/configs/base-generic/x86/CONFIG_ACPI_IPMI
index e40fb9aea..e40fb9aea 100644
--- a/baseconfig/x86/CONFIG_ACPI_IPMI
+++ b/configs/base-generic/x86/CONFIG_ACPI_IPMI
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCESSOR b/configs/base-generic/x86/CONFIG_ACPI_PROCESSOR
index a24416dcf..a24416dcf 100644
--- a/baseconfig/x86/CONFIG_ACPI_PROCESSOR
+++ b/configs/base-generic/x86/CONFIG_ACPI_PROCESSOR
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR b/configs/base-generic/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
index 67779d489..67779d489 100644
--- a/baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
+++ b/configs/base-generic/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCFS b/configs/base-generic/x86/CONFIG_ACPI_PROCFS
index 919c13cf1..919c13cf1 100644
--- a/baseconfig/x86/CONFIG_ACPI_PROCFS
+++ b/configs/base-generic/x86/CONFIG_ACPI_PROCFS
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCFS_POWER b/configs/base-generic/x86/CONFIG_ACPI_PROCFS_POWER
index 4476fecda..4476fecda 100644
--- a/baseconfig/x86/CONFIG_ACPI_PROCFS_POWER
+++ b/configs/base-generic/x86/CONFIG_ACPI_PROCFS_POWER
diff --git a/baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE b/configs/base-generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
index 22e6b36cf..22e6b36cf 100644
--- a/baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
+++ b/configs/base-generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
diff --git a/baseconfig/x86/CONFIG_ACPI_SBS b/configs/base-generic/x86/CONFIG_ACPI_SBS
index 82848bd17..82848bd17 100644
--- a/baseconfig/x86/CONFIG_ACPI_SBS
+++ b/configs/base-generic/x86/CONFIG_ACPI_SBS
diff --git a/baseconfig/x86/CONFIG_ACPI_SLEEP b/configs/base-generic/x86/CONFIG_ACPI_SLEEP
index 68612464d..68612464d 100644
--- a/baseconfig/x86/CONFIG_ACPI_SLEEP
+++ b/configs/base-generic/x86/CONFIG_ACPI_SLEEP
diff --git a/baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE b/configs/base-generic/x86/CONFIG_ACPI_TABLE_UPGRADE
index 276233fba..276233fba 100644
--- a/baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE
+++ b/configs/base-generic/x86/CONFIG_ACPI_TABLE_UPGRADE
diff --git a/baseconfig/x86/CONFIG_ACPI_THERMAL b/configs/base-generic/x86/CONFIG_ACPI_THERMAL
index 1bd7964b4..1bd7964b4 100644
--- a/baseconfig/x86/CONFIG_ACPI_THERMAL
+++ b/configs/base-generic/x86/CONFIG_ACPI_THERMAL
diff --git a/baseconfig/x86/CONFIG_ACPI_TOSHIBA b/configs/base-generic/x86/CONFIG_ACPI_TOSHIBA
index 099107738..099107738 100644
--- a/baseconfig/x86/CONFIG_ACPI_TOSHIBA
+++ b/configs/base-generic/x86/CONFIG_ACPI_TOSHIBA
diff --git a/baseconfig/x86/CONFIG_ACPI_VIDEO b/configs/base-generic/x86/CONFIG_ACPI_VIDEO
index b642d06e3..b642d06e3 100644
--- a/baseconfig/x86/CONFIG_ACPI_VIDEO
+++ b/configs/base-generic/x86/CONFIG_ACPI_VIDEO
diff --git a/baseconfig/x86/CONFIG_ACPI_WMI b/configs/base-generic/x86/CONFIG_ACPI_WMI
index 9cef4743c..9cef4743c 100644
--- a/baseconfig/x86/CONFIG_ACPI_WMI
+++ b/configs/base-generic/x86/CONFIG_ACPI_WMI
diff --git a/baseconfig/x86/CONFIG_AGP b/configs/base-generic/x86/CONFIG_AGP
index ea543fee8..ea543fee8 100644
--- a/baseconfig/x86/CONFIG_AGP
+++ b/configs/base-generic/x86/CONFIG_AGP
diff --git a/baseconfig/x86/CONFIG_AGP_ALI b/configs/base-generic/x86/CONFIG_AGP_ALI
index c46aee1e8..c46aee1e8 100644
--- a/baseconfig/x86/CONFIG_AGP_ALI
+++ b/configs/base-generic/x86/CONFIG_AGP_ALI
diff --git a/baseconfig/x86/CONFIG_AGP_AMD b/configs/base-generic/x86/CONFIG_AGP_AMD
index 142f8a1cd..142f8a1cd 100644
--- a/baseconfig/x86/CONFIG_AGP_AMD
+++ b/configs/base-generic/x86/CONFIG_AGP_AMD
diff --git a/baseconfig/x86/CONFIG_AGP_AMD64 b/configs/base-generic/x86/CONFIG_AGP_AMD64
index 97e9526e4..97e9526e4 100644
--- a/baseconfig/x86/CONFIG_AGP_AMD64
+++ b/configs/base-generic/x86/CONFIG_AGP_AMD64
diff --git a/baseconfig/x86/CONFIG_AGP_ATI b/configs/base-generic/x86/CONFIG_AGP_ATI
index 1f551caec..1f551caec 100644
--- a/baseconfig/x86/CONFIG_AGP_ATI
+++ b/configs/base-generic/x86/CONFIG_AGP_ATI
diff --git a/baseconfig/x86/CONFIG_AGP_EFFICEON b/configs/base-generic/x86/CONFIG_AGP_EFFICEON
index 070b4ae60..070b4ae60 100644
--- a/baseconfig/x86/CONFIG_AGP_EFFICEON
+++ b/configs/base-generic/x86/CONFIG_AGP_EFFICEON
diff --git a/baseconfig/x86/CONFIG_AGP_INTEL b/configs/base-generic/x86/CONFIG_AGP_INTEL
index 524a67977..524a67977 100644
--- a/baseconfig/x86/CONFIG_AGP_INTEL
+++ b/configs/base-generic/x86/CONFIG_AGP_INTEL
diff --git a/baseconfig/x86/CONFIG_AGP_NVIDIA b/configs/base-generic/x86/CONFIG_AGP_NVIDIA
index f177c1d92..f177c1d92 100644
--- a/baseconfig/x86/CONFIG_AGP_NVIDIA
+++ b/configs/base-generic/x86/CONFIG_AGP_NVIDIA
diff --git a/baseconfig/x86/CONFIG_AGP_SIS b/configs/base-generic/x86/CONFIG_AGP_SIS
index dac4635e3..dac4635e3 100644
--- a/baseconfig/x86/CONFIG_AGP_SIS
+++ b/configs/base-generic/x86/CONFIG_AGP_SIS
diff --git a/baseconfig/x86/CONFIG_AGP_SWORKS b/configs/base-generic/x86/CONFIG_AGP_SWORKS
index 09d99f431..09d99f431 100644
--- a/baseconfig/x86/CONFIG_AGP_SWORKS
+++ b/configs/base-generic/x86/CONFIG_AGP_SWORKS
diff --git a/baseconfig/x86/CONFIG_AGP_VIA b/configs/base-generic/x86/CONFIG_AGP_VIA
index 21da1a429..21da1a429 100644
--- a/baseconfig/x86/CONFIG_AGP_VIA
+++ b/configs/base-generic/x86/CONFIG_AGP_VIA
diff --git a/baseconfig/x86/CONFIG_ALIENWARE_WMI b/configs/base-generic/x86/CONFIG_ALIENWARE_WMI
index b09f63eb8..b09f63eb8 100644
--- a/baseconfig/x86/CONFIG_ALIENWARE_WMI
+++ b/configs/base-generic/x86/CONFIG_ALIENWARE_WMI
diff --git a/baseconfig/x86/CONFIG_AMD_XGBE b/configs/base-generic/x86/CONFIG_AMD_XGBE
index 27be1a7ee..27be1a7ee 100644
--- a/baseconfig/x86/CONFIG_AMD_XGBE
+++ b/configs/base-generic/x86/CONFIG_AMD_XGBE
diff --git a/baseconfig/x86/CONFIG_AMD_XGBE_DCB b/configs/base-generic/x86/CONFIG_AMD_XGBE_DCB
index f3cdcca89..f3cdcca89 100644
--- a/baseconfig/x86/CONFIG_AMD_XGBE_DCB
+++ b/configs/base-generic/x86/CONFIG_AMD_XGBE_DCB
diff --git a/baseconfig/x86/CONFIG_AMILO_RFKILL b/configs/base-generic/x86/CONFIG_AMILO_RFKILL
index ab49a1190..ab49a1190 100644
--- a/baseconfig/x86/CONFIG_AMILO_RFKILL
+++ b/configs/base-generic/x86/CONFIG_AMILO_RFKILL
diff --git a/baseconfig/x86/CONFIG_APPLE_GMUX b/configs/base-generic/x86/CONFIG_APPLE_GMUX
index 9ecb754be..9ecb754be 100644
--- a/baseconfig/x86/CONFIG_APPLE_GMUX
+++ b/configs/base-generic/x86/CONFIG_APPLE_GMUX
diff --git a/baseconfig/x86/CONFIG_APPLE_PROPERTIES b/configs/base-generic/x86/CONFIG_APPLE_PROPERTIES
index 536ecf6bf..536ecf6bf 100644
--- a/baseconfig/x86/CONFIG_APPLE_PROPERTIES
+++ b/configs/base-generic/x86/CONFIG_APPLE_PROPERTIES
diff --git a/baseconfig/x86/CONFIG_ASUS_LAPTOP b/configs/base-generic/x86/CONFIG_ASUS_LAPTOP
index 40e261455..40e261455 100644
--- a/baseconfig/x86/CONFIG_ASUS_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_ASUS_LAPTOP
diff --git a/baseconfig/x86/CONFIG_ASUS_NB_WMI b/configs/base-generic/x86/CONFIG_ASUS_NB_WMI
index 16d2c7fa9..16d2c7fa9 100644
--- a/baseconfig/x86/CONFIG_ASUS_NB_WMI
+++ b/configs/base-generic/x86/CONFIG_ASUS_NB_WMI
diff --git a/baseconfig/x86/CONFIG_ASUS_WIRELESS b/configs/base-generic/x86/CONFIG_ASUS_WIRELESS
index 23c48a9e8..23c48a9e8 100644
--- a/baseconfig/x86/CONFIG_ASUS_WIRELESS
+++ b/configs/base-generic/x86/CONFIG_ASUS_WIRELESS
diff --git a/baseconfig/x86/CONFIG_ASUS_WMI b/configs/base-generic/x86/CONFIG_ASUS_WMI
index e881859cc..e881859cc 100644
--- a/baseconfig/x86/CONFIG_ASUS_WMI
+++ b/configs/base-generic/x86/CONFIG_ASUS_WMI
diff --git a/baseconfig/x86/CONFIG_ATA_ACPI b/configs/base-generic/x86/CONFIG_ATA_ACPI
index a0be76e56..a0be76e56 100644
--- a/baseconfig/x86/CONFIG_ATA_ACPI
+++ b/configs/base-generic/x86/CONFIG_ATA_ACPI
diff --git a/baseconfig/x86/CONFIG_BACKLIGHT_APPLE b/configs/base-generic/x86/CONFIG_BACKLIGHT_APPLE
index 5150ad41e..5150ad41e 100644
--- a/baseconfig/x86/CONFIG_BACKLIGHT_APPLE
+++ b/configs/base-generic/x86/CONFIG_BACKLIGHT_APPLE
diff --git a/baseconfig/x86/CONFIG_BLK_DEV_AMD74XX b/configs/base-generic/x86/CONFIG_BLK_DEV_AMD74XX
index d302ddeb4..d302ddeb4 100644
--- a/baseconfig/x86/CONFIG_BLK_DEV_AMD74XX
+++ b/configs/base-generic/x86/CONFIG_BLK_DEV_AMD74XX
diff --git a/baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX b/configs/base-generic/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
index 4efb94f64..4efb94f64 100644
--- a/baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
+++ b/configs/base-generic/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
diff --git a/baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION b/configs/base-generic/x86/CONFIG_BXT_WC_PMIC_OPREGION
index d61af920f..d61af920f 100644
--- a/baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION
+++ b/configs/base-generic/x86/CONFIG_BXT_WC_PMIC_OPREGION
diff --git a/baseconfig/x86/CONFIG_CAPI_EICON b/configs/base-generic/x86/CONFIG_CAPI_EICON
index 70c2616e4..70c2616e4 100644
--- a/baseconfig/x86/CONFIG_CAPI_EICON
+++ b/configs/base-generic/x86/CONFIG_CAPI_EICON
diff --git a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR b/configs/base-generic/x86/CONFIG_CC_STACKPROTECTOR
index ffba31f93..ffba31f93 100644
--- a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR
+++ b/configs/base-generic/x86/CONFIG_CC_STACKPROTECTOR
diff --git a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG b/configs/base-generic/x86/CONFIG_CC_STACKPROTECTOR_STRONG
index ce5cb4d04..ce5cb4d04 100644
--- a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG
+++ b/configs/base-generic/x86/CONFIG_CC_STACKPROTECTOR_STRONG
diff --git a/baseconfig/x86/CONFIG_CHROMEOS_LAPTOP b/configs/base-generic/x86/CONFIG_CHROMEOS_LAPTOP
index f4f4c562c..f4f4c562c 100644
--- a/baseconfig/x86/CONFIG_CHROMEOS_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_CHROMEOS_LAPTOP
diff --git a/baseconfig/x86/CONFIG_CHROMEOS_PSTORE b/configs/base-generic/x86/CONFIG_CHROMEOS_PSTORE
index 7ece6441d..7ece6441d 100644
--- a/baseconfig/x86/CONFIG_CHROMEOS_PSTORE
+++ b/configs/base-generic/x86/CONFIG_CHROMEOS_PSTORE
diff --git a/baseconfig/x86/CONFIG_CMDLINE_BOOL b/configs/base-generic/x86/CONFIG_CMDLINE_BOOL
index ca23a06ea..ca23a06ea 100644
--- a/baseconfig/x86/CONFIG_CMDLINE_BOOL
+++ b/configs/base-generic/x86/CONFIG_CMDLINE_BOOL
diff --git a/baseconfig/x86/CONFIG_COMPAL_LAPTOP b/configs/base-generic/x86/CONFIG_COMPAL_LAPTOP
index 84994e177..84994e177 100644
--- a/baseconfig/x86/CONFIG_COMPAL_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_COMPAL_LAPTOP
diff --git a/baseconfig/x86/CONFIG_COMPAT_VDSO b/configs/base-generic/x86/CONFIG_COMPAT_VDSO
index a79844faa..a79844faa 100644
--- a/baseconfig/x86/CONFIG_COMPAT_VDSO
+++ b/configs/base-generic/x86/CONFIG_COMPAT_VDSO
diff --git a/baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG b/configs/base-generic/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG
index c2c51192e..c2c51192e 100644
--- a/baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG
+++ b/configs/base-generic/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG
diff --git a/baseconfig/x86/CONFIG_CPA_DEBUG b/configs/base-generic/x86/CONFIG_CPA_DEBUG
index d87a4d235..d87a4d235 100644
--- a/baseconfig/x86/CONFIG_CPA_DEBUG
+++ b/configs/base-generic/x86/CONFIG_CPA_DEBUG
diff --git a/baseconfig/x86/CONFIG_CRC_PMIC_OPREGION b/configs/base-generic/x86/CONFIG_CRC_PMIC_OPREGION
index cf61babe7..cf61babe7 100644
--- a/baseconfig/x86/CONFIG_CRC_PMIC_OPREGION
+++ b/configs/base-generic/x86/CONFIG_CRC_PMIC_OPREGION
diff --git a/baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL b/configs/base-generic/x86/CONFIG_CRYPTO_AES_NI_INTEL
index 7f29bd9bc..7f29bd9bc 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_AES_NI_INTEL
diff --git a/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL b/configs/base-generic/x86/CONFIG_CRYPTO_CRC32C_INTEL
index c500b4f55..c500b4f55 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_CRC32C_INTEL
diff --git a/baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL b/configs/base-generic/x86/CONFIG_CRYPTO_CRC32_PCLMUL
index c503f02e3..c503f02e3 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_CRC32_PCLMUL
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP
index d2f5497f2..d2f5497f2 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
index 4887c6d76..4887c6d76 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP_DD
index 18c7b900e..18c7b900e 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_CCP_DD
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK
index 8a6e8e6cb..8a6e8e6cb 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES
index fed2a47ff..fed2a47ff 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA
index 7f043e865..7f043e865 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX
index 9fcd620a9..9fcd620a9 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF
index 9e5c62053..9e5c62053 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C62X
index 2583c47f2..2583c47f2 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C62X
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF
index 589fd67c5..589fd67c5 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC
index 3d37c7af5..3d37c7af5 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF
index 803571298..803571298 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF
diff --git a/baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_586 b/configs/base-generic/x86/CONFIG_CRYPTO_SERPENT_SSE2_586
index 04c5548f4..04c5548f4 100644
--- a/baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_586
+++ b/configs/base-generic/x86/CONFIG_CRYPTO_SERPENT_SSE2_586
diff --git a/baseconfig/x86/CONFIG_DCDBAS b/configs/base-generic/x86/CONFIG_DCDBAS
index 1e2e74b31..1e2e74b31 100644
--- a/baseconfig/x86/CONFIG_DCDBAS
+++ b/configs/base-generic/x86/CONFIG_DCDBAS
diff --git a/baseconfig/x86/CONFIG_DEBUG_ENTRY b/configs/base-generic/x86/CONFIG_DEBUG_ENTRY
index 88cb6da08..88cb6da08 100644
--- a/baseconfig/x86/CONFIG_DEBUG_ENTRY
+++ b/configs/base-generic/x86/CONFIG_DEBUG_ENTRY
diff --git a/baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST b/configs/base-generic/x86/CONFIG_DEBUG_NMI_SELFTEST
index 4ea92fec1..4ea92fec1 100644
--- a/baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST
+++ b/configs/base-generic/x86/CONFIG_DEBUG_NMI_SELFTEST
diff --git a/debugconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS b/configs/base-generic/x86/CONFIG_DEBUG_PER_CPU_MAPS
index 01ead7281..01ead7281 100644
--- a/debugconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS
+++ b/configs/base-generic/x86/CONFIG_DEBUG_PER_CPU_MAPS
diff --git a/baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW b/configs/base-generic/x86/CONFIG_DEBUG_STACKOVERFLOW
index 09bb42611..09bb42611 100644
--- a/baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW
+++ b/configs/base-generic/x86/CONFIG_DEBUG_STACKOVERFLOW
diff --git a/baseconfig/x86/CONFIG_DEBUG_TLBFLUSH b/configs/base-generic/x86/CONFIG_DEBUG_TLBFLUSH
index 6544b79a8..6544b79a8 100644
--- a/baseconfig/x86/CONFIG_DEBUG_TLBFLUSH
+++ b/configs/base-generic/x86/CONFIG_DEBUG_TLBFLUSH
diff --git a/baseconfig/x86/CONFIG_DEBUG_WX b/configs/base-generic/x86/CONFIG_DEBUG_WX
index 95e08f44b..95e08f44b 100644
--- a/baseconfig/x86/CONFIG_DEBUG_WX
+++ b/configs/base-generic/x86/CONFIG_DEBUG_WX
diff --git a/baseconfig/x86/CONFIG_DELL_LAPTOP b/configs/base-generic/x86/CONFIG_DELL_LAPTOP
index 73d85e891..73d85e891 100644
--- a/baseconfig/x86/CONFIG_DELL_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_DELL_LAPTOP
diff --git a/baseconfig/x86/CONFIG_DELL_RBTN b/configs/base-generic/x86/CONFIG_DELL_RBTN
index 2aa364473..2aa364473 100644
--- a/baseconfig/x86/CONFIG_DELL_RBTN
+++ b/configs/base-generic/x86/CONFIG_DELL_RBTN
diff --git a/baseconfig/x86/CONFIG_DELL_RBU b/configs/base-generic/x86/CONFIG_DELL_RBU
index 1cb8995ad..1cb8995ad 100644
--- a/baseconfig/x86/CONFIG_DELL_RBU
+++ b/configs/base-generic/x86/CONFIG_DELL_RBU
diff --git a/baseconfig/x86/CONFIG_DELL_SMBIOS b/configs/base-generic/x86/CONFIG_DELL_SMBIOS
index 1a021a6b6..1a021a6b6 100644
--- a/baseconfig/x86/CONFIG_DELL_SMBIOS
+++ b/configs/base-generic/x86/CONFIG_DELL_SMBIOS
diff --git a/baseconfig/x86/CONFIG_DELL_SMO8800 b/configs/base-generic/x86/CONFIG_DELL_SMO8800
index a65967ee2..a65967ee2 100644
--- a/baseconfig/x86/CONFIG_DELL_SMO8800
+++ b/configs/base-generic/x86/CONFIG_DELL_SMO8800
diff --git a/baseconfig/x86/CONFIG_DELL_WMI b/configs/base-generic/x86/CONFIG_DELL_WMI
index c5924ffe8..c5924ffe8 100644
--- a/baseconfig/x86/CONFIG_DELL_WMI
+++ b/configs/base-generic/x86/CONFIG_DELL_WMI
diff --git a/baseconfig/x86/CONFIG_DELL_WMI_AIO b/configs/base-generic/x86/CONFIG_DELL_WMI_AIO
index f650f3f1f..f650f3f1f 100644
--- a/baseconfig/x86/CONFIG_DELL_WMI_AIO
+++ b/configs/base-generic/x86/CONFIG_DELL_WMI_AIO
diff --git a/baseconfig/x86/CONFIG_DELL_WMI_LED b/configs/base-generic/x86/CONFIG_DELL_WMI_LED
index 23d945e59..23d945e59 100644
--- a/baseconfig/x86/CONFIG_DELL_WMI_LED
+++ b/configs/base-generic/x86/CONFIG_DELL_WMI_LED
diff --git a/baseconfig/x86/CONFIG_DMIID b/configs/base-generic/x86/CONFIG_DMIID
index d0ea3622a..d0ea3622a 100644
--- a/baseconfig/x86/CONFIG_DMIID
+++ b/configs/base-generic/x86/CONFIG_DMIID
diff --git a/baseconfig/x86/CONFIG_DMI_SYSFS b/configs/base-generic/x86/CONFIG_DMI_SYSFS
index 76565caf8..76565caf8 100644
--- a/baseconfig/x86/CONFIG_DMI_SYSFS
+++ b/configs/base-generic/x86/CONFIG_DMI_SYSFS
diff --git a/baseconfig/x86/CONFIG_DPTF_POWER b/configs/base-generic/x86/CONFIG_DPTF_POWER
index d5825880a..d5825880a 100644
--- a/baseconfig/x86/CONFIG_DPTF_POWER
+++ b/configs/base-generic/x86/CONFIG_DPTF_POWER
diff --git a/baseconfig/x86/CONFIG_DRM_GMA3600 b/configs/base-generic/x86/CONFIG_DRM_GMA3600
index 52caac51a..52caac51a 100644
--- a/baseconfig/x86/CONFIG_DRM_GMA3600
+++ b/configs/base-generic/x86/CONFIG_DRM_GMA3600
diff --git a/baseconfig/x86/CONFIG_DRM_GMA500 b/configs/base-generic/x86/CONFIG_DRM_GMA500
index 38ba65200..38ba65200 100644
--- a/baseconfig/x86/CONFIG_DRM_GMA500
+++ b/configs/base-generic/x86/CONFIG_DRM_GMA500
diff --git a/baseconfig/x86/CONFIG_DRM_GMA600 b/configs/base-generic/x86/CONFIG_DRM_GMA600
index 78655acb6..78655acb6 100644
--- a/baseconfig/x86/CONFIG_DRM_GMA600
+++ b/configs/base-generic/x86/CONFIG_DRM_GMA600
diff --git a/baseconfig/x86/CONFIG_DRM_I810 b/configs/base-generic/x86/CONFIG_DRM_I810
index 23cc8b602..23cc8b602 100644
--- a/baseconfig/x86/CONFIG_DRM_I810
+++ b/configs/base-generic/x86/CONFIG_DRM_I810
diff --git a/baseconfig/x86/CONFIG_DRM_I915 b/configs/base-generic/x86/CONFIG_DRM_I915
index 1034adf42..1034adf42 100644
--- a/baseconfig/x86/CONFIG_DRM_I915
+++ b/configs/base-generic/x86/CONFIG_DRM_I915
diff --git a/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT b/configs/base-generic/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
index 49c76cb99..49c76cb99 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
diff --git a/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR b/configs/base-generic/x86/CONFIG_DRM_I915_CAPTURE_ERROR
index d85c72035..d85c72035 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_CAPTURE_ERROR
diff --git a/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR b/configs/base-generic/x86/CONFIG_DRM_I915_COMPRESS_ERROR
index 6d6c129f5..6d6c129f5 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_COMPRESS_ERROR
diff --git a/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE b/configs/base-generic/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
index d48518abd..d48518abd 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
diff --git a/baseconfig/x86/CONFIG_DRM_I915_GVT b/configs/base-generic/x86/CONFIG_DRM_I915_GVT
index c6af3c3cc..c6af3c3cc 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_GVT
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_GVT
diff --git a/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT b/configs/base-generic/x86/CONFIG_DRM_I915_GVT_KVMGT
index 016a41e8a..016a41e8a 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_GVT_KVMGT
diff --git a/baseconfig/x86/CONFIG_DRM_I915_USERPTR b/configs/base-generic/x86/CONFIG_DRM_I915_USERPTR
index 4f253abc1..4f253abc1 100644
--- a/baseconfig/x86/CONFIG_DRM_I915_USERPTR
+++ b/configs/base-generic/x86/CONFIG_DRM_I915_USERPTR
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL b/configs/base-generic/x86/CONFIG_DRM_PANEL
index de8a9c247..de8a9c247 100644
--- a/baseconfig/x86/CONFIG_DRM_PANEL
+++ b/configs/base-generic/x86/CONFIG_DRM_PANEL
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_LVDS b/configs/base-generic/x86/CONFIG_DRM_PANEL_LVDS
index 6d4d3c7c6..6d4d3c7c6 100644
--- a/baseconfig/x86/CONFIG_DRM_PANEL_LVDS
+++ b/configs/base-generic/x86/CONFIG_DRM_PANEL_LVDS
diff --git a/baseconfig/x86/CONFIG_DRM_VBOXVIDEO b/configs/base-generic/x86/CONFIG_DRM_VBOXVIDEO
index 8597a5dbb..8597a5dbb 100644
--- a/baseconfig/x86/CONFIG_DRM_VBOXVIDEO
+++ b/configs/base-generic/x86/CONFIG_DRM_VBOXVIDEO
diff --git a/baseconfig/x86/CONFIG_DRM_VMWGFX b/configs/base-generic/x86/CONFIG_DRM_VMWGFX
index 12fe6b15f..12fe6b15f 100644
--- a/baseconfig/x86/CONFIG_DRM_VMWGFX
+++ b/configs/base-generic/x86/CONFIG_DRM_VMWGFX
diff --git a/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON b/configs/base-generic/x86/CONFIG_DRM_VMWGFX_FBCON
index cc51e115d..cc51e115d 100644
--- a/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON
+++ b/configs/base-generic/x86/CONFIG_DRM_VMWGFX_FBCON
diff --git a/baseconfig/x86/CONFIG_DW_DMAC_CORE b/configs/base-generic/x86/CONFIG_DW_DMAC_CORE
index 110558a22..110558a22 100644
--- a/baseconfig/x86/CONFIG_DW_DMAC_CORE
+++ b/configs/base-generic/x86/CONFIG_DW_DMAC_CORE
diff --git a/baseconfig/x86/CONFIG_DW_DMAC_PCI b/configs/base-generic/x86/CONFIG_DW_DMAC_PCI
index 2a2239b24..2a2239b24 100644
--- a/baseconfig/x86/CONFIG_DW_DMAC_PCI
+++ b/configs/base-generic/x86/CONFIG_DW_DMAC_PCI
diff --git a/baseconfig/x86/CONFIG_E1000E_HWTS b/configs/base-generic/x86/CONFIG_E1000E_HWTS
index 9b00c96b4..9b00c96b4 100644
--- a/baseconfig/x86/CONFIG_E1000E_HWTS
+++ b/configs/base-generic/x86/CONFIG_E1000E_HWTS
diff --git a/baseconfig/x86/CONFIG_EADC_AMD64 b/configs/base-generic/x86/CONFIG_EADC_AMD64
index 280e18445..280e18445 100644
--- a/baseconfig/x86/CONFIG_EADC_AMD64
+++ b/configs/base-generic/x86/CONFIG_EADC_AMD64
diff --git a/baseconfig/x86/CONFIG_EARLY_PRINTK_EFI b/configs/base-generic/x86/CONFIG_EARLY_PRINTK_EFI
index b895363c6..b895363c6 100644
--- a/baseconfig/x86/CONFIG_EARLY_PRINTK_EFI
+++ b/configs/base-generic/x86/CONFIG_EARLY_PRINTK_EFI
diff --git a/baseconfig/x86/CONFIG_EDAC_AMD8111 b/configs/base-generic/x86/CONFIG_EDAC_AMD8111
index b191efff8..b191efff8 100644
--- a/baseconfig/x86/CONFIG_EDAC_AMD8111
+++ b/configs/base-generic/x86/CONFIG_EDAC_AMD8111
diff --git a/baseconfig/x86/CONFIG_EDAC_AMD8131 b/configs/base-generic/x86/CONFIG_EDAC_AMD8131
index 63a058c5b..63a058c5b 100644
--- a/baseconfig/x86/CONFIG_EDAC_AMD8131
+++ b/configs/base-generic/x86/CONFIG_EDAC_AMD8131
diff --git a/baseconfig/x86/CONFIG_EDAC_DECODE_MCE b/configs/base-generic/x86/CONFIG_EDAC_DECODE_MCE
index e408064da..e408064da 100644
--- a/baseconfig/x86/CONFIG_EDAC_DECODE_MCE
+++ b/configs/base-generic/x86/CONFIG_EDAC_DECODE_MCE
diff --git a/baseconfig/x86/CONFIG_EDAC_E752X b/configs/base-generic/x86/CONFIG_EDAC_E752X
index 4340af994..4340af994 100644
--- a/baseconfig/x86/CONFIG_EDAC_E752X
+++ b/configs/base-generic/x86/CONFIG_EDAC_E752X
diff --git a/baseconfig/x86/CONFIG_EDAC_I3000 b/configs/base-generic/x86/CONFIG_EDAC_I3000
index 4f30c3dbb..4f30c3dbb 100644
--- a/baseconfig/x86/CONFIG_EDAC_I3000
+++ b/configs/base-generic/x86/CONFIG_EDAC_I3000
diff --git a/baseconfig/x86/CONFIG_EDAC_I3200 b/configs/base-generic/x86/CONFIG_EDAC_I3200
index eaf5b3300..eaf5b3300 100644
--- a/baseconfig/x86/CONFIG_EDAC_I3200
+++ b/configs/base-generic/x86/CONFIG_EDAC_I3200
diff --git a/baseconfig/x86/CONFIG_EDAC_I5000 b/configs/base-generic/x86/CONFIG_EDAC_I5000
index 42ca260cd..42ca260cd 100644
--- a/baseconfig/x86/CONFIG_EDAC_I5000
+++ b/configs/base-generic/x86/CONFIG_EDAC_I5000
diff --git a/baseconfig/x86/CONFIG_EDAC_I5100 b/configs/base-generic/x86/CONFIG_EDAC_I5100
index 255b23ed3..255b23ed3 100644
--- a/baseconfig/x86/CONFIG_EDAC_I5100
+++ b/configs/base-generic/x86/CONFIG_EDAC_I5100
diff --git a/baseconfig/x86/CONFIG_EDAC_I5400 b/configs/base-generic/x86/CONFIG_EDAC_I5400
index 5cd55fc12..5cd55fc12 100644
--- a/baseconfig/x86/CONFIG_EDAC_I5400
+++ b/configs/base-generic/x86/CONFIG_EDAC_I5400
diff --git a/baseconfig/x86/CONFIG_EDAC_I7300 b/configs/base-generic/x86/CONFIG_EDAC_I7300
index d1c3314d7..d1c3314d7 100644
--- a/baseconfig/x86/CONFIG_EDAC_I7300
+++ b/configs/base-generic/x86/CONFIG_EDAC_I7300
diff --git a/baseconfig/x86/CONFIG_EDAC_I7CORE b/configs/base-generic/x86/CONFIG_EDAC_I7CORE
index b49e12979..b49e12979 100644
--- a/baseconfig/x86/CONFIG_EDAC_I7CORE
+++ b/configs/base-generic/x86/CONFIG_EDAC_I7CORE
diff --git a/baseconfig/x86/CONFIG_EDAC_I82975X b/configs/base-generic/x86/CONFIG_EDAC_I82975X
index 0fff85c4a..0fff85c4a 100644
--- a/baseconfig/x86/CONFIG_EDAC_I82975X
+++ b/configs/base-generic/x86/CONFIG_EDAC_I82975X
diff --git a/baseconfig/x86/CONFIG_EDAC_IE31200 b/configs/base-generic/x86/CONFIG_EDAC_IE31200
index 1d4b071de..1d4b071de 100644
--- a/baseconfig/x86/CONFIG_EDAC_IE31200
+++ b/configs/base-generic/x86/CONFIG_EDAC_IE31200
diff --git a/baseconfig/x86/CONFIG_EDAC_X38 b/configs/base-generic/x86/CONFIG_EDAC_X38
index 710ecf317..710ecf317 100644
--- a/baseconfig/x86/CONFIG_EDAC_X38
+++ b/configs/base-generic/x86/CONFIG_EDAC_X38
diff --git a/baseconfig/x86/CONFIG_EDD b/configs/base-generic/x86/CONFIG_EDD
index 9b8a635de..9b8a635de 100644
--- a/baseconfig/x86/CONFIG_EDD
+++ b/configs/base-generic/x86/CONFIG_EDD
diff --git a/baseconfig/x86/CONFIG_EDD_OFF b/configs/base-generic/x86/CONFIG_EDD_OFF
index 8e6d55871..8e6d55871 100644
--- a/baseconfig/x86/CONFIG_EDD_OFF
+++ b/configs/base-generic/x86/CONFIG_EDD_OFF
diff --git a/baseconfig/x86/CONFIG_EEEPC_LAPTOP b/configs/base-generic/x86/CONFIG_EEEPC_LAPTOP
index b0fe48b00..b0fe48b00 100644
--- a/baseconfig/x86/CONFIG_EEEPC_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_EEEPC_LAPTOP
diff --git a/baseconfig/x86/CONFIG_EEEPC_WMI b/configs/base-generic/x86/CONFIG_EEEPC_WMI
index bd7f00ece..bd7f00ece 100644
--- a/baseconfig/x86/CONFIG_EEEPC_WMI
+++ b/configs/base-generic/x86/CONFIG_EEEPC_WMI
diff --git a/baseconfig/x86/CONFIG_EFI b/configs/base-generic/x86/CONFIG_EFI
index 7dcf2966d..7dcf2966d 100644
--- a/baseconfig/x86/CONFIG_EFI
+++ b/configs/base-generic/x86/CONFIG_EFI
diff --git a/baseconfig/x86/CONFIG_EFIVAR_FS b/configs/base-generic/x86/CONFIG_EFIVAR_FS
index 4e151f100..4e151f100 100644
--- a/baseconfig/x86/CONFIG_EFIVAR_FS
+++ b/configs/base-generic/x86/CONFIG_EFIVAR_FS
diff --git a/baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT b/configs/base-generic/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
index 9a27fcc5a..9a27fcc5a 100644
--- a/baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
+++ b/configs/base-generic/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
diff --git a/baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL b/configs/base-generic/x86/CONFIG_EFI_BOOTLOADER_CONTROL
index ca42dfb42..ca42dfb42 100644
--- a/baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL
+++ b/configs/base-generic/x86/CONFIG_EFI_BOOTLOADER_CONTROL
diff --git a/baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER b/configs/base-generic/x86/CONFIG_EFI_CAPSULE_LOADER
index 2cc063216..2cc063216 100644
--- a/baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER
+++ b/configs/base-generic/x86/CONFIG_EFI_CAPSULE_LOADER
diff --git a/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH b/configs/base-generic/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
index 4b0b2944d..4b0b2944d 100644
--- a/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
+++ b/configs/base-generic/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
diff --git a/baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP b/configs/base-generic/x86/CONFIG_EFI_FAKE_MEMMAP
index 316a93b97..316a93b97 100644
--- a/baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP
+++ b/configs/base-generic/x86/CONFIG_EFI_FAKE_MEMMAP
diff --git a/baseconfig/x86/CONFIG_EFI_PCDP b/configs/base-generic/x86/CONFIG_EFI_PCDP
index ba6437e1b..ba6437e1b 100644
--- a/baseconfig/x86/CONFIG_EFI_PCDP
+++ b/configs/base-generic/x86/CONFIG_EFI_PCDP
diff --git a/baseconfig/x86/CONFIG_EFI_RUNTIME_MAP b/configs/base-generic/x86/CONFIG_EFI_RUNTIME_MAP
index 3a4462f39..3a4462f39 100644
--- a/baseconfig/x86/CONFIG_EFI_RUNTIME_MAP
+++ b/configs/base-generic/x86/CONFIG_EFI_RUNTIME_MAP
diff --git a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN b/configs/base-generic/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
index a8b3307f2..a8b3307f2 100644
--- a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
+++ b/configs/base-generic/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
diff --git a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE b/configs/base-generic/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
index 3231dd8c4..3231dd8c4 100644
--- a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
+++ b/configs/base-generic/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
diff --git a/baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/base-generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
index 9671a3c39..9671a3c39 100644
--- a/baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ b/configs/base-generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
diff --git a/baseconfig/x86/CONFIG_EFI_STUB b/configs/base-generic/x86/CONFIG_EFI_STUB
index c8859686c..c8859686c 100644
--- a/baseconfig/x86/CONFIG_EFI_STUB
+++ b/configs/base-generic/x86/CONFIG_EFI_STUB
diff --git a/baseconfig/x86/CONFIG_EFI_VARS b/configs/base-generic/x86/CONFIG_EFI_VARS
index 36e518c98..36e518c98 100644
--- a/baseconfig/x86/CONFIG_EFI_VARS
+++ b/configs/base-generic/x86/CONFIG_EFI_VARS
diff --git a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE b/configs/base-generic/x86/CONFIG_EFI_VARS_PSTORE
index 036e31942..036e31942 100644
--- a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE
+++ b/configs/base-generic/x86/CONFIG_EFI_VARS_PSTORE
diff --git a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE b/configs/base-generic/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
index a8eb13a8a..a8eb13a8a 100644
--- a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
+++ b/configs/base-generic/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
diff --git a/baseconfig/x86/CONFIG_ENA_ETHERNET b/configs/base-generic/x86/CONFIG_ENA_ETHERNET
index 64c0a73c1..64c0a73c1 100644
--- a/baseconfig/x86/CONFIG_ENA_ETHERNET
+++ b/configs/base-generic/x86/CONFIG_ENA_ETHERNET
diff --git a/baseconfig/x86/CONFIG_EXTCON b/configs/base-generic/x86/CONFIG_EXTCON
index bde29bcfc..bde29bcfc 100644
--- a/baseconfig/x86/CONFIG_EXTCON
+++ b/configs/base-generic/x86/CONFIG_EXTCON
diff --git a/baseconfig/x86/CONFIG_EXTCON_GPIO b/configs/base-generic/x86/CONFIG_EXTCON_GPIO
index 87ca2bd05..87ca2bd05 100644
--- a/baseconfig/x86/CONFIG_EXTCON_GPIO
+++ b/configs/base-generic/x86/CONFIG_EXTCON_GPIO
diff --git a/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496 b/configs/base-generic/x86/CONFIG_EXTCON_INTEL_INT3496
index 3f6c5d6f5..3f6c5d6f5 100644
--- a/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496
+++ b/configs/base-generic/x86/CONFIG_EXTCON_INTEL_INT3496
diff --git a/baseconfig/x86/CONFIG_EXTCON_MAX3355 b/configs/base-generic/x86/CONFIG_EXTCON_MAX3355
index 680b5a774..680b5a774 100644
--- a/baseconfig/x86/CONFIG_EXTCON_MAX3355
+++ b/configs/base-generic/x86/CONFIG_EXTCON_MAX3355
diff --git a/baseconfig/x86/CONFIG_EXTCON_RT8973A b/configs/base-generic/x86/CONFIG_EXTCON_RT8973A
index e5f7236c9..e5f7236c9 100644
--- a/baseconfig/x86/CONFIG_EXTCON_RT8973A
+++ b/configs/base-generic/x86/CONFIG_EXTCON_RT8973A
diff --git a/baseconfig/x86/CONFIG_EXTCON_SM5502 b/configs/base-generic/x86/CONFIG_EXTCON_SM5502
index 916994aa9..916994aa9 100644
--- a/baseconfig/x86/CONFIG_EXTCON_SM5502
+++ b/configs/base-generic/x86/CONFIG_EXTCON_SM5502
diff --git a/baseconfig/x86/CONFIG_EXTCON_USB_GPIO b/configs/base-generic/x86/CONFIG_EXTCON_USB_GPIO
index 7a0c9af30..7a0c9af30 100644
--- a/baseconfig/x86/CONFIG_EXTCON_USB_GPIO
+++ b/configs/base-generic/x86/CONFIG_EXTCON_USB_GPIO
diff --git a/baseconfig/x86/CONFIG_F71808E_WDT b/configs/base-generic/x86/CONFIG_F71808E_WDT
index 9fc51eb65..9fc51eb65 100644
--- a/baseconfig/x86/CONFIG_F71808E_WDT
+++ b/configs/base-generic/x86/CONFIG_F71808E_WDT
diff --git a/baseconfig/x86/CONFIG_FB_ARC b/configs/base-generic/x86/CONFIG_FB_ARC
index 1d66b92f4..1d66b92f4 100644
--- a/baseconfig/x86/CONFIG_FB_ARC
+++ b/configs/base-generic/x86/CONFIG_FB_ARC
diff --git a/baseconfig/x86/CONFIG_FB_EFI b/configs/base-generic/x86/CONFIG_FB_EFI
index 62adf192c..62adf192c 100644
--- a/baseconfig/x86/CONFIG_FB_EFI
+++ b/configs/base-generic/x86/CONFIG_FB_EFI
diff --git a/baseconfig/x86/CONFIG_FB_GEODE b/configs/base-generic/x86/CONFIG_FB_GEODE
index 3c78c584d..3c78c584d 100644
--- a/baseconfig/x86/CONFIG_FB_GEODE
+++ b/configs/base-generic/x86/CONFIG_FB_GEODE
diff --git a/baseconfig/x86/CONFIG_FB_HGA b/configs/base-generic/x86/CONFIG_FB_HGA
index 3c3142a1e..3c3142a1e 100644
--- a/baseconfig/x86/CONFIG_FB_HGA
+++ b/configs/base-generic/x86/CONFIG_FB_HGA
diff --git a/baseconfig/x86/CONFIG_FB_HYPERV b/configs/base-generic/x86/CONFIG_FB_HYPERV
index 06c30d0e7..06c30d0e7 100644
--- a/baseconfig/x86/CONFIG_FB_HYPERV
+++ b/configs/base-generic/x86/CONFIG_FB_HYPERV
diff --git a/baseconfig/x86/CONFIG_FB_I810 b/configs/base-generic/x86/CONFIG_FB_I810
index 9ef6eca18..9ef6eca18 100644
--- a/baseconfig/x86/CONFIG_FB_I810
+++ b/configs/base-generic/x86/CONFIG_FB_I810
diff --git a/baseconfig/x86/CONFIG_FB_I810_GTF b/configs/base-generic/x86/CONFIG_FB_I810_GTF
index 71eee1202..71eee1202 100644
--- a/baseconfig/x86/CONFIG_FB_I810_GTF
+++ b/configs/base-generic/x86/CONFIG_FB_I810_GTF
diff --git a/baseconfig/x86/CONFIG_FB_I810_I2C b/configs/base-generic/x86/CONFIG_FB_I810_I2C
index 7cfe05740..7cfe05740 100644
--- a/baseconfig/x86/CONFIG_FB_I810_I2C
+++ b/configs/base-generic/x86/CONFIG_FB_I810_I2C
diff --git a/baseconfig/x86/CONFIG_FB_LE80578 b/configs/base-generic/x86/CONFIG_FB_LE80578
index 327044a84..327044a84 100644
--- a/baseconfig/x86/CONFIG_FB_LE80578
+++ b/configs/base-generic/x86/CONFIG_FB_LE80578
diff --git a/baseconfig/x86/CONFIG_FB_N411 b/configs/base-generic/x86/CONFIG_FB_N411
index 50f6f3584..50f6f3584 100644
--- a/baseconfig/x86/CONFIG_FB_N411
+++ b/configs/base-generic/x86/CONFIG_FB_N411
diff --git a/baseconfig/x86/CONFIG_FB_VGA16 b/configs/base-generic/x86/CONFIG_FB_VGA16
index 4fa33dfdc..4fa33dfdc 100644
--- a/baseconfig/x86/CONFIG_FB_VGA16
+++ b/configs/base-generic/x86/CONFIG_FB_VGA16
diff --git a/baseconfig/x86/CONFIG_FB_VIA b/configs/base-generic/x86/CONFIG_FB_VIA
index d34242c33..d34242c33 100644
--- a/baseconfig/x86/CONFIG_FB_VIA
+++ b/configs/base-generic/x86/CONFIG_FB_VIA
diff --git a/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS b/configs/base-generic/x86/CONFIG_FB_VIA_DIRECT_PROCFS
index d2ff4278d..d2ff4278d 100644
--- a/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
+++ b/configs/base-generic/x86/CONFIG_FB_VIA_DIRECT_PROCFS
diff --git a/baseconfig/x86/CONFIG_FUJITSU_ES b/configs/base-generic/x86/CONFIG_FUJITSU_ES
index 2c1643a52..2c1643a52 100644
--- a/baseconfig/x86/CONFIG_FUJITSU_ES
+++ b/configs/base-generic/x86/CONFIG_FUJITSU_ES
diff --git a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP b/configs/base-generic/x86/CONFIG_FUJITSU_LAPTOP
index e47131e83..e47131e83 100644
--- a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_FUJITSU_LAPTOP
diff --git a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG b/configs/base-generic/x86/CONFIG_FUJITSU_LAPTOP_DEBUG
index 79b795169..79b795169 100644
--- a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG
+++ b/configs/base-generic/x86/CONFIG_FUJITSU_LAPTOP_DEBUG
diff --git a/baseconfig/x86/CONFIG_FUJITSU_TABLET b/configs/base-generic/x86/CONFIG_FUJITSU_TABLET
index 4e9d1a0a1..4e9d1a0a1 100644
--- a/baseconfig/x86/CONFIG_FUJITSU_TABLET
+++ b/configs/base-generic/x86/CONFIG_FUJITSU_TABLET
diff --git a/baseconfig/x86/CONFIG_GENERIC_ISA_DMA b/configs/base-generic/x86/CONFIG_GENERIC_ISA_DMA
index 01c179857..01c179857 100644
--- a/baseconfig/x86/CONFIG_GENERIC_ISA_DMA
+++ b/configs/base-generic/x86/CONFIG_GENERIC_ISA_DMA
diff --git a/baseconfig/x86/CONFIG_GPIO_104_IDI_48 b/configs/base-generic/x86/CONFIG_GPIO_104_IDI_48
index 3f9f19745..3f9f19745 100644
--- a/baseconfig/x86/CONFIG_GPIO_104_IDI_48
+++ b/configs/base-generic/x86/CONFIG_GPIO_104_IDI_48
diff --git a/baseconfig/x86/CONFIG_GPIO_AMD8111 b/configs/base-generic/x86/CONFIG_GPIO_AMD8111
index 097d52ce1..097d52ce1 100644
--- a/baseconfig/x86/CONFIG_GPIO_AMD8111
+++ b/configs/base-generic/x86/CONFIG_GPIO_AMD8111
diff --git a/baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE b/configs/base-generic/x86/CONFIG_GPIO_CRYSTAL_COVE
index 7c7683203..7c7683203 100644
--- a/baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE
+++ b/configs/base-generic/x86/CONFIG_GPIO_CRYSTAL_COVE
diff --git a/baseconfig/x86/CONFIG_GPIO_CS5535 b/configs/base-generic/x86/CONFIG_GPIO_CS5535
index 0566d4f6f..0566d4f6f 100644
--- a/baseconfig/x86/CONFIG_GPIO_CS5535
+++ b/configs/base-generic/x86/CONFIG_GPIO_CS5535
diff --git a/baseconfig/x86/CONFIG_GPIO_F7188X b/configs/base-generic/x86/CONFIG_GPIO_F7188X
index 4ab26719d..4ab26719d 100644
--- a/baseconfig/x86/CONFIG_GPIO_F7188X
+++ b/configs/base-generic/x86/CONFIG_GPIO_F7188X
diff --git a/baseconfig/x86/CONFIG_GPIO_ICH b/configs/base-generic/x86/CONFIG_GPIO_ICH
index 7712d0516..7712d0516 100644
--- a/baseconfig/x86/CONFIG_GPIO_ICH
+++ b/configs/base-generic/x86/CONFIG_GPIO_ICH
diff --git a/baseconfig/x86/CONFIG_GPIO_INTEL_MID b/configs/base-generic/x86/CONFIG_GPIO_INTEL_MID
index 1fca022bb..1fca022bb 100644
--- a/baseconfig/x86/CONFIG_GPIO_INTEL_MID
+++ b/configs/base-generic/x86/CONFIG_GPIO_INTEL_MID
diff --git a/baseconfig/x86/CONFIG_GPIO_IT87 b/configs/base-generic/x86/CONFIG_GPIO_IT87
index 00746d711..00746d711 100644
--- a/baseconfig/x86/CONFIG_GPIO_IT87
+++ b/configs/base-generic/x86/CONFIG_GPIO_IT87
diff --git a/baseconfig/x86/CONFIG_GPIO_LYNXPOINT b/configs/base-generic/x86/CONFIG_GPIO_LYNXPOINT
index b6a68c3b2..b6a68c3b2 100644
--- a/baseconfig/x86/CONFIG_GPIO_LYNXPOINT
+++ b/configs/base-generic/x86/CONFIG_GPIO_LYNXPOINT
diff --git a/baseconfig/x86/CONFIG_GPIO_ML_IOH b/configs/base-generic/x86/CONFIG_GPIO_ML_IOH
index 9155cc76a..9155cc76a 100644
--- a/baseconfig/x86/CONFIG_GPIO_ML_IOH
+++ b/configs/base-generic/x86/CONFIG_GPIO_ML_IOH
diff --git a/baseconfig/x86/CONFIG_GPIO_SCH b/configs/base-generic/x86/CONFIG_GPIO_SCH
index 91a3ab850..91a3ab850 100644
--- a/baseconfig/x86/CONFIG_GPIO_SCH
+++ b/configs/base-generic/x86/CONFIG_GPIO_SCH
diff --git a/baseconfig/x86/CONFIG_GPIO_VX855 b/configs/base-generic/x86/CONFIG_GPIO_VX855
index 07b0ce3ab..07b0ce3ab 100644
--- a/baseconfig/x86/CONFIG_GPIO_VX855
+++ b/configs/base-generic/x86/CONFIG_GPIO_VX855
diff --git a/baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE b/configs/base-generic/x86/CONFIG_GPIO_WHISKEY_COVE
index aea3beacf..aea3beacf 100644
--- a/baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE
+++ b/configs/base-generic/x86/CONFIG_GPIO_WHISKEY_COVE
diff --git a/baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR b/configs/base-generic/x86/CONFIG_HARDLOCKUP_DETECTOR
index dc5ae5ce3..dc5ae5ce3 100644
--- a/baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR
+++ b/configs/base-generic/x86/CONFIG_HARDLOCKUP_DETECTOR
diff --git a/baseconfig/x86/CONFIG_HDMI_LPE_AUDIO b/configs/base-generic/x86/CONFIG_HDMI_LPE_AUDIO
index a901acc4d..a901acc4d 100644
--- a/baseconfig/x86/CONFIG_HDMI_LPE_AUDIO
+++ b/configs/base-generic/x86/CONFIG_HDMI_LPE_AUDIO
diff --git a/baseconfig/x86/CONFIG_HID_ASUS b/configs/base-generic/x86/CONFIG_HID_ASUS
index efc1ef4f8..efc1ef4f8 100644
--- a/baseconfig/x86/CONFIG_HID_ASUS
+++ b/configs/base-generic/x86/CONFIG_HID_ASUS
diff --git a/baseconfig/x86/CONFIG_HID_HYPERV_MOUSE b/configs/base-generic/x86/CONFIG_HID_HYPERV_MOUSE
index 2089444e5..2089444e5 100644
--- a/baseconfig/x86/CONFIG_HID_HYPERV_MOUSE
+++ b/configs/base-generic/x86/CONFIG_HID_HYPERV_MOUSE
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_COMPAQ
index 9714f8806..9714f8806 100644
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ
+++ b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_COMPAQ
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
index 67ee2d252..67ee2d252 100644
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
+++ b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_IBM
index 855d684ca..855d684ca 100644
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM
+++ b/configs/base-generic/x86/CONFIG_HOTPLUG_PCI_IBM
diff --git a/baseconfig/x86/CONFIG_HPET b/configs/base-generic/x86/CONFIG_HPET
index 9ac1b11db..9ac1b11db 100644
--- a/baseconfig/x86/CONFIG_HPET
+++ b/configs/base-generic/x86/CONFIG_HPET
diff --git a/baseconfig/x86/CONFIG_HPET_MMAP b/configs/base-generic/x86/CONFIG_HPET_MMAP
index 9d7890659..9d7890659 100644
--- a/baseconfig/x86/CONFIG_HPET_MMAP
+++ b/configs/base-generic/x86/CONFIG_HPET_MMAP
diff --git a/baseconfig/x86/CONFIG_HPET_TIMER b/configs/base-generic/x86/CONFIG_HPET_TIMER
index 381266e17..381266e17 100644
--- a/baseconfig/x86/CONFIG_HPET_TIMER
+++ b/configs/base-generic/x86/CONFIG_HPET_TIMER
diff --git a/baseconfig/x86/CONFIG_HPWDT_NMI_DECODING b/configs/base-generic/x86/CONFIG_HPWDT_NMI_DECODING
index 2f21b282d..2f21b282d 100644
--- a/baseconfig/x86/CONFIG_HPWDT_NMI_DECODING
+++ b/configs/base-generic/x86/CONFIG_HPWDT_NMI_DECODING
diff --git a/baseconfig/x86/CONFIG_HP_ACCEL b/configs/base-generic/x86/CONFIG_HP_ACCEL
index 7aade2bc1..7aade2bc1 100644
--- a/baseconfig/x86/CONFIG_HP_ACCEL
+++ b/configs/base-generic/x86/CONFIG_HP_ACCEL
diff --git a/baseconfig/x86/CONFIG_HP_ILO b/configs/base-generic/x86/CONFIG_HP_ILO
index 1d3256354..1d3256354 100644
--- a/baseconfig/x86/CONFIG_HP_ILO
+++ b/configs/base-generic/x86/CONFIG_HP_ILO
diff --git a/baseconfig/x86/CONFIG_HP_WATCHDOG b/configs/base-generic/x86/CONFIG_HP_WATCHDOG
index 9a829b4e9..9a829b4e9 100644
--- a/baseconfig/x86/CONFIG_HP_WATCHDOG
+++ b/configs/base-generic/x86/CONFIG_HP_WATCHDOG
diff --git a/baseconfig/x86/CONFIG_HP_WIRELESS b/configs/base-generic/x86/CONFIG_HP_WIRELESS
index e371ddd0d..e371ddd0d 100644
--- a/baseconfig/x86/CONFIG_HP_WIRELESS
+++ b/configs/base-generic/x86/CONFIG_HP_WIRELESS
diff --git a/baseconfig/x86/CONFIG_HP_WMI b/configs/base-generic/x86/CONFIG_HP_WMI
index 078d5d53f..078d5d53f 100644
--- a/baseconfig/x86/CONFIG_HP_WMI
+++ b/configs/base-generic/x86/CONFIG_HP_WMI
diff --git a/baseconfig/x86/CONFIG_HVC_XEN b/configs/base-generic/x86/CONFIG_HVC_XEN
index df97a05c7..df97a05c7 100644
--- a/baseconfig/x86/CONFIG_HVC_XEN
+++ b/configs/base-generic/x86/CONFIG_HVC_XEN
diff --git a/baseconfig/x86/CONFIG_HVC_XEN_FRONTEND b/configs/base-generic/x86/CONFIG_HVC_XEN_FRONTEND
index 02ccaac13..02ccaac13 100644
--- a/baseconfig/x86/CONFIG_HVC_XEN_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_HVC_XEN_FRONTEND
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_AMD b/configs/base-generic/x86/CONFIG_HW_RANDOM_AMD
index dd7a51f3d..dd7a51f3d 100644
--- a/baseconfig/x86/CONFIG_HW_RANDOM_AMD
+++ b/configs/base-generic/x86/CONFIG_HW_RANDOM_AMD
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_INTEL b/configs/base-generic/x86/CONFIG_HW_RANDOM_INTEL
index 8929685e6..8929685e6 100644
--- a/baseconfig/x86/CONFIG_HW_RANDOM_INTEL
+++ b/configs/base-generic/x86/CONFIG_HW_RANDOM_INTEL
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_VIA b/configs/base-generic/x86/CONFIG_HW_RANDOM_VIA
index 9b9c51231..9b9c51231 100644
--- a/baseconfig/x86/CONFIG_HW_RANDOM_VIA
+++ b/configs/base-generic/x86/CONFIG_HW_RANDOM_VIA
diff --git a/baseconfig/x86/CONFIG_HYPERV b/configs/base-generic/x86/CONFIG_HYPERV
index 586091822..586091822 100644
--- a/baseconfig/x86/CONFIG_HYPERV
+++ b/configs/base-generic/x86/CONFIG_HYPERV
diff --git a/baseconfig/x86/CONFIG_HYPERVISOR_GUEST b/configs/base-generic/x86/CONFIG_HYPERVISOR_GUEST
index 2770560d5..2770560d5 100644
--- a/baseconfig/x86/CONFIG_HYPERVISOR_GUEST
+++ b/configs/base-generic/x86/CONFIG_HYPERVISOR_GUEST
diff --git a/baseconfig/x86/CONFIG_HYPERV_BALLOON b/configs/base-generic/x86/CONFIG_HYPERV_BALLOON
index b1f01cbe4..b1f01cbe4 100644
--- a/baseconfig/x86/CONFIG_HYPERV_BALLOON
+++ b/configs/base-generic/x86/CONFIG_HYPERV_BALLOON
diff --git a/baseconfig/x86/CONFIG_HYPERV_KEYBOARD b/configs/base-generic/x86/CONFIG_HYPERV_KEYBOARD
index 25dccab6b..25dccab6b 100644
--- a/baseconfig/x86/CONFIG_HYPERV_KEYBOARD
+++ b/configs/base-generic/x86/CONFIG_HYPERV_KEYBOARD
diff --git a/baseconfig/x86/CONFIG_HYPERV_NET b/configs/base-generic/x86/CONFIG_HYPERV_NET
index ecacee715..ecacee715 100644
--- a/baseconfig/x86/CONFIG_HYPERV_NET
+++ b/configs/base-generic/x86/CONFIG_HYPERV_NET
diff --git a/baseconfig/x86/CONFIG_HYPERV_STORAGE b/configs/base-generic/x86/CONFIG_HYPERV_STORAGE
index 6782fa59b..6782fa59b 100644
--- a/baseconfig/x86/CONFIG_HYPERV_STORAGE
+++ b/configs/base-generic/x86/CONFIG_HYPERV_STORAGE
diff --git a/baseconfig/x86/CONFIG_HYPERV_UTILS b/configs/base-generic/x86/CONFIG_HYPERV_UTILS
index 9b8c0d2a4..9b8c0d2a4 100644
--- a/baseconfig/x86/CONFIG_HYPERV_UTILS
+++ b/configs/base-generic/x86/CONFIG_HYPERV_UTILS
diff --git a/baseconfig/x86/CONFIG_HYPERV_VSOCKETS b/configs/base-generic/x86/CONFIG_HYPERV_VSOCKETS
index bd21cd675..bd21cd675 100644
--- a/baseconfig/x86/CONFIG_HYPERV_VSOCKETS
+++ b/configs/base-generic/x86/CONFIG_HYPERV_VSOCKETS
diff --git a/baseconfig/x86/CONFIG_I2C b/configs/base-generic/x86/CONFIG_I2C
index aafb657f5..aafb657f5 100644
--- a/baseconfig/x86/CONFIG_I2C
+++ b/configs/base-generic/x86/CONFIG_I2C
diff --git a/baseconfig/x86/CONFIG_I2C_AMD756 b/configs/base-generic/x86/CONFIG_I2C_AMD756
index 760d8bd42..760d8bd42 100644
--- a/baseconfig/x86/CONFIG_I2C_AMD756
+++ b/configs/base-generic/x86/CONFIG_I2C_AMD756
diff --git a/baseconfig/x86/CONFIG_I2C_AMD756_S4882 b/configs/base-generic/x86/CONFIG_I2C_AMD756_S4882
index 32da34a3e..32da34a3e 100644
--- a/baseconfig/x86/CONFIG_I2C_AMD756_S4882
+++ b/configs/base-generic/x86/CONFIG_I2C_AMD756_S4882
diff --git a/baseconfig/x86/CONFIG_I2C_AMD8111 b/configs/base-generic/x86/CONFIG_I2C_AMD8111
index 3359257cd..3359257cd 100644
--- a/baseconfig/x86/CONFIG_I2C_AMD8111
+++ b/configs/base-generic/x86/CONFIG_I2C_AMD8111
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL
index 88e9c546e..88e9c546e 100644
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL
+++ b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_CORE
index f9cdc633b..f9cdc633b 100644
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE
+++ b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_CORE
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_PLATFORM
index 3d50a3e8a..3d50a3e8a 100644
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM
+++ b/configs/base-generic/x86/CONFIG_I2C_DESIGNWARE_PLATFORM
diff --git a/baseconfig/x86/CONFIG_I2C_I801 b/configs/base-generic/x86/CONFIG_I2C_I801
index 5d1883a34..5d1883a34 100644
--- a/baseconfig/x86/CONFIG_I2C_I801
+++ b/configs/base-generic/x86/CONFIG_I2C_I801
diff --git a/baseconfig/x86/CONFIG_I2C_ISCH b/configs/base-generic/x86/CONFIG_I2C_ISCH
index ca084a709..ca084a709 100644
--- a/baseconfig/x86/CONFIG_I2C_ISCH
+++ b/configs/base-generic/x86/CONFIG_I2C_ISCH
diff --git a/baseconfig/x86/CONFIG_I2C_ISMT b/configs/base-generic/x86/CONFIG_I2C_ISMT
index f720d1bb1..f720d1bb1 100644
--- a/baseconfig/x86/CONFIG_I2C_ISMT
+++ b/configs/base-generic/x86/CONFIG_I2C_ISMT
diff --git a/baseconfig/x86/CONFIG_I2C_NFORCE2 b/configs/base-generic/x86/CONFIG_I2C_NFORCE2
index 50bbe34f2..50bbe34f2 100644
--- a/baseconfig/x86/CONFIG_I2C_NFORCE2
+++ b/configs/base-generic/x86/CONFIG_I2C_NFORCE2
diff --git a/baseconfig/x86/CONFIG_I2C_NFORCE2_S4985 b/configs/base-generic/x86/CONFIG_I2C_NFORCE2_S4985
index 758a790d2..758a790d2 100644
--- a/baseconfig/x86/CONFIG_I2C_NFORCE2_S4985
+++ b/configs/base-generic/x86/CONFIG_I2C_NFORCE2_S4985
diff --git a/baseconfig/x86/CONFIG_I2C_PARPORT b/configs/base-generic/x86/CONFIG_I2C_PARPORT
index 58827a258..58827a258 100644
--- a/baseconfig/x86/CONFIG_I2C_PARPORT
+++ b/configs/base-generic/x86/CONFIG_I2C_PARPORT
diff --git a/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT b/configs/base-generic/x86/CONFIG_I2C_PARPORT_LIGHT
index 1dbc68883..1dbc68883 100644
--- a/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT
+++ b/configs/base-generic/x86/CONFIG_I2C_PARPORT_LIGHT
diff --git a/baseconfig/x86/CONFIG_I2C_PIIX4 b/configs/base-generic/x86/CONFIG_I2C_PIIX4
index ff0307146..ff0307146 100644
--- a/baseconfig/x86/CONFIG_I2C_PIIX4
+++ b/configs/base-generic/x86/CONFIG_I2C_PIIX4
diff --git a/baseconfig/x86/CONFIG_I2C_PXA b/configs/base-generic/x86/CONFIG_I2C_PXA
index 59d18f0cb..59d18f0cb 100644
--- a/baseconfig/x86/CONFIG_I2C_PXA
+++ b/configs/base-generic/x86/CONFIG_I2C_PXA
diff --git a/baseconfig/x86/CONFIG_I2C_PXA_SLAVE b/configs/base-generic/x86/CONFIG_I2C_PXA_SLAVE
index 7cc440320..7cc440320 100644
--- a/baseconfig/x86/CONFIG_I2C_PXA_SLAVE
+++ b/configs/base-generic/x86/CONFIG_I2C_PXA_SLAVE
diff --git a/baseconfig/x86/CONFIG_I2C_SCMI b/configs/base-generic/x86/CONFIG_I2C_SCMI
index 6e60bd4e1..6e60bd4e1 100644
--- a/baseconfig/x86/CONFIG_I2C_SCMI
+++ b/configs/base-generic/x86/CONFIG_I2C_SCMI
diff --git a/baseconfig/x86/CONFIG_I2C_SIS96X b/configs/base-generic/x86/CONFIG_I2C_SIS96X
index e716d3492..e716d3492 100644
--- a/baseconfig/x86/CONFIG_I2C_SIS96X
+++ b/configs/base-generic/x86/CONFIG_I2C_SIS96X
diff --git a/baseconfig/x86/CONFIG_I2C_VIA b/configs/base-generic/x86/CONFIG_I2C_VIA
index 4b9475a7b..4b9475a7b 100644
--- a/baseconfig/x86/CONFIG_I2C_VIA
+++ b/configs/base-generic/x86/CONFIG_I2C_VIA
diff --git a/baseconfig/x86/CONFIG_I2C_VIAPRO b/configs/base-generic/x86/CONFIG_I2C_VIAPRO
index 93d8303db..93d8303db 100644
--- a/baseconfig/x86/CONFIG_I2C_VIAPRO
+++ b/configs/base-generic/x86/CONFIG_I2C_VIAPRO
diff --git a/baseconfig/x86/CONFIG_I8K b/configs/base-generic/x86/CONFIG_I8K
index 0ffc1edcc..0ffc1edcc 100644
--- a/baseconfig/x86/CONFIG_I8K
+++ b/configs/base-generic/x86/CONFIG_I8K
diff --git a/baseconfig/x86/CONFIG_IB700_WDT b/configs/base-generic/x86/CONFIG_IB700_WDT
index 3cf068abd..3cf068abd 100644
--- a/baseconfig/x86/CONFIG_IB700_WDT
+++ b/configs/base-generic/x86/CONFIG_IB700_WDT
diff --git a/baseconfig/x86/CONFIG_IBMASR b/configs/base-generic/x86/CONFIG_IBMASR
index c5d4eb253..c5d4eb253 100644
--- a/baseconfig/x86/CONFIG_IBMASR
+++ b/configs/base-generic/x86/CONFIG_IBMASR
diff --git a/baseconfig/x86/CONFIG_IBM_ASM b/configs/base-generic/x86/CONFIG_IBM_ASM
index caf4c739a..caf4c739a 100644
--- a/baseconfig/x86/CONFIG_IBM_ASM
+++ b/configs/base-generic/x86/CONFIG_IBM_ASM
diff --git a/baseconfig/x86/CONFIG_IBM_RTL b/configs/base-generic/x86/CONFIG_IBM_RTL
index 3a0fee720..3a0fee720 100644
--- a/baseconfig/x86/CONFIG_IBM_RTL
+++ b/configs/base-generic/x86/CONFIG_IBM_RTL
diff --git a/baseconfig/x86/CONFIG_IDEAPAD_LAPTOP b/configs/base-generic/x86/CONFIG_IDEAPAD_LAPTOP
index 5937dca3e..5937dca3e 100644
--- a/baseconfig/x86/CONFIG_IDEAPAD_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_IDEAPAD_LAPTOP
diff --git a/baseconfig/x86/CONFIG_IDMA64 b/configs/base-generic/x86/CONFIG_IDMA64
index 58c13bbb3..58c13bbb3 100644
--- a/baseconfig/x86/CONFIG_IDMA64
+++ b/configs/base-generic/x86/CONFIG_IDMA64
diff --git a/baseconfig/x86/CONFIG_IE6XX_WDT b/configs/base-generic/x86/CONFIG_IE6XX_WDT
index 96368c0af..96368c0af 100644
--- a/baseconfig/x86/CONFIG_IE6XX_WDT
+++ b/configs/base-generic/x86/CONFIG_IE6XX_WDT
diff --git a/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA b/configs/base-generic/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
index 164f3b26c..164f3b26c 100644
--- a/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
+++ b/configs/base-generic/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
diff --git a/baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY b/configs/base-generic/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY
index dec62a899..dec62a899 100644
--- a/baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY
+++ b/configs/base-generic/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY
diff --git a/baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND b/configs/base-generic/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
index 9703adaf4..9703adaf4 100644
--- a/baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
diff --git a/baseconfig/x86/CONFIG_INT3406_THERMAL b/configs/base-generic/x86/CONFIG_INT3406_THERMAL
index b61486c65..b61486c65 100644
--- a/baseconfig/x86/CONFIG_INT3406_THERMAL
+++ b/configs/base-generic/x86/CONFIG_INT3406_THERMAL
diff --git a/baseconfig/x86/CONFIG_INT340X_THERMAL b/configs/base-generic/x86/CONFIG_INT340X_THERMAL
index 1df71f851..1df71f851 100644
--- a/baseconfig/x86/CONFIG_INT340X_THERMAL
+++ b/configs/base-generic/x86/CONFIG_INT340X_THERMAL
diff --git a/baseconfig/x86/CONFIG_INTEL_ATOMISP b/configs/base-generic/x86/CONFIG_INTEL_ATOMISP
index fde06c533..fde06c533 100644
--- a/baseconfig/x86/CONFIG_INTEL_ATOMISP
+++ b/configs/base-generic/x86/CONFIG_INTEL_ATOMISP
diff --git a/baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL b/configs/base-generic/x86/CONFIG_INTEL_BXT_PMIC_THERMAL
index 6207a4474..6207a4474 100644
--- a/baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL
+++ b/configs/base-generic/x86/CONFIG_INTEL_BXT_PMIC_THERMAL
diff --git a/baseconfig/x86/CONFIG_INTEL_CHT_INT33FE b/configs/base-generic/x86/CONFIG_INTEL_CHT_INT33FE
index 7657a9a07..7657a9a07 100644
--- a/baseconfig/x86/CONFIG_INTEL_CHT_INT33FE
+++ b/configs/base-generic/x86/CONFIG_INTEL_CHT_INT33FE
diff --git a/baseconfig/x86/CONFIG_INTEL_HID_EVENT b/configs/base-generic/x86/CONFIG_INTEL_HID_EVENT
index db284f9da..db284f9da 100644
--- a/baseconfig/x86/CONFIG_INTEL_HID_EVENT
+++ b/configs/base-generic/x86/CONFIG_INTEL_HID_EVENT
diff --git a/baseconfig/x86/CONFIG_INTEL_IDLE b/configs/base-generic/x86/CONFIG_INTEL_IDLE
index 11c398412..11c398412 100644
--- a/baseconfig/x86/CONFIG_INTEL_IDLE
+++ b/configs/base-generic/x86/CONFIG_INTEL_IDLE
diff --git a/baseconfig/x86/CONFIG_INTEL_IDMA64 b/configs/base-generic/x86/CONFIG_INTEL_IDMA64
index 599b2317e..599b2317e 100644
--- a/baseconfig/x86/CONFIG_INTEL_IDMA64
+++ b/configs/base-generic/x86/CONFIG_INTEL_IDMA64
diff --git a/baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO b/configs/base-generic/x86/CONFIG_INTEL_INT0002_VGPIO
index f416f2ddc..f416f2ddc 100644
--- a/baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO
+++ b/configs/base-generic/x86/CONFIG_INTEL_INT0002_VGPIO
diff --git a/baseconfig/x86/CONFIG_INTEL_IOATDMA b/configs/base-generic/x86/CONFIG_INTEL_IOATDMA
index 916ea1727..916ea1727 100644
--- a/baseconfig/x86/CONFIG_INTEL_IOATDMA
+++ b/configs/base-generic/x86/CONFIG_INTEL_IOATDMA
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU b/configs/base-generic/x86/CONFIG_INTEL_IOMMU
index b21af5c55..b21af5c55 100644
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU
+++ b/configs/base-generic/x86/CONFIG_INTEL_IOMMU
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON
index 65c519e1d..65c519e1d 100644
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON
+++ b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA
index 24e7e07d8..24e7e07d8 100644
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA
+++ b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_SVM b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_SVM
index eb03ccae7..eb03ccae7 100644
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_SVM
+++ b/configs/base-generic/x86/CONFIG_INTEL_IOMMU_SVM
diff --git a/baseconfig/x86/CONFIG_INTEL_IPS b/configs/base-generic/x86/CONFIG_INTEL_IPS
index 3d5e32159..3d5e32159 100644
--- a/baseconfig/x86/CONFIG_INTEL_IPS
+++ b/configs/base-generic/x86/CONFIG_INTEL_IPS
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI b/configs/base-generic/x86/CONFIG_INTEL_MEI
index 15212b9f8..15212b9f8 100644
--- a/baseconfig/x86/CONFIG_INTEL_MEI
+++ b/configs/base-generic/x86/CONFIG_INTEL_MEI
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_ME b/configs/base-generic/x86/CONFIG_INTEL_MEI_ME
index 1592e963b..1592e963b 100644
--- a/baseconfig/x86/CONFIG_INTEL_MEI_ME
+++ b/configs/base-generic/x86/CONFIG_INTEL_MEI_ME
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_TXE b/configs/base-generic/x86/CONFIG_INTEL_MEI_TXE
index 359cad436..359cad436 100644
--- a/baseconfig/x86/CONFIG_INTEL_MEI_TXE
+++ b/configs/base-generic/x86/CONFIG_INTEL_MEI_TXE
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_WDT b/configs/base-generic/x86/CONFIG_INTEL_MEI_WDT
index a1d5fc1bf..a1d5fc1bf 100644
--- a/baseconfig/x86/CONFIG_INTEL_MEI_WDT
+++ b/configs/base-generic/x86/CONFIG_INTEL_MEI_WDT
diff --git a/baseconfig/x86/CONFIG_INTEL_MENLOW b/configs/base-generic/x86/CONFIG_INTEL_MENLOW
index 342cd294b..342cd294b 100644
--- a/baseconfig/x86/CONFIG_INTEL_MENLOW
+++ b/configs/base-generic/x86/CONFIG_INTEL_MENLOW
diff --git a/baseconfig/x86/CONFIG_INTEL_OAKTRAIL b/configs/base-generic/x86/CONFIG_INTEL_OAKTRAIL
index c2cbe39cd..c2cbe39cd 100644
--- a/baseconfig/x86/CONFIG_INTEL_OAKTRAIL
+++ b/configs/base-generic/x86/CONFIG_INTEL_OAKTRAIL
diff --git a/baseconfig/x86/CONFIG_INTEL_PCH_THERMAL b/configs/base-generic/x86/CONFIG_INTEL_PCH_THERMAL
index 626785458..626785458 100644
--- a/baseconfig/x86/CONFIG_INTEL_PCH_THERMAL
+++ b/configs/base-generic/x86/CONFIG_INTEL_PCH_THERMAL
diff --git a/baseconfig/x86/CONFIG_INTEL_PMC_CORE b/configs/base-generic/x86/CONFIG_INTEL_PMC_CORE
index 4b7233a63..4b7233a63 100644
--- a/baseconfig/x86/CONFIG_INTEL_PMC_CORE
+++ b/configs/base-generic/x86/CONFIG_INTEL_PMC_CORE
diff --git a/baseconfig/x86/CONFIG_INTEL_PMC_IPC b/configs/base-generic/x86/CONFIG_INTEL_PMC_IPC
index eedef11ac..eedef11ac 100644
--- a/baseconfig/x86/CONFIG_INTEL_PMC_IPC
+++ b/configs/base-generic/x86/CONFIG_INTEL_PMC_IPC
diff --git a/baseconfig/x86/CONFIG_INTEL_POWERCLAMP b/configs/base-generic/x86/CONFIG_INTEL_POWERCLAMP
index 84f4db21f..84f4db21f 100644
--- a/baseconfig/x86/CONFIG_INTEL_POWERCLAMP
+++ b/configs/base-generic/x86/CONFIG_INTEL_POWERCLAMP
diff --git a/baseconfig/x86/CONFIG_INTEL_PUNIT_IPC b/configs/base-generic/x86/CONFIG_INTEL_PUNIT_IPC
index c99b3a524..c99b3a524 100644
--- a/baseconfig/x86/CONFIG_INTEL_PUNIT_IPC
+++ b/configs/base-generic/x86/CONFIG_INTEL_PUNIT_IPC
diff --git a/baseconfig/x86/CONFIG_INTEL_RAPL b/configs/base-generic/x86/CONFIG_INTEL_RAPL
index c894934f7..c894934f7 100644
--- a/baseconfig/x86/CONFIG_INTEL_RAPL
+++ b/configs/base-generic/x86/CONFIG_INTEL_RAPL
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT b/configs/base-generic/x86/CONFIG_INTEL_RDT
index 0dcef9a32..0dcef9a32 100644
--- a/baseconfig/x86/CONFIG_INTEL_RDT
+++ b/configs/base-generic/x86/CONFIG_INTEL_RDT
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT_A b/configs/base-generic/x86/CONFIG_INTEL_RDT_A
index 8c02d1afc..8c02d1afc 100644
--- a/baseconfig/x86/CONFIG_INTEL_RDT_A
+++ b/configs/base-generic/x86/CONFIG_INTEL_RDT_A
diff --git a/baseconfig/x86/CONFIG_INTEL_RST b/configs/base-generic/x86/CONFIG_INTEL_RST
index 3a471adf0..3a471adf0 100644
--- a/baseconfig/x86/CONFIG_INTEL_RST
+++ b/configs/base-generic/x86/CONFIG_INTEL_RST
diff --git a/baseconfig/x86/CONFIG_INTEL_SCU_IPC b/configs/base-generic/x86/CONFIG_INTEL_SCU_IPC
index e535aec5b..e535aec5b 100644
--- a/baseconfig/x86/CONFIG_INTEL_SCU_IPC
+++ b/configs/base-generic/x86/CONFIG_INTEL_SCU_IPC
diff --git a/baseconfig/x86/CONFIG_INTEL_SMARTCONNECT b/configs/base-generic/x86/CONFIG_INTEL_SMARTCONNECT
index f0c0a8f22..f0c0a8f22 100644
--- a/baseconfig/x86/CONFIG_INTEL_SMARTCONNECT
+++ b/configs/base-generic/x86/CONFIG_INTEL_SMARTCONNECT
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL b/configs/base-generic/x86/CONFIG_INTEL_SOC_DTS_THERMAL
index f3b1441e1..f3b1441e1 100644
--- a/baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL
+++ b/configs/base-generic/x86/CONFIG_INTEL_SOC_DTS_THERMAL
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC b/configs/base-generic/x86/CONFIG_INTEL_SOC_PMIC
index 2bb94a4d0..2bb94a4d0 100644
--- a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC
+++ b/configs/base-generic/x86/CONFIG_INTEL_SOC_PMIC
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC b/configs/base-generic/x86/CONFIG_INTEL_SOC_PMIC_CHTWC
index 2d14c0346..2d14c0346 100644
--- a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC
+++ b/configs/base-generic/x86/CONFIG_INTEL_SOC_PMIC_CHTWC
diff --git a/baseconfig/x86/CONFIG_INTEL_VBTN b/configs/base-generic/x86/CONFIG_INTEL_VBTN
index 62234540a..62234540a 100644
--- a/baseconfig/x86/CONFIG_INTEL_VBTN
+++ b/configs/base-generic/x86/CONFIG_INTEL_VBTN
diff --git a/baseconfig/x86/CONFIG_IOMMU_STRESS b/configs/base-generic/x86/CONFIG_IOMMU_STRESS
index e4aac8c40..e4aac8c40 100644
--- a/baseconfig/x86/CONFIG_IOMMU_STRESS
+++ b/configs/base-generic/x86/CONFIG_IOMMU_STRESS
diff --git a/baseconfig/x86/CONFIG_IOSF_MBI b/configs/base-generic/x86/CONFIG_IOSF_MBI
index 27b224a56..27b224a56 100644
--- a/baseconfig/x86/CONFIG_IOSF_MBI
+++ b/configs/base-generic/x86/CONFIG_IOSF_MBI
diff --git a/baseconfig/x86/CONFIG_IOSF_MBI_DEBUG b/configs/base-generic/x86/CONFIG_IOSF_MBI_DEBUG
index ecc6275ab..ecc6275ab 100644
--- a/baseconfig/x86/CONFIG_IOSF_MBI_DEBUG
+++ b/configs/base-generic/x86/CONFIG_IOSF_MBI_DEBUG
diff --git a/baseconfig/x86/CONFIG_IPW2100 b/configs/base-generic/x86/CONFIG_IPW2100
index 7cd6b8097..7cd6b8097 100644
--- a/baseconfig/x86/CONFIG_IPW2100
+++ b/configs/base-generic/x86/CONFIG_IPW2100
diff --git a/baseconfig/x86/CONFIG_IPW2100_MONITOR b/configs/base-generic/x86/CONFIG_IPW2100_MONITOR
index d409cd004..d409cd004 100644
--- a/baseconfig/x86/CONFIG_IPW2100_MONITOR
+++ b/configs/base-generic/x86/CONFIG_IPW2100_MONITOR
diff --git a/baseconfig/x86/CONFIG_IPW2200 b/configs/base-generic/x86/CONFIG_IPW2200
index a1feed659..a1feed659 100644
--- a/baseconfig/x86/CONFIG_IPW2200
+++ b/configs/base-generic/x86/CONFIG_IPW2200
diff --git a/baseconfig/x86/CONFIG_IPW2200_MONITOR b/configs/base-generic/x86/CONFIG_IPW2200_MONITOR
index 31bc39b2a..31bc39b2a 100644
--- a/baseconfig/x86/CONFIG_IPW2200_MONITOR
+++ b/configs/base-generic/x86/CONFIG_IPW2200_MONITOR
diff --git a/baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS b/configs/base-generic/x86/CONFIG_IPW2200_PROMISCUOUS
index dd9265155..dd9265155 100644
--- a/baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS
+++ b/configs/base-generic/x86/CONFIG_IPW2200_PROMISCUOUS
diff --git a/baseconfig/x86/CONFIG_IPW2200_QOS b/configs/base-generic/x86/CONFIG_IPW2200_QOS
index d67715efc..d67715efc 100644
--- a/baseconfig/x86/CONFIG_IPW2200_QOS
+++ b/configs/base-generic/x86/CONFIG_IPW2200_QOS
diff --git a/baseconfig/x86/CONFIG_IPW2200_RADIOTAP b/configs/base-generic/x86/CONFIG_IPW2200_RADIOTAP
index e43f7fe00..e43f7fe00 100644
--- a/baseconfig/x86/CONFIG_IPW2200_RADIOTAP
+++ b/configs/base-generic/x86/CONFIG_IPW2200_RADIOTAP
diff --git a/baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG b/configs/base-generic/x86/CONFIG_IRQ_DOMAIN_DEBUG
index fadfd90f4..fadfd90f4 100644
--- a/baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG
+++ b/configs/base-generic/x86/CONFIG_IRQ_DOMAIN_DEBUG
diff --git a/baseconfig/x86/CONFIG_ISCSI_IBFT b/configs/base-generic/x86/CONFIG_ISCSI_IBFT
index de0808095..de0808095 100644
--- a/baseconfig/x86/CONFIG_ISCSI_IBFT
+++ b/configs/base-generic/x86/CONFIG_ISCSI_IBFT
diff --git a/baseconfig/x86/CONFIG_ISCSI_IBFT_FIND b/configs/base-generic/x86/CONFIG_ISCSI_IBFT_FIND
index 4737a1e89..4737a1e89 100644
--- a/baseconfig/x86/CONFIG_ISCSI_IBFT_FIND
+++ b/configs/base-generic/x86/CONFIG_ISCSI_IBFT_FIND
diff --git a/baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG b/configs/base-generic/x86/CONFIG_KEXEC_VERIFY_SIG
index 5d9b84372..5d9b84372 100644
--- a/baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG
+++ b/configs/base-generic/x86/CONFIG_KEXEC_VERIFY_SIG
diff --git a/baseconfig/x86/CONFIG_KEYBOARD_GPIO b/configs/base-generic/x86/CONFIG_KEYBOARD_GPIO
index 46a9f62ef..46a9f62ef 100644
--- a/baseconfig/x86/CONFIG_KEYBOARD_GPIO
+++ b/configs/base-generic/x86/CONFIG_KEYBOARD_GPIO
diff --git a/baseconfig/x86/CONFIG_KVM b/configs/base-generic/x86/CONFIG_KVM
index cf9bf67a6..cf9bf67a6 100644
--- a/baseconfig/x86/CONFIG_KVM
+++ b/configs/base-generic/x86/CONFIG_KVM
diff --git a/baseconfig/x86/CONFIG_KVM_AMD b/configs/base-generic/x86/CONFIG_KVM_AMD
index b96224f70..b96224f70 100644
--- a/baseconfig/x86/CONFIG_KVM_AMD
+++ b/configs/base-generic/x86/CONFIG_KVM_AMD
diff --git a/baseconfig/x86/CONFIG_KVM_DEBUG_FS b/configs/base-generic/x86/CONFIG_KVM_DEBUG_FS
index 0e9438841..0e9438841 100644
--- a/baseconfig/x86/CONFIG_KVM_DEBUG_FS
+++ b/configs/base-generic/x86/CONFIG_KVM_DEBUG_FS
diff --git a/baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT b/configs/base-generic/x86/CONFIG_KVM_DEVICE_ASSIGNMENT
index 6879c7b7c..6879c7b7c 100644
--- a/baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT
+++ b/configs/base-generic/x86/CONFIG_KVM_DEVICE_ASSIGNMENT
diff --git a/baseconfig/x86/CONFIG_KVM_GUEST b/configs/base-generic/x86/CONFIG_KVM_GUEST
index 133da0424..133da0424 100644
--- a/baseconfig/x86/CONFIG_KVM_GUEST
+++ b/configs/base-generic/x86/CONFIG_KVM_GUEST
diff --git a/baseconfig/x86/CONFIG_KVM_INTEL b/configs/base-generic/x86/CONFIG_KVM_INTEL
index 7f5fa4452..7f5fa4452 100644
--- a/baseconfig/x86/CONFIG_KVM_INTEL
+++ b/configs/base-generic/x86/CONFIG_KVM_INTEL
diff --git a/baseconfig/x86/CONFIG_KVM_MMU_AUDIT b/configs/base-generic/x86/CONFIG_KVM_MMU_AUDIT
index 7e62e63cd..7e62e63cd 100644
--- a/baseconfig/x86/CONFIG_KVM_MMU_AUDIT
+++ b/configs/base-generic/x86/CONFIG_KVM_MMU_AUDIT
diff --git a/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200 b/configs/base-generic/x86/CONFIG_LEDS_INTEL_SS4200
index 9937903af..9937903af 100644
--- a/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200
+++ b/configs/base-generic/x86/CONFIG_LEDS_INTEL_SS4200
diff --git a/baseconfig/x86/CONFIG_LGUEST b/configs/base-generic/x86/CONFIG_LGUEST
index b80e4b9a3..b80e4b9a3 100644
--- a/baseconfig/x86/CONFIG_LGUEST
+++ b/configs/base-generic/x86/CONFIG_LGUEST
diff --git a/baseconfig/x86/CONFIG_LGUEST_GUEST b/configs/base-generic/x86/CONFIG_LGUEST_GUEST
index 92e126f36..92e126f36 100644
--- a/baseconfig/x86/CONFIG_LGUEST_GUEST
+++ b/configs/base-generic/x86/CONFIG_LGUEST_GUEST
diff --git a/baseconfig/x86/CONFIG_LOAD_UEFI_KEYS b/configs/base-generic/x86/CONFIG_LOAD_UEFI_KEYS
index 22502e981..22502e981 100644
--- a/baseconfig/x86/CONFIG_LOAD_UEFI_KEYS
+++ b/configs/base-generic/x86/CONFIG_LOAD_UEFI_KEYS
diff --git a/baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL b/configs/base-generic/x86/CONFIG_LOCK_DOWN_KERNEL
index e99bff22d..e99bff22d 100644
--- a/baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL
+++ b/configs/base-generic/x86/CONFIG_LOCK_DOWN_KERNEL
diff --git a/baseconfig/x86/CONFIG_LPC_ICH b/configs/base-generic/x86/CONFIG_LPC_ICH
index 0348d015e..0348d015e 100644
--- a/baseconfig/x86/CONFIG_LPC_ICH
+++ b/configs/base-generic/x86/CONFIG_LPC_ICH
diff --git a/baseconfig/x86/CONFIG_LPC_SCH b/configs/base-generic/x86/CONFIG_LPC_SCH
index 5d8664a8a..5d8664a8a 100644
--- a/baseconfig/x86/CONFIG_LPC_SCH
+++ b/configs/base-generic/x86/CONFIG_LPC_SCH
diff --git a/baseconfig/x86/CONFIG_MACINTOSH_DRIVERS b/configs/base-generic/x86/CONFIG_MACINTOSH_DRIVERS
index 105442f40..105442f40 100644
--- a/baseconfig/x86/CONFIG_MACINTOSH_DRIVERS
+++ b/configs/base-generic/x86/CONFIG_MACINTOSH_DRIVERS
diff --git a/debugconfig/CONFIG_MAXSMP b/configs/base-generic/x86/CONFIG_MAXSMP
index 8d0fa581d..8d0fa581d 100644
--- a/debugconfig/CONFIG_MAXSMP
+++ b/configs/base-generic/x86/CONFIG_MAXSMP
diff --git a/baseconfig/x86/CONFIG_MEMTEST b/configs/base-generic/x86/CONFIG_MEMTEST
index 27d7daee6..27d7daee6 100644
--- a/baseconfig/x86/CONFIG_MEMTEST
+++ b/configs/base-generic/x86/CONFIG_MEMTEST
diff --git a/baseconfig/x86/CONFIG_MFD_88PM800 b/configs/base-generic/x86/CONFIG_MFD_88PM800
index 858dc2db1..858dc2db1 100644
--- a/baseconfig/x86/CONFIG_MFD_88PM800
+++ b/configs/base-generic/x86/CONFIG_MFD_88PM800
diff --git a/baseconfig/x86/CONFIG_MFD_88PM805 b/configs/base-generic/x86/CONFIG_MFD_88PM805
index f3cd46c90..f3cd46c90 100644
--- a/baseconfig/x86/CONFIG_MFD_88PM805
+++ b/configs/base-generic/x86/CONFIG_MFD_88PM805
diff --git a/baseconfig/x86/CONFIG_MFD_AAT2870_CORE b/configs/base-generic/x86/CONFIG_MFD_AAT2870_CORE
index 9d4cf9056..9d4cf9056 100644
--- a/baseconfig/x86/CONFIG_MFD_AAT2870_CORE
+++ b/configs/base-generic/x86/CONFIG_MFD_AAT2870_CORE
diff --git a/baseconfig/x86/CONFIG_MFD_AS3711 b/configs/base-generic/x86/CONFIG_MFD_AS3711
index 53b3b04f1..53b3b04f1 100644
--- a/baseconfig/x86/CONFIG_MFD_AS3711
+++ b/configs/base-generic/x86/CONFIG_MFD_AS3711
diff --git a/baseconfig/x86/CONFIG_MFD_DA9052_I2C b/configs/base-generic/x86/CONFIG_MFD_DA9052_I2C
index c294bc24d..c294bc24d 100644
--- a/baseconfig/x86/CONFIG_MFD_DA9052_I2C
+++ b/configs/base-generic/x86/CONFIG_MFD_DA9052_I2C
diff --git a/baseconfig/x86/CONFIG_MFD_DA9055 b/configs/base-generic/x86/CONFIG_MFD_DA9055
index 3f7ae6423..3f7ae6423 100644
--- a/baseconfig/x86/CONFIG_MFD_DA9055
+++ b/configs/base-generic/x86/CONFIG_MFD_DA9055
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI b/configs/base-generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
index 7be3065fc..7be3065fc 100644
--- a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI
+++ b/configs/base-generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI b/configs/base-generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
index 93a430846..93a430846 100644
--- a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI
+++ b/configs/base-generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO b/configs/base-generic/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO
index e0e51d577..e0e51d577 100644
--- a/baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO
+++ b/configs/base-generic/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO
diff --git a/baseconfig/x86/CONFIG_MFD_LP8788 b/configs/base-generic/x86/CONFIG_MFD_LP8788
index 4600a154f..4600a154f 100644
--- a/baseconfig/x86/CONFIG_MFD_LP8788
+++ b/configs/base-generic/x86/CONFIG_MFD_LP8788
diff --git a/baseconfig/x86/CONFIG_MFD_RC5T583 b/configs/base-generic/x86/CONFIG_MFD_RC5T583
index f3976be09..f3976be09 100644
--- a/baseconfig/x86/CONFIG_MFD_RC5T583
+++ b/configs/base-generic/x86/CONFIG_MFD_RC5T583
diff --git a/baseconfig/x86/CONFIG_MFD_SEC_CORE b/configs/base-generic/x86/CONFIG_MFD_SEC_CORE
index d6bc4de4d..d6bc4de4d 100644
--- a/baseconfig/x86/CONFIG_MFD_SEC_CORE
+++ b/configs/base-generic/x86/CONFIG_MFD_SEC_CORE
diff --git a/baseconfig/x86/CONFIG_MFD_SMSC b/configs/base-generic/x86/CONFIG_MFD_SMSC
index 998701017..998701017 100644
--- a/baseconfig/x86/CONFIG_MFD_SMSC
+++ b/configs/base-generic/x86/CONFIG_MFD_SMSC
diff --git a/baseconfig/x86/CONFIG_MFD_TPS6586X b/configs/base-generic/x86/CONFIG_MFD_TPS6586X
index 142ccf9dd..142ccf9dd 100644
--- a/baseconfig/x86/CONFIG_MFD_TPS6586X
+++ b/configs/base-generic/x86/CONFIG_MFD_TPS6586X
diff --git a/baseconfig/x86/CONFIG_MICROCODE b/configs/base-generic/x86/CONFIG_MICROCODE
index bbf6abac4..bbf6abac4 100644
--- a/baseconfig/x86/CONFIG_MICROCODE
+++ b/configs/base-generic/x86/CONFIG_MICROCODE
diff --git a/baseconfig/x86/CONFIG_MICROCODE_AMD b/configs/base-generic/x86/CONFIG_MICROCODE_AMD
index 73f45c40e..73f45c40e 100644
--- a/baseconfig/x86/CONFIG_MICROCODE_AMD
+++ b/configs/base-generic/x86/CONFIG_MICROCODE_AMD
diff --git a/baseconfig/x86/CONFIG_MICROCODE_INTEL b/configs/base-generic/x86/CONFIG_MICROCODE_INTEL
index 11709e556..11709e556 100644
--- a/baseconfig/x86/CONFIG_MICROCODE_INTEL
+++ b/configs/base-generic/x86/CONFIG_MICROCODE_INTEL
diff --git a/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI b/configs/base-generic/x86/CONFIG_MMC_TOSHIBA_PCI
index 9372cd4fe..9372cd4fe 100644
--- a/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI
+++ b/configs/base-generic/x86/CONFIG_MMC_TOSHIBA_PCI
diff --git a/debugconfig/CONFIG_MMIOTRACE b/configs/base-generic/x86/CONFIG_MMIOTRACE
index dd8016c2c..dd8016c2c 100644
--- a/debugconfig/CONFIG_MMIOTRACE
+++ b/configs/base-generic/x86/CONFIG_MMIOTRACE
diff --git a/baseconfig/x86/CONFIG_MMIOTRACE_TEST b/configs/base-generic/x86/CONFIG_MMIOTRACE_TEST
index d8bbc0bdd..d8bbc0bdd 100644
--- a/baseconfig/x86/CONFIG_MMIOTRACE_TEST
+++ b/configs/base-generic/x86/CONFIG_MMIOTRACE_TEST
diff --git a/baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE b/configs/base-generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
index d3f895d3b..d3f895d3b 100644
--- a/baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE
+++ b/configs/base-generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
diff --git a/baseconfig/x86/CONFIG_MPILIB b/configs/base-generic/x86/CONFIG_MPILIB
index a41ce5d0e..a41ce5d0e 100644
--- a/baseconfig/x86/CONFIG_MPILIB
+++ b/configs/base-generic/x86/CONFIG_MPILIB
diff --git a/baseconfig/x86/CONFIG_MSI_LAPTOP b/configs/base-generic/x86/CONFIG_MSI_LAPTOP
index 7d45b2e5e..7d45b2e5e 100644
--- a/baseconfig/x86/CONFIG_MSI_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_MSI_LAPTOP
diff --git a/baseconfig/x86/CONFIG_MSI_WMI b/configs/base-generic/x86/CONFIG_MSI_WMI
index 7949ac91b..7949ac91b 100644
--- a/baseconfig/x86/CONFIG_MSI_WMI
+++ b/configs/base-generic/x86/CONFIG_MSI_WMI
diff --git a/baseconfig/x86/CONFIG_MTD_CK804XROM b/configs/base-generic/x86/CONFIG_MTD_CK804XROM
index 197c6ed96..197c6ed96 100644
--- a/baseconfig/x86/CONFIG_MTD_CK804XROM
+++ b/configs/base-generic/x86/CONFIG_MTD_CK804XROM
diff --git a/baseconfig/x86/CONFIG_MTD_ESB2ROM b/configs/base-generic/x86/CONFIG_MTD_ESB2ROM
index 4398f4a1e..4398f4a1e 100644
--- a/baseconfig/x86/CONFIG_MTD_ESB2ROM
+++ b/configs/base-generic/x86/CONFIG_MTD_ESB2ROM
diff --git a/baseconfig/x86/CONFIG_MTRR b/configs/base-generic/x86/CONFIG_MTRR
index 744162bca..744162bca 100644
--- a/baseconfig/x86/CONFIG_MTRR
+++ b/configs/base-generic/x86/CONFIG_MTRR
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER
index 2a32885dd..2a32885dd 100644
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER
+++ b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT
index 904e30638..904e30638 100644
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT
+++ b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
index f400e9c44..f400e9c44 100644
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
+++ b/configs/base-generic/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
diff --git a/baseconfig/x86/CONFIG_NET_SB1000 b/configs/base-generic/x86/CONFIG_NET_SB1000
index c776a1581..c776a1581 100644
--- a/baseconfig/x86/CONFIG_NET_SB1000
+++ b/configs/base-generic/x86/CONFIG_NET_SB1000
diff --git a/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE b/configs/base-generic/x86/CONFIG_NET_VENDOR_SOLARFLARE
index 8b1f0b6bf..8b1f0b6bf 100644
--- a/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE
+++ b/configs/base-generic/x86/CONFIG_NET_VENDOR_SOLARFLARE
diff --git a/baseconfig/x86/CONFIG_NFC_MEI_PHY b/configs/base-generic/x86/CONFIG_NFC_MEI_PHY
index c71b82e3a..c71b82e3a 100644
--- a/baseconfig/x86/CONFIG_NFC_MEI_PHY
+++ b/configs/base-generic/x86/CONFIG_NFC_MEI_PHY
diff --git a/baseconfig/x86/CONFIG_NFC_MICROREAD_MEI b/configs/base-generic/x86/CONFIG_NFC_MICROREAD_MEI
index 6f92f1400..6f92f1400 100644
--- a/baseconfig/x86/CONFIG_NFC_MICROREAD_MEI
+++ b/configs/base-generic/x86/CONFIG_NFC_MICROREAD_MEI
diff --git a/baseconfig/x86/CONFIG_NFC_PN544_MEI b/configs/base-generic/x86/CONFIG_NFC_PN544_MEI
index a94f0ad1b..a94f0ad1b 100644
--- a/baseconfig/x86/CONFIG_NFC_PN544_MEI
+++ b/configs/base-generic/x86/CONFIG_NFC_PN544_MEI
diff --git a/baseconfig/x86/CONFIG_NIC7018_WDT b/configs/base-generic/x86/CONFIG_NIC7018_WDT
index 9bc7a462a..9bc7a462a 100644
--- a/baseconfig/x86/CONFIG_NIC7018_WDT
+++ b/configs/base-generic/x86/CONFIG_NIC7018_WDT
diff --git a/baseconfig/x86/CONFIG_NO_BOOTMEM b/configs/base-generic/x86/CONFIG_NO_BOOTMEM
index 42f85aa30..42f85aa30 100644
--- a/baseconfig/x86/CONFIG_NO_BOOTMEM
+++ b/configs/base-generic/x86/CONFIG_NO_BOOTMEM
diff --git a/baseconfig/x86/CONFIG_NVRAM b/configs/base-generic/x86/CONFIG_NVRAM
index a296f9134..a296f9134 100644
--- a/baseconfig/x86/CONFIG_NVRAM
+++ b/configs/base-generic/x86/CONFIG_NVRAM
diff --git a/baseconfig/x86/CONFIG_NV_TCO b/configs/base-generic/x86/CONFIG_NV_TCO
index 984c1ff65..984c1ff65 100644
--- a/baseconfig/x86/CONFIG_NV_TCO
+++ b/configs/base-generic/x86/CONFIG_NV_TCO
diff --git a/baseconfig/x86/CONFIG_PANASONIC_LAPTOP b/configs/base-generic/x86/CONFIG_PANASONIC_LAPTOP
index f1ac44b84..f1ac44b84 100644
--- a/baseconfig/x86/CONFIG_PANASONIC_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_PANASONIC_LAPTOP
diff --git a/baseconfig/x86/CONFIG_PARAVIRT b/configs/base-generic/x86/CONFIG_PARAVIRT
index 65d95d1e2..65d95d1e2 100644
--- a/baseconfig/x86/CONFIG_PARAVIRT
+++ b/configs/base-generic/x86/CONFIG_PARAVIRT
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_DEBUG b/configs/base-generic/x86/CONFIG_PARAVIRT_DEBUG
index 7b0071250..7b0071250 100644
--- a/baseconfig/x86/CONFIG_PARAVIRT_DEBUG
+++ b/configs/base-generic/x86/CONFIG_PARAVIRT_DEBUG
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS b/configs/base-generic/x86/CONFIG_PARAVIRT_SPINLOCKS
index 857e9465e..857e9465e 100644
--- a/baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS
+++ b/configs/base-generic/x86/CONFIG_PARAVIRT_SPINLOCKS
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING b/configs/base-generic/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING
index 176320ad5..176320ad5 100644
--- a/baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING
+++ b/configs/base-generic/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING
diff --git a/baseconfig/x86/CONFIG_PARPORT b/configs/base-generic/x86/CONFIG_PARPORT
index 589156958..589156958 100644
--- a/baseconfig/x86/CONFIG_PARPORT
+++ b/configs/base-generic/x86/CONFIG_PARPORT
diff --git a/baseconfig/x86/CONFIG_PARPORT_1284 b/configs/base-generic/x86/CONFIG_PARPORT_1284
index 585684fb0..585684fb0 100644
--- a/baseconfig/x86/CONFIG_PARPORT_1284
+++ b/configs/base-generic/x86/CONFIG_PARPORT_1284
diff --git a/baseconfig/x86/CONFIG_PARPORT_AX88796 b/configs/base-generic/x86/CONFIG_PARPORT_AX88796
index 6214b2b8c..6214b2b8c 100644
--- a/baseconfig/x86/CONFIG_PARPORT_AX88796
+++ b/configs/base-generic/x86/CONFIG_PARPORT_AX88796
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC b/configs/base-generic/x86/CONFIG_PARPORT_PC
index b9aa6e8ca..b9aa6e8ca 100644
--- a/baseconfig/x86/CONFIG_PARPORT_PC
+++ b/configs/base-generic/x86/CONFIG_PARPORT_PC
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_FIFO b/configs/base-generic/x86/CONFIG_PARPORT_PC_FIFO
index 62562af4c..62562af4c 100644
--- a/baseconfig/x86/CONFIG_PARPORT_PC_FIFO
+++ b/configs/base-generic/x86/CONFIG_PARPORT_PC_FIFO
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA b/configs/base-generic/x86/CONFIG_PARPORT_PC_PCMCIA
index cae4b9a2a..cae4b9a2a 100644
--- a/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA
+++ b/configs/base-generic/x86/CONFIG_PARPORT_PC_PCMCIA
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO b/configs/base-generic/x86/CONFIG_PARPORT_PC_SUPERIO
index b6858ce79..b6858ce79 100644
--- a/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO
+++ b/configs/base-generic/x86/CONFIG_PARPORT_PC_SUPERIO
diff --git a/baseconfig/x86/CONFIG_PARPORT_SERIAL b/configs/base-generic/x86/CONFIG_PARPORT_SERIAL
index 8e9020190..8e9020190 100644
--- a/baseconfig/x86/CONFIG_PARPORT_SERIAL
+++ b/configs/base-generic/x86/CONFIG_PARPORT_SERIAL
diff --git a/baseconfig/x86/CONFIG_PATA_ACPI b/configs/base-generic/x86/CONFIG_PATA_ACPI
index c3bc7866f..c3bc7866f 100644
--- a/baseconfig/x86/CONFIG_PATA_ACPI
+++ b/configs/base-generic/x86/CONFIG_PATA_ACPI
diff --git a/baseconfig/x86/CONFIG_PATA_ATIIXP b/configs/base-generic/x86/CONFIG_PATA_ATIIXP
index 0089d45c9..0089d45c9 100644
--- a/baseconfig/x86/CONFIG_PATA_ATIIXP
+++ b/configs/base-generic/x86/CONFIG_PATA_ATIIXP
diff --git a/baseconfig/x86/CONFIG_PATA_MPIIX b/configs/base-generic/x86/CONFIG_PATA_MPIIX
index a29c081f6..a29c081f6 100644
--- a/baseconfig/x86/CONFIG_PATA_MPIIX
+++ b/configs/base-generic/x86/CONFIG_PATA_MPIIX
diff --git a/baseconfig/x86/CONFIG_PATA_OLDPIIX b/configs/base-generic/x86/CONFIG_PATA_OLDPIIX
index a3a6f6f6f..a3a6f6f6f 100644
--- a/baseconfig/x86/CONFIG_PATA_OLDPIIX
+++ b/configs/base-generic/x86/CONFIG_PATA_OLDPIIX
diff --git a/baseconfig/x86/CONFIG_PATA_SCH b/configs/base-generic/x86/CONFIG_PATA_SCH
index 2b0924997..2b0924997 100644
--- a/baseconfig/x86/CONFIG_PATA_SCH
+++ b/configs/base-generic/x86/CONFIG_PATA_SCH
diff --git a/baseconfig/x86/CONFIG_PATA_TOSHIBA b/configs/base-generic/x86/CONFIG_PATA_TOSHIBA
index 1fe4524d6..1fe4524d6 100644
--- a/baseconfig/x86/CONFIG_PATA_TOSHIBA
+++ b/configs/base-generic/x86/CONFIG_PATA_TOSHIBA
diff --git a/baseconfig/x86/CONFIG_PATA_TRIFLEX b/configs/base-generic/x86/CONFIG_PATA_TRIFLEX
index 09a247f65..09a247f65 100644
--- a/baseconfig/x86/CONFIG_PATA_TRIFLEX
+++ b/configs/base-generic/x86/CONFIG_PATA_TRIFLEX
diff --git a/baseconfig/x86/CONFIG_PCH_CAN b/configs/base-generic/x86/CONFIG_PCH_CAN
index 0350f86bd..0350f86bd 100644
--- a/baseconfig/x86/CONFIG_PCH_CAN
+++ b/configs/base-generic/x86/CONFIG_PCH_CAN
diff --git a/baseconfig/x86/CONFIG_PCH_DMA b/configs/base-generic/x86/CONFIG_PCH_DMA
index 45a18788d..45a18788d 100644
--- a/baseconfig/x86/CONFIG_PCH_DMA
+++ b/configs/base-generic/x86/CONFIG_PCH_DMA
diff --git a/baseconfig/x86/CONFIG_PCH_GBE b/configs/base-generic/x86/CONFIG_PCH_GBE
index 0ca9f51a0..0ca9f51a0 100644
--- a/baseconfig/x86/CONFIG_PCH_GBE
+++ b/configs/base-generic/x86/CONFIG_PCH_GBE
diff --git a/baseconfig/x86/CONFIG_PCH_PHUB b/configs/base-generic/x86/CONFIG_PCH_PHUB
index 3479f3e68..3479f3e68 100644
--- a/baseconfig/x86/CONFIG_PCH_PHUB
+++ b/configs/base-generic/x86/CONFIG_PCH_PHUB
diff --git a/baseconfig/x86/CONFIG_PCI_BIOS b/configs/base-generic/x86/CONFIG_PCI_BIOS
index 982fc1fa1..982fc1fa1 100644
--- a/baseconfig/x86/CONFIG_PCI_BIOS
+++ b/configs/base-generic/x86/CONFIG_PCI_BIOS
diff --git a/baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK b/configs/base-generic/x86/CONFIG_PCI_CNB20LE_QUIRK
index 88876bd15..88876bd15 100644
--- a/baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK
+++ b/configs/base-generic/x86/CONFIG_PCI_CNB20LE_QUIRK
diff --git a/baseconfig/x86/CONFIG_PCI_HYPERV b/configs/base-generic/x86/CONFIG_PCI_HYPERV
index baf87f9b9..baf87f9b9 100644
--- a/baseconfig/x86/CONFIG_PCI_HYPERV
+++ b/configs/base-generic/x86/CONFIG_PCI_HYPERV
diff --git a/baseconfig/x86/CONFIG_PCI_MMCONFIG b/configs/base-generic/x86/CONFIG_PCI_MMCONFIG
index cd749582c..cd749582c 100644
--- a/baseconfig/x86/CONFIG_PCI_MMCONFIG
+++ b/configs/base-generic/x86/CONFIG_PCI_MMCONFIG
diff --git a/baseconfig/x86/CONFIG_PEAQ_WMI b/configs/base-generic/x86/CONFIG_PEAQ_WMI
index 942e0690e..942e0690e 100644
--- a/baseconfig/x86/CONFIG_PEAQ_WMI
+++ b/configs/base-generic/x86/CONFIG_PEAQ_WMI
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER b/configs/base-generic/x86/CONFIG_PERF_EVENTS_AMD_POWER
index 481bdca29..481bdca29 100644
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER
+++ b/configs/base-generic/x86/CONFIG_PERF_EVENTS_AMD_POWER
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE
index aca4e0481..aca4e0481 100644
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE
+++ b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_RAPL
index b4c5123f1..b4c5123f1 100644
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL
+++ b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_RAPL
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE
index c96e92f02..c96e92f02 100644
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE
+++ b/configs/base-generic/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE
diff --git a/baseconfig/x86/CONFIG_PINCTRL b/configs/base-generic/x86/CONFIG_PINCTRL
index d8d83d561..d8d83d561 100644
--- a/baseconfig/x86/CONFIG_PINCTRL
+++ b/configs/base-generic/x86/CONFIG_PINCTRL
diff --git a/baseconfig/x86/CONFIG_PINCTRL_AMD b/configs/base-generic/x86/CONFIG_PINCTRL_AMD
index 02626b835..02626b835 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_AMD
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_AMD
diff --git a/baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL b/configs/base-generic/x86/CONFIG_PINCTRL_BAYTRAIL
index 706680265..706680265 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_BAYTRAIL
diff --git a/baseconfig/x86/CONFIG_PINCTRL_BROXTON b/configs/base-generic/x86/CONFIG_PINCTRL_BROXTON
index 563eb973f..563eb973f 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_BROXTON
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_BROXTON
diff --git a/baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW b/configs/base-generic/x86/CONFIG_PINCTRL_CHERRYVIEW
index bcdf61e7d..bcdf61e7d 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_CHERRYVIEW
diff --git a/baseconfig/x86/CONFIG_PINCTRL_DENVERTON b/configs/base-generic/x86/CONFIG_PINCTRL_DENVERTON
index ec6b4e8e1..ec6b4e8e1 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_DENVERTON
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_DENVERTON
diff --git a/baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE b/configs/base-generic/x86/CONFIG_PINCTRL_GEMINILAKE
index deb3b301d..deb3b301d 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_GEMINILAKE
diff --git a/baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT b/configs/base-generic/x86/CONFIG_PINCTRL_SUNRISEPOINT
index f47b9a76d..f47b9a76d 100644
--- a/baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT
+++ b/configs/base-generic/x86/CONFIG_PINCTRL_SUNRISEPOINT
diff --git a/baseconfig/x86/CONFIG_PMIC_ADP5520 b/configs/base-generic/x86/CONFIG_PMIC_ADP5520
index 8664194c8..8664194c8 100644
--- a/baseconfig/x86/CONFIG_PMIC_ADP5520
+++ b/configs/base-generic/x86/CONFIG_PMIC_ADP5520
diff --git a/baseconfig/x86/CONFIG_PMIC_DA903X b/configs/base-generic/x86/CONFIG_PMIC_DA903X
index 875cd2580..875cd2580 100644
--- a/baseconfig/x86/CONFIG_PMIC_DA903X
+++ b/configs/base-generic/x86/CONFIG_PMIC_DA903X
diff --git a/baseconfig/x86/CONFIG_PMIC_OPREGION b/configs/base-generic/x86/CONFIG_PMIC_OPREGION
index 4dbdfac30..4dbdfac30 100644
--- a/baseconfig/x86/CONFIG_PMIC_OPREGION
+++ b/configs/base-generic/x86/CONFIG_PMIC_OPREGION
diff --git a/baseconfig/x86/CONFIG_PNP b/configs/base-generic/x86/CONFIG_PNP
index 5c70e41cd..5c70e41cd 100644
--- a/baseconfig/x86/CONFIG_PNP
+++ b/configs/base-generic/x86/CONFIG_PNP
diff --git a/baseconfig/x86/CONFIG_PNPACPI b/configs/base-generic/x86/CONFIG_PNPACPI
index 02d6f696e..02d6f696e 100644
--- a/baseconfig/x86/CONFIG_PNPACPI
+++ b/configs/base-generic/x86/CONFIG_PNPACPI
diff --git a/baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES b/configs/base-generic/x86/CONFIG_PNP_DEBUG_MESSAGES
index cb591885f..cb591885f 100644
--- a/baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES
+++ b/configs/base-generic/x86/CONFIG_PNP_DEBUG_MESSAGES
diff --git a/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT b/configs/base-generic/x86/CONFIG_PPS_CLIENT_PARPORT
index d11894def..d11894def 100644
--- a/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT
+++ b/configs/base-generic/x86/CONFIG_PPS_CLIENT_PARPORT
diff --git a/baseconfig/x86/CONFIG_PROC_VMCORE b/configs/base-generic/x86/CONFIG_PROC_VMCORE
index c864e6b0b..c864e6b0b 100644
--- a/baseconfig/x86/CONFIG_PROC_VMCORE
+++ b/configs/base-generic/x86/CONFIG_PROC_VMCORE
diff --git a/baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM b/configs/base-generic/x86/CONFIG_PTP_1588_CLOCK_KVM
index 203f6b757..203f6b757 100644
--- a/baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM
+++ b/configs/base-generic/x86/CONFIG_PTP_1588_CLOCK_KVM
diff --git a/baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG b/configs/base-generic/x86/CONFIG_PUNIT_ATOM_DEBUG
index 0507cd497..0507cd497 100644
--- a/baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG
+++ b/configs/base-generic/x86/CONFIG_PUNIT_ATOM_DEBUG
diff --git a/baseconfig/x86/CONFIG_PVPANIC b/configs/base-generic/x86/CONFIG_PVPANIC
index fdc38a0f2..fdc38a0f2 100644
--- a/baseconfig/x86/CONFIG_PVPANIC
+++ b/configs/base-generic/x86/CONFIG_PVPANIC
diff --git a/baseconfig/x86/CONFIG_PWM_CRC b/configs/base-generic/x86/CONFIG_PWM_CRC
index 9b76aad38..9b76aad38 100644
--- a/baseconfig/x86/CONFIG_PWM_CRC
+++ b/configs/base-generic/x86/CONFIG_PWM_CRC
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS b/configs/base-generic/x86/CONFIG_PWM_LPSS
index 7e6a48990..7e6a48990 100644
--- a/baseconfig/x86/CONFIG_PWM_LPSS
+++ b/configs/base-generic/x86/CONFIG_PWM_LPSS
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS_PCI b/configs/base-generic/x86/CONFIG_PWM_LPSS_PCI
index d7ed9139e..d7ed9139e 100644
--- a/baseconfig/x86/CONFIG_PWM_LPSS_PCI
+++ b/configs/base-generic/x86/CONFIG_PWM_LPSS_PCI
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM b/configs/base-generic/x86/CONFIG_PWM_LPSS_PLATFORM
index d9042d8b8..d9042d8b8 100644
--- a/baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM
+++ b/configs/base-generic/x86/CONFIG_PWM_LPSS_PLATFORM
diff --git a/baseconfig/x86/CONFIG_RANDOMIZE_BASE b/configs/base-generic/x86/CONFIG_RANDOMIZE_BASE
index 20610a95a..20610a95a 100644
--- a/baseconfig/x86/CONFIG_RANDOMIZE_BASE
+++ b/configs/base-generic/x86/CONFIG_RANDOMIZE_BASE
diff --git a/baseconfig/x86/CONFIG_RAPIDIO b/configs/base-generic/x86/CONFIG_RAPIDIO
index 79892b190..79892b190 100644
--- a/baseconfig/x86/CONFIG_RAPIDIO
+++ b/configs/base-generic/x86/CONFIG_RAPIDIO
diff --git a/baseconfig/x86/CONFIG_RCU_FANOUT_LEAF b/configs/base-generic/x86/CONFIG_RCU_FANOUT_LEAF
index 147351a49..147351a49 100644
--- a/baseconfig/x86/CONFIG_RCU_FANOUT_LEAF
+++ b/configs/base-generic/x86/CONFIG_RCU_FANOUT_LEAF
diff --git a/baseconfig/x86/CONFIG_REGMAP_I2C b/configs/base-generic/x86/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/x86/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/x86/CONFIG_REGMAP_I2C
diff --git a/baseconfig/x86/CONFIG_RELOCATABLE b/configs/base-generic/x86/CONFIG_RELOCATABLE
index 36808edb3..36808edb3 100644
--- a/baseconfig/x86/CONFIG_RELOCATABLE
+++ b/configs/base-generic/x86/CONFIG_RELOCATABLE
diff --git a/baseconfig/x86/CONFIG_SAMSUNG_LAPTOP b/configs/base-generic/x86/CONFIG_SAMSUNG_LAPTOP
index aaa107689..aaa107689 100644
--- a/baseconfig/x86/CONFIG_SAMSUNG_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_SAMSUNG_LAPTOP
diff --git a/baseconfig/x86/CONFIG_SAMSUNG_Q10 b/configs/base-generic/x86/CONFIG_SAMSUNG_Q10
index 01423b93d..01423b93d 100644
--- a/baseconfig/x86/CONFIG_SAMSUNG_Q10
+++ b/configs/base-generic/x86/CONFIG_SAMSUNG_Q10
diff --git a/baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG b/configs/base-generic/x86/CONFIG_SBC_FITPC2_WATCHDOG
index 7f3cf3733..7f3cf3733 100644
--- a/baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG
+++ b/configs/base-generic/x86/CONFIG_SBC_FITPC2_WATCHDOG
diff --git a/baseconfig/x86/CONFIG_SCHED_MC b/configs/base-generic/x86/CONFIG_SCHED_MC
index 348674403..348674403 100644
--- a/baseconfig/x86/CONFIG_SCHED_MC
+++ b/configs/base-generic/x86/CONFIG_SCHED_MC
diff --git a/baseconfig/x86/CONFIG_SCHED_MC_PRIO b/configs/base-generic/x86/CONFIG_SCHED_MC_PRIO
index 893581e34..893581e34 100644
--- a/baseconfig/x86/CONFIG_SCHED_MC_PRIO
+++ b/configs/base-generic/x86/CONFIG_SCHED_MC_PRIO
diff --git a/baseconfig/x86/CONFIG_SCHED_SMT b/configs/base-generic/x86/CONFIG_SCHED_SMT
index ed3f04a20..ed3f04a20 100644
--- a/baseconfig/x86/CONFIG_SCHED_SMT
+++ b/configs/base-generic/x86/CONFIG_SCHED_SMT
diff --git a/baseconfig/x86/CONFIG_SCSI_ADVANSYS b/configs/base-generic/x86/CONFIG_SCSI_ADVANSYS
index ccae4c427..ccae4c427 100644
--- a/baseconfig/x86/CONFIG_SCSI_ADVANSYS
+++ b/configs/base-generic/x86/CONFIG_SCSI_ADVANSYS
diff --git a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU b/configs/base-generic/x86/CONFIG_SENSORS_ABITUGURU
index adab26252..adab26252 100644
--- a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU
+++ b/configs/base-generic/x86/CONFIG_SENSORS_ABITUGURU
diff --git a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU3 b/configs/base-generic/x86/CONFIG_SENSORS_ABITUGURU3
index 22666cbee..22666cbee 100644
--- a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU3
+++ b/configs/base-generic/x86/CONFIG_SENSORS_ABITUGURU3
diff --git a/baseconfig/x86/CONFIG_SENSORS_ACPI_POWER b/configs/base-generic/x86/CONFIG_SENSORS_ACPI_POWER
index dbb45c01b..dbb45c01b 100644
--- a/baseconfig/x86/CONFIG_SENSORS_ACPI_POWER
+++ b/configs/base-generic/x86/CONFIG_SENSORS_ACPI_POWER
diff --git a/baseconfig/x86/CONFIG_SENSORS_APPLESMC=m b/configs/base-generic/x86/CONFIG_SENSORS_APPLESMC=m
index 48519f04f..48519f04f 100644
--- a/baseconfig/x86/CONFIG_SENSORS_APPLESMC=m
+++ b/configs/base-generic/x86/CONFIG_SENSORS_APPLESMC=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ASB100 b/configs/base-generic/x86/CONFIG_SENSORS_ASB100
index e568b0eb6..e568b0eb6 100644
--- a/baseconfig/x86/CONFIG_SENSORS_ASB100
+++ b/configs/base-generic/x86/CONFIG_SENSORS_ASB100
diff --git a/baseconfig/x86/CONFIG_SENSORS_ATK0110 b/configs/base-generic/x86/CONFIG_SENSORS_ATK0110
index a323de026..a323de026 100644
--- a/baseconfig/x86/CONFIG_SENSORS_ATK0110
+++ b/configs/base-generic/x86/CONFIG_SENSORS_ATK0110
diff --git a/baseconfig/x86/CONFIG_SENSORS_CORETEMP b/configs/base-generic/x86/CONFIG_SENSORS_CORETEMP
index 8fb4868a2..8fb4868a2 100644
--- a/baseconfig/x86/CONFIG_SENSORS_CORETEMP
+++ b/configs/base-generic/x86/CONFIG_SENSORS_CORETEMP
diff --git a/baseconfig/x86/CONFIG_SENSORS_DELL_SMM b/configs/base-generic/x86/CONFIG_SENSORS_DELL_SMM
index d9fa9f5a2..d9fa9f5a2 100644
--- a/baseconfig/x86/CONFIG_SENSORS_DELL_SMM
+++ b/configs/base-generic/x86/CONFIG_SENSORS_DELL_SMM
diff --git a/baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER b/configs/base-generic/x86/CONFIG_SENSORS_FAM15H_POWER
index 9632b4c8d..9632b4c8d 100644
--- a/baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER
+++ b/configs/base-generic/x86/CONFIG_SENSORS_FAM15H_POWER
diff --git a/baseconfig/x86/CONFIG_SENSORS_FSCHMD b/configs/base-generic/x86/CONFIG_SENSORS_FSCHMD
index 0407bdcd1..0407bdcd1 100644
--- a/baseconfig/x86/CONFIG_SENSORS_FSCHMD
+++ b/configs/base-generic/x86/CONFIG_SENSORS_FSCHMD
diff --git a/baseconfig/x86/CONFIG_SENSORS_HDAPS b/configs/base-generic/x86/CONFIG_SENSORS_HDAPS
index d2dba2ab1..d2dba2ab1 100644
--- a/baseconfig/x86/CONFIG_SENSORS_HDAPS
+++ b/configs/base-generic/x86/CONFIG_SENSORS_HDAPS
diff --git a/baseconfig/x86/CONFIG_SENSORS_I5500 b/configs/base-generic/x86/CONFIG_SENSORS_I5500
index d956e09b5..d956e09b5 100644
--- a/baseconfig/x86/CONFIG_SENSORS_I5500
+++ b/configs/base-generic/x86/CONFIG_SENSORS_I5500
diff --git a/baseconfig/x86/CONFIG_SENSORS_I5K_AMB b/configs/base-generic/x86/CONFIG_SENSORS_I5K_AMB
index ad6832efb..ad6832efb 100644
--- a/baseconfig/x86/CONFIG_SENSORS_I5K_AMB
+++ b/configs/base-generic/x86/CONFIG_SENSORS_I5K_AMB
diff --git a/baseconfig/x86/CONFIG_SENSORS_K10TEMP b/configs/base-generic/x86/CONFIG_SENSORS_K10TEMP
index eec8b328a..eec8b328a 100644
--- a/baseconfig/x86/CONFIG_SENSORS_K10TEMP
+++ b/configs/base-generic/x86/CONFIG_SENSORS_K10TEMP
diff --git a/baseconfig/x86/CONFIG_SENSORS_K8TEMP b/configs/base-generic/x86/CONFIG_SENSORS_K8TEMP
index f690795aa..f690795aa 100644
--- a/baseconfig/x86/CONFIG_SENSORS_K8TEMP
+++ b/configs/base-generic/x86/CONFIG_SENSORS_K8TEMP
diff --git a/baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP b/configs/base-generic/x86/CONFIG_SENSORS_VIA_CPUTEMP
index f4ca4454a..f4ca4454a 100644
--- a/baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP
+++ b/configs/base-generic/x86/CONFIG_SENSORS_VIA_CPUTEMP
diff --git a/baseconfig/x86/CONFIG_SERIAL_8250_LPSS b/configs/base-generic/x86/CONFIG_SERIAL_8250_LPSS
index 9d2401a32..9d2401a32 100644
--- a/baseconfig/x86/CONFIG_SERIAL_8250_LPSS
+++ b/configs/base-generic/x86/CONFIG_SERIAL_8250_LPSS
diff --git a/baseconfig/x86/CONFIG_SFI b/configs/base-generic/x86/CONFIG_SFI
index 4754983e1..4754983e1 100644
--- a/baseconfig/x86/CONFIG_SFI
+++ b/configs/base-generic/x86/CONFIG_SFI
diff --git a/baseconfig/x86/CONFIG_SILEAD_DMI b/configs/base-generic/x86/CONFIG_SILEAD_DMI
index 3fd766126..3fd766126 100644
--- a/baseconfig/x86/CONFIG_SILEAD_DMI
+++ b/configs/base-generic/x86/CONFIG_SILEAD_DMI
diff --git a/baseconfig/x86/CONFIG_SMSC37B787_WDT b/configs/base-generic/x86/CONFIG_SMSC37B787_WDT
index 5448253d6..5448253d6 100644
--- a/baseconfig/x86/CONFIG_SMSC37B787_WDT
+++ b/configs/base-generic/x86/CONFIG_SMSC37B787_WDT
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0 b/configs/base-generic/x86/CONFIG_SND_INTEL8X0
index 6d78f08ea..6d78f08ea 100644
--- a/baseconfig/x86/CONFIG_SND_INTEL8X0
+++ b/configs/base-generic/x86/CONFIG_SND_INTEL8X0
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0M b/configs/base-generic/x86/CONFIG_SND_INTEL8X0M
index 24ac6ada4..24ac6ada4 100644
--- a/baseconfig/x86/CONFIG_SND_INTEL8X0M
+++ b/configs/base-generic/x86/CONFIG_SND_INTEL8X0M
diff --git a/baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC b/configs/base-generic/x86/CONFIG_SND_SOC_AC97_CODEC
index f2388a7c0..f2388a7c0 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_AC97_CODEC
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8316 b/configs/base-generic/x86/CONFIG_SND_SOC_ES8316
index c173cadd5..c173cadd5 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8316
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_ES8316
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328 b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328
index 806f698e1..806f698e1 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328_I2C
index 9f90cb7e0..9f90cb7e0 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328_I2C
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328_SPI
index 0eb8f755c..0eb8f755c 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_ES8328_SPI
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL
index ba58c2418..ba58c2418 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH
index 03e370bf9..03e370bf9 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH
index 9ee67687e..9ee67687e 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
index dde636feb..dde636feb 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH
index 5779d30ed..5779d30ed 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH
index d825af971..d825af971 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH
index 42c1e72f3..42c1e72f3 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
index 0697694f9..0697694f9 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH
index 33cb51b40..33cb51b40 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
index db07e5fb0..db07e5fb0 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH
index a43d37398..a43d37398 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH
index bf5c613ac..bf5c613ac 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
index 5c7c03e25..5c7c03e25 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH
index baa40becc..baa40becc 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH
index c1f779e5d..c1f779e5d 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH
index 0413d4066..0413d4066 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
index 139a693b5..139a693b5 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
index 8fccaf1bd..8fccaf1bd 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
index 15bc39d49..15bc39d49 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
index 5f9b4d152..5f9b4d152 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH
index f903cb3d1..f903cb3d1 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SST
index d93328a53..d93328a53 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SST
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SST_ACPI
index bb5dfab11..bb5dfab11 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_INTEL_SST_ACPI
diff --git a/baseconfig/x86/CONFIG_SND_SOC_NAU8540 b/configs/base-generic/x86/CONFIG_SND_SOC_NAU8540
index 9862521b0..9862521b0 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_NAU8540
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_NAU8540
diff --git a/baseconfig/x86/CONFIG_SND_SOC_TS3A227E b/configs/base-generic/x86/CONFIG_SND_SOC_TS3A227E
index 1d3522517..1d3522517 100644
--- a/baseconfig/x86/CONFIG_SND_SOC_TS3A227E
+++ b/configs/base-generic/x86/CONFIG_SND_SOC_TS3A227E
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX b/configs/base-generic/x86/CONFIG_SND_VIA82XX
index 129cf3976..129cf3976 100644
--- a/baseconfig/x86/CONFIG_SND_VIA82XX
+++ b/configs/base-generic/x86/CONFIG_SND_VIA82XX
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM b/configs/base-generic/x86/CONFIG_SND_VIA82XX_MODEM
index 81e80f3a5..81e80f3a5 100644
--- a/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM
+++ b/configs/base-generic/x86/CONFIG_SND_VIA82XX_MODEM
diff --git a/baseconfig/x86/CONFIG_SND_X86 b/configs/base-generic/x86/CONFIG_SND_X86
index 310c61afc..310c61afc 100644
--- a/baseconfig/x86/CONFIG_SND_X86
+++ b/configs/base-generic/x86/CONFIG_SND_X86
diff --git a/baseconfig/x86/CONFIG_SONYPI_COMPAT b/configs/base-generic/x86/CONFIG_SONYPI_COMPAT
index 6655c779b..6655c779b 100644
--- a/baseconfig/x86/CONFIG_SONYPI_COMPAT
+++ b/configs/base-generic/x86/CONFIG_SONYPI_COMPAT
diff --git a/baseconfig/x86/CONFIG_SONY_LAPTOP b/configs/base-generic/x86/CONFIG_SONY_LAPTOP
index a31919301..a31919301 100644
--- a/baseconfig/x86/CONFIG_SONY_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_SONY_LAPTOP
diff --git a/baseconfig/x86/CONFIG_SP5100_TCO b/configs/base-generic/x86/CONFIG_SP5100_TCO
index db59115bf..db59115bf 100644
--- a/baseconfig/x86/CONFIG_SP5100_TCO
+++ b/configs/base-generic/x86/CONFIG_SP5100_TCO
diff --git a/baseconfig/x86/CONFIG_SPI b/configs/base-generic/x86/CONFIG_SPI
index 5616bfc48..5616bfc48 100644
--- a/baseconfig/x86/CONFIG_SPI
+++ b/configs/base-generic/x86/CONFIG_SPI
diff --git a/baseconfig/x86/CONFIG_SPI_CADENCE b/configs/base-generic/x86/CONFIG_SPI_CADENCE
index 78e16ec97..78e16ec97 100644
--- a/baseconfig/x86/CONFIG_SPI_CADENCE
+++ b/configs/base-generic/x86/CONFIG_SPI_CADENCE
diff --git a/baseconfig/x86/CONFIG_SPI_MASTER b/configs/base-generic/x86/CONFIG_SPI_MASTER
index 63f789d5b..63f789d5b 100644
--- a/baseconfig/x86/CONFIG_SPI_MASTER
+++ b/configs/base-generic/x86/CONFIG_SPI_MASTER
diff --git a/baseconfig/x86/CONFIG_SPI_PXA2XX b/configs/base-generic/x86/CONFIG_SPI_PXA2XX
index 99db8d26f..99db8d26f 100644
--- a/baseconfig/x86/CONFIG_SPI_PXA2XX
+++ b/configs/base-generic/x86/CONFIG_SPI_PXA2XX
diff --git a/baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI b/configs/base-generic/x86/CONFIG_SPI_ZYNQMP_GQSPI
index 48e520fd6..48e520fd6 100644
--- a/baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI
+++ b/configs/base-generic/x86/CONFIG_SPI_ZYNQMP_GQSPI
diff --git a/baseconfig/x86/CONFIG_SURFACE3_WMI b/configs/base-generic/x86/CONFIG_SURFACE3_WMI
index d2fbd9c7b..d2fbd9c7b 100644
--- a/baseconfig/x86/CONFIG_SURFACE3_WMI
+++ b/configs/base-generic/x86/CONFIG_SURFACE3_WMI
diff --git a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON b/configs/base-generic/x86/CONFIG_SURFACE_3_BUTTON
index 8ba50033b..8ba50033b 100644
--- a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
+++ b/configs/base-generic/x86/CONFIG_SURFACE_3_BUTTON
diff --git a/baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON b/configs/base-generic/x86/CONFIG_SURFACE_PRO3_BUTTON
index 71e1bf47b..71e1bf47b 100644
--- a/baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON
+++ b/configs/base-generic/x86/CONFIG_SURFACE_PRO3_BUTTON
diff --git a/baseconfig/x86/CONFIG_TCG_INFINEON b/configs/base-generic/x86/CONFIG_TCG_INFINEON
index d73a2c668..d73a2c668 100644
--- a/baseconfig/x86/CONFIG_TCG_INFINEON
+++ b/configs/base-generic/x86/CONFIG_TCG_INFINEON
diff --git a/baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG b/configs/base-generic/x86/CONFIG_THERMAL_GOV_BANG_BANG
index 7f6f73a46..7f6f73a46 100644
--- a/baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG
+++ b/configs/base-generic/x86/CONFIG_THERMAL_GOV_BANG_BANG
diff --git a/baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE b/configs/base-generic/x86/CONFIG_THERMAL_GOV_USER_SPACE
index 040cf3947..040cf3947 100644
--- a/baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE
+++ b/configs/base-generic/x86/CONFIG_THERMAL_GOV_USER_SPACE
diff --git a/baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS b/configs/base-generic/x86/CONFIG_THERMAL_WRITABLE_TRIPS
index a0a8924e0..a0a8924e0 100644
--- a/baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS
+++ b/configs/base-generic/x86/CONFIG_THERMAL_WRITABLE_TRIPS
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI
index b56a7701d..b56a7701d 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
index 5b406b9ba..5b406b9ba 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
index 10e6eb6a7..10e6eb6a7 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
index 0673591f5..0673591f5 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
index cf6a85819..cf6a85819 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
index 535380b27..535380b27 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
index a13ebc06b..a13ebc06b 100644
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO
+++ b/configs/base-generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
diff --git a/baseconfig/x86/CONFIG_TOPSTAR_LAPTOP b/configs/base-generic/x86/CONFIG_TOPSTAR_LAPTOP
index d38a75930..d38a75930 100644
--- a/baseconfig/x86/CONFIG_TOPSTAR_LAPTOP
+++ b/configs/base-generic/x86/CONFIG_TOPSTAR_LAPTOP
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL b/configs/base-generic/x86/CONFIG_TOSHIBA_BT_RFKILL
index 07f3cf8b1..07f3cf8b1 100644
--- a/baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL
+++ b/configs/base-generic/x86/CONFIG_TOSHIBA_BT_RFKILL
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_HAPS b/configs/base-generic/x86/CONFIG_TOSHIBA_HAPS
index 1c4725a63..1c4725a63 100644
--- a/baseconfig/x86/CONFIG_TOSHIBA_HAPS
+++ b/configs/base-generic/x86/CONFIG_TOSHIBA_HAPS
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_WMI b/configs/base-generic/x86/CONFIG_TOSHIBA_WMI
index 2d91fbb25..2d91fbb25 100644
--- a/baseconfig/x86/CONFIG_TOSHIBA_WMI
+++ b/configs/base-generic/x86/CONFIG_TOSHIBA_WMI
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG110 b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_CY8CTMG110
index 0e43d53b5..0e43d53b5 100644
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG110
+++ b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_CY8CTMG110
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_GOODIX
index ad45d6831..ad45d6831 100644
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX
+++ b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_GOODIX
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_INTEL_MID
index 097977c2c..097977c2c 100644
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID
+++ b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_INTEL_MID
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI
index 9bf9d49f2..9bf9d49f2 100644
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI
+++ b/configs/base-generic/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI
diff --git a/baseconfig/x86/CONFIG_UID16 b/configs/base-generic/x86/CONFIG_UID16
index c766b9089..c766b9089 100644
--- a/baseconfig/x86/CONFIG_UID16
+++ b/configs/base-generic/x86/CONFIG_UID16
diff --git a/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT b/configs/base-generic/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
index 87be7826c..87be7826c 100644
--- a/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
+++ b/configs/base-generic/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
diff --git a/baseconfig/x86/CONFIG_VFIO_PCI_VGA b/configs/base-generic/x86/CONFIG_VFIO_PCI_VGA
index 915f9bd81..915f9bd81 100644
--- a/baseconfig/x86/CONFIG_VFIO_PCI_VGA
+++ b/configs/base-generic/x86/CONFIG_VFIO_PCI_VGA
diff --git a/baseconfig/x86/CONFIG_VGA_SWITCHEROO b/configs/base-generic/x86/CONFIG_VGA_SWITCHEROO
index 1bfcb26d6..1bfcb26d6 100644
--- a/baseconfig/x86/CONFIG_VGA_SWITCHEROO
+++ b/configs/base-generic/x86/CONFIG_VGA_SWITCHEROO
diff --git a/baseconfig/x86/CONFIG_VIA_WDT b/configs/base-generic/x86/CONFIG_VIA_WDT
index cf0dc5e89..cf0dc5e89 100644
--- a/baseconfig/x86/CONFIG_VIA_WDT
+++ b/configs/base-generic/x86/CONFIG_VIA_WDT
diff --git a/baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA b/configs/base-generic/x86/CONFIG_VIDEO_VIA_CAMERA
index d413ef1f9..d413ef1f9 100644
--- a/baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA
+++ b/configs/base-generic/x86/CONFIG_VIDEO_VIA_CAMERA
diff --git a/baseconfig/x86/CONFIG_VMD b/configs/base-generic/x86/CONFIG_VMD
index 8b55f8786..8b55f8786 100644
--- a/baseconfig/x86/CONFIG_VMD
+++ b/configs/base-generic/x86/CONFIG_VMD
diff --git a/baseconfig/x86/CONFIG_VMWARE_BALLOON b/configs/base-generic/x86/CONFIG_VMWARE_BALLOON
index 324a0cebc..324a0cebc 100644
--- a/baseconfig/x86/CONFIG_VMWARE_BALLOON
+++ b/configs/base-generic/x86/CONFIG_VMWARE_BALLOON
diff --git a/baseconfig/x86/CONFIG_VMWARE_PVSCSI b/configs/base-generic/x86/CONFIG_VMWARE_PVSCSI
index 3568e9188..3568e9188 100644
--- a/baseconfig/x86/CONFIG_VMWARE_PVSCSI
+++ b/configs/base-generic/x86/CONFIG_VMWARE_PVSCSI
diff --git a/baseconfig/x86/CONFIG_VMWARE_VMCI b/configs/base-generic/x86/CONFIG_VMWARE_VMCI
index e54667c66..e54667c66 100644
--- a/baseconfig/x86/CONFIG_VMWARE_VMCI
+++ b/configs/base-generic/x86/CONFIG_VMWARE_VMCI
diff --git a/baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS b/configs/base-generic/x86/CONFIG_VMWARE_VMCI_VSOCKETS
index e49bd5cf2..e49bd5cf2 100644
--- a/baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS
+++ b/configs/base-generic/x86/CONFIG_VMWARE_VMCI_VSOCKETS
diff --git a/baseconfig/x86/CONFIG_VMXNET3 b/configs/base-generic/x86/CONFIG_VMXNET3
index a5a8f9fa7..a5a8f9fa7 100644
--- a/baseconfig/x86/CONFIG_VMXNET3
+++ b/configs/base-generic/x86/CONFIG_VMXNET3
diff --git a/baseconfig/x86/CONFIG_WMI_BMOF b/configs/base-generic/x86/CONFIG_WMI_BMOF
index 61dcf543b..61dcf543b 100644
--- a/baseconfig/x86/CONFIG_WMI_BMOF
+++ b/configs/base-generic/x86/CONFIG_WMI_BMOF
diff --git a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ b/configs/base-generic/x86/CONFIG_X86_ACPI_CPUFREQ
index 95aca6535..95aca6535 100644
--- a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ
+++ b/configs/base-generic/x86/CONFIG_X86_ACPI_CPUFREQ
diff --git a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB b/configs/base-generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
index db5a9b22b..db5a9b22b 100644
--- a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
+++ b/configs/base-generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
diff --git a/baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY b/configs/base-generic/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY
index 30b790026..30b790026 100644
--- a/baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY
+++ b/configs/base-generic/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY
diff --git a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE b/configs/base-generic/x86/CONFIG_X86_AMD_PLATFORM_DEVICE
index 15b9c575b..15b9c575b 100644
--- a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE
+++ b/configs/base-generic/x86/CONFIG_X86_AMD_PLATFORM_DEVICE
diff --git a/baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION b/configs/base-generic/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION
index be693cd81..be693cd81 100644
--- a/baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION
+++ b/configs/base-generic/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION
diff --git a/baseconfig/x86/CONFIG_X86_CPUID b/configs/base-generic/x86/CONFIG_X86_CPUID
index 165a10160..165a10160 100644
--- a/baseconfig/x86/CONFIG_X86_CPUID
+++ b/configs/base-generic/x86/CONFIG_X86_CPUID
diff --git a/baseconfig/x86/CONFIG_X86_DEBUG_FPU b/configs/base-generic/x86/CONFIG_X86_DEBUG_FPU
index 26258a114..26258a114 100644
--- a/baseconfig/x86/CONFIG_X86_DEBUG_FPU
+++ b/configs/base-generic/x86/CONFIG_X86_DEBUG_FPU
diff --git a/baseconfig/x86/CONFIG_X86_DECODER_SELFTEST b/configs/base-generic/x86/CONFIG_X86_DECODER_SELFTEST
index 4452e43dd..4452e43dd 100644
--- a/baseconfig/x86/CONFIG_X86_DECODER_SELFTEST
+++ b/configs/base-generic/x86/CONFIG_X86_DECODER_SELFTEST
diff --git a/baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM b/configs/base-generic/x86/CONFIG_X86_EXTENDED_PLATFORM
index 8000cbb78..8000cbb78 100644
--- a/baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM
+++ b/configs/base-generic/x86/CONFIG_X86_EXTENDED_PLATFORM
diff --git a/baseconfig/x86/CONFIG_X86_GENERIC b/configs/base-generic/x86/CONFIG_X86_GENERIC
index 4c1688c38..4c1688c38 100644
--- a/baseconfig/x86/CONFIG_X86_GENERIC
+++ b/configs/base-generic/x86/CONFIG_X86_GENERIC
diff --git a/baseconfig/x86/CONFIG_X86_GOLDFISH b/configs/base-generic/x86/CONFIG_X86_GOLDFISH
index e509890ff..e509890ff 100644
--- a/baseconfig/x86/CONFIG_X86_GOLDFISH
+++ b/configs/base-generic/x86/CONFIG_X86_GOLDFISH
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_LPSS b/configs/base-generic/x86/CONFIG_X86_INTEL_LPSS
index 2d20612f8..2d20612f8 100644
--- a/baseconfig/x86/CONFIG_X86_INTEL_LPSS
+++ b/configs/base-generic/x86/CONFIG_X86_INTEL_LPSS
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_MID b/configs/base-generic/x86/CONFIG_X86_INTEL_MID
index 9c338605e..9c338605e 100644
--- a/baseconfig/x86/CONFIG_X86_INTEL_MID
+++ b/configs/base-generic/x86/CONFIG_X86_INTEL_MID
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_MPX b/configs/base-generic/x86/CONFIG_X86_INTEL_MPX
index ed1a6daeb..ed1a6daeb 100644
--- a/baseconfig/x86/CONFIG_X86_INTEL_MPX
+++ b/configs/base-generic/x86/CONFIG_X86_INTEL_MPX
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_PSTATE b/configs/base-generic/x86/CONFIG_X86_INTEL_PSTATE
index 35365aa70..35365aa70 100644
--- a/baseconfig/x86/CONFIG_X86_INTEL_PSTATE
+++ b/configs/base-generic/x86/CONFIG_X86_INTEL_PSTATE
diff --git a/baseconfig/x86/CONFIG_X86_LEGACY_VM86 b/configs/base-generic/x86/CONFIG_X86_LEGACY_VM86
index 256143684..256143684 100644
--- a/baseconfig/x86/CONFIG_X86_LEGACY_VM86
+++ b/configs/base-generic/x86/CONFIG_X86_LEGACY_VM86
diff --git a/baseconfig/x86/CONFIG_X86_MCE b/configs/base-generic/x86/CONFIG_X86_MCE
index de8e48077..de8e48077 100644
--- a/baseconfig/x86/CONFIG_X86_MCE
+++ b/configs/base-generic/x86/CONFIG_X86_MCE
diff --git a/baseconfig/x86/CONFIG_X86_MCE_AMD b/configs/base-generic/x86/CONFIG_X86_MCE_AMD
index 7c1f05da9..7c1f05da9 100644
--- a/baseconfig/x86/CONFIG_X86_MCE_AMD
+++ b/configs/base-generic/x86/CONFIG_X86_MCE_AMD
diff --git a/baseconfig/x86/CONFIG_X86_MCE_INJECT b/configs/base-generic/x86/CONFIG_X86_MCE_INJECT
index 1e3d32843..1e3d32843 100644
--- a/baseconfig/x86/CONFIG_X86_MCE_INJECT
+++ b/configs/base-generic/x86/CONFIG_X86_MCE_INJECT
diff --git a/baseconfig/x86/CONFIG_X86_MCE_INTEL b/configs/base-generic/x86/CONFIG_X86_MCE_INTEL
index 17f52def2..17f52def2 100644
--- a/baseconfig/x86/CONFIG_X86_MCE_INTEL
+++ b/configs/base-generic/x86/CONFIG_X86_MCE_INTEL
diff --git a/baseconfig/x86/CONFIG_X86_MPPARSE b/configs/base-generic/x86/CONFIG_X86_MPPARSE
index 1e4f55144..1e4f55144 100644
--- a/baseconfig/x86/CONFIG_X86_MPPARSE
+++ b/configs/base-generic/x86/CONFIG_X86_MPPARSE
diff --git a/baseconfig/x86/CONFIG_X86_MSR b/configs/base-generic/x86/CONFIG_X86_MSR
index 18d5b64dd..18d5b64dd 100644
--- a/baseconfig/x86/CONFIG_X86_MSR
+++ b/configs/base-generic/x86/CONFIG_X86_MSR
diff --git a/baseconfig/x86/CONFIG_X86_P4_CLOCKMOD b/configs/base-generic/x86/CONFIG_X86_P4_CLOCKMOD
index 714e722dd..714e722dd 100644
--- a/baseconfig/x86/CONFIG_X86_P4_CLOCKMOD
+++ b/configs/base-generic/x86/CONFIG_X86_P4_CLOCKMOD
diff --git a/baseconfig/x86/CONFIG_X86_PAT b/configs/base-generic/x86/CONFIG_X86_PAT
index 09f062ec2..09f062ec2 100644
--- a/baseconfig/x86/CONFIG_X86_PAT
+++ b/configs/base-generic/x86/CONFIG_X86_PAT
diff --git a/baseconfig/x86/CONFIG_X86_PCC_CPUFREQ b/configs/base-generic/x86/CONFIG_X86_PCC_CPUFREQ
index 10c283d7d..10c283d7d 100644
--- a/baseconfig/x86/CONFIG_X86_PCC_CPUFREQ
+++ b/configs/base-generic/x86/CONFIG_X86_PCC_CPUFREQ
diff --git a/baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL b/configs/base-generic/x86/CONFIG_X86_PKG_TEMP_THERMAL
index 8fb87c3a6..8fb87c3a6 100644
--- a/baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL
+++ b/configs/base-generic/x86/CONFIG_X86_PKG_TEMP_THERMAL
diff --git a/baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES b/configs/base-generic/x86/CONFIG_X86_PLATFORM_DEVICES
index 9f3b3e436..9f3b3e436 100644
--- a/baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES
+++ b/configs/base-generic/x86/CONFIG_X86_PLATFORM_DEVICES
diff --git a/baseconfig/x86/CONFIG_X86_PMEM_LEGACY b/configs/base-generic/x86/CONFIG_X86_PMEM_LEGACY
index 3ac539aca..3ac539aca 100644
--- a/baseconfig/x86/CONFIG_X86_PMEM_LEGACY
+++ b/configs/base-generic/x86/CONFIG_X86_PMEM_LEGACY
diff --git a/baseconfig/x86/CONFIG_X86_PM_TIMER b/configs/base-generic/x86/CONFIG_X86_PM_TIMER
index 75c2da2a4..75c2da2a4 100644
--- a/baseconfig/x86/CONFIG_X86_PM_TIMER
+++ b/configs/base-generic/x86/CONFIG_X86_PM_TIMER
diff --git a/baseconfig/x86/CONFIG_X86_POWERNOW_K8 b/configs/base-generic/x86/CONFIG_X86_POWERNOW_K8
index 07b56a824..07b56a824 100644
--- a/baseconfig/x86/CONFIG_X86_POWERNOW_K8
+++ b/configs/base-generic/x86/CONFIG_X86_POWERNOW_K8
diff --git a/baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS b/configs/base-generic/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
index d7dc1147e..d7dc1147e 100644
--- a/baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+++ b/configs/base-generic/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
diff --git a/baseconfig/x86/CONFIG_X86_RESERVE_LOW b/configs/base-generic/x86/CONFIG_X86_RESERVE_LOW
index 663538c26..663538c26 100644
--- a/baseconfig/x86/CONFIG_X86_RESERVE_LOW
+++ b/configs/base-generic/x86/CONFIG_X86_RESERVE_LOW
diff --git a/baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO b/configs/base-generic/x86/CONFIG_X86_SPEEDSTEP_CENTRINO
index ea1e56da2..ea1e56da2 100644
--- a/baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO
+++ b/configs/base-generic/x86/CONFIG_X86_SPEEDSTEP_CENTRINO
diff --git a/baseconfig/x86/CONFIG_X86_SYSFB b/configs/base-generic/x86/CONFIG_X86_SYSFB
index fce62660e..fce62660e 100644
--- a/baseconfig/x86/CONFIG_X86_SYSFB
+++ b/configs/base-generic/x86/CONFIG_X86_SYSFB
diff --git a/baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP b/configs/base-generic/x86/CONFIG_X86_VERBOSE_BOOTUP
index e209c212b..e209c212b 100644
--- a/baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP
+++ b/configs/base-generic/x86/CONFIG_X86_VERBOSE_BOOTUP
diff --git a/baseconfig/x86/CONFIG_XEN b/configs/base-generic/x86/CONFIG_XEN
index a4985b44e..a4985b44e 100644
--- a/baseconfig/x86/CONFIG_XEN
+++ b/configs/base-generic/x86/CONFIG_XEN
diff --git a/baseconfig/x86/CONFIG_XENFS b/configs/base-generic/x86/CONFIG_XENFS
index 2a9db2ee7..2a9db2ee7 100644
--- a/baseconfig/x86/CONFIG_XENFS
+++ b/configs/base-generic/x86/CONFIG_XENFS
diff --git a/baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR b/configs/base-generic/x86/CONFIG_XEN_ACPI_PROCESSOR
index ce86cd33d..ce86cd33d 100644
--- a/baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR
+++ b/configs/base-generic/x86/CONFIG_XEN_ACPI_PROCESSOR
diff --git a/baseconfig/x86/CONFIG_XEN_BACKEND b/configs/base-generic/x86/CONFIG_XEN_BACKEND
index b15ca354b..b15ca354b 100644
--- a/baseconfig/x86/CONFIG_XEN_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_BALLOON b/configs/base-generic/x86/CONFIG_XEN_BALLOON
index df2818539..df2818539 100644
--- a/baseconfig/x86/CONFIG_XEN_BALLOON
+++ b/configs/base-generic/x86/CONFIG_XEN_BALLOON
diff --git a/baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND b/configs/base-generic/x86/CONFIG_XEN_BLKDEV_BACKEND
index 214dd3c75..214dd3c75 100644
--- a/baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_BLKDEV_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND b/configs/base-generic/x86/CONFIG_XEN_BLKDEV_FRONTEND
index 5b1ec5f14..5b1ec5f14 100644
--- a/baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_XEN_BLKDEV_FRONTEND
diff --git a/baseconfig/x86/CONFIG_XEN_COMPAT_XENFS b/configs/base-generic/x86/CONFIG_XEN_COMPAT_XENFS
index 280bc95c8..280bc95c8 100644
--- a/baseconfig/x86/CONFIG_XEN_COMPAT_XENFS
+++ b/configs/base-generic/x86/CONFIG_XEN_COMPAT_XENFS
diff --git a/baseconfig/x86/CONFIG_XEN_DEBUG b/configs/base-generic/x86/CONFIG_XEN_DEBUG
index d80f13584..d80f13584 100644
--- a/baseconfig/x86/CONFIG_XEN_DEBUG
+++ b/configs/base-generic/x86/CONFIG_XEN_DEBUG
diff --git a/baseconfig/x86/CONFIG_XEN_DEBUG_FS b/configs/base-generic/x86/CONFIG_XEN_DEBUG_FS
index f250e987f..f250e987f 100644
--- a/baseconfig/x86/CONFIG_XEN_DEBUG_FS
+++ b/configs/base-generic/x86/CONFIG_XEN_DEBUG_FS
diff --git a/baseconfig/x86/CONFIG_XEN_DOM0 b/configs/base-generic/x86/CONFIG_XEN_DOM0
index c5cb5d24a..c5cb5d24a 100644
--- a/baseconfig/x86/CONFIG_XEN_DOM0
+++ b/configs/base-generic/x86/CONFIG_XEN_DOM0
diff --git a/baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND b/configs/base-generic/x86/CONFIG_XEN_FBDEV_FRONTEND
index a0d0c69b8..a0d0c69b8 100644
--- a/baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_XEN_FBDEV_FRONTEND
diff --git a/baseconfig/x86/CONFIG_XEN_GNTDEV b/configs/base-generic/x86/CONFIG_XEN_GNTDEV
index 0773eb106..0773eb106 100644
--- a/baseconfig/x86/CONFIG_XEN_GNTDEV
+++ b/configs/base-generic/x86/CONFIG_XEN_GNTDEV
diff --git a/baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC b/configs/base-generic/x86/CONFIG_XEN_GRANT_DEV_ALLOC
index 9c4e42ad1..9c4e42ad1 100644
--- a/baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC
+++ b/configs/base-generic/x86/CONFIG_XEN_GRANT_DEV_ALLOC
diff --git a/baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND b/configs/base-generic/x86/CONFIG_XEN_NETDEV_BACKEND
index 8f3e152d3..8f3e152d3 100644
--- a/baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_NETDEV_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND b/configs/base-generic/x86/CONFIG_XEN_NETDEV_FRONTEND
index eb86ad0f8..eb86ad0f8 100644
--- a/baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_XEN_NETDEV_FRONTEND
diff --git a/baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND b/configs/base-generic/x86/CONFIG_XEN_PCIDEV_BACKEND
index 7d4708d2b..7d4708d2b 100644
--- a/baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_PCIDEV_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND b/configs/base-generic/x86/CONFIG_XEN_PCIDEV_FRONTEND
index 9763ad236..9763ad236 100644
--- a/baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_XEN_PCIDEV_FRONTEND
diff --git a/baseconfig/x86/CONFIG_XEN_PV b/configs/base-generic/x86/CONFIG_XEN_PV
index 89203e84e..89203e84e 100644
--- a/baseconfig/x86/CONFIG_XEN_PV
+++ b/configs/base-generic/x86/CONFIG_XEN_PV
diff --git a/baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND b/configs/base-generic/x86/CONFIG_XEN_PVCALLS_BACKEND
index 3a5b2c46d..3a5b2c46d 100644
--- a/baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_PVCALLS_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_PVH b/configs/base-generic/x86/CONFIG_XEN_PVH
index 5f8642963..5f8642963 100644
--- a/baseconfig/x86/CONFIG_XEN_PVH
+++ b/configs/base-generic/x86/CONFIG_XEN_PVH
diff --git a/baseconfig/x86/CONFIG_XEN_PVHVM b/configs/base-generic/x86/CONFIG_XEN_PVHVM
index be722d220..be722d220 100644
--- a/baseconfig/x86/CONFIG_XEN_PVHVM
+++ b/configs/base-generic/x86/CONFIG_XEN_PVHVM
diff --git a/baseconfig/x86/CONFIG_XEN_SAVE_RESTORE b/configs/base-generic/x86/CONFIG_XEN_SAVE_RESTORE
index b42ea5137..b42ea5137 100644
--- a/baseconfig/x86/CONFIG_XEN_SAVE_RESTORE
+++ b/configs/base-generic/x86/CONFIG_XEN_SAVE_RESTORE
diff --git a/baseconfig/x86/CONFIG_XEN_SCRUB_PAGES b/configs/base-generic/x86/CONFIG_XEN_SCRUB_PAGES
index e8e080270..e8e080270 100644
--- a/baseconfig/x86/CONFIG_XEN_SCRUB_PAGES
+++ b/configs/base-generic/x86/CONFIG_XEN_SCRUB_PAGES
diff --git a/baseconfig/x86/CONFIG_XEN_SCSI_BACKEND b/configs/base-generic/x86/CONFIG_XEN_SCSI_BACKEND
index b995785c5..b995785c5 100644
--- a/baseconfig/x86/CONFIG_XEN_SCSI_BACKEND
+++ b/configs/base-generic/x86/CONFIG_XEN_SCSI_BACKEND
diff --git a/baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND b/configs/base-generic/x86/CONFIG_XEN_SCSI_FRONTEND
index b01eb3787..b01eb3787 100644
--- a/baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND
+++ b/configs/base-generic/x86/CONFIG_XEN_SCSI_FRONTEND
diff --git a/baseconfig/x86/CONFIG_XEN_SELFBALLOONING b/configs/base-generic/x86/CONFIG_XEN_SELFBALLOONING
index d3fb0cb3d..d3fb0cb3d 100644
--- a/baseconfig/x86/CONFIG_XEN_SELFBALLOONING
+++ b/configs/base-generic/x86/CONFIG_XEN_SELFBALLOONING
diff --git a/baseconfig/x86/CONFIG_XEN_SYMS b/configs/base-generic/x86/CONFIG_XEN_SYMS
index c7918b924..c7918b924 100644
--- a/baseconfig/x86/CONFIG_XEN_SYMS
+++ b/configs/base-generic/x86/CONFIG_XEN_SYMS
diff --git a/baseconfig/x86/CONFIG_XEN_WDT b/configs/base-generic/x86/CONFIG_XEN_WDT
index 333aa5528..333aa5528 100644
--- a/baseconfig/x86/CONFIG_XEN_WDT
+++ b/configs/base-generic/x86/CONFIG_XEN_WDT
diff --git a/baseconfig/x86/CONFIG_XO15_EBOOK b/configs/base-generic/x86/CONFIG_XO15_EBOOK
index c8f4a21b2..c8f4a21b2 100644
--- a/baseconfig/x86/CONFIG_XO15_EBOOK
+++ b/configs/base-generic/x86/CONFIG_XO15_EBOOK
diff --git a/baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION b/configs/base-generic/x86/CONFIG_XPOWER_PMIC_OPREGION
index 8c98df142..8c98df142 100644
--- a/baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION
+++ b/configs/base-generic/x86/CONFIG_XPOWER_PMIC_OPREGION
diff --git a/baseconfig/x86/CONFIG_XZ_DEC_X86 b/configs/base-generic/x86/CONFIG_XZ_DEC_X86
index 1be802334..1be802334 100644
--- a/baseconfig/x86/CONFIG_XZ_DEC_X86
+++ b/configs/base-generic/x86/CONFIG_XZ_DEC_X86
diff --git a/baseconfig/x86/i686/CONFIG_4KSTACKS b/configs/base-generic/x86/i686/CONFIG_4KSTACKS
index b3ae285eb..b3ae285eb 100644
--- a/baseconfig/x86/i686/CONFIG_4KSTACKS
+++ b/configs/base-generic/x86/i686/CONFIG_4KSTACKS
diff --git a/baseconfig/x86/i686/CONFIG_64BIT b/configs/base-generic/x86/i686/CONFIG_64BIT
index 2441d5a81..2441d5a81 100644
--- a/baseconfig/x86/i686/CONFIG_64BIT
+++ b/configs/base-generic/x86/i686/CONFIG_64BIT
diff --git a/baseconfig/x86/i686/CONFIG_ALIX b/configs/base-generic/x86/i686/CONFIG_ALIX
index 42007a768..42007a768 100644
--- a/baseconfig/x86/i686/CONFIG_ALIX
+++ b/configs/base-generic/x86/i686/CONFIG_ALIX
diff --git a/baseconfig/x86/i686/CONFIG_APM b/configs/base-generic/x86/i686/CONFIG_APM
index ef1e73d55..ef1e73d55 100644
--- a/baseconfig/x86/i686/CONFIG_APM
+++ b/configs/base-generic/x86/i686/CONFIG_APM
diff --git a/baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS b/configs/base-generic/x86/i686/CONFIG_APM_ALLOW_INTS
index 9a0eef313..9a0eef313 100644
--- a/baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS
+++ b/configs/base-generic/x86/i686/CONFIG_APM_ALLOW_INTS
diff --git a/baseconfig/x86/i686/CONFIG_APM_CPU_IDLE b/configs/base-generic/x86/i686/CONFIG_APM_CPU_IDLE
index 874064310..874064310 100644
--- a/baseconfig/x86/i686/CONFIG_APM_CPU_IDLE
+++ b/configs/base-generic/x86/i686/CONFIG_APM_CPU_IDLE
diff --git a/baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK b/configs/base-generic/x86/i686/CONFIG_APM_DISPLAY_BLANK
index b2909fb06..b2909fb06 100644
--- a/baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK
+++ b/configs/base-generic/x86/i686/CONFIG_APM_DISPLAY_BLANK
diff --git a/baseconfig/x86/i686/CONFIG_APM_DO_ENABLE b/configs/base-generic/x86/i686/CONFIG_APM_DO_ENABLE
index 475553811..475553811 100644
--- a/baseconfig/x86/i686/CONFIG_APM_DO_ENABLE
+++ b/configs/base-generic/x86/i686/CONFIG_APM_DO_ENABLE
diff --git a/baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND b/configs/base-generic/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND
index 45b5324a1..45b5324a1 100644
--- a/baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND
+++ b/configs/base-generic/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND
diff --git a/baseconfig/x86/i686/CONFIG_BACKLIGHT_OT200 b/configs/base-generic/x86/i686/CONFIG_BACKLIGHT_OT200
index 7fc698fe0..7fc698fe0 100644
--- a/baseconfig/x86/i686/CONFIG_BACKLIGHT_OT200
+++ b/configs/base-generic/x86/i686/CONFIG_BACKLIGHT_OT200
diff --git a/baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM b/configs/base-generic/x86/i686/CONFIG_BACKLIGHT_PWM
index 44737e214..44737e214 100644
--- a/baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM
+++ b/configs/base-generic/x86/i686/CONFIG_BACKLIGHT_PWM
diff --git a/baseconfig/x86/i686/CONFIG_BATTERY_OLPC b/configs/base-generic/x86/i686/CONFIG_BATTERY_OLPC
index 1270fb00f..1270fb00f 100644
--- a/baseconfig/x86/i686/CONFIG_BATTERY_OLPC
+++ b/configs/base-generic/x86/i686/CONFIG_BATTERY_OLPC
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_AES_586 b/configs/base-generic/x86/i686/CONFIG_CRYPTO_AES_586
index 4702bf09c..4702bf09c 100644
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_AES_586
+++ b/configs/base-generic/x86/i686/CONFIG_CRYPTO_AES_586
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD b/configs/base-generic/x86/i686/CONFIG_CRYPTO_CRYPTD
index 36649cff3..36649cff3 100644
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD
+++ b/configs/base-generic/x86/i686/CONFIG_CRYPTO_CRYPTD
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE b/configs/base-generic/x86/i686/CONFIG_CRYPTO_DEV_GEODE
index 751bb8680..751bb8680 100644
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE
+++ b/configs/base-generic/x86/i686/CONFIG_CRYPTO_DEV_GEODE
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_LRW b/configs/base-generic/x86/i686/CONFIG_CRYPTO_LRW
index 602a90482..602a90482 100644
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_LRW
+++ b/configs/base-generic/x86/i686/CONFIG_CRYPTO_LRW
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_586 b/configs/base-generic/x86/i686/CONFIG_CRYPTO_TWOFISH_586
index 3f9979eb7..3f9979eb7 100644
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_586
+++ b/configs/base-generic/x86/i686/CONFIG_CRYPTO_TWOFISH_586
diff --git a/baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC b/configs/base-generic/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC
index 091ab254d..091ab254d 100644
--- a/baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC
+++ b/configs/base-generic/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC
diff --git a/baseconfig/x86/i686/CONFIG_CS5535_MFGPT b/configs/base-generic/x86/i686/CONFIG_CS5535_MFGPT
index 3699e8a4e..3699e8a4e 100644
--- a/baseconfig/x86/i686/CONFIG_CS5535_MFGPT
+++ b/configs/base-generic/x86/i686/CONFIG_CS5535_MFGPT
diff --git a/baseconfig/x86/i686/CONFIG_DW_DMAC_CORE b/configs/base-generic/x86/i686/CONFIG_DW_DMAC_CORE
index 110558a22..110558a22 100644
--- a/baseconfig/x86/i686/CONFIG_DW_DMAC_CORE
+++ b/configs/base-generic/x86/i686/CONFIG_DW_DMAC_CORE
diff --git a/baseconfig/x86/i686/CONFIG_DW_DMAC_PCI b/configs/base-generic/x86/i686/CONFIG_DW_DMAC_PCI
index 2a2239b24..2a2239b24 100644
--- a/baseconfig/x86/i686/CONFIG_DW_DMAC_PCI
+++ b/configs/base-generic/x86/i686/CONFIG_DW_DMAC_PCI
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_AMD76X b/configs/base-generic/x86/i686/CONFIG_EDAC_AMD76X
index fe5952e70..fe5952e70 100644
--- a/baseconfig/x86/i686/CONFIG_EDAC_AMD76X
+++ b/configs/base-generic/x86/i686/CONFIG_EDAC_AMD76X
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_E7XXX b/configs/base-generic/x86/i686/CONFIG_EDAC_E7XXX
index 0322ddb69..0322ddb69 100644
--- a/baseconfig/x86/i686/CONFIG_EDAC_E7XXX
+++ b/configs/base-generic/x86/i686/CONFIG_EDAC_E7XXX
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_I82860 b/configs/base-generic/x86/i686/CONFIG_EDAC_I82860
index 5e132db1a..5e132db1a 100644
--- a/baseconfig/x86/i686/CONFIG_EDAC_I82860
+++ b/configs/base-generic/x86/i686/CONFIG_EDAC_I82860
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_I82875P b/configs/base-generic/x86/i686/CONFIG_EDAC_I82875P
index dbe32d406..dbe32d406 100644
--- a/baseconfig/x86/i686/CONFIG_EDAC_I82875P
+++ b/configs/base-generic/x86/i686/CONFIG_EDAC_I82875P
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_R82600 b/configs/base-generic/x86/i686/CONFIG_EDAC_R82600
index 93a01e506..93a01e506 100644
--- a/baseconfig/x86/i686/CONFIG_EDAC_R82600
+++ b/configs/base-generic/x86/i686/CONFIG_EDAC_R82600
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE b/configs/base-generic/x86/i686/CONFIG_FB_GEODE
index 0f1c77894..0f1c77894 100644
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE
+++ b/configs/base-generic/x86/i686/CONFIG_FB_GEODE
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_GX
index 08da10775..08da10775 100644
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX
+++ b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_GX
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX1 b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_GX1
index 55532c98a..55532c98a 100644
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX1
+++ b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_GX1
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_LX b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_LX
index 382bfc6e1..382bfc6e1 100644
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_LX
+++ b/configs/base-generic/x86/i686/CONFIG_FB_GEODE_LX
diff --git a/baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS b/configs/base-generic/x86/i686/CONFIG_FB_MODE_HELPERS
index 84f515748..84f515748 100644
--- a/baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS
+++ b/configs/base-generic/x86/i686/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/x86/i686/CONFIG_FB_OLPC_DCON b/configs/base-generic/x86/i686/CONFIG_FB_OLPC_DCON
index 5e1569153..5e1569153 100644
--- a/baseconfig/x86/i686/CONFIG_FB_OLPC_DCON
+++ b/configs/base-generic/x86/i686/CONFIG_FB_OLPC_DCON
diff --git a/baseconfig/x86/i686/CONFIG_FB_SSD1307 b/configs/base-generic/x86/i686/CONFIG_FB_SSD1307
index efd995bdf..efd995bdf 100644
--- a/baseconfig/x86/i686/CONFIG_FB_SSD1307
+++ b/configs/base-generic/x86/i686/CONFIG_FB_SSD1307
diff --git a/baseconfig/x86/i686/CONFIG_GENERIC_PHY b/configs/base-generic/x86/i686/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/x86/i686/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/x86/i686/CONFIG_GENERIC_PHY
diff --git a/baseconfig/x86/i686/CONFIG_GEODE_WDT b/configs/base-generic/x86/i686/CONFIG_GEODE_WDT
index b6e9726e0..b6e9726e0 100644
--- a/baseconfig/x86/i686/CONFIG_GEODE_WDT
+++ b/configs/base-generic/x86/i686/CONFIG_GEODE_WDT
diff --git a/baseconfig/x86/i686/CONFIG_GEOS b/configs/base-generic/x86/i686/CONFIG_GEOS
index e3c72149c..e3c72149c 100644
--- a/baseconfig/x86/i686/CONFIG_GEOS
+++ b/configs/base-generic/x86/i686/CONFIG_GEOS
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO b/configs/base-generic/x86/i686/CONFIG_GPIO_74XX_MMIO
index b761ec18a..b761ec18a 100644
--- a/baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO
+++ b/configs/base-generic/x86/i686/CONFIG_GPIO_74XX_MMIO
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_CS5535 b/configs/base-generic/x86/i686/CONFIG_GPIO_CS5535
index 91ff2409a..91ff2409a 100644
--- a/baseconfig/x86/i686/CONFIG_GPIO_CS5535
+++ b/configs/base-generic/x86/i686/CONFIG_GPIO_CS5535
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_SCH b/configs/base-generic/x86/i686/CONFIG_GPIO_SCH
index 81dcf7191..81dcf7191 100644
--- a/baseconfig/x86/i686/CONFIG_GPIO_SCH
+++ b/configs/base-generic/x86/i686/CONFIG_GPIO_SCH
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE b/configs/base-generic/x86/i686/CONFIG_GPIO_SODAVILLE
index f6c07b049..f6c07b049 100644
--- a/baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE
+++ b/configs/base-generic/x86/i686/CONFIG_GPIO_SODAVILLE
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM b/configs/base-generic/x86/i686/CONFIG_HIGHMEM
index ae91367ff..ae91367ff 100644
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM
+++ b/configs/base-generic/x86/i686/CONFIG_HIGHMEM
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM4G b/configs/base-generic/x86/i686/CONFIG_HIGHMEM4G
index 87e34270c..87e34270c 100644
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM4G
+++ b/configs/base-generic/x86/i686/CONFIG_HIGHMEM4G
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM64G b/configs/base-generic/x86/i686/CONFIG_HIGHMEM64G
index 99d4c1998..99d4c1998 100644
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM64G
+++ b/configs/base-generic/x86/i686/CONFIG_HIGHMEM64G
diff --git a/baseconfig/x86/i686/CONFIG_HIGHPTE b/configs/base-generic/x86/i686/CONFIG_HIGHPTE
index e11904f2f..e11904f2f 100644
--- a/baseconfig/x86/i686/CONFIG_HIGHPTE
+++ b/configs/base-generic/x86/i686/CONFIG_HIGHPTE
diff --git a/baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/x86/i686/CONFIG_HOTPLUG_PCI_SHPC
index f03be8a8f..f03be8a8f 100644
--- a/baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/x86/i686/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/x86/i686/CONFIG_HSU_DMA b/configs/base-generic/x86/i686/CONFIG_HSU_DMA
index 0dcb85dec..0dcb85dec 100644
--- a/baseconfig/x86/i686/CONFIG_HSU_DMA
+++ b/configs/base-generic/x86/i686/CONFIG_HSU_DMA
diff --git a/baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE b/configs/base-generic/x86/i686/CONFIG_HW_RANDOM_GEODE
index a8c3583f1..a8c3583f1 100644
--- a/baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE
+++ b/configs/base-generic/x86/i686/CONFIG_HW_RANDOM_GEODE
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI1535 b/configs/base-generic/x86/i686/CONFIG_I2C_ALI1535
index 9342b1dbc..9342b1dbc 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI1535
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_ALI1535
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI1563 b/configs/base-generic/x86/i686/CONFIG_I2C_ALI1563
index c030320fc..c030320fc 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI1563
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_ALI1563
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI15X3 b/configs/base-generic/x86/i686/CONFIG_I2C_ALI15X3
index df3fff740..df3fff740 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI15X3
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_ALI15X3
diff --git a/baseconfig/x86/i686/CONFIG_I2C_MUX b/configs/base-generic/x86/i686/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_MUX
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_MUX
diff --git a/baseconfig/x86/i686/CONFIG_I2C_SIS5595 b/configs/base-generic/x86/i686/CONFIG_I2C_SIS5595
index 6a57af79b..6a57af79b 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_SIS5595
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_SIS5595
diff --git a/baseconfig/x86/i686/CONFIG_I2C_SIS630 b/configs/base-generic/x86/i686/CONFIG_I2C_SIS630
index 1eff29bc7..1eff29bc7 100644
--- a/baseconfig/x86/i686/CONFIG_I2C_SIS630
+++ b/configs/base-generic/x86/i686/CONFIG_I2C_SIS630
diff --git a/baseconfig/x86/i686/CONFIG_I2O b/configs/base-generic/x86/i686/CONFIG_I2O
index bd51f089f..bd51f089f 100644
--- a/baseconfig/x86/i686/CONFIG_I2O
+++ b/configs/base-generic/x86/i686/CONFIG_I2O
diff --git a/baseconfig/x86/i686/CONFIG_IB700_WDT b/configs/base-generic/x86/i686/CONFIG_IB700_WDT
index 3cf068abd..3cf068abd 100644
--- a/baseconfig/x86/i686/CONFIG_IB700_WDT
+++ b/configs/base-generic/x86/i686/CONFIG_IB700_WDT
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_GP2A b/configs/base-generic/x86/i686/CONFIG_INPUT_GP2A
index 221036349..221036349 100644
--- a/baseconfig/x86/i686/CONFIG_INPUT_GP2A
+++ b/configs/base-generic/x86/i686/CONFIG_INPUT_GP2A
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED b/configs/base-generic/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED
index 8b1ef8c62..8b1ef8c62 100644
--- a/baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED
+++ b/configs/base-generic/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/x86/i686/CONFIG_INPUT_MATRIXKMAP
index 0f1b2f168..0f1b2f168 100644
--- a/baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/x86/i686/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/x86/i686/CONFIG_INPUT_PWM_BEEPER
index 59fdb225d..59fdb225d 100644
--- a/baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/x86/i686/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/x86/i686/CONFIG_INTEL_TXT b/configs/base-generic/x86/i686/CONFIG_INTEL_TXT
index 729b3644f..729b3644f 100644
--- a/baseconfig/x86/i686/CONFIG_INTEL_TXT
+++ b/configs/base-generic/x86/i686/CONFIG_INTEL_TXT
diff --git a/baseconfig/x86/i686/CONFIG_KEXEC_JUMP b/configs/base-generic/x86/i686/CONFIG_KEXEC_JUMP
index ac2cebdf4..ac2cebdf4 100644
--- a/baseconfig/x86/i686/CONFIG_KEXEC_JUMP
+++ b/configs/base-generic/x86/i686/CONFIG_KEXEC_JUMP
diff --git a/baseconfig/x86/i686/CONFIG_KEYBOARD_BCM b/configs/base-generic/x86/i686/CONFIG_KEYBOARD_BCM
index d904364b5..d904364b5 100644
--- a/baseconfig/x86/i686/CONFIG_KEYBOARD_BCM
+++ b/configs/base-generic/x86/i686/CONFIG_KEYBOARD_BCM
diff --git a/baseconfig/x86/i686/CONFIG_LBDAF b/configs/base-generic/x86/i686/CONFIG_LBDAF
index b3fae707a..b3fae707a 100644
--- a/baseconfig/x86/i686/CONFIG_LBDAF
+++ b/configs/base-generic/x86/i686/CONFIG_LBDAF
diff --git a/baseconfig/x86/i686/CONFIG_M486 b/configs/base-generic/x86/i686/CONFIG_M486
index 63ff16ad2..63ff16ad2 100644
--- a/baseconfig/x86/i686/CONFIG_M486
+++ b/configs/base-generic/x86/i686/CONFIG_M486
diff --git a/baseconfig/x86/i686/CONFIG_M586 b/configs/base-generic/x86/i686/CONFIG_M586
index 1922a00f8..1922a00f8 100644
--- a/baseconfig/x86/i686/CONFIG_M586
+++ b/configs/base-generic/x86/i686/CONFIG_M586
diff --git a/baseconfig/x86/i686/CONFIG_M586MMX b/configs/base-generic/x86/i686/CONFIG_M586MMX
index 56306e616..56306e616 100644
--- a/baseconfig/x86/i686/CONFIG_M586MMX
+++ b/configs/base-generic/x86/i686/CONFIG_M586MMX
diff --git a/baseconfig/x86/i686/CONFIG_M586TSC b/configs/base-generic/x86/i686/CONFIG_M586TSC
index 5e8d7bf18..5e8d7bf18 100644
--- a/baseconfig/x86/i686/CONFIG_M586TSC
+++ b/configs/base-generic/x86/i686/CONFIG_M586TSC
diff --git a/baseconfig/x86/i686/CONFIG_M686 b/configs/base-generic/x86/i686/CONFIG_M686
index 48ecb46e3..48ecb46e3 100644
--- a/baseconfig/x86/i686/CONFIG_M686
+++ b/configs/base-generic/x86/i686/CONFIG_M686
diff --git a/baseconfig/x86/i686/CONFIG_MATH_EMULATION b/configs/base-generic/x86/i686/CONFIG_MATH_EMULATION
index be33a6a76..be33a6a76 100644
--- a/baseconfig/x86/i686/CONFIG_MATH_EMULATION
+++ b/configs/base-generic/x86/i686/CONFIG_MATH_EMULATION
diff --git a/baseconfig/x86/i686/CONFIG_MCRUSOE b/configs/base-generic/x86/i686/CONFIG_MCRUSOE
index de9c313b3..de9c313b3 100644
--- a/baseconfig/x86/i686/CONFIG_MCRUSOE
+++ b/configs/base-generic/x86/i686/CONFIG_MCRUSOE
diff --git a/baseconfig/x86/i686/CONFIG_MCYRIXIII b/configs/base-generic/x86/i686/CONFIG_MCYRIXIII
index 9386b3779..9386b3779 100644
--- a/baseconfig/x86/i686/CONFIG_MCYRIXIII
+++ b/configs/base-generic/x86/i686/CONFIG_MCYRIXIII
diff --git a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO b/configs/base-generic/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..27b93466f 100644
--- a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/configs/base-generic/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG b/configs/base-generic/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..4d738fd98 100644
--- a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/configs/base-generic/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/x86/i686/CONFIG_MFD_CS5535 b/configs/base-generic/x86/i686/CONFIG_MFD_CS5535
index ac2f3c2fc..ac2f3c2fc 100644
--- a/baseconfig/x86/i686/CONFIG_MFD_CS5535
+++ b/configs/base-generic/x86/i686/CONFIG_MFD_CS5535
diff --git a/baseconfig/x86/i686/CONFIG_MK6 b/configs/base-generic/x86/i686/CONFIG_MK6
index d8b023cf4..d8b023cf4 100644
--- a/baseconfig/x86/i686/CONFIG_MK6
+++ b/configs/base-generic/x86/i686/CONFIG_MK6
diff --git a/baseconfig/x86/i686/CONFIG_MK7 b/configs/base-generic/x86/i686/CONFIG_MK7
index 949a5f991..949a5f991 100644
--- a/baseconfig/x86/i686/CONFIG_MK7
+++ b/configs/base-generic/x86/i686/CONFIG_MK7
diff --git a/baseconfig/x86/i686/CONFIG_MK8 b/configs/base-generic/x86/i686/CONFIG_MK8
index 2f448241b..2f448241b 100644
--- a/baseconfig/x86/i686/CONFIG_MK8
+++ b/configs/base-generic/x86/i686/CONFIG_MK8
diff --git a/baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND b/configs/base-generic/x86/i686/CONFIG_MLX5_INFINIBAND
index c09ba1a61..c09ba1a61 100644
--- a/baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND
+++ b/configs/base-generic/x86/i686/CONFIG_MLX5_INFINIBAND
diff --git a/baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC b/configs/base-generic/x86/i686/CONFIG_MOUSE_PS2_OLPC
index a5a03d20c..a5a03d20c 100644
--- a/baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC
+++ b/configs/base-generic/x86/i686/CONFIG_MOUSE_PS2_OLPC
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUM4 b/configs/base-generic/x86/i686/CONFIG_MPENTIUM4
index cebe97732..cebe97732 100644
--- a/baseconfig/x86/i686/CONFIG_MPENTIUM4
+++ b/configs/base-generic/x86/i686/CONFIG_MPENTIUM4
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMII b/configs/base-generic/x86/i686/CONFIG_MPENTIUMII
index 10d33aec4..10d33aec4 100644
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMII
+++ b/configs/base-generic/x86/i686/CONFIG_MPENTIUMII
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMIII b/configs/base-generic/x86/i686/CONFIG_MPENTIUMIII
index 6a631dc84..6a631dc84 100644
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMIII
+++ b/configs/base-generic/x86/i686/CONFIG_MPENTIUMIII
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMM b/configs/base-generic/x86/i686/CONFIG_MPENTIUMM
index b77ce1640..b77ce1640 100644
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMM
+++ b/configs/base-generic/x86/i686/CONFIG_MPENTIUMM
diff --git a/baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE b/configs/base-generic/x86/i686/CONFIG_MTD_NAND_CAFE
index ae5227871..ae5227871 100644
--- a/baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE
+++ b/configs/base-generic/x86/i686/CONFIG_MTD_NAND_CAFE
diff --git a/baseconfig/x86/i686/CONFIG_MTD_OF_PARTS b/configs/base-generic/x86/i686/CONFIG_MTD_OF_PARTS
index bddcc3b5e..bddcc3b5e 100644
--- a/baseconfig/x86/i686/CONFIG_MTD_OF_PARTS
+++ b/configs/base-generic/x86/i686/CONFIG_MTD_OF_PARTS
diff --git a/baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF b/configs/base-generic/x86/i686/CONFIG_MTD_PHYSMAP_OF
index 4558beae6..4558beae6 100644
--- a/baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF
+++ b/configs/base-generic/x86/i686/CONFIG_MTD_PHYSMAP_OF
diff --git a/baseconfig/x86/i686/CONFIG_MVIAC3_2 b/configs/base-generic/x86/i686/CONFIG_MVIAC3_2
index 935c0d447..935c0d447 100644
--- a/baseconfig/x86/i686/CONFIG_MVIAC3_2
+++ b/configs/base-generic/x86/i686/CONFIG_MVIAC3_2
diff --git a/baseconfig/x86/i686/CONFIG_MWINCHIP3D b/configs/base-generic/x86/i686/CONFIG_MWINCHIP3D
index f311f90ea..f311f90ea 100644
--- a/baseconfig/x86/i686/CONFIG_MWINCHIP3D
+++ b/configs/base-generic/x86/i686/CONFIG_MWINCHIP3D
diff --git a/baseconfig/x86/i686/CONFIG_MWINCHIPC6 b/configs/base-generic/x86/i686/CONFIG_MWINCHIPC6
index 24e6694b4..24e6694b4 100644
--- a/baseconfig/x86/i686/CONFIG_MWINCHIPC6
+++ b/configs/base-generic/x86/i686/CONFIG_MWINCHIPC6
diff --git a/baseconfig/x86/i686/CONFIG_NET5501 b/configs/base-generic/x86/i686/CONFIG_NET5501
index 3ed621992..3ed621992 100644
--- a/baseconfig/x86/i686/CONFIG_NET5501
+++ b/configs/base-generic/x86/i686/CONFIG_NET5501
diff --git a/baseconfig/x86/i686/CONFIG_NOHIGHMEM b/configs/base-generic/x86/i686/CONFIG_NOHIGHMEM
index 7f8918613..7f8918613 100644
--- a/baseconfig/x86/i686/CONFIG_NOHIGHMEM
+++ b/configs/base-generic/x86/i686/CONFIG_NOHIGHMEM
diff --git a/baseconfig/x86/i686/CONFIG_NR_CPUS b/configs/base-generic/x86/i686/CONFIG_NR_CPUS
index 1d82a8537..1d82a8537 100644
--- a/baseconfig/x86/i686/CONFIG_NR_CPUS
+++ b/configs/base-generic/x86/i686/CONFIG_NR_CPUS
diff --git a/baseconfig/x86/i686/CONFIG_NSC_GPIO b/configs/base-generic/x86/i686/CONFIG_NSC_GPIO
index ae162591d..ae162591d 100644
--- a/baseconfig/x86/i686/CONFIG_NSC_GPIO
+++ b/configs/base-generic/x86/i686/CONFIG_NSC_GPIO
diff --git a/baseconfig/x86/i686/CONFIG_NUMA b/configs/base-generic/x86/i686/CONFIG_NUMA
index 7482c9800..7482c9800 100644
--- a/baseconfig/x86/i686/CONFIG_NUMA
+++ b/configs/base-generic/x86/i686/CONFIG_NUMA
diff --git a/baseconfig/x86/i686/CONFIG_OF b/configs/base-generic/x86/i686/CONFIG_OF
index b7345dd59..b7345dd59 100644
--- a/baseconfig/x86/i686/CONFIG_OF
+++ b/configs/base-generic/x86/i686/CONFIG_OF
diff --git a/baseconfig/x86/i686/CONFIG_OF_OVERLAY b/configs/base-generic/x86/i686/CONFIG_OF_OVERLAY
index d87a96c0f..d87a96c0f 100644
--- a/baseconfig/x86/i686/CONFIG_OF_OVERLAY
+++ b/configs/base-generic/x86/i686/CONFIG_OF_OVERLAY
diff --git a/baseconfig/x86/i686/CONFIG_OF_UNITTEST b/configs/base-generic/x86/i686/CONFIG_OF_UNITTEST
index f9773f73d..f9773f73d 100644
--- a/baseconfig/x86/i686/CONFIG_OF_UNITTEST
+++ b/configs/base-generic/x86/i686/CONFIG_OF_UNITTEST
diff --git a/baseconfig/x86/i686/CONFIG_OLPC b/configs/base-generic/x86/i686/CONFIG_OLPC
index 83b2aa42a..83b2aa42a 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1 b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1
index 3fc470286..3fc470286 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI b/configs/base-generic/x86/i686/CONFIG_OLPC_XO15_SCI
index e499c0a69..e499c0a69 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC_XO15_SCI
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_PM b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_PM
index 3431f9ab8..3431f9ab8 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_PM
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_PM
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_RTC
index 761dae209..761dae209 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_RTC
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_SCI
index 6ff71331c..6ff71331c 100644
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI
+++ b/configs/base-generic/x86/i686/CONFIG_OLPC_XO1_SCI
diff --git a/baseconfig/x86/i686/CONFIG_PC8736x_GPIO b/configs/base-generic/x86/i686/CONFIG_PC8736x_GPIO
index 77e0e929a..77e0e929a 100644
--- a/baseconfig/x86/i686/CONFIG_PC8736x_GPIO
+++ b/configs/base-generic/x86/i686/CONFIG_PC8736x_GPIO
diff --git a/baseconfig/x86/i686/CONFIG_PCI_DIRECT b/configs/base-generic/x86/i686/CONFIG_PCI_DIRECT
index 1d4923bf1..1d4923bf1 100644
--- a/baseconfig/x86/i686/CONFIG_PCI_DIRECT
+++ b/configs/base-generic/x86/i686/CONFIG_PCI_DIRECT
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOANY b/configs/base-generic/x86/i686/CONFIG_PCI_GOANY
index 35bc92b39..35bc92b39 100644
--- a/baseconfig/x86/i686/CONFIG_PCI_GOANY
+++ b/configs/base-generic/x86/i686/CONFIG_PCI_GOANY
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOBIOS b/configs/base-generic/x86/i686/CONFIG_PCI_GOBIOS
index 0bf470f25..0bf470f25 100644
--- a/baseconfig/x86/i686/CONFIG_PCI_GOBIOS
+++ b/configs/base-generic/x86/i686/CONFIG_PCI_GOBIOS
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GODIRECT b/configs/base-generic/x86/i686/CONFIG_PCI_GODIRECT
index 356bcaa99..356bcaa99 100644
--- a/baseconfig/x86/i686/CONFIG_PCI_GODIRECT
+++ b/configs/base-generic/x86/i686/CONFIG_PCI_GODIRECT
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG b/configs/base-generic/x86/i686/CONFIG_PCI_GOMMCONFIG
index 06d222163..06d222163 100644
--- a/baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG
+++ b/configs/base-generic/x86/i686/CONFIG_PCI_GOMMCONFIG
diff --git a/baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN b/configs/base-generic/x86/i686/CONFIG_PHYSICAL_ALIGN
index 593f6d5c4..593f6d5c4 100644
--- a/baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN
+++ b/configs/base-generic/x86/i686/CONFIG_PHYSICAL_ALIGN
diff --git a/baseconfig/x86/i686/CONFIG_PHYSICAL_START b/configs/base-generic/x86/i686/CONFIG_PHYSICAL_START
index 52dc8ee22..52dc8ee22 100644
--- a/baseconfig/x86/i686/CONFIG_PHYSICAL_START
+++ b/configs/base-generic/x86/i686/CONFIG_PHYSICAL_START
diff --git a/baseconfig/x86/i686/CONFIG_PINCONF b/configs/base-generic/x86/i686/CONFIG_PINCONF
index 2f04b24a4..2f04b24a4 100644
--- a/baseconfig/x86/i686/CONFIG_PINCONF
+++ b/configs/base-generic/x86/i686/CONFIG_PINCONF
diff --git a/baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE b/configs/base-generic/x86/i686/CONFIG_PINCTRL_SINGLE
index 4142920af..4142920af 100644
--- a/baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE
+++ b/configs/base-generic/x86/i686/CONFIG_PINCTRL_SINGLE
diff --git a/baseconfig/x86/i686/CONFIG_PINMUX b/configs/base-generic/x86/i686/CONFIG_PINMUX
index 2e704c683..2e704c683 100644
--- a/baseconfig/x86/i686/CONFIG_PINMUX
+++ b/configs/base-generic/x86/i686/CONFIG_PINMUX
diff --git a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO b/configs/base-generic/x86/i686/CONFIG_POWER_RESET_GPIO
index dac784d6c..dac784d6c 100644
--- a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO
+++ b/configs/base-generic/x86/i686/CONFIG_POWER_RESET_GPIO
diff --git a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART b/configs/base-generic/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART
index 28e2b6125..28e2b6125 100644
--- a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART
+++ b/configs/base-generic/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART
diff --git a/baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/configs/base-generic/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT
index 494ddf49a..494ddf49a 100644
--- a/baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ b/configs/base-generic/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT
diff --git a/baseconfig/x86/i686/CONFIG_RCU_FANOUT b/configs/base-generic/x86/i686/CONFIG_RCU_FANOUT
index f80f8cbe6..f80f8cbe6 100644
--- a/baseconfig/x86/i686/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/x86/i686/CONFIG_RCU_FANOUT
diff --git a/baseconfig/x86/i686/CONFIG_REGMAP_I2C b/configs/base-generic/x86/i686/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/x86/i686/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/x86/i686/CONFIG_REGMAP_I2C
diff --git a/baseconfig/x86/i686/CONFIG_SCx200 b/configs/base-generic/x86/i686/CONFIG_SCx200
index 3b69c05a7..3b69c05a7 100644
--- a/baseconfig/x86/i686/CONFIG_SCx200
+++ b/configs/base-generic/x86/i686/CONFIG_SCx200
diff --git a/baseconfig/x86/i686/CONFIG_SCx200_ACB b/configs/base-generic/x86/i686/CONFIG_SCx200_ACB
index a4434e910..a4434e910 100644
--- a/baseconfig/x86/i686/CONFIG_SCx200_ACB
+++ b/configs/base-generic/x86/i686/CONFIG_SCx200_ACB
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_8250_MID b/configs/base-generic/x86/i686/CONFIG_SERIAL_8250_MID
index 58ee08f11..58ee08f11 100644
--- a/baseconfig/x86/i686/CONFIG_SERIAL_8250_MID
+++ b/configs/base-generic/x86/i686/CONFIG_SERIAL_8250_MID
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART b/configs/base-generic/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
index a72a7dbda..a72a7dbda 100644
--- a/baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
+++ b/configs/base-generic/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM b/configs/base-generic/x86/i686/CONFIG_SERIAL_OF_PLATFORM
index 46bc74d49..46bc74d49 100644
--- a/baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM
+++ b/configs/base-generic/x86/i686/CONFIG_SERIAL_OF_PLATFORM
diff --git a/baseconfig/x86/i686/CONFIG_SND_SOC_SSM4567 b/configs/base-generic/x86/i686/CONFIG_SND_SOC_SSM4567
index 8907aafc9..8907aafc9 100644
--- a/baseconfig/x86/i686/CONFIG_SND_SOC_SSM4567
+++ b/configs/base-generic/x86/i686/CONFIG_SND_SOC_SSM4567
diff --git a/baseconfig/x86/i686/CONFIG_SONYPI b/configs/base-generic/x86/i686/CONFIG_SONYPI
index ee80f74cb..ee80f74cb 100644
--- a/baseconfig/x86/i686/CONFIG_SONYPI
+++ b/configs/base-generic/x86/i686/CONFIG_SONYPI
diff --git a/baseconfig/x86/i686/CONFIG_SONYPI_COMPAT b/configs/base-generic/x86/i686/CONFIG_SONYPI_COMPAT
index 6655c779b..6655c779b 100644
--- a/baseconfig/x86/i686/CONFIG_SONYPI_COMPAT
+++ b/configs/base-generic/x86/i686/CONFIG_SONYPI_COMPAT
diff --git a/baseconfig/x86/i686/CONFIG_SPARSE_IRQ b/configs/base-generic/x86/i686/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/x86/i686/CONFIG_SPARSE_IRQ
+++ b/configs/base-generic/x86/i686/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/x86/i686/CONFIG_STA2X11 b/configs/base-generic/x86/i686/CONFIG_STA2X11
index ee8f3f09f..ee8f3f09f 100644
--- a/baseconfig/x86/i686/CONFIG_STA2X11
+++ b/configs/base-generic/x86/i686/CONFIG_STA2X11
diff --git a/baseconfig/x86/i686/CONFIG_SYNC_FILE b/configs/base-generic/x86/i686/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/x86/i686/CONFIG_SYNC_FILE
+++ b/configs/base-generic/x86/i686/CONFIG_SYNC_FILE
diff --git a/baseconfig/x86/i686/CONFIG_TC1100_WMI b/configs/base-generic/x86/i686/CONFIG_TC1100_WMI
index ca6002268..ca6002268 100644
--- a/baseconfig/x86/i686/CONFIG_TC1100_WMI
+++ b/configs/base-generic/x86/i686/CONFIG_TC1100_WMI
diff --git a/baseconfig/x86/i686/CONFIG_TOSHIBA b/configs/base-generic/x86/i686/CONFIG_TOSHIBA
index b0cfad976..b0cfad976 100644
--- a/baseconfig/x86/i686/CONFIG_TOSHIBA
+++ b/configs/base-generic/x86/i686/CONFIG_TOSHIBA
diff --git a/baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/configs/base-generic/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR
index b33f61f37..b33f61f37 100644
--- a/baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ b/configs/base-generic/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR
diff --git a/baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..4874a851b 100644
--- a/baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC b/configs/base-generic/x86/i686/CONFIG_VIDEO_CAFE_CCIC
index f29531420..f29531420 100644
--- a/baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC
+++ b/configs/base-generic/x86/i686/CONFIG_VIDEO_CAFE_CCIC
diff --git a/baseconfig/x86/i686/CONFIG_X86_32_IRIS b/configs/base-generic/x86/i686/CONFIG_X86_32_IRIS
index f962972e1..f962972e1 100644
--- a/baseconfig/x86/i686/CONFIG_X86_32_IRIS
+++ b/configs/base-generic/x86/i686/CONFIG_X86_32_IRIS
diff --git a/baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD b/configs/base-generic/x86/i686/CONFIG_X86_32_NON_STANDARD
index 051640b41..051640b41 100644
--- a/baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD
+++ b/configs/base-generic/x86/i686/CONFIG_X86_32_NON_STANDARD
diff --git a/baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE b/configs/base-generic/x86/i686/CONFIG_X86_ANCIENT_MCE
index 0f8514b5f..0f8514b5f 100644
--- a/baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE
+++ b/configs/base-generic/x86/i686/CONFIG_X86_ANCIENT_MCE
diff --git a/baseconfig/x86/i686/CONFIG_X86_BIGSMP b/configs/base-generic/x86/i686/CONFIG_X86_BIGSMP
index 80880952e..80880952e 100644
--- a/baseconfig/x86/i686/CONFIG_X86_BIGSMP
+++ b/configs/base-generic/x86/i686/CONFIG_X86_BIGSMP
diff --git a/baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2 b/configs/base-generic/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2
index 6d5f101b7..6d5f101b7 100644
--- a/baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2
+++ b/configs/base-generic/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2
diff --git a/baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER b/configs/base-generic/x86/i686/CONFIG_X86_E_POWERSAVER
index d5fbbbb13..d5fbbbb13 100644
--- a/baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER
+++ b/configs/base-generic/x86/i686/CONFIG_X86_E_POWERSAVER
diff --git a/baseconfig/x86/i686/CONFIG_X86_GENERIC b/configs/base-generic/x86/i686/CONFIG_X86_GENERIC
index 4c1688c38..4c1688c38 100644
--- a/baseconfig/x86/i686/CONFIG_X86_GENERIC
+++ b/configs/base-generic/x86/i686/CONFIG_X86_GENERIC
diff --git a/baseconfig/x86/i686/CONFIG_X86_GOLDFISH b/configs/base-generic/x86/i686/CONFIG_X86_GOLDFISH
index e509890ff..e509890ff 100644
--- a/baseconfig/x86/i686/CONFIG_X86_GOLDFISH
+++ b/configs/base-generic/x86/i686/CONFIG_X86_GOLDFISH
diff --git a/baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD b/configs/base-generic/x86/i686/CONFIG_X86_GX_SUSPMOD
index 2eb3b277c..2eb3b277c 100644
--- a/baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD
+++ b/configs/base-generic/x86/i686/CONFIG_X86_GX_SUSPMOD
diff --git a/baseconfig/x86/i686/CONFIG_X86_INTEL_MID b/configs/base-generic/x86/i686/CONFIG_X86_INTEL_MID
index 9c338605e..9c338605e 100644
--- a/baseconfig/x86/i686/CONFIG_X86_INTEL_MID
+++ b/configs/base-generic/x86/i686/CONFIG_X86_INTEL_MID
diff --git a/baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK b/configs/base-generic/x86/i686/CONFIG_X86_INTEL_QUARK
index 735531531..735531531 100644
--- a/baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK
+++ b/configs/base-generic/x86/i686/CONFIG_X86_INTEL_QUARK
diff --git a/baseconfig/x86/i686/CONFIG_X86_LONGHAUL b/configs/base-generic/x86/i686/CONFIG_X86_LONGHAUL
index dfa6f6e12..dfa6f6e12 100644
--- a/baseconfig/x86/i686/CONFIG_X86_LONGHAUL
+++ b/configs/base-generic/x86/i686/CONFIG_X86_LONGHAUL
diff --git a/baseconfig/x86/i686/CONFIG_X86_LONGRUN b/configs/base-generic/x86/i686/CONFIG_X86_LONGRUN
index 003040a51..003040a51 100644
--- a/baseconfig/x86/i686/CONFIG_X86_LONGRUN
+++ b/configs/base-generic/x86/i686/CONFIG_X86_LONGRUN
diff --git a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K6 b/configs/base-generic/x86/i686/CONFIG_X86_POWERNOW_K6
index 370dc6cfb..370dc6cfb 100644
--- a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K6
+++ b/configs/base-generic/x86/i686/CONFIG_X86_POWERNOW_K6
diff --git a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K7 b/configs/base-generic/x86/i686/CONFIG_X86_POWERNOW_K7
index 00e5189c4..00e5189c4 100644
--- a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K7
+++ b/configs/base-generic/x86/i686/CONFIG_X86_POWERNOW_K7
diff --git a/baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE b/configs/base-generic/x86/i686/CONFIG_X86_PPRO_FENCE
index 373382804..373382804 100644
--- a/baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE
+++ b/configs/base-generic/x86/i686/CONFIG_X86_PPRO_FENCE
diff --git a/baseconfig/x86/i686/CONFIG_X86_RDC321X b/configs/base-generic/x86/i686/CONFIG_X86_RDC321X
index 24228b211..24228b211 100644
--- a/baseconfig/x86/i686/CONFIG_X86_RDC321X
+++ b/configs/base-generic/x86/i686/CONFIG_X86_RDC321X
diff --git a/baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS b/configs/base-generic/x86/i686/CONFIG_X86_REBOOTFIXUPS
index 290af2213..290af2213 100644
--- a/baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS
+++ b/configs/base-generic/x86/i686/CONFIG_X86_REBOOTFIXUPS
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_ICH
index bfe895f71..bfe895f71 100644
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH
+++ b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_ICH
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_LIB
index 3372ad003..3372ad003 100644
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB
+++ b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_LIB
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
index 808ce2b1d..808ce2b1d 100644
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
+++ b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_SMI
index 1a5cd0138..1a5cd0138 100644
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI
+++ b/configs/base-generic/x86/i686/CONFIG_X86_SPEEDSTEP_SMI
diff --git a/baseconfig/x86/i686/CONFIG_XO1_RFKILL b/configs/base-generic/x86/i686/CONFIG_XO1_RFKILL
index 342cadbed..342cadbed 100644
--- a/baseconfig/x86/i686/CONFIG_XO1_RFKILL
+++ b/configs/base-generic/x86/i686/CONFIG_XO1_RFKILL
diff --git a/baseconfig/x86/i686/CONFIG_ZONE_DMA b/configs/base-generic/x86/i686/CONFIG_ZONE_DMA
index c1b5f84a5..c1b5f84a5 100644
--- a/baseconfig/x86/i686/CONFIG_ZONE_DMA
+++ b/configs/base-generic/x86/i686/CONFIG_ZONE_DMA
diff --git a/baseconfig/x86/i686PAE/CONFIG_4KSTACKS b/configs/base-generic/x86/i686PAE/CONFIG_4KSTACKS
index b3ae285eb..b3ae285eb 100644
--- a/baseconfig/x86/i686PAE/CONFIG_4KSTACKS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_4KSTACKS
diff --git a/baseconfig/x86/i686PAE/CONFIG_64BIT b/configs/base-generic/x86/i686PAE/CONFIG_64BIT
index 2441d5a81..2441d5a81 100644
--- a/baseconfig/x86/i686PAE/CONFIG_64BIT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_64BIT
diff --git a/baseconfig/x86/i686PAE/CONFIG_ALIX b/configs/base-generic/x86/i686PAE/CONFIG_ALIX
index 42007a768..42007a768 100644
--- a/baseconfig/x86/i686PAE/CONFIG_ALIX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_ALIX
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM b/configs/base-generic/x86/i686PAE/CONFIG_APM
index ef1e73d55..ef1e73d55 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS b/configs/base-generic/x86/i686PAE/CONFIG_APM_ALLOW_INTS
index 9a0eef313..9a0eef313 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM_ALLOW_INTS
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE b/configs/base-generic/x86/i686PAE/CONFIG_APM_CPU_IDLE
index 874064310..874064310 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM_CPU_IDLE
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK b/configs/base-generic/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK
index b2909fb06..b2909fb06 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE b/configs/base-generic/x86/i686PAE/CONFIG_APM_DO_ENABLE
index 475553811..475553811 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM_DO_ENABLE
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND b/configs/base-generic/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND
index 45b5324a1..45b5324a1 100644
--- a/baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND
+++ b/configs/base-generic/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND
diff --git a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT200 b/configs/base-generic/x86/i686PAE/CONFIG_BACKLIGHT_OT200
index 7fc698fe0..7fc698fe0 100644
--- a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT200
+++ b/configs/base-generic/x86/i686PAE/CONFIG_BACKLIGHT_OT200
diff --git a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM b/configs/base-generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM
index 44737e214..44737e214 100644
--- a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM
diff --git a/baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC b/configs/base-generic/x86/i686PAE/CONFIG_BATTERY_OLPC
index 1270fb00f..1270fb00f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_BATTERY_OLPC
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_586 b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_AES_586
index 4702bf09c..4702bf09c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_586
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_AES_586
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_CRYPTD
index 36649cff3..36649cff3 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_CRYPTD
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE
index 751bb8680..751bb8680 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_LRW
index 602a90482..602a90482 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_LRW
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586 b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586
index 3f9979eb7..3f9979eb7 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586
diff --git a/baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC b/configs/base-generic/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC
index 091ab254d..091ab254d 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC
diff --git a/baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT b/configs/base-generic/x86/i686PAE/CONFIG_CS5535_MFGPT
index 3699e8a4e..3699e8a4e 100644
--- a/baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_CS5535_MFGPT
diff --git a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE b/configs/base-generic/x86/i686PAE/CONFIG_DW_DMAC_CORE
index 110558a22..110558a22 100644
--- a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_DW_DMAC_CORE
diff --git a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI b/configs/base-generic/x86/i686PAE/CONFIG_DW_DMAC_PCI
index 2a2239b24..2a2239b24 100644
--- a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_DW_DMAC_PCI
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_AMD76X
index fe5952e70..fe5952e70 100644
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
+++ b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_AMD76X
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_E7XXX
index 0322ddb69..0322ddb69 100644
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_E7XXX
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860 b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_I82860
index 5e132db1a..5e132db1a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
+++ b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_I82860
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_I82875P
index dbe32d406..dbe32d406 100644
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
+++ b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_I82875P
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600 b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_R82600
index 93a01e506..93a01e506 100644
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
+++ b/configs/base-generic/x86/i686PAE/CONFIG_EDAC_R82600
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE
index 0f1c77894..0f1c77894 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_GX
index 08da10775..08da10775 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_GX
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1 b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_GX1
index 55532c98a..55532c98a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_GX1
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_LX
index 382bfc6e1..382bfc6e1 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_GEODE_LX
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS b/configs/base-generic/x86/i686PAE/CONFIG_FB_MODE_HELPERS
index 84f515748..84f515748 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON b/configs/base-generic/x86/i686PAE/CONFIG_FB_OLPC_DCON
index 5e1569153..5e1569153 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_OLPC_DCON
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_SSD1307 b/configs/base-generic/x86/i686PAE/CONFIG_FB_SSD1307
index efd995bdf..efd995bdf 100644
--- a/baseconfig/x86/i686PAE/CONFIG_FB_SSD1307
+++ b/configs/base-generic/x86/i686PAE/CONFIG_FB_SSD1307
diff --git a/baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY b/configs/base-generic/x86/i686PAE/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GENERIC_PHY
diff --git a/baseconfig/x86/i686PAE/CONFIG_GEODE_WDT b/configs/base-generic/x86/i686PAE/CONFIG_GEODE_WDT
index b6e9726e0..b6e9726e0 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GEODE_WDT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GEODE_WDT
diff --git a/baseconfig/x86/i686PAE/CONFIG_GEOS b/configs/base-generic/x86/i686PAE/CONFIG_GEOS
index e3c72149c..e3c72149c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GEOS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GEOS
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_74XX_MMIO
index b761ec18a..b761ec18a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_74XX_MMIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_SCH b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_SCH
index 81dcf7191..81dcf7191 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_SCH
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_SCH
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_SODAVILLE
index f6c07b049..f6c07b049 100644
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_GPIO_SODAVILLE
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM
index ae91367ff..ae91367ff 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM4G
index a0aecc579..a0aecc579 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM4G
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM64G
index c0fbbc172..c0fbbc172 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HIGHMEM64G
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHPTE b/configs/base-generic/x86/i686PAE/CONFIG_HIGHPTE
index e11904f2f..e11904f2f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHPTE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HIGHPTE
diff --git a/baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC
index f03be8a8f..f03be8a8f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/x86/i686PAE/CONFIG_HSU_DMA b/configs/base-generic/x86/i686PAE/CONFIG_HSU_DMA
index 0dcb85dec..0dcb85dec 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HSU_DMA
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HSU_DMA
diff --git a/baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE b/configs/base-generic/x86/i686PAE/CONFIG_HW_RANDOM_GEODE
index a8c3583f1..a8c3583f1 100644
--- a/baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_HW_RANDOM_GEODE
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1535 b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI1535
index 9342b1dbc..9342b1dbc 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1535
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI1535
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1563 b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI1563
index c030320fc..c030320fc 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1563
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI1563
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X3 b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI15X3
index df3fff740..df3fff740 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X3
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_ALI15X3
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_MUX b/configs/base-generic/x86/i686PAE/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_MUX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_MUX
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS5595 b/configs/base-generic/x86/i686PAE/CONFIG_I2C_SIS5595
index 6a57af79b..6a57af79b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS5595
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_SIS5595
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS630 b/configs/base-generic/x86/i686PAE/CONFIG_I2C_SIS630
index 1eff29bc7..1eff29bc7 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS630
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2C_SIS630
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2O b/configs/base-generic/x86/i686PAE/CONFIG_I2O
index c3064fb4b..c3064fb4b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_I2O
+++ b/configs/base-generic/x86/i686PAE/CONFIG_I2O
diff --git a/baseconfig/x86/i686PAE/CONFIG_IB700_WDT b/configs/base-generic/x86/i686PAE/CONFIG_IB700_WDT
index 3cf068abd..3cf068abd 100644
--- a/baseconfig/x86/i686PAE/CONFIG_IB700_WDT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_IB700_WDT
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_GP2A
index 221036349..221036349 100644
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A
+++ b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_GP2A
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED
index 8b1ef8c62..8b1ef8c62 100644
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED
+++ b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP
index 0f1b2f168..0f1b2f168 100644
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP
+++ b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER
index 59fdb225d..59fdb225d 100644
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER
+++ b/configs/base-generic/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER
diff --git a/baseconfig/x86/i686PAE/CONFIG_INTEL_TXT b/configs/base-generic/x86/i686PAE/CONFIG_INTEL_TXT
index 729b3644f..729b3644f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_INTEL_TXT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_INTEL_TXT
diff --git a/baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP b/configs/base-generic/x86/i686PAE/CONFIG_KEXEC_JUMP
index ac2cebdf4..ac2cebdf4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP
+++ b/configs/base-generic/x86/i686PAE/CONFIG_KEXEC_JUMP
diff --git a/baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM b/configs/base-generic/x86/i686PAE/CONFIG_KEYBOARD_BCM
index d904364b5..d904364b5 100644
--- a/baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_KEYBOARD_BCM
diff --git a/baseconfig/x86/i686PAE/CONFIG_LBDAF b/configs/base-generic/x86/i686PAE/CONFIG_LBDAF
index b3fae707a..b3fae707a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_LBDAF
+++ b/configs/base-generic/x86/i686PAE/CONFIG_LBDAF
diff --git a/baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM b/configs/base-generic/x86/i686PAE/CONFIG_LIBNVDIMM
index f773300dc..f773300dc 100644
--- a/baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_LIBNVDIMM
diff --git a/baseconfig/x86/i686PAE/CONFIG_M486 b/configs/base-generic/x86/i686PAE/CONFIG_M486
index 63ff16ad2..63ff16ad2 100644
--- a/baseconfig/x86/i686PAE/CONFIG_M486
+++ b/configs/base-generic/x86/i686PAE/CONFIG_M486
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586 b/configs/base-generic/x86/i686PAE/CONFIG_M586
index 1922a00f8..1922a00f8 100644
--- a/baseconfig/x86/i686PAE/CONFIG_M586
+++ b/configs/base-generic/x86/i686PAE/CONFIG_M586
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586MMX b/configs/base-generic/x86/i686PAE/CONFIG_M586MMX
index 56306e616..56306e616 100644
--- a/baseconfig/x86/i686PAE/CONFIG_M586MMX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_M586MMX
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586TSC b/configs/base-generic/x86/i686PAE/CONFIG_M586TSC
index 5e8d7bf18..5e8d7bf18 100644
--- a/baseconfig/x86/i686PAE/CONFIG_M586TSC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_M586TSC
diff --git a/baseconfig/x86/i686PAE/CONFIG_M686 b/configs/base-generic/x86/i686PAE/CONFIG_M686
index 48ecb46e3..48ecb46e3 100644
--- a/baseconfig/x86/i686PAE/CONFIG_M686
+++ b/configs/base-generic/x86/i686PAE/CONFIG_M686
diff --git a/baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION b/configs/base-generic/x86/i686PAE/CONFIG_MATH_EMULATION
index be33a6a76..be33a6a76 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MATH_EMULATION
diff --git a/baseconfig/x86/i686PAE/CONFIG_MCRUSOE b/configs/base-generic/x86/i686PAE/CONFIG_MCRUSOE
index de9c313b3..de9c313b3 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MCRUSOE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MCRUSOE
diff --git a/baseconfig/x86/i686PAE/CONFIG_MCYRIXIII b/configs/base-generic/x86/i686PAE/CONFIG_MCYRIXIII
index 9386b3779..9386b3779 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MCYRIXIII
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MCYRIXIII
diff --git a/baseconfig/x86/i686PAE/CONFIG_MFD_CS5535 b/configs/base-generic/x86/i686PAE/CONFIG_MFD_CS5535
index ac2f3c2fc..ac2f3c2fc 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MFD_CS5535
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MFD_CS5535
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK6 b/configs/base-generic/x86/i686PAE/CONFIG_MK6
index d8b023cf4..d8b023cf4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MK6
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MK6
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK7 b/configs/base-generic/x86/i686PAE/CONFIG_MK7
index 949a5f991..949a5f991 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MK7
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MK7
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK8 b/configs/base-generic/x86/i686PAE/CONFIG_MK8
index 2f448241b..2f448241b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MK8
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MK8
diff --git a/baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND b/configs/base-generic/x86/i686PAE/CONFIG_MLX5_INFINIBAND
index c09ba1a61..c09ba1a61 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MLX5_INFINIBAND
diff --git a/baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC b/configs/base-generic/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC
index a5a03d20c..a5a03d20c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUM4 b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUM4
index cebe97732..cebe97732 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUM4
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUM4
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMII b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMII
index 10d33aec4..10d33aec4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMII
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMII
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMIII
index 6a631dc84..6a631dc84 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMIII
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMM b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMM
index b77ce1640..b77ce1640 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MPENTIUMM
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE b/configs/base-generic/x86/i686PAE/CONFIG_MTD_NAND_CAFE
index ae5227871..ae5227871 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MTD_NAND_CAFE
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS b/configs/base-generic/x86/i686PAE/CONFIG_MTD_OF_PARTS
index bddcc3b5e..bddcc3b5e 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MTD_OF_PARTS
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF b/configs/base-generic/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF
index 4558beae6..4558beae6 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF
diff --git a/baseconfig/x86/i686PAE/CONFIG_MVIAC3_2 b/configs/base-generic/x86/i686PAE/CONFIG_MVIAC3_2
index 935c0d447..935c0d447 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MVIAC3_2
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MVIAC3_2
diff --git a/baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D b/configs/base-generic/x86/i686PAE/CONFIG_MWINCHIP3D
index f311f90ea..f311f90ea 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MWINCHIP3D
diff --git a/baseconfig/x86/i686PAE/CONFIG_MWINCHIPC6 b/configs/base-generic/x86/i686PAE/CONFIG_MWINCHIPC6
index 24e6694b4..24e6694b4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MWINCHIPC6
+++ b/configs/base-generic/x86/i686PAE/CONFIG_MWINCHIPC6
diff --git a/baseconfig/x86/i686PAE/CONFIG_NET5501 b/configs/base-generic/x86/i686PAE/CONFIG_NET5501
index 3ed621992..3ed621992 100644
--- a/baseconfig/x86/i686PAE/CONFIG_NET5501
+++ b/configs/base-generic/x86/i686PAE/CONFIG_NET5501
diff --git a/baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM b/configs/base-generic/x86/i686PAE/CONFIG_NOHIGHMEM
index 7f8918613..7f8918613 100644
--- a/baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_NOHIGHMEM
diff --git a/baseconfig/x86/i686PAE/CONFIG_NR_CPUS b/configs/base-generic/x86/i686PAE/CONFIG_NR_CPUS
index 1d82a8537..1d82a8537 100644
--- a/baseconfig/x86/i686PAE/CONFIG_NR_CPUS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_NR_CPUS
diff --git a/baseconfig/x86/i686PAE/CONFIG_NSC_GPIO b/configs/base-generic/x86/i686PAE/CONFIG_NSC_GPIO
index ae162591d..ae162591d 100644
--- a/baseconfig/x86/i686PAE/CONFIG_NSC_GPIO
+++ b/configs/base-generic/x86/i686PAE/CONFIG_NSC_GPIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_NUMA b/configs/base-generic/x86/i686PAE/CONFIG_NUMA
index 7482c9800..7482c9800 100644
--- a/baseconfig/x86/i686PAE/CONFIG_NUMA
+++ b/configs/base-generic/x86/i686PAE/CONFIG_NUMA
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF b/configs/base-generic/x86/i686PAE/CONFIG_OF
index b7345dd59..b7345dd59 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OF
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OF
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY b/configs/base-generic/x86/i686PAE/CONFIG_OF_OVERLAY
index d87a96c0f..d87a96c0f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OF_OVERLAY
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST b/configs/base-generic/x86/i686PAE/CONFIG_OF_UNITTEST
index f9773f73d..f9773f73d 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OF_UNITTEST
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC b/configs/base-generic/x86/i686PAE/CONFIG_OLPC
index 83b2aa42a..83b2aa42a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1 b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1
index 3fc470286..3fc470286 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO15_SCI
index e499c0a69..e499c0a69 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO15_SCI
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_PM
index 3431f9ab8..3431f9ab8 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_PM
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_RTC
index 761dae209..761dae209 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_RTC
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_SCI
index 6ff71331c..6ff71331c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_OLPC_XO1_SCI
diff --git a/baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO b/configs/base-generic/x86/i686PAE/CONFIG_PC8736x_GPIO
index 77e0e929a..77e0e929a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PC8736x_GPIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT b/configs/base-generic/x86/i686PAE/CONFIG_PCI_DIRECT
index 1d4923bf1..1d4923bf1 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PCI_DIRECT
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOANY b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOANY
index 35bc92b39..35bc92b39 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOANY
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOANY
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOBIOS
index 0bf470f25..0bf470f25 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOBIOS
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GODIRECT
index 356bcaa99..356bcaa99 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GODIRECT
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOMMCONFIG
index 06d222163..06d222163 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PCI_GOMMCONFIG
diff --git a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN b/configs/base-generic/x86/i686PAE/CONFIG_PHYSICAL_ALIGN
index 593f6d5c4..593f6d5c4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PHYSICAL_ALIGN
diff --git a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START b/configs/base-generic/x86/i686PAE/CONFIG_PHYSICAL_START
index 52dc8ee22..52dc8ee22 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PHYSICAL_START
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINCONF b/configs/base-generic/x86/i686PAE/CONFIG_PINCONF
index 2f04b24a4..2f04b24a4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PINCONF
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PINCONF
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE b/configs/base-generic/x86/i686PAE/CONFIG_PINCTRL_SINGLE
index 4142920af..4142920af 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PINCTRL_SINGLE
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINMUX b/configs/base-generic/x86/i686PAE/CONFIG_PINMUX
index 2e704c683..2e704c683 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PINMUX
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PINMUX
diff --git a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO b/configs/base-generic/x86/i686PAE/CONFIG_POWER_RESET_GPIO
index dac784d6c..dac784d6c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO
+++ b/configs/base-generic/x86/i686PAE/CONFIG_POWER_RESET_GPIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART b/configs/base-generic/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART
index 28e2b6125..28e2b6125 100644
--- a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART
+++ b/configs/base-generic/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART
diff --git a/baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/configs/base-generic/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT
index 494ddf49a..494ddf49a 100644
--- a/baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT
diff --git a/baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT b/configs/base-generic/x86/i686PAE/CONFIG_RCU_FANOUT
index f80f8cbe6..f80f8cbe6 100644
--- a/baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_RCU_FANOUT
diff --git a/baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C b/configs/base-generic/x86/i686PAE/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/x86/i686PAE/CONFIG_REGMAP_I2C
diff --git a/baseconfig/x86/i686PAE/CONFIG_SCx200 b/configs/base-generic/x86/i686PAE/CONFIG_SCx200
index 3b69c05a7..3b69c05a7 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SCx200
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SCx200
diff --git a/baseconfig/x86/i686PAE/CONFIG_SCx200_ACB b/configs/base-generic/x86/i686PAE/CONFIG_SCx200_ACB
index a4434e910..a4434e910 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SCx200_ACB
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SCx200_ACB
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_8250_MID
index 58ee08f11..58ee08f11 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_8250_MID
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
index a72a7dbda..a72a7dbda 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM
index 46bc74d49..46bc74d49 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM
diff --git a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM4567 b/configs/base-generic/x86/i686PAE/CONFIG_SND_SOC_SSM4567
index 8907aafc9..8907aafc9 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM4567
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SND_SOC_SSM4567
diff --git a/baseconfig/x86/i686PAE/CONFIG_SONYPI b/configs/base-generic/x86/i686PAE/CONFIG_SONYPI
index ee80f74cb..ee80f74cb 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SONYPI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SONYPI
diff --git a/baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT b/configs/base-generic/x86/i686PAE/CONFIG_SONYPI_COMPAT
index 6655c779b..6655c779b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SONYPI_COMPAT
diff --git a/baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ b/configs/base-generic/x86/i686PAE/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/x86/i686PAE/CONFIG_STA2X11 b/configs/base-generic/x86/i686PAE/CONFIG_STA2X11
index ee8f3f09f..ee8f3f09f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_STA2X11
+++ b/configs/base-generic/x86/i686PAE/CONFIG_STA2X11
diff --git a/baseconfig/x86/i686PAE/CONFIG_SYNC_FILE b/configs/base-generic/x86/i686PAE/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_SYNC_FILE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_SYNC_FILE
diff --git a/baseconfig/x86/i686PAE/CONFIG_TC1100_WMI b/configs/base-generic/x86/i686PAE/CONFIG_TC1100_WMI
index ca6002268..ca6002268 100644
--- a/baseconfig/x86/i686PAE/CONFIG_TC1100_WMI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_TC1100_WMI
diff --git a/baseconfig/x86/i686PAE/CONFIG_TOSHIBA b/configs/base-generic/x86/i686PAE/CONFIG_TOSHIBA
index b0cfad976..b0cfad976 100644
--- a/baseconfig/x86/i686PAE/CONFIG_TOSHIBA
+++ b/configs/base-generic/x86/i686PAE/CONFIG_TOSHIBA
diff --git a/baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/configs/base-generic/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR
index b33f61f37..b33f61f37 100644
--- a/baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ b/configs/base-generic/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR
diff --git a/baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..4874a851b 100644
--- a/baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC b/configs/base-generic/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC
index f29531420..f29531420 100644
--- a/baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS b/configs/base-generic/x86/i686PAE/CONFIG_X86_32_IRIS
index f962972e1..f962972e1 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_32_IRIS
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD b/configs/base-generic/x86/i686PAE/CONFIG_X86_32_NON_STANDARD
index 051640b41..051640b41 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_32_NON_STANDARD
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE b/configs/base-generic/x86/i686PAE/CONFIG_X86_ANCIENT_MCE
index 0f8514b5f..0f8514b5f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_ANCIENT_MCE
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP b/configs/base-generic/x86/i686PAE/CONFIG_X86_BIGSMP
index 80880952e..80880952e 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_BIGSMP
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2 b/configs/base-generic/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2
index 6d5f101b7..6d5f101b7 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER b/configs/base-generic/x86/i686PAE/CONFIG_X86_E_POWERSAVER
index d5fbbbb13..d5fbbbb13 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_E_POWERSAVER
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GENERIC b/configs/base-generic/x86/i686PAE/CONFIG_X86_GENERIC
index 4c1688c38..4c1688c38 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GENERIC
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_GENERIC
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH b/configs/base-generic/x86/i686PAE/CONFIG_X86_GOLDFISH
index e509890ff..e509890ff 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_GOLDFISH
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD b/configs/base-generic/x86/i686PAE/CONFIG_X86_GX_SUSPMOD
index 2eb3b277c..2eb3b277c 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_GX_SUSPMOD
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID b/configs/base-generic/x86/i686PAE/CONFIG_X86_INTEL_MID
index 9c338605e..9c338605e 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_INTEL_MID
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK b/configs/base-generic/x86/i686PAE/CONFIG_X86_INTEL_QUARK
index 735531531..735531531 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_INTEL_QUARK
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL b/configs/base-generic/x86/i686PAE/CONFIG_X86_LONGHAUL
index dfa6f6e12..dfa6f6e12 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_LONGHAUL
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN b/configs/base-generic/x86/i686PAE/CONFIG_X86_LONGRUN
index 003040a51..003040a51 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_LONGRUN
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K6 b/configs/base-generic/x86/i686PAE/CONFIG_X86_POWERNOW_K6
index 370dc6cfb..370dc6cfb 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K6
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_POWERNOW_K6
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K7 b/configs/base-generic/x86/i686PAE/CONFIG_X86_POWERNOW_K7
index 00e5189c4..00e5189c4 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K7
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_POWERNOW_K7
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE b/configs/base-generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE
index 373382804..373382804 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_PPRO_FENCE
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_RDC321X b/configs/base-generic/x86/i686PAE/CONFIG_X86_RDC321X
index 24228b211..24228b211 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_RDC321X
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_RDC321X
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS b/configs/base-generic/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS
index 290af2213..290af2213 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH
index bfe895f71..bfe895f71 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB
index 3372ad003..3372ad003 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
index 808ce2b1d..808ce2b1d 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI
index 1a5cd0138..1a5cd0138 100644
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI
+++ b/configs/base-generic/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI
diff --git a/baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN b/configs/base-generic/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN
index a198d3b62..a198d3b62 100644
--- a/baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN
+++ b/configs/base-generic/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN
diff --git a/baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR b/configs/base-generic/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR
index a8ff9c8e6..a8ff9c8e6 100644
--- a/baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR
+++ b/configs/base-generic/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR
diff --git a/baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL b/configs/base-generic/x86/i686PAE/CONFIG_XO1_RFKILL
index 342cadbed..342cadbed 100644
--- a/baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL
+++ b/configs/base-generic/x86/i686PAE/CONFIG_XO1_RFKILL
diff --git a/baseconfig/x86/i686PAE/CONFIG_ZONE_DMA b/configs/base-generic/x86/i686PAE/CONFIG_ZONE_DMA
index c1b5f84a5..c1b5f84a5 100644
--- a/baseconfig/x86/i686PAE/CONFIG_ZONE_DMA
+++ b/configs/base-generic/x86/i686PAE/CONFIG_ZONE_DMA
diff --git a/baseconfig/x86/x86_64/CONFIG_64BIT b/configs/base-generic/x86/x86_64/CONFIG_64BIT
index 06a94e48b..06a94e48b 100644
--- a/baseconfig/x86/x86_64/CONFIG_64BIT
+++ b/configs/base-generic/x86/x86_64/CONFIG_64BIT
diff --git a/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE b/configs/base-generic/x86/x86_64/CONFIG_88EU_AP_MODE
index 8ba98fbe9..8ba98fbe9 100644
--- a/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE
+++ b/configs/base-generic/x86/x86_64/CONFIG_88EU_AP_MODE
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY b/configs/base-generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
index d2933e65f..d2933e65f 100644
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
+++ b/configs/base-generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NFIT
index 922b719bf..922b719bf 100644
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT
+++ b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NFIT
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG
index fc829324f..fc829324f 100644
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NUMA b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NUMA
index 19881f440..19881f440 100644
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NUMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_ACPI_NUMA
diff --git a/baseconfig/x86/x86_64/CONFIG_AK8975 b/configs/base-generic/x86/x86_64/CONFIG_AK8975
index 547c21a99..547c21a99 100644
--- a/baseconfig/x86/x86_64/CONFIG_AK8975
+++ b/configs/base-generic/x86/x86_64/CONFIG_AK8975
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU b/configs/base-generic/x86/x86_64/CONFIG_AMD_IOMMU
index ede0caaa0..ede0caaa0 100644
--- a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU
+++ b/configs/base-generic/x86/x86_64/CONFIG_AMD_IOMMU
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V2 b/configs/base-generic/x86/x86_64/CONFIG_AMD_IOMMU_V2
index bc103a7b9..bc103a7b9 100644
--- a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V2
+++ b/configs/base-generic/x86/x86_64/CONFIG_AMD_IOMMU_V2
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT b/configs/base-generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT
index f9eacfabc..f9eacfabc 100644
--- a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT
+++ b/configs/base-generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/configs/base-generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
index e41f0cf8f..e41f0cf8f 100644
--- a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+++ b/configs/base-generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_NUMA b/configs/base-generic/x86/x86_64/CONFIG_AMD_NUMA
index 2ff0db092..2ff0db092 100644
--- a/baseconfig/x86/x86_64/CONFIG_AMD_NUMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_AMD_NUMA
diff --git a/baseconfig/x86/x86_64/CONFIG_AQTION b/configs/base-generic/x86/x86_64/CONFIG_AQTION
index 7812ca016..7812ca016 100644
--- a/baseconfig/x86/x86_64/CONFIG_AQTION
+++ b/configs/base-generic/x86/x86_64/CONFIG_AQTION
diff --git a/baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE b/configs/base-generic/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE
index 9b5174506..9b5174506 100644
--- a/baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE
+++ b/configs/base-generic/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC b/configs/base-generic/x86/x86_64/CONFIG_AXP20X_ADC
index 0960ee661..0960ee661 100644
--- a/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
+++ b/configs/base-generic/x86/x86_64/CONFIG_AXP20X_ADC
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER b/configs/base-generic/x86/x86_64/CONFIG_AXP20X_POWER
index e02cee707..e02cee707 100644
--- a/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
+++ b/configs/base-generic/x86/x86_64/CONFIG_AXP20X_POWER
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_ADC b/configs/base-generic/x86/x86_64/CONFIG_AXP288_ADC
index e138f36af..e138f36af 100644
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_ADC
+++ b/configs/base-generic/x86/x86_64/CONFIG_AXP288_ADC
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER b/configs/base-generic/x86/x86_64/CONFIG_AXP288_CHARGER
index 0418f962c..0418f962c 100644
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
+++ b/configs/base-generic/x86/x86_64/CONFIG_AXP288_CHARGER
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE b/configs/base-generic/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
index e171b954b..e171b954b 100644
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
+++ b/configs/base-generic/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
diff --git a/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042 b/configs/base-generic/x86/x86_64/CONFIG_BATTERY_MAX17042
index 669e6ac2e..669e6ac2e 100644
--- a/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
+++ b/configs/base-generic/x86/x86_64/CONFIG_BATTERY_MAX17042
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD640 b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CMD640
index 4484bcf00..4484bcf00 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD640
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CMD640
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5520 b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5520
index 9d3d33c71..9d3d33c71 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5520
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5520
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5530 b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5530
index 2b2e38f13..2b2e38f13 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5530
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5530
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5535 b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5535
index a4649258c..a4649258c 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5535
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_CS5535
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ1000 b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_RZ1000
index 60369d999..60369d999 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ1000
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_RZ1000
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX
index 1ae9f1df0..1ae9f1df0 100644
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX
+++ b/configs/base-generic/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX
diff --git a/baseconfig/x86/x86_64/CONFIG_BTT b/configs/base-generic/x86/x86_64/CONFIG_BTT
index 9cfddf1b9..9cfddf1b9 100644
--- a/baseconfig/x86/x86_64/CONFIG_BTT
+++ b/configs/base-generic/x86/x86_64/CONFIG_BTT
diff --git a/baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU b/configs/base-generic/x86/x86_64/CONFIG_CALGARY_IOMMU
index b190f1db0..b190f1db0 100644
--- a/baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU
+++ b/configs/base-generic/x86/x86_64/CONFIG_CALGARY_IOMMU
diff --git a/baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB b/configs/base-generic/x86/x86_64/CONFIG_CGROUP_HUGETLB
index 0e9e34b4c..0e9e34b4c 100644
--- a/baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB
+++ b/configs/base-generic/x86/x86_64/CONFIG_CGROUP_HUGETLB
diff --git a/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190 b/configs/base-generic/x86/x86_64/CONFIG_CHARGER_BQ24190
index 3128bb676..3128bb676 100644
--- a/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
+++ b/configs/base-generic/x86/x86_64/CONFIG_CHARGER_BQ24190
diff --git a/baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE b/configs/base-generic/x86/x86_64/CONFIG_CHECKPOINT_RESTORE
index c554a09ce..c554a09ce 100644
--- a/baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE
+++ b/configs/base-generic/x86/x86_64/CONFIG_CHECKPOINT_RESTORE
diff --git a/baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION b/configs/base-generic/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION
index 3aa5a5f70..3aa5a5f70 100644
--- a/baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION
+++ b/configs/base-generic/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA b/configs/base-generic/x86/x86_64/CONFIG_CMA
index 309c9e771..309c9e771 100644
--- a/baseconfig/x86/x86_64/CONFIG_CMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_CMA
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_AREAS b/configs/base-generic/x86/x86_64/CONFIG_CMA_AREAS
index 5474a48e9..5474a48e9 100644
--- a/baseconfig/x86/x86_64/CONFIG_CMA_AREAS
+++ b/configs/base-generic/x86/x86_64/CONFIG_CMA_AREAS
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUG b/configs/base-generic/x86/x86_64/CONFIG_CMA_DEBUG
index 64ff80c56..64ff80c56 100644
--- a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_CMA_DEBUG
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS b/configs/base-generic/x86/x86_64/CONFIG_CMA_DEBUGFS
index fba89903a..fba89903a 100644
--- a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS
+++ b/configs/base-generic/x86/x86_64/CONFIG_CMA_DEBUGFS
diff --git a/baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE b/configs/base-generic/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE
index 3548ba6a5..3548ba6a5 100644
--- a/baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE
+++ b/configs/base-generic/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
index 7c09d010b..7c09d010b 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64
index 52bdc5fdd..52bdc5fdd 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
index 67edf8dde..67edf8dde 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64
index 6b7b87315..6b7b87315 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64
index b60b238f4..b60b238f4 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64
index a8afa374d..a8afa374d 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64
index 5dbd020a9..5dbd020a9 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64
index 6131a7b56..6131a7b56 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL
index 14e5d708b..14e5d708b 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CRYPTD
index 36649cff3..36649cff3 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_CRYPTD
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64
index fac68c6a1..fac68c6a1 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL
index 3c9561aee..3c9561aee 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_LRW
index 602a90482..602a90482 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_LRW
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_MCRYPTD
index 16f3b731c..16f3b731c 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_MCRYPTD
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64
index b444d2317..b444d2317 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64
index 2828a82ec..2828a82ec 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64
index 604ebff65..604ebff65 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64
index e3ab517c6..e3ab517c6 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64
index 6706b3873..6706b3873 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA1_MB
index 955fbbc0e..955fbbc0e 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA1_MB
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3
index a9dcbc3fb..a9dcbc3fb 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA256_MB
index ee0f365d3..ee0f365d3 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA256_MB
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3
index 70145df43..70145df43 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA512_MB
index 8175aaafe..8175aaafe 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA512_MB
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
index 1356b5ed4..1356b5ed4 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SKEIN
index 74ecf1fe2..74ecf1fe2 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_SKEIN
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64
index abdc67677..abdc67677 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64 b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64
index cf51269aa..cf51269aa 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY
index 3dbb7102f..3dbb7102f 100644
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY
+++ b/configs/base-generic/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY
diff --git a/baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR b/configs/base-generic/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR
index 84b22678e..84b22678e 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR
diff --git a/baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT b/configs/base-generic/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT
index c23e98f1e..c23e98f1e 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT
diff --git a/baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE b/configs/base-generic/x86/x86_64/CONFIG_DEVICE_PRIVATE
index ef0a4ad5b..ef0a4ad5b 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEVICE_PRIVATE
diff --git a/baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC b/configs/base-generic/x86/x86_64/CONFIG_DEVICE_PUBLIC
index c790e941b..c790e941b 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEVICE_PUBLIC
diff --git a/baseconfig/x86/x86_64/CONFIG_DEV_DAX b/configs/base-generic/x86/x86_64/CONFIG_DEV_DAX
index 77478a213..77478a213 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEV_DAX
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEV_DAX
diff --git a/baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM b/configs/base-generic/x86/x86_64/CONFIG_DEV_DAX_PMEM
index 8c7fd6732..8c7fd6732 100644
--- a/baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM
+++ b/configs/base-generic/x86/x86_64/CONFIG_DEV_DAX_PMEM
diff --git a/baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES b/configs/base-generic/x86/x86_64/CONFIG_DIRECT_GBPAGES
index 9fef2b80b..9fef2b80b 100644
--- a/baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES
+++ b/configs/base-generic/x86/x86_64/CONFIG_DIRECT_GBPAGES
diff --git a/baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL b/configs/base-generic/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL
index ab12a7fd1..ab12a7fd1 100644
--- a/baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL
+++ b/configs/base-generic/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64 b/configs/base-generic/x86/x86_64/CONFIG_EDAC_AMD64
index 667e1c0ab..667e1c0ab 100644
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64
+++ b/configs/base-generic/x86/x86_64/CONFIG_EDAC_AMD64
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION b/configs/base-generic/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION
index f587fd9c9..f587fd9c9 100644
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION
+++ b/configs/base-generic/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_PND2 b/configs/base-generic/x86/x86_64/CONFIG_EDAC_PND2
index d0b59df60..d0b59df60 100644
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_PND2
+++ b/configs/base-generic/x86/x86_64/CONFIG_EDAC_PND2
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE b/configs/base-generic/x86/x86_64/CONFIG_EDAC_SBRIDGE
index 18dc9b53a..18dc9b53a 100644
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE
+++ b/configs/base-generic/x86/x86_64/CONFIG_EDAC_SBRIDGE
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_SKX b/configs/base-generic/x86/x86_64/CONFIG_EDAC_SKX
index 33f417f1e..33f417f1e 100644
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_SKX
+++ b/configs/base-generic/x86/x86_64/CONFIG_EDAC_SKX
diff --git a/baseconfig/x86/x86_64/CONFIG_EFI_MIXED b/configs/base-generic/x86/x86_64/CONFIG_EFI_MIXED
index 3eb4a43bf..3eb4a43bf 100644
--- a/baseconfig/x86/x86_64/CONFIG_EFI_MIXED
+++ b/configs/base-generic/x86/x86_64/CONFIG_EFI_MIXED
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288 b/configs/base-generic/x86/x86_64/CONFIG_EXTCON_AXP288
index 7fadeb58d..7fadeb58d 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
+++ b/configs/base-generic/x86/x86_64/CONFIG_EXTCON_AXP288
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC b/configs/base-generic/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC
index 06e0472e8..06e0472e8 100644
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC
+++ b/configs/base-generic/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC
diff --git a/baseconfig/x86/x86_64/CONFIG_FRAME_WARN b/configs/base-generic/x86/x86_64/CONFIG_FRAME_WARN
index 6826578df..6826578df 100644
--- a/baseconfig/x86/x86_64/CONFIG_FRAME_WARN
+++ b/configs/base-generic/x86/x86_64/CONFIG_FRAME_WARN
diff --git a/baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER b/configs/base-generic/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER
index b1c634d00..b1c634d00 100644
--- a/baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER
+++ b/configs/base-generic/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER
diff --git a/baseconfig/x86/x86_64/CONFIG_GART_IOMMU b/configs/base-generic/x86/x86_64/CONFIG_GART_IOMMU
index c735af30c..c735af30c 100644
--- a/baseconfig/x86/x86_64/CONFIG_GART_IOMMU
+++ b/configs/base-generic/x86/x86_64/CONFIG_GART_IOMMU
diff --git a/baseconfig/x86/x86_64/CONFIG_GENERIC_CPU b/configs/base-generic/x86/x86_64/CONFIG_GENERIC_CPU
index 9cd8d3177..9cd8d3177 100644
--- a/baseconfig/x86/x86_64/CONFIG_GENERIC_CPU
+++ b/configs/base-generic/x86/x86_64/CONFIG_GENERIC_CPU
diff --git a/baseconfig/x86/x86_64/CONFIG_GENERIC_PHY b/configs/base-generic/x86/x86_64/CONFIG_GENERIC_PHY
index 40cd1a4f5..40cd1a4f5 100644
--- a/baseconfig/x86/x86_64/CONFIG_GENERIC_PHY
+++ b/configs/base-generic/x86/x86_64/CONFIG_GENERIC_PHY
diff --git a/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209 b/configs/base-generic/x86/x86_64/CONFIG_GPIO_AXP209
index c71682292..c71682292 100644
--- a/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
+++ b/configs/base-generic/x86/x86_64/CONFIG_GPIO_AXP209
diff --git a/baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT b/configs/base-generic/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT
index bb00d6994..bb00d6994 100644
--- a/baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT
+++ b/configs/base-generic/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT
diff --git a/baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER b/configs/base-generic/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER
index a5c5e96e6..a5c5e96e6 100644
--- a/baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER
+++ b/configs/base-generic/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER
diff --git a/baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN b/configs/base-generic/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN
index d225cd30b..d225cd30b 100644
--- a/baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN
+++ b/configs/base-generic/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN
diff --git a/baseconfig/x86/x86_64/CONFIG_HMM_MIRROR b/configs/base-generic/x86/x86_64/CONFIG_HMM_MIRROR
index 11dfee6c1..11dfee6c1 100644
--- a/baseconfig/x86/x86_64/CONFIG_HMM_MIRROR
+++ b/configs/base-generic/x86/x86_64/CONFIG_HMM_MIRROR
diff --git a/baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC b/configs/base-generic/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC
index baec74561..baec74561 100644
--- a/baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC
+++ b/configs/base-generic/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/x86/x86_64/CONFIG_HSA_AMD b/configs/base-generic/x86/x86_64/CONFIG_HSA_AMD
index f8e96fff1..f8e96fff1 100644
--- a/baseconfig/x86/x86_64/CONFIG_HSA_AMD
+++ b/configs/base-generic/x86/x86_64/CONFIG_HSA_AMD
diff --git a/baseconfig/x86/x86_64/CONFIG_HSU_DMA b/configs/base-generic/x86/x86_64/CONFIG_HSU_DMA
index 0dcb85dec..0dcb85dec 100644
--- a/baseconfig/x86/x86_64/CONFIG_HSU_DMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_HSU_DMA
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1535 b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI1535
index 3f9e2fef1..3f9e2fef1 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1535
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI1535
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1563 b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI1563
index 035045f8b..035045f8b 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1563
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI1563
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI15X3 b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI15X3
index 1621ea381..1621ea381 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI15X3
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_ALI15X3
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC b/configs/base-generic/x86/x86_64/CONFIG_I2C_CHT_WC
index f656e03fc..f656e03fc 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_CHT_WC
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI b/configs/base-generic/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
index 6103f947e..6103f947e 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_MUX b/configs/base-generic/x86/x86_64/CONFIG_I2C_MUX
index 6982ed98a..6982ed98a 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_MUX
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_MUX
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_SIS5595 b/configs/base-generic/x86/x86_64/CONFIG_I2C_SIS5595
index 881262cd6..881262cd6 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_SIS5595
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_SIS5595
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_SIS630 b/configs/base-generic/x86/x86_64/CONFIG_I2C_SIS630
index daa589151..daa589151 100644
--- a/baseconfig/x86/x86_64/CONFIG_I2C_SIS630
+++ b/configs/base-generic/x86/x86_64/CONFIG_I2C_SIS630
diff --git a/baseconfig/x86/x86_64/CONFIG_I7300_IDLE b/configs/base-generic/x86/x86_64/CONFIG_I7300_IDLE
index a4de12698..a4de12698 100644
--- a/baseconfig/x86/x86_64/CONFIG_I7300_IDLE
+++ b/configs/base-generic/x86/x86_64/CONFIG_I7300_IDLE
diff --git a/baseconfig/x86/x86_64/CONFIG_IA32_AOUT b/configs/base-generic/x86/x86_64/CONFIG_IA32_AOUT
index 4b8545de7..4b8545de7 100644
--- a/baseconfig/x86/x86_64/CONFIG_IA32_AOUT
+++ b/configs/base-generic/x86/x86_64/CONFIG_IA32_AOUT
diff --git a/baseconfig/x86/x86_64/CONFIG_IA32_EMULATION b/configs/base-generic/x86/x86_64/CONFIG_IA32_EMULATION
index 66c73dad0..66c73dad0 100644
--- a/baseconfig/x86/x86_64/CONFIG_IA32_EMULATION
+++ b/configs/base-generic/x86/x86_64/CONFIG_IA32_EMULATION
diff --git a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI1 b/configs/base-generic/x86/x86_64/CONFIG_INFINIBAND_HFI1
index eb333c845..eb333c845 100644
--- a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI1
+++ b/configs/base-generic/x86/x86_64/CONFIG_INFINIBAND_HFI1
diff --git a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC b/configs/base-generic/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
index d79565e48..d79565e48 100644
--- a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
+++ b/configs/base-generic/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
diff --git a/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK b/configs/base-generic/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
+++ b/configs/base-generic/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO b/configs/base-generic/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO
index 7ab08bb0e..7ab08bb0e 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID b/configs/base-generic/x86/x86_64/CONFIG_INTEL_ISH_HID
index 7f7cbea0a..7f7cbea0a 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_ISH_HID
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_BUS
index 0d018fbf4..0d018fbf4 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_BUS
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_CARD
index ce7cbb77a..ce7cbb77a 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_CARD
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_HOST
index 26e9b3ccf..26e9b3ccf 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_HOST
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
index df573d1ab..df573d1ab 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC b/configs/base-generic/x86/x86_64/CONFIG_INTEL_SCU_IPC
index e535aec5b..e535aec5b 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_SCU_IPC
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC b/configs/base-generic/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC
index 2f8920510..2f8920510 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3 b/configs/base-generic/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3
index 9516cd8f6..9516cd8f6 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_TXT b/configs/base-generic/x86/x86_64/CONFIG_INTEL_TXT
index f5428a4eb..f5428a4eb 100644
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_TXT
+++ b/configs/base-generic/x86/x86_64/CONFIG_INTEL_TXT
diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C b/configs/base-generic/x86/x86_64/CONFIG_INV_MPU6050_I2C
index 8ec049b05..8ec049b05 100644
--- a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
+++ b/configs/base-generic/x86/x86_64/CONFIG_INV_MPU6050_I2C
diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO b/configs/base-generic/x86/x86_64/CONFIG_INV_MPU6050_IIO
index ae4889d92..ae4889d92 100644
--- a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
+++ b/configs/base-generic/x86/x86_64/CONFIG_INV_MPU6050_IIO
diff --git a/baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG b/configs/base-generic/x86/x86_64/CONFIG_IOMMU_DEBUG
index aa0d301b9..aa0d301b9 100644
--- a/baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_IOMMU_DEBUG
diff --git a/baseconfig/x86/x86_64/CONFIG_IRQ_REMAP b/configs/base-generic/x86/x86_64/CONFIG_IRQ_REMAP
index dfe559c5e..dfe559c5e 100644
--- a/baseconfig/x86/x86_64/CONFIG_IRQ_REMAP
+++ b/configs/base-generic/x86/x86_64/CONFIG_IRQ_REMAP
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
index e74074065..e74074065 100644
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+++ b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_FILE b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_FILE
index 25862bf98..25862bf98 100644
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_FILE
+++ b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_FILE
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_JUMP
index e87b72ed1..e87b72ed1 100644
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP
+++ b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_JUMP
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG
index 5f39f1993..5f39f1993 100644
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG
+++ b/configs/base-generic/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG
diff --git a/baseconfig/x86/x86_64/CONFIG_LIBNVDIMM b/configs/base-generic/x86/x86_64/CONFIG_LIBNVDIMM
index f773300dc..f773300dc 100644
--- a/baseconfig/x86/x86_64/CONFIG_LIBNVDIMM
+++ b/configs/base-generic/x86/x86_64/CONFIG_LIBNVDIMM
diff --git a/baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT b/configs/base-generic/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
index 4a06cfcc2..4a06cfcc2 100644
--- a/baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
+++ b/configs/base-generic/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
diff --git a/baseconfig/x86/x86_64/CONFIG_MAILBOX b/configs/base-generic/x86/x86_64/CONFIG_MAILBOX
index f1a6342b4..f1a6342b4 100644
--- a/baseconfig/x86/x86_64/CONFIG_MAILBOX
+++ b/configs/base-generic/x86/x86_64/CONFIG_MAILBOX
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTPLUG
index ff75139e0..ff75139e0 100644
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTPLUG
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
index bbbf7d364..bbbf7d364 100644
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTREMOVE
index 362150e69..362150e69 100644
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE
+++ b/configs/base-generic/x86/x86_64/CONFIG_MEMORY_HOTREMOVE
diff --git a/baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY b/configs/base-generic/x86/x86_64/CONFIG_MEM_SOFT_DIRTY
index 356f2edd8..356f2edd8 100644
--- a/baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY
+++ b/configs/base-generic/x86/x86_64/CONFIG_MEM_SOFT_DIRTY
diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X b/configs/base-generic/x86/x86_64/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
+++ b/configs/base-generic/x86/x86_64/CONFIG_MFD_AXP20X
diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C b/configs/base-generic/x86/x86_64/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
+++ b/configs/base-generic/x86/x86_64/CONFIG_MFD_AXP20X_I2C
diff --git a/baseconfig/x86/x86_64/CONFIG_MIC_COSM b/configs/base-generic/x86/x86_64/CONFIG_MIC_COSM
index 826edffcd..826edffcd 100644
--- a/baseconfig/x86/x86_64/CONFIG_MIC_COSM
+++ b/configs/base-generic/x86/x86_64/CONFIG_MIC_COSM
diff --git a/baseconfig/x86/x86_64/CONFIG_MK8 b/configs/base-generic/x86/x86_64/CONFIG_MK8
index 2f448241b..2f448241b 100644
--- a/baseconfig/x86/x86_64/CONFIG_MK8
+++ b/configs/base-generic/x86/x86_64/CONFIG_MK8
diff --git a/baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM b/configs/base-generic/x86/x86_64/CONFIG_MLX_PLATFORM
index 54e7906ec..54e7906ec 100644
--- a/baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM
+++ b/configs/base-generic/x86/x86_64/CONFIG_MLX_PLATFORM
diff --git a/baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE b/configs/base-generic/x86/x86_64/CONFIG_MOVABLE_NODE
index 375308c7f..375308c7f 100644
--- a/baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE
+++ b/configs/base-generic/x86/x86_64/CONFIG_MOVABLE_NODE
diff --git a/baseconfig/x86/x86_64/CONFIG_MPSC b/configs/base-generic/x86/x86_64/CONFIG_MPSC
index 8993bc823..8993bc823 100644
--- a/baseconfig/x86/x86_64/CONFIG_MPSC
+++ b/configs/base-generic/x86/x86_64/CONFIG_MPSC
diff --git a/baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS b/configs/base-generic/x86/x86_64/CONFIG_MTD_BLKDEVS
index b59074744..b59074744 100644
--- a/baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS
+++ b/configs/base-generic/x86/x86_64/CONFIG_MTD_BLKDEVS
diff --git a/baseconfig/x86/x86_64/CONFIG_MTD_BLOCK b/configs/base-generic/x86/x86_64/CONFIG_MTD_BLOCK
index 74f992fda..74f992fda 100644
--- a/baseconfig/x86/x86_64/CONFIG_MTD_BLOCK
+++ b/configs/base-generic/x86/x86_64/CONFIG_MTD_BLOCK
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_BLK b/configs/base-generic/x86/x86_64/CONFIG_ND_BLK
index 8a6c237d7..8a6c237d7 100644
--- a/baseconfig/x86/x86_64/CONFIG_ND_BLK
+++ b/configs/base-generic/x86/x86_64/CONFIG_ND_BLK
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_BTT b/configs/base-generic/x86/x86_64/CONFIG_ND_BTT
index d4e20e237..d4e20e237 100644
--- a/baseconfig/x86/x86_64/CONFIG_ND_BTT
+++ b/configs/base-generic/x86/x86_64/CONFIG_ND_BTT
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_PFN b/configs/base-generic/x86/x86_64/CONFIG_ND_PFN
index 8dd69e19b..8dd69e19b 100644
--- a/baseconfig/x86/x86_64/CONFIG_ND_PFN
+++ b/configs/base-generic/x86/x86_64/CONFIG_ND_PFN
diff --git a/baseconfig/x86/x86_64/CONFIG_NODES_SHIFT b/configs/base-generic/x86/x86_64/CONFIG_NODES_SHIFT
index abdee2f53..abdee2f53 100644
--- a/baseconfig/x86/x86_64/CONFIG_NODES_SHIFT
+++ b/configs/base-generic/x86/x86_64/CONFIG_NODES_SHIFT
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL
index 4cd3ab9ec..4cd3ab9ec 100644
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL
+++ b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL_ALL
index eddf5c467..eddf5c467 100644
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL
+++ b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL_ALL
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE
index c8aa224ab..c8aa224ab 100644
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE
+++ b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_IDLE
index 8641a52f7..8641a52f7 100644
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE
+++ b/configs/base-generic/x86/x86_64/CONFIG_NO_HZ_IDLE
diff --git a/baseconfig/x86/x86_64/CONFIG_NR_CPUS b/configs/base-generic/x86/x86_64/CONFIG_NR_CPUS
index 27d187f4d..27d187f4d 100644
--- a/baseconfig/x86/x86_64/CONFIG_NR_CPUS
+++ b/configs/base-generic/x86/x86_64/CONFIG_NR_CPUS
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB b/configs/base-generic/x86/x86_64/CONFIG_NTB
index f9d9791f4..f9d9791f4 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_AMD b/configs/base-generic/x86/x86_64/CONFIG_NTB_AMD
index 25197ef36..25197ef36 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_AMD
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_AMD
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_INTEL b/configs/base-generic/x86/x86_64/CONFIG_NTB_INTEL
index 9089b0cc6..9089b0cc6 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_INTEL
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_INTEL
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_NETDEV b/configs/base-generic/x86/x86_64/CONFIG_NTB_NETDEV
index b0a30584b..b0a30584b 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_NETDEV
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_NETDEV
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_PERF b/configs/base-generic/x86/x86_64/CONFIG_NTB_PERF
index d0a76da66..d0a76da66 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_PERF
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_PERF
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG b/configs/base-generic/x86/x86_64/CONFIG_NTB_PINGPONG
index e797285a7..e797285a7 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_PINGPONG
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_TOOL b/configs/base-generic/x86/x86_64/CONFIG_NTB_TOOL
index 71fb00278..71fb00278 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_TOOL
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_TOOL
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT b/configs/base-generic/x86/x86_64/CONFIG_NTB_TRANSPORT
index ce0c040fa..ce0c040fa 100644
--- a/baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT
+++ b/configs/base-generic/x86/x86_64/CONFIG_NTB_TRANSPORT
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA b/configs/base-generic/x86/x86_64/CONFIG_NUMA
index e480f0c04..e480f0c04 100644
--- a/baseconfig/x86/x86_64/CONFIG_NUMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_NUMA
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING b/configs/base-generic/x86/x86_64/CONFIG_NUMA_BALANCING
index 9de89d51d..9de89d51d 100644
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING
+++ b/configs/base-generic/x86/x86_64/CONFIG_NUMA_BALANCING
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/configs/base-generic/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 5f7402180..5f7402180 100644
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/configs/base-generic/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_EMU b/configs/base-generic/x86/x86_64/CONFIG_NUMA_EMU
index 510bfc0a6..510bfc0a6 100644
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_EMU
+++ b/configs/base-generic/x86/x86_64/CONFIG_NUMA_EMU
diff --git a/baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX b/configs/base-generic/x86/x86_64/CONFIG_NVDIMM_DAX
index 947636ca8..947636ca8 100644
--- a/baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX
+++ b/configs/base-generic/x86/x86_64/CONFIG_NVDIMM_DAX
diff --git a/baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN b/configs/base-generic/x86/x86_64/CONFIG_NVDIMM_PFN
index 9db164ae5..9db164ae5 100644
--- a/baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN
+++ b/configs/base-generic/x86/x86_64/CONFIG_NVDIMM_PFN
diff --git a/baseconfig/x86/x86_64/CONFIG_OF b/configs/base-generic/x86/x86_64/CONFIG_OF
index d15176e9c..d15176e9c 100644
--- a/baseconfig/x86/x86_64/CONFIG_OF
+++ b/configs/base-generic/x86/x86_64/CONFIG_OF
diff --git a/baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO b/configs/base-generic/x86/x86_64/CONFIG_PC8736x_GPIO
index a7a547640..a7a547640 100644
--- a/baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO
+++ b/configs/base-generic/x86/x86_64/CONFIG_PC8736x_GPIO
diff --git a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN b/configs/base-generic/x86/x86_64/CONFIG_PHYSICAL_ALIGN
index 6a12c860e..6a12c860e 100644
--- a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN
+++ b/configs/base-generic/x86/x86_64/CONFIG_PHYSICAL_ALIGN
diff --git a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_START b/configs/base-generic/x86/x86_64/CONFIG_PHYSICAL_START
index 197ff1f91..197ff1f91 100644
--- a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_START
+++ b/configs/base-generic/x86/x86_64/CONFIG_PHYSICAL_START
diff --git a/baseconfig/x86/x86_64/CONFIG_PINCONF b/configs/base-generic/x86/x86_64/CONFIG_PINCONF
index 2f04b24a4..2f04b24a4 100644
--- a/baseconfig/x86/x86_64/CONFIG_PINCONF
+++ b/configs/base-generic/x86/x86_64/CONFIG_PINCONF
diff --git a/baseconfig/x86/x86_64/CONFIG_PINMUX b/configs/base-generic/x86/x86_64/CONFIG_PINMUX
index 2e704c683..2e704c683 100644
--- a/baseconfig/x86/x86_64/CONFIG_PINMUX
+++ b/configs/base-generic/x86/x86_64/CONFIG_PINMUX
diff --git a/baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/configs/base-generic/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT
index eee4011e1..eee4011e1 100644
--- a/baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ b/configs/base-generic/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT
diff --git a/baseconfig/x86/x86_64/CONFIG_R8188EU b/configs/base-generic/x86/x86_64/CONFIG_R8188EU
index ed7c3546e..ed7c3546e 100644
--- a/baseconfig/x86/x86_64/CONFIG_R8188EU
+++ b/configs/base-generic/x86/x86_64/CONFIG_R8188EU
diff --git a/baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY b/configs/base-generic/x86/x86_64/CONFIG_RANDOMIZE_MEMORY
index cb4fdaaac..cb4fdaaac 100644
--- a/baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY
+++ b/configs/base-generic/x86/x86_64/CONFIG_RANDOMIZE_MEMORY
diff --git a/baseconfig/x86/x86_64/CONFIG_RCU_FANOUT b/configs/base-generic/x86/x86_64/CONFIG_RCU_FANOUT
index e95447c12..e95447c12 100644
--- a/baseconfig/x86/x86_64/CONFIG_RCU_FANOUT
+++ b/configs/base-generic/x86/x86_64/CONFIG_RCU_FANOUT
diff --git a/baseconfig/x86/x86_64/CONFIG_REGMAP_I2C b/configs/base-generic/x86/x86_64/CONFIG_REGMAP_I2C
index 907c212ef..907c212ef 100644
--- a/baseconfig/x86/x86_64/CONFIG_REGMAP_I2C
+++ b/configs/base-generic/x86/x86_64/CONFIG_REGMAP_I2C
diff --git a/baseconfig/x86/x86_64/CONFIG_SCIF b/configs/base-generic/x86/x86_64/CONFIG_SCIF
index 74fab5182..74fab5182 100644
--- a/baseconfig/x86/x86_64/CONFIG_SCIF
+++ b/configs/base-generic/x86/x86_64/CONFIG_SCIF
diff --git a/baseconfig/x86/x86_64/CONFIG_SCIF_BUS b/configs/base-generic/x86/x86_64/CONFIG_SCIF_BUS
index 054e08ed2..054e08ed2 100644
--- a/baseconfig/x86/x86_64/CONFIG_SCIF_BUS
+++ b/configs/base-generic/x86/x86_64/CONFIG_SCIF_BUS
diff --git a/baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY b/configs/base-generic/x86/x86_64/CONFIG_SDMA_VERBOSITY
index 1144ca928..1144ca928 100644
--- a/baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY
+++ b/configs/base-generic/x86/x86_64/CONFIG_SDMA_VERBOSITY
diff --git a/baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID b/configs/base-generic/x86/x86_64/CONFIG_SERIAL_8250_MID
index 58ee08f11..58ee08f11 100644
--- a/baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID
+++ b/configs/base-generic/x86/x86_64/CONFIG_SERIAL_8250_MID
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC b/configs/base-generic/x86/x86_64/CONFIG_SFC
index dd76039a1..dd76039a1 100644
--- a/baseconfig/x86/x86_64/CONFIG_SFC
+++ b/configs/base-generic/x86/x86_64/CONFIG_SFC
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING b/configs/base-generic/x86/x86_64/CONFIG_SFC_MCDI_LOGGING
index d9b61520e..d9b61520e 100644
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING
+++ b/configs/base-generic/x86/x86_64/CONFIG_SFC_MCDI_LOGGING
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON b/configs/base-generic/x86/x86_64/CONFIG_SFC_MCDI_MON
index 5bb40eaea..5bb40eaea 100644
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON
+++ b/configs/base-generic/x86/x86_64/CONFIG_SFC_MCDI_MON
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MTD b/configs/base-generic/x86/x86_64/CONFIG_SFC_MTD
index 35ab623c5..35ab623c5 100644
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MTD
+++ b/configs/base-generic/x86/x86_64/CONFIG_SFC_MTD
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_SRIOV b/configs/base-generic/x86/x86_64/CONFIG_SFC_SRIOV
index 62e41fa84..62e41fa84 100644
--- a/baseconfig/x86/x86_64/CONFIG_SFC_SRIOV
+++ b/configs/base-generic/x86/x86_64/CONFIG_SFC_SRIOV
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_GRU b/configs/base-generic/x86/x86_64/CONFIG_SGI_GRU
index 5b133b268..5b133b268 100644
--- a/baseconfig/x86/x86_64/CONFIG_SGI_GRU
+++ b/configs/base-generic/x86/x86_64/CONFIG_SGI_GRU
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG b/configs/base-generic/x86/x86_64/CONFIG_SGI_GRU_DEBUG
index 5e65cd5dd..5e65cd5dd 100644
--- a/baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_SGI_GRU_DEBUG
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_IOC4 b/configs/base-generic/x86/x86_64/CONFIG_SGI_IOC4
index 89b268e91..89b268e91 100644
--- a/baseconfig/x86/x86_64/CONFIG_SGI_IOC4
+++ b/configs/base-generic/x86/x86_64/CONFIG_SGI_IOC4
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_XP b/configs/base-generic/x86/x86_64/CONFIG_SGI_XP
index c27ee782f..c27ee782f 100644
--- a/baseconfig/x86/x86_64/CONFIG_SGI_XP
+++ b/configs/base-generic/x86/x86_64/CONFIG_SGI_XP
diff --git a/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI b/configs/base-generic/x86/x86_64/CONFIG_SILEAD_DMI
index 25b017354..25b017354 100644
--- a/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
+++ b/configs/base-generic/x86/x86_64/CONFIG_SILEAD_DMI
diff --git a/baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM4567 b/configs/base-generic/x86/x86_64/CONFIG_SND_SOC_SSM4567
index 8907aafc9..8907aafc9 100644
--- a/baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM4567
+++ b/configs/base-generic/x86/x86_64/CONFIG_SND_SOC_SSM4567
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM
index 04c45b450..04c45b450 100644
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM
+++ b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_EXTREME
index 0e87090ab..0e87090ab 100644
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME
+++ b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_EXTREME
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_MANUAL
index 1a32bf7cd..1a32bf7cd 100644
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL
+++ b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_MANUAL
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP
index a2826dacd..a2826dacd 100644
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP
+++ b/configs/base-generic/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ b/configs/base-generic/x86/x86_64/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ
+++ b/configs/base-generic/x86/x86_64/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/x86/x86_64/CONFIG_SWIOTLB b/configs/base-generic/x86/x86_64/CONFIG_SWIOTLB
index 5405b65b4..5405b65b4 100644
--- a/baseconfig/x86/x86_64/CONFIG_SWIOTLB
+++ b/configs/base-generic/x86/x86_64/CONFIG_SWIOTLB
diff --git a/baseconfig/x86/x86_64/CONFIG_SYNC_FILE b/configs/base-generic/x86/x86_64/CONFIG_SYNC_FILE
index 391ab547b..391ab547b 100644
--- a/baseconfig/x86/x86_64/CONFIG_SYNC_FILE
+++ b/configs/base-generic/x86/x86_64/CONFIG_SYNC_FILE
diff --git a/baseconfig/x86/x86_64/CONFIG_THUNDERBOLT b/configs/base-generic/x86/x86_64/CONFIG_THUNDERBOLT
index 12b8cdd76..12b8cdd76 100644
--- a/baseconfig/x86/x86_64/CONFIG_THUNDERBOLT
+++ b/configs/base-generic/x86/x86_64/CONFIG_THUNDERBOLT
diff --git a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE b/configs/base-generic/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE
index 75d999c66..75d999c66 100644
--- a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/configs/base-generic/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/configs/base-generic/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
index f9a942f2c..f9a942f2c 100644
--- a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
+++ b/configs/base-generic/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
diff --git a/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM b/configs/base-generic/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
index 060ebfc94..060ebfc94 100644
--- a/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
+++ b/configs/base-generic/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
diff --git a/baseconfig/x86/x86_64/CONFIG_UV_MMTIMER b/configs/base-generic/x86/x86_64/CONFIG_UV_MMTIMER
index 93fe2251b..93fe2251b 100644
--- a/baseconfig/x86/x86_64/CONFIG_UV_MMTIMER
+++ b/configs/base-generic/x86/x86_64/CONFIG_UV_MMTIMER
diff --git a/baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC b/configs/base-generic/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC
index 7f70560cf..7f70560cf 100644
--- a/baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC
+++ b/configs/base-generic/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC
diff --git a/baseconfig/x86/x86_64/CONFIG_VMAP_STACK b/configs/base-generic/x86/x86_64/CONFIG_VMAP_STACK
index 8bd986875..8bd986875 100644
--- a/baseconfig/x86/x86_64/CONFIG_VMAP_STACK
+++ b/configs/base-generic/x86/x86_64/CONFIG_VMAP_STACK
diff --git a/baseconfig/x86/x86_64/CONFIG_VOP b/configs/base-generic/x86/x86_64/CONFIG_VOP
index 3f6192e2b..3f6192e2b 100644
--- a/baseconfig/x86/x86_64/CONFIG_VOP
+++ b/configs/base-generic/x86/x86_64/CONFIG_VOP
diff --git a/baseconfig/x86/x86_64/CONFIG_VOP_BUS b/configs/base-generic/x86/x86_64/CONFIG_VOP_BUS
index 83c12391b..83c12391b 100644
--- a/baseconfig/x86/x86_64/CONFIG_VOP_BUS
+++ b/configs/base-generic/x86/x86_64/CONFIG_VOP_BUS
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_5LEVEL b/configs/base-generic/x86/x86_64/CONFIG_X86_5LEVEL
index db301f396..db301f396 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_5LEVEL
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_5LEVEL
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA b/configs/base-generic/x86/x86_64/CONFIG_X86_64_ACPI_NUMA
index 9ed4791dc..9ed4791dc 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_64_ACPI_NUMA
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS b/configs/base-generic/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
index 9d135af1d..9d135af1d 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_MPPARSE b/configs/base-generic/x86/x86_64/CONFIG_X86_MPPARSE
index 1e4f55144..1e4f55144 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_MPPARSE
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_MPPARSE
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP b/configs/base-generic/x86/x86_64/CONFIG_X86_NUMACHIP
index ad80ce426..ad80ce426 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_NUMACHIP
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_UV b/configs/base-generic/x86/x86_64/CONFIG_X86_UV
index 48e2726e3..48e2726e3 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_UV
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_UV
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_VSMP b/configs/base-generic/x86/x86_64/CONFIG_X86_VSMP
index 808ee39bf..808ee39bf 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_VSMP
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_VSMP
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_X2APIC b/configs/base-generic/x86/x86_64/CONFIG_X86_X2APIC
index 8bee94dec..8bee94dec 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_X2APIC
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_X2APIC
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_X32 b/configs/base-generic/x86/x86_64/CONFIG_X86_X32
index a2dfec15e..a2dfec15e 100644
--- a/baseconfig/x86/x86_64/CONFIG_X86_X32
+++ b/configs/base-generic/x86/x86_64/CONFIG_X86_X32
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_512GB b/configs/base-generic/x86/x86_64/CONFIG_XEN_512GB
index 7ef73a72d..7ef73a72d 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_512GB
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_512GB
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG b/configs/base-generic/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
index 40df16cfe..40df16cfe 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN b/configs/base-generic/x86/x86_64/CONFIG_XEN_DEV_EVTCHN
index a198d3b62..a198d3b62 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_DEV_EVTCHN
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG b/configs/base-generic/x86/x86_64/CONFIG_XEN_MCE_LOG
index e77983fae..e77983fae 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_MCE_LOG
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_STUB b/configs/base-generic/x86/x86_64/CONFIG_XEN_STUB
index 4792a9049..4792a9049 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_STUB
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_STUB
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR b/configs/base-generic/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR
index a8ff9c8e6..a8ff9c8e6 100644
--- a/baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR
+++ b/configs/base-generic/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR
diff --git a/baseconfig/x86/x86_64/CONFIG_XO15_EBOOK b/configs/base-generic/x86/x86_64/CONFIG_XO15_EBOOK
index 625aa8cad..625aa8cad 100644
--- a/baseconfig/x86/x86_64/CONFIG_XO15_EBOOK
+++ b/configs/base-generic/x86/x86_64/CONFIG_XO15_EBOOK
diff --git a/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION b/configs/base-generic/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
index 8c98df142..8c98df142 100644
--- a/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
+++ b/configs/base-generic/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
diff --git a/baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE b/configs/base-generic/x86/x86_64/CONFIG_ZONE_DEVICE
index 7d0942fcf..7d0942fcf 100644
--- a/baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE
+++ b/configs/base-generic/x86/x86_64/CONFIG_ZONE_DEVICE
diff --git a/baseconfig/x86/x86_64/CONFIG_ZONE_DMA b/configs/base-generic/x86/x86_64/CONFIG_ZONE_DMA
index c1b5f84a5..c1b5f84a5 100644
--- a/baseconfig/x86/x86_64/CONFIG_ZONE_DMA
+++ b/configs/base-generic/x86/x86_64/CONFIG_ZONE_DMA