* [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
* [U-Boot] [PATCH v2] arm926ejs: Fix two occurrences of illegal syntax assembler instructions
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
1 sibling, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2010-10-23 21:24 UTC (permalink / raw)
To: u-boot
Dear Gray Remlin,
In message <4CC09099.70106@rocketmail.com> you wrote:
> 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(-)
Do you agree to change the subject into someting like "ARM: use
consistent assembler syntax" or so? First, the "arm926ejs" part is
not correct any more, and second, the "illegal" is debatable.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Build a system that even a fool can use and only a fool will want to
use it.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v3] ARM: Use consistent assembler syntax
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 ` Gray Remlin
2010-10-25 6:13 ` Heiko Schocher
` (2 more replies)
1 sibling, 3 replies; 6+ messages in thread
From: Gray Remlin @ 2010-10-24 15:18 UTC (permalink / raw)
To: u-boot
Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
---
Patch V3 Subject line correction change to patch v2 from
"arm926ejs: Fix two occurrences of illegal syntax assembler instructions"
originally used in patch v1, as it now impacts more than one CPU type.
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
* [U-Boot] [PATCH v3] ARM: Use consistent assembler syntax
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
2 siblings, 0 replies; 6+ messages in thread
From: Heiko Schocher @ 2010-10-25 6:13 UTC (permalink / raw)
To: u-boot
Hello Gray,
Gray Remlin wrote:
> Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
> ---
> Patch V3 Subject line correction change to patch v2 from
> "arm926ejs: Fix two occurrences of illegal syntax assembler instructions"
> originally used in patch v1, as it now impacts more than one CPU type.
Tested on the beagle board
Acked-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v3] ARM: Use consistent assembler syntax
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
2 siblings, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2010-10-26 18:53 UTC (permalink / raw)
To: u-boot
Dear Gray Remlin,
In message <4CC44E47.2050107@rocketmail.com> you wrote:
>
> Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
> ---
> Patch V3 Subject line correction change to patch v2 from
> "arm926ejs: Fix two occurrences of illegal syntax assembler instructions"
> originally used in patch v1, as it now impacts more than one CPU type.
>
>
> 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 */
Your patch is line wrapped and white space corrupted. I applied it
manually, but please fix your mailer, or, even better, use "git
send-email" to submit patches.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Peace was the way.
-- Kirk, "The City on the Edge of Forever", stardate unknown
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v4] ARM: Use consistent assembler syntax
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 ` Gray Remlin
2 siblings, 0 replies; 6+ messages in thread
From: Gray Remlin @ 2010-11-28 23:08 UTC (permalink / raw)
To: u-boot
Signed-off-by: Gray Remlin <gryrmln@gmail.com>
---
v4 Rebase against v2010.12-rc2
v3 Subject line correction change to patch v2
v2 Fix all occurrences, not just those under arm926ejs
v1 Fix syntax of two assembler instructions preventing assembly
arch/arm/cpu/arm1136/start.S | 2 +-
arch/arm/cpu/arm926ejs/start.S | 2 +-
arch/arm/cpu/armv7/start.S | 2 +-
arch/arm/cpu/pxa/start.S | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index eec8bee..f6e3bd3 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -233,7 +233,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 6dcc9b4..b27ac47 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -238,7 +238,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 2dfdafe..02fa53c 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -208,7 +208,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/pxa/start.S b/arch/arm/cpu/pxa/start.S
index ae358a5..4310a3f 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -272,7 +272,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? */
@@ -286,7 +286,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 */
--
1.7.2.3
^ 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.