board/sbc405/strataflash.c: Fix GCC 4.6 build warning

[karo-tx-uboot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 2fda1d4c416032f41f6fed997a6aaf4356dc8c40..438530b567863c638d4a21fa38ab1688370ec527 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -29,6 +29,15 @@ if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
        set ${line}
        # add default board name if needed
        [ $# = 3 ] && set ${line} ${1}
+elif [ "${MAKEFLAGS+set}${MAKELEVEL+set}" = "setset" ] ; then
+       # only warn when using a config target in the Makefile
+       cat <<-EOF
+
+       warning: Please migrate to boards.cfg.  Failure to do so will
+                mean removal of your board in the next release.
+
+       EOF
+       sleep 5
 fi
 
 while [ $# -gt 0 ] ; do
@@ -98,8 +107,7 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then
        ln -s ${SRCTREE}/arch/${arch}/include/asm asm
        LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
        cd ../include
-       rm -f asm
-       ln -s ${SRCTREE}/arch/${arch}/include/asm asm
+       mkdir -p asm
 else
        cd ./include
        rm -f asm
@@ -149,12 +157,13 @@ fi
 echo "/* Automatically generated - do not edit */" >>config.h
 
 for i in ${TARGETS} ; do
-       i="`echo ${i} | sed '/=/ {s/=/\t/;q } ; { s/$/\t1/ }'`"
+       i="`echo ${i} | sed '/=/ {s/=/  /;q; } ; { s/$/ 1/; }'`"
        echo "#define CONFIG_${i}" >>config.h ;
 done
 
 cat << EOF >> config.h
 #define CONFIG_BOARDDIR board/$BOARDDIR
+#include <config_cmd_defaults.h>
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>
 #include <asm/config.h>