michaelh/zephyr
1
0
Fork 0
Code Releases Activity

west: runners: Do not ignore --no-reset in command line or arguments

Browse source 
Prevents this code section from enforcing reset even
if --no-reset was passed at some point

Signed-off-by: Camille BAUD <mail@massdriver.space>
This commit is contained in:
Camille BAUD 2025-03-14 20:07:15 +01:00 • committed by Benjamin Cabé
commit 9ad7f840bf
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/west_commands/run_common.py
View file

@ -411,11 +411,17 @@ def do_run_common_image(command, user_args, user_runner_args, used_cmds,
i = i - 1 i = i - 1
# Arguments in this order to allow specific to override general:
#
# - runner-specific runners.yaml arguments
# - user-provided command line arguments
final_argv = runners_yaml['args'][runner_name] + runner_args
# If flashing multiple images, the runner supports reset after flashing and # If flashing multiple images, the runner supports reset after flashing and
# the board has enabled this functionality, check if the board should be # the board has enabled this functionality, check if the board should be
# reset or not. If this is not specified in the board/soc file, leave it up to # reset or not. If this is not specified in the board/soc file, leave it up to
# the runner's default configuration to decide if a reset should occur. # the runner's default configuration to decide if a reset should occur.
if runner_cls.capabilities().reset: if runner_cls.capabilities().reset and '--no-reset' not in final_argv:
if board_image_count is not None: if board_image_count is not None:
reset = True reset = True
@ -449,15 +455,9 @@ def do_run_common_image(command, user_args, user_runner_args, used_cmds,
break break
if reset: if reset:
runner_args.append('--reset') final_argv.append('--reset')
else: else:
runner_args.append('--no-reset') final_argv.append('--no-reset')
# Arguments in this order to allow specific to override general:
#
# - runner-specific runners.yaml arguments
# - user-provided command line arguments
final_argv = runners_yaml['args'][runner_name] + runner_args
# 'user_args' contains parsed arguments which are: # 'user_args' contains parsed arguments which are:
# #