From aa91296ac965d8141c248b8c1e92cee7b701fe78 Mon Sep 17 00:00:00 2001 From: Jens Wiklander Date: Tue, 4 Sep 2018 14:07:19 +0200 Subject: [PATCH] plat: qemu: update the early platform setup API Replaces deprecated early platform setup APIs * Replaces bl31_early_platform_setup() with bl31_early_platform_setup2() * Replaces bl2_early_platform_setup() with bl2_early_platform_setup2() Signed-off-by: Jens Wiklander --- plat/qemu/qemu_bl2_setup.c | 7 ++++--- plat/qemu/qemu_bl31_setup.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plat/qemu/qemu_bl2_setup.c b/plat/qemu/qemu_bl2_setup.c index 997c85d7..b9a30d88 100644 --- a/plat/qemu/qemu_bl2_setup.c +++ b/plat/qemu/qemu_bl2_setup.c @@ -117,10 +117,11 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void) } #endif /* !LOAD_IMAGE_V2 */ - - -void bl2_early_platform_setup(meminfo_t *mem_layout) +void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) { + meminfo_t *mem_layout = (void *)arg1; + /* Initialize the console to provide early debug support */ qemu_console_init(); diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/qemu_bl31_setup.c index 416411e7..8b4312cf 100644 --- a/plat/qemu/qemu_bl31_setup.c +++ b/plat/qemu/qemu_bl31_setup.c @@ -36,8 +36,8 @@ static entry_point_info_t bl33_image_ep_info; * tables. BL2 has flushed this information to memory, so we are guaranteed * to pick up good data. ******************************************************************************/ -void bl31_early_platform_setup(void *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) { /* Initialize the console to provide early debug support */ qemu_console_init(); @@ -45,7 +45,7 @@ void bl31_early_platform_setup(void *from_bl2, /* * Check params passed from BL2 */ - bl_params_t *params_from_bl2 = (bl_params_t *)from_bl2; + bl_params_t *params_from_bl2 = (bl_params_t *)arg0; assert(params_from_bl2); assert(params_from_bl2->h.type == PARAM_BL_PARAMS); -- 2.30.2