Remove deprecated early platform setup interfaces

The affected interfaces are bl31_early_platform_setup(),
sp_min_early_platform_setup() and bl2_early_platform_setup().

Change-Id: I50c01ec68bcbe97fe4e5d101bcd0f763358b8e1e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/include/bl32/sp_min/platform_sp_min.h b/include/bl32/sp_min/platform_sp_min.h
index 8f6a82d90896c187ab9506b190b2dc775a637f10..2d71a47982153f2878782386dbf2493e993e9e76 100644 (file)
--- a/include/bl32/sp_min/platform_sp_min.h
+++ b/include/bl32/sp_min/platform_sp_min.h
@@ -10,10 +10,6 @@
 /*******************************************************************************
  * Mandatory SP_MIN functions
  ******************************************************************************/
-#if !ERROR_DEPRECATED
-void sp_min_early_platform_setup(void *from_bl2,
-               void *plat_params_from_bl2);
-#endif
 void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
                u_register_t arg2, u_register_t arg3);
 void sp_min_platform_setup(void);

diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index 7fd6b71d92a013e72286de5685f5d73f652213ff..6c81faf5c74712a0c9f0b6803dc0cd3349a04410 100644 (file)
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -168,9 +168,6 @@ int bl1_plat_handle_post_image_load(unsigned int image_id);
  * Mandatory BL2 functions
  ******************************************************************************/
 void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3);
-#if !ERROR_DEPRECATED
-void bl2_early_platform_setup(struct meminfo *mem_layout);
-#endif
 void bl2_plat_arch_setup(void);
 void bl2_platform_setup(void);
 struct meminfo *bl2_plat_sec_mem_layout(void);
@@ -222,10 +219,6 @@ int bl2u_plat_handle_scp_bl2u(void);
 /*******************************************************************************
  * Mandatory BL31 functions
  ******************************************************************************/
-#if !ERROR_DEPRECATED
-void bl31_early_platform_setup(void *from_bl2,
-                               void *plat_params_from_bl2);
-#endif /* ERROR_DEPRECATED */
 void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
                u_register_t arg2, u_register_t arg3);
 void bl31_plat_arch_setup(void);

diff --git a/plat/common/aarch32/plat_sp_min_common.c b/plat/common/aarch32/plat_sp_min_common.c
index 67ae817e624e8928cee79e60fd9752725afdb5be..a9a92c7e5a79eeb53db627ad4671084cdb58f55b 100644 (file)
--- a/plat/common/aarch32/plat_sp_min_common.c
+++ b/plat/common/aarch32/plat_sp_min_common.c
@@ -23,14 +23,3 @@ void sp_min_plat_runtime_setup(void)
         */
        console_uninit();
 }
-
-#if !ERROR_DEPRECATED
-
-#pragma weak sp_min_early_platform_setup2
-
-void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
-                       u_register_t arg2, u_register_t arg3)
-{
-       sp_min_early_platform_setup((void *)arg0, (void *)arg1);
-}
-#endif

diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c
index df70f656550d6831351002b4603c0ae2dc2eb2b6..60bdd3ea0dce5be6f1e8ddcf192c604cc6f5b522 100644 (file)
--- a/plat/common/aarch64/plat_common.c
+++ b/plat/common/aarch64/plat_common.c
@@ -21,7 +21,6 @@
 #pragma weak bl31_plat_runtime_setup
 #if !ERROR_DEPRECATED
 #pragma weak plat_get_syscnt_freq2
-#pragma weak bl31_early_platform_setup2
 #endif /* ERROR_DEPRECATED */
 
 #if SDEI_SUPPORT
@@ -69,12 +68,6 @@ unsigned int plat_get_syscnt_freq2(void)
 
        return (unsigned int)freq;
 }
-
-void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
-                       u_register_t arg2, u_register_t arg3)
-{
-       bl31_early_platform_setup((void *) arg0, (void *)arg1);
-}
 #endif /* ERROR_DEPRECATED */
 
 #if SDEI_SUPPORT

diff --git a/plat/common/plat_bl_common.c b/plat/common/plat_bl_common.c
index aa1077bd3012dac50668718ec0a424feecd193fe..264d5180d3a3c58e64d769f2975e93e72275ad13 100644 (file)
--- a/plat/common/plat_bl_common.c
+++ b/plat/common/plat_bl_common.c
@@ -55,21 +55,6 @@ int plat_try_next_boot_source(void)
        return 0;
 }
 
-#if !ERROR_DEPRECATED
-#pragma weak bl2_early_platform_setup2
-
-/*
- * The following platform API implementation that allow compatibility for
- * the older platform APIs.
- */
-void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
-                       u_register_t arg2, u_register_t arg3)
-{
-       bl2_early_platform_setup((void *)arg1);
-}
-#endif
-
-
 #if TRUSTED_BOARD_BOOT
 /*
  * The following default implementation of the function simply returns the