aboutsummaryrefslogtreecommitdiff
path: root/tcl/interface
diff options
context:
space:
mode:
authorEvgeniy Naydanov <109669442+en-sc@users.noreply.github.com>2025-09-12 12:57:16 +0300
committerGitHub <noreply@github.com>2025-09-12 12:57:16 +0300
commit48483a84a064ee5487aa3e8a2c2494722a3c3849 (patch)
treec257d9a9f54558064219ed565088000ee0883ce4 /tcl/interface
parent39d4c50950817d0622aa468a675091ea9a0b23c2 (diff)
parent517c40ba8d2da7dfdbcccd04dd3fba59da633213 (diff)
downloadriscv-openocd-riscv.zip
riscv-openocd-riscv.tar.gz
riscv-openocd-riscv.tar.bz2
Merge pull request #1267 from en-sc/en-sc/from_upstreamHEADlatestriscv
Merge up to afbd01b0a46f3a81fe6076c002ad66973dcfb64c from upstream
Diffstat (limited to 'tcl/interface')
-rw-r--r--tcl/interface/nulink.cfg2
-rw-r--r--tcl/interface/rshim.cfg2
-rw-r--r--tcl/interface/stlink.cfg10
3 files changed, 10 insertions, 4 deletions
diff --git a/tcl/interface/nulink.cfg b/tcl/interface/nulink.cfg
index 48dc20e..be68347 100644
--- a/tcl/interface/nulink.cfg
+++ b/tcl/interface/nulink.cfg
@@ -10,4 +10,4 @@ hla device_desc "Nu-Link"
hla vid_pid 0x0416 0x511b 0x0416 0x511c 0x0416 0x511d 0x0416 0x5200 0x0416 0x5201
# Only swd is supported
-transport select hla_swd
+transport select swd
diff --git a/tcl/interface/rshim.cfg b/tcl/interface/rshim.cfg
index 1d5da59..327212f 100644
--- a/tcl/interface/rshim.cfg
+++ b/tcl/interface/rshim.cfg
@@ -5,4 +5,4 @@
#
adapter driver rshim
-transport select dapdirect_swd
+transport select swd
diff --git a/tcl/interface/stlink.cfg b/tcl/interface/stlink.cfg
index 99c81c1..48c5656 100644
--- a/tcl/interface/stlink.cfg
+++ b/tcl/interface/stlink.cfg
@@ -10,11 +10,17 @@
# SWIM transport is natively supported
#
+if { [adapter name] == "hla" } {
+ # Deprecated HLA adapter driver already selected.
+ # Quit silently, as the ST-LINK driver already complains.
+ return
+}
+
adapter driver st-link
st-link vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757
-# transport select dapdirect_jtag
-# transport select dapdirect_swd
+# transport select jtag
+# transport select swd
# transport select swim
# Optionally specify the serial number of usb device