ANDROID: suppress IOMMU_IO_PGTABLE_LPAE on 32-bit

Originally init/Kconfig.gki was just excluded on 32-bit, which works
fine for allmodconfig builds, but breaks downstream boards trying to
build specific drivers modularly (in a 'mixed tree' configuration)
for 32-bit ARM with Kleaf. Replace the workaround with a new one.

Bug: 379954362
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: Ia67da020f561fdc43e73a68984ca882bbe0d3082
This commit is contained in:
Alistair Delva
2025-03-25 13:21:35 -07:00
committed by Treehugger Robot
parent 8b9a794068
commit 25e74c53fc
+7 -1
View File
@@ -90,11 +90,17 @@ config GKI_HIDDEN_GPIO_CONFIGS
These are normally selected implicitly when a module
that relies on it is configured.
# If this file is included on a 32-bit allmodconfig build, the select for
# IOMMU_IO_PGTABLE_LPAE will trigger an "unmet direct dependency" warning
# because this option is incompatible with GENERIC_ATOMIC64, which is
# required by CPU_V6 and implied by ARCH_BCM2835. ARCH_BCM2835 is enabled
# in the ARM defconfig (multi_v7_defconfig) and implied by many BCM2835
# drivers, so it is lower impact to disable IOMMU_IO_PGTABLE_LPAE here
config GKI_HIDDEN_QCOM_CONFIGS
bool "Hidden QCOM configs needed for GKI"
select QCOM_SMEM_STATE
select QCOM_GDSC if (ARCH_QCOM)
select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM)
select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM && 64BIT)
select INTERCONNECT_QCOM if (ARCH_QCOM)
select AUXILIARY_BUS if (ARCH_QCOM)