michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: runners: make $BOARD_DIR/support/openocd.cfg optional

Browse source 
I'd like to support nRF boards in a more generic way, so make it
optional. We can clean up the STM32 files later if there's a lot of
overlap in their .cfg files.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2019-11-01 15:23:52 +01:00 • committed by Kumar Gala
commit 23a5bcc7cc
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/west_commands/runners/openocd.py
View file

@ -25,11 +25,11 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
gdb_port=DEFAULT_OPENOCD_GDB_PORT):
super(OpenOcdBinaryRunner, self).__init__(cfg)
if config is not None:
self.openocd_config = config
else:
self.openocd_config = path.join(cfg.board_dir, 'support',
'openocd.cfg')
if not config:
default = path.join(cfg.board_dir, 'support', 'openocd.cfg')
if path.exists(default):
config = default
self.openocd_config = config
search_args = []
if cfg.openocd_search is not None:
@ -93,6 +93,11 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
def do_run(self, command, **kwargs):
self.require(self.openocd_cmd[0])
self.cfg_cmd = []
if self.openocd_config is not None:
self.cfg_cmd = ['-f', self.openocd_config]
if command == 'flash':
self.do_flash(**kwargs)
elif command == 'debug':
@ -124,7 +129,7 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
self.logger.info('Flashing file: {}'.format(self.hex_name))
cmd = (self.openocd_cmd +
['-f', self.openocd_config] +
self.cfg_cmd +
pre_init_cmd +
['-c', 'init',
'-c', 'targets'] +
@ -145,8 +150,8 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
raise ValueError('Cannot debug; no .elf specified')
server_cmd = (self.openocd_cmd +
['-f', self.openocd_config,
'-c', 'tcl_port {}'.format(self.tcl_port),
self.cfg_cmd +
['-c', 'tcl_port {}'.format(self.tcl_port),
'-c', 'telnet_port {}'.format(self.telnet_port),
'-c', 'gdb_port {}'.format(self.gdb_port),
'-c', 'init',
@ -160,8 +165,8 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
def do_debugserver(self, **kwargs):
cmd = (self.openocd_cmd +
['-f', self.openocd_config,
'-c', 'init',
self.cfg_cmd +
['-c', 'init',
'-c', 'targets',
'-c', 'reset halt'])
self.check_call(cmd)