From ce1f43ac349dd6ba8ecbb3f9fc5bae0a8d1868d0 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Mon, 24 Sep 2018 17:16:30 +0100 Subject: [PATCH] synquacer: Migrate to new interfaces - Remove references to removed build options. - Update Makefile paths. - Migrate to bl31_early_platform_setup2(). Change-Id: I51cbf09a0297ac1ee645a959063238c9d556d8e1 Tested-by: Sumit Garg Signed-off-by: Antonio Nino Diaz --- plat/socionext/synquacer/platform.mk | 3 +-- plat/socionext/synquacer/sq_bl31_setup.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plat/socionext/synquacer/platform.mk b/plat/socionext/synquacer/platform.mk index 96427a161..1bee20abb 100644 --- a/plat/socionext/synquacer/platform.mk +++ b/plat/socionext/synquacer/platform.mk @@ -5,7 +5,6 @@ # override RESET_TO_BL31 := 1 -override ENABLE_PLAT_COMPAT := 0 override MULTI_CONSOLE_API := 1 override PROGRAMMABLE_RESET_ADDRESS := 1 override USE_COHERENT_MEM := 1 @@ -28,7 +27,7 @@ PLAT_INCLUDES := -I$(PLAT_PATH)/include \ -I$(PLAT_PATH)/drivers/mhu PLAT_BL_COMMON_SOURCES += $(PLAT_PATH)/sq_helpers.S \ - drivers/arm/pl011/pl011_console.S \ + drivers/arm/pl011/aarch64/pl011_console.S \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ ${XLAT_TABLES_LIB_SRCS} diff --git a/plat/socionext/synquacer/sq_bl31_setup.c b/plat/socionext/synquacer/sq_bl31_setup.c index 26b8ff1bb..07c1f8997 100644 --- a/plat/socionext/synquacer/sq_bl31_setup.c +++ b/plat/socionext/synquacer/sq_bl31_setup.c @@ -55,8 +55,8 @@ uint32_t sq_get_spsr_for_bl33_entry(void) return spsr; } -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) { /* Initialize the console to provide early debug support */ (void)console_pl011_register(PLAT_SQ_BOOT_UART_BASE, @@ -67,8 +67,8 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, CONSOLE_FLAG_RUNTIME); /* There are no parameters from BL2 if BL31 is a reset vector */ - assert(from_bl2 == NULL); - assert(plat_params_from_bl2 == NULL); + assert(arg0 == 0U); + assert(arg1 == 0U); /* Initialize power controller before setting up topology */ plat_sq_pwrc_setup();