diff options
author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2020-10-02 11:56:02 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-02 11:56:02 +0000 |
commit | 14bac449fa29c9576abdda36b4e8f77deb99d9bb (patch) | |
tree | a58ca93b18fe9ed9e293b4312c127bd81277ba6d | |
parent | fa417e6806b48a95234bfe63f94990233b7c3886 (diff) | |
parent | 6c07a9273b5e66d7234ecc52195f8eefbfe88205 (diff) | |
download | trusted-firmware-a-14bac449fa29c9576abdda36b4e8f77deb99d9bb.tar.gz |
Merge "morello: Add changes to fix build of Morello Platform" into integration
-rw-r--r-- | plat/arm/board/morello/include/platform_def.h | 3 | ||||
-rw-r--r-- | plat/arm/board/morello/morello_bl31_setup.c | 2 | ||||
-rw-r--r-- | 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 07c06a10cf..9ca75ffe79 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 43f5f7fc71..5b91e87e1b 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 f62cd67491..2a23bc60fe 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 |