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 <rebecca@quicinc.com>
Change-Id: I3fa01483e572abfd781ceaecff16ecf57cda8316

diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk
index cc437e3e2473d48da2f2713b6f01786c33720949..13f61ca2a4a739d1d59c7ac4e3c134210ce4e928 100644 (file)
--- 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)