From 6c07a9273b5e66d7234ecc52195f8eefbfe88205 Mon Sep 17 00:00:00 2001 From: Chandni Cherukuri Date: Thu, 1 Oct 2020 10:11:44 +0530 Subject: [PATCH] morello: Add changes to fix build of Morello Platform This patch makes changes required to get the morello platform working with the tip of TF-A. Change-Id: I095006615c9959bba49fcc75b52e1de7d7486309 Signed-off-by: Chandni Cherukuri --- plat/arm/board/morello/include/platform_def.h | 3 +++ plat/arm/board/morello/morello_bl31_setup.c | 2 +- plat/arm/board/morello/platform.mk | 11 +++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plat/arm/board/morello/include/platform_def.h b/plat/arm/board/morello/include/platform_def.h index 07c06a10c..9ca75ffe7 100644 --- a/plat/arm/board/morello/include/platform_def.h +++ b/plat/arm/board/morello/include/platform_def.h @@ -93,4 +93,7 @@ #define PLAT_ARM_GICC_BASE UL(0x2C000000) #define PLAT_ARM_GICR_BASE UL(0x300C0000) +/* Number of SCMI channels on the platform */ +#define PLAT_ARM_SCMI_CHANNEL_COUNT U(1) + #endif /* PLATFORM_DEF_H */ diff --git a/plat/arm/board/morello/morello_bl31_setup.c b/plat/arm/board/morello/morello_bl31_setup.c index 43f5f7fc7..5b91e87e1 100644 --- a/plat/arm/board/morello/morello_bl31_setup.c +++ b/plat/arm/board/morello/morello_bl31_setup.c @@ -48,7 +48,7 @@ static scmi_channel_plat_info_t morello_scmi_plat_info = { .ring_doorbell = &mhu_ring_doorbell }; -scmi_channel_plat_info_t *plat_css_get_scmi_info() +scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) { return &morello_scmi_plat_info; } diff --git a/plat/arm/board/morello/platform.mk b/plat/arm/board/morello/platform.mk index f62cd6749..2a23bc60f 100644 --- a/plat/arm/board/morello/platform.mk +++ b/plat/arm/board/morello/platform.mk @@ -12,12 +12,15 @@ PLAT_INCLUDES := -I${MORELLO_BASE}/include MORELLO_CPU_SOURCES := lib/cpus/aarch64/rainier.S -MORELLO_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v3/gicv3_main.c \ - drivers/arm/gic/v3/gicv3_helpers.c \ +# GIC-600 configuration +GICV3_SUPPORT_GIC600 := 1 + +# Include GICv3 driver files +include drivers/arm/gic/v3/gicv3.mk + +MORELLO_GIC_SOURCES := ${GICV3_SOURCES} \ plat/common/plat_gicv3.c \ plat/arm/common/arm_gicv3.c \ - drivers/arm/gic/v3/gic600.c PLAT_BL_COMMON_SOURCES := ${MORELLO_BASE}/morello_plat.c \ ${MORELLO_BASE}/aarch64/morello_helper.S