From b8cb51d0de9457c270e63e876712213c5cbbf5dc Mon Sep 17 00:00:00 2001 From: Jeremy Hunt Date: Mon, 18 Jul 2016 12:01:02 -0400 Subject: armv8: spl: Call board_init_r from crt0_64 in SPL As part of the startup process for boards using the SPL, the meaning of board_init_f changed such that it should return normally rather than calling board_init_r directly. (see db910353a126d84fe8dff7a694ea792f50fcfb6a ) This was fixed in 32-bit arm, but broke when SPL was added to 64 bit arm. This fixes crt0_64 so that it calls board_init_r during the SPL and removes the direct call from board_init_f from the arm SPL example. Signed-off-by: Jeremy Hunt Acked-by: Simon Glass --- arch/arm/lib/crt0_64.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/lib/crt0_64.S') diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index cad22c7b41..91b19e00da 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -108,6 +108,7 @@ relocation_return: * Set up final (full) environment */ bl c_runtime_cpu_setup /* still call old routine */ +#endif /* !CONFIG_SPL_BUILD */ /* TODO: For SPL, call spl_relocate_stack_gd() to alloc stack relocation */ @@ -130,6 +131,4 @@ clear_loop: /* NOTREACHED - board_init_r() does not return */ -#endif /* !CONFIG_SPL_BUILD */ - ENDPROC(_main) -- cgit