aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorAndreas Bie├čmann <andreas.devel@googlemail.com>2010-12-01 00:58:35 +0100
committerWolfgang Denk <wd@denx.de>2010-12-09 11:01:15 +0100
commit1f52d89f2b4b5ca8dde7aa1be02bb1c658e0aa13 (patch)
treeab6baf9b1912ae1f9702529bce1d213be74ed860 /arch/arm/cpu/pxa
parenta1a47d3c57e3bc3c49bc1eca94c00eba4880d2c3 (diff)
downloadu-boot-linaro-stable-1f52d89f2b4b5ca8dde7aa1be02bb1c658e0aa13.tar.gz
arm: fixloop(): do not use r8 for relocation
r8 is used for global_data and should therefore be left alone! For C code the compiler flag --fixed-r8 does the job, but in assembler we need to be aware of that fact. Signed-off-by: Andreas Bie▀mann <andreas.devel@googlemail.com>
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/start.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 53391ec30..0580adce1 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -275,10 +275,10 @@ fixloop:
ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */
add r0, r9 /* r0 <- location to fix up in RAM */
ldr r1, [r2, #4]
- and r8, r1, #0xff
- cmp r8, #23 /* relative fixup? */
+ and r7, r1, #0xff
+ cmp r7, #23 /* relative fixup? */
beq fixrel
- cmp r8, #2 /* absolute fixup? */
+ cmp r7, #2 /* absolute fixup? */
beq fixabs
/* ignore unknown type of fixup */
b fixnext