summaryrefslogtreecommitdiffstats
path: root/baseconfig/arm/armv7
diff options
context:
space:
mode:
Diffstat (limited to 'baseconfig/arm/armv7')
-rw-r--r--baseconfig/arm/armv7/CONFIG_AHCI_DM8161
-rw-r--r--baseconfig/arm/armv7/CONFIG_AXP20X_ADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X1
-rw-r--r--baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX778021
-rw-r--r--baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI_AHB_AUDIO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PCI_DRA7XX1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PL310_ERRATA_5883692
-rw-r--r--baseconfig/arm/armv7/CONFIG_PL310_ERRATA_7279152
-rw-r--r--baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_MAX980901
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SOC_DRA7XX (renamed from baseconfig/arm/armv7/armv7/CONFIG_SOC_DRA7XX)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_TWL4030_CORE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_USB_EHCI_HCD_ORION1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_AK89751
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_SI5701
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD91
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB21
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_5883691
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_7279151
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_RADIO_WL128X1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_ST1
-rw-r--r--baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX1
47 files changed, 23 insertions, 26 deletions
diff --git a/baseconfig/arm/armv7/CONFIG_AHCI_DM816 b/baseconfig/arm/armv7/CONFIG_AHCI_DM816
new file mode 100644
index 000000000..ba4b51891
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_AHCI_DM816
@@ -0,0 +1 @@
+CONFIG_AHCI_DM816=m
diff --git a/baseconfig/arm/armv7/CONFIG_AXP20X_ADC b/baseconfig/arm/armv7/CONFIG_AXP20X_ADC
new file mode 100644
index 000000000..025239f25
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_AXP20X_ADC
@@ -0,0 +1 @@
+CONFIG_AXP20X_ADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X b/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X
new file mode 100644
index 000000000..75591a277
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X
@@ -0,0 +1 @@
+CONFIG_BATTERY_AXP20X=m
diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802 b/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802
deleted file mode 100644
index c6e1136d0..000000000
--- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77802
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_MAX77802=m
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG b/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG
new file mode 100644
index 000000000..f60ff08ee
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_CRYPTO_DEV_EXYNOS_RNG
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
diff --git a/baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR b/baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR
deleted file mode 100644
index 03757767c..000000000
--- a/baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI b/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI
deleted file mode 100644
index 0be71f10f..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_DW_HDMI=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI_AHB_AUDIO b/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI_AHB_AUDIO
deleted file mode 100644
index 679147e29..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI_AHB_AUDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
diff --git a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
deleted file mode 100644
index 87c25300c..000000000
--- a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_EXYNOS=m
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE b/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE
deleted file mode 100644
index 226d75be9..000000000
--- a/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_PM8921_CORE is not set
diff --git a/baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM b/baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM
new file mode 100644
index 000000000..9407e7a4b
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_NVMEM_IMX_IIM
@@ -0,0 +1 @@
+CONFIG_NVMEM_IMX_IIM=m
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX
new file mode 100644
index 000000000..b401f79fb
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX
@@ -0,0 +1 @@
+# CONFIG_PCI_DRA7XX is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP
new file mode 100644
index 000000000..8a6a68062
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP
@@ -0,0 +1 @@
+# CONFIG_PCI_DRA7XX_EP is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST
new file mode 100644
index 000000000..7bbb2fd97
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST
@@ -0,0 +1 @@
+# CONFIG_PCI_DRA7XX_HOST is not set
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369 b/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369
index af3842f84..a821768d1 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369
+++ b/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_588369
@@ -1 +1 @@
-# CONFIG_PL310_ERRATA_588369 is not set
+CONFIG_PL310_ERRATA_588369=y
diff --git a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915 b/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915
index 99df60574..4e4e5453f 100644
--- a/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915
+++ b/baseconfig/arm/armv7/CONFIG_PL310_ERRATA_727915
@@ -1 +1 @@
-# CONFIG_PL310_ERRATA_727915 is not set
+CONFIG_PL310_ERRATA_727915=y
diff --git a/baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC b/baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC
new file mode 100644
index 000000000..1060913dd
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_QCOM_PM8XXX_XOADC
@@ -0,0 +1 @@
+CONFIG_QCOM_PM8XXX_XOADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090 b/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090
new file mode 100644
index 000000000..c22ad4a46
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MAX98090=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID b/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID
new file mode 100644
index 000000000..ece6cf56f
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_ODROID
@@ -0,0 +1 @@
+CONFIG_SND_SOC_ODROID=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_DRA7XX b/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX
index a11bb6971..a11bb6971 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_DRA7XX
+++ b/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL b/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
new file mode 100644
index 000000000..00413d459
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
@@ -0,0 +1 @@
+CONFIG_SOC_TEGRA_FLOWCTRL=y
diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC b/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC
new file mode 100644
index 000000000..97139c216
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_SUN4I_GPADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU b/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU
deleted file mode 100644
index 542d6fc7d..000000000
--- a/baseconfig/arm/armv7/CONFIG_SUN8I_H3_CCU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN8I_H3_CCU=y
diff --git a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE b/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
deleted file mode 100644
index 1f5b92782..000000000
--- a/baseconfig/arm/armv7/CONFIG_TWL4030_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TWL4030_CORE is not set
diff --git a/baseconfig/arm/armv7/CONFIG_USB_EHCI_HCD_ORION b/baseconfig/arm/armv7/CONFIG_USB_EHCI_HCD_ORION
deleted file mode 100644
index eee05e763..000000000
--- a/baseconfig/arm/armv7/CONFIG_USB_EHCI_HCD_ORION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_HCD_ORION=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AK8975 b/baseconfig/arm/armv7/armv7/CONFIG_AK8975
deleted file mode 100644
index 547c21a99..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_AK8975
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AK8975=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_SI570 b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_SI570
deleted file mode 100644
index df6668885..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_SI570
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMMON_CLK_SI570=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS b/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
new file mode 100644
index 000000000..33e5c6a93
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_IMX7_PM_DOMAINS
@@ -0,0 +1 @@
+CONFIG_IMX7_PM_DOMAINS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9 b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9
deleted file mode 100644
index 090669c9c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KXSD9=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C
deleted file mode 100644
index 3d2256700..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KXSD9_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI
deleted file mode 100644
index f4da57bbc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KXSD9_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
deleted file mode 100644
index 6360fee39..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C b/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
deleted file mode 100644
index 2e9c7cc45..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MPU3050_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX
deleted file mode 100644
index 7f8a147e3..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_DRA7XX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
new file mode 100644
index 000000000..cba57faf8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_QMP=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
new file mode 100644
index 000000000..6512e59d2
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_QUSB2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
new file mode 100644
index 000000000..61e98f856
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HS
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_USB_HS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
new file mode 100644
index 000000000..0b25aa233
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_USB_HSIC
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_USB_HSIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_588369 b/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_588369
deleted file mode 100644
index a821768d1..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_588369
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PL310_ERRATA_588369=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_727915 b/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_727915
deleted file mode 100644
index 4e4e5453f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PL310_ERRATA_727915
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PL310_ERRATA_727915=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU
new file mode 100644
index 000000000..b7e99b882
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_IOMMU
@@ -0,0 +1 @@
+CONFIG_QCOM_IOMMU=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD
deleted file mode 100644
index d43fecfdb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_SMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RADIO_WL128X b/baseconfig/arm/armv7/armv7/CONFIG_RADIO_WL128X
deleted file mode 100644
index 88b42f8e6..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_RADIO_WL128X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RADIO_WL128X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
new file mode 100644
index 000000000..37161086e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
@@ -0,0 +1 @@
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index 207a5e523..f862f05a7 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -1 +1 @@
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_ST b/baseconfig/arm/armv7/armv7/CONFIG_TI_ST
deleted file mode 100644
index e6d0d4428..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_ST=m
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX b/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX
deleted file mode 100644
index a11bb6971..000000000
--- a/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_DRA7XX is not set