Merge "plat/arm: Add assert for the valid address of dtb information" into integration
This commit is contained in:
commit
1ba168cf42
|
@ -62,15 +62,13 @@ void arm_bl2_early_platform_setup(uintptr_t fw_config,
|
||||||
bl2_tzram_layout = *mem_layout;
|
bl2_tzram_layout = *mem_layout;
|
||||||
|
|
||||||
/* Fill the properties struct with the info from the config dtb */
|
/* 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 was also loaded by BL1 */
|
||||||
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
||||||
if (tb_fw_config_info != NULL) {
|
assert(tb_fw_config_info != NULL);
|
||||||
fconf_populate("TB_FW", tb_fw_config_info->config_addr);
|
|
||||||
}
|
fconf_populate("TB_FW", tb_fw_config_info->config_addr);
|
||||||
|
|
||||||
/* Initialise the IO layer and register platform IO devices */
|
/* Initialise the IO layer and register platform IO devices */
|
||||||
plat_arm_io_setup();
|
plat_arm_io_setup();
|
||||||
|
|
|
@ -93,6 +93,8 @@ void arm_bl1_set_mbedtls_heap(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
||||||
|
assert(tb_fw_config_info != NULL);
|
||||||
|
|
||||||
tb_fw_cfg_dtb = tb_fw_config_info->config_addr;
|
tb_fw_cfg_dtb = tb_fw_config_info->config_addr;
|
||||||
|
|
||||||
if ((tb_fw_cfg_dtb != 0UL) && (mbedtls_heap_addr != NULL)) {
|
if ((tb_fw_cfg_dtb != 0UL) && (mbedtls_heap_addr != NULL)) {
|
||||||
|
@ -134,6 +136,8 @@ void arm_bl1_set_bl2_hash(image_desc_t *image_desc)
|
||||||
const struct dyn_cfg_dtb_info_t *tb_fw_config_info;
|
const struct dyn_cfg_dtb_info_t *tb_fw_config_info;
|
||||||
|
|
||||||
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID);
|
||||||
|
assert(tb_fw_config_info != NULL);
|
||||||
|
|
||||||
tb_fw_cfg_dtb = tb_fw_config_info->config_addr;
|
tb_fw_cfg_dtb = tb_fw_config_info->config_addr;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue