aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Przywara <andre.przywara@arm.com>2021-03-24 15:44:24 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-03-24 15:44:24 +0100
commitb59444ea8e5309b50aaf2c213bd851871e758a8a (patch)
treec75421762a6d6289ca107735946bc2d15336ea8d
parent4a81a9f1be97b36ef19fedbd74d5a6075b433f73 (diff)
parent830c7657d5b11b26138339bafbc7edd0c7a10d08 (diff)
downloadtrusted-firmware-a-b59444ea8e5309b50aaf2c213bd851871e758a8a.tar.gz
Merge "rpi4: Switch to gicv2.mk and GICV2_SOURCES" into integration
-rw-r--r--plat/rpi/rpi4/platform.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/plat/rpi/rpi4/platform.mk b/plat/rpi/rpi4/platform.mk
index 0744bceb46..99d51fb29b 100644
--- a/plat/rpi/rpi4/platform.mk
+++ b/plat/rpi/rpi4/platform.mk
@@ -7,6 +7,8 @@
include lib/libfdt/libfdt.mk
include lib/xlat_tables_v2/xlat_tables.mk
+include drivers/arm/gic/v2/gicv2.mk
+
PLAT_INCLUDES := -Iplat/rpi/common/include \
-Iplat/rpi/rpi4/include
@@ -18,9 +20,6 @@ PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \
BL31_SOURCES += lib/cpus/aarch64/cortex_a72.S \
plat/rpi/common/aarch64/plat_helpers.S \
plat/rpi/rpi4/aarch64/armstub8_header.S \
- drivers/arm/gic/common/gic_common.c \
- drivers/arm/gic/v2/gicv2_helpers.c \
- drivers/arm/gic/v2/gicv2_main.c \
drivers/delay_timer/delay_timer.c \
drivers/gpio/gpio.c \
drivers/rpi3/gpio/rpi3_gpio.c \
@@ -30,7 +29,8 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a72.S \
plat/common/plat_psci_common.c \
plat/rpi/common/rpi3_topology.c \
common/fdt_fixup.c \
- ${LIBFDT_SRCS}
+ ${LIBFDT_SRCS} \
+ ${GICV2_SOURCES}
# For now we only support BL31, using the kernel loaded by the GPU firmware.
RESET_TO_BL31 := 1