patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

runner: linkerserver : remove the probe ID hardcode

Browse source 
linkserver is hardcoded to probe ID, now with #70343 merged
the probe ID restriction can be removed.

Signed-off-by: Hake Huang <hake.huang@oss.nxp.com>
This commit is contained in:
Hake Huang 2024-03-20 18:42:32 +08:00 committed by Fabio Baltieri
parent 353c6a66cb
commit f419ea7990
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/west_commands/runners/linkserver.py
View file

@ -25,7 +25,7 @@ class LinkServerBinaryRunner(ZephyrBinaryRunner):
def __init__(self, cfg, device, core, def __init__(self, cfg, device, core,
linkserver=DEFAULT_LINKSERVER_EXE, linkserver=DEFAULT_LINKSERVER_EXE,
dt_flash=True, erase=True, dt_flash=True, erase=True,
probe=1, probe='#1',
gdb_host='', gdb_host='',
gdb_port=DEFAULT_LINKSERVER_GDB_PORT, gdb_port=DEFAULT_LINKSERVER_GDB_PORT,
semihost_port=DEFAULT_LINKSERVER_SEMIHOST_PORT, semihost_port=DEFAULT_LINKSERVER_SEMIHOST_PORT,
@ -71,8 +71,8 @@ class LinkServerBinaryRunner(ZephyrBinaryRunner):
parser.add_argument('--core', required=False, help='core of the device') parser.add_argument('--core', required=False, help='core of the device')
parser.add_argument('--probe', default=1, parser.add_argument('--probe', default='#1',
help='interface to use (index, no serial number), default is 1') help='interface to use (index, or serial number, default is #1')
parser.add_argument('--tui', default=False, action='store_true', parser.add_argument('--tui', default=False, action='store_true',
help='if given, GDB uses -tui') help='if given, GDB uses -tui')
@ -169,7 +169,7 @@ class LinkServerBinaryRunner(ZephyrBinaryRunner):
else: else:
_cmd_core = "" _cmd_core = ""
linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", "#"+str(self.probe)] + linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", str(self.probe)] +
[self.device+_cmd_core] + ["erase"]) [self.device+_cmd_core] + ["erase"])
self.logger.debug("flash erase command = " + str(linkserver_cmd)) self.logger.debug("flash erase command = " + str(linkserver_cmd))
self.check_call(linkserver_cmd) self.check_call(linkserver_cmd)
@ -191,7 +191,7 @@ class LinkServerBinaryRunner(ZephyrBinaryRunner):
else: else:
_cmd_core = "" _cmd_core = ""
linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", "#"+str(self.probe)] + self.override_cli + [self.device+_cmd_core]) linkserver_cmd = ([self.linkserver, "flash"] + ["--probe", str(self.probe)] + self.override_cli + [self.device+_cmd_core])
self.logger.debug(f'LinkServer cmd: + {linkserver_cmd}') self.logger.debug(f'LinkServer cmd: + {linkserver_cmd}')
if self.erase: if self.erase: