Rather than including this arch-specific header file in common.h, include it from within arm's u-boot.h header.
Also drop the comment about something to be fixed. It has been there forever and it is not clear what it means.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/include/asm/u-boot-arm.h | 4 ++++ arch/arm/include/asm/u-boot.h | 1 + include/common.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index b931c22060..3a0d0b8675 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -13,6 +13,8 @@ #ifndef _U_BOOT_ARM_H_ #define _U_BOOT_ARM_H_ 1
+#ifndef __ASSEMBLY__ + /* for the following variables, see start.S */ extern ulong IRQ_STACK_START; /* top of IRQ stack */ extern ulong FIQ_STACK_START; /* top of FIQ stack */ @@ -59,4 +61,6 @@ void do_fiq(struct pt_regs *pt_regs); void do_irq(struct pt_regs *pt_regswq); #endif
+#endif /* __ASSEMBLY__ */ + #endif /* _U_BOOT_ARM_H_ */ diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index ca3abd7d0b..ef9196f898 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -22,6 +22,7 @@
/* Use the generic board which requires a unified bd_info */ #include <asm-generic/u-boot.h> +#include <asm/u-boot-arm.h>
/* For image.h:image_check_target_arch() */ #ifndef CONFIG_ARM64 diff --git a/include/common.h b/include/common.h index 229ca4c397..fe396c5705 100644 --- a/include/common.h +++ b/include/common.h @@ -428,7 +428,7 @@ static inline int setenv_addr(const char *varname, const void *addr) #ifdef CONFIG_ARM # include <asm/mach-types.h> # include <asm/setup.h> -# include <asm/u-boot-arm.h> /* ARM version to be fixed! */ +# include <asm/u-boot.h> #endif /* CONFIG_ARM */ #ifdef CONFIG_X86 # include <asm/u-boot.h>