diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2020-01-30 18:11:54 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2020-02-06 21:15:55 +0000 |
| commit | 095809648ba2aa018adef7a6ff75e9eaf2bb26bb (patch) | |
| tree | 71da1aab5bcb5c5ca4ba54c8fca84f83df47502c | |
| parent | b4dc07388181addb14980f45251ae26c0be6d34e (diff) | |
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
| -rw-r--r-- | tcl/board/rigado_bmd300_ek.cfg | 2 | ||||
| -rw-r--r-- | tcl/interface/stlink-dap.cfg | 2 | ||||
| -rw-r--r-- | tcl/target/infineon/tle987x.cfg | 2 | ||||
| -rw-r--r-- | tcl/target/stm32wbx.cfg | 8 | ||||
| -rw-r--r-- | tcl/target/swm050.cfg | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tcl/board/rigado_bmd300_ek.cfg b/tcl/board/rigado_bmd300_ek.cfg index 04e5e1f4..8e1e65ed 100644 --- 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 f889f74e..4576ad38 100644 --- 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 00cb1c03..84cc2380 100644 --- 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 138bcf18..90f53bb9 100644 --- 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 2c4ab34f..e6f2ecbf 100644 --- 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 |