When there are no toolchains a warning is printed. But in some cases this is confusing, such as when the user is fetching new toolchains.

Adjust the function to supress the warning in this case.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/buildman/toolchain.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 3993db3..f6ab295 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -167,9 +167,12 @@ class Toolchains: self.paths = [] self._make_flags = dict(bsettings.GetItems('make-flags'))

- def GetPathList(self): + def GetPathList(self, show_warning=True): """Get a list of available toolchain paths

+ Args: + show_warning: True to show a warning if there are no tool chains. + Returns: List of strings, each a path to a toolchain mentioned in the [toolchain] section of the settings file. @@ -188,9 +191,14 @@ class Toolchains: paths.append(value) return paths

- def GetSettings(self): - self.prefixes = bsettings.GetItems('toolchain-prefix') - self.paths += self.GetPathList() + def GetSettings(self, show_warning=True): + """Get toolchain settings from the settings file. + + Args: + show_warning: True to show a warning if there are no tool chains. + """ + self.prefixes = bsettings.GetItems('toolchain-prefix') + self.paths += self.GetPathList(show_warning)

def Add(self, fname, test=True, verbose=False, priority=PRIORITY_CALC, arch=None): @@ -479,7 +487,7 @@ class Toolchains: Returns: True if the path is in settings, False if not """ - paths = self.GetPathList() + paths = self.GetPathList(False) return path in paths

def ListArchs(self):

Use colour to make it easier to see what is going on. Also print a message before downloading a new toolchain. Mention --fetch-arch in the message that is shown when there are no available toolchains, since this is the quickest way to resolve the problem.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/buildman/control.py | 9 ++++++--- tools/buildman/toolchain.py | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/tools/buildman/control.py b/tools/buildman/control.py index aeb128a..46053d8 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -107,6 +107,7 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, return 0

gitutil.Setup() + col = terminal.Color()

options.git_dir = os.path.join(options.git, '.git')

@@ -122,14 +123,17 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, if options.fetch_arch: if options.fetch_arch == 'list': sorted_list = toolchains.ListArchs() - print 'Available architectures: %s\n' % ' '.join(sorted_list) + print col.Color(col.BLUE, 'Available architectures: %s\n' % + ' '.join(sorted_list)) return 0 else: fetch_arch = options.fetch_arch if fetch_arch == 'all': fetch_arch = ','.join(toolchains.ListArchs()) - print 'Downloading toolchains: %s\n' % fetch_arch + print col.Color(col.CYAN, '\nDownloading toolchains: %s' % + fetch_arch) for arch in fetch_arch.split(','): + print ret = toolchains.FetchAndInstall(arch) if ret: return ret @@ -138,7 +142,6 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, # Work out how many commits to build. We want to build everything on the # branch. We also build the upstream commit as a control so we can see # problems introduced by the first commit on the branch. - col = terminal.Color() count = options.count has_range = options.branch and '..' in options.branch if count == -1: diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index f6ab295..6f39a2b 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -13,6 +13,7 @@ import urllib2

import bsettings import command +import terminal

(PRIORITY_FULL_PREFIX, PRIORITY_PREFIX_GCC, PRIORITY_PREFIX_GCC_PATH, PRIORITY_CALC) = range(4) @@ -179,9 +180,11 @@ class Toolchains: """ toolchains = bsettings.GetItems('toolchain') if not toolchains: - print ('Warning: No tool chains - please add a [toolchain] section' - ' to your buildman config file %s. See README for details' % - bsettings.config_fname) + print ("Warning: No tool chains. Please run 'buildman " + "--fetch-arch all' to download all available toolchains, or " + "add a [toolchain] section to your buildman config file " + "%s. See README for details" % + bsettings.config_fname)

paths = [] for name, value in toolchains: @@ -294,7 +297,9 @@ class Toolchains:

def List(self): """List out the selected toolchains for each architecture""" - print 'List of available toolchains (%d):' % len(self.toolchains) + col = terminal.Color() + print col.Color(col.BLUE, 'List of available toolchains (%d):' % + len(self.toolchains)) if len(self.toolchains): for key, value in sorted(self.toolchains.iteritems()): print '%-10s: %s' % (key, value.gcc) @@ -509,6 +514,8 @@ class Toolchains: Architecture to fetch, or 'list' to list """ # Fist get the URL for this architecture + col = terminal.Color() + print col.Color(col.BLUE, "Downloading toolchain for arch '%s'" % arch) url = self.LocateArchUrl(arch) if not url: print ("Cannot find toolchain for arch '%s' - use 'list' to list" % @@ -523,7 +530,7 @@ class Toolchains: tmpdir, tarfile = self.Download(url) if not tarfile: return 1 - print 'Unpacking to: %s' % dest, + print col.Color(col.GREEN, 'Unpacking to: %s' % dest), sys.stdout.flush() path = self.Unpack(tarfile, dest) os.remove(tarfile) @@ -531,16 +538,15 @@ class Toolchains: print

# Check that the toolchain works - print 'Testing' + print col.Color(col.GREEN, 'Testing') dirpath = os.path.join(dest, path) compiler_fname_list = self.ScanPath(dirpath, True) if not compiler_fname_list: print 'Could not locate C compiler - fetch failed.' return 1 if len(compiler_fname_list) != 1: - print ('Internal error, ambiguous toolchains: %s' % - (', '.join(compiler_fname))) - return 1 + print col.Color(col.RED, 'Warning, ambiguous toolchains: %s' % + ', '.join(compiler_fname_list)) toolchain = Toolchain(compiler_fname_list[0], True, True)

# Make sure that it will be found by buildman

The function comment should say 'buildman'. Fix it.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/buildman/toolchain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 6f39a2b..584c9f2 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -487,7 +487,7 @@ class Toolchains: return stdout.splitlines()[0][:-1]

def TestSettingsHasPath(self, path): - """Check if builmand will find this toolchain + """Check if buildman will find this toolchain

Returns: True if the path is in settings, False if not

The current code for setting up the toolchain config always writes the new paths to an item called 'toolchain'. This means that it will overwrite any existing toolchain item with the same name. In practice, this means that:

buildman --fetch-arch all

will fetch all toolchains, but only the path of the final one will be added to the config. This normally works out OK, since most toolchains are the same version (e.g. gcc 4.9) and will be found on the same path. But it is not correct and toolchains for archs which don't use the same version will not function as expected.

Adjust the code to use unique names for each toolchain path entry.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/buildman/bsettings.py | 21 +++++++++++++++++++++ tools/buildman/toolchain.py | 29 +++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py index 6f8fdfd..655fef8 100644 --- a/tools/buildman/bsettings.py +++ b/tools/buildman/bsettings.py @@ -47,6 +47,27 @@ def GetItems(section): except: raise

+def GetItemsAsDict(section): + """Get the items from a section of the config. + + Args: + section: name of section to retrieve + + Returns: + Dict: + key: name of item + value: value of item + """ + try: + items = {} + for item in settings.items(section): + items[item[0]] = item[1] + return items + except ConfigParser.NoSectionError as e: + return {} + except: + raise + def SetItem(section, tag, value): """Set an item and write it back to the settings file""" global settings diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 584c9f2..293b297 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -550,9 +550,30 @@ class Toolchains: toolchain = Toolchain(compiler_fname_list[0], True, True)

# Make sure that it will be found by buildman - if not self.TestSettingsHasPath(dirpath): - print ("Adding 'download' to config file '%s'" % - bsettings.config_fname) + if self.TestSettingsHasPath(dirpath): + print col.Color(col.GREEN, 'Reusing existing config item') + else: tools_dir = os.path.dirname(dirpath) - bsettings.SetItem('toolchain', 'download', '%s/*' % tools_dir) + self.AddToolchainSetting('%s/*' % tools_dir) return 0 + + def AddToolchainSetting(self, tools_path): + """Add a new toolchain setting to the [toolchain] section. + + Be careful to avoid overwriting an existing entry. + + Args: + tools_path: New tools patch to add (normally ends with "/*") + """ + col = terminal.Color() + items = bsettings.GetItemsAsDict('toolchain') + for upto in xrange(100): + name = 'download%d' % upto + if name not in items: + break + if upto == 100: + print 'Internal error: too many items in [toolchain]' + return 1 + print col.Color(col.YELLOW, "Adding '%s' to config file '%s'" % + (name, bsettings.config_fname)) + bsettings.SetItem('toolchain', name, tools_path)

Buildman has been around for 3 years now. It has had a lot of use and testing. Perhaps it is time to remove MAKEALL.

Signed-off-by: Simon Glass sjg@chromium.org ---

MAKEALL | 850 ---------------------------------------------------------------- 1 file changed, 850 deletions(-) delete mode 100755 MAKEALL

diff --git a/MAKEALL b/MAKEALL deleted file mode 100755 index 7e42f10..0000000 --- a/MAKEALL +++ /dev/null @@ -1,850 +0,0 @@ -#!/bin/bash -# Tool mainly for U-Boot Quality Assurance: build one or more board -# configurations with minimal verbosity, showing only warnings and -# errors. -# -# SPDX-License-Identifier: GPL-2.0+ - -usage() -{ - # if exiting with 0, write to stdout, else write to stderr - local ret=${1:-0} - [ "${ret}" -eq 1 ] && exec 1>&2 - cat <<-EOF - Usage: MAKEALL [options] [--] [boards-to-build] - - Options: - -a ARCH, --arch ARCH Build all boards with arch ARCH - -c CPU, --cpu CPU Build all boards with cpu CPU - -v VENDOR, --vendor VENDOR Build all boards with vendor VENDOR - -s SOC, --soc SOC Build all boards with soc SOC - -b BOARD, --board BOARD Build all boards with board name BOARD - -l, --list List all targets to be built - -m, --maintainers List all targets and maintainer email - -M, --mails List all targets and all affilated emails - -C, --check Enable build checking - -n, --continue Continue (skip boards already built) - -r, --rebuild-errors Rebuild any boards that errored - -h, --help This help output - - Selections by these options are logically ANDed; if the same option - is used repeatedly, such selections are ORed. So "-v FOO -v BAR" - will select all configurations where the vendor is either FOO or - BAR. Any additional arguments specified on the command line are - always build additionally. See the boards.cfg file for more info. - - If no boards are specified, then the default is "powerpc". - - Environment variables: - BUILD_NCPUS number of parallel make jobs (default: auto) - CROSS_COMPILE cross-compiler toolchain prefix (default: "") - CROSS_COMPILE_<ARCH> cross-compiler toolchain prefix for - architecture "ARCH". Substitute "ARCH" for any - supported architecture (default: "") - MAKEALL_LOGDIR output all logs to here (default: ./LOG/) - BUILD_DIR output build directory (default: ./) - BUILD_NBUILDS number of parallel targets (default: 1) - - Examples: - - build all Power Architecture boards: - MAKEALL -a powerpc - MAKEALL --arch powerpc - MAKEALL powerpc - - build all PowerPC boards manufactured by vendor "esd": - MAKEALL -a powerpc -v esd - - build all PowerPC boards manufactured either by "keymile" or "siemens": - MAKEALL -a powerpc -v keymile -v siemens - - build all Freescale boards with MPC83xx CPUs, plus all 4xx boards: - MAKEALL -c mpc83xx -v freescale 4xx - EOF - exit ${ret} -} - -deprecation() { - echo "** Note: MAKEALL is deprecated - please use buildman instead" - echo "** See tools/buildman/README for details" - echo -} - -deprecation - -SHORT_OPTS="ha:c:v:s:b:lmMCnr" -LONG_OPTS="help,arch:,cpu:,vendor:,soc:,board:,list,maintainers,mails,check,continue,rebuild-errors" - -# Option processing based on util-linux-2.13/getopt-parse.bash - -# Note that we use `"$@"' to let each command-line parameter expand to a -# separate word. The quotes around `$@' are essential! -# We need TEMP as the `eval set --' would nuke the return value of -# getopt. -TEMP=`getopt -o ${SHORT_OPTS} --long ${LONG_OPTS} \ - -n 'MAKEALL' -- "$@"` - -[ $? != 0 ] && usage 1 - -# Note the quotes around `$TEMP': they are essential! -eval set -- "$TEMP" - -SELECTED='' -ONLY_LIST='' -PRINT_MAINTS='' -MAINTAINERS_ONLY='' -CONTINUE='' -REBUILD_ERRORS='' - -while true ; do - case "$1" in - -a|--arch) - # echo "Option ARCH: argument `$2'" - if [ "$opt_a" ] ; then - opt_a="${opt_a%)} || $2 == "$2")" - else - opt_a="($2 == "$2")" - fi - SELECTED='y' - shift 2 ;; - -c|--cpu) - # echo "Option CPU: argument `$2'" - if [ "$opt_c" ] ; then - opt_c="${opt_c%)} || $3 == "$2" || $3 ~ /$2:/)" - else - opt_c="($3 == "$2" || $3 ~ /$2:/)" - fi - SELECTED='y' - shift 2 ;; - -s|--soc) - # echo "Option SoC: argument `$2'" - if [ "$opt_s" ] ; then - opt_s="${opt_s%)} || $4 == "$2" || $4 ~ /$2/)" - else - opt_s="($4 == "$2" || $4 ~ /$2/)" - fi - SELECTED='y' - shift 2 ;; - -v|--vendor) - # echo "Option VENDOR: argument `$2'" - if [ "$opt_v" ] ; then - opt_v="${opt_v%)} || $5 == "$2")" - else - opt_v="($5 == "$2")" - fi - SELECTED='y' - shift 2 ;; - -b|--board) - # echo "Option BOARD: argument `$2'" - if [ "$opt_b" ] ; then - opt_b="${opt_b%)} || $6 == "$2" || $7 == "$2")" - else - # We need to check the 7th field too - # for boards whose 6th field is "-" - opt_b="($6 == "$2" || $7 == "$2")" - fi - SELECTED='y' - shift 2 ;; - -C|--check) - CHECK='C=1' - shift ;; - -n|--continue) - CONTINUE='y' - shift ;; - -r|--rebuild-errors) - REBUILD_ERRORS='y' - shift ;; - -l|--list) - ONLY_LIST='y' - shift ;; - -m|--maintainers) - ONLY_LIST='y' - PRINT_MAINTS='y' - MAINTAINERS_ONLY='y' - shift ;; - -M|--mails) - ONLY_LIST='y' - PRINT_MAINTS='y' - shift ;; - -h|--help) - usage ;; - --) - shift ; break ;; - *) - echo "Internal error!" >&2 ; exit 1 ;; - esac -done - -GNU_MAKE=$(scripts/show-gnu-make) || { - echo "GNU Make not found" >&2 - exit 1 -} - -# echo "Remaining arguments:" -# for arg do echo '--> '"`$arg'" ; done - -tools/genboardscfg.py || { - echo "Failed to generate boards.cfg" >&2 - exit 1 -} - -FILTER="$1 !~ /^#/" -[ "$opt_a" ] && FILTER="${FILTER} && $opt_a" -[ "$opt_c" ] && FILTER="${FILTER} && $opt_c" -[ "$opt_s" ] && FILTER="${FILTER} && $opt_s" -[ "$opt_v" ] && FILTER="${FILTER} && $opt_v" -[ "$opt_b" ] && FILTER="${FILTER} && $opt_b" - -if [ "$SELECTED" ] ; then - SELECTED=$(awk '('"$FILTER"') { print $7 }' boards.cfg) - - # Make sure some boards from boards.cfg are actually found - if [ -z "$SELECTED" ] ; then - echo "Error: No boards selected, invalid arguments" - exit 1 - fi -fi - -######################################################################### - -# Print statistics when we exit -trap exit 1 2 3 15 -trap print_stats 0 - -# Determine number of CPU cores if no default was set -: ${BUILD_NCPUS:="`getconf _NPROCESSORS_ONLN`"} - -if [ "$BUILD_NCPUS" -gt 1 ] -then - JOBS="-j $((BUILD_NCPUS + 1))" -else - JOBS="" -fi - -if [ "${MAKEALL_LOGDIR}" ] ; then - LOG_DIR=${MAKEALL_LOGDIR} -else - LOG_DIR="LOG" -fi - -: ${BUILD_NBUILDS:=1} -BUILD_MANY=0 - -if [ "${BUILD_NBUILDS}" -gt 1 ] ; then - BUILD_MANY=1 - : ${BUILD_DIR:=./build} - mkdir -p "${BUILD_DIR}/ERR" - find "${BUILD_DIR}/ERR/" -type f -exec rm -f {} + -fi - -: ${BUILD_DIR:=.} - -OUTPUT_PREFIX="${BUILD_DIR}" - -[ -d ${LOG_DIR} ] || mkdir "${LOG_DIR}" || exit 1 -if [ "$CONTINUE" != 'y' -a "$REBUILD_ERRORS" != 'y' ] ; then - find "${LOG_DIR}/" -type f -exec rm -f {} + -fi - -LIST="" - -# Keep track of the number of builds and errors -ERR_CNT=0 -ERR_LIST="" -WRN_CNT=0 -WRN_LIST="" -TOTAL_CNT=0 -SKIP_CNT=0 -CURRENT_CNT=0 -OLDEST_IDX=1 -RC=0 - -# Helper funcs for parsing boards.cfg -targets_by_field() -{ - field=$1 - regexp=$2 - - awk '($1 !~ /^#/ && $'"$field"' ~ /^'"$regexp"'$/) { print $7 }' \ - boards.cfg -} - -targets_by_arch() { targets_by_field 2 "$@" ; } -targets_by_cpu() { targets_by_field 3 "$@" ; targets_by_field 3 "$@:.*" ; } -targets_by_soc() { targets_by_field 4 "$@" ; } - -######################################################################### -## MPC5xx Systems -######################################################################### - -LIST_5xx="$(targets_by_cpu mpc5xx)" - -######################################################################### -## MPC5xxx Systems -######################################################################### - -LIST_5xxx="$(targets_by_cpu mpc5xxx)" - -######################################################################### -## MPC512x Systems -######################################################################### - -LIST_512x="$(targets_by_cpu mpc512x)" - -######################################################################### -## MPC8xx Systems -######################################################################### - -LIST_8xx="$(targets_by_cpu mpc8xx)" - -######################################################################### -## PPC4xx Systems -######################################################################### - -LIST_4xx="$(targets_by_cpu ppc4xx)" - -######################################################################### -## MPC8260 Systems (includes 8250, 8255 etc.) -######################################################################### - -LIST_8260="$(targets_by_cpu mpc8260)" - -######################################################################### -## MPC83xx Systems (includes 8349, etc.) -######################################################################### - -LIST_83xx="$(targets_by_cpu mpc83xx)" - -######################################################################### -## MPC85xx Systems (includes 8540, 8560 etc.) -######################################################################### - -LIST_85xx="$(targets_by_cpu mpc85xx)" - -######################################################################### -## MPC86xx Systems -######################################################################### - -LIST_86xx="$(targets_by_cpu mpc86xx)" - -######################################################################### -## PowerPC groups -######################################################################### - -LIST_TSEC=" \ - ${LIST_83xx} \ - ${LIST_85xx} \ - ${LIST_86xx} \ -" - -LIST_powerpc=" \ - ${LIST_5xx} \ - ${LIST_512x} \ - ${LIST_5xxx} \ - ${LIST_8xx} \ - ${LIST_824x} \ - ${LIST_8260} \ - ${LIST_83xx} \ - ${LIST_85xx} \ - ${LIST_86xx} \ - ${LIST_4xx} \ -" - -# Alias "ppc" -> "powerpc" to not break compatibility with older scripts -# still using "ppc" instead of "powerpc" -LIST_ppc=" \ - ${LIST_powerpc} \ -" - -######################################################################### -## StrongARM Systems -######################################################################### - -LIST_SA="$(targets_by_cpu sa1100)" - -######################################################################### -## ARM7 Systems -######################################################################### - -LIST_ARM7="$(targets_by_cpu arm720t)" - -######################################################################### -## ARM9 Systems -######################################################################### - -LIST_ARM9="$(targets_by_cpu arm920t) \ - $(targets_by_cpu arm926ejs) \ - $(targets_by_cpu arm946es) \ -" - -######################################################################### -## ARM11 Systems -######################################################################### -LIST_ARM11="$(targets_by_cpu arm1136) \ - $(targets_by_cpu arm1176) \ -" - -######################################################################### -## ARMV7 Systems -######################################################################### - -LIST_ARMV7="$(targets_by_cpu armv7)" - -######################################################################### -## ARMV8 Systems -######################################################################### - -LIST_ARMV8="$(targets_by_cpu armv8)" - -######################################################################### -## AT91 Systems -######################################################################### - -LIST_at91="$(targets_by_soc at91)" - -######################################################################### -## Xscale Systems -######################################################################### - -LIST_pxa="$(targets_by_cpu pxa)" - -######################################################################### -## SPEAr Systems -######################################################################### - -LIST_spear="$(targets_by_soc spear)" - -######################################################################### -## ARM groups -######################################################################### - -LIST_arm="$(targets_by_arch arm | \ - for ARMV8_TARGET in $LIST_ARMV8; \ - do sed "/$ARMV8_TARGET/d"; \ - done) \ -" - -######################################################################### -## MIPS Systems (default = big endian) -######################################################################### - -LIST_mips="$(targets_by_arch mips)" - -######################################################################### -## OpenRISC Systems -######################################################################### - -LIST_openrisc="$(targets_by_arch openrisc)" - -######################################################################### -## x86 Systems -######################################################################### - -LIST_x86="$(targets_by_arch x86)" - -######################################################################### -## Nios-II Systems -######################################################################### - -LIST_nios2="$(targets_by_arch nios2)" - -######################################################################### -## MicroBlaze Systems -######################################################################### - -LIST_microblaze="$(targets_by_arch microblaze)" - -######################################################################### -## ColdFire Systems -######################################################################### - -LIST_m68k="$(targets_by_arch m68k)" -LIST_coldfire=${LIST_m68k} - -######################################################################### -## AVR32 Systems -######################################################################### - -LIST_avr32="$(targets_by_arch avr32)" - -######################################################################### -## Blackfin Systems -######################################################################### - -LIST_blackfin="$(targets_by_arch blackfin)" - -######################################################################### -## SH Systems -######################################################################### - -LIST_sh2="$(targets_by_cpu sh2)" -LIST_sh3="$(targets_by_cpu sh3)" -LIST_sh4="$(targets_by_cpu sh4)" - -LIST_sh="$(targets_by_arch sh)" - -######################################################################### -## SPARC Systems -######################################################################### - -LIST_sparc="$(targets_by_arch sparc)" - -######################################################################### -## NDS32 Systems -######################################################################### - -LIST_nds32="$(targets_by_arch nds32)" - -######################################################################### -## ARC Systems -######################################################################### - -LIST_arc="$(targets_by_arch arc)" - -#----------------------------------------------------------------------- - -get_target_location() { - local target=$1 - local BOARD_NAME="" - local CONFIG_NAME="" - local board="" - local vendor="" - - # Automatic mode - local line=`awk '$7 == "'"$target"'" { print $0 }' boards.cfg` - if [ -z "${line}" ] ; then echo "" ; return ; fi - - set ${line} - - CONFIG_NAME="${7%_defconfig}" - - [ "${BOARD_NAME}" ] || BOARD_NAME="${7%_defconfig}" - - if [ $# -gt 5 ]; then - if [ "$6" = "-" ] ; then - board=${BOARD_NAME} - else - board="$6" - fi - fi - - [ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5" - [ $# -gt 6 ] && [ "$8" != "-" ] && { - tmp="${8%:*}" - if [ "$tmp" ] ; then - CONFIG_NAME="$tmp" - fi - } - - # Assign board directory to BOARDIR variable - if [ "${vendor}" == "-" ] ; then - BOARDDIR=${board} - else - BOARDDIR=${vendor}/${board} - fi - - echo "${CONFIG_NAME}:${BOARDDIR}:${BOARD_NAME}" -} - -get_target_maintainers() { - local name=`echo $1 | cut -d : -f 3` - - local line=`awk '$7 == "'"$target"'" { print $0 }' boards.cfg` - if [ -z "${line}" ]; then - echo "" - return ; - fi - - local mails=`echo ${line} | cut -d ' ' -f 9- | sed -e 's/[^<]*<//' -e 's/>.*</ /' -e 's/>[^>]*$//'` - [ "$mails" == "-" ] && mails="" - echo "$mails" -} - -get_target_arch() { - local target=$1 - - awk '$7 == "'$target'" { print $2 }' boards.cfg -} - -list_target() { - if [ "$PRINT_MAINTS" != 'y' ] ; then - echo "$1" - return - fi - - echo -n "$1:" - - local loc=`get_target_location $1` - - if [ -z "${loc}" ] ; then echo "ERROR" ; return ; fi - - local maintainers_result=`get_target_maintainers ${loc} | tr " " "\n"` - - if [ "$MAINTAINERS_ONLY" != 'y' ] ; then - - local dir=`echo ${loc} | cut -d ":" -f 2` - local cfg=`echo ${loc} | cut -d ":" -f 1` - local git_result=`git log --format=%aE board/${dir} \ - include/configs/${cfg}.h | grep "@"` - local git_result_recent=`echo ${git_result} | tr " " "\n" | \ - head -n 3` - local git_result_top=`echo ${git_result} | tr " " "\n" | \ - sort | uniq -c | sort -nr | head -n 3 | \ - sed "s/^ +[0-9]+ +//"` - - echo -e "$git_result_recent\n$git_result_top\n$maintainers_result" | \ - sort -u | tr "\n" " " | sed "s/ $//" ; - else - echo -e "$maintainers_result" | sort -u | tr "\n" " " | \ - sed "s/ $//" ; - fi - - echo "" -} - -# Each finished build will have a file called ${donep}${n}, -# where n is the index of the build. Each build -# we've already noted as finished will have ${skipp}${n}. -# The code managing the build process will use this information -# to ensure that only BUILD_NBUILDS builds are in flight at once -donep="${LOG_DIR}/._done_" -skipp="${LOG_DIR}/._skip_" - -build_target_killed() { - echo "Aborted $target build." - # Remove the logs for this board since it was aborted - rm -f ${LOG_DIR}/$target.MAKELOG ${LOG_DIR}/$target.ERR - exit -} - -build_target() { - target=$1 - build_idx=$2 - - if [ "$ONLY_LIST" == 'y' ] ; then - list_target ${target} - return - fi - - if [ $BUILD_MANY == 1 ] ; then - output_dir="${OUTPUT_PREFIX}/${target}" - mkdir -p "${output_dir}" - trap build_target_killed TERM - else - output_dir="${OUTPUT_PREFIX}" - fi - - target_arch=$(get_target_arch ${target}) - eval cross_toolchain=$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'` - if [ "${cross_toolchain}" ] ; then - MAKE="$GNU_MAKE CROSS_COMPILE=${cross_toolchain}" - elif [ "${CROSS_COMPILE}" ] ; then - MAKE="$GNU_MAKE CROSS_COMPILE=${CROSS_COMPILE}" - else - MAKE=$GNU_MAKE - fi - - if [ "${output_dir}" != "." ] ; then - MAKE="${MAKE} O=${output_dir}" - fi - - ${MAKE} mrproper >/dev/null - - echo "Building ${target} board..." - ${MAKE} -s ${target}_defconfig >/dev/null - - ${MAKE} ${JOBS} ${CHECK} all \ - >${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR - - # Check for 'make' errors - if [ ${PIPESTATUS[0]} -ne 0 ] ; then - RC=1 - fi - - OBJS=${output_dir}/u-boot - if [ -e ${output_dir}/spl/u-boot-spl ]; then - OBJS="${OBJS} ${output_dir}/spl/u-boot-spl" - fi - - ${CROSS_COMPILE}size ${OBJS} | tee -a ${LOG_DIR}/$target.MAKELOG - - if [ $BUILD_MANY == 1 ] ; then - trap - TERM - - ${MAKE} -s clean - - if [ -s ${LOG_DIR}/${target}.ERR ] ; then - cp ${LOG_DIR}/${target}.ERR ${OUTPUT_PREFIX}/ERR/${target} - else - rm ${LOG_DIR}/${target}.ERR - fi - else - if [ -s ${LOG_DIR}/${target}.ERR ] ; then - if grep -iw error ${LOG_DIR}/${target}.ERR ; then - : $(( ERR_CNT += 1 )) - ERR_LIST="${ERR_LIST} $target" - else - : $(( WRN_CNT += 1 )) - WRN_LIST="${WRN_LIST} $target" - fi - else - rm ${LOG_DIR}/${target}.ERR - fi - fi - - [ -e "${LOG_DIR}/${target}.ERR" ] && cat "${LOG_DIR}/${target}.ERR" - - touch "${donep}${build_idx}" -} - -manage_builds() { - search_idx=${OLDEST_IDX} - if [ "$ONLY_LIST" == 'y' ] ; then return ; fi - - while true; do - if [ -e "${donep}${search_idx}" ] ; then - : $(( CURRENT_CNT-- )) - [ ${OLDEST_IDX} -eq ${search_idx} ] && - : $(( OLDEST_IDX++ )) - - # Only want to count it once - rm -f "${donep}${search_idx}" - touch "${skipp}${search_idx}" - elif [ -e "${skipp}${search_idx}" ] ; then - [ ${OLDEST_IDX} -eq ${search_idx} ] && - : $(( OLDEST_IDX++ )) - fi - : $(( search_idx++ )) - if [ ${search_idx} -gt ${TOTAL_CNT} ] ; then - if [ ${CURRENT_CNT} -ge ${BUILD_NBUILDS} ] ; then - search_idx=${OLDEST_IDX} - sleep 1 - else - break - fi - fi - done -} - -build_targets() { - for t in "$@" ; do - # If a LIST_xxx var exists, use it. But avoid variable - # expansion in the eval when a board name contains certain - # characters that the shell interprets. - case ${t} in - *[-+=]*) list= ;; - *) list=$(eval echo '${LIST_'$t'}') ;; - esac - if [ -n "${list}" ] ; then - build_targets ${list} - else - : $((TOTAL_CNT += 1)) - : $((CURRENT_CNT += 1)) - rm -f "${donep}${TOTAL_CNT}" - rm -f "${skipp}${TOTAL_CNT}" - if [ "$CONTINUE" = 'y' -a -e ${LOG_DIR}/$t.MAKELOG ] ; then - : $((SKIP_CNT += 1)) - touch "${donep}${TOTAL_CNT}" - elif [ "$REBUILD_ERRORS" = 'y' -a ! -e ${LOG_DIR}/$t.ERR ] ; then - : $((SKIP_CNT += 1)) - touch "${donep}${TOTAL_CNT}" - else - if [ $BUILD_MANY == 1 ] ; then - build_target ${t} ${TOTAL_CNT} & - else - CUR_TGT="${t}" - build_target ${t} ${TOTAL_CNT} - CUR_TGT='' - fi - fi - fi - - # We maintain a running count of all the builds we have done. - # Each finished build will have a file called ${donep}${n}, - # where n is the index of the build. Each build - # we've already noted as finished will have ${skipp}${n}. - # We track the current index via TOTAL_CNT, and the oldest - # index. When we exceed the maximum number of parallel builds, - # We look from oldest to current for builds that have completed, - # and update the current count and oldest index as appropriate. - # If we've gone through the entire list, wait a second, and - # reprocess the entire list until we find a build that has - # completed - if [ ${CURRENT_CNT} -ge ${BUILD_NBUILDS} ] ; then - manage_builds - fi - done -} - -#----------------------------------------------------------------------- - -kill_children() { - local OS=$(uname -s) - local children="" - case "${OS}" in - "Darwin") - # Mac OS X is known to have BSD style ps - local pgid=$(ps -p $$ -o pgid | sed -e "/PGID/d") - children=$(ps -g $pgid -o pid | sed -e "/PID|$$|$pgid/d") - ;; - *) - # everything else tries the GNU style - local pgid=$(ps -p $$ --no-headers -o "%r" | tr -d ' ') - children=$(pgrep -g $pgid | sed -e "/$$|$pgid/d") - ;; - esac - - kill $children 2> /dev/null - wait $children 2> /dev/null - - exit -} - -print_stats() { - if [ "$ONLY_LIST" == 'y' ] ; then return ; fi - - # Only count boards that completed - : $((TOTAL_CNT = `find ${skipp}* 2> /dev/null | wc -l`)) - - rm -f ${donep}* ${skipp}* - - if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then - ERR_LIST=`grep -riwl error ${OUTPUT_PREFIX}/ERR/` - ERR_LIST=`for f in $ERR_LIST ; do echo -n " $(basename $f)" ; done` - ERR_CNT=`echo $ERR_LIST | wc -w | awk '{print $1}'` - WRN_LIST=`grep -riwL error ${OUTPUT_PREFIX}/ERR/` - WRN_LIST=`for f in $WRN_LIST ; do echo -n " $(basename $f)" ; done` - WRN_CNT=`echo $WRN_LIST | wc -w | awk '{print $1}'` - else - # Remove the logs for any board that was interrupted - rm -f ${LOG_DIR}/${CUR_TGT}.MAKELOG ${LOG_DIR}/${CUR_TGT}.ERR - fi - - : $((TOTAL_CNT -= ${SKIP_CNT})) - echo "" - echo "--------------------- SUMMARY ----------------------------" - if [ "$CONTINUE" = 'y' -o "$REBUILD_ERRORS" = 'y' ] ; then - echo "Boards skipped: ${SKIP_CNT}" - fi - echo "Boards compiled: ${TOTAL_CNT}" - if [ ${ERR_CNT} -gt 0 ] ; then - echo "Boards with errors: ${ERR_CNT} (${ERR_LIST} )" - fi - if [ ${WRN_CNT} -gt 0 ] ; then - echo "Boards with warnings but no errors: ${WRN_CNT} (${WRN_LIST} )" - fi - echo "----------------------------------------------------------" - - if [ $BUILD_MANY == 1 ] ; then - kill_children - fi - - deprecation - - exit $RC -} - -#----------------------------------------------------------------------- - -# Build target groups selected by options, plus any command line args -set -- ${SELECTED} "$@" -# run PowerPC by default -[ $# = 0 ] && set -- powerpc -build_targets "$@" -wait

It is confusing to mention MAKEALL when it is not the normal way of building U-Boot anymore. Update the documentation to suit.

Signed-off-by: Simon Glass sjg@chromium.org ---

README | 35 ++++++----------------------------- board/Barix/ipam390/README.ipam390 | 12 ++++++------ doc/README.sha1 | 5 +++-- 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/README b/README index 26d5ad2..704a370 100644 --- a/README +++ b/README @@ -2753,7 +2753,7 @@ CBFS (Coreboot Filesystem) support with a special header) as build targets. By defining CONFIG_BUILD_TARGET in the SoC / board header, this special image will be automatically built upon calling - make / MAKEALL. + make / buildman.

CONFIG_IDENT_STRING

@@ -5078,33 +5078,10 @@ official or latest in the git repository) version of U-Boot sources. But before you submit such a patch, please verify that your modifi- cation did not break existing code. At least make sure that *ALL* of the supported boards compile WITHOUT ANY compiler warnings. To do so, -just run the "MAKEALL" script, which will configure and build U-Boot -for ALL supported system. Be warned, this will take a while. You can -select which (cross) compiler to use by passing a `CROSS_COMPILE' -environment variable to the script, i. e. to use the ELDK cross tools -you can type - - CROSS_COMPILE=ppc_8xx- MAKEALL - -or to build on a native PowerPC system you can type - - CROSS_COMPILE=' ' MAKEALL - -When using the MAKEALL script, the default behaviour is to build -U-Boot in the source directory. This location can be changed by -setting the BUILD_DIR environment variable. Also, for each target -built, the MAKEALL script saves two log files (<target>.ERR and -<target>.MAKEALL) in the <source dir>/LOG directory. This default -location can be changed by setting the MAKEALL_LOGDIR environment -variable. For example: - - export BUILD_DIR=/tmp/build - export MAKEALL_LOGDIR=/tmp/log - CROSS_COMPILE=ppc_8xx- MAKEALL - -With the above settings build objects are saved in the /tmp/build, -log files are saved in the /tmp/log and the source tree remains clean -during the whole build process. +just run the buildman script (tools/buildman/buildman), which will +configure and build U-Boot for ALL supported system. Be warned, this +will take a while. Please see the buildman README, or run 'buildman -H' +for documentation.

See also "U-Boot Porting Guide" below. @@ -6560,7 +6537,7 @@ it:

Notes:

-* Before sending the patch, run the MAKEALL script on your patched +* Before sending the patch, run the buildman script on your patched source tree and make sure that no errors or warnings are reported for any of the boards.

diff --git a/board/Barix/ipam390/README.ipam390 b/board/Barix/ipam390/README.ipam390 index 5c45fca..be09280 100644 --- a/board/Barix/ipam390/README.ipam390 +++ b/board/Barix/ipam390/README.ipam390 @@ -31,9 +31,9 @@ loading the next image from a different media, etc).

Compilation =========== -run "./MAKEALL ipam390" in the u-boot source tree. -Once this build completes you will have a u-boot.ais file that needs to -be written to the nand flash. +run "tools/buildman/buildman -k ipam390" in the u-boot source tree. +Once this build completes you will have a ../current/ipam390/u-boot.ais file +that needs to be written to the nand flash.

Flashing the images to NAND ========================== @@ -71,13 +71,13 @@ here[1] to create an uboot-uart-ais.bin file - cd to the u-boot source tree

- compile the u-boot for the ipam390 board: -$ ./MAKEALL ipam390 +$ tools/buildman/buildman -k ipam390

-> Now we shall have u-boot.bin

- Create u-boot-uart-ais.bin -$ mono HexAIS_OMAP-L138.exe -entrypoint 0xC1080000 -ini -ipam390-ais-uart.cfg -o ./uboot-uart-ais.bin ./u-boot.bin@0xC1080000; +$ mono HexAIS_OMAP-L138.exe -entrypoint 0xC1080000 -ini ipam390-ais-uart.cfg \ + -o ../current/ipam390/uboot-uart-ais.bin ./u-boot.bin@0xC1080000;

Note: The ipam390-ais-uart.cfg is found in the board directory for the ipam390 board, u-boot:/board/Barix/ipam390/ipam390-ais-uart.cfg diff --git a/doc/README.sha1 b/doc/README.sha1 index f6cca40..f178f37 100644 --- a/doc/README.sha1 +++ b/doc/README.sha1 @@ -51,7 +51,8 @@ c) now calculate the SHA1 sum from the memoryrange and write

Now you have a U-Boot-Image for the pcs440ep board with the correct SHA1 sum.

-If you do a "./MAKEALL pcs440ep" or a "make all" to get the U-Boot image, -the correct SHA1 sum will be automagically included in the U-Boot image. +If you do a "buildman -k pcs440ep" or a "make all" to get the U-Boot image, +which will be found in ../current/ipam390/ - the correct SHA1 sum will be +automagically included in the U-Boot image.

Heiko Schocher, 11 Jul 2007