diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-06-13 12:59:30 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-24 09:51:06 -0400 |
| commit | ba9cf07122ce7ab3a10ab2873deb890bf2c72bd9 (patch) | |
| tree | f1fb4859c4f2ff3f0045c7c80f47678d755d31d1 /arch | |
| parent | 9a28e0d177d7714baccf282071d99f70e087a4e4 (diff) | |
| download | talos-obmc-uboot-ba9cf07122ce7ab3a10ab2873deb890bf2c72bd9.tar.gz talos-obmc-uboot-ba9cf07122ce7ab3a10ab2873deb890bf2c72bd9.zip | |
MIPS: xburst/start.S: save relocation offset in s1 register
Synchronize the code with mips{32,64}/start.S, in order to
allow further unifications.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/cpu/xburst/start.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/cpu/xburst/start.S b/arch/mips/cpu/xburst/start.S index 052e25ebad..2dfd27e90f 100644 --- a/arch/mips/cpu/xburst/start.S +++ b/arch/mips/cpu/xburst/start.S @@ -50,13 +50,13 @@ relocate_code: move s2, a2 # save destination address in s2 li t0, CONFIG_SYS_MONITOR_BASE - sub t6, s2, t0 # t6 <-- relocation offset + sub s1, s2, t0 # s1 <-- relocation offset la t3, in_ram lw t2, -12(t3) # t2 <-- __image_copy_end move t1, a2 - add gp, t6 # adjust gp + add gp, s1 # adjust gp /* * t0 = source address @@ -117,13 +117,13 @@ in_ram: */ lw t3, -4(t0) # t3 <-- num_got_entries lw t4, -8(t0) # t4 <-- _GLOBAL_OFFSET_TABLE_ - add t4, t6 # t4 now holds relocated _G_O_T_ + add t4, s1 # t4 now holds relocated _G_O_T_ addi t4, t4, 8 # skipping first two entries li t2, 2 1: lw t1, 0(t4) beqz t1, 2f - add t1, t6 + add t1, s1 sw t1, 0(t4) 2: addi t2, 1 @@ -147,9 +147,9 @@ in_ram: lw t3, -8(t1) # t3 <-- location to fix up in FLASH lw t4, 0(t3) # t4 <-- original pointer - add t4, t6 # t4 <-- adjusted pointer + add t4, s1 # t4 <-- adjusted pointer - add t3, t6 # t3 <-- location to fix up in RAM + add t3, s1 # t3 <-- location to fix up in RAM sw t4, 0(t3) 2: |
