]> git.sur5r.net Git - u-boot/commitdiff
sandbox: Make u-boot-sandbox.h a private header
authorSimon Glass <sjg@chromium.org>
Wed, 17 May 2017 14:22:48 +0000 (08:22 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 5 Jun 2017 15:02:32 +0000 (11:02 -0400)
Rather than including this arch-specific header file in common.h, include
it from within sandbox's u-boot.h header.

Also drop the comment about something to be fixed.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/sandbox/include/asm/u-boot.h
include/common.h

index 8279894eeca9709ae79947b736afe67c7351c8cd..ddcd6fb397e608f5f28d1a0a549daf991e1d6631 100644 (file)
@@ -22,6 +22,7 @@
 
 /* Use the generic board which requires a unified bd_info */
 #include <asm-generic/u-boot.h>
+#include <asm/u-boot-sandbox.h>
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_SANDBOX
index b07b8fc6da90a522478a032831749284e6d845cc..ffaed49bdef02b36acfd5536ee60e44d3b9da004 100644 (file)
@@ -434,7 +434,7 @@ static inline int setenv_addr(const char *varname, const void *addr)
 # include <asm/u-boot-x86.h>
 #endif /* CONFIG_X86 */
 #ifdef CONFIG_SANDBOX
-# include <asm/u-boot-sandbox.h>       /* TODO(sjg) what needs to be fixed? */
+# include <asm/u-boot.h>
 #endif
 #ifdef CONFIG_NDS32
 # include <asm/mach-types.h>