summaryrefslogtreecommitdiff
path: root/arch/arm/lib/spl.c
diff options
context:
space:
mode:
authorJeremy Hunt <Jeremy.Hunt@DEShawResearch.com>2016-07-18 12:01:02 -0400
committerTom Rini <trini@konsulko.com>2016-07-22 14:46:23 -0400
commitb8cb51d0de9457c270e63e876712213c5cbbf5dc (patch)
tree7597d669cf606f51ddb4c62a006a54bbfeb81c80 /arch/arm/lib/spl.c
parentc933ed94bc866606f2edae8b4a914880e7e1f501 (diff)
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 <Jeremy.Hunt@DEShawResearch.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/lib/spl.c')
-rw-r--r--arch/arm/lib/spl.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index c1b85340fa..3587ad6812 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -25,22 +25,20 @@ gd_t gdata __attribute__ ((section(".data")));
#endif
/*
- * In the context of SPL, board_init_f must ensure that any clocks/etc for
- * DDR are enabled, ensure that the stack pointer is valid, clear the BSS
- * and call board_init_r. We provide this version by default but mark it
- * as __weak to allow for platforms to do this in their own way if needed.
+ * In the context of SPL, board_init_f() prepares the hardware for execution
+ * from system RAM (DRAM, DDR...). As system RAM may not be available yet,
+ * board_init_f() must use the current GD to store any data which must be
+ * passed on to later stages. These data include the relocation destination,
+ * the future stack, and the future GD location. BSS is cleared after this
+ * function (and therefore must be accessible).
+ *
+ * We provide this version by default but mark it as __weak to allow for
+ * platforms to do this in their own way if needed. Please see the top
+ * level U-Boot README "Board Initialization Flow" section for info on what
+ * to put in this function.
*/
void __weak board_init_f(ulong dummy)
{
- /* Clear the BSS. */
- memset(__bss_start, 0, __bss_end - __bss_start);
-
-#ifndef CONFIG_SPL_DM
- /* TODO: Remove settings of the global data pointer here */
- gd = &gdata;
-#endif
-
- board_init_r(NULL, 0);
}
/*