xtensa: cleanup MMU setup and kernel layout macros

[sfrench/cifs-2.6.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 e6bf313613cf6ddcfa5682b9b8665433969460d9..b6aa85328ac0ccc05936bcf9b477499e7bbbbfe7 100644 (file)
--- a/arch/xtensa/boot/boot-elf/bootstrap.S
+++ b/arch/xtensa/boot/boot-elf/bootstrap.S
@@ -35,7 +35,12 @@ _ResetVector:
 
        .align 4
 RomInitAddr:
-       .word   LOAD_MEMORY_ADDRESS
+#if defined(CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX) && \
+       XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
+       .word   CONFIG_KERNEL_LOAD_ADDRESS
+#else
+       .word   KERNELOFFSET
+#endif
 RomBootParam:
        .word _bootparam
 _bootparam: