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>
This commit is contained in:
Antonio Nino Diaz 2018-09-24 17:24:41 +01:00
parent f9ed3cb624
commit 34244d946d
5 changed files with 0 additions and 44 deletions

View file

@ -10,10 +10,6 @@
/******************************************************************************* /*******************************************************************************
* Mandatory SP_MIN functions * 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, void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3); u_register_t arg2, u_register_t arg3);
void sp_min_platform_setup(void); void sp_min_platform_setup(void);

View file

@ -168,9 +168,6 @@ int bl1_plat_handle_post_image_load(unsigned int image_id);
* Mandatory BL2 functions * Mandatory BL2 functions
******************************************************************************/ ******************************************************************************/
void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3); 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_plat_arch_setup(void);
void bl2_platform_setup(void); void bl2_platform_setup(void);
struct meminfo *bl2_plat_sec_mem_layout(void); struct meminfo *bl2_plat_sec_mem_layout(void);
@ -222,10 +219,6 @@ int bl2u_plat_handle_scp_bl2u(void);
/******************************************************************************* /*******************************************************************************
* Mandatory BL31 functions * 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, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3); u_register_t arg2, u_register_t arg3);
void bl31_plat_arch_setup(void); void bl31_plat_arch_setup(void);

View file

@ -23,14 +23,3 @@ void sp_min_plat_runtime_setup(void)
*/ */
console_uninit(); 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

View file

@ -21,7 +21,6 @@
#pragma weak bl31_plat_runtime_setup #pragma weak bl31_plat_runtime_setup
#if !ERROR_DEPRECATED #if !ERROR_DEPRECATED
#pragma weak plat_get_syscnt_freq2 #pragma weak plat_get_syscnt_freq2
#pragma weak bl31_early_platform_setup2
#endif /* ERROR_DEPRECATED */ #endif /* ERROR_DEPRECATED */
#if SDEI_SUPPORT #if SDEI_SUPPORT
@ -69,12 +68,6 @@ unsigned int plat_get_syscnt_freq2(void)
return (unsigned int)freq; 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 */ #endif /* ERROR_DEPRECATED */
#if SDEI_SUPPORT #if SDEI_SUPPORT

View file

@ -55,21 +55,6 @@ int plat_try_next_boot_source(void)
return 0; 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 #if TRUSTED_BOARD_BOOT
/* /*
* The following default implementation of the function simply returns the * The following default implementation of the function simply returns the