From: Simon Glass <sjg@chromium.org>
Date: Wed, 17 May 2017 14:22:51 +0000 (-0600)
Subject: mips: Make u-boot-mips.h a private header
X-Git-Tag: v2017.07-rc1~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a320acc419cad588d0e340572740fe0081ead914;p=u-boot

mips: Make u-boot-mips.h a private header

Rather than including this arch-specific header file in common.h, include
it from within mips's u-boot.h header.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---

diff --git a/arch/mips/include/asm/u-boot.h b/arch/mips/include/asm/u-boot.h
index af03e8d5be..68985af4b9 100644
--- a/arch/mips/include/asm/u-boot.h
+++ b/arch/mips/include/asm/u-boot.h
@@ -17,6 +17,7 @@
 
 /* Use the generic board which requires a unified bd_info */
 #include <asm-generic/u-boot.h>
+#include <asm/u-boot-mips.h>
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_MIPS
diff --git a/include/common.h b/include/common.h
index fe396c5705..f36fed3843 100644
--- a/include/common.h
+++ b/include/common.h
@@ -442,7 +442,7 @@ static inline int setenv_addr(const char *varname, const void *addr)
 # include <asm/u-boot-nds32.h>
 #endif /* CONFIG_NDS32 */
 #ifdef CONFIG_MIPS
-# include <asm/u-boot-mips.h>
+# include <asm/u-boot.h>
 #endif /* CONFIG_MIPS */
 #ifdef CONFIG_ARC
 # include <asm/u-boot.h>