summaryrefslogtreecommitdiffstats
path: root/baseconfig/arm/armv7/armv7
diff options
context:
space:
mode:
Diffstat (limited to 'baseconfig/arm/armv7/armv7')
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS652172
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V21
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM1
15 files changed, 9 insertions, 9 deletions
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
deleted file mode 100644
index 85b4e115d..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CADENCE_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217 b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
index e77c2fc05..629b8503c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
+++ b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
@@ -1 +1 @@
-CONFIG_CHARGER_TPS65217=m
+# CONFIG_CHARGER_TPS65217 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL
new file mode 100644
index 000000000..ddd9d5832
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL
@@ -0,0 +1 @@
+CONFIG_DRM_ETNAVIV_THERMAL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE b/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
deleted file mode 100644
index 8e1eefa5c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_CADENCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU
new file mode 100644
index 000000000..777cb90c8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU
@@ -0,0 +1 @@
+CONFIG_MFD_TI_LMU=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
deleted file mode 100644
index 936bcab6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_QCOM_UFS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
deleted file mode 100644
index 25d1d5570..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_IMX=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X
new file mode 100644
index 000000000..a4610d589
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X
@@ -0,0 +1 @@
+CONFIG_REGULATOR_LM363X=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2
new file mode 100644
index 000000000..225594051
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_MXC_V2=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
index 582053b2d..0f7ea5449 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP
@@ -1 +1 @@
-CONFIG_SERIAL_8250_OMAP=m
+CONFIG_SERIAL_8250_OMAP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP
new file mode 100644
index 000000000..cffbc1b84
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP
@@ -0,0 +1 @@
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
index 0dbd205b2..1c036ec4f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP
@@ -1 +1 @@
-CONFIG_SERIAL_OMAP=y
+# CONFIG_SERIAL_OMAP is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
deleted file mode 100644
index 84ab44f7f..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_OMAP_CONSOLE=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE b/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
deleted file mode 100644
index 3a8bb168c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_CADENCE=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM b/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM
new file mode 100644
index 000000000..6bb0bf6e6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM
@@ -0,0 +1 @@
+CONFIG_TI_EMIF_SRAM=m