summaryrefslogtreecommitdiffstats
path: root/baseconfig/arm
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-03-01 12:12:17 +0000
committerPeter Robinson <pbrobinson@gmail.com>2017-03-01 12:12:17 +0000
commit51f1cbdea98a8b36de6daa5b0f2dfb6b26647a4d (patch)
tree5fa8795399ba50259b58536a36f350e049a9c81a /baseconfig/arm
parent1652b3b29eb207a6455cf6389a0b92b41ecb5e04 (diff)
downloadkernel-51f1cbdea98a8b36de6daa5b0f2dfb6b26647a4d.tar.gz
kernel-51f1cbdea98a8b36de6daa5b0f2dfb6b26647a4d.tar.xz
kernel-51f1cbdea98a8b36de6daa5b0f2dfb6b26647a4d.zip
- Enable Tiny DRM on ARM platforms
- ARM config updates - General config cleanups - Add patch to fix desktop lockups on RPi (vc4) RHBZ# 1389163
Diffstat (limited to 'baseconfig/arm')
-rw-r--r--baseconfig/arm/CONFIG_AGP1
-rw-r--r--baseconfig/arm/CONFIG_DRM_NXP_PTN34601
-rw-r--r--baseconfig/arm/CONFIG_DRM_PARADE_PS86221
-rw-r--r--baseconfig/arm/CONFIG_DRM_TINYDRM1
-rw-r--r--baseconfig/arm/CONFIG_I2C_TEGRA_BPMP1
-rw-r--r--baseconfig/arm/CONFIG_RFKILL_REGULATOR1
-rw-r--r--baseconfig/arm/CONFIG_SERIAL_NONSTANDARD1
-rw-r--r--baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG1
-rw-r--r--baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND1
-rw-r--r--baseconfig/arm/CONFIG_SUN50I_A64_CCU1
-rw-r--r--baseconfig/arm/CONFIG_SUN6I_A31_CCU1
-rw-r--r--baseconfig/arm/CONFIG_SUN8I_A23_CCU1
-rw-r--r--baseconfig/arm/CONFIG_SUN8I_A33_CCU1
-rw-r--r--baseconfig/arm/CONFIG_SUN8I_H3_CCU1
-rw-r--r--baseconfig/arm/CONFIG_SUNXI_CCU1
-rw-r--r--baseconfig/arm/CONFIG_TINYDRM_MI0283QT1
-rw-r--r--baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON1
-rw-r--r--baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X1
-rw-r--r--baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI36601
-rw-r--r--baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_CHARGER_AXP20X1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE2
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_RK3288_HDMI_ANALOG1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_RK3399_GRU_SOUND1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL50001
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA_SGTL50002
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC2
-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_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_V3S_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SUN9I_A80_CCU1
-rw-r--r--baseconfig/arm/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS2
-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_OMAP_MUX_DEBUG1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_IMX_VDOA1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS1
48 files changed, 39 insertions, 13 deletions
diff --git a/baseconfig/arm/CONFIG_AGP b/baseconfig/arm/CONFIG_AGP
deleted file mode 100644
index f7332ef53..000000000
--- a/baseconfig/arm/CONFIG_AGP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AGP is not set
diff --git a/baseconfig/arm/CONFIG_DRM_NXP_PTN3460 b/baseconfig/arm/CONFIG_DRM_NXP_PTN3460
new file mode 100644
index 000000000..e4647af6c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_NXP_PTN3460
@@ -0,0 +1 @@
+CONFIG_DRM_NXP_PTN3460=m
diff --git a/baseconfig/arm/CONFIG_DRM_PARADE_PS8622 b/baseconfig/arm/CONFIG_DRM_PARADE_PS8622
new file mode 100644
index 000000000..ff6fd7e1b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_PARADE_PS8622
@@ -0,0 +1 @@
+CONFIG_DRM_PARADE_PS8622=m
diff --git a/baseconfig/arm/CONFIG_DRM_TINYDRM b/baseconfig/arm/CONFIG_DRM_TINYDRM
new file mode 100644
index 000000000..4e6e01bfe
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_TINYDRM
@@ -0,0 +1 @@
+CONFIG_DRM_TINYDRM=m
diff --git a/baseconfig/arm/CONFIG_I2C_TEGRA_BPMP b/baseconfig/arm/CONFIG_I2C_TEGRA_BPMP
new file mode 100644
index 000000000..71099e082
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_TEGRA_BPMP
@@ -0,0 +1 @@
+CONFIG_I2C_TEGRA_BPMP=m
diff --git a/baseconfig/arm/CONFIG_RFKILL_REGULATOR b/baseconfig/arm/CONFIG_RFKILL_REGULATOR
deleted file mode 100644
index 64e4c4774..000000000
--- a/baseconfig/arm/CONFIG_RFKILL_REGULATOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RFKILL_REGULATOR=m
diff --git a/baseconfig/arm/CONFIG_SERIAL_NONSTANDARD b/baseconfig/arm/CONFIG_SERIAL_NONSTANDARD
new file mode 100644
index 000000000..57688cbec
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SERIAL_NONSTANDARD
@@ -0,0 +1 @@
+# CONFIG_SERIAL_NONSTANDARD is not set
diff --git a/baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG b/baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
new file mode 100644
index 000000000..8034e86d4
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
diff --git a/baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND b/baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND
new file mode 100644
index 000000000..a1f8108ff
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SND_SOC_RK3399_GRU_SOUND
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RK3399_GRU_SOUND=m
diff --git a/baseconfig/arm/CONFIG_SUN50I_A64_CCU b/baseconfig/arm/CONFIG_SUN50I_A64_CCU
new file mode 100644
index 000000000..9ce6c792a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUN50I_A64_CCU
@@ -0,0 +1 @@
+# CONFIG_SUN50I_A64_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN6I_A31_CCU b/baseconfig/arm/CONFIG_SUN6I_A31_CCU
new file mode 100644
index 000000000..5ce1bb3f7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUN6I_A31_CCU
@@ -0,0 +1 @@
+# CONFIG_SUN6I_A31_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_A23_CCU b/baseconfig/arm/CONFIG_SUN8I_A23_CCU
new file mode 100644
index 000000000..26ae1100c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUN8I_A23_CCU
@@ -0,0 +1 @@
+# CONFIG_SUN8I_A23_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_A33_CCU b/baseconfig/arm/CONFIG_SUN8I_A33_CCU
new file mode 100644
index 000000000..e1a357ee8
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUN8I_A33_CCU
@@ -0,0 +1 @@
+# CONFIG_SUN8I_A33_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUN8I_H3_CCU b/baseconfig/arm/CONFIG_SUN8I_H3_CCU
new file mode 100644
index 000000000..02cfb2c97
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUN8I_H3_CCU
@@ -0,0 +1 @@
+# CONFIG_SUN8I_H3_CCU is not set
diff --git a/baseconfig/arm/CONFIG_SUNXI_CCU b/baseconfig/arm/CONFIG_SUNXI_CCU
new file mode 100644
index 000000000..a383113ef
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SUNXI_CCU
@@ -0,0 +1 @@
+# CONFIG_SUNXI_CCU is not set
diff --git a/baseconfig/arm/CONFIG_TINYDRM_MI0283QT b/baseconfig/arm/CONFIG_TINYDRM_MI0283QT
new file mode 100644
index 000000000..98bb3288d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TINYDRM_MI0283QT
@@ -0,0 +1 @@
+CONFIG_TINYDRM_MI0283QT=m
diff --git a/baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI b/baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI
new file mode 100644
index 000000000..bb0235842
--- /dev/null
+++ b/baseconfig/arm/CONFIG_TINYDRM_MIPI_DBI
@@ -0,0 +1 @@
+CONFIG_TINYDRM_MIPI_DBI=m
diff --git a/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON b/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON
new file mode 100644
index 000000000..c0741cab5
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON
@@ -0,0 +1 @@
+CONFIG_ARMADA_AP806_SYSCON=y
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X b/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X
new file mode 100644
index 000000000..2e64e7733
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X
@@ -0,0 +1 @@
+CONFIG_CHARGER_AXP20X=m
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660
new file mode 100644
index 000000000..44693544d
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_HI3660=y
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..d156cb188
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF
new file mode 100644
index 000000000..c0b108aba
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF
@@ -0,0 +1 @@
+CONFIG_SND_SUN4I_SPDIF=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC b/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC
new file mode 100644
index 000000000..c30f94369
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG
new file mode 100644
index 000000000..28ea30190
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU b/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU
new file mode 100644
index 000000000..7b6c7a687
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU
@@ -0,0 +1 @@
+CONFIG_SUN50I_A64_CCU=y
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_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_PHY_EXYNOS_PCIE b/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
index 985c33c06..26417e932 100644
--- a/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
+++ b/baseconfig/arm/armv7/CONFIG_PHY_EXYNOS_PCIE
@@ -1 +1 @@
-# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_EXYNOS_PCIE=y
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3288_HDMI_ANALOG b/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
deleted file mode 100644
index 57aaa9e68..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_RK3288_HDMI_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set
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/CONFIG_SND_SOC_SGTL5000 b/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000
new file mode 100644
index 000000000..ea71dece1
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_SGTL5000
@@ -0,0 +1 @@
+CONFIG_SND_SOC_SGTL5000=m
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/CONFIG_SND_SUN8I_CODEC b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
index 60800b8ae..c30f94369 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
+++ b/baseconfig/arm/armv7/CONFIG_SND_SUN8I_CODEC
@@ -1 +1 @@
-# CONFIG_SND_SUN8I_CODEC is not set
+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_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_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_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_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_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_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