From: Max Filippov <jcmvbkbc@gmail.com>
Date: Tue, 14 Aug 2018 03:43:10 +0000 (-0700)
Subject: xtensa: clean up boot-elf/bootstrap.S
X-Git-Tag: v4.19-rc1~54^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c692569ce1f8944490869604beb99de10278a12;p=linux.git

xtensa: clean up boot-elf/bootstrap.S

Drop unneeded headers, rewrite literal definitions with .literal.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S
index 718c99dcfe7a..29c68426ab56 100644
--- 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