public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Gray Remlin <g_remlin@rocketmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] mainline arm926ejs: Fix two occurrences of illegal syntax assembler instructions
Date: Thu, 21 Oct 2010 17:32:26 +0100	[thread overview]
Message-ID: <4CC06B1A.2070401@rocketmail.com> (raw)

HEAD is at commit c62491d2602b353a815a909e27eec0df9f2c06a2
Untested due to link error bug

Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
---
 arch/arm/cpu/arm926ejs/start.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 */
--

             reply	other threads:[~2010-10-21 16:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-21 16:32 Gray Remlin [this message]
2010-10-21 18:06 ` [U-Boot] [PATCH] mainline arm926ejs: Fix two occurrences of illegal syntax assembler instructions Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CC06B1A.2070401@rocketmail.com \
    --to=g_remlin@rocketmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox