1 files changed, 10 insertions, 3 deletions

diff --git a/firmware/target/arm/imx233/crt0.S b/firmware/target/arm/imx233/crt0.S
index a0f9ec270b..ab0250f6b6 100644
--- a/firmware/target/arm/imx233/crt0.S
+++ b/firmware/target/arm/imx233/crt0.S
@@ -33,6 +33,9 @@
     ldr     pc, =irq_handler
     ldr     pc, =fiq_handler
 
+/* When starting, we are running at 0x40000000 but the code
+ * assumes DRAM is somewhere else (for caching) so we first need to
+ * setup the MMU and then jump to the right location */
 .text
 .global start
 start:
@@ -46,6 +49,13 @@ start:
     bic     r0, r1
     mcr     p15, 0, r0, c1, c0, 0
 
+    /* Enable MMU */
+    bl      memory_init
+
+    /* Jump to real location */
+    ldr     pc, =remap
+remap:
+
     /* Zero out IBSS */
     ldr     r2, =_iedata
     ldr     r3, =_iend
@@ -114,9 +124,6 @@ start:
     msr     cpsr_c, #0xdb
     ldr     sp, =irq_stack
 
-    /* Enable MMU */
-    bl      memory_init
-
     /* Switch back to supervisor mode */
     msr     cpsr_c, #0xd3