andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "morello: Add changes to fix build of Morello Platform" into integration

This commit is contained in:
Alexei Fedorov 2020-10-02 11:56:02 +00:00 committed by TrustedFirmware Code Review
parent fa417e6806 6c07a9273b
commit 14bac449fa
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plat/arm/board/morello/include/platform_def.h
View File

@ -93,4 +93,7 @@
#define PLAT_ARM_GICC_BASE UL(0x2C000000) #define PLAT_ARM_GICC_BASE UL(0x2C000000)
#define PLAT_ARM_GICR_BASE UL(0x300C0000) #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 */ #endif /* PLATFORM_DEF_H */

2
plat/arm/board/morello/morello_bl31_setup.c
View File

@ -48,7 +48,7 @@ static scmi_channel_plat_info_t morello_scmi_plat_info = {
.ring_doorbell = &mhu_ring_doorbell .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; return &morello_scmi_plat_info;
} }

11
plat/arm/board/morello/platform.mk
View File

@ -12,12 +12,15 @@ PLAT_INCLUDES := -I${MORELLO_BASE}/include
MORELLO_CPU_SOURCES := lib/cpus/aarch64/rainier.S MORELLO_CPU_SOURCES := lib/cpus/aarch64/rainier.S
MORELLO_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ # GIC-600 configuration
drivers/arm/gic/v3/gicv3_main.c \ GICV3_SUPPORT_GIC600 := 1
drivers/arm/gic/v3/gicv3_helpers.c \
# Include GICv3 driver files
include drivers/arm/gic/v3/gicv3.mk
MORELLO_GIC_SOURCES := ${GICV3_SOURCES} \
plat/common/plat_gicv3.c \ plat/common/plat_gicv3.c \
plat/arm/common/arm_gicv3.c \ plat/arm/common/arm_gicv3.c \
drivers/arm/gic/v3/gic600.c
PLAT_BL_COMMON_SOURCES := ${MORELLO_BASE}/morello_plat.c \ PLAT_BL_COMMON_SOURCES := ${MORELLO_BASE}/morello_plat.c \
${MORELLO_BASE}/aarch64/morello_helper.S ${MORELLO_BASE}/aarch64/morello_helper.S