Commit ce1f43ac authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

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: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent de5457e3
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
# #
override RESET_TO_BL31 := 1 override RESET_TO_BL31 := 1
override ENABLE_PLAT_COMPAT := 0
override MULTI_CONSOLE_API := 1 override MULTI_CONSOLE_API := 1
override PROGRAMMABLE_RESET_ADDRESS := 1 override PROGRAMMABLE_RESET_ADDRESS := 1
override USE_COHERENT_MEM := 1 override USE_COHERENT_MEM := 1
...@@ -28,7 +27,7 @@ PLAT_INCLUDES := -I$(PLAT_PATH)/include \ ...@@ -28,7 +27,7 @@ PLAT_INCLUDES := -I$(PLAT_PATH)/include \
-I$(PLAT_PATH)/drivers/mhu -I$(PLAT_PATH)/drivers/mhu
PLAT_BL_COMMON_SOURCES += $(PLAT_PATH)/sq_helpers.S \ 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/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
${XLAT_TABLES_LIB_SRCS} ${XLAT_TABLES_LIB_SRCS}
......
...@@ -55,8 +55,8 @@ uint32_t sq_get_spsr_for_bl33_entry(void) ...@@ -55,8 +55,8 @@ uint32_t sq_get_spsr_for_bl33_entry(void)
return spsr; return spsr;
} }
void bl31_early_platform_setup(bl31_params_t *from_bl2, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
void *plat_params_from_bl2) u_register_t arg2, u_register_t arg3)
{ {
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
(void)console_pl011_register(PLAT_SQ_BOOT_UART_BASE, (void)console_pl011_register(PLAT_SQ_BOOT_UART_BASE,
...@@ -67,8 +67,8 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, ...@@ -67,8 +67,8 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
CONSOLE_FLAG_RUNTIME); CONSOLE_FLAG_RUNTIME);
/* There are no parameters from BL2 if BL31 is a reset vector */ /* There are no parameters from BL2 if BL31 is a reset vector */
assert(from_bl2 == NULL); assert(arg0 == 0U);
assert(plat_params_from_bl2 == NULL); assert(arg1 == 0U);
/* Initialize power controller before setting up topology */ /* Initialize power controller before setting up topology */
plat_sq_pwrc_setup(); plat_sq_pwrc_setup();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment