Merge branch 'master' of git://git.denx.de/u-boot-sparc

[u-boot] / arch / arm / cpu / arm1136 / start.S

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 07d0c859cb839a975ab44429f20ee706532c3ee5..d70ca1d515db9816c3770a49bc302685ab4b5612 100644 (file)
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -263,7 +263,7 @@ fixnext:
        str     r1, [r0]
        add     r2, r2, #8              /* each rel.dyn entry is 8 bytes */
        cmp     r2, r3
-       ble     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
@@ -297,8 +297,10 @@ _nand_boot_ofs
 jump_2_ram:
        ldr     r0, _board_init_r_ofs
        adr     r1, _start
-       add     r0, r0, r1
-       add     lr, r0, r9
+       add     lr, r0, r1
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+       add     lr, lr, r9
+#endif
        /* setup parameters for board_init_r */
        mov     r0, r5          /* gd_t */
        mov     r1, r7          /* dest_addr */