2 files changed, 5 insertions, 3 deletions

diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 600781edc8a3..cdac5584ec0c 100644
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -141,9 +141,6 @@
         jx      a4
 
 1:
-        movi    a2, VECBASE_RESET_VADDR
-        wsr     a2, vecbase
-
         /* Step 5: remove temporary mapping. */
         idtlb   a7
         iitlb   a7
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index aeeb3cc8a410..15a461e2a0ed 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -112,6 +112,11 @@ ENTRY(_startup)
 
         movi    a0, 0
 
+#if XCHAL_HAVE_VECBASE
+        movi    a2, VECBASE_RESET_VADDR
+        wsr     a2, vecbase
+#endif
+
         /* Clear debugging registers. */
 
 #if XCHAL_HAVE_DEBUG