diff options
| author | Roberto Vargas <roberto.vargas@arm.com> | 2018-09-24 17:20:48 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:52 +0100 |
| commit | ed51b51f7a9163a7fc48289c5ed97a3fe4fe504f (patch) | |
| tree | 09c75a5c072abcec2f196dfa5dc82ce1d3153db0 /bl1/bl1_main.c | |
| parent | 0b812305998380569fc609ea87157975780fc1e2 (diff) | |
Remove build option LOAD_IMAGE_V2
The code of LOAD_IMAGE_V2=0 has been removed.
Change-Id: Iea03e5bebb90c66889bdb23f85c07d0c9717fffe
Co-authored-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'bl1/bl1_main.c')
| -rw-r--r-- | bl1/bl1_main.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index 047cd6fb..d681a97e 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -37,7 +37,6 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, assert(bl1_mem_layout != NULL); assert(bl2_mem_layout != NULL); -#if LOAD_IMAGE_V2 /* * Remove BL1 RW data from the scope of memory visible to BL2. * This is assuming BL1 RW data is at the top of bl1_mem_layout. @@ -45,19 +44,6 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, assert(BL1_RW_BASE > bl1_mem_layout->total_base); bl2_mem_layout->total_base = bl1_mem_layout->total_base; bl2_mem_layout->total_size = BL1_RW_BASE - bl1_mem_layout->total_base; -#else - /* Check that BL1's memory is lying outside of the free memory */ - assert((BL1_RAM_LIMIT <= bl1_mem_layout->free_base) || - (BL1_RAM_BASE >= bl1_mem_layout->free_base + - bl1_mem_layout->free_size)); - - /* Remove BL1 RW data from the scope of memory visible to BL2 */ - *bl2_mem_layout = *bl1_mem_layout; - reserve_mem(&bl2_mem_layout->total_base, - &bl2_mem_layout->total_size, - BL1_RAM_BASE, - BL1_RAM_LIMIT - BL1_RAM_BASE); -#endif /* LOAD_IMAGE_V2 */ flush_dcache_range((unsigned long)bl2_mem_layout, sizeof(meminfo_t)); } @@ -183,27 +169,7 @@ static void bl1_load_bl2(void) plat_error_handler(err); } -#if LOAD_IMAGE_V2 err = load_auth_image(BL2_IMAGE_ID, image_info); -#else - entry_point_info_t *ep_info; - meminfo_t *bl1_tzram_layout; - - /* Get the entry point info */ - ep_info = &image_desc->ep_info; - - /* Find out how much free trusted ram remains after BL1 load */ - bl1_tzram_layout = bl1_plat_sec_mem_layout(); - - /* Load the BL2 image */ - err = load_auth_image(bl1_tzram_layout, - BL2_IMAGE_ID, - image_info->image_base, - image_info, - ep_info); - -#endif /* LOAD_IMAGE_V2 */ - if (err) { ERROR("Failed to load BL2 firmware.\n"); plat_error_handler(err); |