diff options
Diffstat (limited to 'plat/arm/common/arm_bl2_setup.c')
-rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index e4a4f8724f..fd60c2bd3b 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -62,15 +62,13 @@ void arm_bl2_early_platform_setup(uintptr_t fw_config, bl2_tzram_layout = *mem_layout; /* Fill the properties struct with the info from the config dtb */ - if (fw_config != 0U) { - fconf_populate("FW_CONFIG", fw_config); - } + fconf_populate("FW_CONFIG", fw_config); /* TB_FW_CONFIG was also loaded by BL1 */ tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID); - if (tb_fw_config_info != NULL) { - fconf_populate("TB_FW", tb_fw_config_info->config_addr); - } + assert(tb_fw_config_info != NULL); + + fconf_populate("TB_FW", tb_fw_config_info->config_addr); /* Initialise the IO layer and register platform IO devices */ plat_arm_io_setup(); |