Linux v4.14

128 files changed, 91 insertions, 31 deletions

diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
index d60fe565f..d60fe565f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC
+++ b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
diff --git a/baseconfig/arm/CONFIG_BLK_DEV_SX8 b/baseconfig/arm/CONFIG_BLK_DEV_SX8
new file mode 100644
index 000000000..76e0342ed
--- /dev/null
+++ b/baseconfig/arm/CONFIG_BLK_DEV_SX8
@@ -0,0 +1 @@
+# CONFIG_BLK_DEV_SX8 is not set
diff --git a/baseconfig/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG b/baseconfig/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
new file mode 100644
index 000000000..62fd0b85a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
diff --git a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64 b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
index ba32f8501..3aa7dacbf 100644
--- a/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
+++ b/baseconfig/arm/CONFIG_CRYPTO_SHA256_ARM64
@@ -1 +1 @@
-CONFIG_CRYPTO_SHA256_ARM64=m
+CONFIG_CRYPTO_SHA256_ARM64=y
diff --git a/baseconfig/arm/CONFIG_DRM_DW_HDMI_CEC b/baseconfig/arm/CONFIG_DRM_DW_HDMI_CEC
new file mode 100644
index 000000000..a3e178eae
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_DW_HDMI_CEC
@@ -0,0 +1 @@
+CONFIG_DRM_DW_HDMI_CEC=m
diff --git a/baseconfig/arm/CONFIG_DRM_VC4_HDMI_CEC b/baseconfig/arm/CONFIG_DRM_VC4_HDMI_CEC
new file mode 100644
index 000000000..da0132c1f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_VC4_HDMI_CEC
@@ -0,0 +1 @@
+CONFIG_DRM_VC4_HDMI_CEC=y
diff --git a/baseconfig/arm/CONFIG_EXTCON_USBC_CROS_EC b/baseconfig/arm/CONFIG_EXTCON_USBC_CROS_EC
new file mode 100644
index 000000000..831bc6ea7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_EXTCON_USBC_CROS_EC
@@ -0,0 +1 @@
+CONFIG_EXTCON_USBC_CROS_EC=m
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_IMX_RNGC b/baseconfig/arm/CONFIG_HW_RANDOM_IMX_RNGC
new file mode 100644
index 000000000..e7b39a2c7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_HW_RANDOM_IMX_RNGC
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_IMX_RNGC=m
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/CONFIG_HW_RANDOM_OMAP
new file mode 100644
index 000000000..cf37a6e35
--- /dev/null
+++ b/baseconfig/arm/CONFIG_HW_RANDOM_OMAP
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_OMAP=m
diff --git a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE b/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE
index 661ffb01a..f9cdc633b 100644
--- a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE
+++ b/baseconfig/arm/CONFIG_I2C_DESIGNWARE_CORE
@@ -1 +1 @@
-CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_CORE=y
diff --git a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM b/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
index cec2f8633..3d50a3e8a 100644
--- a/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
+++ b/baseconfig/arm/CONFIG_I2C_DESIGNWARE_PLATFORM
@@ -1 +1 @@
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
diff --git a/baseconfig/arm/CONFIG_IOMMU_DMA b/baseconfig/arm/CONFIG_IOMMU_DMA
new file mode 100644
index 000000000..a9155fba1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IOMMU_DMA
@@ -0,0 +1 @@
+CONFIG_IOMMU_DMA=y
diff --git a/baseconfig/arm/CONFIG_MESON_GX_SOCINFO b/baseconfig/arm/CONFIG_MESON_GX_SOCINFO
new file mode 100644
index 000000000..ce5ba6f4a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_GX_SOCINFO
@@ -0,0 +1 @@
+CONFIG_MESON_GX_SOCINFO=y
diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_PXA3xx b/baseconfig/arm/CONFIG_MTD_NAND_PXA3xx
index 584b57ea1..584b57ea1 100644
--- a/baseconfig/arm/armv7/CONFIG_MTD_NAND_PXA3xx
+++ b/baseconfig/arm/CONFIG_MTD_NAND_PXA3xx
diff --git a/baseconfig/arm/CONFIG_PARPORT b/baseconfig/arm/CONFIG_PARPORT
deleted file mode 100644
index 9dd8f33af..000000000
--- a/baseconfig/arm/CONFIG_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ALI b/baseconfig/arm/CONFIG_PATA_ALI
new file mode 100644
index 000000000..15c814454
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ALI
@@ -0,0 +1 @@
+# CONFIG_PATA_ALI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_AMD b/baseconfig/arm/CONFIG_PATA_AMD
new file mode 100644
index 000000000..33a58facc
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_AMD
@@ -0,0 +1 @@
+# CONFIG_PATA_AMD is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ARTOP b/baseconfig/arm/CONFIG_PATA_ARTOP
new file mode 100644
index 000000000..a4e7eb3b0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ARTOP
@@ -0,0 +1 @@
+# CONFIG_PATA_ARTOP is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ATP867X b/baseconfig/arm/CONFIG_PATA_ATP867X
new file mode 100644
index 000000000..5e66402b8
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ATP867X
@@ -0,0 +1 @@
+# CONFIG_PATA_ATP867X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CMD640_PCI b/baseconfig/arm/CONFIG_PATA_CMD640_PCI
new file mode 100644
index 000000000..9244705d2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CMD640_PCI
@@ -0,0 +1 @@
+# CONFIG_PATA_CMD640_PCI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CMD64X b/baseconfig/arm/CONFIG_PATA_CMD64X
new file mode 100644
index 000000000..eb4773083
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CMD64X
@@ -0,0 +1 @@
+# CONFIG_PATA_CMD64X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5520 b/baseconfig/arm/CONFIG_PATA_CS5520
new file mode 100644
index 000000000..2328c0724
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5520
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5520 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5530 b/baseconfig/arm/CONFIG_PATA_CS5530
new file mode 100644
index 000000000..106b33a1a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5530
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5530 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5535 b/baseconfig/arm/CONFIG_PATA_CS5535
new file mode 100644
index 000000000..331016055
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5535
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5535 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5536 b/baseconfig/arm/CONFIG_PATA_CS5536
new file mode 100644
index 000000000..e82dab7f2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5536
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5536 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_EFAR b/baseconfig/arm/CONFIG_PATA_EFAR
new file mode 100644
index 000000000..d1957bf57
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_EFAR
@@ -0,0 +1 @@
+# CONFIG_PATA_EFAR is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT366 b/baseconfig/arm/CONFIG_PATA_HPT366
new file mode 100644
index 000000000..b67ac339d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT366
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT366 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT37X b/baseconfig/arm/CONFIG_PATA_HPT37X
new file mode 100644
index 000000000..990af0509
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT37X
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT37X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X2N b/baseconfig/arm/CONFIG_PATA_HPT3X2N
new file mode 100644
index 000000000..471fcff45
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT3X2N
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT3X2N is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X3 b/baseconfig/arm/CONFIG_PATA_HPT3X3
new file mode 100644
index 000000000..9fc36a00b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT3X3
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT3X3 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_IT8213 b/baseconfig/arm/CONFIG_PATA_IT8213
new file mode 100644
index 000000000..47fbeb7f5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_IT8213
@@ -0,0 +1 @@
+# CONFIG_PATA_IT8213 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_IT821X b/baseconfig/arm/CONFIG_PATA_IT821X
new file mode 100644
index 000000000..c29d7f7cb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_IT821X
@@ -0,0 +1 @@
+# CONFIG_PATA_IT821X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_JMICRON b/baseconfig/arm/CONFIG_PATA_JMICRON
new file mode 100644
index 000000000..55695c65f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_JMICRON
@@ -0,0 +1 @@
+# CONFIG_PATA_JMICRON is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NETCELL b/baseconfig/arm/CONFIG_PATA_NETCELL
new file mode 100644
index 000000000..e598ae303
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NETCELL
@@ -0,0 +1 @@
+# CONFIG_PATA_NETCELL is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NINJA32 b/baseconfig/arm/CONFIG_PATA_NINJA32
new file mode 100644
index 000000000..9deb5dff7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NINJA32
@@ -0,0 +1 @@
+# CONFIG_PATA_NINJA32 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NS87410 b/baseconfig/arm/CONFIG_PATA_NS87410
new file mode 100644
index 000000000..32f9c72e0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NS87410
@@ -0,0 +1 @@
+# CONFIG_PATA_NS87410 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NS87415 b/baseconfig/arm/CONFIG_PATA_NS87415
new file mode 100644
index 000000000..d12f9010d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NS87415
@@ -0,0 +1 @@
+# CONFIG_PATA_NS87415 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM b/baseconfig/arm/CONFIG_PATA_OF_PLATFORM
deleted file mode 100644
index 5354705f9..000000000
--- a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_OF_PLATFORM=m
diff --git a/baseconfig/arm/CONFIG_PATA_OPTI b/baseconfig/arm/CONFIG_PATA_OPTI
new file mode 100644
index 000000000..f95b6c966
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_OPTI
@@ -0,0 +1 @@
+# CONFIG_PATA_OPTI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_OPTIDMA b/baseconfig/arm/CONFIG_PATA_OPTIDMA
new file mode 100644
index 000000000..6bf1d2e8a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_OPTIDMA
@@ -0,0 +1 @@
+# CONFIG_PATA_OPTIDMA is not set
diff --git a/baseconfig/arm/CONFIG_PATA_PDC2027X b/baseconfig/arm/CONFIG_PATA_PDC2027X
new file mode 100644
index 000000000..c8ad0b826
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_PDC2027X
@@ -0,0 +1 @@
+# CONFIG_PATA_PDC2027X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_PDC_OLD b/baseconfig/arm/CONFIG_PATA_PDC_OLD
new file mode 100644
index 000000000..d77240fcf
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_PDC_OLD
@@ -0,0 +1 @@
+# CONFIG_PATA_PDC_OLD is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SERVERWORKS b/baseconfig/arm/CONFIG_PATA_SERVERWORKS
new file mode 100644
index 000000000..5cacac7a6
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SERVERWORKS
@@ -0,0 +1 @@
+# CONFIG_PATA_SERVERWORKS is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SIL680 b/baseconfig/arm/CONFIG_PATA_SIL680
new file mode 100644
index 000000000..75224a38b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SIL680
@@ -0,0 +1 @@
+# CONFIG_PATA_SIL680 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SIS b/baseconfig/arm/CONFIG_PATA_SIS
new file mode 100644
index 000000000..8c547495a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SIS
@@ -0,0 +1 @@
+# CONFIG_PATA_SIS is not set
diff --git a/baseconfig/arm/CONFIG_PATA_VIA b/baseconfig/arm/CONFIG_PATA_VIA
new file mode 100644
index 000000000..9deaa6c3c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_VIA
@@ -0,0 +1 @@
+# CONFIG_PATA_VIA is not set
diff --git a/baseconfig/arm/CONFIG_PATA_WINBOND b/baseconfig/arm/CONFIG_PATA_WINBOND
new file mode 100644
index 000000000..9b3eb6289
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_WINBOND
@@ -0,0 +1 @@
+# CONFIG_PATA_WINBOND is not set
diff --git a/baseconfig/arm/CONFIG_RADIO_WL128X b/baseconfig/arm/CONFIG_RADIO_WL128X
deleted file mode 100644
index 88b42f8e6..000000000
--- a/baseconfig/arm/CONFIG_RADIO_WL128X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RADIO_WL128X=m
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_PHY b/baseconfig/arm/CONFIG_ROCKCHIP_PHY
new file mode 100644
index 000000000..e49faf8f9
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_PHY
@@ -0,0 +1 @@
+CONFIG_ROCKCHIP_PHY=m
diff --git a/baseconfig/arm/CONFIG_SATA_INIC162X b/baseconfig/arm/CONFIG_SATA_INIC162X
new file mode 100644
index 000000000..6abf495a0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_INIC162X
@@ -0,0 +1 @@
+# CONFIG_SATA_INIC162X is not set
diff --git a/baseconfig/arm/CONFIG_SATA_NV b/baseconfig/arm/CONFIG_SATA_NV
new file mode 100644
index 000000000..c8419327a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_NV
@@ -0,0 +1 @@
+# CONFIG_SATA_NV is not set
diff --git a/baseconfig/arm/CONFIG_SATA_PROMISE b/baseconfig/arm/CONFIG_SATA_PROMISE
new file mode 100644
index 000000000..2af59fe8e
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_PROMISE
@@ -0,0 +1 @@
+# CONFIG_SATA_PROMISE is not set
diff --git a/baseconfig/arm/CONFIG_SATA_QSTOR b/baseconfig/arm/CONFIG_SATA_QSTOR
new file mode 100644
index 000000000..8b3cce9ab
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_QSTOR
@@ -0,0 +1 @@
+# CONFIG_SATA_QSTOR is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIL b/baseconfig/arm/CONFIG_SATA_SIL
new file mode 100644
index 000000000..5d551ee6a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIL
@@ -0,0 +1 @@
+# CONFIG_SATA_SIL is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIL24 b/baseconfig/arm/CONFIG_SATA_SIL24
new file mode 100644
index 000000000..7526a06a0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIL24
@@ -0,0 +1 @@
+# CONFIG_SATA_SIL24 is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIS b/baseconfig/arm/CONFIG_SATA_SIS
new file mode 100644
index 000000000..1cd4ae75f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIS
@@ -0,0 +1 @@
+# CONFIG_SATA_SIS is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SVW b/baseconfig/arm/CONFIG_SATA_SVW
new file mode 100644
index 000000000..625275c8d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SVW
@@ -0,0 +1 @@
+# CONFIG_SATA_SVW is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SX4 b/baseconfig/arm/CONFIG_SATA_SX4
new file mode 100644
index 000000000..abbd89112
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SX4
@@ -0,0 +1 @@
+# CONFIG_SATA_SX4 is not set
diff --git a/baseconfig/arm/CONFIG_SATA_ULI b/baseconfig/arm/CONFIG_SATA_ULI
new file mode 100644
index 000000000..b50271fc3
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_ULI
@@ -0,0 +1 @@
+# CONFIG_SATA_ULI is not set
diff --git a/baseconfig/arm/CONFIG_SATA_VIA b/baseconfig/arm/CONFIG_SATA_VIA
new file mode 100644
index 000000000..f5754463a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_VIA
@@ -0,0 +1 @@
+# CONFIG_SATA_VIA is not set
diff --git a/baseconfig/arm/CONFIG_SATA_VITESSE b/baseconfig/arm/CONFIG_SATA_VITESSE
new file mode 100644
index 000000000..59856ec7b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_VITESSE
@@ -0,0 +1 @@
+# CONFIG_SATA_VITESSE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_AC97 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_AC97
index fa8e0e012..fa8e0e012 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_AC97
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_AC97
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_DAS b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_DAS
index 82205dc43..82205dc43 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_DAS
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_DAS
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA20_I2S b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_I2S
index abfe22877..abfe22877 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA20_I2S
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_I2S
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_SPDIF b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_SPDIF
index 0f05cfffa..0f05cfffa 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA20_SPDIF
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA20_SPDIF
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA30_AHUB b/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_AHUB
index d5632de51..d5632de51 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA30_AHUB
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_AHUB
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA30_I2S b/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_I2S
index c7fabc77b..c7fabc77b 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA30_I2S
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA30_I2S
diff --git a/baseconfig/arm/armv7/CONFIG_SUNXI_SRAM b/baseconfig/arm/CONFIG_SUNXI_SRAM
index 526bd5868..526bd5868 100644
--- a/baseconfig/arm/armv7/CONFIG_SUNXI_SRAM
+++ b/baseconfig/arm/CONFIG_SUNXI_SRAM
diff --git a/baseconfig/arm/CONFIG_TINYDRM_REPAPER b/baseconfig/arm/CONFIG_TINYDRM_REPAPER
new file mode 100644
index 000000000..c4d2874fa
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TINYDRM_REPAPER
@@ -0,0 +1 @@
+# CONFIG_TINYDRM_REPAPER is not set
diff --git a/baseconfig/arm/CONFIG_TINYDRM_ST7586 b/baseconfig/arm/CONFIG_TINYDRM_ST7586
new file mode 100644
index 000000000..2b9e29f63
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TINYDRM_ST7586
@@ -0,0 +1 @@
+# CONFIG_TINYDRM_ST7586 is not set
diff --git a/baseconfig/arm/CONFIG_TI_ST b/baseconfig/arm/CONFIG_TI_ST
deleted file mode 100644
index e6d0d4428..000000000
--- a/baseconfig/arm/CONFIG_TI_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_ST=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA b/baseconfig/arm/CONFIG_USB_CHIPIDEA
index 0b76e3525..0b76e3525 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA
+++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST
index 1c14a4a6c..1c14a4a6c 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST
+++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC
index 320052607..320052607 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC
+++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI
index d1a5cf9eb..d1a5cf9eb 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI
+++ b/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI
diff --git a/baseconfig/arm/CONFIG_VIDEO_MESON_AO_CEC b/baseconfig/arm/CONFIG_VIDEO_MESON_AO_CEC
new file mode 100644
index 000000000..499a44076
--- /dev/null
+++ b/baseconfig/arm/CONFIG_VIDEO_MESON_AO_CEC
@@ -0,0 +1 @@
+CONFIG_VIDEO_MESON_AO_CEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
index 0439db330..1cafdb24f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
+++ b/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
@@ -1 +1 @@
-# CONFIG_ARCH_TEGRA_186_SOC is not set
+CONFIG_ARCH_TEGRA_186_SOC=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_VULCAN b/baseconfig/arm/arm64/CONFIG_ARCH_VULCAN
deleted file mode 100644
index 6081275c5..000000000
--- a/baseconfig/arm/arm64/CONFIG_ARCH_VULCAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_VULCAN is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PMEM b/baseconfig/arm/arm64/CONFIG_ARM64_PMEM
new file mode 100644
index 000000000..9325600d1
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_PMEM
@@ -0,0 +1 @@
+# CONFIG_ARM64_PMEM is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ
new file mode 100644
index 000000000..f0e165dfb
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA186_CPUFREQ=m
diff --git a/baseconfig/arm/arm64/CONFIG_ATA_ACPI b/baseconfig/arm/arm64/CONFIG_ATA_ACPI
new file mode 100644
index 000000000..a0be76e56
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ATA_ACPI
@@ -0,0 +1 @@
+CONFIG_ATA_ACPI=y
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64 b/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64
index 113c72b8c..dd0ae2c1d 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64
+++ b/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64
@@ -1 +1 @@
-CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64=y
diff --git a/baseconfig/arm/arm64/CONFIG_DMI b/baseconfig/arm/arm64/CONFIG_DMI
deleted file mode 100644
index f961d1678..000000000
--- a/baseconfig/arm/arm64/CONFIG_DMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI=y
diff --git a/baseconfig/arm/arm64/CONFIG_DMIID b/baseconfig/arm/arm64/CONFIG_DMIID
deleted file mode 100644
index d0ea3622a..000000000
--- a/baseconfig/arm/arm64/CONFIG_DMIID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMIID=y
diff --git a/baseconfig/arm/arm64/CONFIG_DMI_SYSFS b/baseconfig/arm/arm64/CONFIG_DMI_SYSFS
deleted file mode 100644
index 76565caf8..000000000
--- a/baseconfig/arm/arm64/CONFIG_DMI_SYSFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI_SYSFS=y
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX b/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX
new file mode 100644
index 000000000..6895cc045
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX
@@ -0,0 +1 @@
+CONFIG_GPIO_THUNDERX=m
diff --git a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC
+++ b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
index 059d0d4f2..48facf367 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
+++ b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
@@ -1 +1 @@
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI b/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI
new file mode 100644
index 000000000..bb77206de
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_SNI=y
diff --git a/baseconfig/arm/arm64/CONFIG_PARPORT_PC b/baseconfig/arm/arm64/CONFIG_PARPORT_PC
deleted file mode 100644
index e2a0d3656..000000000
--- a/baseconfig/arm/arm64/CONFIG_PARPORT_PC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT_PC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_PATA_ACPI b/baseconfig/arm/arm64/CONFIG_PATA_ACPI
new file mode 100644
index 000000000..c3bc7866f
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_PATA_ACPI
@@ -0,0 +1 @@
+CONFIG_PATA_ACPI=m
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM b/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM
new file mode 100644
index 000000000..cdb6169bd
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM
@@ -0,0 +1 @@
+CONFIG_PCIE_DW_HOST_ECAM=y
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY b/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY
new file mode 100644
index 000000000..1902b0c1f
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY
@@ -0,0 +1 @@
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE
index 097a2d3e7..20610a95a 100644
--- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE
+++ b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE
@@ -1 +1 @@
-# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_RANDOMIZE_BASE=y
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
new file mode 100644
index 000000000..7645a371e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
@@ -0,0 +1 @@
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
diff --git a/baseconfig/arm/arm64/CONFIG_RELOCATABLE b/baseconfig/arm/arm64/CONFIG_RELOCATABLE
index ff7e13901..36808edb3 100644
--- a/baseconfig/arm/arm64/CONFIG_RELOCATABLE
+++ b/baseconfig/arm/arm64/CONFIG_RELOCATABLE
@@ -1 +1 @@
-# CONFIG_RELOCATABLE is not set
+CONFIG_RELOCATABLE=y
diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
new file mode 100644
index 000000000..c348519ff
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
@@ -0,0 +1 @@
+CONFIG_SNI_NETSEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS b/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
new file mode 100644
index 000000000..ded5c358e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
@@ -0,0 +1 @@
+CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS b/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS
new file mode 100644
index 000000000..213edb5a1
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS
@@ -0,0 +1 @@
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/baseconfig/arm/arm64/CONFIG_VMAP_STACK b/baseconfig/arm/arm64/CONFIG_VMAP_STACK
new file mode 100644
index 000000000..8bd986875
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_VMAP_STACK
@@ -0,0 +1 @@
+CONFIG_VMAP_STACK=y
diff --git a/baseconfig/arm/CONFIG_DRM_SUN4I_BACKEND b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
index c1d1d2121..c1d1d2121 100644
--- a/baseconfig/arm/CONFIG_DRM_SUN4I_BACKEND
+++ b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
new file mode 100644
index 000000000..8ba73409c
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
@@ -0,0 +1 @@
+# CONFIG_DRM_SUN4I_HDMI_CEC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML b/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML
deleted file mode 100644
index 059d0d4f2..000000000
--- a/baseconfig/arm/armv7/CONFIG_MMC_QCOM_DML
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_QCOM_DML=m
diff --git a/baseconfig/arm/armv7/CONFIG_OMAP2_DSS_DEBUG b/baseconfig/arm/armv7/CONFIG_OMAP2_DSS_DEBUG
deleted file mode 100644
index 8b8ba13e8..000000000
--- a/baseconfig/arm/armv7/CONFIG_OMAP2_DSS_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP2_DSS_DEBUG is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010 b/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010
deleted file mode 100644
index c20fa4d0f..000000000
--- a/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PATA_FTIDE010 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_BCM281XX b/baseconfig/arm/armv7/CONFIG_PINCTRL_BCM281XX
deleted file mode 100644
index 9963aedf7..000000000
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_BCM281XX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_BCM281XX is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35 b/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35
deleted file mode 100644
index c9a64229e..000000000
--- a/baseconfig/arm/armv7/CONFIG_PINCTRL_IMX35
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_IMX35 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PWM_TIECAP b/baseconfig/arm/armv7/CONFIG_PWM_TIECAP
new file mode 100644
index 000000000..84f1e9b57
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PWM_TIECAP
@@ -0,0 +1 @@
+CONFIG_PWM_TIECAP=m
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X b/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X
deleted file mode 100644
index 7dcdafcbb..000000000
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_ARMADA38X=m
diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU b/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU
new file mode 100644
index 000000000..3b2ba681a
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN4I_A10_CCU
@@ -0,0 +1 @@
+CONFIG_SUN4I_A10_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A83T_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_A83T_CCU
new file mode 100644
index 000000000..a4e88a43c
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_A83T_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_A83T_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_DE2_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_DE2_CCU
new file mode 100644
index 000000000..1729d1f68
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_DE2_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_DE2_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU
new file mode 100644
index 000000000..149900927
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_R40_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_R40_CCU=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
new file mode 100644
index 000000000..2be078588
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_BATTERY_BQ27XXX_HDQ
@@ -0,0 +1 @@
+CONFIG_BATTERY_BQ27XXX_HDQ=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
new file mode 100644
index 000000000..53983d8af
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_IMX_REMOTEPROC
@@ -0,0 +1 @@
+CONFIG_IMX_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
new file mode 100644
index 000000000..6360fee39
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
@@ -0,0 +1 @@
+CONFIG_MFD_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML b/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
index 059d0d4f2..48facf367 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MMC_QCOM_DML
@@ -1 +1 @@
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_SYSCON_RESET b/baseconfig/arm/armv7/armv7/CONFIG_TI_SYSCON_RESET
deleted file mode 100644
index defe64498..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_SYSCON_RESET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_SYSCON_RESET=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA
deleted file mode 100644
index 0b76e3525..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST
deleted file mode 100644
index 1c14a4a6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_HOST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC
deleted file mode 100644
index 320052607..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_UDC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI
deleted file mode 100644
index d1a5cf9eb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_ULPI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_DAS b/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_DAS
deleted file mode 100644
index 71a38a48c..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA20_DAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TEGRA20_DAS is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_TI_SYSCON_RESET b/baseconfig/arm/armv7/lpae/CONFIG_TI_SYSCON_RESET
deleted file mode 100644
index defe64498..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_TI_SYSCON_RESET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_SYSCON_RESET=m