Linux v4.10-rc1 (didn't adjust debug options), ARM config updates, minor general config cleanups

134 files changed, 90 insertions, 49 deletions

diff --git a/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM b/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
deleted file mode 100644
index 01aca79d0..000000000
--- a/baseconfig/CONFIG_ARM_ARCH_TIMER_EVTSTREAM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
diff --git a/baseconfig/CONFIG_AXP20X_POWER b/baseconfig/CONFIG_AXP20X_POWER
deleted file mode 100644
index e02cee707..000000000
--- a/baseconfig/CONFIG_AXP20X_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AXP20X_POWER is not set
diff --git a/baseconfig/CONFIG_BMP280 b/baseconfig/CONFIG_BMP280
index e882be513..b41053b52 100644
--- a/baseconfig/CONFIG_BMP280
+++ b/baseconfig/CONFIG_BMP280
@@ -1 +1 @@
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
diff --git a/baseconfig/CONFIG_CHARGER_TPS65217 b/baseconfig/CONFIG_CHARGER_TPS65217
deleted file mode 100644
index 629b8503c..000000000
--- a/baseconfig/CONFIG_CHARGER_TPS65217
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_TPS65217 is not set
diff --git a/baseconfig/CONFIG_CRYPTO_SIMD b/baseconfig/CONFIG_CRYPTO_SIMD
new file mode 100644
index 000000000..91fac0ebe
--- /dev/null
+++ b/baseconfig/CONFIG_CRYPTO_SIMD
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SIMD=y
diff --git a/baseconfig/powerpc/CONFIG_FSL_PQ_MDIO b/baseconfig/CONFIG_FSL_PQ_MDIO
index f7952819a..f7952819a 100644
--- a/baseconfig/powerpc/CONFIG_FSL_PQ_MDIO
+++ b/baseconfig/CONFIG_FSL_PQ_MDIO
diff --git a/baseconfig/CONFIG_GPIO_SYSFS b/baseconfig/CONFIG_GPIO_SYSFS
index 52708d181..006904523 100644
--- a/baseconfig/CONFIG_GPIO_SYSFS
+++ b/baseconfig/CONFIG_GPIO_SYSFS
@@ -1 +1 @@
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
diff --git a/baseconfig/CONFIG_GPIO_TPS65218 b/baseconfig/CONFIG_GPIO_TPS65218
deleted file mode 100644
index 0b7ccda87..000000000
--- a/baseconfig/CONFIG_GPIO_TPS65218
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_TPS65218 is not set
diff --git a/baseconfig/CONFIG_LEDS_PM8058 b/baseconfig/CONFIG_LEDS_PM8058
deleted file mode 100644
index 601771aa9..000000000
--- a/baseconfig/CONFIG_LEDS_PM8058
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LEDS_PM8058 is not set
diff --git a/baseconfig/CONFIG_MDIO_BUS_MUX b/baseconfig/CONFIG_MDIO_BUS_MUX
new file mode 100644
index 000000000..0d74f0500
--- /dev/null
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX
@@ -0,0 +1 @@
+# CONFIG_MDIO_BUS_MUX is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..27b93466f 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX_GPIO
diff --git a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..4d738fd98 100644
--- a/baseconfig/x86/i686PAE/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/baseconfig/CONFIG_MDIO_BUS_MUX_MMIOREG
diff --git a/baseconfig/s390x/CONFIG_MDIO_OCTEON b/baseconfig/CONFIG_MDIO_OCTEON
index e14c4b041..e14c4b041 100644
--- a/baseconfig/s390x/CONFIG_MDIO_OCTEON
+++ b/baseconfig/CONFIG_MDIO_OCTEON
diff --git a/baseconfig/CONFIG_MEDIA_CEC b/baseconfig/CONFIG_MEDIA_CEC
deleted file mode 100644
index aad8ea4c0..000000000
--- a/baseconfig/CONFIG_MEDIA_CEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEDIA_CEC is not set
diff --git a/baseconfig/CONFIG_MFD_AAT2870_CORE b/baseconfig/CONFIG_MFD_AAT2870_CORE
new file mode 100644
index 000000000..9d4cf9056
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AAT2870_CORE
@@ -0,0 +1 @@
+# CONFIG_MFD_AAT2870_CORE is not set
diff --git a/baseconfig/CONFIG_MFD_AS3711 b/baseconfig/CONFIG_MFD_AS3711
new file mode 100644
index 000000000..53b3b04f1
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AS3711
@@ -0,0 +1 @@
+# CONFIG_MFD_AS3711 is not set
diff --git a/baseconfig/CONFIG_MFD_AXP20X b/baseconfig/CONFIG_MFD_AXP20X
new file mode 100644
index 000000000..1d658245a
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_AXP20X
@@ -0,0 +1 @@
+# CONFIG_MFD_AXP20X is not set
diff --git a/baseconfig/CONFIG_MFD_AXP20X_RSB b/baseconfig/CONFIG_MFD_AXP20X_RSB
deleted file mode 100644
index 589a48fbd..000000000
--- a/baseconfig/CONFIG_MFD_AXP20X_RSB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AXP20X_RSB is not set
diff --git a/baseconfig/CONFIG_MFD_DA9052_I2C b/baseconfig/CONFIG_MFD_DA9052_I2C
new file mode 100644
index 000000000..c294bc24d
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_DA9052_I2C
@@ -0,0 +1 @@
+# CONFIG_MFD_DA9052_I2C is not set
diff --git a/baseconfig/CONFIG_MFD_DA9055 b/baseconfig/CONFIG_MFD_DA9055
new file mode 100644
index 000000000..3f7ae6423
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_DA9055
@@ -0,0 +1 @@
+# CONFIG_MFD_DA9055 is not set
diff --git a/baseconfig/CONFIG_MFD_LP8788 b/baseconfig/CONFIG_MFD_LP8788
new file mode 100644
index 000000000..4600a154f
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_LP8788
@@ -0,0 +1 @@
+# CONFIG_MFD_LP8788 is not set
diff --git a/baseconfig/CONFIG_MFD_PM8XXX b/baseconfig/CONFIG_MFD_PM8XXX
deleted file mode 100644
index c20d0cb19..000000000
--- a/baseconfig/CONFIG_MFD_PM8XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PM8XXX=m
diff --git a/baseconfig/CONFIG_MFD_RC5T583 b/baseconfig/CONFIG_MFD_RC5T583
new file mode 100644
index 000000000..f3976be09
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_RC5T583
@@ -0,0 +1 @@
+# CONFIG_MFD_RC5T583 is not set
diff --git a/baseconfig/CONFIG_MFD_SEC_CORE b/baseconfig/CONFIG_MFD_SEC_CORE
new file mode 100644
index 000000000..d6bc4de4d
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_SEC_CORE
@@ -0,0 +1 @@
+# CONFIG_MFD_SEC_CORE is not set
diff --git a/baseconfig/CONFIG_MFD_SMSC b/baseconfig/CONFIG_MFD_SMSC
new file mode 100644
index 000000000..998701017
--- /dev/null
+++ b/baseconfig/CONFIG_MFD_SMSC
@@ -0,0 +1 @@
+# CONFIG_MFD_SMSC is not set
diff --git a/baseconfig/CONFIG_PMIC_ADP5520 b/baseconfig/CONFIG_PMIC_ADP5520
new file mode 100644
index 000000000..8664194c8
--- /dev/null
+++ b/baseconfig/CONFIG_PMIC_ADP5520
@@ -0,0 +1 @@
+# CONFIG_PMIC_ADP5520 is not set
diff --git a/baseconfig/CONFIG_PMIC_DA903X b/baseconfig/CONFIG_PMIC_DA903X
new file mode 100644
index 000000000..875cd2580
--- /dev/null
+++ b/baseconfig/CONFIG_PMIC_DA903X
@@ -0,0 +1 @@
+# CONFIG_PMIC_DA903X is not set
diff --git a/baseconfig/CONFIG_QEDI b/baseconfig/CONFIG_QEDI
new file mode 100644
index 000000000..c751aba20
--- /dev/null
+++ b/baseconfig/CONFIG_QEDI
@@ -0,0 +1 @@
+CONFIG_QEDI=m
diff --git a/baseconfig/CONFIG_SND_SOC_HDMI_CODEC b/baseconfig/CONFIG_SND_SOC_HDMI_CODEC
new file mode 100644
index 000000000..8b198f3fa
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_HDMI_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SOC_HDMI_CODEC=m
diff --git a/baseconfig/CONFIG_W1_MASTER_DS1WM b/baseconfig/CONFIG_W1_MASTER_DS1WM
index 24ca8ef38..bf2934c1e 100644
--- a/baseconfig/CONFIG_W1_MASTER_DS1WM
+++ b/baseconfig/CONFIG_W1_MASTER_DS1WM
@@ -1 +1 @@
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
diff --git a/baseconfig/CONFIG_XZ_DEC_ARM b/baseconfig/CONFIG_XZ_DEC_ARM
deleted file mode 100644
index 52cbc2d10..000000000
--- a/baseconfig/CONFIG_XZ_DEC_ARM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XZ_DEC_ARM=y
diff --git a/baseconfig/CONFIG_XZ_DEC_ARMTHUMB b/baseconfig/CONFIG_XZ_DEC_ARMTHUMB
deleted file mode 100644
index 50b05d115..000000000
--- a/baseconfig/CONFIG_XZ_DEC_ARMTHUMB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
new file mode 100644
index 000000000..dce78572b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARM_PSCI_CHECKER
@@ -0,0 +1 @@
+CONFIG_ARM_PSCI_CHECKER=y
diff --git a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ b/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
index b2168cb2d..cd4598a17 100644
--- a/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
+++ b/baseconfig/arm/CONFIG_ARM_RK3399_DMC_DEVFREQ
@@ -1 +1 @@
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
diff --git a/baseconfig/arm/CONFIG_BMP280 b/baseconfig/arm/CONFIG_BMP280
deleted file mode 100644
index b41053b52..000000000
--- a/baseconfig/arm/CONFIG_BMP280
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BMP280=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
new file mode 100644
index 000000000..ee9966699
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32_ARM64_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE
new file mode 100644
index 000000000..242e37489
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRC32_ARM_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32_ARM_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
new file mode 100644
index 000000000..c59d53cfb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
new file mode 100644
index 000000000..6b13ea30c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64 b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
new file mode 100644
index 000000000..ba32f8501
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA256_ARM64=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64 b/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64
new file mode 100644
index 000000000..de1c4c957
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_SHA512_ARM64
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA512_ARM64=m
diff --git a/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI b/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
new file mode 100644
index 000000000..b6bc07970
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
@@ -0,0 +1 @@
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
diff --git a/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC b/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC
new file mode 100644
index 000000000..9bd8d9fd1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_DUMB_VGA_DAC
@@ -0,0 +1 @@
+CONFIG_DRM_DUMB_VGA_DAC=m
diff --git a/baseconfig/arm/CONFIG_EEPROM_AT25 b/baseconfig/arm/CONFIG_EEPROM_AT25
new file mode 100644
index 000000000..90358f33c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_EEPROM_AT25
@@ -0,0 +1 @@
+CONFIG_EEPROM_AT25=m
diff --git a/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO b/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO
new file mode 100644
index 000000000..9113f3294
--- /dev/null
+++ b/baseconfig/arm/CONFIG_FSL_XGMAC_MDIO
@@ -0,0 +1 @@
+# CONFIG_FSL_XGMAC_MDIO is not set
diff --git a/baseconfig/arm/CONFIG_I2C b/baseconfig/arm/CONFIG_I2C
new file mode 100644
index 000000000..aafb657f5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C
@@ -0,0 +1 @@
+CONFIG_I2C=y
diff --git a/baseconfig/arm/CONFIG_I2C_PXA b/baseconfig/arm/CONFIG_I2C_PXA
new file mode 100644
index 000000000..59d18f0cb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_PXA
@@ -0,0 +1 @@
+CONFIG_I2C_PXA=m
diff --git a/baseconfig/arm/CONFIG_I2C_PXA_SLAVE b/baseconfig/arm/CONFIG_I2C_PXA_SLAVE
new file mode 100644
index 000000000..7cc440320
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_PXA_SLAVE
@@ -0,0 +1 @@
+# CONFIG_I2C_PXA_SLAVE is not set
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX b/baseconfig/arm/CONFIG_MDIO_BUS_MUX
new file mode 100644
index 000000000..19416a6ca
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX
@@ -0,0 +1 @@
+CONFIG_MDIO_BUS_MUX=m
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
index 27b93466f..5df332c5e 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_GPIO
@@ -1 +1 @@
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_GPIO=m
diff --git a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
index 4d738fd98..bbb54cf22 100644
--- a/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ b/baseconfig/arm/CONFIG_MDIO_BUS_MUX_MMIOREG
@@ -1 +1 @@
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
diff --git a/baseconfig/arm/CONFIG_MDIO_GPIO b/baseconfig/arm/CONFIG_MDIO_GPIO
new file mode 100644
index 000000000..a317fa125
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MDIO_GPIO
@@ -0,0 +1 @@
+CONFIG_MDIO_GPIO=m
diff --git a/baseconfig/arm/CONFIG_MFD_PM8XXX b/baseconfig/arm/CONFIG_MFD_PM8XXX
new file mode 100644
index 000000000..9f7f192d0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MFD_PM8XXX
@@ -0,0 +1 @@
+# CONFIG_MFD_PM8XXX is not set
diff --git a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..d156cb188
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT b/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT
new file mode 100644
index 000000000..af91a2b50
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PM_DEVFREQ_EVENT
@@ -0,0 +1 @@
+CONFIG_PM_DEVFREQ_EVENT=y
diff --git a/baseconfig/arm/CONFIG_REGMAP_I2C b/baseconfig/arm/CONFIG_REGMAP_I2C
new file mode 100644
index 000000000..907c212ef
--- /dev/null
+++ b/baseconfig/arm/CONFIG_REGMAP_I2C
@@ -0,0 +1 @@
+CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
new file mode 100644
index 000000000..28ea30190
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/arm/CONFIG_SPI_ARMADA_3700 b/baseconfig/arm/CONFIG_SPI_ARMADA_3700
new file mode 100644
index 000000000..f245ed398
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SPI_ARMADA_3700
@@ -0,0 +1 @@
+CONFIG_SPI_ARMADA_3700=m
diff --git a/baseconfig/arm/CONFIG_TEGRA_BPMP b/baseconfig/arm/CONFIG_TEGRA_BPMP
new file mode 100644
index 000000000..348002b0b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_BPMP
@@ -0,0 +1 @@
+CONFIG_TEGRA_BPMP=y
diff --git a/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX
new file mode 100644
index 000000000..3d46b7c93
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_HSP_MBOX
@@ -0,0 +1 @@
+CONFIG_TEGRA_HSP_MBOX=y
diff --git a/baseconfig/arm/CONFIG_TEGRA_IVC b/baseconfig/arm/CONFIG_TEGRA_IVC
new file mode 100644
index 000000000..cdcacbec2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TEGRA_IVC
@@ -0,0 +1 @@
+CONFIG_TEGRA_IVC=y
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION b/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
new file mode 100644
index 000000000..92036b975
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
@@ -0,0 +1 @@
+CONFIG_ACPI_I2C_OPREGION=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
new file mode 100644
index 000000000..0439db330
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
@@ -0,0 +1 @@
+# CONFIG_ARCH_TEGRA_186_SOC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP b/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
new file mode 100644
index 000000000..5090299f2
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
@@ -0,0 +1 @@
+# CONFIG_ARM64_PTDUMP is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
new file mode 100644
index 000000000..3b878e832
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
@@ -0,0 +1 @@
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
new file mode 100644
index 000000000..d64e3e373
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA_DEVFREQ=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER b/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
new file mode 100644
index 000000000..ddf89f551
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
@@ -0,0 +1 @@
+CONFIG_AXP20X_POWER=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_ADC b/baseconfig/arm/arm64/CONFIG_AXP288_ADC
new file mode 100644
index 000000000..e138f36af
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_ADC
@@ -0,0 +1 @@
+CONFIG_AXP288_ADC=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER b/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
new file mode 100644
index 000000000..0418f962c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
@@ -0,0 +1 @@
+CONFIG_AXP288_CHARGER=m
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
new file mode 100644
index 000000000..e171b954b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
@@ -0,0 +1 @@
+CONFIG_AXP288_FUEL_GAUGE=m
diff --git a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I b/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
new file mode 100644
index 000000000..925f02a15
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
@@ -0,0 +1 @@
+CONFIG_CAN_SUN4I=m
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686
new file mode 100644
index 000000000..71ba0b45c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_MAX77686=m
diff --git a/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/arm/arm64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288 b/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
new file mode 100644
index 000000000..7fadeb58d
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
@@ -0,0 +1 @@
+CONFIG_EXTCON_AXP288=m
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209 b/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
new file mode 100644
index 000000000..2365ae707
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
@@ -0,0 +1 @@
+CONFIG_GPIO_AXP209=m
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
new file mode 100644
index 000000000..cf37a6e35
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK b/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
new file mode 100644
index 000000000..e2fbdf907
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
@@ -0,0 +1 @@
+CONFIG_INPUT_AXP20X_PEK=m
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL b/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
new file mode 100644
index 000000000..d334d3f90
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
@@ -0,0 +1 @@
+CONFIG_MAX77620_THERMAL=m
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
new file mode 100644
index 000000000..f998244fd
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MAX77620_WATCHDOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
new file mode 100644
index 000000000..ada79c0d1
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X=y
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
new file mode 100644
index 000000000..22c60295b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X_I2C=y
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
new file mode 100644
index 000000000..29150d51b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
@@ -0,0 +1 @@
+CONFIG_MFD_AXP20X_RSB=m
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X b/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
new file mode 100644
index 000000000..6694810a6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
@@ -0,0 +1 @@
+CONFIG_REGULATOR_AXP20X=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
new file mode 100644
index 000000000..6cce5a1f7
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SUN4I_CODEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I b/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
new file mode 100644
index 000000000..031cd17b9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
@@ -0,0 +1 @@
+CONFIG_SPI_SUN6I=m
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI b/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
new file mode 100644
index 000000000..5def3e891
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
@@ -0,0 +1 @@
+CONFIG_TEGRA_GMI=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI b/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
new file mode 100644
index 000000000..258e716ab
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
@@ -0,0 +1 @@
+CONFIG_USB_MUSB_SUNXI=m
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ b/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
index 02cbb9860..ab6fb6341 100644
--- a/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
+++ b/baseconfig/arm/armv7/CONFIG_ARM_EXYNOS_BUS_DEVFREQ
@@ -1 +1 @@
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
diff --git a/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ b/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
new file mode 100644
index 000000000..d64e3e373
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_ARM_TEGRA_DEVFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA_DEVFREQ=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
index bfa695c8e..6ebace316 100644
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
+++ b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP
@@ -1 +1 @@
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI b/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
deleted file mode 100644
index c48791aae..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
new file mode 100644
index 000000000..149aea920
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PASSIVE
@@ -0,0 +1 @@
+CONFIG_DEVFREQ_GOV_PASSIVE=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE
deleted file mode 100644
index 84ede7faa..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_PERFORMANCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE
deleted file mode 100644
index da1ec0019..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_POWERSAVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index 881ebdd7e..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
diff --git a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE b/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE
deleted file mode 100644
index cc588b996..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEVFREQ_GOV_USERSPACE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_USERSPACE=y
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI b/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI
deleted file mode 100644
index fcd7748b7..000000000
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_MIPI_DSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXYNOS_MIPI_DSI=y
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO b/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO
deleted file mode 100644
index 40b0b76d9..000000000
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXYNOS_VIDEO=y
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209 b/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
index c71682292..2365ae707 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
+++ b/baseconfig/arm/armv7/CONFIG_GPIO_AXP209
@@ -1 +1 @@
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
diff --git a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP
new file mode 100644
index 000000000..cf37a6e35
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_OMAP
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON b/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
deleted file mode 100644
index c20d19635..000000000
--- a/baseconfig/arm/armv7/CONFIG_INPUT_TPS65218_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO
deleted file mode 100644
index 5df332c5e..000000000
--- a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_BUS_MUX_GPIO=m
diff --git a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG
deleted file mode 100644
index bbb54cf22..000000000
--- a/baseconfig/arm/armv7/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP b/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP
deleted file mode 100644
index 14c5f9e64..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ANATOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_ANATOP=m
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_GMI b/baseconfig/arm/armv7/CONFIG_TEGRA_GMI
new file mode 100644
index 000000000..5def3e891
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_TEGRA_GMI
@@ -0,0 +1 @@
+CONFIG_TEGRA_GMI=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_DAVINCI_MDIO b/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO
index aee3112bc..aee3112bc 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_DAVINCI_MDIO
+++ b/baseconfig/arm/armv7/CONFIG_TI_DAVINCI_MDIO
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
index 14ebcca32..d56f76146 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
+++ b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC
@@ -1 +1 @@
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
new file mode 100644
index 000000000..67462a76e
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_S5P_CEC
@@ -0,0 +1 @@
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
new file mode 100644
index 000000000..0b01e2387
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TPS65218
@@ -0,0 +1 @@
+CONFIG_GPIO_TPS65218=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900 b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
new file mode 100644
index 000000000..0104290a1
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_GPIO_TS4900
@@ -0,0 +1 @@
+# CONFIG_GPIO_TS4900 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058 b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
new file mode 100644
index 000000000..301ef0606
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_LEDS_PM8058
@@ -0,0 +1 @@
+CONFIG_LEDS_PM8058=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51 b/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51
deleted file mode 100644
index 5abf8b0be..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MACH_NOKIA_RX51
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MACH_NOKIA_RX51 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE b/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE
deleted file mode 100644
index c41914e44..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_PM8921_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_PM8921_CORE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
new file mode 100644
index 000000000..8a053dc4d
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
@@ -0,0 +1 @@
+CONFIG_SND_SOC_WM8960=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL b/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
new file mode 100644
index 000000000..10dfa04f9
--- /dev/null
+++ b/baseconfig/arm/armv7/lpae/CONFIG_TI_SCI_PROTOCOL
@@ -0,0 +1 @@
+CONFIG_TI_SCI_PROTOCOL=m
diff --git a/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM b/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
new file mode 100644
index 000000000..8d0ade331
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_CRYPTO_CRC32C_VPMSUM
@@ -0,0 +1 @@
+CONFIG_CRYPTO_CRC32C_VPMSUM=m
diff --git a/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM b/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM
deleted file mode 100644
index 4ec94e83f..000000000
--- a/baseconfig/powerpc/CONFIG_CRYPT_CRC32C_VPMSUM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPT_CRC32C_VPMSUM=m
diff --git a/baseconfig/powerpc/CONFIG_MDIO_OCTEON b/baseconfig/powerpc/CONFIG_MDIO_OCTEON
deleted file mode 100644
index 28cd01876..000000000
--- a/baseconfig/powerpc/CONFIG_MDIO_OCTEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_OCTEON=m
diff --git a/baseconfig/powerpc/CONFIG_MFD_SYSCON b/baseconfig/powerpc/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/powerpc/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64le/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/powerpc/powerpc64p7/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/s390x/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/CONFIG_AXP288_ADC b/baseconfig/x86/CONFIG_AXP288_ADC
deleted file mode 100644
index 655b9822e..000000000
--- a/baseconfig/x86/CONFIG_AXP288_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_ADC=y
diff --git a/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE
deleted file mode 100644
index e1fc33e1d..000000000
--- a/baseconfig/x86/CONFIG_AXP288_FUEL_GAUGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_FUEL_GAUGE=y
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT_A b/baseconfig/x86/CONFIG_INTEL_RDT_A
new file mode 100644
index 000000000..8c02d1afc
--- /dev/null
+++ b/baseconfig/x86/CONFIG_INTEL_RDT_A
@@ -0,0 +1 @@
+CONFIG_INTEL_RDT_A=y
diff --git a/baseconfig/x86/CONFIG_REGMAP_I2C b/baseconfig/x86/CONFIG_REGMAP_I2C
new file mode 100644
index 000000000..907c212ef
--- /dev/null
+++ b/baseconfig/x86/CONFIG_REGMAP_I2C
@@ -0,0 +1 @@
+CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/CONFIG_SURFACE3_WMI b/baseconfig/x86/CONFIG_SURFACE3_WMI
new file mode 100644
index 000000000..d2fbd9c7b
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SURFACE3_WMI
@@ -0,0 +1 @@
+CONFIG_SURFACE3_WMI=m
diff --git a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON b/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
new file mode 100644
index 000000000..8ba50033b
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
@@ -0,0 +1 @@
+CONFIG_SURFACE_3_BUTTON=m
diff --git a/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/x86/i686/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/i686/CONFIG_MFD_SYSCON b/baseconfig/x86/i686/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/x86/i686/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND b/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
deleted file mode 100644
index ca7663b83..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON b/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON
deleted file mode 100644
index cab0ef0b7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MFD_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SYSCON is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON b/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON
deleted file mode 100644
index 28cd01876..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MDIO_OCTEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_OCTEON=m