Skip to content

Populating boardstore bugfix #7

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.

Sign up for GitHub

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
skalade wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Populating boardstore bugfix #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions pynqutils/build_utils/boardstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ def resolve_paths(board_dir)->dict:
Returns a dict of absolute paths to all board.xml files
in a board folder, indexed by version numbers
'''
version_dict = {}
board_xmls = find_xml('board.xml', board_dir)
if not board_xmls:
return {}

version_dict = {}
for xml in board_xmls:
version_dict[os.path.normpath(xml).split(os.path.sep)[-2]] = xml

Expand Down Expand Up @@ -80,7 +83,8 @@ def populate_boards(self, families=None, manufacturers=['Avnet', 'Digilent', 'TU
for manufacturer in os.listdir(os.path.join(self.repo_path,'boards')):
# print(f"-----------{manufacturer}-----------")
if manufacturer in manufacturers:
for board in os.listdir(os.path.join(self.repo_path,'boards',manufacturer)):
board_dir_path = os.path.join(self.repo_path, 'boards', manufacturer)
for board in [b for b in os.listdir(board_dir_path) if os.path.isdir(os.path.join(board_dir_path, b))]:
board_holder = Board(os.path.join(self.repo_path,'boards',manufacturer,board))
board_family = board_holder.find_family()
if families == None:
Expand Down Expand Up @@ -210,6 +214,8 @@ def find_family(self)->str:
return 'ZynqRFSoC'
else:
return 'ZynqUltraScale'
elif any(['mpsoc_preset' in child.attrib['preset_proc_name'] for child in preset_root]):
return 'ZynqUltraScale'
elif any([child.attrib['preset_proc_name'] == 'ps7_preset' for child in preset_root]):
return 'Zynq7000'
elif any([any([subchild.attrib['name'] == 'versal_cips' for subchild in child]) for child in preset_root]):
Expand Down