summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-05-10 09:43:21 -0500
committerJon Loeliger <jdl@freescale.com>2006-05-10 09:43:21 -0500
commit846c2d4a0e076083412604ce6f4145ec49ddb99f (patch)
tree8a7d735a99c653607437e58a1012d9ce5fb6d4df /cpu
parenta67255363ae4c8a7c67a83e05de335cdb54b2045 (diff)
parent6cfea33477b04b63ed47386ed1629529484c33ba (diff)
downloadu-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.zip
u-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.tar.gz
u-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.tar.bz2
Merge branch 'mpc86xx'
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc86xx/start.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S
index 0a447a7..b963631 100644
--- a/cpu/mpc86xx/start.S
+++ b/cpu/mpc86xx/start.S
@@ -955,8 +955,9 @@ in_ram:
cmplw 0, r3, r4
bne 5b
6:
- mr r3, r10 /* Destination Address */
- bl after_reloc
+ mr r3, r9 /* Init Date pointer */
+ mr r4, r10 /* Destination Address */
+ bl board_init_r
/* not reached - end relocate_code */
/*-----------------------------------------------------------------------*/