summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-07 11:51:42 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:31 -0700
commit36ec4c021a56209be87b9fe7c2865fd95a820f63 (patch)
treecd50a410149542afd22b6dc9b0752073ea546f76 /arch/powerpc
parent281aea45f8a237a1072116d4910cd86f4586f24b (diff)
downloadtalos-obmc-uboot-36ec4c021a56209be87b9fe7c2865fd95a820f63.tar.gz
talos-obmc-uboot-36ec4c021a56209be87b9fe7c2865fd95a820f63.zip
powerpc: ppc4xx: Call board_init_f_mem() for generic board
Call this function to set up our early memory. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/ppc4xx/start.S18
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 09a02d771c..7a0f0d25d1 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -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 */
OpenPOWER on IntegriCloud