Skip to content

Commit d2701ba

Browse files
nordicjmrlubos
authored andcommitted
[nrf fromlist] scripts: list_hardware: Do not check qualifiers for run 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)
1 parent e401311 commit d2701ba

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

scripts/list_hardware.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,13 @@ def __init__(self, folder='', soc_yaml=None):
100100
for item_data in data['runners']['run_once'][grp]:
101101
for group in item_data['groups']:
102102
for qualifiers in group['qualifiers']:
103-
soc_name, *components = qualifiers.split('/')
103+
soc_name = qualifiers.split('/')[0]
104104
found_match = False
105105

106-
# Allow 'ns' as final qualifier until "virtual" CPUs are ported to soc.yml
107-
# https://github.com/zephyrproject-rtos/zephyr/issues/70721
108-
if components and components[-1] == 'ns':
109-
components.pop()
110-
111106
for soc in self._socs + self._extended_socs:
112107
if re.match(fr'^{soc_name}$', soc.name) is not None:
113-
if soc.cpuclusters and components:
114-
check_string = '/'.join(components)
115-
for cpucluster in soc.cpuclusters:
116-
if re.match(fr'^{check_string}$', cpucluster) is not None:
117-
found_match = True
118-
break
119-
elif not soc.cpuclusters and not components:
120-
found_match = True
121-
break
108+
found_match = True
109+
break
122110

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

0 commit comments

Comments
 (0)