Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 401f2623f35f97ad7a589ff41e32db526e8b870e..84f5a7765b94b9bad19c8c345861d3253bd193f1 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -60,13 +60,7 @@ if [ "$cpu" = "-" ] ; then
        cpu=
 fi
 
-if [ "$6" = "<none>" ] ; then
-       board=
-elif [ "$6" = "-" ] ; then
-       board=${BOARD_NAME}
-else
-       board="$6"
-fi
+[ "$6" != "-" ] && board="$6"
 [ "$5" != "-" ] && vendor="$5"
 [ "$4" != "-" ] && soc="$4"
 [ $# -gt 7 ] && [ "$8" != "-" ] && {