diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 08:22:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-05 11:02:32 -0400 |
| commit | 86e748d946d4c3b0cb867fba2d9367199fb0adfe (patch) | |
| tree | f62feb66642047b25a631e0c509e971d56494f6e | |
| parent | d6d2d0b5e2ab167dad00345aea7b93ec74a7b3e3 (diff) | |
| download | u-boot-86e748d946d4c3b0cb867fba2d9367199fb0adfe.tar.gz | |
sandbox: Make u-boot-sandbox.h a private header
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>
| -rw-r--r-- | arch/sandbox/include/asm/u-boot.h | 1 | ||||
| -rw-r--r-- | include/common.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/sandbox/include/asm/u-boot.h b/arch/sandbox/include/asm/u-boot.h index 8279894eec..ddcd6fb397 100644 --- a/arch/sandbox/include/asm/u-boot.h +++ b/arch/sandbox/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-sandbox.h> /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_SANDBOX diff --git a/include/common.h b/include/common.h index b07b8fc6da..ffaed49bde 100644 --- a/include/common.h +++ b/include/common.h @@ -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> |