diff options
| author | Tom Rini <trini@ti.com> | 2014-11-27 10:49:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-27 10:49:38 -0500 |
| commit | 38cd8c4253013ccdd4052ee021f6066fe9a52551 (patch) | |
| tree | e2f66ebbdbb06d5191a191f4962bf71f6cc209a3 /arch/mips/cpu/mips32/start.S | |
| parent | b19157bf3f2345586f2db8a0f8f92cc54f527952 (diff) | |
| parent | 6cec63d59dc102e87077cd1d85f3c1b9cdcad239 (diff) | |
| download | talos-obmc-uboot-38cd8c4253013ccdd4052ee021f6066fe9a52551.tar.gz talos-obmc-uboot-38cd8c4253013ccdd4052ee021f6066fe9a52551.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/cpu/mips32/start.S')
| -rw-r--r-- | arch/mips/cpu/mips32/start.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/cpu/mips32/start.S b/arch/mips/cpu/mips32/start.S index 68e59b596f..384ea26022 100644 --- a/arch/mips/cpu/mips32/start.S +++ b/arch/mips/cpu/mips32/start.S @@ -136,10 +136,11 @@ reset: /* Set up temporary stack */ li sp, CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET + move fp, sp la t9, board_init_f jr t9 - nop + move ra, zero /* * void relocate_code (addr_sp, gd, addr_moni) @@ -155,6 +156,7 @@ reset: .ent relocate_code relocate_code: move sp, a0 # set new stack pointer + move fp, sp move s0, a1 # save gd in s0 move s2, a2 # save destination address in s2 @@ -260,8 +262,9 @@ in_ram: addi t1, 4 move a0, s0 # a0 <-- gd + move a1, s2 la t9, board_init_r jr t9 - move a1, s2 + move ra, zero .end relocate_code |
