stlink: deprecate HLA support

The STLink API that supports dap-direct is available from STLink
firmware v2j24, published in early 2015.
We can reasonably expect that any old STLink still in use today
has got at least one firmware update during the last 10 years.

Most of the board files in upstream OpenOCD still use the STLink
in HLA mode. This limits the test coverage of the dap-direct code,
which was introduced in OpenOCD v0.11.0.

- Rename interface/stlink.cfg as interface/stlink-hla.cfg to still
  provide support for HLA, adding a deprecated message.

- Rename interface/stlink-dap.cfg as interface/stlink.cfg to make
  dap-direct the default trasport.

- Add a redirect file interface/stlink-dap.cfg for users that have
  out-of-tree custom board files.

- Update all the board files to the new setup.

- Remove STLink HLA mentions from the documentation, while adding
  a reference to interface/stlink-hla.cfg

Checkpatch-ignore: LONG_LINE
Change-Id: I99366bb03cd3b83f8f408514e657f30e59813063
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8523
Tested-by: jenkins
Reviewed-by: Andrzej Sierżęga <asier70@gmail.com>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 97396c7b704307a94a7ebec28c008178cc48f614..9b5cfbb83ed55adda8ca26edc949e84496898cbe 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2489,7 +2489,7 @@ This command is only available if your libusb1 is at least version 1.0.16.
 Specifies the @var{serial_string} of the adapter to use.
 If this command is not specified, serial strings are not checked.
 Only the following adapter drivers use the serial string from this command:
-arm-jtag-ew, cmsis_dap, esp_usb_jtag, ft232r, ftdi, hla (stlink, ti-icdi), jlink, kitprog, opendus,
+arm-jtag-ew, cmsis_dap, esp_usb_jtag, ft232r, ftdi, hla (ti-icdi), jlink, kitprog, opendus,
 openjtag, osbdm, presto, rlink, st-link, usb_blaster (ublast2), usbprog, vsllink, xds110.
 @end deffn
 
@@ -3206,7 +3206,7 @@ version reported is V2.J21.S4.
 Currently Not Supported.
 @end deffn
 
-@deffn {Config Command} {hla layout} (@option{stlink}|@option{icdi}|@option{nulink})
+@deffn {Config Command} {hla layout} (@option{icdi}|@option{nulink})
 Specifies the adapter layout to use.
 @end deffn
 
@@ -3214,15 +3214,6 @@ Specifies the adapter layout to use.
 Pairs of vendor IDs and product IDs of the device.
 @end deffn
 
-@deffn {Config Command} {hla stlink_backend} (usb | tcp [port])
-@emph{ST-Link only:} Choose between 'exclusive' USB communication (the default backend) or
-'shared' mode using ST-Link TCP server (the default port is 7184).
-
-@emph{Note:} ST-Link TCP server is a binary application provided by ST
-available from @url{https://www.st.com/en/development-tools/st-link-server.html,
-ST-LINK server software module}.
-@end deffn
-
 @deffn {Command} {hla command} command
 Execute a custom adapter-specific command. The @var{command} string is
 passed as is to the underlying adapter layout handler.
@@ -3232,9 +3223,12 @@ passed as is to the underlying adapter layout handler.
 @anchor{st_link_dap_interface}
 @deffn {Interface Driver} {st-link}
 This is a driver that supports STMicroelectronics adapters ST-LINK/V2
-(from firmware V2J24), STLINK-V3 and STLINK-V3PWR, thanks to a new API that provides
+(from 2015 firmware V2J24), STLINK-V3 and STLINK-V3PWR, thanks to a new API that provides
 directly access the arm ADIv5 DAP.
 
+The older API that requires HLA transport is deprecated and will be dropped
+from OpenOCD. In mean time it's still available by using @file{interface/stlink-hla.cfg}.
+
 The new API provide access to multiple AP on the same DAP, but the
 maximum number of the AP port is limited by the specific firmware version
 (e.g. firmware V2J29 has 3 as maximum AP number, while V2J32 has 8).
@@ -10677,7 +10671,7 @@ baud with our custom divisor to get 12MHz)
 @item OpenOCD invocation line:
 @example
 openocd -f interface/stlink.cfg \
--c "transport select hla_swd" \
+-c "transport select dapdirect_swd" \
 -f target/stm32l1.cfg \
 -c "stm32l1.tpiu configure -protocol uart" \
 -c "stm32l1.tpiu configure -traceclk 24000000 -pin-freq 12000000" \

diff --git a/tcl/board/st_b-l475e-iot01a.cfg b/tcl/board/st_b-l475e-iot01a.cfg
index e75c99d7a59e44526a7680944264c9edf744c4b1..3f3db125c8edaf1555a81e266587452b1f3f8773 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 96KB
 set WORKAREASIZE 0x18000

diff --git a/tcl/board/st_nucleo_8l152r8.cfg b/tcl/board/st_nucleo_8l152r8.cfg
index 7cb8bcecd8a96515845c6c7d0a14204a79ef2424..681b5a2433959868e381bf17dde86340d8f09314 100644 (file)
--- a/tcl/board/st_nucleo_8l152r8.cfg
+++ b/tcl/board/st_nucleo_8l152r8.cfg
@@ -3,7 +3,7 @@
 # This is a ST NUCLEO 8L152R8 board with a single STM8L152R8T6 chip.
 # http://www.st.com/en/evaluation-tools/nucleo-8l152r8.html
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 
 transport select swim
 

diff --git a/tcl/board/st_nucleo_8s208rb.cfg b/tcl/board/st_nucleo_8s208rb.cfg
index 0d3c0c9125d9c4ab128aaa1dbcaf0bb796717036..0f6bde215ccdbc3afc9c1ecc101f865d15a4a953 100644 (file)
--- a/tcl/board/st_nucleo_8s208rb.cfg
+++ b/tcl/board/st_nucleo_8s208rb.cfg
@@ -3,7 +3,7 @@
 # This is a ST NUCLEO 8S208RB board with a single STM8S208RBT6 chip.
 # https://www.st.com/en/evaluation-tools/nucleo-8s208rb.html
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 
 transport select swim
 

diff --git a/tcl/board/st_nucleo_f0.cfg b/tcl/board/st_nucleo_f0.cfg
index 31a95f59d2e81607456fa30630290d8c50422f35..00c131fd64eab63506b34f28da71c776af72a44e 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f0x.cfg]
 

diff --git a/tcl/board/st_nucleo_f103rb.cfg b/tcl/board/st_nucleo_f103rb.cfg
index 9815d4546e82dbfa9a16750a351c6f9180fd708b..892bdda99ddc296c07d888a133a0c80468844d1b 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f1x.cfg]
 

diff --git a/tcl/board/st_nucleo_f3.cfg b/tcl/board/st_nucleo_f3.cfg
index 8833724945aa1a1d76f59f62e010e15982cd9f0b..38f49e3d5f105772d6ab56b8ca6f52edf79cd810 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f3x.cfg]
 

diff --git a/tcl/board/st_nucleo_f4.cfg b/tcl/board/st_nucleo_f4.cfg
index a1908e40313d4e89bae5629a78358128efaee6f8..7617a17580f6449ed0578b26cc697f0fe26600ca 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f4x.cfg]
 

diff --git a/tcl/board/st_nucleo_f7.cfg b/tcl/board/st_nucleo_f7.cfg
index 9c5b36ea4668fbd28a999c3af4250bc228fdbde0..41f8b21291f5c74b296f510fcb0011a2fa62db34 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f7x.cfg]
 

diff --git a/tcl/board/st_nucleo_g0.cfg b/tcl/board/st_nucleo_g0.cfg
index f8e67a0432184c196b26b00405a8a0c7a797594c..f22a7e397ed370d5c2b004026cac846da5d26487 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32g0x.cfg]
 

diff --git a/tcl/board/st_nucleo_g4.cfg b/tcl/board/st_nucleo_g4.cfg
index 8e583e77d5025245e7522ad9ad64a1d568f14656..309f7a4c844258e13c9e56a898d7609cd4aa9e11 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32g4x.cfg]
 

diff --git a/tcl/board/st_nucleo_h743zi.cfg b/tcl/board/st_nucleo_h743zi.cfg
index b857b00e05ff0fbbb4f89e159fd97f56739cd3bd..be2d42fb8a38d1a3b8af29605f0f4343a1e3670d 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32h7x_dual_bank.cfg]
 

diff --git a/tcl/board/st_nucleo_h745zi.cfg b/tcl/board/st_nucleo_h745zi.cfg
index ad563b7d3125923599b60af511f8ecf24b9aae6a..84865f422d864a8a24ea5526a308038d54c40b48 100644 (file)
--- a/tcl/board/st_nucleo_h745zi.cfg
+++ b/tcl/board/st_nucleo_h745zi.cfg
@@ -2,7 +2,7 @@
 
 # This is an ST NUCLEO-H745ZI-Q board with single STM32H745ZITx chip.
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 transport select dapdirect_swd
 
 # STM32H745xx devices are dual core (Cortex-M7 and Cortex-M4)

diff --git a/tcl/board/st_nucleo_l073rz.cfg b/tcl/board/st_nucleo_l073rz.cfg
index 10fac5ef84541dc54743b7193b2effbb5b266dfb..317c86e21d7a75fb393c3263598b1c3b598bd839 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set WORKAREASIZE 0x2000
 

diff --git a/tcl/board/st_nucleo_l1.cfg b/tcl/board/st_nucleo_l1.cfg
index 50688d2b67c967a7b04007b7ccf2285140d5fe38..d7474d0fe24c77bc75493733d72c99cf045a206b 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32l1x_dual_bank.cfg]
 

diff --git a/tcl/board/st_nucleo_l4.cfg b/tcl/board/st_nucleo_l4.cfg
index 8c63d8cbf84a7a533dfaa18141b045f37c81250e..b0a75afe029b26e5a23cffb0bced93256f0197e3 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32l4x.cfg]
 

diff --git a/tcl/board/st_nucleo_l5.cfg b/tcl/board/st_nucleo_l5.cfg
index 6450f08b8df8ddd1871dfeab26c5fbcfe8be1a1b..626914aa75ce56f960404b8d05709cd49072a1c2 100644 (file)
--- a/tcl/board/st_nucleo_l5.cfg
+++ b/tcl/board/st_nucleo_l5.cfg
@@ -3,7 +3,7 @@
 # This is for STM32L5 Nucleo Dev Boards.
 # http://www.st.com/en/evaluation-tools/stm32-mcu-nucleo.html
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 
 transport select dapdirect_swd
 

diff --git a/tcl/board/st_nucleo_wb55.cfg b/tcl/board/st_nucleo_wb55.cfg
index 29b7ec98d6197e859d10f296d556b748b9e8c507..ab7307c683f664ba42b81681de0f4d7a3c67d409 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32wbx.cfg]
 

diff --git a/tcl/board/stm320518_eval_stlink.cfg b/tcl/board/stm320518_eval_stlink.cfg
index 153f7e5cbcd4f98ef119cc543ff65b67aa68f504..997bb4af95f449400064e8140414585ce7a472bf 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 8KB
 set WORKAREASIZE 0x2000

diff --git a/tcl/board/stm3220g_eval_stlink.cfg b/tcl/board/stm3220g_eval_stlink.cfg
index d5296720c2912f08093779833f33a236d20d39b0..4233d04f15ebbcec99b48a66eff93210fa493094 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm3241g_eval_stlink.cfg b/tcl/board/stm3241g_eval_stlink.cfg
index d2d579077686401b260384ac75d31920d1dc265c..3bccd2866118eb94089463db700fd48c7b356e88 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32429i_eval_stlink.cfg b/tcl/board/stm32429i_eval_stlink.cfg
index be3c482263c6a7e55d5332d4df9d64faa7eff622..7d04aa7f3a383cccdc42030a2fac6f482043b897 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32439i_eval_stlink.cfg b/tcl/board/stm32439i_eval_stlink.cfg
index 7a1a396fcbac796dc9f03bc99ff4aabaf2ca91af..b9ea084dfdc84e7465ed4fe70807b78a14311b12 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f0discovery.cfg b/tcl/board/stm32f0discovery.cfg
index 60fb4a65e4543e90f43d959ca40adfbb312b45a5..398ecc103782fe5d157e6da3379acbb2b4d2b722 100644 (file)
--- a/tcl/board/stm32f0discovery.cfg
+++ b/tcl/board/stm32f0discovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 set WORKAREASIZE 0x2000
 source [find target/stm32f0x.cfg]

diff --git a/tcl/board/stm32f3discovery.cfg b/tcl/board/stm32f3discovery.cfg
index f28e11f6a65aba65c4068245b51facf476e5245b..73c349a6ef510dffd4256aaffb6241e291a2d181 100644 (file)
--- a/tcl/board/stm32f3discovery.cfg
+++ b/tcl/board/stm32f3discovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f3x.cfg]
 

diff --git a/tcl/board/stm32f412g-disco.cfg b/tcl/board/stm32f412g-disco.cfg
index 757b25d75ca6d3f7770772959d7613b8496443dc..30a9537f0bad4e00574558b0e71e61f7af7f3130 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f413h-disco.cfg b/tcl/board/stm32f413h-disco.cfg
index 6abf495514a8b949d935601022fe26bd4d70272f..c82d0d43498e9c84b699f49a94dfc777cec6003e 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f429disc1.cfg b/tcl/board/stm32f429disc1.cfg
index 657aa1986f4ba973f61434f36666ef189cac5438..0a8e7ef4e6af676fa5c62c015779fe7f81b929f5 100644 (file)
--- a/tcl/board/stm32f429disc1.cfg
+++ b/tcl/board/stm32f429disc1.cfg
@@ -7,7 +7,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32f4x.cfg]
 

diff --git a/tcl/board/stm32f429discovery.cfg b/tcl/board/stm32f429discovery.cfg
index d1b5f5a118d171f19a4b1f38e3cb7b9056304f03..865602ab694eb8091d07dd590919f2c48181f4ff 100644 (file)
--- a/tcl/board/stm32f429discovery.cfg
+++ b/tcl/board/stm32f429discovery.cfg
@@ -7,7 +7,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f469discovery.cfg b/tcl/board/stm32f469discovery.cfg
index cca25b7f04be0619822f7979a0d7a610fc1c848c..c9acbbbd0c70f56ce55c468a8bd9358ea5daedb4 100644 (file)
--- a/tcl/board/stm32f469discovery.cfg
+++ b/tcl/board/stm32f469discovery.cfg
@@ -7,7 +7,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f469i-disco.cfg b/tcl/board/stm32f469i-disco.cfg
index 7ce57f6e750faafa34a40f5eb5dfefde692700e7..63c42c64e9fda9dbd87b6247c727f049524df2f5 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f4discovery.cfg b/tcl/board/stm32f4discovery.cfg
index 714f1e90322916c90b4b6f05642fd2ff30427002..d96e2dbd34ca17c9d4db29ed2ba602a61a218491 100644 (file)
--- a/tcl/board/stm32f4discovery.cfg
+++ b/tcl/board/stm32f4discovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 # increase working area to 64KB
 set WORKAREASIZE 0x10000

diff --git a/tcl/board/stm32f723e-disco.cfg b/tcl/board/stm32f723e-disco.cfg
index 2dee2f9023f1925f43a0468bdaca313225977436..0207956206c85849bfff7f905d3a2a51136b99b9 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 128KB
 set WORKAREASIZE 0x20000

diff --git a/tcl/board/stm32f746g-disco.cfg b/tcl/board/stm32f746g-disco.cfg
index fed1d8ec9bd46c13f66bd2177b3be539f9c69377..75ff4ec1e21936e6b60a863664a7626cac683d0f 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 256KB
 set WORKAREASIZE 0x40000

diff --git a/tcl/board/stm32f769i-disco.cfg b/tcl/board/stm32f769i-disco.cfg
index 2969bb9272db6e92544b254ea89b4fccd78ccc70..cd6383a7003010a11e022aff5e1d5a6fc4ab5de9 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 256KB
 set WORKAREASIZE 0x40000

diff --git a/tcl/board/stm32f7discovery.cfg b/tcl/board/stm32f7discovery.cfg
index 4cc22ea6253d9f1651289f772ad94cbe75bd7762..6fd6c64b3d4f0c800f7350b0fc7bc03d32a13a94 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 256KB
 set WORKAREASIZE 0x40000

diff --git a/tcl/board/stm32h735g-disco.cfg b/tcl/board/stm32h735g-disco.cfg
index 4097ae28b22f4e8e9165547cfd13e7b5d92d2f53..327a36418cc3c2d020f5050008c4aedd69a733c1 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set CHIPNAME stm32h735igk6
 

diff --git a/tcl/board/stm32h745i-disco.cfg b/tcl/board/stm32h745i-disco.cfg
index 1c0bc6748c450f81438c8b72d0dbf0fc7251d143..9da1daefc6716819d8b3340745777a7dc4cc5f78 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set CHIPNAME stm32h745xih6
 

diff --git a/tcl/board/stm32h747i-disco.cfg b/tcl/board/stm32h747i-disco.cfg
index e0a348ef08f9df594544cb653c81fb10982d1e19..7f8eda8c45d38c997efb0ecd8427cdaef020c847 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set CHIPNAME stm32h747xih6
 

diff --git a/tcl/board/stm32h750b-disco.cfg b/tcl/board/stm32h750b-disco.cfg
index efb32b1dfbe606d8da65060db6ba40a5e360c900..8b254f21fdf7ce0e4967439832f92f82b9f3bdb9 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set CHIPNAME stm32h750xbh6
 

diff --git a/tcl/board/stm32h7b3i-disco.cfg b/tcl/board/stm32h7b3i-disco.cfg
index 58ad9f78142a47887b09835eb5e80f1c100cdf92..df0d0a6f2761294cdc55353e2bc78ec7dbf5d26c 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 set CHIPNAME stm32h7b3lih6q
 

diff --git a/tcl/board/stm32h7x3i_eval.cfg b/tcl/board/stm32h7x3i_eval.cfg
index b9c4c74c26b9b90851e75443b3f976305a2877d4..508f10d5d1aba3a18ebbc28d89904b476ecac663 100644 (file)
--- a/tcl/board/stm32h7x3i_eval.cfg
+++ b/tcl/board/stm32h7x3i_eval.cfg
@@ -8,7 +8,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32h7x_dual_bank.cfg]
 

diff --git a/tcl/board/stm32l0discovery.cfg b/tcl/board/stm32l0discovery.cfg
index c711d9c8a8bd30304d0ab0c1b7e38bc7c91f88d1..59aed3405d77514d64cabb07b7b2a4d8048debe0 100644 (file)
--- a/tcl/board/stm32l0discovery.cfg
+++ b/tcl/board/stm32l0discovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 set WORKAREASIZE 0x2000
 source [find target/stm32l0.cfg]

diff --git a/tcl/board/stm32l476g-disco.cfg b/tcl/board/stm32l476g-disco.cfg
index a32d20fb3fa85d1f3a324481708e6d94527d4d71..fe33ffefb9c452e89afa529a737b6024a0e4fefd 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 96KB
 set WORKAREASIZE 0x18000

diff --git a/tcl/board/stm32l496g-disco.cfg b/tcl/board/stm32l496g-disco.cfg
index 1ba2299ca9d56bf7139835103b32ccba41d998a9..823fa6e380a5573cf3b5b2fe657e4faace471475 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 96KB
 set WORKAREASIZE 0x18000

diff --git a/tcl/board/stm32l4discovery.cfg b/tcl/board/stm32l4discovery.cfg
index f0895507803e0b2dd6fb75cbeaa547a2cbb64e4d..64a456b612052790d9d16627d8800ee58cb43f10 100644 (file)
--- a/tcl/board/stm32l4discovery.cfg
+++ b/tcl/board/stm32l4discovery.cfg
@@ -8,7 +8,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 source [find target/stm32l4x.cfg]
 

diff --git a/tcl/board/stm32l4p5g-disco.cfg b/tcl/board/stm32l4p5g-disco.cfg
index 20d781a1a45a31a472966c084f5334945b128715..33bb9a7662c8cd15d933282c1670a17efbe61657 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 96KB
 set WORKAREASIZE 0x18000

diff --git a/tcl/board/stm32l4r9i-disco.cfg b/tcl/board/stm32l4r9i-disco.cfg
index f364ad3d58098849f77b1eabfea96d2fa363f1e7..cbb86669f0b6bb8fe3144f84a2da718441cb8787 100644 (file)
--- 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 hla_swd
+transport select dapdirect_swd
 
 # increase working area to 96KB
 set WORKAREASIZE 0x18000

diff --git a/tcl/board/stm32ldiscovery.cfg b/tcl/board/stm32ldiscovery.cfg
index d760edaba796c74b538efc25845c8f64245bcc29..e39b52295a157be6d67215f8846a32cfcbcbd01e 100644 (file)
--- a/tcl/board/stm32ldiscovery.cfg
+++ b/tcl/board/stm32ldiscovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 set WORKAREASIZE 0x4000
 source [find target/stm32l1.cfg]

diff --git a/tcl/board/stm32mp13x_dk.cfg b/tcl/board/stm32mp13x_dk.cfg
index 6328ddb4c01f78329691b6d1315b7a59d4a30ad6..08377ca76afa037d0936805a279763ab4895e8a8 100644 (file)
--- a/tcl/board/stm32mp13x_dk.cfg
+++ b/tcl/board/stm32mp13x_dk.cfg
@@ -3,7 +3,7 @@
 # board MB1635x
 # http://www.st.com/en/evaluation-tools/stm32mp135f-dk.html
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 
 transport select dapdirect_swd
 

diff --git a/tcl/board/stm32mp15x_dk2.cfg b/tcl/board/stm32mp15x_dk2.cfg
index 9503428d1aea142332caf91169558b748ed39011..0e71e05ee036834816c99d09df33f86a18651cff 100644 (file)
--- a/tcl/board/stm32mp15x_dk2.cfg
+++ b/tcl/board/stm32mp15x_dk2.cfg
@@ -4,7 +4,7 @@
 # http://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html
 # http://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html
 
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
 
 transport select dapdirect_swd
 

diff --git a/tcl/board/stm32vldiscovery.cfg b/tcl/board/stm32vldiscovery.cfg
index 30e35b9817d10ecbc92133055823f5bd789daa8d..57852bfd4f7689c8bf88c092ed697b414c884d60 100644 (file)
--- a/tcl/board/stm32vldiscovery.cfg
+++ b/tcl/board/stm32vldiscovery.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/stlink.cfg]
 
-transport select hla_swd
+transport select dapdirect_swd
 
 set WORKAREASIZE 0x2000
 source [find target/stm32f1x.cfg]

diff --git a/tcl/interface/stlink-dap.cfg b/tcl/interface/stlink-dap.cfg
index 99c81c180c2ef01ec5da4337149d362ee410f5bb..009fdb7e0fd36dc104835ed2e9f4bc04c811b6c7 100644 (file)
--- a/tcl/interface/stlink-dap.cfg
+++ b/tcl/interface/stlink-dap.cfg
@@ -1,22 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-#
-# STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
-# debugger/programmer
-#
-# This new interface driver creates a ST-Link wrapper for ARM-DAP named "dapdirect"
-# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support "dapdirect"
-#
-# SWIM transport is natively supported
-#
+echo "WARNING: interface/stlink-dap.cfg is deprecated, please switch to interface/stlink.cfg"
+source [find interface/stlink.cfg]
 
-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 swim
-
-# Optionally specify the serial number of usb device
-# e.g.
-# adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"

diff --git a/tcl/interface/stlink-hla.cfg b/tcl/interface/stlink-hla.cfg
new file mode 100644 (file)
index 0000000..5c4adb8
--- /dev/null
+++ b/tcl/interface/stlink-hla.cfg
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+#
+# STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
+# debugger/programmer
+#
+
+echo "DEPRECATED: OpenOCD support for ST-Link HLA transport will be dropped soon!"
+echo "Consider updating your ST-Link firmware to a version >= V2J24 (2015)"
+
+adapter driver hla
+hla layout stlink
+hla device_desc "ST-LINK"
+hla vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757
+
+# Optionally specify the serial number of ST-LINK/V2 usb device.  ST-LINK/V2
+# devices seem to have serial numbers with unreadable characters.  ST-LINK/V2
+# firmware version >= V2.J21.S4 recommended to avoid issues with adapter serial
+# number reset issues.
+# eg.
+# adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"

diff --git a/tcl/interface/stlink.cfg b/tcl/interface/stlink.cfg
index 9b7f1f9ebf3c2e7f3f52e504e53cf7b2f4655d71..99c81c180c2ef01ec5da4337149d362ee410f5bb 100644 (file)
--- a/tcl/interface/stlink.cfg
+++ b/tcl/interface/stlink.cfg
@@ -4,15 +4,19 @@
 # STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
 # debugger/programmer
 #
+# This new interface driver creates a ST-Link wrapper for ARM-DAP named "dapdirect"
+# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support "dapdirect"
+#
+# SWIM transport is natively supported
+#
+
+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
 
-adapter driver hla
-hla layout stlink
-hla device_desc "ST-LINK"
-hla 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 swim
 
-# Optionally specify the serial number of ST-LINK/V2 usb device.  ST-LINK/V2
-# devices seem to have serial numbers with unreadable characters.  ST-LINK/V2
-# firmware version >= V2.J21.S4 recommended to avoid issues with adapter serial
-# number reset issues.
-# eg.
+# Optionally specify the serial number of usb device
+# e.g.
 # adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"