Remove deprecated bl1_init_bl2_mem_layout()
Change-Id: I8ec8b4439ca1d7606aae069c2c576a9a8b18c92c
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c
index d681a97..ca43695 100644
--- a/bl1/bl1_main.c
+++ b/bl1/bl1_main.c
@@ -48,25 +48,6 @@
flush_dcache_range((unsigned long)bl2_mem_layout, sizeof(meminfo_t));
}
-#if !ERROR_DEPRECATED
-/*******************************************************************************
- * Compatibility default implementation for deprecated API. This has a weak
- * definition. Platform specific code can override it if it wishes to.
- ******************************************************************************/
-#pragma weak bl1_init_bl2_mem_layout
-
-/*******************************************************************************
- * Function that takes a memory layout into which BL2 has been loaded and
- * populates a new memory layout for BL2 that ensures that BL1's data sections
- * resident in secure RAM are not visible to BL2.
- ******************************************************************************/
-void bl1_init_bl2_mem_layout(const struct meminfo *bl1_mem_layout,
- struct meminfo *bl2_mem_layout)
-{
- bl1_calc_bl2_mem_layout(bl1_mem_layout, bl2_mem_layout);
-}
-#endif
-
/*******************************************************************************
* Function to perform late architectural and platform specific initialization.
* It also queries the platform to load and run next BL image. Only called
diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index 6c81faf..36039ab 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -135,10 +135,6 @@
/*******************************************************************************
* Optional BL1 functions (may be overridden)
******************************************************************************/
-#if !ERROR_DEPRECATED
-void bl1_init_bl2_mem_layout(const struct meminfo *bl1_mem_layout,
- struct meminfo *bl2_mem_layout);
-#endif
/*
* The following functions are used for image loading process in BL1.
*/
diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c
index 7fde2e4..824f9e5 100644
--- a/plat/common/plat_bl1_common.c
+++ b/plat/common/plat_bl1_common.c
@@ -106,11 +106,7 @@
*/
bl2_tzram_layout = (meminfo_t *) bl1_tzram_layout->total_base;
-#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;