Skip to content

Commit a7d31c8

Browse files
tom-vanborneoa
authored andcommitted
tcl/target/klx, ke0x: drop swj on swd only targets
Historically swj_newdap was necessary to handle HLA properly. Since commit 60f104f ("hla_transport: split command registration per transport") there is no point in using swj_newdap on SWD only devices. No board files referring these targets select swd transport. Change-Id: I002ce7029936f56b1d8b41505bca8dc771c33187 Signed-off-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-on: https://review.openocd.org/c/openocd/+/9434 Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com> Tested-by: jenkins
1 parent 2374db9 commit a7d31c8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tcl/target/ke0x.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44
# Freescale Kinetis KE0x and KEAx series devices
55
#
6-
7-
source [find target/swj-dp.tcl]
6+
# Devices support SWD transport only
7+
transport select swd
88

99
if { [info exists CHIPNAME] } {
1010
set _CHIPNAME $CHIPNAME
@@ -26,7 +26,7 @@ if { [info exists CPUTAPID] } {
2626
set _CPUTAPID 0x0bc11477
2727
}
2828

29-
swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
29+
swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
3030
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
3131

3232
set _TARGETNAME $_CHIPNAME.cpu

tcl/target/klx.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# NXP (former Freescale) Kinetis KL series devices
55
# Also used for Cortex-M0+ equipped members of KVx and KE1xZ series
66
#
7-
8-
source [find target/swj-dp.tcl]
7+
# Devices support SWD transport only
8+
transport select swd
99

1010
if { [info exists CHIPNAME] } {
1111
set _CHIPNAME $CHIPNAME
@@ -27,7 +27,7 @@ if { [info exists CPUTAPID] } {
2727
set _CPUTAPID 0x0bc11477
2828
}
2929

30-
swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID
30+
swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
3131
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
3232

3333
set _TARGETNAME $_CHIPNAME.cpu

0 commit comments

Comments
 (0)