diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2018-08-14 05:43:10 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2018-08-20 21:28:06 +0200 |
| commit | 0c692569ce1f8944490869604beb99de10278a12 (patch) | |
| tree | da6299298e428d648f3b9b92b491c3f15be4065e /arch/xtensa | |
| parent | xtensa: make bootparam parsing optional (diff) | |
| download | linux-0c692569ce1f8944490869604beb99de10278a12.tar.xz linux-0c692569ce1f8944490869604beb99de10278a12.zip | |
xtensa: clean up boot-elf/bootstrap.S
Drop unneeded headers, rewrite literal definitions with .literal.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/boot/boot-elf/bootstrap.S | 17 |
1 files changed, 6 insertions, 11 deletions
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 |