|
@@ -118,12 +118,16 @@ ENDPROC(cpu_resume_after_mmu)
|
|
|
|
|
|
.text
|
|
|
.align
|
|
|
+
|
|
|
+#ifdef CONFIG_MMU
|
|
|
.arm
|
|
|
ENTRY(cpu_resume_arm)
|
|
|
THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM.
|
|
|
THUMB( bx r9 ) @ If this is a Thumb-2 kernel,
|
|
|
THUMB( .thumb ) @ switch to Thumb now.
|
|
|
THUMB(1: )
|
|
|
+#endif
|
|
|
+
|
|
|
ENTRY(cpu_resume)
|
|
|
ARM_BE8(setend be) @ ensure we are in BE mode
|
|
|
#ifdef CONFIG_ARM_VIRT_EXT
|
|
@@ -155,7 +159,10 @@ THUMB( ldmia r0!, {r1, r2, r3} )
|
|
|
THUMB( mov sp, r2 )
|
|
|
THUMB( bx r3 )
|
|
|
ENDPROC(cpu_resume)
|
|
|
+
|
|
|
+#ifdef CONFIG_MMU
|
|
|
ENDPROC(cpu_resume_arm)
|
|
|
+#endif
|
|
|
|
|
|
.align 2
|
|
|
_sleep_save_sp:
|