public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2] arm926ejs: Fix two occurrences of illegal syntax assembler instructions
@ 2010-10-21 19:12 Gray Remlin
  2010-10-23 21:24 ` Wolfgang Denk
  2010-10-24 15:18 ` [U-Boot] [PATCH v3] ARM: Use consistent assembler syntax Gray Remlin
  0 siblings, 2 replies; 6+ messages in thread
From: Gray Remlin @ 2010-10-21 19:12 UTC (permalink / raw)
  To: u-boot

Maintain syntax consistency and compatibility with the stock
FEDORA ARM cross-compiler tool chain.

Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
---
Patch V2	fix all occurrences, not just arm926ejs


 arch/arm/cpu/arm1136/start.S   |    4 ++--
 arch/arm/cpu/arm926ejs/start.S |    4 ++--
 arch/arm/cpu/armv7/start.S     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 29ed065..0425b54 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -238,7 +238,7 @@ copy_loop:
        add     r3, r3, r0              /* r3 <- rel dyn end in FLASH */
 fixloop:
        ldr     r0, [r2]        /* r0 <- location to fix up, IN FLASH! */
-       add     r0, r9          /* r0 <- location to fix up in RAM */
+       add     r0, r0, r9      /* r0 <- location to fix up in RAM */
        ldr     r1, [r2, #4]
        and     r8, r1, #0xff
        cmp     r8, #23         /* relative fixup? */
@@ -252,7 +252,7 @@ fixabs:
        mov     r1, r1, LSR #4          /* r1 <- symbol index in .dynsym */
        add     r1, r10, r1             /* r1 <- address of symbol in
table */
        ldr     r1, [r1, #4]            /* r1 <- symbol value */
-       add     r1, r9                  /* r1 <- relocated sym addr */
+       add     r1, r1, r9              /* r1 <- relocated sym addr */
        b       fixnext
 fixrel:
        /* relative fix: increase location by offset */
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index 863de3b..4d55573 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -226,7 +226,7 @@ copy_loop:
        add     r3, r3, r0              /* r3 <- rel dyn end in FLASH */
 fixloop:
        ldr     r0, [r2]        /* r0 <- location to fix up, IN FLASH! */
-       add     r0, r9          /* r0 <- location to fix up in RAM */
+       add     r0, r0, r9      /* r0 <- location to fix up in RAM */
        ldr     r1, [r2, #4]
        and     r8, r1, #0xff
        cmp     r8, #23         /* relative fixup? */
@@ -240,7 +240,7 @@ fixabs:
        mov     r1, r1, LSR #4          /* r1 <- symbol index in .dynsym */
        add     r1, r10, r1             /* r1 <- address of symbol in
table */
        ldr     r1, [r1, #4]            /* r1 <- symbol value */
-       add     r1, r9                  /* r1 <- relocated sym addr */
+       add     r1, r1, r9              /* r1 <- relocated sym addr */
        b       fixnext
 fixrel:
        /* relative fix: increase location by offset */
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 64c86e9..2400580 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -225,7 +225,7 @@ copy_loop:
        add     r3, r3, r0              /* r3 <- rel dyn end in FLASH */
 fixloop:
        ldr     r0, [r2]        /* r0 <- location to fix up, IN FLASH! */
-       add     r0, r9          /* r0 <- location to fix up in RAM */
+       add     r0, r0, r9      /* r0 <- location to fix up in RAM */
        ldr     r1, [r2, #4]
        and     r8, r1, #0xff
        cmp     r8, #23         /* relative fixup? */
@@ -239,7 +239,7 @@ fixabs:
        mov     r1, r1, LSR #4          /* r1 <- symbol index in .dynsym */
        add     r1, r10, r1             /* r1 <- address of symbol in
table */
        ldr     r1, [r1, #4]            /* r1 <- symbol value */
-       add     r1, r9                  /* r1 <- relocated sym addr */
+       add     r1, r1, r9              /* r1 <- relocated sym addr */
        b       fixnext
 fixrel:
        /* relative fix: increase location by offset */
--

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-11-28 23:08 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-21 19:12 [U-Boot] [PATCH v2] arm926ejs: Fix two occurrences of illegal syntax assembler instructions Gray Remlin
2010-10-23 21:24 ` Wolfgang Denk
2010-10-24 15:18 ` [U-Boot] [PATCH v3] ARM: Use consistent assembler syntax Gray Remlin
2010-10-25  6:13   ` Heiko Schocher
2010-10-26 18:53   ` Wolfgang Denk
2010-11-28 23:08   ` [U-Boot] [PATCH v4] " Gray Remlin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox