Skip to content

Commit fef2e30

Browse files
committed
runners: openocd: Default to an actual executable when not configured
Whenever build/zephyr/runners.yaml does not specify the location of the openocd executable we seemd to be leaving the executable variable as None. Instead, use its executable name. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
1 parent cbf815e commit fef2e30

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/west_commands/runners/openocd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, cfg, pre_init=None, reset_halt_cmd=DEFAULT_OPENOCD_RESET_HALT
5858
if cfg.openocd_search is not None:
5959
for p in cfg.openocd_search:
6060
search_args.extend(['-s', p])
61-
self.openocd_cmd = [cfg.openocd] + search_args
61+
self.openocd_cmd = [cfg.openocd or 'openocd'] + search_args
6262
# openocd doesn't cope with Windows path names, so convert
6363
# them to POSIX style just to be sure.
6464
self.elf_name = Path(cfg.elf_file).as_posix()

0 commit comments

Comments
 (0)