summaryrefslogtreecommitdiffstats
path: root/baseconfig/arm/armv7
diff options
context:
space:
mode:
Diffstat (limited to 'baseconfig/arm/armv7')
-rw-r--r--baseconfig/arm/armv7/CONFIG_ARCH_MESON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X1
-rw-r--r--baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX776861
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEBUG_RODATA1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_MESON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_STI2
-rw-r--r--baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I1
-rw-r--r--baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER1
-rw-r--r--baseconfig/arm/armv7/CONFIG_GPIO_EM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_IOMMU_IO_PGTABLE_LPAE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_LEDS_GPIO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER1
-rw-r--r--baseconfig/arm/armv7/CONFIG_LEDS_PWM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_LEDS_SYSCON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON61
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON81
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON8B1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MFD_MAX776861
-rw-r--r--baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MVPP21
-rw-r--r--baseconfig/arm/armv7/CONFIG_PATA_PLATFORM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_REGULATOR_MAX776861
-rw-r--r--baseconfig/arm/armv7/CONFIG_REGULATOR_MAX778021
-rw-r--r--baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP1
-rw-r--r--baseconfig/arm/armv7/CONFIG_RPMSG_CHAR1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_RK3399_GRU_SOUND1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000 (renamed from baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL50002
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753 (renamed from baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8753)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SPI_PXA2XX1
-rw-r--r--baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX1
-rw-r--r--baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN5I_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_EMAC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_TEGRA_IVC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA_SLAVE1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_I2C_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_DEBUG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PWM_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_RC_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES83281
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM87531
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH4071
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH4151
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH4161
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC41
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS1
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC56321
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE1
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM89031
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM97121
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_VDSO1
112 files changed, 74 insertions, 41 deletions
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MESON b/baseconfig/arm/armv7/CONFIG_ARCH_MESON
deleted file mode 100644
index 849319f60..000000000
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MESON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X b/baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X
new file mode 100644
index 000000000..2e64e7733
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X
@@ -0,0 +1 @@
+CONFIG_CHARGER_AXP20X=m
diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686 b/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686
deleted file mode 100644
index 71ba0b45c..000000000
--- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_MAX77686=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEBUG_RODATA b/baseconfig/arm/armv7/CONFIG_DEBUG_RODATA
deleted file mode 100644
index 8b3ba9432..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEBUG_RODATA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_RODATA is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON
deleted file mode 100644
index 7a6179102..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_MESON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_STI b/baseconfig/arm/armv7/CONFIG_DRM_STI
index 008714f93..d16e09b9b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_STI
+++ b/baseconfig/arm/armv7/CONFIG_DRM_STI
@@ -1 +1 @@
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC b/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC
deleted file mode 100644
index fe2550e2b..000000000
--- a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_GENERIC=m
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I b/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I
new file mode 100644
index 000000000..ce05f93b3
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DWMAC_SUN8I
@@ -0,0 +1 @@
+CONFIG_DWMAC_SUN8I=m
diff --git a/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
new file mode 100644
index 000000000..bdbd3377f
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
@@ -0,0 +1 @@
+CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_EM b/baseconfig/arm/armv7/CONFIG_GPIO_EM
deleted file mode 100644
index 175c5778a..000000000
--- a/baseconfig/arm/armv7/CONFIG_GPIO_EM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_EM is not set
diff --git a/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO b/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO
new file mode 100644
index 000000000..7b38ce09b
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO
@@ -0,0 +1 @@
+# CONFIG_IIO_CROS_EC_BARO is not set
diff --git a/baseconfig/arm/armv7/CONFIG_IOMMU_IO_PGTABLE_LPAE b/baseconfig/arm/armv7/CONFIG_IOMMU_IO_PGTABLE_LPAE
deleted file mode 100644
index 73494e9d2..000000000
--- a/baseconfig/arm/armv7/CONFIG_IOMMU_IO_PGTABLE_LPAE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO b/baseconfig/arm/armv7/CONFIG_LEDS_GPIO
deleted file mode 100644
index 65a807afb..000000000
--- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_GPIO=m
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER b/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER
deleted file mode 100644
index 101e4404f..000000000
--- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_GPIO_REGISTER=y
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_PWM b/baseconfig/arm/armv7/CONFIG_LEDS_PWM
deleted file mode 100644
index fc4cfe6f7..000000000
--- a/baseconfig/arm/armv7/CONFIG_LEDS_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_PWM=m
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON b/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON
deleted file mode 100644
index c458741b6..000000000
--- a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_SYSCON=y
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU b/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU
deleted file mode 100644
index b017fb086..000000000
--- a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_TRIGGER_CPU=y
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON6 b/baseconfig/arm/armv7/CONFIG_MACH_MESON6
new file mode 100644
index 000000000..aff440cc5
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON6
@@ -0,0 +1 @@
+# CONFIG_MACH_MESON6 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8 b/baseconfig/arm/armv7/CONFIG_MACH_MESON8
new file mode 100644
index 000000000..e55c72211
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8
@@ -0,0 +1 @@
+# CONFIG_MACH_MESON8 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B
new file mode 100644
index 000000000..5212d2aca
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B
@@ -0,0 +1 @@
+CONFIG_MACH_MESON8B=y
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MAX77686 b/baseconfig/arm/armv7/CONFIG_MFD_MAX77686
deleted file mode 100644
index e6791bf7e..000000000
--- a/baseconfig/arm/armv7/CONFIG_MFD_MAX77686
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_MAX77686=y
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..d156cb188
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_MVPP2 b/baseconfig/arm/armv7/CONFIG_MVPP2
deleted file mode 100644
index e41ec5ca1..000000000
--- a/baseconfig/arm/armv7/CONFIG_MVPP2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MVPP2=m
diff --git a/baseconfig/arm/armv7/CONFIG_PATA_PLATFORM b/baseconfig/arm/armv7/CONFIG_PATA_PLATFORM
deleted file mode 100644
index e385815ec..000000000
--- a/baseconfig/arm/armv7/CONFIG_PATA_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PATA_PLATFORM is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE b/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
new file mode 100644
index 000000000..26417e932
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
@@ -0,0 +1 @@
+CONFIG_PHY_EXYNOS_PCIE=y
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77686 b/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77686
deleted file mode 100644
index 69bd2bdd7..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77686
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX77686=m
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77802 b/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77802
deleted file mode 100644
index 3f55c214c..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77802
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX77802=m
diff --git a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP
new file mode 100644
index 000000000..98a696d76
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP
@@ -0,0 +1 @@
+# CONFIG_ROCKCHIP_CDN_DP is not set
diff --git a/baseconfig/arm/armv7/CONFIG_RPMSG_CHAR b/baseconfig/arm/armv7/CONFIG_RPMSG_CHAR
new file mode 100644
index 000000000..3aa998906
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_RPMSG_CHAR
@@ -0,0 +1 @@
+# CONFIG_RPMSG_CHAR is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC
new file mode 100644
index 000000000..9ac7f69ac
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC
@@ -0,0 +1 @@
+CONFIG_SERIAL_ST_ASC=y
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
new file mode 100644
index 000000000..4f7f87761
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC b/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC
deleted file mode 100644
index f2388a7c0..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_AC97_CODEC=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3399_GRU_SOUND b/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3399_GRU_SOUND
deleted file mode 100644
index 6897e6b54..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3399_GRU_SOUND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000 b/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000
index ea71dece1..ea71dece1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X b/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X
deleted file mode 100644
index 5a0960c0f..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TAS571X is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000 b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
index b3214101c..4706a31c1 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL5000
@@ -1 +1 @@
-# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
+CONFIG_SND_SOC_TEGRA_SGTL5000=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8753 b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753
index 9039b1695..9039b1695 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8753
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_WM8753
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E b/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E
deleted file mode 100644
index 1d3522517..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TS3A227E=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
new file mode 100644
index 000000000..c30f94369
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
new file mode 100644
index 000000000..28ea30190
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/arm/armv7/CONFIG_SPI_PXA2XX b/baseconfig/arm/armv7/CONFIG_SPI_PXA2XX
deleted file mode 100644
index 266e686b8..000000000
--- a/baseconfig/arm/armv7/CONFIG_SPI_PXA2XX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_PXA2XX is not set
diff --git a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM b/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM
deleted file mode 100644
index 2ad238de4..000000000
--- a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STMMAC_PLATFORM=m
diff --git a/baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX b/baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX
new file mode 100644
index 000000000..8c57b454a
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_STRICT_KERNEL_RWX
@@ -0,0 +1 @@
+CONFIG_STRICT_KERNEL_RWX=y
diff --git a/baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX b/baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX
new file mode 100644
index 000000000..2f1f100d7
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_STRICT_MODULE_RWX
@@ -0,0 +1 @@
+CONFIG_STRICT_MODULE_RWX=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN5I_CCU b/baseconfig/arm/armv7/CONFIG_SUN5I_CCU
new file mode 100644
index 000000000..7001f3dd4
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN5I_CCU
@@ -0,0 +1 @@
+CONFIG_SUN5I_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU b/baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU
new file mode 100644
index 000000000..7bf2b1a47
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN6I_A31_CCU
@@ -0,0 +1 @@
+CONFIG_SUN6I_A31_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU
new file mode 100644
index 000000000..46d0fa87e
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_A23_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_A23_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU
new file mode 100644
index 000000000..907c87d04
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_A33_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_A33_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC b/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC
deleted file mode 100644
index 1b91ca143..000000000
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_EMAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN8I_EMAC=m
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU
new file mode 100644
index 000000000..030c5de49
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN8I_V3S_CCU
@@ -0,0 +1 @@
+CONFIG_SUN8I_V3S_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU b/baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU
new file mode 100644
index 000000000..d203816e6
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU
@@ -0,0 +1 @@
+CONFIG_SUN9I_A80_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC
new file mode 100644
index 000000000..cdcacbec2
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC
@@ -0,0 +1 @@
+CONFIG_TEGRA_IVC=y
diff --git a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
index 2602e3b97..65db40667 100644
--- a/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
+++ b/baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
@@ -1 +1 @@
-CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST b/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST
new file mode 100644
index 000000000..975ecd425
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_AHCI_ST
@@ -0,0 +1 @@
+CONFIG_AHCI_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI
new file mode 100644
index 000000000..7a253ecf5
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ARCH_STI
@@ -0,0 +1 @@
+CONFIG_ARCH_STI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
new file mode 100644
index 000000000..0e26a51f0
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_STI_CPUFREQ
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..ca125040d
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ARM_TI_CPUFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TI_CPUFREQ=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
new file mode 100644
index 000000000..49177a6db
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
@@ -0,0 +1 @@
+CONFIG_DWMAC_IPQ806X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI
new file mode 100644
index 000000000..b0da5ddbc
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_STI
@@ -0,0 +1 @@
+CONFIG_DWMAC_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
new file mode 100644
index 000000000..e908df516
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_HW_RANDOM_ST
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C b/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
new file mode 100644
index 000000000..2d866d55f
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
@@ -0,0 +1 @@
+CONFIG_I2C_IMX_LPI2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA b/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA
deleted file mode 100644
index 59d18f0cb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PXA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA_SLAVE b/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA_SLAVE
deleted file mode 100644
index 7cc440320..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_PXA_SLAVE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PXA_SLAVE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST b/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST
new file mode 100644
index 000000000..dac85894e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_I2C_ST
@@ -0,0 +1 @@
+CONFIG_I2C_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
new file mode 100644
index 000000000..5ad9d0409
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_KEYBOARD_ST_KEYSCAN
@@ -0,0 +1 @@
+CONFIG_KEYBOARD_ST_KEYSCAN=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
new file mode 100644
index 000000000..4a513a669
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_ST
@@ -0,0 +1 @@
+CONFIG_MMC_SDHCI_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_DEBUG b/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_DEBUG
deleted file mode 100644
index b61e5b603..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_OMAP_MUX_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OMAP_MUX_DEBUG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
new file mode 100644
index 000000000..c0b002711
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY28LP
@@ -0,0 +1 @@
+CONFIG_PHY_MIPHY28LP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
new file mode 100644
index 000000000..b824f4d74
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_MIPHY365X
@@ -0,0 +1 @@
+# CONFIG_PHY_MIPHY365X is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB b/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
new file mode 100644
index 000000000..62d71519e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH407_USB
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..65f0bc9b7
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_STIH41X_USB
@@ -0,0 +1 @@
+# CONFIG_PHY_STIH41X_USB is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST
new file mode 100644
index 000000000..e14ee1ac1
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_ST
@@ -0,0 +1 @@
+CONFIG_POWER_RESET_ST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI b/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI
new file mode 100644
index 000000000..8aaff84cb
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PWM_STI
@@ -0,0 +1 @@
+CONFIG_PWM_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RC_ST b/baseconfig/arm/armv7/armv7/CONFIG_RC_ST
new file mode 100644
index 000000000..878dd631d
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RC_ST
@@ -0,0 +1 @@
+CONFIG_RC_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
index 7679dbb81..479a6f546 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_OMAP
@@ -1 +1 @@
-CONFIG_RTC_DRV_OMAP=y
+CONFIG_RTC_DRV_OMAP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
new file mode 100644
index 000000000..548d6d6c9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_ST_LPC
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_ST_LPC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328
deleted file mode 100644
index 806f698e1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C
deleted file mode 100644
index 9f90cb7e0..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI
deleted file mode 100644
index 0eb8f755c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI
new file mode 100644
index 000000000..af73428f9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..99ae102fc
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_STI_SAS
@@ -0,0 +1 @@
+CONFIG_SND_SOC_STI_SAS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8753 b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8753
deleted file mode 100644
index d8bef6a31..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_TEGRA_WM8753
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TEGRA_WM8753=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407
new file mode 100644
index 000000000..e1a2ca5a6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH407
@@ -0,0 +1 @@
+CONFIG_SOC_STIH407=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415
new file mode 100644
index 000000000..41502f339
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH415
@@ -0,0 +1 @@
+# CONFIG_SOC_STIH415 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416 b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416
new file mode 100644
index 000000000..9835ddfc1
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SOC_STIH416
@@ -0,0 +1 @@
+# CONFIG_SOC_STIH416 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4 b/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
new file mode 100644
index 000000000..87403eb57
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SPI_ST_SSC4
@@ -0,0 +1 @@
+CONFIG_SPI_ST_SSC4=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX b/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX
new file mode 100644
index 000000000..60dd9ded6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_STI_MBOX
@@ -0,0 +1 @@
+CONFIG_STI_MBOX=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA b/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA
new file mode 100644
index 000000000..73c09775d
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_FDMA
@@ -0,0 +1 @@
+CONFIG_ST_FDMA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
new file mode 100644
index 000000000..5e0a376a8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_LPC_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_ST_LPC_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC b/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
new file mode 100644
index 000000000..73ad95532
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_REMOTEPROC
@@ -0,0 +1 @@
+CONFIG_ST_REMOTEPROC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL
new file mode 100644
index 000000000..62b32ecb6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL
@@ -0,0 +1 @@
+CONFIG_ST_THERMAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
new file mode 100644
index 000000000..22f120d14
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_MEMMAP
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..865418b83
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_ST_THERMAL_SYSCFG
@@ -0,0 +1 @@
+# CONFIG_ST_THERMAL_SYSCFG is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
index 163365765..f2dd7ea1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
@@ -1 +1 @@
-CONFIG_TI_CPTS=m
+CONFIG_TI_CPTS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
new file mode 100644
index 000000000..b81356e32
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
@@ -0,0 +1 @@
+CONFIG_TI_CPTS_MOD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST b/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST
new file mode 100644
index 000000000..8c2b8b403
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_USB_DWC3_ST
@@ -0,0 +1 @@
+CONFIG_USB_DWC3_ST=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
new file mode 100644
index 000000000..7f13c6b05
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_HCD_STI
@@ -0,0 +1 @@
+CONFIG_USB_EHCI_HCD_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI b/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
new file mode 100644
index 000000000..ac20563d8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_USB_OHCI_HCD_STI
@@ -0,0 +1 @@
+CONFIG_USB_OHCI_HCD_STI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
new file mode 100644
index 000000000..034c99572
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA
@@ -0,0 +1 @@
+CONFIG_VIDEO_IMX_VDOA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
deleted file mode 100644
index 65db40667..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
new file mode 100644
index 000000000..430657aeb
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_BDISP
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..8bb71fa96
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..0292f4baa
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_DRIVER
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..f847894b9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_DELTA_MJPEG
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..a1d5539f7
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HDMI_CEC
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..7058385d2
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..637bf6eb4
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_STI_HVA_DEBUGFS
@@ -0,0 +1 @@
+# CONFIG_VIDEO_STI_HVA_DEBUGFS is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632 b/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632
deleted file mode 100644
index 63a5d40d0..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE
deleted file mode 100644
index 23a6b3005..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903 b/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903
deleted file mode 100644
index ff10de901..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TEGRA_WM8903 is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712 b/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712
deleted file mode 100644
index 3ced427a6..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TEGRA_WM9712 is not set
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_VDSO b/baseconfig/arm/armv7/lpae/CONFIG_VDSO
new file mode 100644
index 000000000..cab5ebafb
--- /dev/null
+++ b/baseconfig/arm/armv7/lpae/CONFIG_VDSO
@@ -0,0 +1 @@
+CONFIG_VDSO=y