]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
powerpc: ppc4xx: Call board_init_f_mem() for generic board
authorSimon Glass <sjg@chromium.org>
Sat, 7 Feb 2015 18:51:42 +0000 (11:51 -0700)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 1 Sep 2015 11:50:45 +0000 (13:50 +0200)
Call this function to set up our early memory.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/powerpc/cpu/ppc4xx/start.S

index 09a02d771c2a5d48cfcce822ed11370a43d28430..7a0f0d25d14daf0745d7f978343a540a36a862a1 100644 (file)
@@ -760,6 +760,15 @@ _start:
 #endif
 
        bl      cpu_init_f      /* run low-level CPU init code     (from Flash) */
+#ifdef CONFIG_SYS_GENERIC_BOARD
+       mr      r3, r1
+       bl      board_init_f_mem
+       mr      r1, r3
+       li      r0,0
+       stwu    r0, -4(r1)
+       stwu    r0, -4(r1)
+#endif
+       li      r3, 0
        bl      board_init_f
        /* NOTREACHED - board_init_f() does not return */
 
@@ -1027,7 +1036,14 @@ _start:
        GET_GOT                 /* initialize GOT access                        */
 
        bl      cpu_init_f      /* run low-level CPU init code     (from Flash) */
-
+#ifdef CONFIG_SYS_GENERIC_BOARD
+       mr      r3, r1
+       bl      board_init_f_mem
+       mr      r1, r3
+       stwu    r0, -4(r1)
+       stwu    r0, -4(r1)
+#endif
+       li      r3, 0
        bl      board_init_f    /* run first part of init code (from Flash)     */
        /* NOTREACHED - board_init_f() does not return */