[PATCH]: 418349f7bc tcl/target/rp2040, rp2350: use swd newdap instead of swj_newdap

[<ge...@op...>]

This is an automated email from Gerrit.

"Tomas Vanek <va...@fb...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9421

-- gerrit

commit 418349f7bcaa6b54e853bd570e03bc7c1b492cf4
Author: Tomas Vanek <va...@fb...>
Date:   Sat Jan 31 20:40:52 2026 +0100

    tcl/target/rp2040, rp2350: use swd newdap instead of swj_newdap
    
    Historically swj_newdap was necessary to handle HLA properly.
    Since commit 60f104f45013 ("hla_transport: split command
    registration per transport") there is no point in using
    swj_newdap on SWD only devices.
    
    Change-Id: Ib4d7eb5935e0b44087cc8ea73ab187a417413db6
    Signed-off-by: Tomas Vanek <va...@fb...>

diff --git a/tcl/target/rp2040.cfg b/tcl/target/rp2040.cfg
index 262de44186..e60892ebd2 100644
--- a/tcl/target/rp2040.cfg
+++ b/tcl/target/rp2040.cfg
@@ -6,8 +6,6 @@
 # The device requires multidrop SWD for debug.
 transport select swd
 
-source [find target/swj-dp.tcl]
-
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
 } else {
@@ -50,7 +48,7 @@ if { [info exists USE_CORE] } {
 }
 set _BOTH_CORES [expr { $_USE_CORE != 0 && $_USE_CORE != 1 }]
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 # The rescue debug port uses the DP CTRL/STAT bit DBGPWRUPREQ to reset the
 # PSM (power on state machine) of the RP2040 with a flag set in the
diff --git a/tcl/target/rp2350.cfg b/tcl/target/rp2350.cfg
index be51931ec4..afa16261c4 100644
--- a/tcl/target/rp2350.cfg
+++ b/tcl/target/rp2350.cfg
@@ -5,8 +5,6 @@
 
 transport select swd
 
-source [find target/swj-dp.tcl]
-
 if { [info exists CHIPNAME] } {
 	set _CHIPNAME $CHIPNAME
 } else {
@@ -51,7 +49,7 @@ if { [info exists USE_CORE] } {
 	set _USE_CORE { cm0 cm1 }
 }
 
-swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 
 if { [info exists SWD_MULTIDROP] } {
 	dap create $_CHIPNAME.dap -adiv6 -chain-position $_CHIPNAME.cpu -dp-id 0x0040927 -instance-id 0

--