Hi Daniel,
On 17 May 2017 at 13:27, Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Am 17.05.2017 um 16:22 schrieb Simon Glass:
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
arch/mips/include/asm/u-boot.h | 1 + include/common.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
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 */
you could also remove the #ifdef CONFIG_MIPS in this patch and drop patch 21/38
Yes, true, I am trying to avoid making a change and removing code at the same time.
#ifdef CONFIG_ARC # include <asm/u-boot.h>
--
- Daniel
Regards, Simon