From 38ac08c1c25adf42cf20e48e10e6ddeab6a12d71 Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Fri, 23 Aug 2019 15:51:00 +0200
Subject: tcl: replace the deprecated commands with "adapter ..."

Avoid annoying "deprecated" messages while running the scripts
distributed with OpenOCD code.
Change automatically created with commands
	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)

Minor indentation issue fixed manually in
	tcl/board/at91sam9g20-ek.cfg
	tcl/target/at91sam9260_ext_RAM_ext_flash.cfg

Change-Id: I425fd56c0c88cd6b06124621306eeb89166dfe71
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5284
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
---
 tcl/board/actux3.cfg                            | 2 +-
 tcl/board/adsp-sc584-ezbrd.cfg                  | 2 +-
 tcl/board/altera_sockit.cfg                     | 2 +-
 tcl/board/arm_musca_a.cfg                       | 2 +-
 tcl/board/arty_s7.cfg                           | 2 +-
 tcl/board/at91cap7a-stk-sdram.cfg               | 4 ++--
 tcl/board/at91eb40a.cfg                         | 2 +-
 tcl/board/at91rm9200-dk.cfg                     | 4 ++--
 tcl/board/at91rm9200-ek.cfg                     | 6 +++---
 tcl/board/at91sam9g20-ek.cfg                    | 6 +++---
 tcl/board/atmel_sam3n_ek.cfg                    | 2 +-
 tcl/board/avnet_ultrazed-eg.cfg                 | 2 +-
 tcl/board/bcm28155_ap.cfg                       | 2 +-
 tcl/board/colibri.cfg                           | 2 +-
 tcl/board/crossbow_tech_imote2.cfg              | 2 +-
 tcl/board/csb337.cfg                            | 4 ++--
 tcl/board/csb732.cfg                            | 2 +-
 tcl/board/digi_connectcore_wi-9c.cfg            | 2 +-
 tcl/board/digilent_analog_discovery.cfg         | 2 +-
 tcl/board/dm365evm.cfg                          | 2 +-
 tcl/board/dp_busblaster_v3.cfg                  | 2 +-
 tcl/board/efm32.cfg                             | 2 +-
 tcl/board/ek-lm3s1968.cfg                       | 2 +-
 tcl/board/embedded-artists_lpc2478-32.cfg       | 2 +-
 tcl/board/emcraft_imx8m-som-bsb.cfg             | 4 ++--
 tcl/board/ethernut3.cfg                         | 4 ++--
 tcl/board/fsl_imx6q_sabresd.cfg                 | 4 ++--
 tcl/board/glyn_tonga2.cfg                       | 6 +++---
 tcl/board/hilscher_nxdb500sys.cfg               | 2 +-
 tcl/board/hilscher_nxeb500hmi.cfg               | 2 +-
 tcl/board/hilscher_nxhx10.cfg                   | 2 +-
 tcl/board/hilscher_nxhx50.cfg                   | 2 +-
 tcl/board/hilscher_nxhx500.cfg                  | 2 +-
 tcl/board/hilscher_nxsb100.cfg                  | 2 +-
 tcl/board/hitex_lpc1768stick.cfg                | 2 +-
 tcl/board/hitex_lpc2929.cfg                     | 8 ++++----
 tcl/board/hitex_stm32-performancestick.cfg      | 2 +-
 tcl/board/hitex_str9-comstick.cfg               | 4 ++--
 tcl/board/icnova_imx53_sodimm.cfg               | 4 ++--
 tcl/board/icnova_sam9g45_sodimm.cfg             | 6 +++---
 tcl/board/imx27lnst.cfg                         | 2 +-
 tcl/board/imx53-m53evk.cfg                      | 2 +-
 tcl/board/imx53loco.cfg                         | 4 ++--
 tcl/board/insignal_arndale.cfg                  | 2 +-
 tcl/board/kasli.cfg                             | 2 +-
 tcl/board/kc705.cfg                             | 2 +-
 tcl/board/kcu105.cfg                            | 2 +-
 tcl/board/kindle2.cfg                           | 4 ++--
 tcl/board/lubbock.cfg                           | 2 +-
 tcl/board/marsohod.cfg                          | 2 +-
 tcl/board/marsohod2.cfg                         | 2 +-
 tcl/board/marsohod3.cfg                         | 2 +-
 tcl/board/mcb1700.cfg                           | 4 ++--
 tcl/board/microchip_saml11_xplained_pro.cfg     | 2 +-
 tcl/board/mini2440.cfg                          | 6 +++---
 tcl/board/mini6410.cfg                          | 4 ++--
 tcl/board/numato_mimas_a7.cfg                   | 2 +-
 tcl/board/nxp_imx7sabre.cfg                     | 4 ++--
 tcl/board/nxp_mcimx8m-evk.cfg                   | 4 ++--
 tcl/board/olimex_sam7_la2.cfg                   | 8 ++++----
 tcl/board/openrd.cfg                            | 2 +-
 tcl/board/or1k_generic.cfg                      | 2 +-
 tcl/board/phytec_lpc3250.cfg                    | 8 ++++----
 tcl/board/pxa255_sst.cfg                        | 2 +-
 tcl/board/quark_d2000_refboard.cfg              | 2 +-
 tcl/board/quark_x10xx_board.cfg                 | 2 +-
 tcl/board/rsc-w910.cfg                          | 8 ++++----
 tcl/board/sayma_amc.cfg                         | 2 +-
 tcl/board/sheevaplug.cfg                        | 2 +-
 tcl/board/sifive-e31arty.cfg                    | 2 +-
 tcl/board/sifive-e51arty.cfg                    | 2 +-
 tcl/board/sifive-hifive1.cfg                    | 4 ++--
 tcl/board/telo.cfg                              | 8 ++++----
 tcl/board/ti_am437x_idk.cfg                     | 2 +-
 tcl/board/ti_am43xx_evm.cfg                     | 2 +-
 tcl/board/ti_beaglebone.cfg                     | 2 +-
 tcl/board/ti_beaglebone_black.cfg               | 2 +-
 tcl/board/ti_cc13x0_launchpad.cfg               | 2 +-
 tcl/board/ti_cc13x2_launchpad.cfg               | 2 +-
 tcl/board/ti_cc26x0_launchpad.cfg               | 2 +-
 tcl/board/ti_cc26x2_launchpad.cfg               | 2 +-
 tcl/board/ti_cc3200_launchxl.cfg                | 2 +-
 tcl/board/ti_cc3220sf_launchpad.cfg             | 2 +-
 tcl/board/ti_cc32xx_launchpad.cfg               | 2 +-
 tcl/board/ti_msp432_launchpad.cfg               | 2 +-
 tcl/board/ti_tmdx570ls31usb.cfg                 | 2 +-
 tcl/board/tocoding_poplar.cfg                   | 2 +-
 tcl/board/topas910.cfg                          | 2 +-
 tcl/board/topasa900.cfg                         | 2 +-
 tcl/board/twr-vf65gs10.cfg                      | 2 +-
 tcl/board/verdex.cfg                            | 2 +-
 tcl/board/voltcraft_dso-3062c.cfg               | 2 +-
 tcl/board/zy1000.cfg                            | 2 +-
 tcl/interface/calao-usb-a9260.cfg               | 2 +-
 tcl/interface/ft232r.cfg                        | 2 +-
 tcl/interface/ftdi/minispartan6.cfg             | 2 +-
 tcl/interface/ftdi/pipistrello.cfg              | 2 +-
 tcl/interface/nds32-aice.cfg                    | 2 +-
 "tcl/target/1986\320\262\320\2651\321\202.cfg"  | 4 ++--
 tcl/target/aduc702x.cfg                         | 2 +-
 tcl/target/aducm360.cfg                         | 4 ++--
 tcl/target/allwinner_v3s.cfg                    | 2 +-
 tcl/target/altera_fpgasoc.cfg                   | 6 +++---
 tcl/target/amdm37x.cfg                          | 6 +++---
 tcl/target/ar71xx.cfg                           | 2 +-
 tcl/target/at91sam3XXX.cfg                      | 4 ++--
 tcl/target/at91sam4XXX.cfg                      | 4 ++--
 tcl/target/at91sam4lXX.cfg                      | 4 ++--
 tcl/target/at91sam9.cfg                         | 4 ++--
 tcl/target/at91sam9260_ext_RAM_ext_flash.cfg    | 8 ++++----
 tcl/target/at91sam9g20.cfg                      | 2 +-
 tcl/target/at91samdXX.cfg                       | 4 ++--
 tcl/target/atheros_ar9331.cfg                   | 4 ++--
 tcl/target/atmega128.cfg                        | 6 +++---
 tcl/target/atmega128rfa1.cfg                    | 2 +-
 tcl/target/atsame5x.cfg                         | 2 +-
 tcl/target/atsamv.cfg                           | 2 +-
 tcl/target/avr32.cfg                            | 2 +-
 tcl/target/bcm6348.cfg                          | 2 +-
 tcl/target/bluenrg-x.cfg                        | 2 +-
 tcl/target/c100.cfg                             | 2 +-
 tcl/target/c100helper.tcl                       | 2 +-
 tcl/target/cc2538.cfg                           | 2 +-
 tcl/target/dragonite.cfg                        | 2 +-
 tcl/target/dsp56321.cfg                         | 2 +-
 tcl/target/dsp568013.cfg                        | 2 +-
 tcl/target/dsp568037.cfg                        | 2 +-
 tcl/target/efm32.cfg                            | 2 +-
 tcl/target/epc9301.cfg                          | 2 +-
 tcl/target/esi32xx.cfg                          | 2 +-
 tcl/target/feroceon.cfg                         | 2 +-
 tcl/target/fm3.cfg                              | 4 ++--
 tcl/target/fm4.cfg                              | 2 +-
 tcl/target/gp326xxxa.cfg                        | 8 ++++----
 tcl/target/imx28.cfg                            | 2 +-
 tcl/target/imx31.cfg                            | 2 +-
 tcl/target/imx6.cfg                             | 4 ++--
 tcl/target/is5114.cfg                           | 6 +++---
 tcl/target/k1921vk01t.cfg                       | 4 ++--
 tcl/target/ke0x.cfg                             | 2 +-
 tcl/target/klx.cfg                              | 2 +-
 tcl/target/ks869x.cfg                           | 2 +-
 tcl/target/kx.cfg                               | 2 +-
 tcl/target/lpc1850.cfg                          | 2 +-
 tcl/target/lpc1xxx.cfg                          | 4 ++--
 tcl/target/lpc2xxx.cfg                          | 4 ++--
 tcl/target/lpc3131.cfg                          | 2 +-
 tcl/target/lpc4350.cfg                          | 2 +-
 tcl/target/lpc4370.cfg                          | 2 +-
 tcl/target/lpc8nxx.cfg                          | 2 +-
 tcl/target/ls1012a.cfg                          | 2 +-
 tcl/target/max32620.cfg                         | 2 +-
 tcl/target/max32625.cfg                         | 2 +-
 tcl/target/max3263x.cfg                         | 2 +-
 tcl/target/mc13224v.cfg                         | 4 ++--
 tcl/target/mdr32f9q2i.cfg                       | 4 ++--
 tcl/target/nrf51.cfg                            | 2 +-
 tcl/target/nrf52.cfg                            | 2 +-
 tcl/target/numicro.cfg                          | 2 +-
 tcl/target/omap3530.cfg                         | 4 ++--
 tcl/target/omap5912.cfg                         | 2 +-
 tcl/target/omapl138.cfg                         | 4 ++--
 tcl/target/pic32mx.cfg                          | 2 +-
 tcl/target/psoc4.cfg                            | 6 +++---
 tcl/target/psoc6.cfg                            | 2 +-
 tcl/target/pxa255.cfg                           | 4 ++--
 tcl/target/pxa270.cfg                           | 4 ++--
 tcl/target/pxa3xx.cfg                           | 4 ++--
 tcl/target/qualcomm_qca4531.cfg                 | 4 ++--
 tcl/target/readme.txt                           | 6 +++---
 tcl/target/renesas_s7g2.cfg                     | 2 +-
 tcl/target/samsung_s3c2450.cfg                  | 4 ++--
 tcl/target/samsung_s3c6410.cfg                  | 2 +-
 tcl/target/sim3x.cfg                            | 4 ++--
 tcl/target/smp8634.cfg                          | 2 +-
 tcl/target/stellaris.cfg                        | 4 ++--
 tcl/target/stm32f0x.cfg                         | 8 ++++----
 tcl/target/stm32f1x.cfg                         | 4 ++--
 tcl/target/stm32f2x.cfg                         | 4 ++--
 tcl/target/stm32f3x.cfg                         | 8 ++++----
 tcl/target/stm32f4x.cfg                         | 8 ++++----
 tcl/target/stm32f7x.cfg                         | 8 ++++----
 tcl/target/stm32h7x.cfg                         | 6 +++---
 tcl/target/stm32l0.cfg                          | 8 ++++----
 tcl/target/stm32l1.cfg                          | 8 ++++----
 tcl/target/stm32l4x.cfg                         | 8 ++++----
 tcl/target/stm8l.cfg                            | 2 +-
 tcl/target/stm8s.cfg                            | 2 +-
 tcl/target/str710.cfg                           | 6 +++---
 tcl/target/str730.cfg                           | 8 ++++----
 tcl/target/str750.cfg                           | 8 ++++----
 tcl/target/str912.cfg                           | 8 ++++----
 tcl/target/ti_calypso.cfg                       | 2 +-
 tcl/target/ti_cc26x0.cfg                        | 2 +-
 tcl/target/ti_cc32xx.cfg                        | 2 +-
 tcl/target/ti_dm355.cfg                         | 4 ++--
 tcl/target/ti_dm365.cfg                         | 4 ++--
 tcl/target/ti_dm6446.cfg                        | 4 ++--
 tcl/target/ti_msp432.cfg                        | 2 +-
 tcl/target/ti_tms570.cfg                        | 2 +-
 tcl/target/tmpa900.cfg                          | 2 +-
 tcl/target/tmpa910.cfg                          | 2 +-
 tcl/target/u8500.cfg                            | 2 +-
 tcl/target/vybrid_vf6xx.cfg                     | 2 +-
 tcl/target/xmc1xxx.cfg                          | 2 +-
 tcl/target/xmc4xxx.cfg                          | 2 +-
 tcl/target/zynq_7000.cfg                        | 2 +-
 "tcl/target/\320\2721879x\320\2611\321\217.cfg" | 2 +-
 tcl/test/syntax1.cfg                            | 2 +-
 tcl/tools/firmware-recovery.tcl                 | 4 ++--
 210 files changed, 332 insertions(+), 332 deletions(-)

diff --git a/tcl/board/actux3.cfg b/tcl/board/actux3.cfg
index 5435ff88..0de4cb4c 100644
--- a/tcl/board/actux3.cfg
+++ b/tcl/board/actux3.cfg
@@ -4,7 +4,7 @@
 
 reset_config trst_and_srst separate
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 jtag_ntrst_delay 100
 
 source [find target/ixp42x.cfg]
diff --git a/tcl/board/adsp-sc584-ezbrd.cfg b/tcl/board/adsp-sc584-ezbrd.cfg
index 1054a941..439fe926 100644
--- a/tcl/board/adsp-sc584-ezbrd.cfg
+++ b/tcl/board/adsp-sc584-ezbrd.cfg
@@ -25,7 +25,7 @@ source [find interface/jlink.cfg]
 transport select swd
 
 # chosen speed is 'safe' choice, but your adapter may be capable of more
-adapter_khz 400
+adapter speed 400
 
 source [find target/adsp-sc58x.cfg]
 
diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index 1466bd46..3fd01be3 100644
--- a/tcl/board/altera_sockit.cfg
+++ b/tcl/board/altera_sockit.cfg
@@ -15,5 +15,5 @@ source [find target/altera_fpgasoc.cfg]
 #usb_blaster_vid_pid 0x6810 0x09fb
 #usb_blaster_device_desc "USB-Blaster II"
 
-adapter_khz 100
+adapter speed 100
 
diff --git a/tcl/board/arm_musca_a.cfg b/tcl/board/arm_musca_a.cfg
index fa7cf5ee..25f8ce61 100644
--- a/tcl/board/arm_musca_a.cfg
+++ b/tcl/board/arm_musca_a.cfg
@@ -15,7 +15,7 @@
 source [find target/swj-dp.tcl]
 
 # set a safe JTAG clock speed, can be overridden
-adapter_khz 1000
+adapter speed 1000
 
 global _CHIPNAME
 if { [info exists CHIPNAME] } {
diff --git a/tcl/board/arty_s7.cfg b/tcl/board/arty_s7.cfg
index ca7d3f1c..5ab40839 100644
--- a/tcl/board/arty_s7.cfg
+++ b/tcl/board/arty_s7.cfg
@@ -10,7 +10,7 @@ source [find interface/ftdi/digilent-hs1.cfg]
 source [find cpld/xilinx-xc7.cfg]
 source [find cpld/jtagspi.cfg]
 
-adapter_khz 25000
+adapter speed 25000
 
 # Usage:
 #
diff --git a/tcl/board/at91cap7a-stk-sdram.cfg b/tcl/board/at91cap7a-stk-sdram.cfg
index 9bc02e8c..a0e393f2 100644
--- a/tcl/board/at91cap7a-stk-sdram.cfg
+++ b/tcl/board/at91cap7a-stk-sdram.cfg
@@ -28,7 +28,7 @@ target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAM
 
 $_TARGETNAME configure -event reset-start {
 	# start off real slow when we're running off internal RC oscillator
-	adapter_khz 32
+	adapter speed 32
 }
 
 proc peek32 {address} {
@@ -78,7 +78,7 @@ $_TARGETNAME configure -event reset-init {
 	echo "Master clock ok."
 	
 	# Now that we're up and running, crank up speed!
-	global post_reset_khz ;	adapter_khz $post_reset_khz
+	global post_reset_khz ;	adapter speed $post_reset_khz
 	
 	echo "Configuring the SDRAM controller..."
 
diff --git a/tcl/board/at91eb40a.cfg b/tcl/board/at91eb40a.cfg
index d8a82a59..d314e181 100644
--- a/tcl/board/at91eb40a.cfg
+++ b/tcl/board/at91eb40a.cfg
@@ -64,4 +64,4 @@ $_TARGETNAME configure -event reset-init {
 }
 
 # This target is pretty snappy...
-adapter_khz 16000
+adapter speed 16000
diff --git a/tcl/board/at91rm9200-dk.cfg b/tcl/board/at91rm9200-dk.cfg
index f484fded..b8ec00ea 100644
--- a/tcl/board/at91rm9200-dk.cfg
+++ b/tcl/board/at91rm9200-dk.cfg
@@ -19,7 +19,7 @@ flash bank $_FLASHNAME cfi 0x10000000 0x00200000 2 2 $_TARGETNAME
 proc at91rm9200_dk_init { } {
     # Try to run at 1khz... Yea, that slow!
     # Chip is really running @ 32khz
-    adapter_khz 8
+    adapter speed 8
 
     mww 0xfffffc64 0xffffffff
     ##  disable all clocks but system clock
@@ -45,7 +45,7 @@ proc at91rm9200_dk_init { } {
     #========================================
     # CPU now runs at 180mhz
     # SYS runs at 60mhz.
-    adapter_khz 40000
+    adapter speed 40000
     #========================================
 
 
diff --git a/tcl/board/at91rm9200-ek.cfg b/tcl/board/at91rm9200-ek.cfg
index a3f253a2..958bc9d5 100644
--- a/tcl/board/at91rm9200-ek.cfg
+++ b/tcl/board/at91rm9200-ek.cfg
@@ -19,12 +19,12 @@ set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME cfi 0x10000000 0x00800000 2 2 $_TARGETNAME
 
 # The chip may run @ 32khz, so set a really low JTAG speed
-adapter_khz 8
+adapter speed 8
 
 proc at91rm9200_ek_init { } {
 	# Try to run at 1khz... Yea, that slow!
 	# Chip is really running @ 32khz
-	adapter_khz 8
+	adapter speed 8
 
 	mww 0xfffffc64 0xffffffff
 	## disable all clocks but system clock
@@ -61,7 +61,7 @@ proc at91rm9200_ek_init { } {
 	#========================================
 	# CPU now runs at 180mhz
 	# SYS runs at 60mhz.
-	adapter_khz 40000
+	adapter speed 40000
 	#========================================
 
 	## Init SDRAM
diff --git a/tcl/board/at91sam9g20-ek.cfg b/tcl/board/at91sam9g20-ek.cfg
index 741d6018..773c8899 100644
--- a/tcl/board/at91sam9g20-ek.cfg
+++ b/tcl/board/at91sam9g20-ek.cfg
@@ -19,7 +19,7 @@ set _FLASHTYPE nandflash_cs3
 
 reset_config srst_only
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
 
 # If you don't want to execute built-in boot rom code (and there are good reasons at times not to do that) in the
@@ -54,7 +54,7 @@ proc at91sam9g20_reset_start { } {
 	# jtag speed without causing GDB keep alive problem.
 
 	arm7_9 fast_memory_access disable
-	adapter_khz 2                   ;# Slow-speed oscillator enabled at reset, so run jtag speed slow.
+	adapter speed 2                 ;# Slow-speed oscillator enabled at reset, so run jtag speed slow.
 	halt                            ;# Make sure processor is halted, or error will result in following steps.
 	wait_halt 10000
 	mww 0xfffffd08 0xa5000501       ;# RSTC_MR : enable user reset.
@@ -103,7 +103,7 @@ proc at91sam9g20_reset_init { } {
 
 	# Switch over to adaptive clocking.
 
-	adapter_khz 0
+	adapter speed 0
 
 	# Enable faster DCC downloads and memory accesses.
 
diff --git a/tcl/board/atmel_sam3n_ek.cfg b/tcl/board/atmel_sam3n_ek.cfg
index 2ae73ebf..e43008f1 100644
--- a/tcl/board/atmel_sam3n_ek.cfg
+++ b/tcl/board/atmel_sam3n_ek.cfg
@@ -7,6 +7,6 @@ reset_config srst_only
 
 set CHIPNAME at91sam3n4c
 
-adapter_khz 32
+adapter speed 32
 
 source [find target/at91sam3nXX.cfg]
diff --git a/tcl/board/avnet_ultrazed-eg.cfg b/tcl/board/avnet_ultrazed-eg.cfg
index 9879bfcb..3e4a11a3 100644
--- a/tcl/board/avnet_ultrazed-eg.cfg
+++ b/tcl/board/avnet_ultrazed-eg.cfg
@@ -9,7 +9,7 @@ transport select jtag
 reset_config none
 
 # slow default clock
-adapter_khz 1000
+adapter speed 1000
 
 set CHIPNAME uscale
 
diff --git a/tcl/board/bcm28155_ap.cfg b/tcl/board/bcm28155_ap.cfg
index fb729e19..770ff9cd 100644
--- a/tcl/board/bcm28155_ap.cfg
+++ b/tcl/board/bcm28155_ap.cfg
@@ -1,6 +1,6 @@
 # BCM28155_AP
 
-adapter_khz 20000
+adapter speed 20000
 
 set CHIPNAME bcm28155
 source [find target/bcm281xx.cfg]
diff --git a/tcl/board/colibri.cfg b/tcl/board/colibri.cfg
index 7c1f1cb5..fe9a3d50 100644
--- a/tcl/board/colibri.cfg
+++ b/tcl/board/colibri.cfg
@@ -1,7 +1,7 @@
 # Toradex Colibri PXA270
 source [find target/pxa270.cfg]
 reset_config trst_and_srst srst_push_pull
-adapter_nsrst_assert_width 40
+adapter srst pulse_width 40
 
 # CS0 -- one bank of CFI flash, 32 MBytes
 # the bank is 32-bits wide, two 16-bit chips in parallel
diff --git a/tcl/board/crossbow_tech_imote2.cfg b/tcl/board/crossbow_tech_imote2.cfg
index 002b5372..277c353a 100644
--- a/tcl/board/crossbow_tech_imote2.cfg
+++ b/tcl/board/crossbow_tech_imote2.cfg
@@ -4,7 +4,7 @@ set  CHIPNAME imote2
 source [find target/pxa270.cfg]
 
 # longer-than-normal reset delay
-adapter_nsrst_delay 800
+adapter srst delay 800
 
 reset_config trst_and_srst separate
 
diff --git a/tcl/board/csb337.cfg b/tcl/board/csb337.cfg
index 5e225f5f..a9d01392 100644
--- a/tcl/board/csb337.cfg
+++ b/tcl/board/csb337.cfg
@@ -19,7 +19,7 @@ if { [info exists ETM_DRIVER] } {
 
 proc csb337_clk_init { } {
 	# CPU is in Slow Clock Mode (32KiHz) ... needs slow JTAG clock
-	adapter_khz 8
+	adapter speed 8
 
 	# CKGR_MOR:  start main oscillator (3.6864 MHz)
 	mww 0xfffffc20 0xff01
@@ -37,7 +37,7 @@ proc csb337_clk_init { } {
 	sleep 20
 
 	# CPU is in Normal Mode ... allows faster JTAG clock speed
-	adapter_khz 40000
+	adapter speed 40000
 }
 
 proc csb337_nor_init { } {
diff --git a/tcl/board/csb732.cfg b/tcl/board/csb732.cfg
index 4d6f0e48..35e397ff 100644
--- a/tcl/board/csb732.cfg
+++ b/tcl/board/csb732.cfg
@@ -3,7 +3,7 @@ source [find target/imx35.cfg]
 
 # Determined by trial and error
 reset_config trst_and_srst combined
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
 
 $_TARGETNAME configure -event gdb-attach { reset init }
diff --git a/tcl/board/digi_connectcore_wi-9c.cfg b/tcl/board/digi_connectcore_wi-9c.cfg
index 8a8d4c3b..43ad1c90 100644
--- a/tcl/board/digi_connectcore_wi-9c.cfg
+++ b/tcl/board/digi_connectcore_wi-9c.cfg
@@ -36,7 +36,7 @@ if { [info exists CPUTAPID] } {
 set _TARGETNAME $_CHIPNAME.cpu
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 0
 
 
diff --git a/tcl/board/digilent_analog_discovery.cfg b/tcl/board/digilent_analog_discovery.cfg
index 65eb6608..954e5400 100644
--- a/tcl/board/digilent_analog_discovery.cfg
+++ b/tcl/board/digilent_analog_discovery.cfg
@@ -13,6 +13,6 @@ ftdi_vid_pid 0x0403 0x6014
 
 ftdi_layout_init 0x8008 0x800b
 
-adapter_khz 25000
+adapter speed 25000
 
 source [find cpld/xilinx-xc6s.cfg]
diff --git a/tcl/board/dm365evm.cfg b/tcl/board/dm365evm.cfg
index 8f268c45..ed34c4b2 100644
--- a/tcl/board/dm365evm.cfg
+++ b/tcl/board/dm365evm.cfg
@@ -103,7 +103,7 @@ proc dm365evm_init {} {
 	echo "Initialize DM365 EVM board"
 
 	# CLKIN	= 24 MHz ... can't talk quickly to ARM yet
-	adapter_khz 1500
+	adapter speed 1500
 
 	# FIXME -- PLL init
 
diff --git a/tcl/board/dp_busblaster_v3.cfg b/tcl/board/dp_busblaster_v3.cfg
index f21197b7..a9974d9b 100644
--- a/tcl/board/dp_busblaster_v3.cfg
+++ b/tcl/board/dp_busblaster_v3.cfg
@@ -4,7 +4,7 @@
 # http://dangerousprototypes.com/docs/Bus_Blaster
 #
 # To reprogram the on-board CPLD do:
-# openocd -f board/dp_busblaster_v3.cfg -c "adapter_khz 1000; init; svf <path_to_svf>; shutdown"
+# openocd -f board/dp_busblaster_v3.cfg -c "adapter speed 1000; init; svf <path_to_svf>; shutdown"
 #
 
 source [find interface/ftdi/dp_busblaster.cfg]
diff --git a/tcl/board/efm32.cfg b/tcl/board/efm32.cfg
index d2bc9a61..adbdda72 100644
--- a/tcl/board/efm32.cfg
+++ b/tcl/board/efm32.cfg
@@ -5,7 +5,7 @@
 
 source [find interface/jlink.cfg]
 transport select swd
-adapter_khz 1000
+adapter speed 1000
 
 set CHIPNAME efm32
 source [find target/efm32.cfg]
diff --git a/tcl/board/ek-lm3s1968.cfg b/tcl/board/ek-lm3s1968.cfg
index 8d990b19..bbb04baa 100644
--- a/tcl/board/ek-lm3s1968.cfg
+++ b/tcl/board/ek-lm3s1968.cfg
@@ -5,7 +5,7 @@
 #
 
 # NOTE:  to use J-Link instead of the on-board interface,
-# you may also need to reduce adapter_khz to be about 1200.
+# you may also need to reduce adapter speed to be about 1200.
 # source [find interface/jlink.cfg]
 
 # include the FT2232 interface config for on-board JTAG interface
diff --git a/tcl/board/embedded-artists_lpc2478-32.cfg b/tcl/board/embedded-artists_lpc2478-32.cfg
index b036cd69..6c3aec64 100644
--- a/tcl/board/embedded-artists_lpc2478-32.cfg
+++ b/tcl/board/embedded-artists_lpc2478-32.cfg
@@ -15,7 +15,7 @@ proc read_register {register} {
 
 proc init_board {} {
     # Delays on reset lines
-    adapter_nsrst_delay 500
+    adapter srst delay 500
     jtag_ntrst_delay 1
 
     # Adaptive JTAG clocking through RTCK.
diff --git a/tcl/board/emcraft_imx8m-som-bsb.cfg b/tcl/board/emcraft_imx8m-som-bsb.cfg
index 5571d0ec..248c0d40 100644
--- a/tcl/board/emcraft_imx8m-som-bsb.cfg
+++ b/tcl/board/emcraft_imx8m-som-bsb.cfg
@@ -6,13 +6,13 @@
 transport select jtag
 
 # set a safe JTAG clock speed, can be overridden
-adapter_khz 1000
+adapter speed 1000
 
 # SRST and TRST are wired up
 reset_config trst_and_srst
 
 # delay after SRST goes inactive
-adapter_nsrst_delay 70
+adapter srst delay 70
 
 # board has an i.MX8MQ with 4 Cortex-A53 cores
 set CHIPNAME imx8mq
diff --git a/tcl/board/ethernut3.cfg b/tcl/board/ethernut3.cfg
index ad455273..72fc5ade 100644
--- a/tcl/board/ethernut3.cfg
+++ b/tcl/board/ethernut3.cfg
@@ -20,13 +20,13 @@ flash bank $_FLASHNAME cfi 0x10000000 0x400000 2 2 $_TARGETNAME
 # Micrel MIC2775-29YM5 Supervisor
 # Reset output will remain active for 280ms (maximum)
 #
-adapter_nsrst_delay 300
+adapter srst delay 300
 jtag_ntrst_delay 300
 
 
 arm7_9 fast_memory_access enable
 arm7_9 dcc_downloads enable
-adapter_khz 16000
+adapter speed 16000
 
 
 # Target events
diff --git a/tcl/board/fsl_imx6q_sabresd.cfg b/tcl/board/fsl_imx6q_sabresd.cfg
index e1f0892f..cf34cd16 100644
--- a/tcl/board/fsl_imx6q_sabresd.cfg
+++ b/tcl/board/fsl_imx6q_sabresd.cfg
@@ -13,7 +13,7 @@ transport select jtag
 
 # iMX6Q POR gates JTAG and the chip is completely incommunicado
 # over JTAG for at least 10ms after nSRST is deasserted
-adapter_nsrst_delay 11
+adapter srst delay 11
 
 # Source generic iMX6Q target configuration
 set CHIPNAME imx6q
@@ -144,4 +144,4 @@ $_TARGETNAME.0 configure -event reset-assert { }
 # hook the init function into the reset-init event
 $_TARGETNAME.0 configure -event reset-init { imx6q_sabresd_init }
 # set a slow default JTAG clock, can be overridden later
-adapter_khz 1000
+adapter speed 1000
diff --git a/tcl/board/glyn_tonga2.cfg b/tcl/board/glyn_tonga2.cfg
index 17ed3cf2..31aa9ff5 100644
--- a/tcl/board/glyn_tonga2.cfg
+++ b/tcl/board/glyn_tonga2.cfg
@@ -19,12 +19,12 @@ source [find target/tmpa900.cfg]
 # Initial JTAG speed should not exceed 1/6 of the initial CPU clock
 # frequency (24MHz). Be conservative and use 1/8 of the frequency.
 # (24MHz / 8 = 3MHz)
-adapter_khz 3000
+adapter speed 3000
 
 $_TARGETNAME configure -event reset-start {
 	# Upon reset, set the JTAG frequency to 3MHz again, see above.
 	echo "Setting JTAG speed to 3MHz until clocks are initialized."
-	adapter_khz 3000
+	adapter speed 3000
 
 	# Halt the CPU.
 	halt
@@ -41,7 +41,7 @@ $_TARGETNAME configure -event reset-init {
 	# Tests showed that 15MHz works OK, higher speeds can cause problems,
 	# though. Not sure if this is a CPU issue or JTAG adapter issue.
 	echo "Increasing JTAG speed to 15MHz."
-	adapter_khz 15000
+	adapter speed 15000
 
 	# Enable faster memory access.
 	arm7_9 fast_memory_access enable
diff --git a/tcl/board/hilscher_nxdb500sys.cfg b/tcl/board/hilscher_nxdb500sys.cfg
index 77073e72..d71c4453 100644
--- a/tcl/board/hilscher_nxdb500sys.cfg
+++ b/tcl/board/hilscher_nxdb500sys.cfg
@@ -5,7 +5,7 @@
 source [find target/hilscher_netx500.cfg]
 
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x1000 -work-area-phys 0x1000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hilscher_nxeb500hmi.cfg b/tcl/board/hilscher_nxeb500hmi.cfg
index 64391561..aa3d5870 100644
--- a/tcl/board/hilscher_nxeb500hmi.cfg
+++ b/tcl/board/hilscher_nxeb500hmi.cfg
@@ -5,7 +5,7 @@
 source [find target/hilscher_netx500.cfg]
 
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x1000 -work-area-phys 0x1000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hilscher_nxhx10.cfg b/tcl/board/hilscher_nxhx10.cfg
index 4ef2f3b9..7ff99165 100644
--- a/tcl/board/hilscher_nxhx10.cfg
+++ b/tcl/board/hilscher_nxhx10.cfg
@@ -9,7 +9,7 @@ source [find target/hilscher_netx10.cfg]
 # problems try to line below
 # reset_config trst_and_srst srst_pulls_trst
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x08000000 -work-area-phys 0x08000000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hilscher_nxhx50.cfg b/tcl/board/hilscher_nxhx50.cfg
index eebb1652..0867f2ed 100644
--- a/tcl/board/hilscher_nxhx50.cfg
+++ b/tcl/board/hilscher_nxhx50.cfg
@@ -5,7 +5,7 @@
 source [find target/hilscher_netx50.cfg]
 
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x10000000 -work-area-phys 0x10000000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hilscher_nxhx500.cfg b/tcl/board/hilscher_nxhx500.cfg
index dd3a9514..2ba030ec 100644
--- a/tcl/board/hilscher_nxhx500.cfg
+++ b/tcl/board/hilscher_nxhx500.cfg
@@ -5,7 +5,7 @@
 source [find target/hilscher_netx500.cfg]
 
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x1000 -work-area-phys 0x1000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hilscher_nxsb100.cfg b/tcl/board/hilscher_nxsb100.cfg
index efb091b1..807e2920 100644
--- a/tcl/board/hilscher_nxsb100.cfg
+++ b/tcl/board/hilscher_nxsb100.cfg
@@ -5,7 +5,7 @@
 source [find target/hilscher_netx500.cfg]
 
 reset_config trst_and_srst
-adapter_nsrst_delay 500
+adapter srst delay 500
 jtag_ntrst_delay 500
 
 $_TARGETNAME configure -work-area-virt 0x1000 -work-area-phys 0x1000 -work-area-size 0x4000 -work-area-backup 1
diff --git a/tcl/board/hitex_lpc1768stick.cfg b/tcl/board/hitex_lpc1768stick.cfg
index 161e9654..8c119360 100644
--- a/tcl/board/hitex_lpc1768stick.cfg
+++ b/tcl/board/hitex_lpc1768stick.cfg
@@ -11,5 +11,5 @@ source [find target/lpc17xx.cfg]
 
 
 # startup @ 500kHz
-adapter_khz 500
+adapter speed 500
 
diff --git a/tcl/board/hitex_lpc2929.cfg b/tcl/board/hitex_lpc2929.cfg
index d2515371..f5177986 100644
--- a/tcl/board/hitex_lpc2929.cfg
+++ b/tcl/board/hitex_lpc2929.cfg
@@ -2,12 +2,12 @@
 # http://www.hitex.com/
 
 # Delays on reset lines
-adapter_nsrst_delay 50
+adapter srst delay 50
 jtag_ntrst_delay 1
 
 # Maximum of 1/8 of clock frequency (XTAL = 16 MHz).
 # Adaptive clocking through RTCK is not supported.
-adapter_khz 2000
+adapter speed 2000
 
 # Target device: LPC29xx with ETB
 # The following variables are used by the LPC2900 script:
@@ -24,7 +24,7 @@ $_TARGETNAME configure -work-area-phys 0x58000000 -work-area-size 0x10000 -work-
 # Event handlers
 $_TARGETNAME configure -event reset-start {
   # Back to the slow JTAG clock
-  adapter_khz 2000
+  adapter speed 2000
 }
 
 # External 16-bit flash at chip select CS7 (SST39VF3201-70, 4 MiB)
@@ -46,7 +46,7 @@ $_TARGETNAME configure -event reset-init {
   mww 0xFFFF8070 0x02000000     ;# SYS_CLK_CONF: PLL
 
   # Increase JTAG speed
-  adapter_khz 6000
+  adapter speed 6000
 
   # Enable external memory bus (16-bit SRAM at CS6, 16-bit flash at CS7)
   mww 0xE0001138 0x0000001F     ;# P1.14 = D0
diff --git a/tcl/board/hitex_stm32-performancestick.cfg b/tcl/board/hitex_stm32-performancestick.cfg
index 82fb1696..738178af 100644
--- a/tcl/board/hitex_stm32-performancestick.cfg
+++ b/tcl/board/hitex_stm32-performancestick.cfg
@@ -12,5 +12,5 @@ source [find target/stm32f1x.cfg]
 jtag newtap str750 cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id 0x4f1f0041
 
 # for some reason this board like to startup @ 500kHz
-adapter_khz 500
+adapter speed 500
 
diff --git a/tcl/board/hitex_str9-comstick.cfg b/tcl/board/hitex_str9-comstick.cfg
index be153314..3b922521 100644
--- a/tcl/board/hitex_str9-comstick.cfg
+++ b/tcl/board/hitex_str9-comstick.cfg
@@ -5,9 +5,9 @@
 source [find interface/ftdi/hitex_str9-comstick.cfg]
 
 # set jtag speed
-adapter_khz 3000
+adapter speed 3000
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 jtag_ntrst_delay 100
 #use combined on interfaces or targets that can't set TRST/SRST separately
 reset_config trst_and_srst
diff --git a/tcl/board/icnova_imx53_sodimm.cfg b/tcl/board/icnova_imx53_sodimm.cfg
index aa6a148a..2345ef12 100644
--- a/tcl/board/icnova_imx53_sodimm.cfg
+++ b/tcl/board/icnova_imx53_sodimm.cfg
@@ -15,7 +15,7 @@ echo "i.MX53 SO-Dimm board lodaded."
 # Set reset type
 #reset_config srst_only
 
-adapter_khz 3000
+adapter speed 3000
 
 # Slow speed to be sure it will work
 jtag_rclk 1000
@@ -58,7 +58,7 @@ proc sodimm_init { } {
 	arm core_state arm
 
 	jtag_rclk 3000
-#	adapter_khz 3000
+#	adapter speed 3000
 }
 
 
diff --git a/tcl/board/icnova_sam9g45_sodimm.cfg b/tcl/board/icnova_sam9g45_sodimm.cfg
index 84dab389..bf70cca9 100644
--- a/tcl/board/icnova_sam9g45_sodimm.cfg
+++ b/tcl/board/icnova_sam9g45_sodimm.cfg
@@ -15,7 +15,7 @@ source [find target/at91sam9g45.cfg]
 # Set reset type.
 # reset_config trst_and_srst
 
-# adapter_nsrst_delay 200
+# adapter srst delay 200
 # jtag_ntrst_delay 200
 
 
@@ -58,7 +58,7 @@ proc at91sam9g45_start { } {
 
 	arm7_9 fast_memory_access disable
     # Slow-speed oscillator enabled at reset, so run jtag speed slow.
-	adapter_khz 4
+	adapter speed 4
     # Make sure processor is halted, or error will result in following steps.
 	halt
 	wait_halt 10000
@@ -117,7 +117,7 @@ proc at91sam9g45_init { } {
 
 	# Switch over to adaptive clocking.
 
-	adapter_khz 6000
+	adapter speed 6000
 
 	# Enable faster DCC downloads.
 
diff --git a/tcl/board/imx27lnst.cfg b/tcl/board/imx27lnst.cfg
index e0ed0579..ac5a9f3e 100644
--- a/tcl/board/imx27lnst.cfg
+++ b/tcl/board/imx27lnst.cfg
@@ -8,7 +8,7 @@ proc imx27lnst_init { } {
 	# This setup puts RAM at 0xA0000000
 
 	# reset the board correctly
-	adapter_khz 500
+	adapter speed 500
 	reset run
 	reset halt
 
diff --git a/tcl/board/imx53-m53evk.cfg b/tcl/board/imx53-m53evk.cfg
index eada27ab..d18afc73 100644
--- a/tcl/board/imx53-m53evk.cfg
+++ b/tcl/board/imx53-m53evk.cfg
@@ -18,7 +18,7 @@ echo "iMX53 M53EVK board lodaded."
 reset_config trst_and_srst separate trst_open_drain srst_open_drain
 
 # Run at 6 MHz
-adapter_khz 6000
+adapter speed 6000
 
 $_TARGETNAME configure -event "reset-assert" {
 	echo "Reseting ...."
diff --git a/tcl/board/imx53loco.cfg b/tcl/board/imx53loco.cfg
index 06c39937..57473ead 100644
--- a/tcl/board/imx53loco.cfg
+++ b/tcl/board/imx53loco.cfg
@@ -13,7 +13,7 @@ echo "iMX53 Loco board lodaded."
 # Set reset type
 #reset_config srst_only
 
-adapter_khz 3000
+adapter speed 3000
 
 # Slow speed to be sure it will work
 jtag_rclk 1000
@@ -59,7 +59,7 @@ proc loco_init { } {
 	arm core_state arm
 
 	jtag_rclk 3000
-#	adapter_khz 3000
+#	adapter speed 3000
 }
 
 
diff --git a/tcl/board/insignal_arndale.cfg b/tcl/board/insignal_arndale.cfg
index 25c123e7..09a7223f 100644
--- a/tcl/board/insignal_arndale.cfg
+++ b/tcl/board/insignal_arndale.cfg
@@ -5,4 +5,4 @@
 source [find target/exynos5250.cfg]
 
 # Experimentally determined highest working speed
-adapter_khz 200
+adapter speed 200
diff --git a/tcl/board/kasli.cfg b/tcl/board/kasli.cfg
index fb59f931..06cc1e6c 100644
--- a/tcl/board/kasli.cfg
+++ b/tcl/board/kasli.cfg
@@ -7,7 +7,7 @@ ftdi_layout_init 0x0008 0x000b
 
 reset_config none
 transport select jtag
-adapter_khz 25000
+adapter speed 25000
 
 source [find cpld/xilinx-xc7.cfg]
 source [find cpld/jtagspi.cfg]
diff --git a/tcl/board/kc705.cfg b/tcl/board/kc705.cfg
index e032e9b2..51ea14d4 100644
--- a/tcl/board/kc705.cfg
+++ b/tcl/board/kc705.cfg
@@ -5,7 +5,7 @@ source [find cpld/xilinx-xc7.cfg]
 source [find cpld/jtagspi.cfg]
 source [find fpga/xilinx-xadc.cfg]
 source [find fpga/xilinx-dna.cfg]
-adapter_khz 25000
+adapter speed 25000
 
 # example command to write bitstream, soft-cpu bios and runtime:
 # openocd -f board/kc705.cfg -c "init;\
diff --git a/tcl/board/kcu105.cfg b/tcl/board/kcu105.cfg
index c8daea65..e2b68ca7 100644
--- a/tcl/board/kcu105.cfg
+++ b/tcl/board/kcu105.cfg
@@ -8,4 +8,4 @@ source [find cpld/xilinx-xcu.cfg]
 
 source [find cpld/jtagspi.cfg]
 
-adapter_khz 25000
+adapter speed 25000
diff --git a/tcl/board/kindle2.cfg b/tcl/board/kindle2.cfg
index f32b2a32..fbb1022f 100644
--- a/tcl/board/kindle2.cfg
+++ b/tcl/board/kindle2.cfg
@@ -18,7 +18,7 @@ source [find target/imx31.cfg]
 source [find target/imx.cfg]
 
 $_TARGETNAME configure -event reset-init { kindle2_init }
-$_TARGETNAME configure -event reset-start { adapter_khz 1000 }
+$_TARGETNAME configure -event reset-start { adapter speed 1000 }
 
 # 8MiB NOR Flash
 set _FLASHNAME $_CHIPNAME.flash
@@ -36,7 +36,7 @@ jtag_ntrst_delay 30
 # this is broken but enabled by default
 arm11 memwrite burst disable
 
-adapter_khz 1000
+adapter speed 1000
 ftdi_tdo_sample_edge falling
 
 proc kindle2_init {} {
diff --git a/tcl/board/lubbock.cfg b/tcl/board/lubbock.cfg
index 298954cc..d803e6fb 100644
--- a/tcl/board/lubbock.cfg
+++ b/tcl/board/lubbock.cfg
@@ -4,7 +4,7 @@
 
 source [find target/pxa255.cfg]
 
-adapter_nsrst_delay 250
+adapter srst delay 250
 jtag_ntrst_delay 250
 
 # NOTE: until after pinmux and such are set up, only CS0 is
diff --git a/tcl/board/marsohod.cfg b/tcl/board/marsohod.cfg
index 681f575c..b1393a91 100644
--- a/tcl/board/marsohod.cfg
+++ b/tcl/board/marsohod.cfg
@@ -6,7 +6,7 @@
 
 # Recommended MBFTDI programmer
 source [find interface/ftdi/mbftdi.cfg]
-adapter_khz 2000
+adapter speed 2000
 transport select jtag
 
 # Altera MAXII EPM240T100C CPLD
diff --git a/tcl/board/marsohod2.cfg b/tcl/board/marsohod2.cfg
index d4897c3c..31819a2f 100644
--- a/tcl/board/marsohod2.cfg
+++ b/tcl/board/marsohod2.cfg
@@ -6,7 +6,7 @@
 
 # Built-in MBFTDI programmer
 source [find interface/ftdi/mbftdi.cfg]
-adapter_khz 2000
+adapter speed 2000
 transport select jtag
 
 # Cyclone III EP3C10E144 FPGA
diff --git a/tcl/board/marsohod3.cfg b/tcl/board/marsohod3.cfg
index bb3c74f2..fa00706d 100644
--- a/tcl/board/marsohod3.cfg
+++ b/tcl/board/marsohod3.cfg
@@ -6,7 +6,7 @@
 
 # Built-in MBFTDI programmer
 source [find interface/ftdi/mbftdi.cfg]
-adapter_khz 2000
+adapter speed 2000
 transport select jtag
 
 # MAX10 10M50SAE144C8GES FPGA
diff --git a/tcl/board/mcb1700.cfg b/tcl/board/mcb1700.cfg
index 068a19b2..4954dab0 100644
--- a/tcl/board/mcb1700.cfg
+++ b/tcl/board/mcb1700.cfg
@@ -11,7 +11,7 @@ set MCB1700_CCLK $CCLK
 $_TARGETNAME configure -event reset-start {
 	# Start *real slow* as we do not know the
     # state the boot rom left the clock in
-	adapter_khz 10
+	adapter speed 10
 }
 
 # Set up 100MHz clock to CPU
@@ -55,7 +55,7 @@ $_TARGETNAME configure -event reset-init {
 	#
 	# 
 	global MCB1700_CCLK
-	adapter_khz [expr $MCB1700_CCLK / 8]
+	adapter speed [expr $MCB1700_CCLK / 8]
 
 	# Do not remap 0x0000-0x0020 to anything but the flash (i.e. select
 	# "User Flash Mode" where interrupt vectors are _not_ remapped,
diff --git a/tcl/board/microchip_saml11_xplained_pro.cfg b/tcl/board/microchip_saml11_xplained_pro.cfg
index 3558a8e7..2ab61118 100644
--- a/tcl/board/microchip_saml11_xplained_pro.cfg
+++ b/tcl/board/microchip_saml11_xplained_pro.cfg
@@ -4,7 +4,7 @@
 #
 
 source [find interface/cmsis-dap.cfg]
-adapter_khz 1000
+adapter speed 1000
 
 set CHIPNAME saml11
 source [find target/atsaml1x.cfg]
diff --git a/tcl/board/mini2440.cfg b/tcl/board/mini2440.cfg
index 874f829a..9dca5a37 100644
--- a/tcl/board/mini2440.cfg
+++ b/tcl/board/mini2440.cfg
@@ -111,7 +111,7 @@ target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME
 $_TARGETNAME configure -work-area-phys 0x40000000  -work-area-size 0x4000 -work-area-backup 1
 
 #reset configuration
-adapter_nsrst_delay 100
+adapter srst delay 100
 jtag_ntrst_delay 100
 reset_config trst_and_srst
 
@@ -120,7 +120,7 @@ reset_config trst_and_srst
 # IMPORTANT! See README at top of this file.
 #-------------------------------------------------------------------------
 
-    adapter_khz 12000
+    adapter speed 12000
     jtag interface
 
 #-------------------------------------------------------------------------
@@ -140,7 +140,7 @@ reset_config trst_and_srst
 
     nand device s3c2440 0
 
-    adapter_nsrst_delay 100
+    adapter srst delay 100
     jtag_ntrst_delay 100
     reset_config trst_and_srst
     init
diff --git a/tcl/board/mini6410.cfg b/tcl/board/mini6410.cfg
index d00ce1f8..2cee9393 100644
--- a/tcl/board/mini6410.cfg
+++ b/tcl/board/mini6410.cfg
@@ -88,8 +88,8 @@ proc init_6410_flash {} {
 }
 
 
-adapter_khz 1000
-adapter_nsrst_delay 100
+adapter speed 1000
+adapter srst delay 100
 jtag_ntrst_delay 100
 reset_config trst_and_srst
 
diff --git a/tcl/board/numato_mimas_a7.cfg b/tcl/board/numato_mimas_a7.cfg
index a538872d..d4012bad 100644
--- a/tcl/board/numato_mimas_a7.cfg
+++ b/tcl/board/numato_mimas_a7.cfg
@@ -30,7 +30,7 @@ ftdi_tdo_sample_edge falling
 #
 ftdi_layout_init 0x0008 0x004b
 reset_config none
-adapter_khz 30000
+adapter speed 30000
 
 source [find cpld/xilinx-xc7.cfg]
 source [find cpld/jtagspi.cfg]
diff --git a/tcl/board/nxp_imx7sabre.cfg b/tcl/board/nxp_imx7sabre.cfg
index 25b7b878..c595e3a6 100644
--- a/tcl/board/nxp_imx7sabre.cfg
+++ b/tcl/board/nxp_imx7sabre.cfg
@@ -3,12 +3,12 @@
 transport select jtag
 
 # set a safe speed, can be overridden
-adapter_khz 1000
+adapter speed 1000
 
 # reset configuration has TRST and SRST support
 reset_config trst_and_srst srst_push_pull
 # need at least 100ms delay after SRST release for JTAG
-adapter_nsrst_delay 100
+adapter srst delay 100
 
 # source the target file
 source [find target/imx7.cfg]
diff --git a/tcl/board/nxp_mcimx8m-evk.cfg b/tcl/board/nxp_mcimx8m-evk.cfg
index e2d63ce7..dd9bd53a 100644
--- a/tcl/board/nxp_mcimx8m-evk.cfg
+++ b/tcl/board/nxp_mcimx8m-evk.cfg
@@ -6,13 +6,13 @@
 transport select jtag
 
 # set a safe JTAG clock speed, can be overridden
-adapter_khz 1000
+adapter speed 1000
 
 # default JTAG configuration has only SRST and no TRST
 reset_config srst_only srst_push_pull
 
 # delay after SRST goes inactive
-adapter_nsrst_delay 70
+adapter srst delay 70
 
 # board has an i.MX8MQ with 4 Cortex-A53 cores
 set CHIPNAME imx8mq
diff --git a/tcl/board/olimex_sam7_la2.cfg b/tcl/board/olimex_sam7_la2.cfg
index 89d2b5a5..038fe67b 100644
--- a/tcl/board/olimex_sam7_la2.cfg
+++ b/tcl/board/olimex_sam7_la2.cfg
@@ -2,7 +2,7 @@ source [find target/at91sam7a2.cfg]
 
 # delays needed to get stable reads of cpu state
 jtag_ntrst_delay 10
-adapter_nsrst_delay 200
+adapter srst delay 200
 
 # board uses pullup and connects only srst
 reset_config srst_open_drain
@@ -10,9 +10,9 @@ reset_config srst_open_drain
 # srst is connected to NRESET of CPU and fully resets everything...
 reset_config srst_only srst_pulls_trst
 
-adapter_khz 1
+adapter speed 1
 $_TARGETNAME configure -event reset-start {
-	adapter_khz 1
+	adapter speed 1
 }
 
 $_TARGETNAME configure -event reset-init {
@@ -61,7 +61,7 @@ $_TARGETNAME configure -event reset-init {
 	echo "set up pll"
 
 	sleep 100
-	adapter_khz 5000
+	adapter speed 5000
 }
 
 $_TARGETNAME arm7_9 dcc_downloads enable
diff --git a/tcl/board/openrd.cfg b/tcl/board/openrd.cfg
index 7659b074..696af4e5 100644
--- a/tcl/board/openrd.cfg
+++ b/tcl/board/openrd.cfg
@@ -3,7 +3,7 @@
 source [find interface/ftdi/openrd.cfg]
 source [find target/feroceon.cfg]
 
-adapter_khz 2000
+adapter speed 2000
 
 $_TARGETNAME configure \
 	-work-area-phys 0x10000000 \
diff --git a/tcl/board/or1k_generic.cfg b/tcl/board/or1k_generic.cfg
index c543ebe2..7c195656 100644
--- a/tcl/board/or1k_generic.cfg
+++ b/tcl/board/or1k_generic.cfg
@@ -17,7 +17,7 @@ source [find target/or1k.cfg]
 poll_period 1
 
 # Set the adapter speed
-adapter_khz 3000
+adapter speed 3000
 
 # Enable the target description feature
 gdb_target_description enable
diff --git a/tcl/board/phytec_lpc3250.cfg b/tcl/board/phytec_lpc3250.cfg
index 6a7e8e92..1c48f5df 100644
--- a/tcl/board/phytec_lpc3250.cfg
+++ b/tcl/board/phytec_lpc3250.cfg
@@ -1,8 +1,8 @@
 source [find target/lpc3250.cfg]
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 1
-adapter_khz 200
+adapter speed 200
 reset_config trst_and_srst separate
 
 arm7_9 dcc_downloads enable
@@ -11,11 +11,11 @@ $_TARGETNAME configure -event gdb-attach { reset init }
 
 $_TARGETNAME configure -event reset-start {
              arm7_9 fast_memory_access disable
-             adapter_khz 200
+             adapter speed 200
 }
 
 $_TARGETNAME configure -event reset-end {
-             adapter_khz 6000
+             adapter speed 6000
              arm7_9 fast_memory_access enable
 }
 
diff --git a/tcl/board/pxa255_sst.cfg b/tcl/board/pxa255_sst.cfg
index 49cad5db..2b44a054 100644
--- a/tcl/board/pxa255_sst.cfg
+++ b/tcl/board/pxa255_sst.cfg
@@ -93,7 +93,7 @@ $_TARGETNAME configure -event reset-init {pxa255_sst_init}
 
 reset_config trst_and_srst
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
 
 #xscale debug_handler 0  0xFFFF0800      ;# debug handler base address
diff --git a/tcl/board/quark_d2000_refboard.cfg b/tcl/board/quark_d2000_refboard.cfg
index 460e8c96..8b8314a0 100644
--- a/tcl/board/quark_d2000_refboard.cfg
+++ b/tcl/board/quark_d2000_refboard.cfg
@@ -10,6 +10,6 @@ ftdi_layout_signal nTRST -data 0x0100 -noe 0x0100
 
 source [find target/quark_d20xx.cfg]
 
-adapter_khz 1000
+adapter speed 1000
 
 reset_config trst_only
diff --git a/tcl/board/quark_x10xx_board.cfg b/tcl/board/quark_x10xx_board.cfg
index 8dc600b8..4ecf30ed 100644
--- a/tcl/board/quark_x10xx_board.cfg
+++ b/tcl/board/quark_x10xx_board.cfg
@@ -4,6 +4,6 @@
 source [find target/quark_x10xx.cfg]
 
 #default frequency but this can be adjusted at runtime
-adapter_khz 4000
+adapter speed 4000
 
 reset_config trst_only
diff --git a/tcl/board/rsc-w910.cfg b/tcl/board/rsc-w910.cfg
index 636a0539..cb1733b2 100644
--- a/tcl/board/rsc-w910.cfg
+++ b/tcl/board/rsc-w910.cfg
@@ -12,8 +12,8 @@ source [find target/nuc910.cfg]
 #
 reset_config trst_and_srst srst_pulls_trst
 
-adapter_khz 1000
-adapter_nsrst_delay 100
+adapter speed 1000
+adapter srst delay 100
 jtag_ntrst_delay 100
 
 $_TARGETNAME configure -work-area-phys 0x00000000 -work-area-size 0x04000000 -work-area-backup 0
@@ -28,7 +28,7 @@ nand device $_NANDNAME nuc910 $_TARGETNAME
 # Target events
 #
 
-$_TARGETNAME configure -event reset-start {adapter_khz 1000}
+$_TARGETNAME configure -event reset-start {adapter speed 1000}
 
 $_TARGETNAME configure -event reset-init {
 	# switch on PLL for 200MHz operation
@@ -47,7 +47,7 @@ $_TARGETNAME configure -event reset-init {
 	
 	arm7_9 dcc_downloads enable
 	arm7_9 fast_memory_access enable
-	adapter_khz 15000
+	adapter speed 15000
 	
 	# map nor flash to 0x20000000
 	# map sdram to 0x00000000
diff --git a/tcl/board/sayma_amc.cfg b/tcl/board/sayma_amc.cfg
index 0b507ee0..009eb78c 100644
--- a/tcl/board/sayma_amc.cfg
+++ b/tcl/board/sayma_amc.cfg
@@ -26,7 +26,7 @@ ftdi_layout_init 0x0098 0x008b
 #ftdi_layout_signal nTRST -data 0x0010
 reset_config none
 
-adapter_khz 5000
+adapter speed 5000
 
 transport select jtag
 
diff --git a/tcl/board/sheevaplug.cfg b/tcl/board/sheevaplug.cfg
index 0d21be37..7ccb8841 100644
--- a/tcl/board/sheevaplug.cfg
+++ b/tcl/board/sheevaplug.cfg
@@ -3,7 +3,7 @@
 source [find interface/ftdi/sheevaplug.cfg]
 source [find target/feroceon.cfg]
 
-adapter_khz 2000
+adapter speed 2000
 
 $_TARGETNAME configure \
 	-work-area-phys 0x10000000 \
diff --git a/tcl/board/sifive-e31arty.cfg b/tcl/board/sifive-e31arty.cfg
index ec10b27c..b7a255ea 100644
--- a/tcl/board/sifive-e31arty.cfg
+++ b/tcl/board/sifive-e31arty.cfg
@@ -1,7 +1,7 @@
 #
 # Be sure you include the speed and interface before this file
 # Example:
-# -c "adapter_khz 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e31arty.cfg"
+# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e31arty.cfg"
 
 set _CHIPNAME riscv
 jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x20000001
diff --git a/tcl/board/sifive-e51arty.cfg b/tcl/board/sifive-e51arty.cfg
index ffd83a05..20ad5755 100644
--- a/tcl/board/sifive-e51arty.cfg
+++ b/tcl/board/sifive-e51arty.cfg
@@ -1,7 +1,7 @@
 #
 # Be sure you include the speed and interface before this file
 # Example:
-# -c "adapter_khz 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e51arty.cfg"
+# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e51arty.cfg"
 
 set _CHIPNAME riscv
 jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x20000001
diff --git a/tcl/board/sifive-hifive1.cfg b/tcl/board/sifive-hifive1.cfg
index 9e62bbd0..196f540b 100644
--- a/tcl/board/sifive-hifive1.cfg
+++ b/tcl/board/sifive-hifive1.cfg
@@ -1,4 +1,4 @@
-adapter_khz     10000
+adapter speed     10000
 
 adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
@@ -10,7 +10,7 @@ ftdi_layout_signal nSRST -oe 0x0020 -data 0x0020
 #Reset Stretcher logic on FE310 is ~1 second long
 #This doesn't apply if you use
 # ftdi_set_signal, but still good to document
-#adapter_nsrst_delay 1500
+#adapter srst delay 1500
 
 set _CHIPNAME riscv
 jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x10e31913
diff --git a/tcl/board/telo.cfg b/tcl/board/telo.cfg
index 1d3afdf0..05644f65 100644
--- a/tcl/board/telo.cfg
+++ b/tcl/board/telo.cfg
@@ -10,10 +10,10 @@ source [find target/c100helper.tcl]
 # Telo board & C100 support trst and srst
 # make the reset asserted to
 # allow RC circuit to discharge for: [ms]
-adapter_nsrst_assert_width 100
+adapter srst pulse_width 100
 jtag_ntrst_assert_width 100
 # don't talk to JTAG after reset for: [ms]
-adapter_nsrst_delay 100
+adapter srst delay 100
 jtag_ntrst_delay 100
 reset_config trst_and_srst separate
 
@@ -23,11 +23,11 @@ reset_config trst_and_srst separate
 # issue telnet: reset init
 # issue gdb: monitor reset init
 $_TARGETNAME configure -event reset-init {
-	adapter_khz 100
+	adapter speed 100
 	# this will setup Telo board
 	setupTelo
 	#turn up the JTAG speed
-	adapter_khz 3000
+	adapter speed 3000
 	echo "JTAG speek now 3MHz"
 	echo "type helpC100 to get help on C100"
 }
diff --git a/tcl/board/ti_am437x_idk.cfg b/tcl/board/ti_am437x_idk.cfg
index 65e2094e..fc2b81b2 100644
--- a/tcl/board/ti_am437x_idk.cfg
+++ b/tcl/board/ti_am437x_idk.cfg
@@ -4,7 +4,7 @@
 source [find interface/ftdi/xds100v2.cfg]
 
 transport select jtag
-adapter_khz 30000
+adapter speed 30000
 
 source [find target/am437x.cfg]
 $_TARGETNAME configure -event reset-init { init_platform 0x61a11b32 }
diff --git a/tcl/board/ti_am43xx_evm.cfg b/tcl/board/ti_am43xx_evm.cfg
index d536314b..dbc37ae8 100644
--- a/tcl/board/ti_am43xx_evm.cfg
+++ b/tcl/board/ti_am43xx_evm.cfg
@@ -1,6 +1,6 @@
 # Works on both AM437x GP EVM and AM438x ePOS EVM
 transport select jtag
-adapter_khz 16000
+adapter speed 16000
 
 source [find target/am437x.cfg]
 
diff --git a/tcl/board/ti_beaglebone.cfg b/tcl/board/ti_beaglebone.cfg
index a54ad627..6a6272d2 100644
--- a/tcl/board/ti_beaglebone.cfg
+++ b/tcl/board/ti_beaglebone.cfg
@@ -4,7 +4,7 @@
 # The JTAG interface is built directly on the board.
 source [find interface/ftdi/xds100v2.cfg]
 
-adapter_khz 16000
+adapter speed 16000
 
 reset_config trst_and_srst
 
diff --git a/tcl/board/ti_beaglebone_black.cfg b/tcl/board/ti_beaglebone_black.cfg
index 79fc1e8a..c730814c 100644
--- a/tcl/board/ti_beaglebone_black.cfg
+++ b/tcl/board/ti_beaglebone_black.cfg
@@ -1,7 +1,7 @@
 # AM335x Beaglebone Black
 #  http://beagleboard.org/bone
 
-adapter_khz 1000
+adapter speed 1000
 
 reset_config trst_and_srst
 
diff --git a/tcl/board/ti_cc13x0_launchpad.cfg b/tcl/board/ti_cc13x0_launchpad.cfg
index 9e1c1ea3..d2d0c68f 100644
--- a/tcl/board/ti_cc13x0_launchpad.cfg
+++ b/tcl/board/ti_cc13x0_launchpad.cfg
@@ -3,5 +3,5 @@
 #
 source [find interface/xds110.cfg]
 transport select jtag
-adapter_khz 2500
+adapter speed 2500
 source [find target/ti_cc13x0.cfg]
diff --git a/tcl/board/ti_cc13x2_launchpad.cfg b/tcl/board/ti_cc13x2_launchpad.cfg
index 18c5ce51..706bb728 100644
--- a/tcl/board/ti_cc13x2_launchpad.cfg
+++ b/tcl/board/ti_cc13x2_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI CC13x2 LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select jtag
 source [find target/ti_cc13x2.cfg]
diff --git a/tcl/board/ti_cc26x0_launchpad.cfg b/tcl/board/ti_cc26x0_launchpad.cfg
index 3613a47f..c16fa4c5 100644
--- a/tcl/board/ti_cc26x0_launchpad.cfg
+++ b/tcl/board/ti_cc26x0_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI CC26x0 LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select jtag
 source [find target/ti_cc26x0.cfg]
diff --git a/tcl/board/ti_cc26x2_launchpad.cfg b/tcl/board/ti_cc26x2_launchpad.cfg
index 2f2b34b4..e7941914 100644
--- a/tcl/board/ti_cc26x2_launchpad.cfg
+++ b/tcl/board/ti_cc26x2_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI CC26x2 LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select jtag
 source [find target/ti_cc26x2.cfg]
diff --git a/tcl/board/ti_cc3200_launchxl.cfg b/tcl/board/ti_cc3200_launchxl.cfg
index b78b09b7..34f9bffb 100644
--- a/tcl/board/ti_cc3200_launchxl.cfg
+++ b/tcl/board/ti_cc3200_launchxl.cfg
@@ -12,7 +12,7 @@ if { [info exists TRANSPORT] } {
    transport select jtag
 }
 
-adapter_khz 2500
+adapter speed 2500
 
 set WORKAREASIZE 0x40000
 source [find target/ti_cc32xx.cfg]
diff --git a/tcl/board/ti_cc3220sf_launchpad.cfg b/tcl/board/ti_cc3220sf_launchpad.cfg
index a3dac620..30255c79 100644
--- a/tcl/board/ti_cc3220sf_launchpad.cfg
+++ b/tcl/board/ti_cc3220sf_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI CC3220SF-LaunchXL LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select swd
 source [find target/ti_cc3220sf.cfg]
diff --git a/tcl/board/ti_cc32xx_launchpad.cfg b/tcl/board/ti_cc32xx_launchpad.cfg
index f657bdfd..6676e5d6 100644
--- a/tcl/board/ti_cc32xx_launchpad.cfg
+++ b/tcl/board/ti_cc32xx_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI CC32xx-LaunchXL LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select swd
 source [find target/ti_cc32xx.cfg]
diff --git a/tcl/board/ti_msp432_launchpad.cfg b/tcl/board/ti_msp432_launchpad.cfg
index bfad3223..f7c96eed 100644
--- a/tcl/board/ti_msp432_launchpad.cfg
+++ b/tcl/board/ti_msp432_launchpad.cfg
@@ -2,6 +2,6 @@
 # TI MSP432 LaunchPad Evaluation Kit
 #
 source [find interface/xds110.cfg]
-adapter_khz 2500
+adapter speed 2500
 transport select swd
 source [find target/ti_msp432.cfg]
diff --git a/tcl/board/ti_tmdx570ls31usb.cfg b/tcl/board/ti_tmdx570ls31usb.cfg
index 55024442..6d735029 100644
--- a/tcl/board/ti_tmdx570ls31usb.cfg
+++ b/tcl/board/ti_tmdx570ls31usb.cfg
@@ -1,4 +1,4 @@
-adapter_khz 1500
+adapter speed 1500
 
 source [find interface/ftdi/xds100v2.cfg]
 source [find target/ti_tms570.cfg]
diff --git a/tcl/board/tocoding_poplar.cfg b/tcl/board/tocoding_poplar.cfg
index d8b83300..d0951ce6 100644
--- a/tcl/board/tocoding_poplar.cfg
+++ b/tcl/board/tocoding_poplar.cfg
@@ -5,7 +5,7 @@
 # board does not feature anything but JTAG
 transport select jtag
 
-adapter_khz 10000
+adapter speed 10000
 
 # SRST-only reset configuration
 reset_config srst_only srst_push_pull
diff --git a/tcl/board/topas910.cfg b/tcl/board/topas910.cfg
index 90c18c48..77084a96 100644
--- a/tcl/board/topas910.cfg
+++ b/tcl/board/topas910.cfg
@@ -99,7 +99,7 @@ proc topas910_init { } {
 	mww 0xf4300004 0x00000000
 
 	sleep 10
-#	adapter_khz NNNN
+#	adapter speed NNNN
 
 # remap off in case of IROM boot
 	mww 0xf0000004 0x00000001
diff --git a/tcl/board/topasa900.cfg b/tcl/board/topasa900.cfg
index 2a388d51..91ee5847 100644
--- a/tcl/board/topasa900.cfg
+++ b/tcl/board/topasa900.cfg
@@ -105,7 +105,7 @@ proc topasa900_init { } {
 	mww 0xf4300004 0x00000000
 
 	sleep 10
-#	adapter_khz NNNN
+#	adapter speed NNNN
 
 # remap off in case of IROM boot
 	mww 0xf0000004 0x00000001
diff --git a/tcl/board/twr-vf65gs10.cfg b/tcl/board/twr-vf65gs10.cfg
index a80407f3..0d6d3329 100644
--- a/tcl/board/twr-vf65gs10.cfg
+++ b/tcl/board/twr-vf65gs10.cfg
@@ -198,4 +198,4 @@ proc board_init { } {
 # hook the init function into the reset-init event
 ${_TARGETNAME}0 configure -event reset-init { board_init }
 # set a slow default JTAG clock, can be overridden later
-adapter_khz 1000
+adapter speed 1000
diff --git a/tcl/board/verdex.cfg b/tcl/board/verdex.cfg
index 6da98752..dd267fcb 100644
--- a/tcl/board/verdex.cfg
+++ b/tcl/board/verdex.cfg
@@ -8,7 +8,7 @@ source [find target/pxa270.cfg]
 reset_config trst_and_srst separate
 
 # XM4 = 400MHz, XL6P = 600MHz...let's run at 0.1*400MHz=40MHz
-adapter_khz 40000
+adapter speed 40000
 
 # flash bank <driver> <base> <size> <chip_width> <bus_width>
 # XL6P has 32 MB flash
diff --git a/tcl/board/voltcraft_dso-3062c.cfg b/tcl/board/voltcraft_dso-3062c.cfg
index 01e37e9a..01879b12 100644
--- a/tcl/board/voltcraft_dso-3062c.cfg
+++ b/tcl/board/voltcraft_dso-3062c.cfg
@@ -13,7 +13,7 @@
 
 source [find target/samsung_s3c2440.cfg]
 
-adapter_khz 16000
+adapter speed 16000
 
 # Samsung K9F1208U0C NAND flash chip (64MiB, 3.3V, 8-bit)
 nand device $_CHIPNAME.nand s3c2440 $_TARGETNAME
diff --git a/tcl/board/zy1000.cfg b/tcl/board/zy1000.cfg
index 57deaa83..e0d1ccf8 100644
--- a/tcl/board/zy1000.cfg
+++ b/tcl/board/zy1000.cfg
@@ -72,7 +72,7 @@ $_TARGETNAME configure -event gdb-attach {
 # other things than flash programming.
 $_TARGETNAME configure -work-area-phys 0x00020000 -work-area-size 0x20000 -work-area-backup 0
 
-adapter_khz 16000
+adapter speed 16000
 
 
 proc production_info {} {
diff --git a/tcl/interface/calao-usb-a9260.cfg b/tcl/interface/calao-usb-a9260.cfg
index 5fae2f3b..d1dc736d 100644
--- a/tcl/interface/calao-usb-a9260.cfg
+++ b/tcl/interface/calao-usb-a9260.cfg
@@ -6,6 +6,6 @@
 # See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
 #
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
 
diff --git a/tcl/interface/ft232r.cfg b/tcl/interface/ft232r.cfg
index 24e338ff..2c705c33 100644
--- a/tcl/interface/ft232r.cfg
+++ b/tcl/interface/ft232r.cfg
@@ -1,2 +1,2 @@
 adapter driver ft232r
-adapter_khz 1000
+adapter speed 1000
diff --git a/tcl/interface/ftdi/minispartan6.cfg b/tcl/interface/ftdi/minispartan6.cfg
index 92aebbcf..97a6abe0 100644
--- a/tcl/interface/ftdi/minispartan6.cfg
+++ b/tcl/interface/ftdi/minispartan6.cfg
@@ -12,4 +12,4 @@ ftdi_layout_init 0x0008 0x000b
 reset_config none
 # this generally works fast: the fpga can handle 30MHz, the spi flash can handle
 # 54MHz with simple read, no dummy cycles, and wait-for-write-completion
-adapter_khz 30000
+adapter speed 30000
diff --git a/tcl/interface/ftdi/pipistrello.cfg b/tcl/interface/ftdi/pipistrello.cfg
index 4e392942..2074924a 100644
--- a/tcl/interface/ftdi/pipistrello.cfg
+++ b/tcl/interface/ftdi/pipistrello.cfg
@@ -10,4 +10,4 @@ ftdi_layout_init 0x0008 0x000b
 reset_config none
 # this generally works fast: the fpga can handle 30MHz, the spi flash can handle
 # 54MHz with simple read, no dummy cycles, and wait-for-write-completion
-adapter_khz 10000
+adapter speed 10000
diff --git a/tcl/interface/nds32-aice.cfg b/tcl/interface/nds32-aice.cfg
index 8f32c899..3b21025b 100644
--- a/tcl/interface/nds32-aice.cfg
+++ b/tcl/interface/nds32-aice.cfg
@@ -10,6 +10,6 @@ aice serial "C001-42163"
 aice vid_pid 0x1CFC 0x0000
 aice port aice_usb
 reset_config trst_and_srst
-adapter_khz 24000
+adapter speed 24000
 aice retry_times 50
 aice count_to_check_dbger 30
diff --git "a/tcl/target/1986\320\262\320\2651\321\202.cfg" "b/tcl/target/1986\320\262\320\2651\321\202.cfg"
index ecb3f8ae..b7c9d633 100644
--- "a/tcl/target/1986\320\262\320\2651\321\202.cfg"
+++ "b/tcl/target/1986\320\262\320\2651\321\202.cfg"
@@ -50,9 +50,9 @@ if { [info exists IMEMORY] && [string equal $IMEMORY true] } {
 }
 
 # JTAG speed should be <= F_CPU/6. F_CPU after reset is 8MHz, so use F_JTAG = 1MHz
-adapter_khz 1000
+adapter speed 1000
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 if {[using_jtag]} {
    jtag_ntrst_delay 100
 }
diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index fca0a7f9..9c756be3 100644
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -17,7 +17,7 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x3f0f0f0f
 }
 
-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
 
 ## JTAG scan chain
diff --git a/tcl/target/aducm360.cfg b/tcl/target/aducm360.cfg
index ca4bc68d..caee9654 100755
--- a/tcl/target/aducm360.cfg
+++ b/tcl/target/aducm360.cfg
@@ -36,7 +36,7 @@ swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPU
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 # SWD/JTAG speed
-adapter_khz 1000
+adapter speed 1000
 
 ##
 ## Target configuration
@@ -51,6 +51,6 @@ $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME aducm360 0x00 0 0 0 $_TARGETNAME
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 
 cortex_m reset_config sysresetreq
diff --git a/tcl/target/allwinner_v3s.cfg b/tcl/target/allwinner_v3s.cfg
index 32fd1887..d8d78bdc 100644
--- a/tcl/target/allwinner_v3s.cfg
+++ b/tcl/target/allwinner_v3s.cfg
@@ -34,7 +34,7 @@
 # 0220ms	JTAG pins switched to SD mode
 #
 # The time frame of 20ms can be not enough to init and halt the CPU. In this
-# case I would recommend to set: "adapter_khz 15000"
+# case I would recommend to set: "adapter speed 15000"
 # To get more or less precise timings, the board should provide reset pin,
 # or some bench power supply with remote function. In my case I used
 # EEZ H24005 with this command to power on and halt the target:
diff --git a/tcl/target/altera_fpgasoc.cfg b/tcl/target/altera_fpgasoc.cfg
index 9a83b5cc..0fc8d673 100644
--- a/tcl/target/altera_fpgasoc.cfg
+++ b/tcl/target/altera_fpgasoc.cfg
@@ -36,7 +36,7 @@ jtag newtap $_CHIPNAME.fpga tap -irlen 10 -ircapture 0x01 -irmask 0x3 -expected-
 # core 1  -  0x80112000
 
 # Slow speed to be sure it will work
-adapter_khz 1000
+adapter speed 1000
 
 set _TARGETNAME1 $_CHIPNAME.cpu.0
 set _TARGETNAME2 $_CHIPNAME.cpu.1
@@ -46,7 +46,7 @@ dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 target create $_TARGETNAME1 cortex_a -dap $_CHIPNAME.dap \
         -coreid 0 -dbgbase 0x80110000
 
-$_TARGETNAME1 configure -event reset-start { adapter_khz 1000 }
+$_TARGETNAME1 configure -event reset-start { adapter speed 1000 }
 $_TARGETNAME1 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME1"
 
 
@@ -54,7 +54,7 @@ $_TARGETNAME1 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME1"
 #target create $_TARGETNAME2 cortex_a -dap $_CHIPNAME.dap \
 #        -coreid 1 -dbgbase 0x80112000
 
-#$_TARGETNAME2 configure -event reset-start { adapter_khz 1000 }
+#$_TARGETNAME2 configure -event reset-start { adapter speed 1000 }
 #$_TARGETNAME2 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME2"
 
 proc cycv_dbginit {target} {
diff --git a/tcl/target/amdm37x.cfg b/tcl/target/amdm37x.cfg
index 5c4e3151..7098adfa 100644
--- a/tcl/target/amdm37x.cfg
+++ b/tcl/target/amdm37x.cfg
@@ -45,7 +45,7 @@ if { [info exists CHIPTYPE] } {
 
 # Run the adapter at the fastest acceptable speed with the slowest possible
 # core clock.
-adapter_khz 10
+adapter speed 10
 
 ###############################################################################
 # JTAG setup
@@ -157,7 +157,7 @@ $_TARGETNAME configure -work-area-phys 0x40200000 -work-area-size 0x4000
 #  slowest possible core clock (16.8MHz/2 = 8.4MHz). It is OK to speed up
 #  *after* PLL and clock tree setup.
 
-$_TARGETNAME configure -event "reset-start" { adapter_khz 10 }
+$_TARGETNAME configure -event "reset-start" { adapter speed 10 }
 
 # Describe the reset assert process for openocd - this is asserted with the
 # ICEPick
@@ -176,7 +176,7 @@ $_TARGETNAME configure -event reset-assert-post {
 
    global _TARGETNAME
    amdm37x_dbginit $_TARGETNAME
-   adapter_khz 1000
+   adapter speed 1000
 }
 
 $_TARGETNAME configure -event gdb-attach {
diff --git a/tcl/target/ar71xx.cfg b/tcl/target/ar71xx.cfg
index 196b0486..0c64a96e 100644
--- a/tcl/target/ar71xx.cfg
+++ b/tcl/target/ar71xx.cfg
@@ -1,7 +1,7 @@
 # Atheros AR71xx MIPS 24Kc SoC.
 # tested on PB44 refererence board
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 jtag_ntrst_delay 100
 
 reset_config trst_and_srst
diff --git a/tcl/target/at91sam3XXX.cfg b/tcl/target/at91sam3XXX.cfg
index e7dec4b3..7d01ccdb 100644
--- a/tcl/target/at91sam3XXX.cfg
+++ b/tcl/target/at91sam3XXX.cfg
@@ -74,9 +74,9 @@ $_TARGETNAME configure -event gdb-flash-erase-start {
 # running off a crystal, we can run closer to the limit. Note
 # that there can be a pretty wide band where things are more or less stable.
 
-adapter_khz 500
+adapter speed 500
 
-adapter_nsrst_delay 100
+adapter srst delay 100
 if {[using_jtag]} {
    jtag_ntrst_delay 100
 }
diff --git a/tcl/target/at91sam4XXX.cfg b/tcl/target/at91sam4XXX.cfg
index ff736704..ebb7eed3 100644