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:
322a25d
)
Revert "armv7: fixloop: proper memory checking"
author
Minkyu Kang
<mk7.kang@samsung.com>
Wed, 5 Jan 2011 05:28:39 +0000
(14:28 +0900)
committer
Minkyu Kang
<mk7.kang@samsung.com>
Wed, 5 Jan 2011 05:28:39 +0000
(14:28 +0900)
This reverts commit
6ae844fca543238a4441f0e7b3a5357ae4048de0
.
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
a052378
..
4eeb12a
100644
(file)
--- a/
arch/arm/cpu/armv7/start.S
+++ b/
arch/arm/cpu/armv7/start.S
@@
-195,11
+195,8
@@
copy_loop:
add r3, r3, r0 /* r3 <- rel dyn end in FLASH */
fixloop:
ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */
- ldr r7, _TEXT_BASE
- cmp r0, r7
- blo fixskip
- cmp r0, r6
- bhs fixskip
+ cmp r0, #0
+ beq fixskip
add r0, r0, r9 /* r0 <- location to fix up in RAM */
ldr r1, [r2, #4]
and r7, r1, #0xff