arm: fixloop(): do not use r8 for relocation

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / start.S

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index fe982352f51e4b2f25ffc1c389c76d7e1a836bfb..02fdfc7976f3be3041bcd1b3b692a51880211bd5 100644 (file)
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -166,14 +166,14 @@ stack_setup:
        mov     sp, r4
 
        adr     r0, _start
-       ldr     r2, _TEXT_BASE
-       ldr     r3, _bss_start_ofs
-       add     r2, r0, r3              /* r2 <- source end address         */
-       mov     r1, r6                  /* r1 <- scratch for copy_loop */
        cmp     r0, r6
 #ifndef CONFIG_PRELOADER
        beq     jump_2_ram
 #endif
+       mov     r1, r6                  /* r1 <- scratch for copy_loop */
+       ldr     r2, _TEXT_BASE
+       ldr     r3, _bss_start_ofs
+       add     r2, r0, r3              /* r2 <- source end address         */
 
 copy_loop:
        ldmia   r0!, {r9-r10}           /* copy from source address [r0]    */
@@ -197,10 +197,10 @@ fixloop:
        ldr     r0, [r2]                /* r0 <- location to fix up, IN FLASH! */
        add     r0, 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