| Message ID | 1465714475-24111-8-git-send-email-ysato@users.sourceforge.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/12/2016 9:54 AM, Yoshinori Sato wrote: > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> > --- > arch/sh/boot/compressed/head_32.S | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S > index 3e15032..ef70454 100644 > --- a/arch/sh/boot/compressed/head_32.S > +++ b/arch/sh/boot/compressed/head_32.S > @@ -11,10 +11,11 @@ > > .global startup > startup: > + /* Save FDT address */ > + mov r4, r13 > /* Load initial status register */ > mov.l init_sr, r1 > ldc r1, sr > - > /* Move myself to proper location if necessary */ > mova 1f, r0 > mov.l 1f, r2 > @@ -83,7 +84,7 @@ l1: > /* Jump to the start of the decompressed kernel */ > mov.l kernel_start_addr, r0 > jmp @r0 > - nop > + mov r13,r4 Forgot a space after comma? Is it a delay slot BTW (judging by extra indentation)? [...] MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S index 3e15032..ef70454 100644 --- a/arch/sh/boot/compressed/head_32.S +++ b/arch/sh/boot/compressed/head_32.S @@ -11,10 +11,11 @@ .global startup startup: + /* Save FDT address */ + mov r4, r13 /* Load initial status register */ mov.l init_sr, r1 ldc r1, sr - /* Move myself to proper location if necessary */ mova 1f, r0 mov.l 1f, r2 @@ -83,7 +84,7 @@ l1: /* Jump to the start of the decompressed kernel */ mov.l kernel_start_addr, r0 jmp @r0 - nop + mov r13,r4 .align 2 bss_start_addr:
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- arch/sh/boot/compressed/head_32.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)