michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: runners: nrf: Default to soft reset for the nRF52 series

Browse source 
The Nordic nRF52 series have a peculiarity that is not shared with any
other Nordic families of SoCs: the reset pin can be reconfigured as a
regular GPIO. This has an unintended consequence: if the user has
reconfigured the pin in Devicetree to be a GPIO, `west flash` will
override that and configure the IC to use it as a reset pin, and the
firmware at boot won't be able to switch it back to GPIO, because that
requires a UICR erase. This behavior is very confusing to users, because
the GPIO does not work at all, since it is now just a reset line.

With this patch, `west flash` defaults to using soft reset instead of
pin reset for the nRF52 family of devices, to avoid overwriting the
reset pin configuration that the user includes in the image.

In order to be able to continue to use pin reset for users that so
desire it, a new option `--pinreset` is added that forces the use of pin
reset. The existing `--softreset` option is left exactly as it was, but
it is now applicable only to families other than the nRF52.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2025-01-30 18:55:00 +01:00 • committed by Benjamin Cabé
commit 17a671ca00
5 changed files with 81 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/releases/migration-guide-4.1.rst
View file

@ -50,6 +50,10 @@ Boards
the required configuration by using ``mikroe_weather_click_i2c`` or ``mikroe_weather_click_spi``
instead of ``mikroe_weather_click``.
* All nRF52-based boards will now default to soft (system) reset
instead of pin reset when flashing with ``west flash``. If you want to keep
using pin reset on the nRF52 family of ICs you can use ``west flash --pinreset``.
Devicetree
**********

29
scripts/west_commands/runners/nrf_common.py
View file

@ -78,13 +78,14 @@ def _get_suit_starter():
class NrfBinaryRunner(ZephyrBinaryRunner):
'''Runner front-end base class for nrf tools.'''
def __init__(self, cfg, family, softreset, dev_id, erase=False,
def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
reset=True, tool_opt=None, force=False, recover=False):
super().__init__(cfg)
self.hex_ = cfg.hex_file
# The old --nrf-family options takes upper-case family names
self.family = family.lower() if family else None
self.softreset = softreset
self.pinreset = pinreset
self.dev_id = dev_id
self.erase = bool(erase)
self.reset = bool(reset)
@ -117,9 +118,14 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
'NRF54H', 'NRF91', 'NRF92'],
help='''MCU family; still accepted for
compatibility only''')
# Not using a mutual exclusive group for softreset and pinreset due to
# the way dump_runner_option_help() works in run_common.py
parser.add_argument('--softreset', required=False,
action='store_true',
help='use reset instead of pinreset')
help='use softreset instead of pinreset')
parser.add_argument('--pinreset', required=False,
action='store_true',
help='use pinreset instead of softreset')
parser.add_argument('--snr', required=False, dest='dev_id',
help='obsolete synonym for -i/--dev-id')
parser.add_argument('--force', required=False,
@ -412,13 +418,18 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
def reset_target(self):
if self.family == 'nrf52' and not self.softreset:
# Default to soft reset on nRF52 only, because ICs in these series can
# reconfigure the reset pin as a regular GPIO
default = "RESET_SYSTEM" if self.family == 'nrf52' else "RESET_PIN"
kind = ("RESET_SYSTEM" if self.softreset else "RESET_PIN" if
self.pinreset else default)
if self.family == 'nrf52' and kind == "RESET_PIN":
# Write to the UICR enabling nRESET in the corresponding pin
self.exec_op('pinreset-enable')
if self.softreset:
self.exec_op('reset', kind="RESET_SYSTEM")
else:
self.exec_op('reset', kind="RESET_PIN")
self.logger.debug(f'Reset kind: {kind}')
self.exec_op('reset', kind=kind)
@abc.abstractmethod
def do_require(self):
@ -488,6 +499,10 @@ class NrfBinaryRunner(ZephyrBinaryRunner):
def do_run(self, command, **kwargs):
self.do_require()
if self.softreset and self.pinreset:
raise RuntimeError('Options --softreset and --pinreset are mutually '
'exclusive.')
self.ensure_output('hex')
if IntelHex is None:
raise RuntimeError('Python dependency intelhex was missing; '

6
scripts/west_commands/runners/nrfjprog.py
View file

@ -17,11 +17,11 @@ VerifyError = 55
class NrfJprogBinaryRunner(NrfBinaryRunner):
'''Runner front-end for nrfjprog.'''
def __init__(self, cfg, family, softreset, dev_id, erase=False,
def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
reset=True, tool_opt=None, force=False, recover=False,
qspi_ini=None):
super().__init__(cfg, family, softreset, dev_id, erase, reset,
super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
tool_opt, force, recover)
self.qspi_ini = qspi_ini
@ -37,7 +37,7 @@ class NrfJprogBinaryRunner(NrfBinaryRunner):
@classmethod
def do_create(cls, cfg, args):
return NrfJprogBinaryRunner(cfg, args.nrf_family, args.softreset,
args.dev_id, erase=args.erase,
args.pinreset, args.dev_id, erase=args.erase,
reset=args.reset,
tool_opt=args.tool_opt, force=args.force,
recover=args.recover, qspi_ini=args.qspi_ini)

6
scripts/west_commands/runners/nrfutil.py
View file

@ -16,11 +16,11 @@ from runners.nrf_common import NrfBinaryRunner
class NrfUtilBinaryRunner(NrfBinaryRunner):
'''Runner front-end for nrfutil.'''
def __init__(self, cfg, family, softreset, dev_id, erase=False,
def __init__(self, cfg, family, softreset, pinreset, dev_id, erase=False,
reset=True, tool_opt=None, force=False, recover=False,
suit_starter=False):
super().__init__(cfg, family, softreset, dev_id, erase, reset,
super().__init__(cfg, family, softreset, pinreset, dev_id, erase, reset,
tool_opt, force, recover)
self.suit_starter = suit_starter
@ -39,7 +39,7 @@ class NrfUtilBinaryRunner(NrfBinaryRunner):
@classmethod
def do_create(cls, cfg, args):
return NrfUtilBinaryRunner(cfg, args.nrf_family, args.softreset,
args.dev_id, erase=args.erase,
args.pinreset, args.dev_id, erase=args.erase,
reset=args.reset,
tool_opt=args.tool_opt, force=args.force,
recover=args.recover,

93
scripts/west_commands/tests/test_nrf.py
View file

@ -56,6 +56,9 @@ class TC(typing.NamedTuple): # 'TestCase'
# Use --reset instead of --pinreset if True
softreset: bool
# Use --pinreset instead of --reset if True
pinreset: bool
# --snr TEST_OVR_SNR if True, --snr TEST_DEF_SNR if False
snr: bool
@ -72,46 +75,46 @@ EXPECTED_RESULTS = {
# -------------------------------------------------------------------------
# NRF51
#
# family CP recov soft snr erase tool_opt
TC('nrf51', None, False, False, False, False, False):
# family CP recov soft pin snr erase tool_opt
TC('nrf51', None, False, False, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf51', None, False, False, False, True, False):
TC('nrf51', None, False, False, False, False, True, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf51', None, False, False, True, False, False):
TC('nrf51', None, False, False, True, True, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf51', None, False, True, False, False, False):
TC('nrf51', None, False, True, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf51', None, True, False, False, False, False):
TC('nrf51', None, True, False, True, False, False, False):
((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_DEF_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF51',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF51', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf51', None, True, True, True, True, False):
TC('nrf51', None, True, True, False, True, True, False):
((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--reset', '-f', 'NRF51', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf51', None, True, True, True, True, True):
TC('nrf51', None, True, True, False, True, True, True):
((['nrfjprog', '--recover', '-f', 'NRF51', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF51',
'--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@ -121,35 +124,33 @@ EXPECTED_RESULTS = {
# -------------------------------------------------------------------------
# NRF52
#
# family CP recov soft snr erase tool_opt
TC('nrf52', None, False, False, False, False, False):
# family CP recov soft pin snr erase tool_opt
TC('nrf52', None, False, False, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
'--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf52', None, False, False, False, True, False):
TC('nrf52', None, False, False, True, False, True, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf52', None, False, False, True, False, False):
TC('nrf52', None, False, False, False, True, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
'--verify', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
['nrfjprog', '--pinresetenable', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf52', None, False, True, False, False, False):
TC('nrf52', None, False, True, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
'--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf52', None, True, False, False, False, False):
TC('nrf52', None, True, False, True, False, False, False):
((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--sectoranduicrerase',
'--verify', '-f', 'NRF52', '--snr', TEST_DEF_SNR],
@ -157,14 +158,14 @@ EXPECTED_RESULTS = {
['nrfjprog', '--pinreset', '-f', 'NRF52', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf52', None, True, True, True, True, False):
TC('nrf52', None, True, True, False, True, True, False):
((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--reset', '-f', 'NRF52', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf52', None, True, True, True, True, True):
TC('nrf52', None, True, True, False, True, True, True):
((['nrfjprog', '--recover', '-f', 'NRF52', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF52',
'--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@ -174,32 +175,32 @@ EXPECTED_RESULTS = {
# -------------------------------------------------------------------------
# NRF53 APP
#
# family CP recov soft snr erase tool_opt
TC('nrf53', 'APP', False, False, False, False, False):
# family CP recov soft pin snr erase tool_opt
TC('nrf53', 'APP', False, False, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'APP', False, False, False, True, False):
TC('nrf53', 'APP', False, False, True, False, True, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'APP', False, False, True, False, False):
TC('nrf53', 'APP', False, False, False, True, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_OVR_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf53', 'APP', False, True, False, False, False):
TC('nrf53', 'APP', False, True, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_APPLICATION', '--snr', TEST_DEF_SNR],
['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'APP', True, False, False, False, False):
TC('nrf53', 'APP', True, False, True, False, False, False):
((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@ -208,7 +209,7 @@ EXPECTED_RESULTS = {
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'APP', True, True, True, True, False):
TC('nrf53', 'APP', True, True, False, True, True, False):
((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@ -220,32 +221,32 @@ EXPECTED_RESULTS = {
# -------------------------------------------------------------------------
# NRF53 NET
#
# family CP recov soft snr erase tool_opt
TC('nrf53', 'NET', False, False, False, False, False):
# family CP recov soft pin snr erase tool_opt
TC('nrf53', 'NET', False, False, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'NET', False, False, False, True, False):
TC('nrf53', 'NET', False, False, True, False, True, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'NET', False, False, True, False, False):
TC('nrf53', 'NET', False, False, False, True, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_OVR_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf53', 'NET', False, True, False, False, False):
TC('nrf53', 'NET', False, True, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase',
'--verify', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK', '--snr', TEST_DEF_SNR],
['nrfjprog', '--reset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'NET', True, False, False, False, False):
TC('nrf53', 'NET', True, False, True, False, False, False):
((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_DEF_SNR],
@ -254,7 +255,7 @@ EXPECTED_RESULTS = {
['nrfjprog', '--pinreset', '-f', 'NRF53', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf53', 'NET', True, True, True, True, False):
TC('nrf53', 'NET', True, True, False, True, True, False):
((['nrfjprog', '--recover', '-f', 'NRF53', '--coprocessor', 'CP_NETWORK',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--recover', '-f', 'NRF53', '--snr', TEST_OVR_SNR],
@ -266,46 +267,46 @@ EXPECTED_RESULTS = {
# -------------------------------------------------------------------------
# NRF91
#
# family CP recov soft snr erase tool_opt
TC('nrf91', None, False, False, False, False, False):
# family CP recov soft pin snr erase tool_opt
TC('nrf91', None, False, False, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf91', None, False, False, False, True, False):
TC('nrf91', None, False, False, True, False, True, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf91', None, False, False, True, False, False):
TC('nrf91', None, False, False, False, True, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf91', None, False, True, False, False, False):
TC('nrf91', None, False, True, False, False, False, False):
((['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf91', None, True, False, False, False, False):
TC('nrf91', None, True, False, True, False, False, False):
((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_DEF_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--sectorerase', '--verify', '-f', 'NRF91',
'--snr', TEST_DEF_SNR],
['nrfjprog', '--pinreset', '-f', 'NRF91', '--snr', TEST_DEF_SNR]),
(TEST_DEF_SNR, None)),
TC('nrf91', None, True, True, True, True, False):
TC('nrf91', None, True, True, False, True, True, False):
((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR],
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
'--snr', TEST_OVR_SNR],
['nrfjprog', '--reset', '-f', 'NRF91', '--snr', TEST_OVR_SNR]),
(TEST_OVR_SNR, None)),
TC('nrf91', None, True, True, True, True, True):
TC('nrf91', None, True, True, False, True, True, True):
((['nrfjprog', '--recover', '-f', 'NRF91', '--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
['nrfjprog', '--program', RC_KERNEL_HEX, '--chiperase', '--verify', '-f', 'NRF91',
'--snr', TEST_OVR_SNR] + TEST_TOOL_OPT_L,
@ -341,13 +342,14 @@ def id_fn(test_case):
cp = ''
else:
cp = f'-{test_case.coprocessor}'
s = 'soft_reset' if test_case.softreset else 'pin_reset'
s = 'soft_reset' if test_case.softreset else 'no_soft_reset'
p = 'pin_reset' if test_case.pinreset else 'no_pin_reset'
sn = 'default_snr' if test_case.snr else 'override_snr'
e = 'chip_erase' if test_case.erase else 'sector[anduicr]_erase'
r = 'recover' if test_case.recover else 'no_recover'
t = 'tool_opt' if test_case.tool_opt else 'no_tool_opt'
return f'{test_case.family[:5]}{cp}-{s}-{sn}-{e}-{r}-{t}'
return f'{test_case.family[:5]}{cp}-{s}-{p}-{sn}-{e}-{r}-{t}'
def fix_up_runner_config(test_case, runner_config, tmpdir):
# Helper that adjusts the common runner_config fixture for our
@ -421,6 +423,7 @@ def test_init(check_call, popen, get_snr, require, tool, test_case,
runner = cls(runner_config,
test_case.family,
test_case.softreset,
test_case.pinreset,
snr,
erase=test_case.erase,
tool_opt=tool_opt,
@ -451,6 +454,8 @@ def test_create(check_call, popen, get_snr, require, tool, test_case,
args = []
if test_case.softreset:
args.append('--softreset')
if test_case.pinreset:
args.append('--pinreset')
if test_case.snr:
args.extend(['--dev-id', TEST_OVR_SNR])
if test_case.erase: