zephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts: west_commands: runners: jlink: support pylink >= 0.14.2 

It looks like the latest release, 0.14.2, changed the contents of
JLINK_SDK_NAME as it was before 0.14.0 release. That means that the
previous fix is only applicable to a couple of releases: 0.14.0/0.14.1.

Fixes #49564

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit 2d712c6c55)
This commit is contained in:
Gerard Marull-Paretas 2022-08-19 11:12:55 +02:00 committed by Christopher Friedt
parent 63d0c7fcae
commit 5221787303
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/west_commands/runners/jlink.py
View File

@ -7,7 +7,6 @@
import argparse
import logging
import os
from packaging.version import Version
from pathlib import Path
import shlex
import subprocess
@ -143,9 +142,9 @@ class JLinkBinaryRunner(ZephyrBinaryRunner):
# to load the shared library distributed with the tools, which
# provides an API call for getting the version.
if not hasattr(self, '_jlink_version'):
# pylink >= 0.14.0 exposes JLink SDK DLL (libjlinkarm) in
# JLINK_SDK_STARTS_WITH, while previous versions use JLINK_SDK_NAME
if Version(pylink.__version__) >= Version('0.14.0'):
# pylink 0.14.0/0.14.1 exposes JLink SDK DLL (libjlinkarm) in
# JLINK_SDK_STARTS_WITH, while other versions use JLINK_SDK_NAME
if pylink.__version__ in ('0.14.0', '0.14.1'):
sdk = Library.JLINK_SDK_STARTS_WITH
else:
sdk = Library.JLINK_SDK_NAME