Skip to content

Commit

Permalink
[nrf fromlist] scripts: list_hardware: Do not check qualifiers for ru…
Browse files Browse the repository at this point in the history
…n once config

Upstream PR: zephyrproject-rtos/zephyr#72857

Removes validating the qualifiers for flash run once configuration
as files may be present that contain information for qualifiers
that are not present in a single repository but are spaced out in
other repositories, or might be optional

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit b72acf47e550090878fa87145c9766504c3deb13)
(cherry picked from commit 973e62f)
  • Loading branch information
nordicjm authored and rlubos committed Oct 22, 2024
1 parent 59371c3 commit 4f0db94
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions scripts/list_hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,13 @@ def __init__(self, folder='', soc_yaml=None):
for item_data in data['runners']['run_once'][grp]:
for group in item_data['groups']:
for qualifiers in group['qualifiers']:
soc_name, *components = qualifiers.split('/')
soc_name = qualifiers.split('/')[0]
found_match = False

# Allow 'ns' as final qualifier until "virtual" CPUs are ported to soc.yml
# https://github.com/zephyrproject-rtos/zephyr/issues/70721
if components and components[-1] == 'ns':
components.pop()

for soc in self._socs + self._extended_socs:
if re.match(fr'^{soc_name}$', soc.name) is not None:
if soc.cpuclusters and components:
check_string = '/'.join(components)
for cpucluster in soc.cpuclusters:
if re.match(fr'^{check_string}$', cpucluster) is not None:
found_match = True
break
elif not soc.cpuclusters and not components:
found_match = True
break
found_match = True
break

if found_match is False:
sys.exit(f'ERROR: SoC qualifier match unresolved: {qualifiers}')
Expand Down

0 comments on commit 4f0db94

Please sign in to comment.