| Message ID | 20170517142311.29484-16-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 86e748d946d4c3b0cb867fba2d9367199fb0adfe |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, May 17, 2017 at 08:22:48AM -0600, Simon Glass wrote: > 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> Applied to u-boot/master, thanks!
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>
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 | 1 + include/common.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)