tcl: convert transport select to jtag and swd

Convert every transport select command: - hla_swd -> swd - dapdirect_swd -> swd - hla_jtag -> jtag - dapdirect_jtag -> jtag Change-Id: I81971e06f7aefd21a570a4e098cf3822a775464b Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: https://review.openocd.org/c/openocd/+/8678 Reviewed-by: zapb <dev@zapb.de> Tested-by: jenkins
2024-12-23 18:10:10 +01:00
parent c1c4d489df
commit ad53fe659b
60 changed files with 61 additions and 61 deletions
--- a/tcl/board/ek-lm4f120xl.cfg
+++ b/tcl/board/ek-lm4f120xl.cfg
@@ -12,7 +12,7 @@
 #
 source [find interface/ti-icdi.cfg]

-transport select hla_jtag
+transport select jtag

 set WORKAREASIZE 0x8000
 set CHIPNAME lm4f120h5qr
--- a/tcl/board/ek-lm4f232.cfg
+++ b/tcl/board/ek-lm4f232.cfg
@@ -12,7 +12,7 @@
 #
 source [find interface/ti-icdi.cfg]

-transport select hla_jtag
+transport select jtag

 set WORKAREASIZE 0x8000
 set CHIPNAME lm4f23x
--- a/tcl/board/st_b-l475e-iot01a.cfg
+++ b/tcl/board/st_b-l475e-iot01a.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 96KB
 set WORKAREASIZE 0x18000
--- a/tcl/board/st_nucleo_f0.cfg
+++ b/tcl/board/st_nucleo_f0.cfg
@@ -10,7 +10,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f0x.cfg]

--- a/tcl/board/st_nucleo_f103rb.cfg
+++ b/tcl/board/st_nucleo_f103rb.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f1x.cfg]

--- a/tcl/board/st_nucleo_f3.cfg
+++ b/tcl/board/st_nucleo_f3.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f3x.cfg]

--- a/tcl/board/st_nucleo_f4.cfg
+++ b/tcl/board/st_nucleo_f4.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f4x.cfg]

--- a/tcl/board/st_nucleo_f7.cfg
+++ b/tcl/board/st_nucleo_f7.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f7x.cfg]

--- a/tcl/board/st_nucleo_g0.cfg
+++ b/tcl/board/st_nucleo_g0.cfg
@@ -12,7 +12,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32g0x.cfg]

--- a/tcl/board/st_nucleo_g4.cfg
+++ b/tcl/board/st_nucleo_g4.cfg
@@ -12,7 +12,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32g4x.cfg]

--- a/tcl/board/st_nucleo_h743zi.cfg
+++ b/tcl/board/st_nucleo_h743zi.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32h7x_dual_bank.cfg]

--- a/tcl/board/st_nucleo_h745zi.cfg
+++ b/tcl/board/st_nucleo_h745zi.cfg
@@ -3,7 +3,7 @@
 # This is an ST NUCLEO-H745ZI-Q board with single STM32H745ZITx chip.

 source [find interface/stlink.cfg]
-transport select dapdirect_swd
+transport select swd

 # STM32H745xx devices are dual core (Cortex-M7 and Cortex-M4)
 set DUAL_CORE 1
--- a/tcl/board/st_nucleo_l073rz.cfg
+++ b/tcl/board/st_nucleo_l073rz.cfg
@@ -4,7 +4,7 @@
 # http://www.st.com/en/evaluation-tools/nucleo-l073rz.html
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set WORKAREASIZE 0x2000

--- a/tcl/board/st_nucleo_l1.cfg
+++ b/tcl/board/st_nucleo_l1.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32l1x_dual_bank.cfg]

--- a/tcl/board/st_nucleo_l4.cfg
+++ b/tcl/board/st_nucleo_l4.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32l4x.cfg]

--- a/tcl/board/st_nucleo_l5.cfg
+++ b/tcl/board/st_nucleo_l5.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32l5x.cfg]

--- a/tcl/board/st_nucleo_wb55.cfg
+++ b/tcl/board/st_nucleo_wb55.cfg
@@ -6,7 +6,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32wbx.cfg]

--- a/tcl/board/stm320518_eval_stlink.cfg
+++ b/tcl/board/stm320518_eval_stlink.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 8KB
 set WORKAREASIZE 0x2000
--- a/tcl/board/stm3220g_eval_stlink.cfg
+++ b/tcl/board/stm3220g_eval_stlink.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm3241g_eval_stlink.cfg
+++ b/tcl/board/stm3241g_eval_stlink.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32429i_eval_stlink.cfg
+++ b/tcl/board/stm32429i_eval_stlink.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32439i_eval_stlink.cfg
+++ b/tcl/board/stm32439i_eval_stlink.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f0discovery.cfg
+++ b/tcl/board/stm32f0discovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set WORKAREASIZE 0x2000
 source [find target/stm32f0x.cfg]
--- a/tcl/board/stm32f3discovery.cfg
+++ b/tcl/board/stm32f3discovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f3x.cfg]

--- a/tcl/board/stm32f412g-disco.cfg
+++ b/tcl/board/stm32f412g-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f413h-disco.cfg
+++ b/tcl/board/stm32f413h-disco.cfg
@@ -10,7 +10,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f429disc1.cfg
+++ b/tcl/board/stm32f429disc1.cfg
@@ -7,7 +7,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32f4x.cfg]

--- a/tcl/board/stm32f429discovery.cfg
+++ b/tcl/board/stm32f429discovery.cfg
@@ -7,7 +7,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f469discovery.cfg
+++ b/tcl/board/stm32f469discovery.cfg
@@ -7,7 +7,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f469i-disco.cfg
+++ b/tcl/board/stm32f469i-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f4discovery.cfg
+++ b/tcl/board/stm32f4discovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 64KB
 set WORKAREASIZE 0x10000
--- a/tcl/board/stm32f723e-disco.cfg
+++ b/tcl/board/stm32f723e-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 128KB
 set WORKAREASIZE 0x20000
--- a/tcl/board/stm32f746g-disco.cfg
+++ b/tcl/board/stm32f746g-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 256KB
 set WORKAREASIZE 0x40000
--- a/tcl/board/stm32f769i-disco.cfg
+++ b/tcl/board/stm32f769i-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 256KB
 set WORKAREASIZE 0x40000
--- a/tcl/board/stm32f7discovery.cfg
+++ b/tcl/board/stm32f7discovery.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK/V2-1
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 256KB
 set WORKAREASIZE 0x40000
--- a/tcl/board/stm32h735g-disco.cfg
+++ b/tcl/board/stm32h735g-disco.cfg
@@ -7,7 +7,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set CHIPNAME stm32h735igk6

--- a/tcl/board/stm32h745i-disco.cfg
+++ b/tcl/board/stm32h745i-disco.cfg
@@ -7,7 +7,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set CHIPNAME stm32h745xih6

--- a/tcl/board/stm32h747i-disco.cfg
+++ b/tcl/board/stm32h747i-disco.cfg
@@ -7,7 +7,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set CHIPNAME stm32h747xih6

--- a/tcl/board/stm32h750b-disco.cfg
+++ b/tcl/board/stm32h750b-disco.cfg
@@ -7,7 +7,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set CHIPNAME stm32h750xbh6

--- a/tcl/board/stm32h7b3i-disco.cfg
+++ b/tcl/board/stm32h7b3i-disco.cfg
@@ -7,7 +7,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set CHIPNAME stm32h7b3lih6q

--- a/tcl/board/stm32h7x3i_eval.cfg
+++ b/tcl/board/stm32h7x3i_eval.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32h7x_dual_bank.cfg]

--- a/tcl/board/stm32l0discovery.cfg
+++ b/tcl/board/stm32l0discovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set WORKAREASIZE 0x2000
 source [find target/stm32l0.cfg]
--- a/tcl/board/stm32l476g-disco.cfg
+++ b/tcl/board/stm32l476g-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 96KB
 set WORKAREASIZE 0x18000
--- a/tcl/board/stm32l496g-disco.cfg
+++ b/tcl/board/stm32l496g-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 96KB
 set WORKAREASIZE 0x18000
--- a/tcl/board/stm32l4discovery.cfg
+++ b/tcl/board/stm32l4discovery.cfg
@@ -8,7 +8,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32l4x.cfg]

--- a/tcl/board/stm32l4p5g-disco.cfg
+++ b/tcl/board/stm32l4p5g-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 96KB
 set WORKAREASIZE 0x18000
--- a/tcl/board/stm32l4r9i-disco.cfg
+++ b/tcl/board/stm32l4r9i-disco.cfg
@@ -6,7 +6,7 @@
 # This is for using the onboard STLINK
 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 # increase working area to 96KB
 set WORKAREASIZE 0x18000
--- a/tcl/board/stm32ldiscovery.cfg
+++ b/tcl/board/stm32ldiscovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set WORKAREASIZE 0x4000
 source [find target/stm32l1.cfg]
--- a/tcl/board/stm32mp13x_dk.cfg
+++ b/tcl/board/stm32mp13x_dk.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32mp13x.cfg]

--- a/tcl/board/stm32mp15x_dk2.cfg
+++ b/tcl/board/stm32mp15x_dk2.cfg
@@ -6,7 +6,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 source [find target/stm32mp15x.cfg]

--- a/tcl/board/stm32vldiscovery.cfg
+++ b/tcl/board/stm32vldiscovery.cfg
@@ -5,7 +5,7 @@

 source [find interface/stlink.cfg]

-transport select dapdirect_swd
+transport select swd

 set WORKAREASIZE 0x2000
 source [find target/stm32f1x.cfg]
--- a/tcl/board/ti_dk-tm4c129.cfg
+++ b/tcl/board/ti_dk-tm4c129.cfg
@@ -8,7 +8,7 @@

 source [find interface/ti-icdi.cfg]

-transport select hla_jtag
+transport select jtag

 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c129xnczad
--- a/tcl/board/ti_ek-tm4c123gxl.cfg
+++ b/tcl/board/ti_ek-tm4c123gxl.cfg
@@ -8,7 +8,7 @@

 source [find interface/ti-icdi.cfg]

-transport select hla_jtag
+transport select jtag

 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c123gh6pm
--- a/tcl/board/ti_ek-tm4c1294xl.cfg
+++ b/tcl/board/ti_ek-tm4c1294xl.cfg
@@ -8,7 +8,7 @@

 source [find interface/ti-icdi.cfg]

-transport select hla_jtag
+transport select jtag

 set WORKAREASIZE 0x8000
 set CHIPNAME tm4c1294ncpdt
--- a/tcl/board/vd_a53x2_dap.cfg
+++ b/tcl/board/vd_a53x2_dap.cfg
@@ -13,7 +13,7 @@ set DBGBASE {0x80810000 0x80910000}
 set CTIBASE {0x80820000 0x80920000}

 # vdebug select transport
-transport select dapdirect_swd
+transport select swd

 # JTAG reset config, frequency and reset delay
 adapter speed 50000
--- a/tcl/board/vd_a75x4_dap.cfg
+++ b/tcl/board/vd_a75x4_dap.cfg
@@ -13,7 +13,7 @@ set DBGBASE {0x01010000 0x01110000 0x01210000 0x01310000}
 set CTIBASE {0x01020000 0x01120000 0x01220000 0x01320000}

 # vdebug select transport
-transport select dapdirect_swd
+transport select swd

 # JTAG reset config, frequency and reset delay
 adapter speed 200000
--- a/tcl/board/vd_m4_dap.cfg
+++ b/tcl/board/vd_m4_dap.cfg
@@ -9,7 +9,7 @@ set MEMSTART 0x00000000
 set MEMSIZE 0x10000

 # vdebug select transport
-transport select dapdirect_swd
+transport select swd
 adapter speed 25000
 adapter srst delay 5

--- a/tcl/interface/nulink.cfg
+++ b/tcl/interface/nulink.cfg
@@ -10,4 +10,4 @@ hla device_desc "Nu-Link"
 hla vid_pid 0x0416 0x511b 0x0416 0x511c 0x0416 0x511d 0x0416 0x5200 0x0416 0x5201

 # Only swd is supported
-transport select hla_swd
+transport select swd
--- a/tcl/interface/rshim.cfg
+++ b/tcl/interface/rshim.cfg
@@ -5,4 +5,4 @@
 #

 adapter driver rshim
-transport select dapdirect_swd
+transport select swd
--- a/tcl/interface/stlink.cfg
+++ b/tcl/interface/stlink.cfg
@@ -13,8 +13,8 @@
 adapter driver st-link
 st-link vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757

-# transport select dapdirect_jtag
-# transport select dapdirect_swd
+# transport select jtag
+# transport select swd
 # transport select swim

 # Optionally specify the serial number of usb device