summaryrefslogtreecommitdiff
path: root/plat/common/plat_bl1_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'plat/common/plat_bl1_common.c')
-rw-r--r--plat/common/plat_bl1_common.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c
index 67779799..824f9e55 100644
--- a/plat/common/plat_bl1_common.c
+++ b/plat/common/plat_bl1_common.c
@@ -104,18 +104,9 @@ int bl1_plat_handle_post_image_load(unsigned int image_id)
* to BL2. BL2 will read the memory layout before using its
* memory for other purposes.
*/
-#if LOAD_IMAGE_V2
bl2_tzram_layout = (meminfo_t *) bl1_tzram_layout->total_base;
-#else
- bl2_tzram_layout = (meminfo_t *) round_up(bl1_tzram_layout->free_base,
- sizeof(uint64_t));
-#endif /* LOAD_IMAGE_V2 */
-
-#if !ERROR_DEPRECATED
- bl1_init_bl2_mem_layout(bl1_tzram_layout, bl2_tzram_layout);
-#else
+
bl1_calc_bl2_mem_layout(bl1_tzram_layout, bl2_tzram_layout);
-#endif
ep_info->args.arg1 = (uintptr_t)bl2_tzram_layout;