boards.cfg: change "<none>" in the board field to "-"

In the previous commit, all the board fields were filled.

Now we can use "-" in the board field for a different meaning.

Going forward, "-" stands for no board directory
as in cpu, soc, vendor fields.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/boards.cfg b/boards.cfg
index b3995f57632b21d48359095b164f3372cbc33c87..1ba2081788f04ab328e4602947f60ebd652e6690 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -49,8 +49,8 @@ Active  aarch64     armv8          fsl-lsch3   freescale       ls2085a
 Active  aarch64     armv8          fsl-lsch3   freescale       ls2085a             ls2085a_emu_D4                        ls2085a_emu:ARM64,EMU,SYS_FSL_DDR4                                                                                                York Sun <yorksun@freescale.com>
 Active  aarch64     armv8          fsl-lsch3   freescale       ls2085a             ls2085a_simu                          ls2085a_simu:ARM64,SIMU                                                                                                           York Sun <yorksun@freescale.com>
 Active  arc         arc700         -           abilis          tb100               tb100                                 -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
-Active  arc         arc700         -           synopsys        <none>              arcangel4                             -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
-Active  arc         arc700         -           synopsys        <none>              arcangel4-be                          -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
+Active  arc         arc700         -           synopsys        -                   arcangel4                             -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
+Active  arc         arc700         -           synopsys        -                   arcangel4-be                          -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 Active  arc         arc700         -           synopsys        axs101              axs101                                -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 Active  arm         arm1136        -           armltd          integrator          integratorcp_cm1136                   integratorcp:CM1136                                                                                                               Linus Walleij <linus.walleij@linaro.org>
 Active  arm         arm1136        mx31        -               imx31_phycore       imx31_phycore                         -                                                                                                                                 -

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" != "-" ] && {