- Enable Tiny DRM on ARM platforms

- ARM config updates
- General config cleanups
- Add patch to fix desktop lockups on RPi (vc4) RHBZ# 1389163

87 files changed, 42 insertions, 35 deletions

diff --git a/baseconfig/CONFIG_ARM64_PTDUMP b/baseconfig/CONFIG_ARM64_PTDUMP
deleted file mode 100644
index 5090299f2..000000000
--- a/baseconfig/CONFIG_ARM64_PTDUMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM64_PTDUMP is not set
diff --git a/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN
deleted file mode 100644
index 3b878e832..000000000
--- a/baseconfig/CONFIG_ARM64_SW_TTBR0_PAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
diff --git a/baseconfig/CONFIG_ARM_SCPI_PROTOCOL b/baseconfig/CONFIG_ARM_SCPI_PROTOCOL
deleted file mode 100644
index 438b6d561..000000000
--- a/baseconfig/CONFIG_ARM_SCPI_PROTOCOL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_SCPI_PROTOCOL is not set
diff --git a/baseconfig/CONFIG_COMMON_CLK_HI3660 b/baseconfig/CONFIG_COMMON_CLK_HI3660
deleted file mode 100644
index eb7529aa1..000000000
--- a/baseconfig/CONFIG_COMMON_CLK_HI3660
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_COMMON_CLK_HI3660 is not set
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE b/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE
deleted file mode 100644
index ee9966699..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRC32_ARM64_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32_ARM_CE b/baseconfig/CONFIG_CRYPTO_CRC32_ARM_CE
deleted file mode 100644
index 242e37489..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRC32_ARM_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32_ARM_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE b/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
deleted file mode 100644
index c59d53cfb..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM64_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM_CE b/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
deleted file mode 100644
index 6b13ea30c..000000000
--- a/baseconfig/CONFIG_CRYPTO_CRCT10DIF_ARM_CE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
diff --git a/baseconfig/CONFIG_CRYPTO_SHA256_ARM64 b/baseconfig/CONFIG_CRYPTO_SHA256_ARM64
deleted file mode 100644
index ba32f8501..000000000
--- a/baseconfig/CONFIG_CRYPTO_SHA256_ARM64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA256_ARM64=m
diff --git a/baseconfig/CONFIG_CRYPTO_SHA512_ARM64 b/baseconfig/CONFIG_CRYPTO_SHA512_ARM64
deleted file mode 100644
index de1c4c957..000000000
--- a/baseconfig/CONFIG_CRYPTO_SHA512_ARM64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA512_ARM64=m
diff --git a/baseconfig/CONFIG_DEBUG_VM_RB b/baseconfig/CONFIG_DEBUG_VM_RB
new file mode 100644
index 000000000..fbc8aaef8
--- /dev/null
+++ b/baseconfig/CONFIG_DEBUG_VM_RB
@@ -0,0 +1 @@
+# CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
diff --git a/baseconfig/CONFIG_FB_INTEL b/baseconfig/CONFIG_FB_INTEL
deleted file mode 100644
index d5ca4253f..000000000
--- a/baseconfig/CONFIG_FB_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL is not set
diff --git a/baseconfig/CONFIG_FB_INTEL_DEBUG b/baseconfig/CONFIG_FB_INTEL_DEBUG
deleted file mode 100644
index b3ff96e60..000000000
--- a/baseconfig/CONFIG_FB_INTEL_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL_DEBUG is not set
diff --git a/baseconfig/CONFIG_FB_INTEL_I2C b/baseconfig/CONFIG_FB_INTEL_I2C
deleted file mode 100644
index 7dbd2269f..000000000
--- a/baseconfig/CONFIG_FB_INTEL_I2C
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_INTEL_I2C is not set
diff --git a/baseconfig/CONFIG_INTEL_RDT_A b/baseconfig/CONFIG_INTEL_RDT_A
deleted file mode 100644
index 8c02d1afc..000000000
--- a/baseconfig/CONFIG_INTEL_RDT_A
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_RDT_A=y
diff --git a/baseconfig/CONFIG_QCOM_EBI2 b/baseconfig/CONFIG_QCOM_EBI2
deleted file mode 100644
index e96b3544e..000000000
--- a/baseconfig/CONFIG_QCOM_EBI2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_EBI2 is not set
diff --git a/baseconfig/CONFIG_RADIO_WL128X depends on TI_ST which we don't enable b/baseconfig/CONFIG_RADIO_WL128X depends on TI_ST which we don't enable
deleted file mode 100644
index da0cf2eb9..000000000
--- a/baseconfig/CONFIG_RADIO_WL128X depends on TI_ST which we don't enable
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RADIO_WL128X is not set # depends on TI_ST which we don't enable
diff --git a/baseconfig/CONFIG_SND_SOC_HDAC_HDMI b/baseconfig/CONFIG_SND_SOC_HDAC_HDMI
new file mode 100644
index 000000000..dfefcf887
--- /dev/null
+++ b/baseconfig/CONFIG_SND_SOC_HDAC_HDMI
@@ -0,0 +1 @@
+CONFIG_SND_SOC_HDAC_HDMI=m
diff --git a/baseconfig/CONFIG_TEGRA_GMI b/baseconfig/CONFIG_TEGRA_GMI
deleted file mode 100644
index 5def3e891..000000000
--- a/baseconfig/CONFIG_TEGRA_GMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA_GMI=m
diff --git a/baseconfig/CONFIG_VIDEO_SAMSUNG_S5P_CEC b/baseconfig/CONFIG_VIDEO_SAMSUNG_S5P_CEC
deleted file mode 100644
index 67462a76e..000000000
--- a/baseconfig/CONFIG_VIDEO_SAMSUNG_S5P_CEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
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
diff --git a/baseconfig/arm/CONFIG_AGP b/baseconfig/powerpc/CONFIG_AGP
index f7332ef53..f7332ef53 100644
--- a/baseconfig/arm/CONFIG_AGP
+++ b/baseconfig/powerpc/CONFIG_AGP
diff --git a/baseconfig/CONFIG_AGP b/baseconfig/powerpc/powerpc64/CONFIG_AGP
index ea543fee8..ea543fee8 100644
--- a/baseconfig/CONFIG_AGP
+++ b/baseconfig/powerpc/powerpc64/CONFIG_AGP
diff --git a/baseconfig/x86/CONFIG_AGP b/baseconfig/x86/CONFIG_AGP
new file mode 100644
index 000000000..ea543fee8
--- /dev/null
+++ b/baseconfig/x86/CONFIG_AGP
@@ -0,0 +1 @@
+CONFIG_AGP=y
diff --git a/baseconfig/CONFIG_AGP_ALI b/baseconfig/x86/CONFIG_AGP_ALI
index c46aee1e8..c46aee1e8 100644
--- a/baseconfig/CONFIG_AGP_ALI
+++ b/baseconfig/x86/CONFIG_AGP_ALI
diff --git a/baseconfig/CONFIG_AGP_AMD b/baseconfig/x86/CONFIG_AGP_AMD
index 142f8a1cd..142f8a1cd 100644
--- a/baseconfig/CONFIG_AGP_AMD
+++ b/baseconfig/x86/CONFIG_AGP_AMD
diff --git a/baseconfig/CONFIG_AGP_AMD64 b/baseconfig/x86/CONFIG_AGP_AMD64
index 97e9526e4..97e9526e4 100644
--- a/baseconfig/CONFIG_AGP_AMD64
+++ b/baseconfig/x86/CONFIG_AGP_AMD64
diff --git a/baseconfig/CONFIG_AGP_ATI b/baseconfig/x86/CONFIG_AGP_ATI
index 1f551caec..1f551caec 100644
--- a/baseconfig/CONFIG_AGP_ATI
+++ b/baseconfig/x86/CONFIG_AGP_ATI
diff --git a/baseconfig/CONFIG_AGP_EFFICEON b/baseconfig/x86/CONFIG_AGP_EFFICEON
index 070b4ae60..070b4ae60 100644
--- a/baseconfig/CONFIG_AGP_EFFICEON
+++ b/baseconfig/x86/CONFIG_AGP_EFFICEON
diff --git a/baseconfig/CONFIG_AGP_INTEL b/baseconfig/x86/CONFIG_AGP_INTEL
index 524a67977..524a67977 100644
--- a/baseconfig/CONFIG_AGP_INTEL
+++ b/baseconfig/x86/CONFIG_AGP_INTEL
diff --git a/baseconfig/CONFIG_AGP_NVIDIA b/baseconfig/x86/CONFIG_AGP_NVIDIA
index f177c1d92..f177c1d92 100644
--- a/baseconfig/CONFIG_AGP_NVIDIA
+++ b/baseconfig/x86/CONFIG_AGP_NVIDIA
diff --git a/baseconfig/CONFIG_AGP_SIS b/baseconfig/x86/CONFIG_AGP_SIS
index dac4635e3..dac4635e3 100644
--- a/baseconfig/CONFIG_AGP_SIS
+++ b/baseconfig/x86/CONFIG_AGP_SIS
diff --git a/baseconfig/CONFIG_AGP_SWORKS b/baseconfig/x86/CONFIG_AGP_SWORKS
index 09d99f431..09d99f431 100644
--- a/baseconfig/CONFIG_AGP_SWORKS
+++ b/baseconfig/x86/CONFIG_AGP_SWORKS
diff --git a/baseconfig/CONFIG_AGP_VIA b/baseconfig/x86/CONFIG_AGP_VIA
index 21da1a429..21da1a429 100644
--- a/baseconfig/CONFIG_AGP_VIA
+++ b/baseconfig/x86/CONFIG_AGP_VIA
diff --git a/baseconfig/CONFIG_CRYPTO_CRC32C_INTEL b/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL
index c500b4f55..c500b4f55 100644
--- a/baseconfig/CONFIG_CRYPTO_CRC32C_INTEL
+++ b/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL
diff --git a/baseconfig/CONFIG_LEDS_INTEL_SS4200 b/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200
index 9937903af..9937903af 100644
--- a/baseconfig/CONFIG_LEDS_INTEL_SS4200
+++ b/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200
diff --git a/baseconfig/x86/CONFIG_MFD_AXP20X b/baseconfig/x86/CONFIG_MFD_AXP20X
deleted file mode 100644
index 1d658245a..000000000
--- a/baseconfig/x86/CONFIG_MFD_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AXP20X is not set
diff --git a/baseconfig/x86/i686/CONFIG_I2C_PXA b/baseconfig/x86/i686/CONFIG_I2C_PXA
deleted file mode 100644
index 59d18f0cb..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_PXA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PXA=m
diff --git a/baseconfig/x86/i686/CONFIG_LEDS_INTEL_SS4200 b/baseconfig/x86/i686/CONFIG_LEDS_INTEL_SS4200
deleted file mode 100644
index 9937903af..000000000
--- a/baseconfig/x86/i686/CONFIG_LEDS_INTEL_SS4200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_INTEL_SS4200=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_PXA b/baseconfig/x86/i686PAE/CONFIG_I2C_PXA
deleted file mode 100644
index 59d18f0cb..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_PXA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PXA=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_LEDS_INTEL_SS4200 b/baseconfig/x86/i686PAE/CONFIG_LEDS_INTEL_SS4200
deleted file mode 100644
index 9937903af..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_LEDS_INTEL_SS4200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_INTEL_SS4200=m