aboutsummaryrefslogtreecommitdiff
path: root/plat/common
diff options
context:
space:
mode:
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 677797995..7fde2e415 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 95d73e3c9..aa1077bd3 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)
{