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
This commit is contained in:
Antonio Borneo 2020-01-30 18:11:54 +01:00
parent b4dc073881
commit 095809648b
5 changed files with 8 additions and 8 deletions

View File

@ -6,6 +6,6 @@
source [find interface/jlink.cfg] source [find interface/jlink.cfg]
transport select swd transport select swd
adapter_khz 1000 adapter speed 1000
source [find target/nrf52.cfg] source [find target/nrf52.cfg]

View File

@ -6,7 +6,7 @@
# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support this method # 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 st-link vid_pid 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
# transport select dapdirect_jtag # transport select dapdirect_jtag

View File

@ -33,4 +33,4 @@ if { ![using_hla] } {
cortex_m reset_config sysresetreq cortex_m reset_config sysresetreq
} }
adapter_khz 1000 adapter speed 1000

View File

@ -55,9 +55,9 @@ flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
# #
# Note that there is a pretty wide band where things are # Note that there is a pretty wide band where things are
# more or less stable, see http://openocd.zylin.com/#/c/3366/ # 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]} { if {[using_jtag]} {
jtag_ntrst_delay 100 jtag_ntrst_delay 100
} }
@ -77,12 +77,12 @@ $_TARGETNAME configure -event reset-init {
mmw 0x58004000 0x00000102 0 ;# FLASH_ACR |= PRFTBE | 2(Latency) mmw 0x58004000 0x00000102 0 ;# FLASH_ACR |= PRFTBE | 2(Latency)
mmw 0x58000000 0x00000091 0 ;# RCC_CR = MSI_ON | MSI Range 24 MHz mmw 0x58000000 0x00000091 0 ;# RCC_CR = MSI_ON | MSI Range 24 MHz
# Boost JTAG frequency # Boost JTAG frequency
adapter_khz 4000 adapter speed 4000
} }
$_TARGETNAME configure -event reset-start { $_TARGETNAME configure -event reset-start {
# Reset clock is MSI (4 MHz) # Reset clock is MSI (4 MHz)
adapter_khz 500 adapter speed 500
} }
$_TARGETNAME configure -event examine-end { $_TARGETNAME configure -event examine-end {

View File

@ -29,7 +29,7 @@ $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE
set _FLASHNAME $_CHIPNAME.flash set _FLASHNAME $_CHIPNAME.flash
flash bank $_FLASHNAME swm050 0x0 0x2000 0 0 $_TARGETNAME flash bank $_FLASHNAME swm050 0x0 0x2000 0 0 $_TARGETNAME
adapter_khz 1000 adapter speed 1000
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {
# Stop the watchdog, just to be safe # Stop the watchdog, just to be safe