This is an automated email from Gerrit. "Tomas Vanek <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9435
-- gerrit commit 289614d4114c876c6f266ce35949f5246c13c543 Author: Tomas Vanek <[email protected]> Date: Tue Feb 3 21:36:52 2026 +0100 tcl/target/nordic: drop swj on swd only targets 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. Drop 'transport select swd' from board files referring to these targets. While on it remove useless endianess option handling. Change-Id: Icb4c04c79998369059044c203edcca61648aa936 Signed-off-by: Tomas Vanek <[email protected]> diff --git a/tcl/board/nordic/nrf51-dk.cfg b/tcl/board/nordic/nrf51-dk.cfg index 4ccd3272e5..dee63cc7ff 100644 --- a/tcl/board/nordic/nrf51-dk.cfg +++ b/tcl/board/nordic/nrf51-dk.cfg @@ -5,7 +5,4 @@ # source [find interface/jlink.cfg] - -transport select swd - source [find target/nordic/nrf51.cfg] diff --git a/tcl/board/nordic/nrf52-dk.cfg b/tcl/board/nordic/nrf52-dk.cfg index 9b2390a624..c35d5c7c6b 100644 --- a/tcl/board/nordic/nrf52-dk.cfg +++ b/tcl/board/nordic/nrf52-dk.cfg @@ -5,7 +5,4 @@ # source [find interface/jlink.cfg] - -transport select swd - source [find target/nordic/nrf52.cfg] diff --git a/tcl/board/nordic/nrf5340-dk.cfg b/tcl/board/nordic/nrf5340-dk.cfg index fd7a40d666..8d5c111013 100644 --- a/tcl/board/nordic/nrf5340-dk.cfg +++ b/tcl/board/nordic/nrf5340-dk.cfg @@ -6,7 +6,4 @@ # source [find interface/jlink.cfg] - -transport select swd - source [find target/nordic/nrf53.cfg] diff --git a/tcl/board/nordic/nrf9160-dk.cfg b/tcl/board/nordic/nrf9160-dk.cfg index dc456202c1..b3deedaa81 100644 --- a/tcl/board/nordic/nrf9160-dk.cfg +++ b/tcl/board/nordic/nrf9160-dk.cfg @@ -6,7 +6,4 @@ # source [find interface/jlink.cfg] - -transport select swd - source [find target/nordic/nrf91.cfg] diff --git a/tcl/target/nordic/nrf51.cfg b/tcl/target/nordic/nrf51.cfg index 3781eccb50..959ee432fd 100644 --- a/tcl/target/nordic/nrf51.cfg +++ b/tcl/target/nordic/nrf51.cfg @@ -3,8 +3,8 @@ # # script for Nordic nRF51 series, a Cortex-M0 chip # - -source [find target/swj-dp.tcl] +# Devices support SWD transport only +transport select swd if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME @@ -12,12 +12,6 @@ if { [info exists CHIPNAME] } { 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 # By default use 16kB if { [info exists WORKAREASIZE] } { @@ -32,7 +26,7 @@ if { [info exists CPUTAPID] } { 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 set _TARGETNAME $_CHIPNAME.cpu diff --git a/tcl/target/nordic/nrf52.cfg b/tcl/target/nordic/nrf52.cfg index 0703b18862..c151283dad 100644 --- a/tcl/target/nordic/nrf52.cfg +++ b/tcl/target/nordic/nrf52.cfg @@ -3,8 +3,9 @@ # # 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] if { [info exists CHIPNAME] } { @@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } { 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 set _TARGETNAME $_CHIPNAME.cpu diff --git a/tcl/target/nordic/nrf53.cfg b/tcl/target/nordic/nrf53.cfg index 0dcfd55eca..ce2eaf045a 100644 --- a/tcl/target/nordic/nrf53.cfg +++ b/tcl/target/nordic/nrf53.cfg @@ -3,8 +3,9 @@ # # 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] if { [info exists CHIPNAME] } { @@ -34,7 +35,7 @@ if { [info exists SWD_INSTANCE_ID] } { set _SWD_INSTANCE_ID 0 } -swj_newdap $_CHIPNAME cpu -expected-id $_CPUTAPID +swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID if { [info exists SWD_MULTIDROP] } { dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu -dp-id 0x0070289 -instance-id $_SWD_INSTANCE_ID diff --git a/tcl/target/nordic/nrf91.cfg b/tcl/target/nordic/nrf91.cfg index 64ed864e75..826d627763 100644 --- a/tcl/target/nordic/nrf91.cfg +++ b/tcl/target/nordic/nrf91.cfg @@ -3,8 +3,9 @@ # # 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] if { [info exists CHIPNAME] } { @@ -27,7 +28,7 @@ if { [info exists CPUTAPID] } { 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. # The instance ID is fixed, no more than one nRF91 can be connected to one SWD bus. --
