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.
author: Don Zickus <dzickus@redhat.com> 2017-11-06 16:40:39 -0500
committer: Laura Abbott <labbott@redhat.com> 2017-11-13 09:39:12 -0800
commit: c54d82caa97d0d11e06f263f92394479bf3bb437 (patch)
tree: 7c5e484b5a50d517e782dad4a6bdb5bb4bfe13a4 /baseconfig/arm/armv7/armv7
parent: 36ae66c549a5da472615f2974bb7c7fc18843d4c (diff)
download: kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.gz
kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.xz
kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.zip
622 files changed, 0 insertions, 622 deletions
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_IMX b/baseconfig/arm/armv7/armv7/CONFIG_AHCI_IMX
deleted file mode 100644
index 924631145..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AHCI_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST b/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST
deleted file mode 100644
index 975ecd425..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AHCI_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB b/baseconfig/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB
deleted file mode 100644
index 6ee8077c4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_CONTROL_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AM335X_CONTROL_USB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_PHY_USB b/baseconfig/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
deleted file mode 100644
index b3f86e351..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AM335X_PHY_USB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084 b/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
deleted file mode 100644
index bacb61e5e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APQ_GCC_8084=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_MMCC_8084 b/baseconfig/arm/armv7/armv7/CONFIG_APQ_MMCC_8084
deleted file mode 100644
index 05c8d0c7b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_MMCC_8084
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APQ_MMCC_8084=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_BERLIN b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_BERLIN
deleted file mode 100644
index 9a647a4a1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_BERLIN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_BERLIN is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4
deleted file mode 100644
index 61b192a72..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_EXYNOS4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_EXYNOS4=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE
deleted file mode 100644
index 7a2faa3bf..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_KEYSTONE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_KEYSTONE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MDM9615 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MDM9615
deleted file mode 100644
index 8d39d37d9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MDM9615
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MDM9615 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MMP b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MMP
deleted file mode 100644
index df1b1f323..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_MMP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8960 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8960
deleted file mode 100644
index aa7448c34..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_MSM8960=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8974 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8974
deleted file mode 100644
index d1983189e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8974
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_MSM8974=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8X60 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8X60
deleted file mode 100644
index 5848aefa4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MSM8X60
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_MSM8X60=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MXC b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MXC
deleted file mode 100644
index 5568226d1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_MXC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_MXC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL
deleted file mode 100644
index c27327f91..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP2PLUS_TYPICAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP3 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP3
deleted file mode 100644
index c5555b514..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_OMAP3=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP4 b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP4
deleted file mode 100644
index 8b2dee0fd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_OMAP4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_OMAP4=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_QCOM
deleted file mode 100644
index e51a38aa6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_QCOM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI
deleted file mode 100644
index 7a253ecf5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_STI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA
deleted file mode 100644
index 3b74d56f4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_TEGRA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC
deleted file mode 100644
index 1b82454da..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_2x_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_TEGRA_2x_SOC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC
deleted file mode 100644
index 97399b00b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_TEGRA_3x_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_TEGRA_3x_SOC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_ZYNQ b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_ZYNQ
deleted file mode 100644
index 6397585ca..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_ZYNQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_ZYNQ=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ
deleted file mode 100644
index 9cdade71b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_IMX6Q_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_IMX6Q_CPUFREQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_LPAE b/baseconfig/arm/armv7/armv7/CONFIG_ARM_LPAE
deleted file mode 100644
index 6fd138b99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_LPAE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_LPAE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ
deleted file mode 100644
index 5b86d6cba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_OMAP2PLUS_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
deleted file mode 100644
index 0e26a51f0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_STI_CPUFREQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
deleted file mode 100644
index ca125040d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_TI_CPUFREQ=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT b/baseconfig/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT
deleted file mode 100644
index 7f469ba88..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_VIRT_EXT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_VIRT_EXT=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE b/baseconfig/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE
deleted file mode 100644
index ce556911b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ARM_ZYNQ_CPUIDLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_ZYNQ_CPUIDLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AXI_DMAC b/baseconfig/arm/armv7/armv7/CONFIG_AXI_DMAC
deleted file mode 100644
index 565eb6e6e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AXI_DMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXI_DMAC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052
deleted file mode 100644
index 10f4ffe68..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA b/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA
deleted file mode 100644
index 746923749..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_PANDORA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PANDORA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217 b/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
deleted file mode 100644
index a07a30140..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_TPS65217=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX
deleted file mode 100644
index 70c971363..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_BQ27XXX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
deleted file mode 100644
index 13f2e3d86..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
deleted file mode 100644
index 2be078588..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_BQ27XXX_HDQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C
deleted file mode 100644
index 574be81f5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_BQ27XXX_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_DA9052
deleted file mode 100644
index 31f2c8c10..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_RX51 b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_RX51
deleted file mode 100644
index f204d74e2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_RX51
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_RX51=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC
deleted file mode 100644
index c30155320..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_TWL4030_MADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_TWL4030_MADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD b/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
deleted file mode 100644
index 9f36fb6a8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BT_QCOMSMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
deleted file mode 100644
index 85b4e115d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CADENCE_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN b/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN
deleted file mode 100644
index bf0bc15df..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAN_C_CAN=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM b/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM
deleted file mode 100644
index 386c5e4ca..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_C_CAN_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAN_C_CAN_PLATFORM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CAN_FLEXCAN b/baseconfig/arm/armv7/armv7/CONFIG_CAN_FLEXCAN
deleted file mode 100644
index b18a38008..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CAN_FLEXCAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAN_FLEXCAN=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X
deleted file mode 100644
index 6886de4eb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_BQ2415X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_BQ2415X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_ISP1704 b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_ISP1704
deleted file mode 100644
index f9ba02e8b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_ISP1704
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_ISP1704=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
deleted file mode 100644
index 43a91eb0e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217 b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
deleted file mode 100644
index e77c2fc05..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_TPS65217=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TWL4030
deleted file mode 100644
index 5f7138059..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CLK_TWL6040 b/baseconfig/arm/armv7/armv7/CONFIG_CLK_TWL6040
deleted file mode 100644
index ec6153158..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CLK_TWL6040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CLK_TWL6040=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CM36651 b/baseconfig/arm/armv7/armv7/CONFIG_CM36651
deleted file mode 100644
index d13a155f9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CM36651
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CM36651=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN
deleted file mode 100644
index a347b8f34..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_AXI_CLKGEN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_AXI_CLKGEN=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS
deleted file mode 100644
index 695bed39b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_PALMAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
deleted file mode 100644
index 2b7c64357..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_QCOM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL
deleted file mode 100644
index b9697f113..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_TI_ADPLL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_TI_ADPLL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD
deleted file mode 100644
index 69d344ce6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_XLNX_CLKWZRD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
deleted file mode 100644
index 9432ae930..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
deleted file mode 100644
index 513a57a7c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
deleted file mode 100644
index 88195c95c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
deleted file mode 100644
index a2ebce907..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
deleted file mode 100644
index e9a418ac8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
deleted file mode 100644
index 2ce83fc68..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
deleted file mode 100644
index 626039201..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
deleted file mode 100644
index 367a3c834..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
deleted file mode 100644
index 668bf43f6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
deleted file mode 100644
index ee310393e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
deleted file mode 100644
index 9e6e91b74..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC
deleted file mode 100644
index 3195253f1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
deleted file mode 100644
index 7e925a191..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
deleted file mode 100644
index 98ff565f8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
deleted file mode 100644
index 1b126b18e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_OMAP_AES=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
deleted file mode 100644
index b359a5c3f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_OMAP_DES=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
deleted file mode 100644
index 58d162aba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL
deleted file mode 100644
index d953a326b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_PICOXCELL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_PICOXCELL is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE
deleted file mode 100644
index 27a3f7204..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_QCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA b/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA
deleted file mode 100644
index 992c3e8c5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CRYPTO_DEV_SAHARA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_SAHARA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG
deleted file mode 100644
index 30e84a0e2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DA9052_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DA9052_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG
deleted file mode 100644
index dd19d9cec..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DA9055_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DA9055_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DDR b/baseconfig/arm/armv7/armv7/CONFIG_DDR
deleted file mode 100644
index ef2dd72e5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DDR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DDR=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DMA_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_DMA_OMAP
deleted file mode 100644
index e11f15c99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DMA_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMA_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV
deleted file mode 100644
index 699299fab..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_ETNAVIV=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING
deleted file mode 100644
index 68356e1a5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_REGISTER_LOGGING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX
deleted file mode 100644
index 3195e3e11..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI
deleted file mode 100644
index 653ebbd4d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_HDMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX_HDMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3
deleted file mode 100644
index af7cff715..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_IPUV3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX_IPUV3=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_LDB b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_LDB
deleted file mode 100644
index acae5a47a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_LDB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX_LDB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY
deleted file mode 100644
index 57cbdd3a3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_PARALLEL_DISPLAY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_TVE b/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_TVE
deleted file mode 100644
index dee0256f4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_IMX_TVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_IMX_TVE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM
deleted file mode 100644
index 0a1adfc20..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
deleted file mode 100644
index 87b627906..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
deleted file mode 100644
index 397f69094..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI_14NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
deleted file mode 100644
index 7595ae205..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI_20NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
deleted file mode 100644
index 5d86a4597..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
deleted file mode 100644
index ea1c4f918..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI_28NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
deleted file mode 100644
index 16ac280e6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_DSI_PLL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP
deleted file mode 100644
index 2adc35b99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_HDMI_HDCP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MSM_HDMI_HDCP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING
deleted file mode 100644
index 83c03d92d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_REGISTER_LOGGING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB
deleted file mode 100644
index e24a8952c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_MXSFB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP
deleted file mode 100644
index 5e6027954..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV
deleted file mode 100644
index b1c910b41..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
deleted file mode 100644
index 8b78fee27..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_DVI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_CONNECTOR_DVI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI
deleted file mode 100644
index c32d551d3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_CONNECTOR_HDMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362
deleted file mode 100644
index 266b225c4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_OPA362
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_ENCODER_OPA362=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
deleted file mode 100644
index cc463415e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TFP410
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_ENCODER_TFP410=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015
deleted file mode 100644
index c7fe3823b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_ENCODER_TPD12S015
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS
deleted file mode 100644
index d6760eb74..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_NUM_CRTCS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_NUM_CRTCS=2
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
deleted file mode 100644
index 2255168f6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_DPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM
deleted file mode 100644
index 3ddf71e55..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_DSI_CM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_DSI_CM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
deleted file mode 100644
index 59d16a459..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
deleted file mode 100644
index 8751af145..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
deleted file mode 100644
index fe01d0a37..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
deleted file mode 100644
index d4629e2b7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
deleted file mode 100644
index de91d35b4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1 b/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
deleted file mode 100644
index 9a503f8e7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC b/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC
deleted file mode 100644
index 19e7aedf6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_TILCDC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT b/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT
deleted file mode 100644
index a6818d45b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_TILCDC_SLAVE_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
deleted file mode 100644
index 49177a6db..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_IPQ806X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI
deleted file mode 100644
index b0da5ddbc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS b/baseconfig/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS
deleted file mode 100644
index 01b6ce8d4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_EDAC_SYNOPSYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_SYNOPSYS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON b/baseconfig/arm/armv7/armv7/CONFIG_EXTCON
deleted file mode 100644
index bde29bcfc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_PALMAS
deleted file mode 100644
index 9d44d9149..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_PALMAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC b/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC
deleted file mode 100644
index b52487909..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_EXTCON_QCOM_SPMI_MISC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_QCOM_SPMI_MISC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_IMX b/baseconfig/arm/armv7/armv7/CONFIG_FB_IMX
deleted file mode 100644
index 3b317d265..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_IMX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_IMX is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_MX3 b/baseconfig/arm/armv7/armv7/CONFIG_FB_MX3
deleted file mode 100644
index 71d6457ed..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_MX3
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_MX3 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FB_MXS b/baseconfig/arm/armv7/armv7/CONFIG_FB_MXS
deleted file mode 100644
index d179e9f9d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FB_MXS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_MXS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FEC b/baseconfig/arm/armv7/armv7/CONFIG_FEC
deleted file mode 100644
index 0791662d1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FEC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO b/baseconfig/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO
deleted file mode 100644
index f7952819a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FSL_PQ_MDIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_PQ_MDIO is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO b/baseconfig/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO
deleted file mode 100644
index 9113f3294..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_FSL_XGMAC_MDIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_XGMAC_MDIO is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GIANFAR b/baseconfig/arm/armv7/armv7/CONFIG_GIANFAR
deleted file mode 100644
index 9227c7a80..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GIANFAR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GIANFAR is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9052
deleted file mode 100644
index 5cf28e3da..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9055 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9055
deleted file mode 100644
index 297dfa4df..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_DA9055=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_OMAP
deleted file mode 100644
index 7c593d352..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_OMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_PALMAS
deleted file mode 100644
index 3d3301bcf..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_PALMAS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_STMPE b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_STMPE
deleted file mode 100644
index 14d1708e2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_STMPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_STMPE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
deleted file mode 100644
index 0b01e2387..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_TPS65218=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS6586X b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
deleted file mode 100644
index c8f2da811..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_TPS6586X=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4800 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4800
deleted file mode 100644
index a0d83a680..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4800
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_TS4800=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
deleted file mode 100644
index 0104290a1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_TS4900 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL4030
deleted file mode 100644
index fc3bcf854..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL6040 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL6040
deleted file mode 100644
index 9a0126117..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TWL6040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_TWL6040=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_XILINX
deleted file mode 100644
index 654c7ea7f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_XILINX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_ZYNQ b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_ZYNQ
deleted file mode 100644
index 2f9ba2067..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_ZYNQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_ZYNQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GS_FPGABOOT b/baseconfig/arm/armv7/armv7/CONFIG_GS_FPGABOOT
deleted file mode 100644
index 68aef042b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_GS_FPGABOOT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GS_FPGABOOT=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP
deleted file mode 100644
index a51d799ba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HDQ_MASTER_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HDQ_MASTER_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HUGETLB_PAGE b/baseconfig/arm/armv7/armv7/CONFIG_HUGETLB_PAGE
deleted file mode 100644
index bea38c303..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HUGETLB_PAGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HUGETLB_PAGE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP
deleted file mode 100644
index 869da47ed..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HWSPINLOCK_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM
deleted file mode 100644
index 5dfdf858e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HWSPINLOCK_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HWSPINLOCK_QCOM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
deleted file mode 100644
index b95d5cb24..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_MSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA
deleted file mode 100644
index 22e8ad7fc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_MXC_RNGA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_MXC_RNGA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP
deleted file mode 100644
index cf37a6e35..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM
deleted file mode 100644
index b2145880d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_OMAP3_ROM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_OMAP3_ROM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
deleted file mode 100644
index e908df516..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE b/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
deleted file mode 100644
index 8e1eefa5c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_CADENCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX b/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX
deleted file mode 100644
index 295dda355..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C b/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
deleted file mode 100644
index 2d866d55f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_IMX_LPI2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_I2C_OMAP
deleted file mode 100644
index 7d49cccbd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_OMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_QUP b/baseconfig/arm/armv7/armv7/CONFIG_I2C_QUP
deleted file mode 100644
index 7fb7cd350..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_QUP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_QUP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST b/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST
deleted file mode 100644
index dac85894e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_I2C_XILINX
deleted file mode 100644
index c2bfd9c5e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_XILINX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX2_WDT b/baseconfig/arm/armv7/armv7/CONFIG_IMX2_WDT
deleted file mode 100644
index bf5eaba02..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX2_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX2_WDT=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX7D_ADC b/baseconfig/arm/armv7/armv7/CONFIG_IMX7D_ADC
deleted file mode 100644
index 00e36d3d8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX7D_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX7D_ADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS b/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
deleted file mode 100644
index 33e5c6a93..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX7_PM_DOMAINS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_DMA b/baseconfig/arm/armv7/armv7/CONFIG_IMX_DMA
deleted file mode 100644
index 47814badb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_DMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_GPCV2 b/baseconfig/arm/armv7/armv7/CONFIG_IMX_GPCV2
deleted file mode 100644
index af127227d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_GPCV2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_GPCV2=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE b/baseconfig/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE
deleted file mode 100644
index 070060333..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_IPUV3_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_IPUV3_CORE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
deleted file mode 100644
index 53983d8af..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_SDMA b/baseconfig/arm/armv7/armv7/CONFIG_IMX_SDMA
deleted file mode 100644
index 6f1c8b431..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_SDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_SDMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_IMX_THERMAL
deleted file mode 100644
index 9720f0876..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_THERMAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_WEIM b/baseconfig/arm/armv7/armv7/CONFIG_IMX_WEIM
deleted file mode 100644
index 051fd96c3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IMX_WEIM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IMX_WEIM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY
deleted file mode 100644
index 20510b969..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_88PM80X_ONKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_88PM80X_ONKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY
deleted file mode 100644
index 3e92ddfa6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9052_ONKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_DA9052_ONKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY
deleted file mode 100644
index 46198e804..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_DA9055_ONKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_DA9055_ONKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP
deleted file mode 100644
index 8dbcc42bb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_MATRIXKMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_MATRIXKMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON
deleted file mode 100644
index 001a8cf96..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PALMAS_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PALMAS_PWRBUTTON=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY
deleted file mode 100644
index a591c1274..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8941_PWRKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PM8941_PWRKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR
deleted file mode 100644
index 2a1af2b4e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PM8XXX_VIBRATOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PM8XXX_VIBRATOR=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY
deleted file mode 100644
index f14705e77..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PMIC8XXX_PWRKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PMIC8XXX_PWRKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER
deleted file mode 100644
index 59fdb225d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_PWM_BEEPER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PWM_BEEPER=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
deleted file mode 100644
index 1f55158fa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON
deleted file mode 100644
index 8dbe98c01..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA
deleted file mode 100644
index 10c5c90f2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL4030_VIBRA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_TWL4030_VIBRA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA b/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA
deleted file mode 100644
index 6708e39c6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_INPUT_TWL6040_VIBRA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_TWL6040_VIBRA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IR_RX51 b/baseconfig/arm/armv7/armv7/CONFIG_IR_RX51
deleted file mode 100644
index e671fe0a5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_IR_RX51
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IR_RX51 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_IMX b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_IMX
deleted file mode 100644
index ef9fc6544..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC
deleted file mode 100644
index b261424ef..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_NVEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_NVEC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4 b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4
deleted file mode 100644
index 565ca1c01..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_OMAP4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_OMAP4=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX
deleted file mode 100644
index 6f1ac5483..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PMIC8XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_PMIC8XXX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x
deleted file mode 100644
index c7122eaaa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_PXA27x
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_PXA27x=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG
deleted file mode 100644
index 9aeb2d31a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SAMSUNG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_SAMSUNG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY
deleted file mode 100644
index 3e207e298..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_SNVS_PWRKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_SNVS_PWRKEY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
deleted file mode 100644
index ee2c5bbb8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_STMPE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
deleted file mode 100644
index 5ad9d0409..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_ST_KEYSCAN=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030
deleted file mode 100644
index a36fb019e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG b/baseconfig/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG
deleted file mode 100644
index 0922ca2f1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_LATTICE_ECP3_CONFIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LATTICE_ECP3_CONFIG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_DA9052
deleted file mode 100644
index 44159d0bc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_MC13783 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_MC13783
deleted file mode 100644
index 7d9f3bd9c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_MC13783
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_MC13783=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
deleted file mode 100644
index 301ef0606..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_PM8058=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_TCA6507 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_TCA6507
deleted file mode 100644
index 22d416949..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_TCA6507
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_TCA6507=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE b/baseconfig/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE
deleted file mode 100644
index 3d59e384c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_BROWNSTONE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_BROWNSTONE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_FLINT b/baseconfig/arm/armv7/armv7/CONFIG_MACH_FLINT
deleted file mode 100644
index c874cd628..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_FLINT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_FLINT is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER b/baseconfig/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER
deleted file mode 100644
index f70d80426..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MARVELL_JASPER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_MARVELL_JASPER is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MMP2_DT b/baseconfig/arm/armv7/armv7/CONFIG_MACH_MMP2_DT
deleted file mode 100644
index 523a4bfcc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_MMP2_DT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACH_MMP2_DT=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM b/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM
deleted file mode 100644
index 044901e6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3517EVM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_OMAP3517EVM is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA b/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA
deleted file mode 100644
index b9ee3458a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP3_PANDORA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_OMAP3_PANDORA is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP b/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP
deleted file mode 100644
index e35637633..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_OMAP_LDP is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN4I b/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN4I
deleted file mode 100644
index 3fe5f88b6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN4I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACH_SUN4I=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN5I b/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN5I
deleted file mode 100644
index 28d69ce87..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_SUN5I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACH_SUN5I=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MDM_GCC_9615 b/baseconfig/arm/armv7/armv7/CONFIG_MDM_GCC_9615
deleted file mode 100644
index 4d972aff3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MDM_GCC_9615
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MDM_GCC_9615 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MDM_LCC_9615 b/baseconfig/arm/armv7/armv7/CONFIG_MDM_LCC_9615
deleted file mode 100644
index 72f159f99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MDM_LCC_9615
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MDM_LCC_9615 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM800 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM800
deleted file mode 100644
index 98ea8db42..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM800
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_88PM800=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM805 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM805
deleted file mode 100644
index c1de4af44..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_88PM805
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_88PM805=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C b/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C
deleted file mode 100644
index e40ccb3b9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_DA9052_I2C=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI b/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI
deleted file mode 100644
index 9f420ba7c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9052_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_DA9052_SPI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9055 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9055
deleted file mode 100644
index eacc445e1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_DA9055=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MAX8907 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_MAX8907
deleted file mode 100644
index 2876fad5a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MAX8907
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_MAX8907=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI b/baseconfig/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI
deleted file mode 100644
index 814896865..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_MC13XXX_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_MC13XXX_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_NVEC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_NVEC
deleted file mode 100644
index 4c63032da..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_NVEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_NVEC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST b/baseconfig/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST
deleted file mode 100644
index 8150f987a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_OMAP_USB_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_OMAP_USB_HOST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_MFD_PALMAS
deleted file mode 100644
index 27f2b3a1f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PALMAS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8XXX b/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8XXX
deleted file mode 100644
index c20d0cb19..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PM8XXX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM b/baseconfig/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM
deleted file mode 100644
index d88a4c4c7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_QCOM_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_QCOM_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
deleted file mode 100644
index 6360fee39..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_STMPE b/baseconfig/arm/armv7/armv7/CONFIG_MFD_STMPE
deleted file mode 100644
index a076cddc3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_STMPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_STMPE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_T7L66XB b/baseconfig/arm/armv7/armv7/CONFIG_MFD_T7L66XB
deleted file mode 100644
index 6fe775b4f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_T7L66XB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_T7L66XB=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TC6387XB b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TC6387XB
deleted file mode 100644
index cf7da4bfb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TC6387XB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TC6387XB=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC
deleted file mode 100644
index 7db3d8445..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_AM335X_TSCADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TI_AM335X_TSCADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65217 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65217
deleted file mode 100644
index 54a061854..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TPS65217=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65218 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65218
deleted file mode 100644
index 86e28df2f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS65218
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TPS65218=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS6586X b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS6586X
deleted file mode 100644
index a7745c769..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS6586X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TPS6586X=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS80031 b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS80031
deleted file mode 100644
index e9113ef67..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TPS80031
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_TPS80031=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_MXC b/baseconfig/arm/armv7/armv7/CONFIG_MMC_MXC
deleted file mode 100644
index 2d42c24fc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_MXC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_MXC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_MMC_OMAP
deleted file mode 100644
index cc3c5a021..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML b/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
deleted file mode 100644
index 48facf367..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_QCOM_DML=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX
deleted file mode 100644
index 2749f16b8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_ESDHC_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM
deleted file mode 100644
index 512d452ed..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_MSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
deleted file mode 100644
index 40e2f68cb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_OF_ESDHC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2 b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2
deleted file mode 100644
index 0572be193..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_PXAV2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_PXAV2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
deleted file mode 100644
index 4a513a669..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMP_PDMA b/baseconfig/arm/armv7/armv7/CONFIG_MMP_PDMA
deleted file mode 100644
index 8b95d78fe..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMP_PDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMP_PDMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMP_TDMA b/baseconfig/arm/armv7/armv7/CONFIG_MMP_TDMA
deleted file mode 100644
index c3ea0d888..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMP_TDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMP_TDMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
deleted file mode 100644
index 9effe8611..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_GCC_8660=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8916 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8916
deleted file mode 100644
index f65dc3662..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8916
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MSM_GCC_8916 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
deleted file mode 100644
index 03ba44b34..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_GCC_8960=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
deleted file mode 100644
index 8ffbd8055..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_GCC_8974=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
deleted file mode 100644
index 4b01d318d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_GCC_8996=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_IOMMU b/baseconfig/arm/armv7/armv7/CONFIG_MSM_IOMMU
deleted file mode 100644
index e07f46220..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MSM_IOMMU is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_LCC_8960 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_LCC_8960
deleted file mode 100644
index 696554428..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_LCC_8960
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MSM_LCC_8960 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8960 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8960
deleted file mode 100644
index c2ccb9997..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_MMCC_8960=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8974 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8974
deleted file mode 100644
index 04b9f7550..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8974
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_MMCC_8974=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8996 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8996
deleted file mode 100644
index e40293af5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_MMCC_8996
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSM_MMCC_8996=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND b/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND
deleted file mode 100644
index 6fd7c9ccd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_GPMI_NAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_GPMI_NAND=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2 b/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2
deleted file mode 100644
index ad5a64465..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_OMAP2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH b/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH
deleted file mode 100644
index 88fc10255..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_OMAP_BCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_OMAP_BCH=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM
deleted file mode 100644
index 819bf21fd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_NAND_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_QCOM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2 b/baseconfig/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2
deleted file mode 100644
index 0d7647896..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MTD_ONENAND_OMAP2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_ONENAND_OMAP2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU b/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU
deleted file mode 100644
index 523f19699..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MX3_IPU is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS b/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS
deleted file mode 100644
index b337babb8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MX3_IPU_IRQS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MX3_IPU_IRQS is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD b/baseconfig/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD
deleted file mode 100644
index 137ef475f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MXC_DEBUG_BOARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MXC_DEBUG_BOARD is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MXS_DMA b/baseconfig/arm/armv7/armv7/CONFIG_MXS_DMA
deleted file mode 100644
index f423496a4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MXS_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MXS_DMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE b/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE
deleted file mode 100644
index 2ac235a8e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_FREESCALE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NET_VENDOR_FREESCALE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
deleted file mode 100644
index 46ccaba73..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NET_VENDOR_XILINX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NFC_WILINK b/baseconfig/arm/armv7/armv7/CONFIG_NFC_WILINK
deleted file mode 100644
index fd087e25f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NFC_WILINK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFC_WILINK=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_PAZ00 b/baseconfig/arm/armv7/armv7/CONFIG_NVEC_PAZ00
deleted file mode 100644
index 74258488a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_PAZ00
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVEC_PAZ00=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_POWER b/baseconfig/arm/armv7/armv7/CONFIG_NVEC_POWER
deleted file mode 100644
index 8aa895d46..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVEC_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVEC_POWER=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP b/baseconfig/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
deleted file mode 100644
index b5e278063..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVMEM_IMX_OCOTP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX
deleted file mode 100644
index 58f6d5fee..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2PLUS_MBOX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2PLUS_MBOX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS
deleted file mode 100644
index 3f2725c06..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
deleted file mode 100644
index 17a1805f3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG
deleted file mode 100644
index 8b8ba13e8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP2_DSS_DEBUG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS
deleted file mode 100644
index d60f0708f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI
deleted file mode 100644
index b8eceeafb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_DPI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI
deleted file mode 100644
index f1114bc76..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_DSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_DSI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
deleted file mode 100644
index 534b6bde0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI
deleted file mode 100644
index d8195c366..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_RFBI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_RFBI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI
deleted file mode 100644
index 5114208ee..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SDI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_SDI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
deleted file mode 100644
index cb20af7dd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC
deleted file mode 100644
index 0c33d2d2c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_DSS_VENC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_DSS_VENC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_VRFB b/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_VRFB
deleted file mode 100644
index 1158d7440..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP2_VRFB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP2_VRFB=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE b/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
deleted file mode 100644
index 6d1fe4d03..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING b/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING
deleted file mode 100644
index 8d4c34773..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP3_SDRC_AC_TIMING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP3_SDRC_AC_TIMING is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI
deleted file mode 100644
index 65e7cde52..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_DSS_HDMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP4_DSS_HDMI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_THERMAL
deleted file mode 100644
index e4667306d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP4_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP4_THERMAL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI b/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI
deleted file mode 100644
index a5b8e7897..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_DSS_HDMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP5_DSS_HDMI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819 b/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819
deleted file mode 100644
index c40e91ac8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_ERRATA_801819
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP5_ERRATA_801819=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_THERMAL
deleted file mode 100644
index 3cb93da28..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP5_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP5_THERMAL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER
deleted file mode 100644
index f1169a7ac..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_32K_TIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_32K_TIMER=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY
deleted file mode 100644
index 3d903235a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_CONTROL_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_CONTROL_PHY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT
deleted file mode 100644
index 52c0fedd9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_INTERCONNECT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_INTERCONNECT=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU
deleted file mode 100644
index fcac8d138..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_IOMMU=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG
deleted file mode 100644
index b8525c479..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_IOMMU_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP_IOMMU_DEBUG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE
deleted file mode 100644
index 14bbf7fbb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MBOX_KFIFO_SIZE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX
deleted file mode 100644
index ac0115315..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_MUX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
deleted file mode 100644
index b6c2ad2cf..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_MUX_WARNINGS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP
deleted file mode 100644
index 1f6d1c274..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_OCP2SCP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_OCP2SCP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB
deleted file mode 100644
index 48ad9270c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CBB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_PACKAGE_CBB=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS
deleted file mode 100644
index 080c7a94b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_PACKAGE_CUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_PACKAGE_CUS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC
deleted file mode 100644
index a757f3837..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_REMOTEPROC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS
deleted file mode 100644
index eac23206d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_RESET_CLOCKS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_RESET_CLOCKS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_USB2 b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_USB2
deleted file mode 100644
index 83f69e987..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_USB2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_USB2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG
deleted file mode 100644
index 420033d44..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PALMAS_GPADC b/baseconfig/arm/armv7/armv7/CONFIG_PALMAS_GPADC
deleted file mode 100644
index 3e8465ae4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PALMAS_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PALMAS_GPADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PATA_IMX b/baseconfig/arm/armv7/armv7/CONFIG_PATA_IMX
deleted file mode 100644
index ea39339ce..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PATA_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_PCIE_QCOM
deleted file mode 100644
index 61886f19a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_QCOM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_PCIE_XILINX
deleted file mode 100644
index e25e6ef81..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCIE_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_XILINX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_IMX6 b/baseconfig/arm/armv7/armv7/CONFIG_PCI_IMX6
deleted file mode 100644
index 8cf6634a2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_IMX6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_IMX6=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_DM816X_USB b/baseconfig/arm/armv7/armv7/CONFIG_PHY_DM816X_USB
deleted file mode 100644
index d226f92a3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_DM816X_USB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PHY_DM816X_USB is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
deleted file mode 100644
index c0b002711..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_MIPHY28LP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
deleted file mode 100644
index b824f4d74..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PHY_MIPHY365X is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA
deleted file mode 100644
index 9549199e7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_APQ8064_SATA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_APQ8064_SATA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
deleted file mode 100644
index cba57faf8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_QMP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
deleted file mode 100644
index 6512e59d2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_QUSB2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
deleted file mode 100644
index 936bcab6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_UFS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
deleted file mode 100644
index 61e98f856..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_USB_HS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
deleted file mode 100644
index 0b25aa233..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_USB_HSIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB b/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
deleted file mode 100644
index 62d71519e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_STIH407_USB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB b/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
deleted file mode 100644
index 65f0bc9b7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PHY_STIH41X_USB is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064
deleted file mode 100644
index d9ef7c187..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8064
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_APQ8064=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084
deleted file mode 100644
index 86b266746..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_APQ8084
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_APQ8084=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL
deleted file mode 100644
index d4f25f735..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_IMX6SL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_IMX6SL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660
deleted file mode 100644
index ba1fac392..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8660
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_MSM8660=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916
deleted file mode 100644
index 939f6b4eb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8916
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_MSM8916=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960
deleted file mode 100644
index d3310f251..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_MSM8960=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74 b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74
deleted file mode 100644
index e711e6d38..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_MSM8X74
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_MSM8X74=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS
deleted file mode 100644
index fa7630ca2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_PALMAS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC
deleted file mode 100644
index 42b81a044..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SPMI_PMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC
deleted file mode 100644
index f5aefcc3a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_QCOM_SSBI_PMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ b/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ
deleted file mode 100644
index 00e9d8a2d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PINCTRL_ZYNQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_ZYNQ=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS b/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS
deleted file mode 100644
index f58c71a0d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_AVS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP
deleted file mode 100644
index d5eb6401e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_AVS_OMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3 b/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3
deleted file mode 100644
index a0d5a2082..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_AVS_OMAP_CLASS3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_AVS_OMAP_CLASS3=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
deleted file mode 100644
index 25d1d5570..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_IMX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_MSM b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_MSM
deleted file mode 100644
index a7db0a2e3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_MSM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST
deleted file mode 100644
index e14ee1ac1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_ST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_IMX b/baseconfig/arm/armv7/armv7/CONFIG_PWM_IMX
deleted file mode 100644
index 693d520a6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER b/baseconfig/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER
deleted file mode 100644
index 2a71f21e9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_OMAP_DMTIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_OMAP_DMTIMER=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI b/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI
deleted file mode 100644
index 8aaff84cb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STMPE b/baseconfig/arm/armv7/armv7/CONFIG_PWM_STMPE
deleted file mode 100644
index 4c2b7c562..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STMPE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PWM_STMPE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIECAP b/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIECAP
deleted file mode 100644
index 84f1e9b57..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIECAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_TIECAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM b/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM
deleted file mode 100644
index 412fe4734..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIEHRPWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_TIEHRPWM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIPWMSS b/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIPWMSS
deleted file mode 100644
index c90d79f1b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TIPWMSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_TIPWMSS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL b/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL
deleted file mode 100644
index 06b68be28..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_TWL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL_LED b/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL_LED
deleted file mode 100644
index 937abc81d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PWM_TWL_LED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_TWL_LED=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PXA_DMA b/baseconfig/arm/armv7/armv7/CONFIG_PXA_DMA
deleted file mode 100644
index 6497f852a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PXA_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PXA_DMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
deleted file mode 100644
index 0aa258124..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_ADSP_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC
deleted file mode 100644
index f8a0514ba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_APCS_IPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_APCS_IPC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA
deleted file mode 100644
index 194583213..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_BAM_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_BAM_DMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
deleted file mode 100644
index 5650c8603..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_CLK_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
deleted file mode 100644
index d355533c9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_CLK_SMD_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_CLK_SMD_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_COINCELL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_COINCELL
deleted file mode 100644
index 6b43aa0aa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_COINCELL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_COINCELL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_GSBI b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_GSBI
deleted file mode 100644
index 1fa5a5f73..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_GSBI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_GSBI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU
deleted file mode 100644
index b7e99b882..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_IOMMU=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_PM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_PM
deleted file mode 100644
index 6089674be..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_PM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_PM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
deleted file mode 100644
index 18d8fb792..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_Q6V5_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_QFPROM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_QFPROM
deleted file mode 100644
index 9df0fc659..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_QFPROM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_QFPROM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM
deleted file mode 100644
index 4610581b9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SMD_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMEM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMEM
deleted file mode 100644
index f91ef8cda..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SMEM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMP2P b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMP2P
deleted file mode 100644
index 5fa221f74..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMP2P
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SMP2P=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMSM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMSM
deleted file mode 100644
index 210a649f7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SMSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC
deleted file mode 100644
index d8601ce79..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_IADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SPMI_IADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
deleted file mode 100644
index 7155372b9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SPMI_TEMP_ALARM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC
deleted file mode 100644
index fcc1196df..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_VADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SPMI_VADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
deleted file mode 100644
index 0d43fc907..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_TSENS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_TSENS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL
deleted file mode 100644
index e5469ca8a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_CTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_WCNSS_CTRL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
deleted file mode 100644
index b13cefb38..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_WCNSS_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WDT b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WDT
deleted file mode 100644
index e4c7f9d37..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_WDT=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RC_ST b/baseconfig/arm/armv7/armv7/CONFIG_RC_ST
deleted file mode 100644
index 878dd631d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RC_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RC_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI b/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI
deleted file mode 100644
index 0c319596b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_SPMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_88PM800 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
deleted file mode 100644
index 68e334db0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_88PM800 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_AD5398 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_AD5398
deleted file mode 100644
index 50bafa94c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_AD5398
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_AD5398=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP
deleted file mode 100644
index 14c5f9e64..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_ANATOP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9052
deleted file mode 100644
index 4248a9686..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9055 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9055
deleted file mode 100644
index 5fe95389b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_DA9055=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A
deleted file mode 100644
index 12da84ace..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL6271A
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_ISL6271A=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305
deleted file mode 100644
index 6c9699328..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_ISL9305
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_ISL9305=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3971 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3971
deleted file mode 100644
index c122849bb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3971
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_LP3971=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3972 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3972
deleted file mode 100644
index 32cc87cd5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP3972
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_LP3972=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP872X b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP872X
deleted file mode 100644
index a826923d4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP872X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_LP872X=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP8755 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP8755
deleted file mode 100644
index 12816a7af..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LP8755
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_LP8755=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586
deleted file mode 100644
index 45b6c017d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX1586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX1586=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649
deleted file mode 100644
index 204519196..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8649
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX8649=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660
deleted file mode 100644
index 628f64fea..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8660
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX8660=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907
deleted file mode 100644
index 9f4e534f1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8907
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX8907=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
deleted file mode 100644
index 7998d5171..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX8952=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13783 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13783
deleted file mode 100644
index bd16e10fc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13783
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MC13783=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13892 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13892
deleted file mode 100644
index 9a3725de3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_MC13892
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MC13892=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS
deleted file mode 100644
index 4a99c54ad..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_PALMAS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS
deleted file mode 100644
index 062775d51..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_PBIAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_PBIAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM
deleted file mode 100644
index 3d002cac5..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_QCOM_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM
deleted file mode 100644
index aae961c4b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SMD_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI
deleted file mode 100644
index c83be7aec..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_QCOM_SPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_QCOM_SPMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB
deleted file mode 100644
index a602d1ebe..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TI_ABB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_TI_ABB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
deleted file mode 100644
index 1843491ff..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_TPS65217=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218
deleted file mode 100644
index 0e50c0d6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TPS65218
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_TPS65218=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030
deleted file mode 100644
index 63a8298e7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_TWL4030=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_REMOTEPROC
deleted file mode 100644
index 5a1f9df99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REMOTEPROC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
deleted file mode 100644
index 7cc8785d0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RPMSG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM
deleted file mode 100644
index 1f5ac58f2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_GLINK_RPM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
deleted file mode 100644
index f65af3d10..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RPMSG_QCOM_SMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052
deleted file mode 100644
index a8ee59bd3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055
deleted file mode 100644
index 10c253c41..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_DA9055=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI
deleted file mode 100644
index 8e6794d69..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_IMXDI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907
deleted file mode 100644
index 32524a0b2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MAX8907
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_MAX8907=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX
deleted file mode 100644
index c73110af7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MC13XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_MC13XXX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC
deleted file mode 100644
index f1a8235ba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_MXC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
deleted file mode 100644
index 479a6f546..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS
deleted file mode 100644
index e25c3751b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PALMAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_PALMAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX
deleted file mode 100644
index adc778ea4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_PM8XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_PM8XXX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
deleted file mode 100644
index bb8eb9dbc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_SNVS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
deleted file mode 100644
index 548d6d6c9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_ST_LPC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X
deleted file mode 100644
index ef916c3f0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TPS6586X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_TPS6586X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
deleted file mode 100644
index 5716e825c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330
deleted file mode 100644
index f03e88ba7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_TWL92330
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RTC_DRV_TWL92330 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC b/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC
deleted file mode 100644
index 3e6e37f9b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9052_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_DA9052_ADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9055 b/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9055
deleted file mode 100644
index 5e09d8397..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_DA9055=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC b/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC
deleted file mode 100644
index 5dfec60f3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_MC13783_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_MC13783_ADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC b/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC
deleted file mode 100644
index f1ce2d798..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SENSORS_TWL4030_MADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_TWL4030_MADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
deleted file mode 100644
index 582053b2d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_8250_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX
deleted file mode 100644
index ce6d59eca..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_IMX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE
deleted file mode 100644
index c2858836b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM
deleted file mode 100644
index d9bd71619..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_MSM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE
deleted file mode 100644
index 5aeaebb23..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_MSM_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_MSM_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
deleted file mode 100644
index 0dbd205b2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_OMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
deleted file mode 100644
index 84ab44f7f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_OMAP_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA
deleted file mode 100644
index 9e51d92bb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_PXA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
deleted file mode 100644
index 66ca5b372..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE
deleted file mode 100644
index c9a206329..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_UARTLITE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE
deleted file mode 100644
index c96e01c72..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
deleted file mode 100644
index 37161086e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_UARTLITE_NR_UARTS=1
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART
deleted file mode 100644
index 96b1d5471..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_XILINX_PS_UART=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
deleted file mode 100644
index 6bf59901d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2 b/baseconfig/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2
deleted file mode 100644
index f4da02ef8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_NVEC_PS2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIO_NVEC_PS2=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP b/baseconfig/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP
deleted file mode 100644
index dd4081561..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIO_OLPC_APSP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIO_OLPC_APSP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM b/baseconfig/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM
deleted file mode 100644
index fff102371..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_AM33XX_SOC_EVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_AM33XX_SOC_EVM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC
deleted file mode 100644
index 13c20145f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_DAVINCI_SOC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM b/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM
deleted file mode 100644
index ba82d0346..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_GENERIC_EVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S b/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S
deleted file mode 100644
index 2ae9b1146..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_I2S
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_DAVINCI_SOC_I2S=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP b/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP
deleted file mode 100644
index 1c9fa3a1b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_MCASP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_DAVINCI_SOC_MCASP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF b/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF
deleted file mode 100644
index 71efbe513..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_DAVINCI_SOC_VCIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_DAVINCI_SOC_VCIF=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_EDMA_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_EDMA_SOC
deleted file mode 100644
index fcca70a99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_EDMA_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_EDMA_SOC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_IMX_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_IMX_SOC
deleted file mode 100644
index 25cc80938..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_IMX_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_IMX_SOC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_MMP_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_MMP_SOC
deleted file mode 100644
index 7efe5db08..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_MMP_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_MMP_SOC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC
deleted file mode 100644
index 17faba2a6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM
deleted file mode 100644
index 048070caa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_AM3517EVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_AM3517EVM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC
deleted file mode 100644
index 475fdbc0b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_DMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_DMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO
deleted file mode 100644
index eb05b9ab4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_HDMI_AUDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP
deleted file mode 100644
index 28851f4fd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCBSP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_MCBSP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM
deleted file mode 100644
index 1f83faa0c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_MCPDM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_MCPDM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA
deleted file mode 100644
index ad6986bc7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP3_PANDORA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040 b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040
deleted file mode 100644
index b43e28027..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030
deleted file mode 100644
index e6b46c847..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_OMAP_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51 b/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51
deleted file mode 100644
index 78b45c501..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_OMAP_SOC_RX51
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_OMAP_SOC_RX51=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_PXA910_SOC b/baseconfig/arm/armv7/armv7/CONFIG_SND_PXA910_SOC
deleted file mode 100644
index 882e1d892..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_PXA910_SOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_PXA910_SOC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI
deleted file mode 100644
index c780ceef1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ADI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S
deleted file mode 100644
index 9519f2d73..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_I2S
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ADI_AXI_I2S=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF
deleted file mode 100644
index bd4f2465d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ADI_AXI_SPDIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ADI_AXI_SPDIF=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C
deleted file mode 100644
index f5db15237..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_CS42XX8_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_CS42XX8_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320
deleted file mode 100644
index 318aa6c9f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_EUKREA_TLV320
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_EUKREA_TLV320=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD
deleted file mode 100644
index 8c6673b1c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_ASOC_CARD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC
deleted file mode 100644
index 157167b9e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_ASRC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI
deleted file mode 100644
index 4afe3edee..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_ESAI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI
deleted file mode 100644
index ccf4345c2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_SAI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF
deleted file mode 100644
index 9c1123316..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_SPDIF=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI
deleted file mode 100644
index 175877081..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_SSI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS
deleted file mode 100644
index 4a976f56b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_FSL_UTILS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI
deleted file mode 100644
index 58cf24a3c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_I2C_AND_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_I2C_AND_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
deleted file mode 100644
index efa06fed2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_AUDMUX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328
deleted file mode 100644
index 04b56d426..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_ES8328
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_ES8328=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783
deleted file mode 100644
index 6f74ac751..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_MC13783
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_MC13783=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA
deleted file mode 100644
index fd13aa0c9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_PCM_DMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ
deleted file mode 100644
index e91b185bd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_PCM_FIQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_PCM_FIQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
deleted file mode 100644
index 9bc19346c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_SGTL5000=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
deleted file mode 100644
index 58a211e43..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_SPDIF=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI
deleted file mode 100644
index 39e51be10..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_SSI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
deleted file mode 100644
index f9530246c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_WM8962=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU
deleted file mode 100644
index 8ba1b4be9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_CPU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_LPASS_CPU=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM
deleted file mode 100644
index f5837c9c1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_LPASS_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
deleted file mode 100644
index f862f05a7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
deleted file mode 100644
index db12f036e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_QCOM
deleted file mode 100644
index 719eb4e3d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_QCOM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI
deleted file mode 100644
index af73428f9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
deleted file mode 100644
index 99ae102fc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_STI_SAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STORM b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STORM
deleted file mode 100644
index 4c4eca4d4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_STORM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632
deleted file mode 100644
index 2ccf32e1f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_ALC5632
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TEGRA_ALC5632=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE
deleted file mode 100644
index 2100fada9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_TRIMSLICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903
deleted file mode 100644
index 5065d5de3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8903
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TEGRA_WM8903=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712
deleted file mode 100644
index fbac8d716..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM9712
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TEGRA_WM9712=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23
deleted file mode 100644
index 6f39daa7e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TLV320AIC23=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C
deleted file mode 100644
index f131b6f76..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI
deleted file mode 100644
index 312955e99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC23_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TLV320AIC23_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX
deleted file mode 100644
index d358e546f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC31XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TLV320AIC31XX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X
deleted file mode 100644
index 2c862d8c0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TLV320AIC3X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TLV320AIC3X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030
deleted file mode 100644
index 1a24fef50..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL4030
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TWL4030=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040
deleted file mode 100644
index e9faf5d6f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TWL6040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TWL6040=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8731 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8731
deleted file mode 100644
index be7329279..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8731
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8731=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8753 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8753
deleted file mode 100644
index 82e701fd1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8753
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8753=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8903 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8903
deleted file mode 100644
index 2961dcc76..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8903
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8903=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
deleted file mode 100644
index 8a053dc4d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8960=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8962 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
deleted file mode 100644
index cfebf5ded..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8962=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM33XX b/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM33XX
deleted file mode 100644
index 2fa1847aa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM33XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_AM33XX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM43XX b/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM43XX
deleted file mode 100644
index 18d0e25c0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_AM43XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_AM43XX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212
deleted file mode 100644
index a38749ca6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4212
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_EXYNOS4212=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412
deleted file mode 100644
index 5de6d0908..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4412
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_EXYNOS4412=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415
deleted file mode 100644
index 47e0f5b97..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_EXYNOS4415
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_EXYNOS4415=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER b/baseconfig/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER
deleted file mode 100644
index bccf956d9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_HAS_REALTIME_COUNTER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_HAS_REALTIME_COUNTER=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX50 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX50
deleted file mode 100644
index 2c6280123..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX50
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX50=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX51 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX51
deleted file mode 100644
index ab614614c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX51
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX51=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX53 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX53
deleted file mode 100644
index 4253c2b9c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX53
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX53=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6
deleted file mode 100644
index 8b1fd41fe..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX6=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6Q b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6Q
deleted file mode 100644
index 9c1774537..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6Q
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX6Q=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SL b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SL
deleted file mode 100644
index 0cc25f1c2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX6SL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SX b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SX
deleted file mode 100644
index 922a55b0e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6SX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX6SX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6UL b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6UL
deleted file mode 100644
index 18a700196..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX6UL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX6UL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX7D b/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX7D
deleted file mode 100644
index 8b8a1ae2d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_IMX7D
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_IMX7D=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_LS1021A b/baseconfig/arm/armv7/armv7/CONFIG_SOC_LS1021A
deleted file mode 100644
index 3df043f0c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_LS1021A
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_LS1021A is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP3430 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP3430
deleted file mode 100644
index 5cbc6aca9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP3430
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_OMAP3430=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP5 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP5
deleted file mode 100644
index dab53582a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_OMAP5
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_OMAP5=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407
deleted file mode 100644
index e1a2ca5a6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_STIH407=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415
deleted file mode 100644
index 41502f339..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_STIH415 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416
deleted file mode 100644
index 9835ddfc1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_STIH416 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_TI81XX b/baseconfig/arm/armv7/armv7/CONFIG_SOC_TI81XX
deleted file mode 100644
index 255ee768e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_TI81XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOC_TI81XX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_VF610 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_VF610
deleted file mode 100644
index 8a41c0aa0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_VF610
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_VF610 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE b/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
deleted file mode 100644
index 3a8bb168c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_CADENCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_DAVINCI b/baseconfig/arm/armv7/armv7/CONFIG_SPI_DAVINCI
deleted file mode 100644
index fb2368a08..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_DAVINCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_DAVINCI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI b/baseconfig/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI
deleted file mode 100644
index 2eaefc798..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_FSL_QUADSPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_FSL_QUADSPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_IMX b/baseconfig/arm/armv7/armv7/CONFIG_SPI_IMX
deleted file mode 100644
index 9276464a3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_IMX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_MXS b/baseconfig/arm/armv7/armv7/CONFIG_SPI_MXS
deleted file mode 100644
index 49119eb18..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_MXS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_MXS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_OMAP24XX b/baseconfig/arm/armv7/armv7/CONFIG_SPI_OMAP24XX
deleted file mode 100644
index 5d7e38bfc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_OMAP24XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_OMAP24XX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_QUP b/baseconfig/arm/armv7/armv7/CONFIG_SPI_QUP
deleted file mode 100644
index 4cfdd1db0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_QUP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_QUP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4 b/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
deleted file mode 100644
index 87403eb57..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_ST_SSC4=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH b/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH
deleted file mode 100644
index c7e910e18..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SFLASH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_TEGRA20_SFLASH=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK b/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK
deleted file mode 100644
index 3fcd32c7d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TEGRA20_SLINK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_TEGRA20_SLINK=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TI_QSPI b/baseconfig/arm/armv7/armv7/CONFIG_SPI_TI_QSPI
deleted file mode 100644
index 8bcd1efe9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_TI_QSPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_TI_QSPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_SPI_XILINX
deleted file mode 100644
index 9544de35b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_XILINX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPMI b/baseconfig/arm/armv7/armv7/CONFIG_SPMI
deleted file mode 100644
index b340c89e6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB b/baseconfig/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB
deleted file mode 100644
index 813a8d1d9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPMI_MSM_PMIC_ARB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPMI_MSM_PMIC_ARB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX b/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX
deleted file mode 100644
index 60dd9ded6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STI_MBOX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_I2C b/baseconfig/arm/armv7/armv7/CONFIG_STMPE_I2C
deleted file mode 100644
index ae0f5fdc0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STMPE_I2C=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_SPI b/baseconfig/arm/armv7/armv7/CONFIG_STMPE_SPI
deleted file mode 100644
index 7adaed89f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_STMPE_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STMPE_SPI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA b/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA
deleted file mode 100644
index 73c09775d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ST_FDMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
deleted file mode 100644
index 5e0a376a8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ST_LPC_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
deleted file mode 100644
index 73ad95532..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ST_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL
deleted file mode 100644
index 62b32ecb6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ST_THERMAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
deleted file mode 100644
index 22f120d14..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ST_THERMAL_MEMMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
deleted file mode 100644
index 865418b83..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ST_THERMAL_SYSCFG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA20_MC b/baseconfig/arm/armv7/armv7/CONFIG_TEGRA20_MC
deleted file mode 100644
index c627c9d0c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA20_MC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA20_MC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART b/baseconfig/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART
deleted file mode 100644
index 14aac087a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TEGRA_IOMMU_GART
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA_IOMMU_GART=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_ADC081C b/baseconfig/arm/armv7/armv7/CONFIG_TI_ADC081C
deleted file mode 100644
index 53474529a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_ADC081C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_ADC081C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_AM335X_ADC b/baseconfig/arm/armv7/armv7/CONFIG_TI_AM335X_ADC
deleted file mode 100644
index 72f215341..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_AM335X_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_AM335X_ADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPPI41 b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPPI41
deleted file mode 100644
index 666dd68c1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPPI41
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPPI41=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW
deleted file mode 100644
index d8770d1c7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPSW=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_ALE b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
deleted file mode 100644
index 00c8a8700..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_ALE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPSW_ALE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL
deleted file mode 100644
index dd3d67842..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPSW_PHY_SEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPSW_PHY_SEL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
deleted file mode 100644
index f2dd7ea1f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPTS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
deleted file mode 100644
index b81356e32..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_CPTS_MOD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAC7512 b/baseconfig/arm/armv7/armv7/CONFIG_TI_DAC7512
deleted file mode 100644
index 65f1da6ac..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAC7512
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_DAC7512=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA b/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
deleted file mode 100644
index 9501e2333..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_CPDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_DAVINCI_CPDMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC b/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC
deleted file mode 100644
index e262f73ba..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_DAVINCI_EMAC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO b/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO
deleted file mode 100644
index aee3112bc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_DAVINCI_MDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_DAVINCI_MDIO=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF b/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF
deleted file mode 100644
index 95caa8707..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_EMIF=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_PIPE3 b/baseconfig/arm/armv7/armv7/CONFIG_TI_PIPE3
deleted file mode 100644
index 93443fcb0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_PIPE3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_PIPE3=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052 b/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052
deleted file mode 100644
index b535783a4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_DA9052
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOUCHSCREEN_DA9052=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC b/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC
deleted file mode 100644
index c2fa52f20..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_IMX6UL_TSC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE b/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
deleted file mode 100644
index be64613d7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOUCHSCREEN_STMPE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_CORE b/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_CORE
deleted file mode 100644
index 36f230e25..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL4030_CORE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_MADC b/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_MADC
deleted file mode 100644
index eee015d1f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_MADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL4030_MADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_POWER b/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_POWER
deleted file mode 100644
index 357614499..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL4030_POWER=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_USB b/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_USB
deleted file mode 100644
index 4af7e5919..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL4030_USB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG
deleted file mode 100644
index fc6343480..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL4030_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL4030_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_GPADC b/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_GPADC
deleted file mode 100644
index d635f2f49..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL6030_GPADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_USB b/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_USB
deleted file mode 100644
index 393dc0926..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6030_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL6030_USB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TWL6040_CORE b/baseconfig/arm/armv7/armv7/CONFIG_TWL6040_CORE
deleted file mode 100644
index 44aff900b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TWL6040_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TWL6040_CORE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_UIO_PRUSS b/baseconfig/arm/armv7/armv7/CONFIG_UIO_PRUSS
deleted file mode 100644
index f0676cc4e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_UIO_PRUSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UIO_PRUSS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP
deleted file mode 100644
index 266a83b35..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_DWC3_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST b/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST
deleted file mode 100644
index 8c2b8b403..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_DWC3_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP
deleted file mode 100644
index 461fb3344..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_OMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_HCD_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
deleted file mode 100644
index 7f13c6b05..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_HCD_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
deleted file mode 100644
index 7397a0f15..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MXC b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MXC
deleted file mode 100644
index 42bd81e3b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MXC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MXC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_FSL_USB2 b/baseconfig/arm/armv7/armv7/CONFIG_USB_FSL_USB2
deleted file mode 100644
index 1bb9e606c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_FSL_USB2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_FSL_USB2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX b/baseconfig/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX
deleted file mode 100644
index 8479db57e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_GADGET_XILINX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_GADGET_XILINX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_IMX21_HCD b/baseconfig/arm/armv7/armv7/CONFIG_USB_IMX21_HCD
deleted file mode 100644
index 9f1ec8ccd..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_IMX21_HCD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_IMX21_HCD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA b/baseconfig/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA
deleted file mode 100644
index fb617333e..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_INVENTRA_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_INVENTRA_DMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG b/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG
deleted file mode 100644
index 043abcf37..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MSM_OTG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD b/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD
deleted file mode 100644
index e16720b6a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM335X_CHILD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MUSB_AM335X_CHILD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X b/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X
deleted file mode 100644
index e861ad528..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_AM35X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MUSB_AM35X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS b/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS
deleted file mode 100644
index 131bb577c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MUSB_OMAP2PLUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MUSB_OMAP2PLUS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MXS_PHY b/baseconfig/arm/armv7/armv7/CONFIG_USB_MXS_PHY
deleted file mode 100644
index 7cd82a168..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MXS_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MXS_PHY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3 b/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3
deleted file mode 100644
index f4286c5b1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_OMAP3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_OHCI_HCD_OMAP3=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI b/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
deleted file mode 100644
index ac20563d8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_OHCI_HCD_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY b/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
deleted file mode 100644
index 79fac4fdc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_QCOM_8X16_PHY=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA b/baseconfig/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA
deleted file mode 100644
index 49f6c27e8..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_TI_CPPI41_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_TI_CPPI41_DMA=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS b/baseconfig/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
deleted file mode 100644
index ba1d871fc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_V4L_PLATFORM_DRIVERS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_ADP1653 b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_ADP1653
deleted file mode 100644
index fd09e94fa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_ADP1653
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ADP1653=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE
deleted file mode 100644
index 17a6c69ab..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_AM437X_VPFE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_AM437X_VPFE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_CODA b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_CODA
deleted file mode 100644
index 13e238170..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_CODA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_CODA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC
deleted file mode 100644
index c1b306606..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM355_CCDC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_DM355_CCDC is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC
deleted file mode 100644
index cfbe3dcfa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_DM6446_CCDC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_DM6446_CCDC is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
deleted file mode 100644
index 034c99572..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_IMX_VDOA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT
deleted file mode 100644
index 03f7cfb09..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP2_VOUT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_OMAP2_VOUT is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3 b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3
deleted file mode 100644
index d0fd9c978..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_OMAP3=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG
deleted file mode 100644
index f1c2b1856..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP3_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_OMAP3_DEBUG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP4 b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP4
deleted file mode 100644
index dfd5bf1c9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_OMAP4
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_OMAP4 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
deleted file mode 100644
index 5e2512c4c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS
deleted file mode 100644
index 68082fdff..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_VENUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_QCOM_VENUS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
deleted file mode 100644
index 430657aeb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_BDISP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
deleted file mode 100644
index 8bb71fa96..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_DELTA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
deleted file mode 100644
index 0292f4baa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_DELTA_DRIVER=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
deleted file mode 100644
index f847894b9..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_DELTA_MJPEG=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
deleted file mode 100644
index a1d5539f7..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_HDMI_CEC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
deleted file mode 100644
index 7058385d2..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_STI_HVA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
deleted file mode 100644
index 637bf6eb4..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_STI_HVA_DEBUGFS is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_W1_MASTER_MXC b/baseconfig/arm/armv7/armv7/CONFIG_W1_MASTER_MXC
deleted file mode 100644
index 8cca542fa..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_W1_MASTER_MXC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_W1_MASTER_MXC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_IPC b/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
deleted file mode 100644
index fa524826b..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_WKUP_M3_IPC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC b/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
deleted file mode 100644
index e49f0132a..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_WKUP_M3_RPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XEN b/baseconfig/arm/armv7/armv7/CONFIG_XEN
deleted file mode 100644
index f154fee42..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_XEN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_EMACLITE b/baseconfig/arm/armv7/armv7/CONFIG_XILINX_EMACLITE
deleted file mode 100644
index 1737a9867..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_EMACLITE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XILINX_EMACLITE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG
deleted file mode 100644
index bc24257fb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XILINX_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_XADC b/baseconfig/arm/armv7/armv7/CONFIG_XILINX_XADC
deleted file mode 100644
index 53ab8251f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILINX_XADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XILINX_XADC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_XILLYBUS_OF b/baseconfig/arm/armv7/armv7/CONFIG_XILLYBUS_OF
deleted file mode 100644
index 673d17364..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_XILLYBUS_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XILLYBUS_OF=m
author	Don Zickus <dzickus@redhat.com>	2017-11-06 16:40:39 -0500
committer	Laura Abbott <labbott@redhat.com>	2017-11-13 09:39:12 -0800
commit	c54d82caa97d0d11e06f263f92394479bf3bb437 (patch)
tree	7c5e484b5a50d517e782dad4a6bdb5bb4bfe13a4 /baseconfig/arm/armv7/armv7
parent	36ae66c549a5da472615f2974bb7c7fc18843d4c (diff)
download	kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.gz kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.xz kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.zip