diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2020-02-07 15:44:43 +0100 |
|---|---|---|
| committer | Olivier Deprez <olivier.deprez@arm.com> | 2020-05-13 08:08:39 +0200 |
| commit | 23d5ba86bd7a43e7abb634c328d7a85bbc877fb5 (patch) | |
| tree | c2c7ec96ff0c0cd3a89f893ab0cdbcf78760bb12 /common | |
| parent | 52696946ab3f441496436ad7223cb2bd853c8beb (diff) | |
| download | arm-trusted-firmware-23d5ba86bd7a43e7abb634c328d7a85bbc877fb5.tar.gz | |
SPMD: extract SPMC DTB header size from SPMD
Currently BL2 passes TOS_FW_CONFIG address and size through registers to
BL31. This corresponds to SPMC manifest load address and size. The SPMC
manifest is mapped in BL31 by dynamic mapping. This patch removes BL2
changes from generic code (which were enclosed by SPD=spmd) and retrieves
SPMC manifest size directly from within SPMD. The SPMC manifest load
address is still passed through a register by generic code.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I35c5abd95c616ae25677302f0b1d0c45c51c042f
Diffstat (limited to 'common')
| -rw-r--r-- | common/desc_image_load.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/common/desc_image_load.c b/common/desc_image_load.c index 47c80aa86..30b97e050 100644 --- a/common/desc_image_load.c +++ b/common/desc_image_load.c @@ -214,9 +214,6 @@ void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params) { bl_params_node_t *params_node; unsigned int fw_config_id; -#ifdef SPD_spmd - uint32_t fw_config_size = 0; -#endif uintptr_t fw_config_base; bl_mem_params_node_t *mem_params; uintptr_t hw_config_base = 0; @@ -264,10 +261,6 @@ void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params) mem_params = get_bl_mem_params_node(fw_config_id); if (mem_params != NULL) { fw_config_base = mem_params->image_info.image_base; -#ifdef SPD_spmd - fw_config_size = - mem_params->image_info.image_size; -#endif } } @@ -306,11 +299,6 @@ void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params) if (params_node->ep_info->args.arg1 == 0U) params_node->ep_info->args.arg1 = hw_config_base; -#ifdef SPD_spmd - if (params_node->ep_info->args.arg2 == 0U) - params_node->ep_info->args.arg2 = - fw_config_size; -#endif } #ifdef SPD_opteed } |