GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 01:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildman: Drop the -a option

Browse source 
There is no point in setting the ARCH environment variable since the
U-Boot build system no-longer uses it.

It seems safe to drop this feature since it was only recently added.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2020-03-18 09:42:47 -06:00 • committed by Tom Rini
parent b2d89bc538
commit 4e9162d519
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/buildman/README
View file

@ -1072,8 +1072,8 @@ Other options
Buildman has various other command-line options. Try --help to see them. Buildman has various other command-line options. Try --help to see them.
To find out what architecture or toolchain prefix buildman will use for a build, To find out what toolchain prefix buildman will use for a build, use the -A
see the -a and -A options. option.
To request that compiler warnings be promoted to errors, use -E. This passes the To request that compiler warnings be promoted to errors, use -E. This passes the
-Werror flag to the compiler. Note that the build can still produce warnings -Werror flag to the compiler. Note that the build can still produce warnings

2
tools/buildman/cmdline.py
View file

@ -13,8 +13,6 @@ def ParseArgs():
args: command lin arguments args: command lin arguments
""" """
parser = OptionParser() parser = OptionParser()
parser.add_option('-a', '--print-arch', action='store_true',
help='Print the architecture for a board (ARCH=)')
parser.add_option('-A', '--print-prefix', action='store_true', parser.add_option('-A', '--print-prefix', action='store_true',
help='Print the tool-chain prefix for a board (CROSS_COMPILE=)') help='Print the tool-chain prefix for a board (CROSS_COMPILE=)')
parser.add_option('-b', '--branch', type='string', parser.add_option('-b', '--branch', type='string',

15
tools/buildman/control.py
View file

@ -85,16 +85,15 @@ def ShowActions(series, why_selected, boards_selected, builder, options,
for warning in board_warnings: for warning in board_warnings:
print(col.Color(col.YELLOW, warning)) print(col.Color(col.YELLOW, warning))
def ShowToolchainInfo(boards, toolchains, print_arch, print_prefix): def ShowToolchainPrefix(boards, toolchains):
"""Show information about a the tool chain used by one or more boards """Show information about a the tool chain used by one or more boards
The function checks that all boards use the same toolchain. The function checks that all boards use the same toolchain, then prints
the correct value for CROSS_COMPILE.
Args: Args:
boards: Boards object containing selected boards boards: Boards object containing selected boards
toolchains: Toolchains object containing available toolchains toolchains: Toolchains object containing available toolchains
print_arch: True to print ARCH value
print_prefix: True to print CROSS_COMPILE value
Return: Return:
None on success, string error message otherwise None on success, string error message otherwise
@ -107,9 +106,6 @@ def ShowToolchainInfo(boards, toolchains, print_arch, print_prefix):
return 'Supplied boards must share one toolchain' return 'Supplied boards must share one toolchain'
return False return False
tc = tc_set.pop() tc = tc_set.pop()
if print_arch:
print(tc.GetEnvArgs(toolchain.VAR_ARCH))
if print_prefix:
print(tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) print(tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE))
return None return None
@ -206,9 +202,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
if not len(selected): if not len(selected):
sys.exit(col.Color(col.RED, 'No matching boards found')) sys.exit(col.Color(col.RED, 'No matching boards found'))
if options.print_arch or options.print_prefix: if options.print_prefix:
err = ShowToolchainInfo(boards, toolchains, options.print_arch, err = ShowToolchainInfo(boards, toolchains)
options.print_prefix)
if err: if err:
sys.exit(col.Color(col.RED, err)) sys.exit(col.Color(col.RED, err))
return 0 return 0