projects
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e32051f
)
armv7: fixloop: proper memory checking
author
Minkyu Kang
<mk7.kang@samsung.com>
Tue, 28 Dec 2010 08:46:28 +0000
(17:46 +0900)
committer
Minkyu Kang
<mk7.kang@samsung.com>
Tue, 28 Dec 2010 08:46:28 +0000
(17:46 +0900)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
arch/arm/cpu/armv7/start.S
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv7/start.S
b/arch/arm/cpu/armv7/start.S
index
4eeb12a
..
a052378
100644
(file)
--- a/
arch/arm/cpu/armv7/start.S
+++ b/
arch/arm/cpu/armv7/start.S
@@
-195,8
+195,11
@@
copy_loop:
add r3, r3, r0 /* r3 <- rel dyn end in FLASH */
fixloop:
ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */
- cmp r0, #0
- beq fixskip
+ ldr r7, _TEXT_BASE
+ cmp r0, r7
+ blo fixskip
+ cmp r0, r6
+ bhs fixskip
add r0, r0, r9 /* r0 <- location to fix up in RAM */
ldr r1, [r2, #4]
and r7, r1, #0xff