summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuangming Cao <Guangming.Cao@mediatek.com>2021-05-25 09:57:47 +0800
committerTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-09-08 23:28:05 +0000
commitad1c0a2a833bd6265e8bc07af5d0e2d48971d0b8 (patch)
tree81492aadd8aa9e7354bbd7d88242abbc61f95f23
parent5ac884721de890afbd45ad58ea885880b0536857 (diff)
downloadcommon-ad1c0a2a833bd6265e8bc07af5d0e2d48971d0b8.tar.gz
ANDROID: GKI: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
To enable IOMMU driver, we need to enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S as build-in by default value in gki_defconfig. Bug: 189076024 Bug: 299677454 Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> (cherry picked from commit b6cab5d17d8b75a5c7b469070e731fd408485b43) (cherry picked from commit 384f4652986e37924468018d0878ef33ce963bc7) (cherry picked from https://android-review.googlesource.com/q/commit:f6090aae9656c0de4c27d987c81e23794e0d5ac9) (cherry picked from https://android-review.googlesource.com/q/commit:f627c35dd5a13fb5024a0cbadb0ca6419a273fb2) Merged-In: Ia9a87682c2c56338f57703a4bc01793fbe1a3496 Change-Id: Ia9a87682c2c56338f57703a4bc01793fbe1a3496
-rw-r--r--arch/arm64/configs/gki_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 8be040ca063b..58fd442710c9 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -567,6 +567,7 @@ CONFIG_COMMON_CLK_SCPI=y
CONFIG_HWSPINLOCK=y
# CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
CONFIG_MAILBOX=y
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
CONFIG_REMOTEPROC=y
CONFIG_REMOTEPROC_CDEV=y
CONFIG_RPMSG_CHAR=y