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

Merge "plat/arm: move compile time switch from source to dt file" into integration

This commit is contained in:
Manish Pandey 2021-04-26 18:11:09 +02:00 committed by TrustedFirmware Code Review
parent a92b02566e c404794a6f
commit 461e0d3e93
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plat/arm/board/fvp/fdts/fvp_fw_config.dts
View File

@ -36,11 +36,14 @@
id = <SOC_FW_CONFIG_ID>;
};
/* If required, SPD should enable loading of trusted OS fw config */
#if defined(SPD_tspd) || defined(SPD_spmd)
tos_fw-config {
load-address = <0x0 0x04001500>;
max-size = <0xB00>;
id = <TOS_FW_CONFIG_ID>;
};
#endif
#if !defined(SPD_spmd)
nt_fw-config {

3
plat/arm/common/arm_dyn_cfg.c
View File

@ -208,10 +208,7 @@ void arm_bl2_dyn_cfg_init(void)
HW_CONFIG_ID,
SOC_FW_CONFIG_ID,
NT_FW_CONFIG_ID,
#if defined(SPD_tspd) || defined(SPD_spmd)
/* tos_fw_config is only present for TSPD/SPMD */
TOS_FW_CONFIG_ID
#endif
};
const struct dyn_cfg_dtb_info_t *dtb_info;