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

Merge "feat(board/rdedmunds): add support for rdedmunds variant" into integration

This commit is contained in:
Madhukar Pappireddy 2022-02-23 16:25:44 +01:00 committed by TrustedFirmware Code Review
parent 176717989f ef515f0d34
commit 80b895ca71
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plat/arm/board/rdn2/platform.mk
View File

@ -30,7 +30,8 @@ RDN2_BASE = plat/arm/board/rdn2
PLAT_INCLUDES += -I${RDN2_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.S
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.S \
lib/cpus/aarch64/neoverse_demeter.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat_v2.c

4
plat/arm/css/sgi/include/sgi_variant.h
View File

@ -23,6 +23,10 @@
/* SID Version values for RD-N2 variants */
#define RD_N2_CFG1_SID_VER_PART_NUM 0x07B6
/* SID Version values for RD-Edmunds */
#define RD_EDMUNDS_SID_VER_PART_NUM 0x07F2
#define RD_EDMUNDS_CONFIG_ID 0x1
/* Structure containing SGI platform variant information */
typedef struct sgi_platform_info {
unsigned int platform_id; /* Part Number of the platform */

1
plat/arm/css/sgi/sgi_bl31_setup.c
View File

@ -76,6 +76,7 @@ scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id)
if (sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM ||
sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM ||
sgi_plat_info.platform_id == RD_N2_SID_VER_PART_NUM ||
sgi_plat_info.platform_id == RD_EDMUNDS_SID_VER_PART_NUM ||
sgi_plat_info.platform_id == RD_N2_CFG1_SID_VER_PART_NUM) {
if (channel_id >= ARRAY_SIZE(plat_rd_scmi_info))
panic();