Skip to content

scripts: sort boards alphabetically #89483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/_extensions/zephyr/kconfig/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def kconfig_load(app: Sphinx) -> tuple[kconfiglib.Kconfig, dict[str, str]]:
root_args = argparse.Namespace(**{'board_roots': [Path(ZEPHYR_BASE)],
'soc_roots': [Path(ZEPHYR_BASE)], 'board': None,
'board_dir': []})
v2_boards = list_boards.find_v2_boards(root_args).values()
v2_boards = list_boards.find_v2_boards(root_args)

with open(Path(td) / "boards" / "Kconfig.boards", "w") as f:
for board in v2_boards:
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/check_compliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
root_args = argparse.Namespace(**{'board_roots': board_roots,
'soc_roots': soc_roots, 'board': None,
'board_dir': []})
v2_boards = list_boards.find_v2_boards(root_args).values()
v2_boards = list_boards.find_v2_boards(root_args)

with open(kconfig_defconfig_file, 'w') as fp:
for board in v2_boards:
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/test_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def find_boards(self):
# Look for boards in monitored repositories
lb_args = argparse.Namespace(**{'arch_roots': roots, 'board_roots': roots, 'board': None, 'soc_roots':roots,
'board_dir': None})
known_boards = list_boards.find_v2_boards(lb_args).values()
known_boards = list_boards.find_v2_boards(lb_args)

for changed in changed_boards:
for board in known_boards:
Expand Down
4 changes: 2 additions & 2 deletions scripts/list_boards.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def find_v2_boards(args):
board_extensions.extend(e)

extend_v2_boards(boards, board_extensions)
return boards
return sorted(boards.values(), key=lambda board: board.name)


def parse_args():
Expand Down Expand Up @@ -415,7 +415,7 @@ def board_v2_qualifiers_csv(board):
def dump_v2_boards(args):
boards = find_v2_boards(args)

for b in boards.values():
for b in boards:
qualifiers_list = board_v2_qualifiers(b)
if args.cmakeformat is not None:
notfound = lambda x: x or 'NOTFOUND'
Expand Down
2 changes: 1 addition & 1 deletion scripts/pylib/twister/twisterlib/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def generate_platforms(board_roots, soc_roots, arch_roots):
lb_args = Namespace(board_roots=board_roots, soc_roots=soc_roots, arch_roots=arch_roots,
board=None, board_dir=None)

for board in list_boards.find_v2_boards(lb_args).values():
for board in list_boards.find_v2_boards(lb_args):
for board_dir in board.directories:
if board_dir in dir2data:
# don't load the same board data twice
Expand Down
2 changes: 1 addition & 1 deletion scripts/west_commands/boards.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def do_run(self, args, _):
revisions=revisions_list,
dir=board.dir, hwm=board.hwm, qualifiers=''))

for board in list_boards.find_v2_boards(args).values():
for board in list_boards.find_v2_boards(args):
if name_re is not None and not name_re.search(board.name):
continue

Expand Down
Loading