summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2009-02-18 16:14:29 -0600
committerWolfgang Denk <wd@denx.de>2009-02-19 00:23:19 +0100
commit7b0bc0219db8981613259473cf19699ac259b4fb (patch)
tree6f0a52d27cdcaa085bfb34a82d341917b94641d2
parentb8845abdc0dcf20d0944e965153f5ae7a9c3077c (diff)
downloadu-boot-imx-7b0bc0219db8981613259473cf19699ac259b4fb.zip
u-boot-imx-7b0bc0219db8981613259473cf19699ac259b4fb.tar.gz
u-boot-imx-7b0bc0219db8981613259473cf19699ac259b4fb.tar.bz2
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>
-rwxr-xr-xmkconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkconfig b/mkconfig
index b6b0a80..b0bbbd1 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