Skip to content

GitLab

Commit 461e0d3e authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

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

parents a92b0256 c404794a
Show whitespace changes
Inline Side-by-side
plat/arm/board/fvp/fdts/fvp_fw_config.dts
View file @ 461e0d3e
...@@ -36,11 +36,14 @@ ...@@ -36,11 +36,14 @@
id = <SOC_FW_CONFIG_ID>; 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 { tos_fw-config {
load-address = <0x0 0x04001500>; load-address = <0x0 0x04001500>;
max-size = <0xB00>; max-size = <0xB00>;
id = <TOS_FW_CONFIG_ID>; id = <TOS_FW_CONFIG_ID>;
}; };
#endif
#if !defined(SPD_spmd) #if !defined(SPD_spmd)
nt_fw-config { nt_fw-config {
......
plat/arm/common/arm_dyn_cfg.c
View file @ 461e0d3e
...@@ -208,10 +208,7 @@ void arm_bl2_dyn_cfg_init(void) ...@@ -208,10 +208,7 @@ void arm_bl2_dyn_cfg_init(void)
HW_CONFIG_ID, HW_CONFIG_ID,
SOC_FW_CONFIG_ID, SOC_FW_CONFIG_ID,
NT_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 TOS_FW_CONFIG_ID
#endif
}; };
const struct dyn_cfg_dtb_info_t *dtb_info; const struct dyn_cfg_dtb_info_t *dtb_info;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment