summaryrefslogtreecommitdiffstats
path: root/arch/m68k/cpu/mcf5227x
diff options
context:
space:
mode:
authorangelo@sysam.it <angelo@sysam.it>2016-04-27 21:50:44 +0200
committerSimon Glass <sjg@chromium.org>2016-05-17 09:54:43 -0600
commit5044c9cc6c4dffb2959769a785663f46cb418461 (patch)
tree3ca99b08de48e0ceff100d5d84bb183a44243a80 /arch/m68k/cpu/mcf5227x
parent037734393ef6181e87d85be15468af4baee70b42 (diff)
downloadtalos-obmc-uboot-5044c9cc6c4dffb2959769a785663f46cb418461.tar.gz
talos-obmc-uboot-5044c9cc6c4dffb2959769a785663f46cb418461.zip
m68k: add malloc memory for early malloc
To use serial uclass and DM, CONFIG_SYS_MALLOC_F must be used. So CONFIG_SYS_GENERIC_GLOBAL_DATA has been undefined and call to board_init_f_mem() is added for all cpu's. Signed-off-by: Angelo Dureghello <angelo@sysam.it> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k/cpu/mcf5227x')
-rw-r--r--arch/m68k/cpu/mcf5227x/start.S25
1 files changed, 20 insertions, 5 deletions
diff --git a/arch/m68k/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S
index 23024f94c8..13c036f746 100644
--- a/arch/m68k/cpu/mcf5227x/start.S
+++ b/arch/m68k/cpu/mcf5227x/start.S
@@ -372,14 +372,29 @@ _start:
move.l %d0, (%a1)
move.l %d0, (%a2)
- /* set stackpointer to end of internal ram to get some stackspace for
- the first c-code */
- move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
- clr.l %sp@-
+ /* put relocation table address to a5 */
+ move.l #__got_start, %a5
+
+ /* setup stack initially on top of internal static ram */
+ move.l #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+ /*
+ * if configured, malloc_f arena will be reserved first,
+ * then (and always) gd struct space will be reserved
+ */
+ move.l %sp, -(%sp)
+ bsr board_init_f_alloc_reserve
+
+ /* update stack and frame-pointers */
+ move.l %d0, %sp
+ move.l %sp, %fp
- move.l #__got_start, %a5 /* put relocation table address to a5 */
+ /* initialize reserved area */
+ move.l %d0, -(%sp)
+ bsr board_init_f_init_reserve
bsr cpu_init_f /* run low-level CPU init code (from flash) */
+ clr.l %sp@-
bsr board_init_f /* run low-level board init code (from flash) */
/* board_init_f() does not return */
OpenPOWER on IntegriCloud