From d799d168e4dfd2d0aaea43f4865241169adf7401 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 10 Mar 2021 15:00:50 +0000 Subject: [PATCH 1/2] plat/qemu: include gicv2.mk The build now gives deprecation warnings for including drivers/arm/gic/common/gic_common.c directly. Move to including the common gicv2 sources via gicv2.mk instead - which also matches the pattern already used for gicv3. Change-Id: I5332fb52c5801272e5e2bb6111f96087b4894325 Signed-off-by: Leif Lindholm --- plat/qemu/qemu/platform.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk index 88a95c800..e7146f6e1 100644 --- a/plat/qemu/qemu/platform.mk +++ b/plat/qemu/qemu/platform.mk @@ -135,9 +135,9 @@ BL1_SOURCES += drivers/io/io_encrypted.c BL2_SOURCES += drivers/io/io_encrypted.c endif -QEMU_GICV2_SOURCES := drivers/arm/gic/v2/gicv2_helpers.c \ - drivers/arm/gic/v2/gicv2_main.c \ - drivers/arm/gic/common/gic_common.c \ +# Include GICv2 driver files +include drivers/arm/gic/v2/gicv2.mk +QEMU_GICV2_SOURCES := ${GICV2_SOURCES} \ plat/common/plat_gicv2.c \ ${PLAT_QEMU_COMMON_PATH}/qemu_gicv2.c From 103ee1b1c389c02a9c0f3a0c44749412dcae8be6 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 10 Mar 2021 13:30:24 +0000 Subject: [PATCH 2/2] plat/qemu: add cortex-a72 support to 'virt' platform Cortex-A72 support is already enabled for sbsa-ref platform, so add it also to virt platform for parity. Change-Id: Ib0a2ce81ef7c0a71ef8dc66dbec179191bf2e6cc Signed-off-by: Leif Lindholm --- plat/qemu/qemu/platform.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plat/qemu/qemu/platform.mk b/plat/qemu/qemu/platform.mk index e7146f6e1..345ba6c31 100644 --- a/plat/qemu/qemu/platform.mk +++ b/plat/qemu/qemu/platform.mk @@ -107,7 +107,9 @@ BL1_SOURCES += drivers/io/io_semihosting.c \ ifeq (${ARM_ARCH_MAJOR},8) BL1_SOURCES += lib/cpus/aarch64/aem_generic.S \ lib/cpus/aarch64/cortex_a53.S \ - lib/cpus/aarch64/cortex_a57.S + lib/cpus/aarch64/cortex_a57.S \ + lib/cpus/aarch64/cortex_a72.S \ + else BL1_SOURCES += lib/cpus/${ARCH}/cortex_a15.S endif @@ -160,6 +162,7 @@ ifeq (${ARM_ARCH_MAJOR},8) BL31_SOURCES += lib/cpus/aarch64/aem_generic.S \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ + lib/cpus/aarch64/cortex_a72.S \ lib/semihosting/semihosting.c \ lib/semihosting/${ARCH}/semihosting_call.S \ plat/common/plat_psci_common.c \