From: Simon Glass <sjg@chromium.org> Provide a new -X option which uses any available .buildman files to augment the list of boards supported by U-Boot with 'extended boards', which consist of a base board with one or more config fragments. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/buildman/board.py | 8 +++- tools/buildman/boards.py | 94 ++++++++++++++++++++++++++++++++++++++- tools/buildman/cmdline.py | 2 + tools/buildman/control.py | 6 +++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/tools/buildman/board.py b/tools/buildman/board.py index 248d8bfff18..c061bf56039 100644 --- a/tools/buildman/board.py +++ b/tools/buildman/board.py @@ -6,7 +6,8 @@ class Board: """A particular board that we can build""" - def __init__(self, status, arch, cpu, soc, vendor, board_name, target, cfg_name): + def __init__(self, status, arch, cpu, soc, vendor, board_name, target, + cfg_name, extended=None, orig_target=None): """Create a new board type. Args: @@ -18,8 +19,11 @@ class Board: board_name: Name of board (e.g. integrator) target: Target name (use make <target>_defconfig to configure) cfg_name: Config-file name (in includes/configs/) + extended (boards.Extended): Extended board, if this board is one + orig_target (str): Name of target this extended board is based on """ self.target = target + self.status = status self.arch = arch self.cpu = cpu self.soc = soc @@ -29,3 +33,5 @@ class Board: self.props = [self.target, self.arch, self.cpu, self.board_name, self.vendor, self.soc, self.cfg_name] self.build_it = False + self.extended = extended + self.orig_target = orig_target diff --git a/tools/buildman/boards.py b/tools/buildman/boards.py index 99d9c5fb9bd..ce6cafe975e 100644 --- a/tools/buildman/boards.py +++ b/tools/buildman/boards.py @@ -19,6 +19,7 @@ import time from buildman import board from buildman import kconfiglib +import qconfig from u_boot_pylib import command from u_boot_pylib.terminal import print_clear, tprint from u_boot_pylib import tools @@ -906,6 +907,92 @@ class Boards: self.format_and_output(params_list, output) return not warnings + def parse_all_extended(self, dbase): + """Parse any .buildman files to find boards composed of fragments + + Args: + dbase (tuple): + set of all config options seen (each a str) + set of all defconfigs seen (each a str) + dict of configs for each defconfig: + key: defconfig name, e.g. "MPC8548CDS_legacy_defconfig" + value: dict: + key: CONFIG option + value: Value of option + dict of defconfigs for each config: + key: CONFIG option + value: set of boards using that option + """ + for fname in glob.glob('configs/*.buildman'): + self.parse_extended(dbase, fname) + + def find_by_target(self, target): + """Find a board given its target name + + Args: + target (str): Target string to search for + + Return: + Board: board found + + Raises: + ValueError: Board was not found + """ + for b in self._boards: + if b.target == target: + return b + raise ValueError(f"Board '{target}' not found") + + def parse_extended(self, dbase, fname): + """Parse a single 'extended' file""" + result = ExtendedParser.parse_file(fname) + for ext in result: + ext_boards = self.scan_extended(dbase, ext) + for name in ext_boards: + # Find the base board + brd = self.find_by_target(name) + newb = board.Board(brd.status, brd.arch, brd.cpu, brd.soc, + brd.vendor, brd.board_name, + f'{ext.name},{brd.target}', + brd.cfg_name, ext, brd.target) + + self.add_board(newb) + + def scan_extended(self, dbase, ext): + """Scan for extended boards""" + # First check the fragments + frags = [] + for frag in ext.fragments: + fname = os.path.join(f'configs/{frag}.config') + frags.append(tools.read_file(fname, binary=False)) + + # Now get a list of defconfigs (without the _defconfig suffix) + defconfigs = set() + cfg_list = [] + for first, val in ext.targets: + if first == 'regex': + pattern = f'configs/{val}' + fnames = glob.glob(pattern) + if not fnames: + print(f"'Warning: No configs matching '{pattern}'") + for fname in fnames: + m_cfg = re.match(r'^configs/(.*)_defconfig$', fname) + defconfigs.add(m_cfg.group(1)) + else: + if val == 'n': + cfg_list.append(f'~{first}') + elif val == 'y': + cfg_list.append(f'{first}') + else: + cfg_list.append(f'{first}={val}') + + # Search for boards with the given configs + boards = qconfig.find_config(dbase, cfg_list) + if defconfigs: + boards &= defconfigs + + return boards + class ExtendedParser: """Parser for extended-board (.buildman) files""" @@ -946,7 +1033,12 @@ class ExtendedParser: return parser.extended def parse(self, fname, data): - """Parse the file""" + """Parse the file + + Args: + fname (str): Filename to parse (used for error messages) + data (str): Contents of the file + """ self.start() for seq, line in enumerate(data.splitlines()): linenum = seq + 1 diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index e194712c37f..ad07e6cac39 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -173,6 +173,8 @@ def add_after_m(parser): parser.add_argument('-x', '--exclude', dest='exclude', type=str, action='append', help='Specify a list of boards to exclude, separated by comma') + parser.add_argument('-X', '--extend', action='store_true', + default=False, help='Include boards based on fragments (configs/*.buildman)') parser.add_argument('-y', '--filter-dtb-warnings', action='store_true', default=False, help='Filter out device-tree-compiler warnings from output') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 69ee4074273..01a618b989a 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -21,6 +21,7 @@ from buildman import cfgutil from buildman import toolchain from buildman.builder import Builder from patman import patchstream +import qconfig from u_boot_pylib import command from u_boot_pylib import gitutil from u_boot_pylib import terminal @@ -766,6 +767,11 @@ def do_buildman(args, toolchains=None, make_func=None, brds=None, if isinstance(brds, int): return brds + if args.extend: + dbase = qconfig.ensure_database( + args.threads or multiprocessing.cpu_count()) + brds.parse_all_extended(dbase) + selected, why_selected, board_warnings = determine_boards( brds, args.terms, col, args.boards, args.exclude) -- 2.43.0