diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-03-03 00:25:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 00:25:19 +0000 |
| commit | 06e3a5e118eebf7575b1ae16edfeca781a4415d5 (patch) | |
| tree | 521fcfcebc2e764f51109cb8aedef4519351ef3c /plat/arm | |
| parent | c208d8128ae28909497dd37fd97d41dcce58c726 (diff) | |
| parent | 0ed8c00174f8c2bd7917fafa5c72a038f944b07b (diff) | |
Merge pull request #1297 from soby-mathew/sm/fix_aarch32_plat_cmn
Remove sp_min functions from plat_common.c
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c | 2 | ||||
| -rw-r--r-- | plat/arm/common/sp_min/arm_sp_min_setup.c | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c index 6cced4dd..7c89c27e 100644 --- a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c +++ b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c @@ -7,7 +7,7 @@ #include <plat_arm.h> #include "../fvp_private.h" -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, +void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) { arm_sp_min_early_platform_setup((void *)arg0, arg1, arg2, (void *)arg3); diff --git a/plat/arm/common/sp_min/arm_sp_min_setup.c b/plat/arm/common/sp_min/arm_sp_min_setup.c index 1776d46a..7b5477ec 100644 --- a/plat/arm/common/sp_min/arm_sp_min_setup.c +++ b/plat/arm/common/sp_min/arm_sp_min_setup.c @@ -18,9 +18,9 @@ static entry_point_info_t bl33_image_ep_info; /* Weak definitions may be overridden in specific ARM standard platform */ -#pragma weak sp_min_early_platform_setup2 #pragma weak sp_min_platform_setup #pragma weak sp_min_plat_arch_setup +#pragma weak plat_arm_sp_min_early_platform_setup /******************************************************************************* @@ -46,7 +46,7 @@ entry_point_info_t *sp_min_plat_get_bl33_ep_info(void) } /******************************************************************************* - * Perform early platform setup. + * Utility function to perform early platform setup. ******************************************************************************/ void arm_sp_min_early_platform_setup(void *from_bl2, uintptr_t tos_fw_config, uintptr_t hw_config, void *plat_params_from_bl2) @@ -105,7 +105,10 @@ void arm_sp_min_early_platform_setup(void *from_bl2, uintptr_t tos_fw_config, } -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, +/******************************************************************************* + * Default implementation for sp_min_platform_setup2() for ARM platforms + ******************************************************************************/ +void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) { arm_sp_min_early_platform_setup((void *)arg0, arg1, arg2, (void *)arg3); @@ -127,6 +130,12 @@ void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, plat_arm_interconnect_enter_coherency(); } +void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) +{ + plat_arm_sp_min_early_platform_setup(arg0, arg1, arg2, arg3); +} + /******************************************************************************* * Perform any SP_MIN platform runtime setup prior to SP_MIN exit. * Common to ARM standard platforms. |