| Message ID | 1368606796-14018-1-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Masahiro, On Wed, 15 May 2013 17:33:16 +0900, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > --- > > Changes for v2: > - Fix one more comment > > Changes for v3: > - Fix the commit log to indicate > * this patch is entirely cosmetic > * which part was changed at a glance > > arch/arm/lib/crt0.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S > index a9657d1..a5bffb8 100644 > --- a/arch/arm/lib/crt0.S > +++ b/arch/arm/lib/crt0.S > @@ -97,13 +97,13 @@ ENTRY(_main) > * 'here' but relocated. > */ > > - ldr sp, [r8, #GD_START_ADDR_SP] /* r8 = gd->start_addr_sp */ > + ldr sp, [r8, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ > bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ > ldr r8, [r8, #GD_BD] /* r8 = gd->bd */ > sub r8, r8, #GD_SIZE /* new GD is below bd */ > > adr lr, here > - ldr r0, [r8, #GD_RELOC_OFF] /* lr = gd->start_addr_sp */ > + ldr r0, [r8, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ > add lr, lr, r0 > ldr r0, [r8, #GD_RELOCADDR] /* r0 = gd->relocaddr */ > b relocate_code Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index a9657d1..a5bffb8 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -97,13 +97,13 @@ ENTRY(_main) * 'here' but relocated. */ - ldr sp, [r8, #GD_START_ADDR_SP] /* r8 = gd->start_addr_sp */ + ldr sp, [r8, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ ldr r8, [r8, #GD_BD] /* r8 = gd->bd */ sub r8, r8, #GD_SIZE /* new GD is below bd */ adr lr, here - ldr r0, [r8, #GD_RELOC_OFF] /* lr = gd->start_addr_sp */ + ldr r0, [r8, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 ldr r0, [r8, #GD_RELOCADDR] /* r0 = gd->relocaddr */ b relocate_code
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> --- Changes for v2: - Fix one more comment Changes for v3: - Fix the commit log to indicate * this patch is entirely cosmetic * which part was changed at a glance arch/arm/lib/crt0.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)