Commit 0a9024e8 authored by Russell King's avatar Russell King

ARM: Fix nommu booting

Commit bf35706f ("ARM: 8314/1: replace PROCINFO embedded branch with
relative offset") broke booting on nommu platforms as it didn't update
the nommu boot code.  This patch fixes that oversight.

Fixes: bf35706f ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 79403cda
...@@ -80,9 +80,9 @@ ENTRY(stext) ...@@ -80,9 +80,9 @@ ENTRY(stext)
ldr r13, =__mmap_switched @ address to jump to after ldr r13, =__mmap_switched @ address to jump to after
@ initialising sctlr @ initialising sctlr
adr lr, BSYM(1f) @ return (PIC) address adr lr, BSYM(1f) @ return (PIC) address
ARM( add pc, r10, #PROCINFO_INITFUNC ) ldr r12, [r10, #PROCINFO_INITFUNC]
THUMB( add r12, r10, #PROCINFO_INITFUNC ) add r12, r12, r10
THUMB( ret r12 ) ret r12
1: b __after_proc_init 1: b __after_proc_init
ENDPROC(stext) ENDPROC(stext)
...@@ -117,9 +117,9 @@ ENTRY(secondary_startup) ...@@ -117,9 +117,9 @@ ENTRY(secondary_startup)
adr lr, BSYM(__after_proc_init) @ return address adr lr, BSYM(__after_proc_init) @ return address
mov r13, r12 @ __secondary_switched address mov r13, r12 @ __secondary_switched address
ARM( add pc, r10, #PROCINFO_INITFUNC ) ldr r12, [r10, #PROCINFO_INITFUNC]
THUMB( add r12, r10, #PROCINFO_INITFUNC ) add r12, r12, r10
THUMB( ret r12 ) ret r12
ENDPROC(secondary_startup) ENDPROC(secondary_startup)
ENTRY(__secondary_switched) ENTRY(__secondary_switched)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment