From 9bc28a5eb2f650648babaea62b6da871819370de Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Mon, 3 Aug 2020 00:25:03 +0100 Subject: [PATCH] plat/allwinner: Use common gicv2.mk Compiling BL31 for the Allwinner platform now produces a message about the deprecation of gic_common.c. Follow the advice and use include gicv2.mk instead. Collect all includes at the beginning of the file on the way. Change-Id: Iee46e21a630bfa831d28059f09aa7b049eb554bb Signed-off-by: Andre Przywara --- plat/allwinner/common/allwinner-common.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plat/allwinner/common/allwinner-common.mk b/plat/allwinner/common/allwinner-common.mk index e60ebc6f2..997aaa6f7 100644 --- a/plat/allwinner/common/allwinner-common.mk +++ b/plat/allwinner/common/allwinner-common.mk @@ -5,6 +5,8 @@ # include lib/xlat_tables_v2/xlat_tables.mk +include lib/libfdt/libfdt.mk +include drivers/arm/gic/v2/gicv2.mk AW_PLAT := plat/allwinner @@ -12,8 +14,6 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common/aarch64 \ -I${AW_PLAT}/common/include \ -I${AW_PLAT}/${PLAT}/include -include lib/libfdt/libfdt.mk - PLAT_BL_COMMON_SOURCES := drivers/ti/uart/${ARCH}/16550_console.S \ ${XLAT_TABLES_LIB_SRCS} \ ${AW_PLAT}/common/plat_helpers.S \ @@ -22,9 +22,7 @@ PLAT_BL_COMMON_SOURCES := drivers/ti/uart/${ARCH}/16550_console.S \ BL31_SOURCES += drivers/allwinner/axp/common.c \ drivers/allwinner/sunxi_msgbox.c \ drivers/arm/css/scpi/css_scpi.c \ - drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v2/gicv2_helpers.c \ - drivers/arm/gic/v2/gicv2_main.c \ + ${GICV2_SOURCES} \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ lib/cpus/${ARCH}/cortex_a53.S \