456 files changed, 27 insertions, 7 deletions

diff --git a/baseconfig/arm/CONFIG_ARCH_BCM_HR2 b/baseconfig/arm/CONFIG_ARCH_BCM_HR2
new file mode 100644
index 000000000..e7a5a2028
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARCH_BCM_HR2
@@ -0,0 +1 @@
+# CONFIG_ARCH_BCM_HR2 is not set
diff --git a/baseconfig/arm/CONFIG_ARM_SPE_PMU b/baseconfig/arm/CONFIG_ARM_SPE_PMU
new file mode 100644
index 000000000..c7f32cf49
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARM_SPE_PMU
@@ -0,0 +1 @@
+CONFIG_ARM_SPE_PMU=m
diff --git a/baseconfig/arm/CONFIG_BINFMT_ELF_FDPIC b/baseconfig/arm/CONFIG_BINFMT_ELF_FDPIC
new file mode 100644
index 000000000..f399e3a85
--- /dev/null
+++ b/baseconfig/arm/CONFIG_BINFMT_ELF_FDPIC
@@ -0,0 +1 @@
+# CONFIG_BINFMT_ELF_FDPIC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI b/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI
index cda1f60f8..cda1f60f8 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI
+++ b/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI
diff --git a/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI_CEC b/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI_CEC
new file mode 100644
index 000000000..146d9409f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI_CEC
@@ -0,0 +1 @@
+CONFIG_DRM_SUN4I_HDMI_CEC=y
diff --git a/baseconfig/arm/armv7/CONFIG_GPIO_PCF857X b/baseconfig/arm/CONFIG_GPIO_PCF857X
index a5a82a6b0..a5a82a6b0 100644
--- a/baseconfig/arm/armv7/CONFIG_GPIO_PCF857X
+++ b/baseconfig/arm/CONFIG_GPIO_PCF857X
diff --git a/baseconfig/arm/CONFIG_HISI_PMU b/baseconfig/arm/CONFIG_HISI_PMU
new file mode 100644
index 000000000..7bd6395da
--- /dev/null
+++ b/baseconfig/arm/CONFIG_HISI_PMU
@@ -0,0 +1 @@
+CONFIG_HISI_PMU=y
diff --git a/baseconfig/arm/CONFIG_MESON_IRQ_GPIO b/baseconfig/arm/CONFIG_MESON_IRQ_GPIO
new file mode 100644
index 000000000..ee5500285
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_IRQ_GPIO
@@ -0,0 +1 @@
+CONFIG_MESON_IRQ_GPIO=y
diff --git a/baseconfig/arm/CONFIG_MMC_MESON_MX_SDIO b/baseconfig/arm/CONFIG_MMC_MESON_MX_SDIO
new file mode 100644
index 000000000..4b58af460
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MMC_MESON_MX_SDIO
@@ -0,0 +1 @@
+CONFIG_MMC_MESON_MX_SDIO=m
diff --git a/baseconfig/arm/CONFIG_MMC_SDHCI_OMAP b/baseconfig/arm/CONFIG_MMC_SDHCI_OMAP
new file mode 100644
index 000000000..293bf33c5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MMC_SDHCI_OMAP
@@ -0,0 +1 @@
+CONFIG_MMC_SDHCI_OMAP=m
diff --git a/baseconfig/arm/CONFIG_NVMEM_SNVS_LPGPR b/baseconfig/arm/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..be81f38c4
--- /dev/null
+++ b/baseconfig/arm/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+# CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/baseconfig/arm/CONFIG_PCIE_HISI_STB b/baseconfig/arm/CONFIG_PCIE_HISI_STB
new file mode 100644
index 000000000..40c67db5f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PCIE_HISI_STB
@@ -0,0 +1 @@
+CONFIG_PCIE_HISI_STB=y
diff --git a/baseconfig/arm/CONFIG_PINCTRL_MESON8 b/baseconfig/arm/CONFIG_PINCTRL_MESON8
new file mode 100644
index 000000000..49f6d3fc4
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PINCTRL_MESON8
@@ -0,0 +1 @@
+# CONFIG_PINCTRL_MESON8 is not set
diff --git a/baseconfig/arm/CONFIG_PINCTRL_MESON8B b/baseconfig/arm/CONFIG_PINCTRL_MESON8B
new file mode 100644
index 000000000..fe5151cbd
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PINCTRL_MESON8B
@@ -0,0 +1 @@
+# CONFIG_PINCTRL_MESON8B is not set
diff --git a/baseconfig/arm/CONFIG_QCOM_RMTFS_MEM b/baseconfig/arm/CONFIG_QCOM_RMTFS_MEM
new file mode 100644
index 000000000..3d1c319a9
--- /dev/null
+++ b/baseconfig/arm/CONFIG_QCOM_RMTFS_MEM
@@ -0,0 +1 @@
+CONFIG_QCOM_RMTFS_MEM=m
diff --git a/baseconfig/arm/CONFIG_RESET_SIMPLE b/baseconfig/arm/CONFIG_RESET_SIMPLE
new file mode 100644
index 000000000..663fbe2ec
--- /dev/null
+++ b/baseconfig/arm/CONFIG_RESET_SIMPLE
@@ -0,0 +1 @@
+CONFIG_RESET_SIMPLE=y
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_LVDS b/baseconfig/arm/CONFIG_ROCKCHIP_LVDS
new file mode 100644
index 000000000..8ea9897b8
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_LVDS
@@ -0,0 +1 @@
+CONFIG_ROCKCHIP_LVDS=y
diff --git a/baseconfig/arm/CONFIG_SIMPLE_PM_BUS b/baseconfig/arm/CONFIG_SIMPLE_PM_BUS
new file mode 100644
index 000000000..3cc21476a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SIMPLE_PM_BUS
@@ -0,0 +1 @@
+CONFIG_SIMPLE_PM_BUS=y
diff --git a/baseconfig/arm/CONFIG_VIDEO_ROCKCHIP_RGA b/baseconfig/arm/CONFIG_VIDEO_ROCKCHIP_RGA
new file mode 100644
index 000000000..433e78fa5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_VIDEO_ROCKCHIP_RGA
@@ -0,0 +1 @@
+CONFIG_VIDEO_ROCKCHIP_RGA=m
diff --git a/baseconfig/arm/CONFIG_VIDEO_TEGRA_HDMI_CEC b/baseconfig/arm/CONFIG_VIDEO_TEGRA_HDMI_CEC
new file mode 100644
index 000000000..01064a677
--- /dev/null
+++ b/baseconfig/arm/CONFIG_VIDEO_TEGRA_HDMI_CEC
@@ -0,0 +1 @@
+CONFIG_VIDEO_TEGRA_HDMI_CEC=m
diff --git a/baseconfig/arm/arm64/CONFIG_64BIT b/baseconfig/arm/aarch64/CONFIG_64BIT
index 06a94e48b..06a94e48b 100644
--- a/baseconfig/arm/arm64/CONFIG_64BIT
+++ b/baseconfig/arm/aarch64/CONFIG_64BIT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI b/baseconfig/arm/aarch64/CONFIG_ACPI
index 839566bae..839566bae 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI
index 9ab33facf..9ab33facf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_EINJ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_EINJ
index 2d03b69a1..2d03b69a1 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_EINJ
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_EINJ
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_ERST_DEBUG b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
index 235760d40..235760d40 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_ERST_DEBUG
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_GHES b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_GHES
index 8fd037d8f..8fd037d8f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_GHES
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_GHES
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
index 46aa1579f..46aa1579f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_PCIEAER b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
index 26f3e9129..26f3e9129 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_PCIEAER
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_SEA
index db573ffb8..db573ffb8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_APEI_SEA
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_APEI_SEA
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_BGRT b/baseconfig/arm/aarch64/CONFIG_ACPI_BGRT
index 13035dd82..13035dd82 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_BGRT
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_BGRT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_BUTTON b/baseconfig/arm/aarch64/CONFIG_ACPI_BUTTON
index e40dff40b..e40dff40b 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_BUTTON
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_BUTTON
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CONFIGFS b/baseconfig/arm/aarch64/CONFIG_ACPI_CONFIGFS
index fc2af2c0b..fc2af2c0b 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CONFIGFS
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_CONFIGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CONTAINER b/baseconfig/arm/aarch64/CONFIG_ACPI_CONTAINER
index 24287daf8..24287daf8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CONTAINER
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_CONTAINER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ b/baseconfig/arm/aarch64/CONFIG_ACPI_CPPC_CPUFREQ
index 5cc88132a..5cc88132a 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_CPPC_CPUFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CUSTOM_METHOD b/baseconfig/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
index 76853b6d8..76853b6d8 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CUSTOM_METHOD
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_DOCK b/baseconfig/arm/aarch64/CONFIG_ACPI_DOCK
index e4d916353..e4d916353 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_DOCK
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_DOCK
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_EC_DEBUGFS b/baseconfig/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
index df1424cee..df1424cee 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_EC_DEBUGFS
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_FAN b/baseconfig/arm/aarch64/CONFIG_ACPI_FAN
index f45a96673..f45a96673 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_FAN
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_FAN
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_HED b/baseconfig/arm/aarch64/CONFIG_ACPI_HED
index 06042df5a..06042df5a 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_HED
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_HED
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION b/baseconfig/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
index 92036b975..92036b975 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_I2C_OPREGION
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_IPMI b/baseconfig/arm/aarch64/CONFIG_ACPI_IPMI
index e40fb9aea..e40fb9aea 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_IPMI
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_IPMI
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT b/baseconfig/arm/aarch64/CONFIG_ACPI_NFIT
index 922b719bf..922b719bf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_NFIT
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT_DEBUG b/baseconfig/arm/aarch64/CONFIG_ACPI_NFIT_DEBUG
index fc829324f..fc829324f 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NFIT_DEBUG
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_NFIT_DEBUG
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_NUMA b/baseconfig/arm/aarch64/CONFIG_ACPI_NUMA
index 19881f440..19881f440 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_NUMA
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_NUMA
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_PROCESSOR b/baseconfig/arm/aarch64/CONFIG_ACPI_PROCESSOR
index a24416dcf..a24416dcf 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_PROCESSOR
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_PROCESSOR
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_PROCFS_POWER b/baseconfig/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
index 26cea3179..26cea3179 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_PROCFS_POWER
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_TABLE_UPGRADE b/baseconfig/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
index 276233fba..276233fba 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_TABLE_UPGRADE
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_THERMAL b/baseconfig/arm/aarch64/CONFIG_ACPI_THERMAL
index 1bd7964b4..1bd7964b4 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_THERMAL
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_ACPI_WATCHDOG
index d82966e07..d82966e07 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_ACPI_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_AHCI_SUNXI b/baseconfig/arm/aarch64/CONFIG_AHCI_SUNXI
index 91560d628..91560d628 100644
--- a/baseconfig/arm/arm64/CONFIG_AHCI_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_AHCI_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_AHCI_XGENE b/baseconfig/arm/aarch64/CONFIG_AHCI_XGENE
index 7e02b9914..7e02b9914 100644
--- a/baseconfig/arm/arm64/CONFIG_AHCI_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_AHCI_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_AMBA_PL08X b/baseconfig/arm/aarch64/CONFIG_AMBA_PL08X
index a13d91b90..a13d91b90 100644
--- a/baseconfig/arm/arm64/CONFIG_AMBA_PL08X
+++ b/baseconfig/arm/aarch64/CONFIG_AMBA_PL08X
diff --git a/baseconfig/arm/arm64/CONFIG_AMD_XGBE b/baseconfig/arm/aarch64/CONFIG_AMD_XGBE
index 27be1a7ee..27be1a7ee 100644
--- a/baseconfig/arm/arm64/CONFIG_AMD_XGBE
+++ b/baseconfig/arm/aarch64/CONFIG_AMD_XGBE
diff --git a/baseconfig/arm/arm64/CONFIG_AMD_XGBE_DCB b/baseconfig/arm/aarch64/CONFIG_AMD_XGBE_DCB
index f3cdcca89..f3cdcca89 100644
--- a/baseconfig/arm/arm64/CONFIG_AMD_XGBE_DCB
+++ b/baseconfig/arm/aarch64/CONFIG_AMD_XGBE_DCB
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084 b/baseconfig/arm/aarch64/CONFIG_APQ_GCC_8084
index bacb61e5e..bacb61e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
+++ b/baseconfig/arm/aarch64/CONFIG_APQ_GCC_8084
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_MMCC_8084 b/baseconfig/arm/aarch64/CONFIG_APQ_MMCC_8084
index 05c8d0c7b..05c8d0c7b 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_MMCC_8084
+++ b/baseconfig/arm/aarch64/CONFIG_APQ_MMCC_8084
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ALPINE b/baseconfig/arm/aarch64/CONFIG_ARCH_ALPINE
index a347a04fc..a347a04fc 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ALPINE
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_ALPINE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_BERLIN b/baseconfig/arm/aarch64/CONFIG_ARCH_BERLIN
index 9a647a4a1..9a647a4a1 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_BERLIN
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_BERLIN
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_EXYNOS b/baseconfig/arm/aarch64/CONFIG_ARCH_EXYNOS
index 1ee894dd8..1ee894dd8 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_EXYNOS
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_EXYNOS
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL b/baseconfig/arm/aarch64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
index e87b4da10..e87b4da10 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_HISI b/baseconfig/arm/aarch64/CONFIG_ARCH_HISI
index 9afa5dcee..9afa5dcee 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_HISI
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_LAYERSCAPE b/baseconfig/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
index 257f6f91d..257f6f91d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_LAYERSCAPE
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_LG1K b/baseconfig/arm/aarch64/CONFIG_ARCH_LG1K
index 0d73af4e2..0d73af4e2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_LG1K
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_LG1K
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_MEDIATEK b/baseconfig/arm/aarch64/CONFIG_ARCH_MEDIATEK
index 62b0a1f19..62b0a1f19 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_MEDIATEK
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_MEDIATEK
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_QCOM b/baseconfig/arm/aarch64/CONFIG_ARCH_QCOM
index e51a38aa6..e51a38aa6 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_QCOM
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_REALTEK b/baseconfig/arm/aarch64/CONFIG_ARCH_REALTEK
index 49536f6d5..49536f6d5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_REALTEK
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_REALTEK
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_RENESAS b/baseconfig/arm/aarch64/CONFIG_ARCH_RENESAS
index 0fa3a2ec3..0fa3a2ec3 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_RENESAS
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_RENESAS
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SEATTLE b/baseconfig/arm/aarch64/CONFIG_ARCH_SEATTLE
index 83c1e8bc4..83c1e8bc4 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SEATTLE
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_SEATTLE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SPRD b/baseconfig/arm/aarch64/CONFIG_ARCH_SPRD
index a090576de..a090576de 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SPRD
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_SPRD
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_STRATIX10 b/baseconfig/arm/aarch64/CONFIG_ARCH_STRATIX10
index ef575bb37..ef575bb37 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_STRATIX10
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_STRATIX10
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_SUNXI b/baseconfig/arm/aarch64/CONFIG_ARCH_SUNXI
index 6cf4026fd..6cf4026fd 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_SUNXI
diff --git a/baseconfig/arm/aarch64/CONFIG_ARCH_SYNQUACER b/baseconfig/arm/aarch64/CONFIG_ARCH_SYNQUACER
new file mode 100644
index 000000000..e1902121d
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_SYNQUACER
@@ -0,0 +1 @@
+CONFIG_ARCH_SYNQUACER=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA
index 3b74d56f4..3b74d56f4 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_132_SOC b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_132_SOC
index b6d3de856..b6d3de856 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_132_SOC
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_132_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_186_SOC
index 1cafdb24f..1cafdb24f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_186_SOC
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_186_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_210_SOC b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_210_SOC
index 0750c3ec0..0750c3ec0 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_TEGRA_210_SOC
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_TEGRA_210_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER b/baseconfig/arm/aarch64/CONFIG_ARCH_THUNDER
index fc1527e5e..fc1527e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_THUNDER
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER2 b/baseconfig/arm/aarch64/CONFIG_ARCH_THUNDER2
index aa0f1f319..aa0f1f319 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_THUNDER2
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_THUNDER2
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_UNIPHIER b/baseconfig/arm/aarch64/CONFIG_ARCH_UNIPHIER
index 2c1103337..2c1103337 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_UNIPHIER
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_UNIPHIER
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_XGENE b/baseconfig/arm/aarch64/CONFIG_ARCH_XGENE
index c1bd4d116..c1bd4d116 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ZX b/baseconfig/arm/aarch64/CONFIG_ARCH_ZX
index ec10bbf1d..ec10bbf1d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ZX
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_ZX
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_ZYNQMP b/baseconfig/arm/aarch64/CONFIG_ARCH_ZYNQMP
index f92a386c6..f92a386c6 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_ZYNQMP
+++ b/baseconfig/arm/aarch64/CONFIG_ARCH_ZYNQMP
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64 b/baseconfig/arm/aarch64/CONFIG_ARM64
index e40393f9a..e40393f9a 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES b/baseconfig/arm/aarch64/CONFIG_ARM64_4K_PAGES
index 5df91df1a..5df91df1a 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_4K_PAGES
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL b/baseconfig/arm/aarch64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
index bdb51423d..bdb51423d 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ACPI_PARKING_PROTOCOL
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_CRYPTO b/baseconfig/arm/aarch64/CONFIG_ARM64_CRYPTO
index 3e9856e5e..3e9856e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_CRYPTO
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_CRYPTO
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_819472 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_819472
index e53fbbbe5..e53fbbbe5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_819472
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_819472
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_824069 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_824069
index 2b4897f44..2b4897f44 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_824069
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_824069
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_826319 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_826319
index 8a3b9aaaf..8a3b9aaaf 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_826319
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_826319
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_827319 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_827319
index d341b420c..d341b420c 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_827319
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_827319
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_832075 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_832075
index 9d1f8fcd7..9d1f8fcd7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_832075
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_832075
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_834220 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_834220
index a4bf47d17..a4bf47d17 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_834220
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_834220
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_843419 b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_843419
index 303cae762..303cae762 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_ERRATUM_843419
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_ERRATUM_843419
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_HW_AFDBM b/baseconfig/arm/aarch64/CONFIG_ARM64_HW_AFDBM
index 4fc9f03d7..4fc9f03d7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_HW_AFDBM
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_HW_AFDBM
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_LSE_ATOMICS b/baseconfig/arm/aarch64/CONFIG_ARM64_LSE_ATOMICS
index a54d60033..a54d60033 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_LSE_ATOMICS
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_LSE_ATOMICS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PAN b/baseconfig/arm/aarch64/CONFIG_ARM64_PAN
index ac8c85ac7..ac8c85ac7 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PAN
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_PAN
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PMEM b/baseconfig/arm/aarch64/CONFIG_ARM64_PMEM
index 9325600d1..9325600d1 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PMEM
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_PMEM
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP b/baseconfig/arm/aarch64/CONFIG_ARM64_PTDUMP
index 5090299f2..5090299f2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_PTDUMP
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP_DEBUGFS b/baseconfig/arm/aarch64/CONFIG_ARM64_PTDUMP_DEBUGFS
index 2d698a99e..2d698a99e 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_PTDUMP_DEBUGFS
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_PTDUMP_DEBUGFS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET b/baseconfig/arm/aarch64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
index a7f7cd778..a7f7cd778 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_RELOC_TEST b/baseconfig/arm/aarch64/CONFIG_ARM64_RELOC_TEST
index 864fc6a6b..864fc6a6b 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_RELOC_TEST
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_RELOC_TEST
diff --git a/baseconfig/arm/aarch64/CONFIG_ARM64_SVE b/baseconfig/arm/aarch64/CONFIG_ARM64_SVE
new file mode 100644
index 000000000..cbb647e27
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_SVE
@@ -0,0 +1 @@
+CONFIG_ARM64_SVE=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/arm/aarch64/CONFIG_ARM64_SW_TTBR0_PAN
index 294c8ec50..294c8ec50 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_SW_TTBR0_PAN
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_UAO b/baseconfig/arm/aarch64/CONFIG_ARM64_UAO
index 1b63cd45c..1b63cd45c 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_UAO
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_UAO
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS b/baseconfig/arm/aarch64/CONFIG_ARM64_VA_BITS
index 3a2764df2..3a2764df2 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_VA_BITS
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS_48 b/baseconfig/arm/aarch64/CONFIG_ARM64_VA_BITS_48
index 1bafe6e58..1bafe6e58 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VA_BITS_48
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_VA_BITS_48
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_VHE b/baseconfig/arm/aarch64/CONFIG_ARM64_VHE
index 340b2bf98..340b2bf98 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_VHE
+++ b/baseconfig/arm/aarch64/CONFIG_ARM64_VHE
diff --git a/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON b/baseconfig/arm/aarch64/CONFIG_ARMADA_AP806_SYSCON
index c0741cab5..c0741cab5 100644
--- a/baseconfig/arm/arm64/CONFIG_ARMADA_AP806_SYSCON
+++ b/baseconfig/arm/aarch64/CONFIG_ARMADA_AP806_SYSCON
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_SBSA_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_ARM_SBSA_WATCHDOG
index 01aa8f152..01aa8f152 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_SBSA_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_ARM_SBSA_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_SMMU_V3 b/baseconfig/arm/aarch64/CONFIG_ARM_SMMU_V3
index 83d144ae0..83d144ae0 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_SMMU_V3
+++ b/baseconfig/arm/aarch64/CONFIG_ARM_SMMU_V3
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ b/baseconfig/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
index f0e165dfb..f0e165dfb 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA186_CPUFREQ
+++ b/baseconfig/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ b/baseconfig/arm/aarch64/CONFIG_ARM_TEGRA_DEVFREQ
index d64e3e373..d64e3e373 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM_TEGRA_DEVFREQ
+++ b/baseconfig/arm/aarch64/CONFIG_ARM_TEGRA_DEVFREQ
diff --git a/baseconfig/arm/arm64/CONFIG_ATA_ACPI b/baseconfig/arm/aarch64/CONFIG_ATA_ACPI
index a0be76e56..a0be76e56 100644
--- a/baseconfig/arm/arm64/CONFIG_ATA_ACPI
+++ b/baseconfig/arm/aarch64/CONFIG_ATA_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_ADC b/baseconfig/arm/aarch64/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP20X_ADC
+++ b/baseconfig/arm/aarch64/CONFIG_AXP20X_ADC
diff --git a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER b/baseconfig/arm/aarch64/CONFIG_AXP20X_POWER
index ddf89f551..ddf89f551 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP20X_POWER
+++ b/baseconfig/arm/aarch64/CONFIG_AXP20X_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_ADC b/baseconfig/arm/aarch64/CONFIG_AXP288_ADC
index e138f36af..e138f36af 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_ADC
+++ b/baseconfig/arm/aarch64/CONFIG_AXP288_ADC
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER b/baseconfig/arm/aarch64/CONFIG_AXP288_CHARGER
index 0418f962c..0418f962c 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_CHARGER
+++ b/baseconfig/arm/aarch64/CONFIG_AXP288_CHARGER
diff --git a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/arm/aarch64/CONFIG_AXP288_FUEL_GAUGE
index e171b954b..e171b954b 100644
--- a/baseconfig/arm/arm64/CONFIG_AXP288_FUEL_GAUGE
+++ b/baseconfig/arm/aarch64/CONFIG_AXP288_FUEL_GAUGE
diff --git a/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X b/baseconfig/arm/aarch64/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X
+++ b/baseconfig/arm/aarch64/CONFIG_BATTERY_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_BCMA_POSSIBLE b/baseconfig/arm/aarch64/CONFIG_BCMA_POSSIBLE
index aa4a92690..aa4a92690 100644
--- a/baseconfig/arm/arm64/CONFIG_BCMA_POSSIBLE
+++ b/baseconfig/arm/aarch64/CONFIG_BCMA_POSSIBLE
diff --git a/baseconfig/arm/arm64/CONFIG_BCM_PDC_MBOX b/baseconfig/arm/aarch64/CONFIG_BCM_PDC_MBOX
index 23c2457df..23c2457df 100644
--- a/baseconfig/arm/arm64/CONFIG_BCM_PDC_MBOX
+++ b/baseconfig/arm/aarch64/CONFIG_BCM_PDC_MBOX
diff --git a/baseconfig/arm/arm64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE b/baseconfig/arm/aarch64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
index 71343dc66..71343dc66 100644
--- a/baseconfig/arm/arm64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
+++ b/baseconfig/arm/aarch64/CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
diff --git a/baseconfig/arm/arm64/CONFIG_BRCMUTIL b/baseconfig/arm/aarch64/CONFIG_BRCMUTIL
index 66c5eac06..66c5eac06 100644
--- a/baseconfig/arm/arm64/CONFIG_BRCMUTIL
+++ b/baseconfig/arm/aarch64/CONFIG_BRCMUTIL
diff --git a/baseconfig/arm/arm64/CONFIG_BTT b/baseconfig/arm/aarch64/CONFIG_BTT
index 9cfddf1b9..9cfddf1b9 100644
--- a/baseconfig/arm/arm64/CONFIG_BTT
+++ b/baseconfig/arm/aarch64/CONFIG_BTT
diff --git a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD b/baseconfig/arm/aarch64/CONFIG_BT_QCOMSMD
index 9f36fb6a8..9f36fb6a8 100644
--- a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
+++ b/baseconfig/arm/aarch64/CONFIG_BT_QCOMSMD
diff --git a/baseconfig/arm/arm64/CONFIG_BUG b/baseconfig/arm/aarch64/CONFIG_BUG
index 7a3a7bf96..7a3a7bf96 100644
--- a/baseconfig/arm/arm64/CONFIG_BUG
+++ b/baseconfig/arm/aarch64/CONFIG_BUG
diff --git a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I b/baseconfig/arm/aarch64/CONFIG_CAN_SUN4I
index 925f02a15..925f02a15 100644
--- a/baseconfig/arm/arm64/CONFIG_CAN_SUN4I
+++ b/baseconfig/arm/aarch64/CONFIG_CAN_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_CPT b/baseconfig/arm/aarch64/CONFIG_CAVIUM_CPT
index 183805687..183805687 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_CPT
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_CPT
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_22375 b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_22375
index e173734bd..e173734bd 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_22375
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_22375
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23144 b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23144
index 59e70bcee..59e70bcee 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23144
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23144
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23154 b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23154
index 04080e787..04080e787 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_23154
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_23154
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_27456 b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_27456
index 540c84307..540c84307 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_27456
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_27456
diff --git a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_30115 b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
index e3f4218af..e3f4218af 100644
--- a/baseconfig/arm/arm64/CONFIG_CAVIUM_ERRATUM_30115
+++ b/baseconfig/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X b/baseconfig/arm/aarch64/CONFIG_CHARGER_AXP20X
index 2e64e7733..2e64e7733 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_AXP20X
+++ b/baseconfig/arm/aarch64/CONFIG_CHARGER_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_MANAGER b/baseconfig/arm/aarch64/CONFIG_CHARGER_MANAGER
index 51fe252eb..51fe252eb 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_MANAGER
+++ b/baseconfig/arm/aarch64/CONFIG_CHARGER_MANAGER
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/aarch64/CONFIG_CHARGER_QCOM_SMBB
index 43a91eb0e..43a91eb0e 100644
--- a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
+++ b/baseconfig/arm/aarch64/CONFIG_CHARGER_QCOM_SMBB
diff --git a/baseconfig/arm/arm64/CONFIG_CLKDEV_LOOKUP b/baseconfig/arm/aarch64/CONFIG_CLKDEV_LOOKUP
index 90b1babeb..90b1babeb 100644
--- a/baseconfig/arm/arm64/CONFIG_CLKDEV_LOOKUP
+++ b/baseconfig/arm/aarch64/CONFIG_CLKDEV_LOOKUP
diff --git a/baseconfig/arm/arm64/CONFIG_CMDLINE b/baseconfig/arm/aarch64/CONFIG_CMDLINE
index f218410dc..f218410dc 100644
--- a/baseconfig/arm/arm64/CONFIG_CMDLINE
+++ b/baseconfig/arm/aarch64/CONFIG_CMDLINE
diff --git a/baseconfig/arm/arm64/CONFIG_CMDLINE_FORCE b/baseconfig/arm/aarch64/CONFIG_CMDLINE_FORCE
index db59f3770..db59f3770 100644
--- a/baseconfig/arm/arm64/CONFIG_CMDLINE_FORCE
+++ b/baseconfig/arm/aarch64/CONFIG_CMDLINE_FORCE
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300 b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3516CV300
index 2c50858a5..2c50858a5 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3516CV300
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519 b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3519
index 5484a59ba..5484a59ba 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3519
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660 b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3660
index 44693544d..44693544d 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3660
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3660
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200 b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3798CV200
index 8d91e10e1..8d91e10e1 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI3798CV200
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI6220 b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI6220
index 440b714f5..440b714f5 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI6220
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI655X
index 18ddc0770..18ddc0770 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI655X
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_HI655X
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_PWM
index 08193dd2c..08193dd2c 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_PWM
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_QCOM
index 2b7c64357..2b7c64357 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_XGENE b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_XGENE
index 44d0a9d9b..44d0a9d9b 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_CLK_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_RESET_HI6220 b/baseconfig/arm/aarch64/CONFIG_COMMON_RESET_HI6220
index a603d7319..a603d7319 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_RESET_HI6220
+++ b/baseconfig/arm/aarch64/CONFIG_COMMON_RESET_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_COMPAT b/baseconfig/arm/aarch64/CONFIG_COMPAT
index 3e041f1b6..3e041f1b6 100644
--- a/baseconfig/arm/arm64/CONFIG_COMPAT
+++ b/baseconfig/arm/aarch64/CONFIG_COMPAT
diff --git a/baseconfig/arm/arm64/CONFIG_CONSOLE_TRANSLATIONS b/baseconfig/arm/aarch64/CONFIG_CONSOLE_TRANSLATIONS
index 983fcc993..983fcc993 100644
--- a/baseconfig/arm/arm64/CONFIG_CONSOLE_TRANSLATIONS
+++ b/baseconfig/arm/aarch64/CONFIG_CONSOLE_TRANSLATIONS
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64 b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64
index dd0ae2c1d..dd0ae2c1d 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_BS b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_BS
index 6e0427353..6e0427353 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_BS
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_BS
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE
index 720099599..720099599 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_BLK b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
index b07b273c0..b07b273c0 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_CCM b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
index 20ef5afff..20ef5afff 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_CE_CCM
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
index 2ac813860..2ac813860 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_AES_ARM64_NEON_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_CRC32_ARM64 b/baseconfig/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64
index 845ef5159..845ef5159 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_CRC32_ARM64
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_CRC32_ARM64
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
index d5226e157..d5226e157 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP
index d2f5497f2..d2f5497f2 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
index 4887c6d76..4887c6d76 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_DD b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_DD
index 18c7b900e..18c7b900e 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_CCP_DD
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_DD
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_QCE b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_QCE
index 27a3f7204..27a3f7204 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_QCE
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_QCE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_SAFEXCEL
index 61cb97435..61cb97435 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_DEV_SAFEXCEL
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_GHASH_ARM64_CE b/baseconfig/arm/aarch64/CONFIG_CRYPTO_GHASH_ARM64_CE
index f2db2f21a..f2db2f21a 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_GHASH_ARM64_CE
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_GHASH_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA1_ARM64_CE b/baseconfig/arm/aarch64/CONFIG_CRYPTO_SHA1_ARM64_CE
index 3fe882cad..3fe882cad 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA1_ARM64_CE
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_SHA1_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA2_ARM64_CE b/baseconfig/arm/aarch64/CONFIG_CRYPTO_SHA2_ARM64_CE
index 5d79a86a6..5d79a86a6 100644
--- a/baseconfig/arm/arm64/CONFIG_CRYPTO_SHA2_ARM64_CE
+++ b/baseconfig/arm/aarch64/CONFIG_CRYPTO_SHA2_ARM64_CE
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_ALIGN_RODATA b/baseconfig/arm/aarch64/CONFIG_DEBUG_ALIGN_RODATA
index 4b5ff5066..4b5ff5066 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_ALIGN_RODATA
+++ b/baseconfig/arm/aarch64/CONFIG_DEBUG_ALIGN_RODATA
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_EFI b/baseconfig/arm/aarch64/CONFIG_DEBUG_EFI
index 68b7b8a1e..68b7b8a1e 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_EFI
+++ b/baseconfig/arm/aarch64/CONFIG_DEBUG_EFI
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_SECTION_MISMATCH b/baseconfig/arm/aarch64/CONFIG_DEBUG_SECTION_MISMATCH
index 441e3464c..441e3464c 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_SECTION_MISMATCH
+++ b/baseconfig/arm/aarch64/CONFIG_DEBUG_SECTION_MISMATCH
diff --git a/baseconfig/arm/arm64/CONFIG_DEBUG_WX b/baseconfig/arm/aarch64/CONFIG_DEBUG_WX
index 95e08f44b..95e08f44b 100644
--- a/baseconfig/arm/arm64/CONFIG_DEBUG_WX
+++ b/baseconfig/arm/aarch64/CONFIG_DEBUG_WX
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_HISI_KIRIN b/baseconfig/arm/aarch64/CONFIG_DRM_HISI_KIRIN
index 271def0dd..271def0dd 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_HISI_KIRIN
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_HISI_KIRIN
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM b/baseconfig/arm/aarch64/CONFIG_DRM_MSM
index 0a1adfc20..0a1adfc20 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI
index 87b627906..87b627906 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_14NM_PHY
index 397f69094..397f69094 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_14NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_20NM_PHY
index 7595ae205..7595ae205 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_20NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
index 5d86a4597..5d86a4597 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_PHY
index ea1c4f918..ea1c4f918 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_28NM_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_PLL
index 16ac280e6..16ac280e6 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_DSI_PLL
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_HDMI_HDCP b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_HDMI_HDCP
index 2adc35b99..2adc35b99 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_HDMI_HDCP
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_HDMI_HDCP
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_REGISTER_LOGGING b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_REGISTER_LOGGING
index 83c03d92d..83c03d92d 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_REGISTER_LOGGING
+++ b/baseconfig/arm/aarch64/CONFIG_DRM_MSM_REGISTER_LOGGING
diff --git a/baseconfig/arm/arm64/CONFIG_DVB_B2C2_FLEXCOP_USB b/baseconfig/arm/aarch64/CONFIG_DVB_B2C2_FLEXCOP_USB
index 5f48affe6..5f48affe6 100644
--- a/baseconfig/arm/arm64/CONFIG_DVB_B2C2_FLEXCOP_USB
+++ b/baseconfig/arm/aarch64/CONFIG_DVB_B2C2_FLEXCOP_USB
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/aarch64/CONFIG_DWMAC_IPQ806X
index 49177a6db..49177a6db 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X
+++ b/baseconfig/arm/aarch64/CONFIG_DWMAC_IPQ806X
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I b/baseconfig/arm/aarch64/CONFIG_DWMAC_SUN8I
index ce05f93b3..ce05f93b3 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_SUN8I
+++ b/baseconfig/arm/aarch64/CONFIG_DWMAC_SUN8I
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI b/baseconfig/arm/aarch64/CONFIG_DWMAC_SUNXI
index 254fc7d8a..254fc7d8a 100644
--- a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_DWMAC_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_EDAC_THUNDERX b/baseconfig/arm/aarch64/CONFIG_EDAC_THUNDERX
index dae44bb02..dae44bb02 100644
--- a/baseconfig/arm/arm64/CONFIG_EDAC_THUNDERX
+++ b/baseconfig/arm/aarch64/CONFIG_EDAC_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_EDAC_XGENE b/baseconfig/arm/aarch64/CONFIG_EDAC_XGENE
index dbadc3572..dbadc3572 100644
--- a/baseconfig/arm/arm64/CONFIG_EDAC_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_EDAC_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288 b/baseconfig/arm/aarch64/CONFIG_EXTCON_AXP288
index 7fadeb58d..7fadeb58d 100644
--- a/baseconfig/arm/arm64/CONFIG_EXTCON_AXP288
+++ b/baseconfig/arm/aarch64/CONFIG_EXTCON_AXP288
diff --git a/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC b/baseconfig/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC
index b52487909..b52487909 100644
--- a/baseconfig/arm/arm64/CONFIG_EXTCON_QCOM_SPMI_MISC
+++ b/baseconfig/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC
diff --git a/baseconfig/arm/arm64/CONFIG_FB_MODE_HELPERS b/baseconfig/arm/aarch64/CONFIG_FB_MODE_HELPERS
index 84f515748..84f515748 100644
--- a/baseconfig/arm/arm64/CONFIG_FB_MODE_HELPERS
+++ b/baseconfig/arm/aarch64/CONFIG_FB_MODE_HELPERS
diff --git a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
index 6d42a47fc..6d42a47fc 100644
--- a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER
+++ b/baseconfig/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
diff --git a/baseconfig/arm/arm64/CONFIG_FSL_ERRATUM_A008585 b/baseconfig/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
index 8dce0afd8..8dce0afd8 100644
--- a/baseconfig/arm/arm64/CONFIG_FSL_ERRATUM_A008585
+++ b/baseconfig/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
diff --git a/baseconfig/arm/arm64/CONFIG_FSL_MC_BUS b/baseconfig/arm/aarch64/CONFIG_FSL_MC_BUS
index dddc2f1f3..dddc2f1f3 100644
--- a/baseconfig/arm/arm64/CONFIG_FSL_MC_BUS
+++ b/baseconfig/arm/aarch64/CONFIG_FSL_MC_BUS
diff --git a/baseconfig/arm/arm64/CONFIG_FUJITSU_ES b/baseconfig/arm/aarch64/CONFIG_FUJITSU_ES
index 39b50c904..39b50c904 100644
--- a/baseconfig/arm/arm64/CONFIG_FUJITSU_ES
+++ b/baseconfig/arm/aarch64/CONFIG_FUJITSU_ES
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209 b/baseconfig/arm/aarch64/CONFIG_GPIO_AXP209
index 2365ae707..2365ae707 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_AXP209
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_AXP209
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_MAX77620 b/baseconfig/arm/aarch64/CONFIG_GPIO_MAX77620
index fd5e22a31..fd5e22a31 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_MAX77620
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX b/baseconfig/arm/aarch64/CONFIG_GPIO_THUNDERX
index 6895cc045..6895cc045 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_THUNDERX
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE b/baseconfig/arm/aarch64/CONFIG_GPIO_XGENE
index f210ebcce..f210ebcce 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE_SB b/baseconfig/arm/aarch64/CONFIG_GPIO_XGENE_SB
index 01e294075..01e294075 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XGENE_SB
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_XGENE_SB
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_XLP b/baseconfig/arm/aarch64/CONFIG_GPIO_XLP
index f99cd41f3..f99cd41f3 100644
--- a/baseconfig/arm/arm64/CONFIG_GPIO_XLP
+++ b/baseconfig/arm/aarch64/CONFIG_GPIO_XLP
diff --git a/baseconfig/arm/arm64/CONFIG_HI6220_MBOX b/baseconfig/arm/aarch64/CONFIG_HI6220_MBOX
index 5fd48c60e..5fd48c60e 100644
--- a/baseconfig/arm/arm64/CONFIG_HI6220_MBOX
+++ b/baseconfig/arm/aarch64/CONFIG_HI6220_MBOX
diff --git a/baseconfig/arm/arm64/CONFIG_HISILICON_ERRATUM_161010101 b/baseconfig/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
index b5914254a..b5914254a 100644
--- a/baseconfig/arm/arm64/CONFIG_HISILICON_ERRATUM_161010101
+++ b/baseconfig/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
diff --git a/baseconfig/arm/aarch64/CONFIG_HISILICON_ERRATUM_161600802 b/baseconfig/arm/aarch64/CONFIG_HISILICON_ERRATUM_161600802
new file mode 100644
index 000000000..86ef85f43
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_HISILICON_ERRATUM_161600802
@@ -0,0 +1 @@
+CONFIG_HISILICON_ERRATUM_161600802=y
diff --git a/baseconfig/arm/arm64/CONFIG_HISILICON_IRQ_MBIGEN b/baseconfig/arm/aarch64/CONFIG_HISILICON_IRQ_MBIGEN
index 5ca6d30d1..5ca6d30d1 100644
--- a/baseconfig/arm/arm64/CONFIG_HISILICON_IRQ_MBIGEN
+++ b/baseconfig/arm/aarch64/CONFIG_HISILICON_IRQ_MBIGEN
diff --git a/baseconfig/arm/arm64/CONFIG_HISI_KIRIN_DW_DSI b/baseconfig/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
index cef60968e..cef60968e 100644
--- a/baseconfig/arm/arm64/CONFIG_HISI_KIRIN_DW_DSI
+++ b/baseconfig/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
diff --git a/baseconfig/arm/arm64/CONFIG_HISI_THERMAL b/baseconfig/arm/aarch64/CONFIG_HISI_THERMAL
index 05fc96b89..05fc96b89 100644
--- a/baseconfig/arm/arm64/CONFIG_HISI_THERMAL
+++ b/baseconfig/arm/aarch64/CONFIG_HISI_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_HOTPLUG_PCI_SHPC b/baseconfig/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
index f03be8a8f..f03be8a8f 100644
--- a/baseconfig/arm/arm64/CONFIG_HOTPLUG_PCI_SHPC
+++ b/baseconfig/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
diff --git a/baseconfig/arm/arm64/CONFIG_HVC_DCC b/baseconfig/arm/aarch64/CONFIG_HVC_DCC
index b2e800764..b2e800764 100644
--- a/baseconfig/arm/arm64/CONFIG_HVC_DCC
+++ b/baseconfig/arm/aarch64/CONFIG_HVC_DCC
diff --git a/baseconfig/arm/arm64/CONFIG_HVC_DRIVER b/baseconfig/arm/aarch64/CONFIG_HVC_DRIVER
index 2b13a0cc9..2b13a0cc9 100644
--- a/baseconfig/arm/arm64/CONFIG_HVC_DRIVER
+++ b/baseconfig/arm/aarch64/CONFIG_HVC_DRIVER
diff --git a/baseconfig/arm/arm64/CONFIG_HWSPINLOCK_QCOM b/baseconfig/arm/aarch64/CONFIG_HWSPINLOCK_QCOM
index 5dfdf858e..5dfdf858e 100644
--- a/baseconfig/arm/arm64/CONFIG_HWSPINLOCK_QCOM
+++ b/baseconfig/arm/aarch64/CONFIG_HWSPINLOCK_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_CAVIUM b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_CAVIUM
index e3bec9744..e3bec9744 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_CAVIUM
+++ b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_CAVIUM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_HISI b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_HISI
index 3f6b707f6..3f6b707f6 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_HISI
+++ b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_MSM b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_MSM
index b95d5cb24..b95d5cb24 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_OMAP
index cf37a6e35..cf37a6e35 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_OMAP
+++ b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_OMAP
diff --git a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_XGENE b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_XGENE
index 85af60d35..85af60d35 100644
--- a/baseconfig/arm/arm64/CONFIG_HW_RANDOM_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_HW_RANDOM_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_HZ b/baseconfig/arm/aarch64/CONFIG_HZ
index bfc405e03..bfc405e03 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ
+++ b/baseconfig/arm/aarch64/CONFIG_HZ
diff --git a/baseconfig/arm/arm64/CONFIG_HZ_100 b/baseconfig/arm/aarch64/CONFIG_HZ_100
index 11bd2afa2..11bd2afa2 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ_100
+++ b/baseconfig/arm/aarch64/CONFIG_HZ_100
diff --git a/baseconfig/arm/arm64/CONFIG_HZ_1000 b/baseconfig/arm/aarch64/CONFIG_HZ_1000
index c211724d6..c211724d6 100644
--- a/baseconfig/arm/arm64/CONFIG_HZ_1000
+++ b/baseconfig/arm/aarch64/CONFIG_HZ_1000
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_HIX5HD2 b/baseconfig/arm/aarch64/CONFIG_I2C_HIX5HD2
index 7b16fe2e5..7b16fe2e5 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_HIX5HD2
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_HIX5HD2
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_QUP b/baseconfig/arm/aarch64/CONFIG_I2C_QUP
index 7fb7cd350..7fb7cd350 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_QUP
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_QUP
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_SCMI b/baseconfig/arm/aarch64/CONFIG_I2C_SCMI
index 6e60bd4e1..6e60bd4e1 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_SCMI
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_SCMI
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_THUNDERX b/baseconfig/arm/aarch64/CONFIG_I2C_THUNDERX
index c544a8c68..c544a8c68 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_THUNDERX
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_XGENE_SLIMPRO b/baseconfig/arm/aarch64/CONFIG_I2C_XGENE_SLIMPRO
index 44af582d4..44af582d4 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_XGENE_SLIMPRO
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_XGENE_SLIMPRO
diff --git a/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX b/baseconfig/arm/aarch64/CONFIG_I2C_XLP9XX
index bcc41c376..bcc41c376 100644
--- a/baseconfig/arm/arm64/CONFIG_I2C_XLP9XX
+++ b/baseconfig/arm/aarch64/CONFIG_I2C_XLP9XX
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK b/baseconfig/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_AXP20X_PEK
+++ b/baseconfig/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_HISI_POWERKEY b/baseconfig/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
index bd59856f3..bd59856f3 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_HISI_POWERKEY
+++ b/baseconfig/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_PM8941_PWRKEY b/baseconfig/arm/aarch64/CONFIG_INPUT_PM8941_PWRKEY
index 24fb62b20..24fb62b20 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_PM8941_PWRKEY
+++ b/baseconfig/arm/aarch64/CONFIG_INPUT_PM8941_PWRKEY
diff --git a/baseconfig/arm/arm64/CONFIG_INPUT_REGULATOR_HAPTIC b/baseconfig/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
index 4230eab6f..4230eab6f 100644
--- a/baseconfig/arm/arm64/CONFIG_INPUT_REGULATOR_HAPTIC
+++ b/baseconfig/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
diff --git a/baseconfig/arm/arm64/CONFIG_IR_SUNXI b/baseconfig/arm/aarch64/CONFIG_IR_SUNXI
index fe2dc68a6..fe2dc68a6 100644
--- a/baseconfig/arm/arm64/CONFIG_IR_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_IR_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_K3_DMA b/baseconfig/arm/aarch64/CONFIG_K3_DMA
index c64ec401c..c64ec401c 100644
--- a/baseconfig/arm/arm64/CONFIG_K3_DMA
+++ b/baseconfig/arm/aarch64/CONFIG_K3_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_KEYBOARD_SUN4I_LRADC b/baseconfig/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
index 8fcbd86b6..8fcbd86b6 100644
--- a/baseconfig/arm/arm64/CONFIG_KEYBOARD_SUN4I_LRADC
+++ b/baseconfig/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
diff --git a/baseconfig/arm/arm64/CONFIG_KVM b/baseconfig/arm/aarch64/CONFIG_KVM
index 14f90d8d6..14f90d8d6 100644
--- a/baseconfig/arm/arm64/CONFIG_KVM
+++ b/baseconfig/arm/aarch64/CONFIG_KVM
diff --git a/baseconfig/arm/arm64/CONFIG_LIBNVDIMM b/baseconfig/arm/aarch64/CONFIG_LIBNVDIMM
index aeaaefec7..aeaaefec7 100644
--- a/baseconfig/arm/arm64/CONFIG_LIBNVDIMM
+++ b/baseconfig/arm/aarch64/CONFIG_LIBNVDIMM
diff --git a/baseconfig/arm/arm64/CONFIG_LIQUIDIO b/baseconfig/arm/aarch64/CONFIG_LIQUIDIO
index 75356625e..75356625e 100644
--- a/baseconfig/arm/arm64/CONFIG_LIQUIDIO
+++ b/baseconfig/arm/aarch64/CONFIG_LIQUIDIO
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL b/baseconfig/arm/aarch64/CONFIG_MAX77620_THERMAL
index d334d3f90..d334d3f90 100644
--- a/baseconfig/arm/arm64/CONFIG_MAX77620_THERMAL
+++ b/baseconfig/arm/aarch64/CONFIG_MAX77620_THERMAL
diff --git a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_MAX77620_WATCHDOG
index f998244fd..f998244fd 100644
--- a/baseconfig/arm/arm64/CONFIG_MAX77620_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_MAX77620_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_HISI_FEMAC b/baseconfig/arm/aarch64/CONFIG_MDIO_HISI_FEMAC
index 6e4c16cf9..6e4c16cf9 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_HISI_FEMAC
+++ b/baseconfig/arm/aarch64/CONFIG_MDIO_HISI_FEMAC
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_OCTEON b/baseconfig/arm/aarch64/CONFIG_MDIO_OCTEON
index e14c4b041..e14c4b041 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_OCTEON
+++ b/baseconfig/arm/aarch64/CONFIG_MDIO_OCTEON
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_SUN4I b/baseconfig/arm/aarch64/CONFIG_MDIO_SUN4I
index 5bf147832..5bf147832 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_SUN4I
+++ b/baseconfig/arm/aarch64/CONFIG_MDIO_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_THUNDER b/baseconfig/arm/aarch64/CONFIG_MDIO_THUNDER
index 00eb9a6ba..00eb9a6ba 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_THUNDER
+++ b/baseconfig/arm/aarch64/CONFIG_MDIO_THUNDER
diff --git a/baseconfig/arm/arm64/CONFIG_MDIO_XGENE b/baseconfig/arm/aarch64/CONFIG_MDIO_XGENE
index 8a6b53a5b..8a6b53a5b 100644
--- a/baseconfig/arm/arm64/CONFIG_MDIO_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_MDIO_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_MDM_GCC_9615 b/baseconfig/arm/aarch64/CONFIG_MDM_GCC_9615
index 4d972aff3..4d972aff3 100644
--- a/baseconfig/arm/arm64/CONFIG_MDM_GCC_9615
+++ b/baseconfig/arm/aarch64/CONFIG_MDM_GCC_9615
diff --git a/baseconfig/arm/arm64/CONFIG_MDM_LCC_9615 b/baseconfig/arm/aarch64/CONFIG_MDM_LCC_9615
index 72f159f99..72f159f99 100644
--- a/baseconfig/arm/arm64/CONFIG_MDM_LCC_9615
+++ b/baseconfig/arm/aarch64/CONFIG_MDM_LCC_9615
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_MESON_GXBB_WATCHDOG
index a9c8de737..a9c8de737 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_MESON_GXBB_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY b/baseconfig/arm/aarch64/CONFIG_MESON_GXL_PHY
index cc59580cc..cc59580cc 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
+++ b/baseconfig/arm/aarch64/CONFIG_MESON_GXL_PHY
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_MESON_WATCHDOG
index 2e5c153a9..2e5c153a9 100644
--- a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_MESON_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_I2C
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X_I2C
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X_RSB
index 29150d51b..29150d51b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_AXP20X_RSB
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_AXP20X_RSB
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_HI655X_PMIC b/baseconfig/arm/aarch64/CONFIG_MFD_HI655X_PMIC
index 650829c00..650829c00 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_HI655X_PMIC
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_HI655X_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_MAX77620 b/baseconfig/arm/aarch64/CONFIG_MFD_MAX77620
index be2ba084b..be2ba084b 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_MAX77620
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_QCOM_RPM b/baseconfig/arm/aarch64/CONFIG_MFD_QCOM_RPM
index d88a4c4c7..d88a4c4c7 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_QCOM_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_QCOM_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/aarch64/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
index d156cb188..d156cb188 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SUN4I_GPADC
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
diff --git a/baseconfig/arm/arm64/CONFIG_MFD_SUN6I_PRCM b/baseconfig/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
index 1784bb288..1784bb288 100644
--- a/baseconfig/arm/arm64/CONFIG_MFD_SUN6I_PRCM
+++ b/baseconfig/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_CAVIUM_THUNDERX b/baseconfig/arm/aarch64/CONFIG_MMC_CAVIUM_THUNDERX
index 8c4640a79..8c4640a79 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_CAVIUM_THUNDERX
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_CAVIUM_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX b/baseconfig/arm/aarch64/CONFIG_MMC_MESON_GX
index f6d05988f..f6d05988f 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_MESON_GX
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML b/baseconfig/arm/aarch64/CONFIG_MMC_QCOM_DML
index 48facf367..48facf367 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_QCOM_DML
diff --git a/baseconfig/arm/aarch64/CONFIG_MMC_SDHCI_F_SDH30 b/baseconfig/arm/aarch64/CONFIG_MMC_SDHCI_F_SDH30
new file mode 100644
index 000000000..e026d18c2
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_SDHCI_F_SDH30
@@ -0,0 +1 @@
+CONFIG_MMC_SDHCI_F_SDH30=m
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_SDHCI_MSM b/baseconfig/arm/aarch64/CONFIG_MMC_SDHCI_MSM
index 512d452ed..512d452ed 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_SDHCI_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_SDHCI_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_SUNXI b/baseconfig/arm/aarch64/CONFIG_MMC_SUNXI
index 0f6eda36b..0f6eda36b 100644
--- a/baseconfig/arm/arm64/CONFIG_MMC_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_MMC_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660 b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8660
index 9effe8611..9effe8611 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8660
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916 b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8916
index 87cf3fd89..87cf3fd89 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8916
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960 b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8960
index 03ba44b34..03ba44b34 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974 b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8974
index 8ffbd8055..8ffbd8055 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8974
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996 b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8996
index 4b01d318d..4b01d318d 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_GCC_8996
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_LCC_8960 b/baseconfig/arm/aarch64/CONFIG_MSM_LCC_8960
index 696554428..696554428 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_LCC_8960
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_LCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8960 b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8960
index c2ccb9997..c2ccb9997 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8960
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8960
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8974 b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8974
index 04b9f7550..04b9f7550 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8974
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8974
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8996 b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8996
index e40293af5..e40293af5 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_MMCC_8996
+++ b/baseconfig/arm/aarch64/CONFIG_MSM_MMCC_8996
diff --git a/baseconfig/arm/arm64/CONFIG_MV_XOR_V2 b/baseconfig/arm/aarch64/CONFIG_MV_XOR_V2
index a6e590eb8..a6e590eb8 100644
--- a/baseconfig/arm/arm64/CONFIG_MV_XOR_V2
+++ b/baseconfig/arm/aarch64/CONFIG_MV_XOR_V2
diff --git a/baseconfig/arm/arm64/CONFIG_ND_BLK b/baseconfig/arm/aarch64/CONFIG_ND_BLK
index 8a6c237d7..8a6c237d7 100644
--- a/baseconfig/arm/arm64/CONFIG_ND_BLK
+++ b/baseconfig/arm/aarch64/CONFIG_ND_BLK
diff --git a/baseconfig/arm/arm64/CONFIG_ND_BTT b/baseconfig/arm/aarch64/CONFIG_ND_BTT
index d4e20e237..d4e20e237 100644
--- a/baseconfig/arm/arm64/CONFIG_ND_BTT
+++ b/baseconfig/arm/aarch64/CONFIG_ND_BTT
diff --git a/baseconfig/arm/arm64/CONFIG_NET_SB1000 b/baseconfig/arm/aarch64/CONFIG_NET_SB1000
index 53ead8cd1..53ead8cd1 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_SB1000
+++ b/baseconfig/arm/aarch64/CONFIG_NET_SB1000
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_ALLWINNER b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_ALLWINNER
index 2ff45074a..2ff45074a 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_ALLWINNER
+++ b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_ALLWINNER
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_CAVIUM b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
index 5ae580523..5ae580523 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_CAVIUM
+++ b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_QUALCOMM
index 46be71a90..46be71a90 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_QUALCOMM
+++ b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_QUALCOMM
diff --git a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_SNI
index bb77206de..bb77206de 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_VENDOR_SNI
+++ b/baseconfig/arm/aarch64/CONFIG_NET_VENDOR_SNI
diff --git a/baseconfig/arm/arm64/CONFIG_NET_XGENE b/baseconfig/arm/aarch64/CONFIG_NET_XGENE
index 57527a616..57527a616 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_NET_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_NET_XGENE_V2 b/baseconfig/arm/aarch64/CONFIG_NET_XGENE_V2
index 7d5cbcdbf..7d5cbcdbf 100644
--- a/baseconfig/arm/arm64/CONFIG_NET_XGENE_V2
+++ b/baseconfig/arm/aarch64/CONFIG_NET_XGENE_V2
diff --git a/baseconfig/arm/arm64/CONFIG_NODES_SHIFT b/baseconfig/arm/aarch64/CONFIG_NODES_SHIFT
index 7647492ca..7647492ca 100644
--- a/baseconfig/arm/arm64/CONFIG_NODES_SHIFT
+++ b/baseconfig/arm/aarch64/CONFIG_NODES_SHIFT
diff --git a/baseconfig/arm/arm64/CONFIG_NR_CPUS b/baseconfig/arm/aarch64/CONFIG_NR_CPUS
index 0c4b1d904..0c4b1d904 100644
--- a/baseconfig/arm/arm64/CONFIG_NR_CPUS
+++ b/baseconfig/arm/aarch64/CONFIG_NR_CPUS
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA b/baseconfig/arm/aarch64/CONFIG_NUMA
index e480f0c04..e480f0c04 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA
+++ b/baseconfig/arm/aarch64/CONFIG_NUMA
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING b/baseconfig/arm/aarch64/CONFIG_NUMA_BALANCING
index 9de89d51d..9de89d51d 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING
+++ b/baseconfig/arm/aarch64/CONFIG_NUMA_BALANCING
diff --git a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/arm/aarch64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
index 5f7402180..5f7402180 100644
--- a/baseconfig/arm/arm64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ b/baseconfig/arm/aarch64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
diff --git a/baseconfig/arm/arm64/CONFIG_NVMEM_SUNXI_SID b/baseconfig/arm/aarch64/CONFIG_NVMEM_SUNXI_SID
index 454644aac..454644aac 100644
--- a/baseconfig/arm/arm64/CONFIG_NVMEM_SUNXI_SID
+++ b/baseconfig/arm/aarch64/CONFIG_NVMEM_SUNXI_SID
diff --git a/baseconfig/arm/arm64/CONFIG_PATA_ACPI b/baseconfig/arm/aarch64/CONFIG_PATA_ACPI
index c3bc7866f..c3bc7866f 100644
--- a/baseconfig/arm/arm64/CONFIG_PATA_ACPI
+++ b/baseconfig/arm/aarch64/CONFIG_PATA_ACPI
diff --git a/baseconfig/arm/arm64/CONFIG_PCC b/baseconfig/arm/aarch64/CONFIG_PCC
index 36eb8c2ab..36eb8c2ab 100644
--- a/baseconfig/arm/arm64/CONFIG_PCC
+++ b/baseconfig/arm/aarch64/CONFIG_PCC
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM b/baseconfig/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
index cdb6169bd..cdb6169bd 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_DW_HOST_ECAM
+++ b/baseconfig/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_KIRIN b/baseconfig/arm/aarch64/CONFIG_PCIE_KIRIN
index be6e297ea..be6e297ea 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_KIRIN
+++ b/baseconfig/arm/aarch64/CONFIG_PCIE_KIRIN
diff --git a/baseconfig/arm/arm64/CONFIG_PCIE_QCOM b/baseconfig/arm/aarch64/CONFIG_PCIE_QCOM
index 61886f19a..61886f19a 100644
--- a/baseconfig/arm/arm64/CONFIG_PCIE_QCOM
+++ b/baseconfig/arm/aarch64/CONFIG_PCIE_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HISI b/baseconfig/arm/aarch64/CONFIG_PCI_HISI
index 468f3e431..468f3e431 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HISI
+++ b/baseconfig/arm/aarch64/CONFIG_PCI_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_ECAM b/baseconfig/arm/aarch64/CONFIG_PCI_HOST_THUNDER_ECAM
index a812c3179..a812c3179 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_ECAM
+++ b/baseconfig/arm/aarch64/CONFIG_PCI_HOST_THUNDER_ECAM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_PEM b/baseconfig/arm/aarch64/CONFIG_PCI_HOST_THUNDER_PEM
index 6c45e0930..6c45e0930 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_HOST_THUNDER_PEM
+++ b/baseconfig/arm/aarch64/CONFIG_PCI_HOST_THUNDER_PEM
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_XGENE b/baseconfig/arm/aarch64/CONFIG_PCI_XGENE
index 85317304c..85317304c 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_PCI_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PCI_XGENE_MSI b/baseconfig/arm/aarch64/CONFIG_PCI_XGENE_MSI
index ce07c62c8..ce07c62c8 100644
--- a/baseconfig/arm/arm64/CONFIG_PCI_XGENE_MSI
+++ b/baseconfig/arm/aarch64/CONFIG_PCI_XGENE_MSI
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_HI6220_USB b/baseconfig/arm/aarch64/CONFIG_PHY_HI6220_USB
index 462bb7c31..462bb7c31 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_HI6220_USB
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_HI6220_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY b/baseconfig/arm/aarch64/CONFIG_PHY_MVEBU_CP110_COMPHY
index 1902b0c1f..1902b0c1f 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_MVEBU_CP110_COMPHY
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_MVEBU_CP110_COMPHY
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_APQ8064_SATA b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_APQ8064_SATA
index bb25b4634..bb25b4634 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_APQ8064_SATA
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_APQ8064_SATA
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_QMP
index cba57faf8..cba57faf8 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_QMP
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2 b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_QUSB2
index 6512e59d2..6512e59d2 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_QUSB2
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_UFS b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_UFS
index 50ac1d830..50ac1d830 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_UFS
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_UFS
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_USB_HS
index 61e98f856..61e98f856 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HS
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_USB_HS
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_USB_HSIC
index 0b25aa233..0b25aa233 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_QCOM_USB_HSIC
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_QCOM_USB_HSIC
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB b/baseconfig/arm/aarch64/CONFIG_PHY_SUN4I_USB
index f619228c3..f619228c3 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_SUN4I_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN9I_USB b/baseconfig/arm/aarch64/CONFIG_PHY_SUN9I_USB
index 98d002535..98d002535 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_SUN9I_USB
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_SUN9I_USB
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_XGENE b/baseconfig/arm/aarch64/CONFIG_PHY_XGENE
index 8d9f368f3..8d9f368f3 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_PHY_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_AMD b/baseconfig/arm/aarch64/CONFIG_PINCTRL_AMD
index 41cff133f..41cff133f 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_AMD
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_AMD
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8064 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_APQ8064
index 0c95df841..0c95df841 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8064
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_APQ8064
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8084 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_APQ8084
index dc701bb1f..dc701bb1f 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_APQ8084
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_APQ8084
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MAX77620 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MAX77620
index 3b44d6941..3b44d6941 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MAX77620
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MDM9615 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MDM9615
index aa3be1054..aa3be1054 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MDM9615
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MDM9615
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM
index b042dc93b..b042dc93b 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8660 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8660
index 905c9f434..905c9f434 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8660
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8660
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8916 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8916
index a7a8bd9d4..a7a8bd9d4 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8916
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8916
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8960 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8960
index 167d89960..167d89960 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8960
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8960
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8996 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8996
index 805a439d5..805a439d5 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8996
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8996
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8X74 b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8X74
index 2d68ec700..2d68ec700 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_MSM8X74
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_MSM8X74
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
index d24825e16..d24825e16 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SSBI_PMIC b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
index bc00fae73..bc00fae73 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QCOM_SSBI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QDF2XXX
index e8dca820d..e8dca820d 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX
+++ b/baseconfig/arm/aarch64/CONFIG_PINCTRL_QDF2XXX
diff --git a/baseconfig/arm/arm64/CONFIG_PMIC_OPREGION b/baseconfig/arm/aarch64/CONFIG_PMIC_OPREGION
index 15102fe45..15102fe45 100644
--- a/baseconfig/arm/arm64/CONFIG_PMIC_OPREGION
+++ b/baseconfig/arm/aarch64/CONFIG_PMIC_OPREGION
diff --git a/baseconfig/arm/arm64/CONFIG_PNP_DEBUG_MESSAGES b/baseconfig/arm/aarch64/CONFIG_PNP_DEBUG_MESSAGES
index cb591885f..cb591885f 100644
--- a/baseconfig/arm/arm64/CONFIG_PNP_DEBUG_MESSAGES
+++ b/baseconfig/arm/aarch64/CONFIG_PNP_DEBUG_MESSAGES
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_HISI b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_HISI
index c5516db40..c5516db40 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_HISI
+++ b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_MSM b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_MSM
index a7db0a2e3..a7db0a2e3 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_POWER_RESET_XGENE b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_XGENE
index 4e363c24d..4e363c24d 100644
--- a/baseconfig/arm/arm64/CONFIG_POWER_RESET_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_POWER_RESET_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_PWM_SUN4I b/baseconfig/arm/aarch64/CONFIG_PWM_SUN4I
index d4f562f3f..d4f562f3f 100644
--- a/baseconfig/arm/arm64/CONFIG_PWM_SUN4I
+++ b/baseconfig/arm/aarch64/CONFIG_PWM_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL b/baseconfig/arm/aarch64/CONFIG_QCOM_ADSP_PIL
index 0aa258124..0aa258124 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_ADSP_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_APCS_IPC b/baseconfig/arm/aarch64/CONFIG_QCOM_APCS_IPC
index f8a0514ba..f8a0514ba 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_APCS_IPC
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_APCS_IPC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_BAM_DMA b/baseconfig/arm/aarch64/CONFIG_QCOM_BAM_DMA
index 84fb1a98e..84fb1a98e 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_BAM_DMA
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_BAM_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM b/baseconfig/arm/aarch64/CONFIG_QCOM_CLK_RPM
index 5650c8603..5650c8603 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_CLK_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM b/baseconfig/arm/aarch64/CONFIG_QCOM_CLK_SMD_RPM
index d355533c9..d355533c9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_CLK_SMD_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_CLK_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_COINCELL b/baseconfig/arm/aarch64/CONFIG_QCOM_COINCELL
index 6b43aa0aa..6b43aa0aa 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_COINCELL
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_COINCELL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_EBI2 b/baseconfig/arm/aarch64/CONFIG_QCOM_EBI2
index e96b3544e..e96b3544e 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_EBI2
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_EBI2
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_EMAC b/baseconfig/arm/aarch64/CONFIG_QCOM_EMAC
index 4e3fa019b..4e3fa019b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_EMAC
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_EMAC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1003 b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
index 94d6b177a..94d6b177a 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1003
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1009 b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
index 1449efafb..1449efafb 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_FALKOR_ERRATUM_1009
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
diff --git a/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041 b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041
new file mode 100644
index 000000000..f0d31a87b
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041
@@ -0,0 +1 @@
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_GSBI b/baseconfig/arm/aarch64/CONFIG_QCOM_GSBI
index 2711cb77b..2711cb77b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_GSBI
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_GSBI
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA b/baseconfig/arm/aarch64/CONFIG_QCOM_HIDMA
index a5442952f..a5442952f 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_HIDMA
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT b/baseconfig/arm/aarch64/CONFIG_QCOM_HIDMA_MGMT
index 8085b2ae4..8085b2ae4 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_HIDMA_MGMT
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_IOMMU b/baseconfig/arm/aarch64/CONFIG_QCOM_IOMMU
index b7e99b882..b7e99b882 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_IOMMU
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_IOMMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER b/baseconfig/arm/aarch64/CONFIG_QCOM_IRQ_COMBINER
index 6c23d15f7..6c23d15f7 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_IRQ_COMBINER
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_L2_PMU b/baseconfig/arm/aarch64/CONFIG_QCOM_L2_PMU
index 2a553c8b1..2a553c8b1 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_L2_PMU
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_L2_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_L3_PMU b/baseconfig/arm/aarch64/CONFIG_QCOM_L3_PMU
index ed899d66b..ed899d66b 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_L3_PMU
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_L3_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL b/baseconfig/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
index 18d8fb792..18d8fb792 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_QDF2400_ERRATUM_0065 b/baseconfig/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
index dec9be970..dec9be970 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_QDF2400_ERRATUM_0065
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_QFPROM b/baseconfig/arm/aarch64/CONFIG_QCOM_QFPROM
index 9df0fc659..9df0fc659 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_QFPROM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_QFPROM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMD_RPM b/baseconfig/arm/aarch64/CONFIG_QCOM_SMD_RPM
index 4610581b9..4610581b9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMD_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMEM b/baseconfig/arm/aarch64/CONFIG_QCOM_SMEM
index f91ef8cda..f91ef8cda 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMEM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SMEM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMP2P b/baseconfig/arm/aarch64/CONFIG_QCOM_SMP2P
index 5fa221f74..5fa221f74 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMP2P
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SMP2P
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMSM b/baseconfig/arm/aarch64/CONFIG_QCOM_SMSM
index 210a649f7..210a649f7 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SMSM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SMSM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_IADC b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_IADC
index d8601ce79..d8601ce79 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_IADC
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_IADC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_TEMP_ALARM b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_TEMP_ALARM
index 7155372b9..7155372b9 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_TEMP_ALARM
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_TEMP_ALARM
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_VADC b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_VADC
index fcc1196df..fcc1196df 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_SPMI_VADC
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_SPMI_VADC
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS b/baseconfig/arm/aarch64/CONFIG_QCOM_TSENS
index 0d43fc907..0d43fc907 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_TSENS
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_TSENS
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_CTRL b/baseconfig/arm/aarch64/CONFIG_QCOM_WCNSS_CTRL
index e5469ca8a..e5469ca8a 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_CTRL
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_WCNSS_CTRL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL b/baseconfig/arm/aarch64/CONFIG_QCOM_WCNSS_PIL
index b13cefb38..b13cefb38 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_WCNSS_PIL
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WDT b/baseconfig/arm/aarch64/CONFIG_QCOM_WDT
index e4c7f9d37..e4c7f9d37 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WDT
+++ b/baseconfig/arm/aarch64/CONFIG_QCOM_WDT
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE b/baseconfig/arm/aarch64/CONFIG_RANDOMIZE_BASE
index 20610a95a..20610a95a 100644
--- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_BASE
+++ b/baseconfig/arm/aarch64/CONFIG_RANDOMIZE_BASE
diff --git a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL b/baseconfig/arm/aarch64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
index 7645a371e..7645a371e 100644
--- a/baseconfig/arm/arm64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
+++ b/baseconfig/arm/aarch64/CONFIG_RANDOMIZE_MODULE_REGION_FULL
diff --git a/baseconfig/arm/arm64/CONFIG_RCU_FANOUT b/baseconfig/arm/aarch64/CONFIG_RCU_FANOUT
index e95447c12..e95447c12 100644
--- a/baseconfig/arm/arm64/CONFIG_RCU_FANOUT
+++ b/baseconfig/arm/aarch64/CONFIG_RCU_FANOUT
diff --git a/baseconfig/arm/aarch64/CONFIG_REFCOUNT_FULL b/baseconfig/arm/aarch64/CONFIG_REFCOUNT_FULL
new file mode 100644
index 000000000..c7e4a167a
--- /dev/null
+++ b/baseconfig/arm/aarch64/CONFIG_REFCOUNT_FULL
@@ -0,0 +1 @@
+CONFIG_REFCOUNT_FULL=y
diff --git a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI b/baseconfig/arm/aarch64/CONFIG_REGMAP_SPMI
index eba374b73..eba374b73 100644
--- a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
+++ b/baseconfig/arm/aarch64/CONFIG_REGMAP_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X b/baseconfig/arm/aarch64/CONFIG_REGULATOR_AXP20X
index 6694810a6..6694810a6 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_AXP20X
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_HI655X b/baseconfig/arm/aarch64/CONFIG_REGULATOR_HI655X
index c267fff85..c267fff85 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_HI655X
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_HI655X
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_MAX77620 b/baseconfig/arm/aarch64/CONFIG_REGULATOR_MAX77620
index db0158399..db0158399 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_MAX77620
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_MAX77620
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_RPM b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM
index 3d002cac5..3d002cac5 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SMD_RPM b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_SMD_RPM
index aae961c4b..aae961c4b 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SMD_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_SMD_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SPMI b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_SPMI
index c83be7aec..c83be7aec 100644
--- a/baseconfig/arm/arm64/CONFIG_REGULATOR_QCOM_SPMI
+++ b/baseconfig/arm/aarch64/CONFIG_REGULATOR_QCOM_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_RELOCATABLE b/baseconfig/arm/aarch64/CONFIG_RELOCATABLE
index 36808edb3..36808edb3 100644
--- a/baseconfig/arm/arm64/CONFIG_RELOCATABLE
+++ b/baseconfig/arm/aarch64/CONFIG_RELOCATABLE
diff --git a/baseconfig/arm/arm64/CONFIG_RESET_HISI b/baseconfig/arm/aarch64/CONFIG_RESET_HISI
index af17d8a85..af17d8a85 100644
--- a/baseconfig/arm/arm64/CONFIG_RESET_HISI
+++ b/baseconfig/arm/aarch64/CONFIG_RESET_HISI
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG b/baseconfig/arm/aarch64/CONFIG_RPMSG
index 7cc8785d0..7cc8785d0 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG
+++ b/baseconfig/arm/aarch64/CONFIG_RPMSG
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_GLINK_RPM b/baseconfig/arm/aarch64/CONFIG_RPMSG_QCOM_GLINK_RPM
index 1f5ac58f2..1f5ac58f2 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_GLINK_RPM
+++ b/baseconfig/arm/aarch64/CONFIG_RPMSG_QCOM_GLINK_RPM
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/aarch64/CONFIG_RPMSG_QCOM_SMD
index f65af3d10..f65af3d10 100644
--- a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD
+++ b/baseconfig/arm/aarch64/CONFIG_RPMSG_QCOM_SMD
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_EFI b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_EFI
index e2a2dcd64..e2a2dcd64 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_EFI
+++ b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_EFI
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PL030 b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_PL030
index 6f6f4ec88..6f6f4ec88 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PL030
+++ b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_PL030
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PM8XXX b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_PM8XXX
index adc778ea4..adc778ea4 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_PM8XXX
+++ b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_PM8XXX
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_SUN6I
index 54410db09..54410db09 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_SUN6I
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_XGENE b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_XGENE
index f6897ba60..f6897ba60 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_RTC_DRV_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_SATA_AHCI_SEATTLE b/baseconfig/arm/aarch64/CONFIG_SATA_AHCI_SEATTLE
index dfcf03f07..dfcf03f07 100644
--- a/baseconfig/arm/arm64/CONFIG_SATA_AHCI_SEATTLE
+++ b/baseconfig/arm/aarch64/CONFIG_SATA_AHCI_SEATTLE
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_ACPI_POWER b/baseconfig/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
index dbb45c01b..dbb45c01b 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_ACPI_POWER
+++ b/baseconfig/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_LTC2978_REGULATOR b/baseconfig/arm/aarch64/CONFIG_SENSORS_LTC2978_REGULATOR
index 54d82ddb6..54d82ddb6 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_LTC2978_REGULATOR
+++ b/baseconfig/arm/aarch64/CONFIG_SENSORS_LTC2978_REGULATOR
diff --git a/baseconfig/arm/arm64/CONFIG_SENSORS_XGENE b/baseconfig/arm/aarch64/CONFIG_SENSORS_XGENE
index 84ffdf1e9..84ffdf1e9 100644
--- a/baseconfig/arm/arm64/CONFIG_SENSORS_XGENE
+++ b/baseconfig/arm/aarch64/CONFIG_SENSORS_XGENE
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_AMBA_PL010 b/baseconfig/arm/aarch64/CONFIG_SERIAL_AMBA_PL010
index ee4b9d52a..ee4b9d52a 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_AMBA_PL010
+++ b/baseconfig/arm/aarch64/CONFIG_SERIAL_AMBA_PL010
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM b/baseconfig/arm/aarch64/CONFIG_SERIAL_MSM
index d9bd71619..d9bd71619 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM
+++ b/baseconfig/arm/aarch64/CONFIG_SERIAL_MSM
diff --git a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM_CONSOLE b/baseconfig/arm/aarch64/CONFIG_SERIAL_MSM_CONSOLE
index 5aeaebb23..5aeaebb23 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIAL_MSM_CONSOLE
+++ b/baseconfig/arm/aarch64/CONFIG_SERIAL_MSM_CONSOLE
diff --git a/baseconfig/arm/arm64/CONFIG_SERIO_SUN4I_PS2 b/baseconfig/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
index aa105b326..aa105b326 100644
--- a/baseconfig/arm/arm64/CONFIG_SERIO_SUN4I_PS2
+++ b/baseconfig/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
diff --git a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC b/baseconfig/arm/aarch64/CONFIG_SND_KIRKWOOD_SOC
index 05e82f2e9..05e82f2e9 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC
+++ b/baseconfig/arm/aarch64/CONFIG_SND_KIRKWOOD_SOC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC b/baseconfig/arm/aarch64/CONFIG_SND_SOC_APQ8016_SBC
index dfe53b84d..dfe53b84d 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_APQ8016_SBC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index 207a5e523..207a5e523 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
index db12f036e..db12f036e 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM b/baseconfig/arm/aarch64/CONFIG_SND_SOC_QCOM
index 719eb4e3d..719eb4e3d 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_QCOM
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_SGTL5000
index ea71dece1..ea71dece1 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM b/baseconfig/arm/aarch64/CONFIG_SND_SOC_STORM
index adab3ae82..adab3ae82 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_STORM
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA
index b32a04ff3..b32a04ff3 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_MAX98090
index 55f327a38..55f327a38 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_MAX98090
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5640
index 3370b8ec2..3370b8ec2 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5640
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5677
index 24298d93b..24298d93b 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_RT5677
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_SGTL5000
index 4706a31c1..4706a31c1 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_SGTL5000
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_WM8753
index 9039b1695..9039b1695 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SOC_TEGRA_WM8753
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_CODEC
index 6cce5a1f7..6cce5a1f7 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_CODEC
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_CODEC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_I2S
index d9270e25b..d9270e25b 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_I2S
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
index c0b108aba..c0b108aba 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_SPDIF
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC b/baseconfig/arm/aarch64/CONFIG_SND_SUN8I_CODEC
index c30f94369..c30f94369 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SUN8I_CODEC
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG
index 28ea30190..28ea30190 100644
--- a/baseconfig/arm/arm64/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ b/baseconfig/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG
diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/baseconfig/arm/aarch64/CONFIG_SNI_NETSEC
index c348519ff..c348519ff 100644
--- a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC
+++ b/baseconfig/arm/aarch64/CONFIG_SNI_NETSEC
diff --git a/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS b/baseconfig/arm/aarch64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
index ded5c358e..ded5c358e 100644
--- a/baseconfig/arm/arm64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
+++ b/baseconfig/arm/aarch64/CONFIG_SOCIONEXT_SYNQUACER_PREITS
diff --git a/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL b/baseconfig/arm/aarch64/CONFIG_SOC_TEGRA_FLOWCTRL
index 00413d459..00413d459 100644
--- a/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL
+++ b/baseconfig/arm/aarch64/CONFIG_SOC_TEGRA_FLOWCTRL
diff --git a/baseconfig/arm/arm64/CONFIG_SPARSEMEM_VMEMMAP b/baseconfig/arm/aarch64/CONFIG_SPARSEMEM_VMEMMAP
index a2826dacd..a2826dacd 100644
--- a/baseconfig/arm/arm64/CONFIG_SPARSEMEM_VMEMMAP
+++ b/baseconfig/arm/aarch64/CONFIG_SPARSEMEM_VMEMMAP
diff --git a/baseconfig/arm/arm64/CONFIG_SPARSE_IRQ b/baseconfig/arm/aarch64/CONFIG_SPARSE_IRQ
index 943900f63..943900f63 100644
--- a/baseconfig/arm/arm64/CONFIG_SPARSE_IRQ
+++ b/baseconfig/arm/aarch64/CONFIG_SPARSE_IRQ
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_QUP b/baseconfig/arm/aarch64/CONFIG_SPI_QUP
index 4cfdd1db0..4cfdd1db0 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_QUP
+++ b/baseconfig/arm/aarch64/CONFIG_SPI_QUP
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I b/baseconfig/arm/aarch64/CONFIG_SPI_SUN6I
index 031cd17b9..031cd17b9 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_SUN6I
+++ b/baseconfig/arm/aarch64/CONFIG_SPI_SUN6I
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_THUNDERX b/baseconfig/arm/aarch64/CONFIG_SPI_THUNDERX
index 054a83114..054a83114 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_THUNDERX
+++ b/baseconfig/arm/aarch64/CONFIG_SPI_THUNDERX
diff --git a/baseconfig/arm/arm64/CONFIG_SPI_XLP b/baseconfig/arm/aarch64/CONFIG_SPI_XLP
index 6026d5f51..6026d5f51 100644
--- a/baseconfig/arm/arm64/CONFIG_SPI_XLP
+++ b/baseconfig/arm/aarch64/CONFIG_SPI_XLP
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI b/baseconfig/arm/aarch64/CONFIG_SPMI
index 4ce4dfde9..4ce4dfde9 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI
+++ b/baseconfig/arm/aarch64/CONFIG_SPMI
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB b/baseconfig/arm/aarch64/CONFIG_SPMI_MSM_PMIC_ARB
index bd46b497a..bd46b497a 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB
+++ b/baseconfig/arm/aarch64/CONFIG_SPMI_MSM_PMIC_ARB
diff --git a/baseconfig/arm/arm64/CONFIG_STUB_CLK_HI6220 b/baseconfig/arm/aarch64/CONFIG_STUB_CLK_HI6220
index 89a60a424..89a60a424 100644
--- a/baseconfig/arm/arm64/CONFIG_STUB_CLK_HI6220
+++ b/baseconfig/arm/aarch64/CONFIG_STUB_CLK_HI6220
diff --git a/baseconfig/arm/arm64/CONFIG_SUN4I_EMAC b/baseconfig/arm/aarch64/CONFIG_SUN4I_EMAC
index 7c44fecee..7c44fecee 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN4I_EMAC
+++ b/baseconfig/arm/aarch64/CONFIG_SUN4I_EMAC
diff --git a/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC b/baseconfig/arm/aarch64/CONFIG_SUN4I_GPADC
index 97139c216..97139c216 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC
+++ b/baseconfig/arm/aarch64/CONFIG_SUN4I_GPADC
diff --git a/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU b/baseconfig/arm/aarch64/CONFIG_SUN50I_A64_CCU
index 7b6c7a687..7b6c7a687 100644
--- a/baseconfig/arm/arm64/CONFIG_SUN50I_A64_CCU
+++ b/baseconfig/arm/aarch64/CONFIG_SUN50I_A64_CCU
diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_CCU b/baseconfig/arm/aarch64/CONFIG_SUNXI_CCU
index 30e6d69d1..30e6d69d1 100644
--- a/baseconfig/arm/arm64/CONFIG_SUNXI_CCU
+++ b/baseconfig/arm/aarch64/CONFIG_SUNXI_CCU
diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_WATCHDOG b/baseconfig/arm/aarch64/CONFIG_SUNXI_WATCHDOG
index 9b58f97fb..9b58f97fb 100644
--- a/baseconfig/arm/arm64/CONFIG_SUNXI_WATCHDOG
+++ b/baseconfig/arm/aarch64/CONFIG_SUNXI_WATCHDOG
diff --git a/baseconfig/arm/arm64/CONFIG_SYS_HYPERVISOR b/baseconfig/arm/aarch64/CONFIG_SYS_HYPERVISOR
index b5668db06..b5668db06 100644
--- a/baseconfig/arm/arm64/CONFIG_SYS_HYPERVISOR
+++ b/baseconfig/arm/aarch64/CONFIG_SYS_HYPERVISOR
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA210_ADMA b/baseconfig/arm/aarch64/CONFIG_TEGRA210_ADMA
index 7f82adad1..7f82adad1 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA210_ADMA
+++ b/baseconfig/arm/aarch64/CONFIG_TEGRA210_ADMA
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_ACONNECT b/baseconfig/arm/aarch64/CONFIG_TEGRA_ACONNECT
index 251550c81..251550c81 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_ACONNECT
+++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_ACONNECT
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI b/baseconfig/arm/aarch64/CONFIG_TEGRA_GMI
index 5def3e891..5def3e891 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_GMI
+++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_GMI
diff --git a/baseconfig/arm/arm64/CONFIG_TEGRA_IVC b/baseconfig/arm/aarch64/CONFIG_TEGRA_IVC
index cdcacbec2..cdcacbec2 100644
--- a/baseconfig/arm/arm64/CONFIG_TEGRA_IVC
+++ b/baseconfig/arm/aarch64/CONFIG_TEGRA_IVC
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_BGX b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_BGX
index 123fe6f48..123fe6f48 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_BGX
+++ b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_BGX
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_PF b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_PF
index 6b047a13c..6b047a13c 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_PF
+++ b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_PF
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_RGX b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_RGX
index c50ae013f..c50ae013f 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_RGX
+++ b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_RGX
diff --git a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_VF b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_VF
index 5fdfca5db..5fdfca5db 100644
--- a/baseconfig/arm/arm64/CONFIG_THUNDER_NIC_VF
+++ b/baseconfig/arm/aarch64/CONFIG_THUNDER_NIC_VF
diff --git a/baseconfig/arm/arm64/CONFIG_TOUCHSCREEN_SUN4I b/baseconfig/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
index af15c1f8c..af15c1f8c 100644
--- a/baseconfig/arm/arm64/CONFIG_TOUCHSCREEN_SUN4I
+++ b/baseconfig/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS b/baseconfig/arm/aarch64/CONFIG_USB_CONFIGFS_F_LB_SS
index 213edb5a1..213edb5a1 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_CONFIGFS_F_LB_SS
+++ b/baseconfig/arm/aarch64/CONFIG_USB_CONFIGFS_F_LB_SS
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI b/baseconfig/arm/aarch64/CONFIG_USB_MUSB_SUNXI
index 258e716ab..258e716ab 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_MUSB_SUNXI
+++ b/baseconfig/arm/aarch64/CONFIG_USB_MUSB_SUNXI
diff --git a/baseconfig/arm/arm64/CONFIG_USB_SPEEDTOUCH b/baseconfig/arm/aarch64/CONFIG_USB_SPEEDTOUCH
index e34bebc62..e34bebc62 100644
--- a/baseconfig/arm/arm64/CONFIG_USB_SPEEDTOUCH
+++ b/baseconfig/arm/aarch64/CONFIG_USB_SPEEDTOUCH
diff --git a/baseconfig/arm/arm64/CONFIG_VDSO b/baseconfig/arm/aarch64/CONFIG_VDSO
index cab5ebafb..cab5ebafb 100644
--- a/baseconfig/arm/arm64/CONFIG_VDSO
+++ b/baseconfig/arm/aarch64/CONFIG_VDSO
diff --git a/baseconfig/arm/arm64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET b/baseconfig/arm/aarch64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
index b6b1ee3b0..b6b1ee3b0 100644
--- a/baseconfig/arm/arm64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
+++ b/baseconfig/arm/aarch64/CONFIG_VFIO_PLATFORM_AMDXGBE_RESET
diff --git a/baseconfig/arm/arm64/CONFIG_VGA_CONSOLE b/baseconfig/arm/aarch64/CONFIG_VGA_CONSOLE
index 5b00b2f22..5b00b2f22 100644
--- a/baseconfig/arm/arm64/CONFIG_VGA_CONSOLE
+++ b/baseconfig/arm/aarch64/CONFIG_VGA_CONSOLE
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
index 5e2512c4c..5e2512c4c 100644
--- a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
+++ b/baseconfig/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_VENUS b/baseconfig/arm/aarch64/CONFIG_VIDEO_QCOM_VENUS
index 68082fdff..68082fdff 100644
--- a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_VENUS
+++ b/baseconfig/arm/aarch64/CONFIG_VIDEO_QCOM_VENUS
diff --git a/baseconfig/arm/arm64/CONFIG_VMAP_STACK b/baseconfig/arm/aarch64/CONFIG_VMAP_STACK
index 8bd986875..8bd986875 100644
--- a/baseconfig/arm/arm64/CONFIG_VMAP_STACK
+++ b/baseconfig/arm/aarch64/CONFIG_VMAP_STACK
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_DMA b/baseconfig/arm/aarch64/CONFIG_XGENE_DMA
index 7c67d5b57..7c67d5b57 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_DMA
+++ b/baseconfig/arm/aarch64/CONFIG_XGENE_DMA
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_PMU b/baseconfig/arm/aarch64/CONFIG_XGENE_PMU
index df5afee9f..df5afee9f 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_PMU
+++ b/baseconfig/arm/aarch64/CONFIG_XGENE_PMU
diff --git a/baseconfig/arm/arm64/CONFIG_XGENE_SLIMPRO_MBOX b/baseconfig/arm/aarch64/CONFIG_XGENE_SLIMPRO_MBOX
index cbc486395..cbc486395 100644
--- a/baseconfig/arm/arm64/CONFIG_XGENE_SLIMPRO_MBOX
+++ b/baseconfig/arm/aarch64/CONFIG_XGENE_SLIMPRO_MBOX
diff --git a/baseconfig/arm/arm64/README b/baseconfig/arm/aarch64/README
index c2aec64b2..c2aec64b2 100644
--- a/baseconfig/arm/arm64/README
+++ b/baseconfig/arm/aarch64/README
diff --git a/baseconfig/arm/arm64/CONFIG_USB_EHCI_MSM b/baseconfig/arm/arm64/CONFIG_USB_EHCI_MSM
deleted file mode 100644
index 7397a0f15..000000000
--- a/baseconfig/arm/arm64/CONFIG_USB_EHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MSM=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_MSM_OTG b/baseconfig/arm/arm64/CONFIG_USB_MSM_OTG
deleted file mode 100644
index 043abcf37..000000000
--- a/baseconfig/arm/arm64/CONFIG_USB_MSM_OTG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MSM_OTG=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_QCOM_8X16_PHY b/baseconfig/arm/arm64/CONFIG_USB_QCOM_8X16_PHY
deleted file mode 100644
index 79fac4fdc..000000000
--- a/baseconfig/arm/arm64/CONFIG_USB_QCOM_8X16_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_QCOM_8X16_PHY=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
deleted file mode 100644
index 8ba73409c..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_SUN4I_HDMI_CEC is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_TVE200 b/baseconfig/arm/armv7/CONFIG_DRM_TVE200
new file mode 100644
index 000000000..9e6b9770d
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DRM_TVE200
@@ -0,0 +1 @@
+CONFIG_DRM_TVE200=m
diff --git a/baseconfig/arm/armv7/CONFIG_OMAP4_DSS_HDMI_CEC b/baseconfig/arm/armv7/CONFIG_OMAP4_DSS_HDMI_CEC
new file mode 100644
index 000000000..56ceebfd5
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_OMAP4_DSS_HDMI_CEC
@@ -0,0 +1 @@
+CONFIG_OMAP4_DSS_HDMI_CEC=y
diff --git a/baseconfig/arm/armv7/CONFIG_PCI_V3_SEMI b/baseconfig/arm/armv7/CONFIG_PCI_V3_SEMI
new file mode 100644
index 000000000..8aeccd6e6
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_PCI_V3_SEMI
@@ -0,0 +1 @@
+CONFIG_PCI_V3_SEMI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM b/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
deleted file mode 100644
index 7397a0f15..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_EHCI_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_EHCI_MSM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG b/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG
deleted file mode 100644
index 043abcf37..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_MSM_OTG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MSM_OTG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY b/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
deleted file mode 100644
index 79fac4fdc..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_QCOM_8X16_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_QCOM_8X16_PHY=m