1 files changed, 1 insertions, 4 deletions

diff --git a/utils/hwstub/stub/stmp/crt0.S b/utils/hwstub/stub/stmp/crt0.S
index 8b2197823e..f4a0c28360 100644
--- a/utils/hwstub/stub/stmp/crt0.S
+++ b/utils/hwstub/stub/stmp/crt0.S
@@ -5,15 +5,12 @@
 start:
     sub     r7, pc, #8 /* Copy running address */
     msr     cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ/FIQ */
-#ifdef CONFIG_STMP
     /* Disable MMU, disable caching and buffering;
      * use low exception range address */
     mrc     p15, 0, r0, c1, c0, 0
     ldr     r1, =0x3005
     bic     r0, r1
     mcr     p15, 0, r0, c1, c0, 0
-#endif
-    ldr     sp, =oc_stackend
     /* Relocate to right address */
     mov    r2, r7
     ldr    r3, =_copystart
@@ -23,7 +20,6 @@ start:
     ldrhi   r5, [r2], #4
     strhi   r5, [r3], #4
     bhi     1b
-
     mov     r2, #0
     mcr     p15, 0, r2, c7, c5, 0   @ Invalidate ICache
     /* Jump to real location */
@@ -38,4 +34,5 @@ remap:
     strhi   r4, [r2], #4
     bhi     1b
     /* jump to C code */
+    ldr     sp, =oc_stackend
     b       main