Skip to content

Commit 353dfa1

Browse files
dhsu-nordiccarlescufi
authored andcommitted
nrf: scripts: runners: Fix multi-core flashing for nRF7120
- Add nRF7120 reset coordination to soc.yml. - Add support for both CONFIG_SOC_NRF7120_ENGA_CPUAPP and CONFIG_SOC_NRF7120_ENGA_CPUFLPR in _get_core() detection. - Fix constructor parameter bug in nrf_common_next.py to allow West's reset coordination framework to function properly. Signed-off-by: Dhanoo Surasarang <[email protected]>
1 parent f9a6fdc commit 353dfa1

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

scripts/runners/nrf_common_next.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
2525
self.family = family # Required to silence git complience checks
2626

2727
super().__init__(cfg, family, softreset, pinreset, dev_id, erase=False,
28-
erase_mode=None, ext_erase_mode=None, reset=True,
29-
tool_opt=None, force=False, recover=False)
28+
erase_mode=None, ext_erase_mode=None, reset=reset,
29+
tool_opt=None, force=False, recover=False)
3030

3131
@classmethod
3232
def do_add_parser(cls, parser):
@@ -78,7 +78,8 @@ def ensure_family(self):
7878

7979
def _get_core(self):
8080
if self.family in ('nrf54h', 'nrf71', 'nrf92'):
81-
if self.build_conf.getboolean('CONFIG_SOC_NRF7120_ENGA_CPUAPP'):
81+
if (self.build_conf.getboolean('CONFIG_SOC_NRF7120_ENGA_CPUAPP') or
82+
self.build_conf.getboolean('CONFIG_SOC_NRF7120_ENGA_CPUFLPR')):
8283
return 'Application'
8384
raise RuntimeError(f'Core not found for family: {self.family}')
8485
return None

soc/nordic/soc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ runners:
5050
- qualifiers:
5151
- nrf54ls05b/cpuapp
5252
'--reset':
53+
- runners:
54+
- nrfutil_next
55+
run: last
56+
groups:
57+
- qualifiers:
58+
- nrf7120/cpuapp
59+
- nrf7120/cpuflpr
5360
- runners:
5461
- nrfutil
5562
run: last

0 commit comments

Comments
 (0)