]> git.sur5r.net Git - u-boot/commitdiff
MAKEALL: fix boards_by_field function
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 21 Oct 2013 02:11:27 +0000 (11:11 +0900)
committerTom Rini <trini@ti.com>
Fri, 8 Nov 2013 14:38:24 +0000 (09:38 -0500)
Commit 27af930e changed the boards.cfg format
and it changed boards_by_field() function incorrectly.
For tegra cpus it returned Board Name field,
not Target field.

This commit restores the behavior prior to 27af930e in the right way.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
MAKEALL

diff --git a/MAKEALL b/MAKEALL
index 230959c4d14ff26989cf892da7bca33149a7b93c..58593611a7c349c9768eba98f67cbb94f27af20b 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -226,17 +226,15 @@ RC=0
 # Helper funcs for parsing boards.cfg
 boards_by_field()
 {
-       FS="[ \t]+"
-       [ -n "$3" ] && FS="$3"
-       awk \
-               -v field="$1" \
-               -v select="$2" \
-               -F "$FS" \
-               '($1 !~ /^#/ && $field == select) { print $7 }' \
-               boards.cfg
+       field=$1
+       regexp=$2
+
+       awk '($1 !~ /^#/ && $'"$field"' ~ /^'"$regexp"'$/) { print $7 }' \
+                                                               boards.cfg
 }
+
 boards_by_arch() { boards_by_field 2 "$@" ; }
-boards_by_cpu()  { boards_by_field 3 "$@" "[: \t]+" ; }
+boards_by_cpu()  { boards_by_field 3 "$@" ; boards_by_field 3 "$@:.*" ; }
 boards_by_soc()  { boards_by_field 4 "$@" ; }
 
 #########################################################################