From c404794a6fbbbc0f59bcebcfd5b1d19264a635eb Mon Sep 17 00:00:00 2001 From: Manish Pandey Date: Wed, 14 Apr 2021 15:03:34 +0100 Subject: [PATCH] plat/arm: move compile time switch from source to dt file This will help in keeping source file generic and conditional compilation can be contained in platform provided dt files. Signed-off-by: Manish Pandey Change-Id: I3c6e0a429073f0afb412b9ba521ce43f880b57fe --- plat/arm/board/fvp/fdts/fvp_fw_config.dts | 3 +++ plat/arm/common/arm_dyn_cfg.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/arm/board/fvp/fdts/fvp_fw_config.dts b/plat/arm/board/fvp/fdts/fvp_fw_config.dts index 074a50a5e..cad888f37 100644 --- a/plat/arm/board/fvp/fdts/fvp_fw_config.dts +++ b/plat/arm/board/fvp/fdts/fvp_fw_config.dts @@ -36,11 +36,14 @@ 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 = ; }; +#endif #if !defined(SPD_spmd) nt_fw-config { diff --git a/plat/arm/common/arm_dyn_cfg.c b/plat/arm/common/arm_dyn_cfg.c index 6b3a61180..30473be31 100644 --- a/plat/arm/common/arm_dyn_cfg.c +++ b/plat/arm/common/arm_dyn_cfg.c @@ -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;