diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-10-24 08:57:14 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-26 06:21:43 +0200 |
| commit | ecbccc230f2d277e14a435e63494f0da4a185e0b (patch) | |
| tree | cf76aa9e79a218750f556d94fca0edd29cacbf0b | |
| parent | 2d68037eb90ad8dab6402da04c7fc66f798b159f (diff) | |
| download | barebox-ecbccc230f2d277e14a435e63494f0da4a185e0b.tar.gz barebox-ecbccc230f2d277e14a435e63494f0da4a185e0b.tar.xz | |
ARM64: asm: drop __barebox_arm_head
Now that we have the common PBL head written in assembly, the 64-bit
inline assembly version remains unused. Drop it.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20221024065716.1215046-7-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/include/asm/barebox-arm-head.h | 17 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/barebox-arm-head.h | 17 |
2 files changed, 2 insertions, 32 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 099e1bef3c..1a1d58c1aa 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -18,13 +18,13 @@ 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_CPU_32 #ifdef CONFIG_HAVE_MACH_ARM_HEAD #include <mach/barebox-arm-head.h> #else static inline void __barebox_arm_head(void) { __asm__ __volatile__ ( -#ifdef CONFIG_CPU_32 #ifdef CONFIG_THUMB2_BAREBOX ".arm\n" "adr r9, 1f + 1\n" @@ -45,31 +45,17 @@ static inline void __barebox_arm_head(void) "1: b 1b\n" "1: b 1b\n" #endif -#else - /* 5 instructions added by ENTRY_FUNCTION */ - /* two instruction long function prologue */ - /* only use if stack is initialized! */ - "b 2f\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" ".endr\n" "2:\n" #ifdef CONFIG_PBL_BREAK -#ifdef CONFIG_CPU_V8 - "brk #17\n" -#else "bkpt #17\n" -#endif "nop\n" #else "nop\n" @@ -85,6 +71,7 @@ static inline void barebox_arm_head(void) ); } #endif +#endif #endif /* __ASSEMBLY__ */ diff --git a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h b/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h index 12f8cfc5a0..2ef3377402 100644 --- a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h +++ b/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h @@ -6,7 +6,6 @@ static inline void __barebox_arm_head(void) { __asm__ __volatile__ ( -#ifdef CONFIG_CPU_32 #ifdef CONFIG_THUMB2_BAREBOX ".arm\n" "adr r9, 1f + 1\n" @@ -27,22 +26,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 */ /* @@ -58,11 +45,7 @@ static inline void __barebox_arm_head(void) ".endr\n" "2:\n" #ifdef CONFIG_PBL_BREAK -#ifdef CONFIG_CPU_V8 - "brk #17\n" -#else "bkpt #17\n" -#endif "nop\n" #else "nop\n" |