summaryrefslogtreecommitdiff
path: root/plat/common
diff options
context:
space:
mode:
authorRoberto Vargas <roberto.vargas@arm.com>2018-09-24 17:20:48 +0100
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-09-28 15:31:52 +0100
commited51b51f7a9163a7fc48289c5ed97a3fe4fe504f (patch)
tree09c75a5c072abcec2f196dfa5dc82ce1d3153db0 /plat/common
parent0b812305998380569fc609ea87157975780fc1e2 (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 'plat/common')
-rw-r--r--plat/common/plat_bl1_common.c5
-rw-r--r--plat/common/plat_bl_common.c2
2 files changed, 0 insertions, 7 deletions
diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c
index 67779799..7fde2e41 100644
--- a/plat/common/plat_bl1_common.c
+++ b/plat/common/plat_bl1_common.c
@@ -104,12 +104,7 @@ 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);
diff --git a/plat/common/plat_bl_common.c b/plat/common/plat_bl_common.c
index 95d73e3c..aa1077bd 100644
--- a/plat/common/plat_bl_common.c
+++ b/plat/common/plat_bl_common.c
@@ -40,7 +40,6 @@ void bl2_plat_preload_setup(void)
{
}
-#if LOAD_IMAGE_V2
int bl2_plat_handle_pre_image_load(unsigned int image_id)
{
return 0;
@@ -50,7 +49,6 @@ int bl2_plat_handle_post_image_load(unsigned int image_id)
{
return 0;
}
-#endif
int plat_try_next_boot_source(void)
{