projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
[oweals/u-boot.git]
/
arch
/
mips
/
cpu
/
mips32
/
start.S
diff --git
a/arch/mips/cpu/mips32/start.S
b/arch/mips/cpu/mips32/start.S
index f5ebe79564cfe863fa404c2792a15a600955e3aa..70ad198cc9d2a54888d447a8641345bc5faa491a 100644
(file)
--- a/
arch/mips/cpu/mips32/start.S
+++ b/
arch/mips/cpu/mips32/start.S
@@
-227,10
+227,10
@@
in_ram:
addi t1, 8
1:
addi t1, 8
1:
- lw t
3, -4(t1) # t3
<-- relocation info
+ lw t
8, -4(t1) # t8
<-- relocation info
-
sub
t3, 3
- bne
z t3, 2f
# skip non R_MIPS_REL32 entries
+
li
t3, 3
+ bne
t8, t3, 2f
# skip non R_MIPS_REL32 entries
nop
lw t3, -8(t1) # t3 <-- location to fix up in FLASH
nop
lw t3, -8(t1) # t3 <-- location to fix up in FLASH