xtensa: clean up boot-elf/bootstrap.S

[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 718c99dcfe7a9557c2814a1ef499dad2dc737ac8..29c68426ab56a15ad7bfc8f1794692e5b3b3b1f4 100644 (file)
--- a/arch/xtensa/boot/boot-elf/bootstrap.S
+++ b/arch/xtensa/boot/boot-elf/bootstrap.S
@@ -15,10 +15,6 @@
  */
 
 #include <asm/bootparam.h>
-#include <asm/processor.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/cacheasm.h>
 #include <asm/initialize_mmu.h>
 #include <asm/vectors.h>
 #include <linux/linkage.h>
@@ -33,19 +29,18 @@ _ResetVector:
        .begin  no-absolute-literals
        .literal_position
 
-       .align 4
-RomInitAddr:
 #if defined(CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX) && \
        XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
-       .word   CONFIG_KERNEL_LOAD_ADDRESS
+       .literal RomInitAddr, CONFIG_KERNEL_LOAD_ADDRESS
 #else
-       .word   KERNELOFFSET
+       .literal RomInitAddr, KERNELOFFSET
 #endif
-RomBootParam:
 #ifndef CONFIG_PARSE_BOOTPARAM
-       .word   0
+       .literal RomBootParam, 0
 #else
-       .word   _bootparam
+       .literal RomBootParam, _bootparam
+
+       .align 4
 _bootparam:
        .short  BP_TAG_FIRST
        .short  4