commit c32210332180dc758312a73a9c66ed31a229f2dd
author Dmitriy Filchenko <dmitriyf@google.com> Wed May 22 04:08:52 2024 +0000
committer Dmitriy Filchenko <dmitriyf@google.com> Fri May 24 03:12:25 2024 +0000
tree 1f52bd9033d8096930bcdffb269d9d978df46d9b
parent 933a66b09ee164b414f6368e92a09acb15e2aaf5

Mark EL2 as unused in ATF for arm32 Trusty builds

Bug: 284057071
Test: Build & run Trusty
Change-Id: I5b7e556799671b6fd5298cd29c68640d396726fe

project/qemu-atf-inc.mk

diff --git a/project/qemu-atf-inc.mk b/project/qemu-atf-inc.mk
index 574e7fd..a795153 100644
--- a/project/qemu-atf-inc.mk
+++ b/project/qemu-atf-inc.mk
@@ -52,6 +52,10 @@
 ATF_MAKE_ARGS += DEBUG=$(ATF_DEBUG)
 ATF_MAKE_ARGS += BUILD_BASE=$(ATF_BUILD_BASE)
 ATF_MAKE_ARGS += QEMU_USE_GIC_DRIVER=QEMU_GICV$(GIC_VERSION)
+# On aarch32, we skip EL2, see 27d8e1e75a2f45d7c23
+ifeq (true,$(call TOBOOL,$(KERNEL_32BIT)))
+ATF_MAKE_ARGS += INIT_UNUSED_NS_EL2=1
+endif
 
 ifeq (true,$(call TOBOOL,$(ATF_WITH_TRUSTY_GENERIC_SERVICES)))
 ATF_MAKE_ARGS += TRUSTY_SPD_WITH_GENERIC_SERVICES=1