]> git.sur5r.net Git - u-boot/commitdiff
mkconfig: include board config.h before asm/config.h
authorKim Phillips <kim.phillips@freescale.com>
Wed, 18 Feb 2009 22:14:29 +0000 (16:14 -0600)
committerWolfgang Denk <wd@denx.de>
Wed, 18 Feb 2009 23:23:19 +0000 (00:23 +0100)
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>
mkconfig

index b6b0a801ef7e729dd1aa57ef54db5f8a9f4b1b84..b0bbbd1e7f41fb0ecdf6918b306680d91b647994 100755 (executable)
--- 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