auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

tcl/target/nordic: drop swj on swd only targets

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.

Drop 'transport select swd' from board files referring to
these targets.

While on it remove useless endianness option handling.

Change-Id: Icb4c04c79998369059044c203edcca61648aa936
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/9435
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Tomas Vanek
2026-02-03 21:36:52 +01:00
committed by Antonio Borneo
parent a7d31c87e1
commit e85f9b2954
8 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tcl/board/nordic/nrf51-dk.cfg
View File

@@ -5,7 +5,4 @@
# #
source [find interface/jlink.cfg] source [find interface/jlink.cfg]
transport select swd
source [find target/nordic/nrf51.cfg] source [find target/nordic/nrf51.cfg]

3
tcl/board/nordic/nrf52-dk.cfg
View File

@@ -5,7 +5,4 @@
# #
source [find interface/jlink.cfg] source [find interface/jlink.cfg]
transport select swd
source [find target/nordic/nrf52.cfg] source [find target/nordic/nrf52.cfg]

3
tcl/board/nordic/nrf5340-dk.cfg
View File

@@ -6,7 +6,4 @@
# #
source [find interface/jlink.cfg] source [find interface/jlink.cfg]
transport select swd
source [find target/nordic/nrf53.cfg] source [find target/nordic/nrf53.cfg]

3
tcl/board/nordic/nrf9160-dk.cfg
View File

@@ -6,7 +6,4 @@
# #
source [find interface/jlink.cfg] source [find interface/jlink.cfg]
transport select swd
source [find target/nordic/nrf91.cfg] source [find target/nordic/nrf91.cfg]

12
tcl/target/nordic/nrf51.cfg
View File

@@ -3,8 +3,8 @@
# #
# script for Nordic nRF51 series, a Cortex-M0 chip # script for Nordic nRF51 series, a Cortex-M0 chip
# #
# Devices support SWD transport only
source [find target/swj-dp.tcl] transport select swd
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
@@ -12,12 +12,6 @@ if { [info exists CHIPNAME] } {
set _CHIPNAME nrf51 set _CHIPNAME nrf51
} }
if { [info exists ENDIAN] } {
set _ENDIAN $ENDIAN
} else {
set _ENDIAN little
}
# Work-area is a space in RAM used for flash programming # Work-area is a space in RAM used for flash programming
# By default use 16kB # By default use 16kB
if { [info exists WORKAREASIZE] } { if { [info exists WORKAREASIZE] } {
@@ -32,7 +26,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x0bb11477 set _CPUTAPID 0x0bb11477
} }
swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu

5
tcl/target/nordic/nrf52.cfg
View File

@@ -3,8 +3,9 @@
# #
# Nordic nRF52 series: ARM Cortex-M4 @ 64 MHz # Nordic nRF52 series: ARM Cortex-M4 @ 64 MHz
# #
# Devices support SWD transport only
transport select swd
source [find target/swj-dp.tcl]
source [find mem_helper.tcl] source [find mem_helper.tcl]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
@@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x2ba01477 set _CPUTAPID 0x2ba01477
} }
swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu

5
tcl/target/nordic/nrf53.cfg
View File

@@ -3,8 +3,9 @@
# #
# Nordic nRF53 series: dual ARM Cortex-M33, multidrop SWD # Nordic nRF53 series: dual ARM Cortex-M33, multidrop SWD
# #
# Devices support SWD transport only
transport select swd
source [find target/swj-dp.tcl]
source [find mem_helper.tcl] source [find mem_helper.tcl]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
@@ -34,7 +35,7 @@ if { [info exists SWD_INSTANCE_ID] } {
set _SWD_INSTANCE_ID 0 set _SWD_INSTANCE_ID 0
} }
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 -chain-position $_CHIPNAME.cpu -dp-id 0x0070289 -instance-id $_SWD_INSTANCE_ID dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu -dp-id 0x0070289 -instance-id $_SWD_INSTANCE_ID

5
tcl/target/nordic/nrf91.cfg
View File

@@ -3,8 +3,9 @@
# #
# Nordic nRF91 series: ARM Cortex-M33, SWD only # Nordic nRF91 series: ARM Cortex-M33, SWD only
# #
# Devices support SWD transport only
transport select swd
source [find target/swj-dp.tcl]
source [find mem_helper.tcl] source [find mem_helper.tcl]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
@@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } {
set _CPUTAPID 0x6ba02477 set _CPUTAPID 0x6ba02477
} }
swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
# Contrary to the product specification at least nRF9161 supports multidrop SWD. # Contrary to the product specification at least nRF9161 supports multidrop SWD.
# The instance ID is fixed, no more than one nRF91 can be connected to one SWD bus. # The instance ID is fixed, no more than one nRF91 can be connected to one SWD bus.