Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / xtensa / boot / boot-elf / bootstrap.S

diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S
index 1388a49..9341a57 100644 (file)
--- a/arch/xtensa/boot/boot-elf/bootstrap.S
+++ b/arch/xtensa/boot/boot-elf/bootstrap.S
@@ -20,6 +20,7 @@
 #include <asm/page.h>
 #include <asm/cacheasm.h>
 #include <asm/initialize_mmu.h>
+#include <asm/vectors.h>
 #include <linux/linkage.h>
 
        .section        .ResetVector.text, "ax"
@@ -34,12 +35,7 @@ _ResetVector:
 
        .align 4
 RomInitAddr:
-#if defined(CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX) && \
-       XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
-       .word 0x00003000
-#else
-       .word 0xd0003000
-#endif
+       .word   LOAD_MEMORY_ADDRESS
 RomBootParam:
        .word _bootparam
 _bootparam:
@@ -79,6 +75,7 @@ reset:
        movi    a4, 0
        jx      a0
 
+#ifdef CONFIG_MMU
        .align 4
 
        .section        .ResetVector.remapped_text, "x"
@@ -102,3 +99,4 @@ _RemappedSetupMMU:
 #endif
 
        .end    no-absolute-literals
+#endif