X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=mkconfig;h=cd911a9dc7322ecd4b126001b31209f44debe2d7;hp=5f516f214a3995633a93c4e95a26feb12b8de546;hb=c34c0246a3600dc4712247b267f71576234e403b;hpb=4c89a369c7cd6e7ad3adec4601cfa69fec476164

diff --git a/mkconfig b/mkconfig
index 5f516f214a..cd911a9dc7 100755
--- a/mkconfig
+++ b/mkconfig
@@ -55,7 +55,9 @@ CONFIG_NAME="${7%_config}"
 arch="$2"
 cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
 spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
-if [ "$6" = "-" ] ; then
+if [ "$6" = "<none>" ] ; then
+	board=
+elif [ "$6" = "-" ] ; then
 	board=${BOARD_NAME}
 else
 	board="$6"
@@ -101,10 +103,10 @@ fi
 #
 # Create link to architecture specific headers
 #
-if [ "$SRCTREE" != "$OBJTREE" ] ; then
-	mkdir -p ${OBJTREE}/include
-	LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
-	cd ${OBJTREE}/include
+if [ -n "$KBUILD_SRC" ] ; then
+	mkdir -p ${objtree}/include
+	LNPREFIX=${srctree}/arch/${arch}/include/asm/
+	cd ${objtree}/include
 	mkdir -p asm
 else
 	cd arch/${arch}/include
@@ -123,8 +125,8 @@ if [ "${arch}" = "arm" ] ; then
 	ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
-if [ "$SRCTREE" = "$OBJTREE" ] ; then
-	cd ${SRCTREE}/include
+if [ -z "$KBUILD_SRC" ] ; then
+	cd ${srctree}/include
 fi
 
 #
@@ -177,8 +179,8 @@ echo "#define CONFIG_SYS_BOARD \"${board}\"" >> config.h
 
 [ "${soc}"    ] && echo "#define CONFIG_SYS_SOC    \"${soc}\""    >> config.h
 
+[ "${board}"  ] && echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >> config.h
 cat << EOF >> config.h
-#define CONFIG_BOARDDIR board/$BOARDDIR
 #include <config_cmd_defaults.h>
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>