From: Philipp Tomsich Date: Wed, 1 Mar 2017 20:04:15 +0000 (+0100) Subject: armv8: spl: Call spl_relocate_stack_gd for ARMv8 X-Git-Tag: v2017.03~21 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7a70c9985ccf2e7e0016b32c367a922e01b6c1fb;p=oweals%2Fu-boot.git armv8: spl: Call spl_relocate_stack_gd for ARMv8 As part of the startup process for boards using the SPL, we need to call spl_relocate_stack_gd. This is needed to set up malloc with its DRAM buffer. Signed-off-by: Philipp Tomsich Reviewed-by: Andre Przywara Reviewed-by: Simon Glass --- diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 19c6a985cd..57e728f9f2 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -109,8 +109,18 @@ relocation_return: */ 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 */ +#if defined(CONFIG_SPL_BUILD) + bl spl_relocate_stack_gd /* may return NULL */ + /* + * Perform 'sp = (x0 != NULL) ? x0 : sp' while working + * around the constraint that conditional moves can not + * have 'sp' as an operand + */ + mov x1, sp + cmp x0, #0 + csel x0, x0, x1, ne + mov sp, x0 +#endif /* * Clear BSS section