On 22 February 2017 at 11:01, Philipp Tomsich <philipp.toms...@theobroma-systems.com> wrote: > 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 <philipp.toms...@theobroma-systems.com> > Reviewed-by: Andre Przywara <andre.przyw...@arm.com> > Reviewed-by: Simon Glass <s...@chromium.org> > --- > arch/arm/lib/crt0_64.S | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S > index 19c6a98..a7cead5 100644 > --- a/arch/arm/lib/crt0_64.S > +++ b/arch/arm/lib/crt0_64.S > @@ -109,8 +109,17 @@ 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 > + */
nit: Comment style again > + mov x1, sp > + cmp x0, #0 > + csel x0, x0, x1, ne > + mov sp, x0 > +#endif > > /* > * Clear BSS section > -- > 1.9.1 > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
