MAKEALL: update to work with new boards.cfg syntax

Update MAKEALL to handle the optional SPL CPU field that was added to
boards.cfg.  This impacts the cases in MAKEALL that have to match
against CPU type (field 3).  In these cases use ':' as a field
separator to split the u-boot CPU from the SPL CPU.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Allen Martin 2012-08-31 08:30:06 +00:00 committed by Albert ARIBAUD
parent 0fd37b82f6
commit aa2e279d2a

View file

@ -87,9 +87,9 @@ while true ; do
-c|--cpu) -c|--cpu)
# echo "Option CPU: argument \`$2'" # echo "Option CPU: argument \`$2'"
if [ "$opt_c" ] ; then if [ "$opt_c" ] ; then
opt_c="${opt_c%)} || \$3 == \"$2\")" opt_c="${opt_c%)} || \$3 == \"$2\" || \$3 ~ /$2:/)"
else else
opt_c="(\$3 == \"$2\")" opt_c="(\$3 == \"$2\" || \$3 ~ /$2:/)"
fi fi
SELECTED='y' SELECTED='y'
shift 2 ;; shift 2 ;;
@ -211,14 +211,17 @@ RC=0
# Helper funcs for parsing boards.cfg # Helper funcs for parsing boards.cfg
boards_by_field() boards_by_field()
{ {
FS="[ \t]+"
[ -n "$3" ] && FS="$3"
awk \ awk \
-v field="$1" \ -v field="$1" \
-v select="$2" \ -v select="$2" \
-F "$FS" \
'($1 !~ /^#/ && $field == select) { print $1 }' \ '($1 !~ /^#/ && $field == select) { print $1 }' \
boards.cfg boards.cfg
} }
boards_by_arch() { boards_by_field 2 "$@" ; } boards_by_arch() { boards_by_field 2 "$@" ; }
boards_by_cpu() { boards_by_field 3 "$@" ; } boards_by_cpu() { boards_by_field 3 "$@" "[: \t]+" ; }
boards_by_soc() { boards_by_field 6 "$@" ; } boards_by_soc() { boards_by_field 6 "$@" ; }
######################################################################### #########################################################################