diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-08-28 10:06:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 10:06:00 +0100 |
| commit | 3c065eb1d20c250ee59249d8137c5abd69412eab (patch) | |
| tree | 04cf946f3458447aa20efe0eeb0fcbe2c341e846 | |
| parent | 6d4f6aea2cd96a4a57ffa2d88b9230e2cab88f28 (diff) | |
| parent | bbaa712ee933386f753fb68302e9a2002f4d2d1f (diff) | |
Merge pull request #1531 from MISL-EBU-System-SW/marvell-plat-updates
plat: marvell: bl31: Update the early platform setup API
| -rw-r--r-- | include/plat/marvell/a8k/common/plat_marvell.h | 6 | ||||
| -rw-r--r-- | plat/marvell/common/marvell_bl31_setup.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h index aad5da79..81cbf387 100644 --- a/include/plat/marvell/a8k/common/plat_marvell.h +++ b/include/plat/marvell/a8k/common/plat_marvell.h @@ -67,8 +67,10 @@ uint32_t marvell_get_spsr_for_bl32_entry(void); uint32_t marvell_get_spsr_for_bl33_entry(void); /* BL31 utility functions */ -void marvell_bl31_early_platform_setup(bl31_params_t *from_bl2, - void *plat_params_from_bl2); +void marvell_bl31_early_platform_setup(struct bl31_params *from_bl2, + uintptr_t soc_fw_config, + uintptr_t hw_config, + void *plat_params_from_bl2); void marvell_bl31_platform_setup(void); void marvell_bl31_plat_runtime_setup(void); void marvell_bl31_plat_arch_setup(void); diff --git a/plat/marvell/common/marvell_bl31_setup.c b/plat/marvell/common/marvell_bl31_setup.c index a74816b7..f3818767 100644 --- a/plat/marvell/common/marvell_bl31_setup.c +++ b/plat/marvell/common/marvell_bl31_setup.c @@ -35,7 +35,7 @@ static entry_point_info_t bl32_image_ep_info; static entry_point_info_t bl33_image_ep_info; /* Weak definitions may be overridden in specific ARM standard platform */ -#pragma weak bl31_early_platform_setup +#pragma weak bl31_early_platform_setup2 #pragma weak bl31_platform_setup #pragma weak bl31_plat_arch_setup #pragma weak bl31_plat_get_next_image_ep_info @@ -69,7 +69,9 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) ***************************************************************************** */ void marvell_bl31_early_platform_setup(bl31_params_t *from_bl2, - void *plat_params_from_bl2) + uintptr_t soc_fw_config, + uintptr_t hw_config, + void *plat_params_from_bl2) { /* Initialize the console to provide early debug support */ console_init(PLAT_MARVELL_BOOT_UART_BASE, @@ -130,10 +132,12 @@ void marvell_bl31_early_platform_setup(bl31_params_t *from_bl2, #endif } -void bl31_early_platform_setup(bl31_params_t *from_bl2, - void *plat_params_from_bl2) +void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) + { - marvell_bl31_early_platform_setup(from_bl2, plat_params_from_bl2); + marvell_bl31_early_platform_setup((void *)arg0, arg1, arg2, + (void *)arg3); #ifdef USE_CCI /* |