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

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

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h
index 2efdeb1243..4378ebf44b 100644
--- a/arch/nds32/include/asm/u-boot.h
+++ b/arch/nds32/include/asm/u-boot.h
@@ -20,6 +20,8 @@
 #ifndef _U_BOOT_H_
 #define _U_BOOT_H_	1
 
+#include <asm/u-boot-nds32.h>
+
 #include <environment.h>
 
 typedef struct bd_info {
diff --git a/include/common.h b/include/common.h
index f36fed3843..c1e634045f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -439,7 +439,7 @@ static inline int setenv_addr(const char *varname, const void *addr)
 #ifdef CONFIG_NDS32
 # include <asm/mach-types.h>
 # include <asm/setup.h>
-# include <asm/u-boot-nds32.h>
+# include <asm/u-boot.h>
 #endif /* CONFIG_NDS32 */
 #ifdef CONFIG_MIPS
 # include <asm/u-boot.h>