ARM: use the same branch insn on all architectures

For the "fixloop" implementation in start.S a number of different
instructions was used.  Unify code so all architectures use "blo"
here because it is more robust in case of incorrect alignments.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert ARIBAUD <albert.aribaud@free.fr>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index e3e646ca6110939ec3ab7c1725ed0b6c322f343a..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 */
 

diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 06aa3a25d41d1252f28f7347b39745cc197e0f3b..41c1519efef6237c028cf636f46fe6ef78c64872 100644 (file)
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -222,7 +222,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index 84f754677f69ec4f66c59f83492838c9fd201ecd..f0274b1f82aeaba5cc359210b7b3d3a5b4ff60ca 100644 (file)
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -268,7 +268,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S
index f45ad891bc2fed628bf77402e7c58e7eeb9ddfb4..2ad2df847ee8535ef0ad210427a88051f29e35e6 100644 (file)
--- a/arch/arm/cpu/arm925t/start.S
+++ b/arch/arm/cpu/arm925t/start.S
@@ -259,7 +259,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S
index 25b573bcdf448ee1d4c0366b2dc9d293c3ef2d04..22af2fae95f1b70e2924f44813e64a2168d8775a 100644 (file)
--- a/arch/arm/cpu/arm946es/start.S
+++ b/arch/arm/cpu/arm946es/start.S
@@ -228,7 +228,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index 3e9d5e8c93d46c274fddf9eff93f7febc6bef55f..a420f44ff5ff48c749af36a35a18705c1cfb9cf2 100644 (file)
--- a/arch/arm/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
@@ -226,7 +226,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S
index 2931ccd61671387f3e107b2789c69eb5c9a06678..a2560d4c2ad3fcfcbf64487573fb11adab87919d 100644 (file)
--- a/arch/arm/cpu/ixp/start.S
+++ b/arch/arm/cpu/ixp/start.S
@@ -352,7 +352,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S
index 703baf89a203a2462e273cd927fa0205b2e76a61..239ad47a4f1bea0175c59a9197c1e4eca7dcc5af 100644 (file)
--- a/arch/arm/cpu/lh7a40x/start.S
+++ b/arch/arm/cpu/lh7a40x/start.S
@@ -239,7 +239,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 

diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S
index 77f3735e54e20f79019d8755bf462dca00c38b64..c58da98798875ef1c8ceef0e38afd38607f63354 100644 (file)
--- a/arch/arm/cpu/s3c44b0/start.S
+++ b/arch/arm/cpu/s3c44b0/start.S
@@ -211,7 +211,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 /*
        now copy to sram the interrupt vector

diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S
index 5635e0a30f53eea31999906731e40e77a99125f7..e6afe0f86fb5bcd6f7af32b23f043745f1baa2a9 100644 (file)
--- a/arch/arm/cpu/sa1100/start.S
+++ b/arch/arm/cpu/sa1100/start.S
@@ -215,7 +215,7 @@ fixloop:
        str     r4, [r2]
        add     r2, r2, #4
        cmp     r2, r3
-       bne     fixloop
+       blo     fixloop
 #endif
 #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */