HAVE_MACH_ARM_HEAD stands in the way of adding multi arch support, as barebox-arm-head.h compiles differently on different archs. There are no users left, so remove it. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/Kconfig | 3 --- arch/arm/include/asm/barebox-arm-head.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1281b8be38..6aa0ec4074 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -16,9 +16,6 @@ config ARM_LINUX default y depends on CMD_BOOTZ || CMD_BOOTU || BOOTM -config HAVE_MACH_ARM_HEAD - bool - config ARM_USE_COMPRESSED_DTB bool select USE_COMPRESSED_DTB diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 1a1d58c1aa..135d0585b1 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -19,9 +19,6 @@ void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2); #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__ ( @@ -71,7 +68,6 @@ static inline void barebox_arm_head(void) ); } #endif -#endif #endif /* __ASSEMBLY__ */ -- 2.30.2