From: Kim Phillips <kim.phillips@freescale.com>
Date: Wed, 18 Feb 2009 22:14:29 +0000 (-0600)
Subject: mkconfig: include board config.h before asm/config.h
X-Git-Tag: v2009.03-rc1~33
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7b0bc0219db8981613259473cf19699ac259b4fb;p=u-boot

mkconfig: include board config.h before asm/config.h

swapping the include order suppresses warnings for board configs
that define their own CONFIG_MAX_MEM_MAPPED:

In file included from /home/r1aaha/git/u-boot/include/config.h:5,
                from /home/r1aaha/git/u-boot/include/common.h:35,
                from simpc8313.c:26:
/home/r1aaha/git/u-boot/include/configs/SIMPC8313.h:81:1: warning:
"CONFIG_MAX_MEM_MAPPED" redefined
In file included from /home/r1aaha/git/u-boot/include/config.h:4,
                from /home/r1aaha/git/u-boot/include/common.h:35,
                from simpc8313.c:26:
/home/r1aaha/git/u-boot/include/asm/config.h:28:1: warning: this is
the location of the previous definition

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---

diff --git a/mkconfig b/mkconfig
index b6b0a801ef..b0bbbd1e7f 100755
--- a/mkconfig
+++ b/mkconfig
@@ -82,7 +82,7 @@ else
 	> config.h		# Create new config file
 fi
 echo "/* Automatically generated - do not edit */" >>config.h
-echo "#include <asm/config.h>" >>config.h
 echo "#include <configs/$1.h>" >>config.h
+echo "#include <asm/config.h>" >>config.h
 
 exit 0