auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcl/target/rp2040, rp2350: use swd newdap instead of swj_newdap

Browse Source 
Historically swj_newdap was necessary to handle HLA properly.
Since commit 60f104f450 ("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 <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/9421
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Tomas Vanek
2026-01-31 20:40:52 +01:00
committed by Antonio Borneo
parent 2b986178cf
commit 9b21a31eb7
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tcl/target/rp2040.cfg
View File

@@ -6,8 +6,6 @@
# The device requires multidrop SWD for debug. # The device requires multidrop SWD for debug.
transport select swd transport select swd
source [find target/swj-dp.tcl]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
} else { } else {
@@ -50,7 +48,7 @@ if { [info exists USE_CORE] } {
} }
set _BOTH_CORES [expr { $_USE_CORE != 0 && $_USE_CORE != 1 }] 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 # 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 # PSM (power on state machine) of the RP2040 with a flag set in the

4
tcl/target/rp2350.cfg
View File

@@ -5,8 +5,6 @@
transport select swd transport select swd
source [find target/swj-dp.tcl]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
} else { } else {
@@ -51,7 +49,7 @@ if { [info exists USE_CORE] } {
set _USE_CORE { cm0 cm1 } set _USE_CORE { cm0 cm1 }
} }
swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
if { [info exists SWD_MULTIDROP] } { if { [info exists SWD_MULTIDROP] } {
dap create $_CHIPNAME.dap -adiv6 -chain-position $_CHIPNAME.cpu -dp-id 0x0040927 -instance-id 0 dap create $_CHIPNAME.dap -adiv6 -chain-position $_CHIPNAME.cpu -dp-id 0x0040927 -instance-id 0