X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=mkconfig;h=84f5a7765b94b9bad19c8c345861d3253bd193f1;hb=74f96dada18edd3ebd4a1c5d39edc806a17eefcc;hp=2bf5897528d9fbc14377033a48dad47f5b9e3386;hpb=7d89982b7af6ec6b2ff0e26f8de640d1d18458a1;p=u-boot

diff --git a/mkconfig b/mkconfig
index 2bf5897528..84f5a7765b 100755
--- a/mkconfig
+++ b/mkconfig
@@ -55,13 +55,12 @@ 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" = "<none>" ] ; then
-	board=
-elif [ "$6" = "-" ] ; then
-	board=${BOARD_NAME}
-else
-	board="$6"
+
+if [ "$cpu" = "-" ] ; then
+	cpu=
 fi
+
+[ "$6" != "-" ] && board="$6"
 [ "$5" != "-" ] && vendor="$5"
 [ "$4" != "-" ] && soc="$4"
 [ $# -gt 7 ] && [ "$8" != "-" ] && {
@@ -114,10 +113,10 @@ fi
 
 rm -f asm/arch
 
-if [ -z "${soc}" ] ; then
-	ln -s ${LNPREFIX}arch-${cpu} asm/arch
-else
+if [ "${soc}" ] ; then
 	ln -s ${LNPREFIX}arch-${soc} asm/arch
+elif [ "${cpu}" ] ; then
+	ln -s ${LNPREFIX}arch-${cpu} asm/arch
 fi
 
 if [ -z "$KBUILD_SRC" ] ; then