diff options
| author | Allen Martin <amartin@nvidia.com> | 2012-08-31 08:30:06 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:21 +0200 |
| commit | aa2e279d2a0ec7fa904a91d3392b57b51ea6264b (patch) | |
| tree | 69a215234a8360aa60046dd484ea81b4abe1fd7f | |
| parent | 0fd37b82f64a72f5e52d11fc1895827551ff5f59 (diff) | |
| download | u-boot-aa2e279d2a0ec7fa904a91d3392b57b51ea6264b.tar.gz | |
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>
| -rwxr-xr-x | MAKEALL | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -87,9 +87,9 @@ while true ; do -c|--cpu) # echo "Option CPU: argument \`$2'" if [ "$opt_c" ] ; then - opt_c="${opt_c%)} || \$3 == \"$2\")" + opt_c="${opt_c%)} || \$3 == \"$2\" || \$3 ~ /$2:/)" else - opt_c="(\$3 == \"$2\")" + opt_c="(\$3 == \"$2\" || \$3 ~ /$2:/)" fi SELECTED='y' shift 2 ;; @@ -211,14 +211,17 @@ 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 $1 }' \ boards.cfg } 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 "$@" ; } ######################################################################### |