diff options
Diffstat (limited to 'arch/arm/include/asm/barebox-arm-head.h')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm-head.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 83a22c4d94..135d0585b1 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __ASM_ARM_HEAD_H #define __ASM_ARM_HEAD_H @@ -16,13 +18,10 @@ void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2); #define ARM_HEAD_SPARE_OFS 0x30 #define ARM_HEAD_SPARE_MARKER 0x55555555 -#ifdef CONFIG_HAVE_MACH_ARM_HEAD -#include <mach/barebox-arm-head.h> -#else +#ifdef CONFIG_CPU_32 static inline void __barebox_arm_head(void) { __asm__ __volatile__ ( -#ifdef CONFIG_CPU_32 #ifdef CONFIG_THUMB2_BAREBOX ".arm\n" "adr r9, 1f + 1\n" @@ -43,22 +42,10 @@ static inline void __barebox_arm_head(void) "1: b 1b\n" "1: b 1b\n" #endif -#else - "b 2f\n" - "nop\n" - "nop\n" - "nop\n" - "nop\n" - "nop\n" -#endif ".asciz \"barebox\"\n" -#ifdef CONFIG_CPU_32 ".word _text\n" /* text base. If copied there, * barebox can skip relocation */ -#else - ".word 0xffffffff\n" -#endif ".word _barebox_image_size\n" /* image size to copy */ ".rept 8\n" ".word 0x55555555\n" |