tcl: fix remaining scripts after rework adapter commands

Some script have been added or modified after the patches for
reworking the adapter commands were pushed in gerrit.
Such scripts use the old command syntax and trigger a "deprecated"
warning at runtime.

Fix them with the same sed commands used for the other scripts:
	sed -i 's/^interface /adapter driver /' $(find tcl/ -type f)
	sed -i 's/adapter_khz/adapter speed/g' $(find tcl/ -type f)
	sed -i 's/adapter_nsrst_delay/adapter srst delay/g' $(find tcl/ -type f)
	sed -i 's/adapter_nsrst_assert_width/adapter srst pulse_width/g' $(find tcl/ -type f)

Change-Id: I0824d6c506a9af3eb9129b74c02a92b4eb1b100d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5424
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Tested-by: jenkins

diff --git a/tcl/board/rigado_bmd300_ek.cfg b/tcl/board/rigado_bmd300_ek.cfg
index 04e5e1f459d118263c6ea795ac52f92a54358ffc..8e1e65ed0d2715d83f4bef5cdd75ef363ba94a3f 100644 (file)
--- a/tcl/board/rigado_bmd300_ek.cfg
+++ b/tcl/board/rigado_bmd300_ek.cfg
@@ -6,6 +6,6 @@
 
 source [find interface/jlink.cfg]
 transport select swd
-adapter_khz 1000
+adapter speed 1000
 
 source [find target/nrf52.cfg]

diff --git a/tcl/interface/stlink-dap.cfg b/tcl/interface/stlink-dap.cfg
index f889f74ed65398075a5e5f0c33389c7ad0dffa1d..4576ad388e1a7f66d987287621cc8c88cf4dfb8e 100644 (file)
--- a/tcl/interface/stlink-dap.cfg
+++ b/tcl/interface/stlink-dap.cfg
@@ -6,7 +6,7 @@
 # Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support this method
 #
 
-interface st-link
+adapter driver st-link
 st-link vid_pid 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
 
 # transport select dapdirect_jtag

diff --git a/tcl/target/infineon/tle987x.cfg b/tcl/target/infineon/tle987x.cfg
index 00cb1c034f96e3c3f3ccbc4c3150b91180083771..84cc2380bd4e92b33101f63ab4943e82cfb52608 100644 (file)
--- a/tcl/target/infineon/tle987x.cfg
+++ b/tcl/target/infineon/tle987x.cfg
@@ -33,4 +33,4 @@ if { ![using_hla] } {
        cortex_m reset_config sysresetreq
 }
 
-adapter_khz 1000
+adapter speed 1000

diff --git a/tcl/target/stm32wbx.cfg b/tcl/target/stm32wbx.cfg
index 138bcf186bba999dd33d749fa86d0063e4e951ed..90f53bb967cf344afbd4430d1f90342d1073dba1 100644 (file)
--- a/tcl/target/stm32wbx.cfg
+++ b/tcl/target/stm32wbx.cfg
@@ -55,9 +55,9 @@ flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
 #
 # Note that there is a pretty wide band where things are
 # more or less stable, see http://openocd.zylin.com/#/c/3366/
-adapter_khz 500
+adapter speed 500
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 if {[using_jtag]} {
  jtag_ntrst_delay 100
 }
@@ -77,12 +77,12 @@ $_TARGETNAME configure -event reset-init {
     mmw 0x58004000 0x00000102 0  ;# FLASH_ACR |= PRFTBE | 2(Latency)
     mmw 0x58000000 0x00000091 0  ;# RCC_CR = MSI_ON | MSI Range 24 MHz
     # Boost JTAG frequency
-    adapter_khz 4000
+    adapter speed 4000
 }
 
 $_TARGETNAME configure -event reset-start {
     # Reset clock is MSI (4 MHz)
-    adapter_khz 500
+    adapter speed 500
 }
 
 $_TARGETNAME configure -event examine-end {

diff --git a/tcl/target/swm050.cfg b/tcl/target/swm050.cfg
index 2c4ab34fea59a5f33b4fcd20b79ffe68c066319c..e6f2ecbf9d2593fdb1b60eaf5db1e71b35437572 100644 (file)
--- a/tcl/target/swm050.cfg
+++ b/tcl/target/swm050.cfg
@@ -29,7 +29,7 @@ $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME swm050 0x0 0x2000 0 0 $_TARGETNAME
 
-adapter_khz 1000
+adapter speed 1000
 
 $_TARGETNAME configure -event reset-init {
        # Stop the watchdog, just to be safe