From c68736dab5631af3d9a1d33cb911e90e67e8ee34 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 7 Dec 2022 13:24:44 -0700 Subject: [PATCH] fix(build): partially fix qemu aarch32 build While aarch32 isn't currently supported on qemu, platform.mk contains hard-coded references to aarch64 in BL1_SOURCES which should be ${ARCH}. This improves the situation, but since aarch32/qemu_max.S doesn't exist and there are other missing files for aarch32, this is only a partial fix. Signed-off-by: Rebecca Cran Change-Id: I3fa01483e572abfd781ceaecff16ecf57cda8316 --- plat/qemu/qemu/platform.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk index cc437e3e2..13f61ca2a 100644 --- a/plat/qemu/qemu/platform.mk +++ b/plat/qemu/qemu/platform.mk @@ -160,6 +160,17 @@ BL1_SOURCES += drivers/io/io_semihosting.c \ ${PLAT_QEMU_COMMON_PATH}/qemu_bl1_setup.c \ ${QEMU_CPU_LIBS} +ifeq (${ARM_ARCH_MAJOR},8) +BL1_SOURCES += lib/cpus/${ARCH}/aem_generic.S \ + lib/cpus/${ARCH}/cortex_a53.S \ + lib/cpus/${ARCH}/cortex_a57.S \ + lib/cpus/${ARCH}/cortex_a72.S \ + lib/cpus/${ARCH}/qemu_max.S \ + +else +BL1_SOURCES += lib/cpus/${ARCH}/cortex_a15.S +endif + BL2_SOURCES += drivers/io/io_semihosting.c \ drivers/io/io_storage.c \ drivers/io/io_fip.c \ @@ -221,7 +232,8 @@ BL31_SOURCES += ${QEMU_CPU_LIBS} \ # Pointer Authentication sources ifeq (${ENABLE_PAUTH}, 1) -PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c +PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c \ + lib/extensions/pauth/pauth_helpers.S endif ifeq (${SPD},spmd) -- 2.39.5