[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-261-g7c38f2452

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  7c38f24529cd765fc16a317874c46a9b428bb4b7 (commit)
       via  1d4b252bb16ef823d8e98bd70fc323099033898b (commit)
      from  65c9653cc768f77a5e8cf2af73e0f40d614bdec2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c38f24529cd765fc16a317874c46a9b428bb4b7
Author: Marc Schink <de...@za...>
Date:   Wed Jun 23 20:54:49 2021 +0200

    tcl: Adapt config files to new ftdi command syntax
    
    The patch was created automatically using the following
    script:
    
    %<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
    (cat << EOF
    ftdi_device_desc ftdi device_desc
    ftdi_serial ftdi serial
    ftdi_channel ftdi channel
    ftdi_layout_init ftdi layout_init
    ftdi_layout_signal ftdi layout_signal
    ftdi_set_signal ftdi set_signal
    ftdi_get_signal ftdi get_signal
    ftdi_vid_pid ftdi vid_pid
    ftdi_tdo_sample_edge ftdi tdo_sample_edge
    EOF
    ) | while read a b; do
    sed -i "s/$a/$b/g" $(find tcl -type f -name "*.cfg" )
    done
    %<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
    
    Change-Id: Iff781f37bb5511b7e15cbe6dcdf6d28e89fb174f
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: http://openocd.zylin.com/6333
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/board/digilent_analog_discovery.cfg b/tcl/board/digilent_analog_discovery.cfg
index 954e54008..64cdacfa8 100644
--- a/tcl/board/digilent_analog_discovery.cfg
+++ b/tcl/board/digilent_analog_discovery.cfg
@@ -8,10 +8,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Digilent USB Device"
-ftdi_vid_pid 0x0403 0x6014
+ftdi device_desc "Digilent USB Device"
+ftdi vid_pid 0x0403 0x6014
 
-ftdi_layout_init 0x8008 0x800b
+ftdi layout_init 0x8008 0x800b
 
 adapter speed 25000
 
diff --git a/tcl/board/digilent_nexys_video.cfg b/tcl/board/digilent_nexys_video.cfg
index f171e2403..b60ec912f 100644
--- a/tcl/board/digilent_nexys_video.cfg
+++ b/tcl/board/digilent_nexys_video.cfg
@@ -6,19 +6,19 @@
 adapter driver ftdi
 adapter speed 30000
 
-ftdi_device_desc "Digilent USB Device"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Digilent USB Device"
+ftdi vid_pid 0x0403 0x6010
 
 # channel 0 is dedicated for Digilent's DPTI Interface
 # channel 1 is used for JTAG
-ftdi_channel 1
+ftdi channel 1
 
 # just TCK TDI TDO TMS, no reset
-ftdi_layout_init 0x0088 0x008b
+ftdi layout_init 0x0088 0x008b
 reset_config none
 
 # Enable sampling on falling edge for high JTAG speeds.
-ftdi_tdo_sample_edge falling
+ftdi tdo_sample_edge falling
 
 transport select jtag
 
diff --git a/tcl/board/dp_busblaster_v3.cfg b/tcl/board/dp_busblaster_v3.cfg
index a9974d9bc..b94b43a0b 100644
--- a/tcl/board/dp_busblaster_v3.cfg
+++ b/tcl/board/dp_busblaster_v3.cfg
@@ -8,6 +8,6 @@
 #
 
 source [find interface/ftdi/dp_busblaster.cfg]
-ftdi_channel 1
+ftdi channel 1
 
 jtag newtap xc2c32a tap -expected-id 0x06e1c093 -irlen 8
diff --git a/tcl/board/dp_busblaster_v4.cfg b/tcl/board/dp_busblaster_v4.cfg
index 7b3bee8fc..2c2f0e9d1 100644
--- a/tcl/board/dp_busblaster_v4.cfg
+++ b/tcl/board/dp_busblaster_v4.cfg
@@ -14,6 +14,6 @@
 #
 
 source [find interface/ftdi/dp_busblaster.cfg]
-ftdi_channel 1
+ftdi channel 1
 
 jtag newtap xc2c64a tap -expected-id 0x06e5c093 -irlen 8
diff --git a/tcl/board/gumstix-aerocore.cfg b/tcl/board/gumstix-aerocore.cfg
index f0103ed45..565df4cf8 100644
--- a/tcl/board/gumstix-aerocore.cfg
+++ b/tcl/board/gumstix-aerocore.cfg
@@ -1,10 +1,10 @@
 # JTAG for the STM32F4x chip used on the Gumstix AeroCore is available on
 # the first interface of a Quad FTDI chip.  nTRST is bit 4.
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6011
+ftdi vid_pid 0x0403 0x6011
 
-ftdi_layout_init 0x0000 0x001b
-ftdi_layout_signal nTRST -data 0x0010
+ftdi layout_init 0x0000 0x001b
+ftdi layout_signal nTRST -data 0x0010
 
 source [find target/stm32f4x.cfg]
 reset_config trst_only
diff --git a/tcl/board/kasli.cfg b/tcl/board/kasli.cfg
index d492249ba..7cfdcf20e 100644
--- a/tcl/board/kasli.cfg
+++ b/tcl/board/kasli.cfg
@@ -1,8 +1,8 @@
 adapter driver ftdi
-ftdi_device_desc "Quad RS232-HS"
-ftdi_vid_pid 0x0403 0x6011
-ftdi_channel 0
-ftdi_layout_init 0x0008 0x000b
+ftdi device_desc "Quad RS232-HS"
+ftdi vid_pid 0x0403 0x6011
+ftdi channel 0
+ftdi layout_init 0x0008 0x000b
 # adapter usb location 1:8
 
 reset_config none
diff --git a/tcl/board/kindle2.cfg b/tcl/board/kindle2.cfg
index a39f15c67..71dca741c 100644
--- a/tcl/board/kindle2.cfg
+++ b/tcl/board/kindle2.cfg
@@ -37,7 +37,7 @@ jtag_ntrst_delay 30
 arm11 memwrite burst disable
 
 adapter speed 1000
-ftdi_tdo_sample_edge falling
+ftdi tdo_sample_edge falling
 
 proc kindle2_init {} {
 	imx3x_reset
diff --git a/tcl/board/nds32_corvettef1.cfg b/tcl/board/nds32_corvettef1.cfg
index cec172342..7300ce04a 100644
--- a/tcl/board/nds32_corvettef1.cfg
+++ b/tcl/board/nds32_corvettef1.cfg
@@ -7,12 +7,12 @@
 adapter speed     10000
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
 reset_config srst_only
 
 source [find target/nds32v5.cfg]
diff --git a/tcl/board/numato_mimas_a7.cfg b/tcl/board/numato_mimas_a7.cfg
index d4012bada..12df8913d 100644
--- a/tcl/board/numato_mimas_a7.cfg
+++ b/tcl/board/numato_mimas_a7.cfg
@@ -8,13 +8,13 @@
 #       Therefore, prefer external power supply.
 
 adapter driver ftdi
-ftdi_device_desc "Mimas Artix 7 FPGA Module"
-ftdi_vid_pid 0x2a19 0x1009
+ftdi device_desc "Mimas Artix 7 FPGA Module"
+ftdi vid_pid 0x2a19 0x1009
 
 # channel 0 is for custom purpose by users (like uart, fifo etc)
 # channel 1 is reserved for JTAG (by-default) or SPI (possible via changing solder jumpers)
-ftdi_channel 1
-ftdi_tdo_sample_edge falling
+ftdi channel 1
+ftdi tdo_sample_edge falling
 
 
 # FTDI Pin Layout
@@ -28,7 +28,7 @@ ftdi_tdo_sample_edge falling
 # OE_N is JTAG buffer output enable signal (active-low)
 # PROG_B is not used, so left as input to FTDI.
 #
-ftdi_layout_init 0x0008 0x004b
+ftdi layout_init 0x0008 0x004b
 reset_config none
 adapter speed 30000
 
diff --git a/tcl/board/quark_d2000_refboard.cfg b/tcl/board/quark_d2000_refboard.cfg
index 8b8314a0e..a89895d89 100644
--- a/tcl/board/quark_d2000_refboard.cfg
+++ b/tcl/board/quark_d2000_refboard.cfg
@@ -2,11 +2,11 @@
 
 # the board has an onboard FTDI FT232H chip
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6014
-ftdi_channel 0
+ftdi vid_pid 0x0403 0x6014
+ftdi channel 0
 
-ftdi_layout_init 0x0000 0x030b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0100
+ftdi layout_init 0x0000 0x030b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0100
 
 source [find target/quark_d20xx.cfg]
 
diff --git a/tcl/board/sayma_amc.cfg b/tcl/board/sayma_amc.cfg
index 64c085428..0bd76ba01 100644
--- a/tcl/board/sayma_amc.cfg
+++ b/tcl/board/sayma_amc.cfg
@@ -11,19 +11,19 @@
 # which features an Artix 7 FPGA.
 
 adapter driver ftdi
-ftdi_device_desc "Quad RS232-HS"
-ftdi_vid_pid 0x0403 0x6011
-ftdi_channel 0
+ftdi device_desc "Quad RS232-HS"
+ftdi vid_pid 0x0403 0x6011
+ftdi channel 0
 # Use this to distinguish multiple boards by topology
 #adapter usb location 5:1
 # sampling on falling edge generally seems to work and accelerates things but
 # is not fully tested
-#ftdi_tdo_sample_edge falling
+#ftdi tdo_sample_edge falling
 # EN_USB_JTAG on ADBUS7: out, high
 # USB_nTRST on ADBUS4: out, high, but R46 is DNP
-ftdi_layout_init 0x0098 0x008b
-#ftdi_layout_signal EN_USB -data 0x0080
-#ftdi_layout_signal nTRST -data 0x0010
+ftdi layout_init 0x0098 0x008b
+#ftdi layout_signal EN_USB -data 0x0080
+#ftdi layout_signal nTRST -data 0x0010
 reset_config none
 
 adapter speed 5000
diff --git a/tcl/board/sifive-e31arty.cfg b/tcl/board/sifive-e31arty.cfg
index b7a255ea2..8e701f156 100644
--- a/tcl/board/sifive-e31arty.cfg
+++ b/tcl/board/sifive-e31arty.cfg
@@ -14,8 +14,8 @@ $_TARGETNAME.0 configure -work-area-phys 0x80000000 -work-area-size 10000 -work-
 flash bank spi0 fespi 0x40000000 0 0 0 $_TARGETNAME.0 0x20004000
 init
 if {[ info exists pulse_srst]} {
-  ftdi_set_signal nSRST 0
-  ftdi_set_signal nSRST z
+  ftdi set_signal nSRST 0
+  ftdi set_signal nSRST z
 }
 halt
 flash protect 0 64 last off
diff --git a/tcl/board/sifive-e51arty.cfg b/tcl/board/sifive-e51arty.cfg
index 20ad57551..a543987bb 100644
--- a/tcl/board/sifive-e51arty.cfg
+++ b/tcl/board/sifive-e51arty.cfg
@@ -14,8 +14,8 @@ $_TARGETNAME.0 configure -work-area-phys 0x80000000 -work-area-size 10000 -work-
 flash bank spi0 fespi 0x40000000 0 0 0 $_TARGETNAME.0 0x20004000
 init
 if {[ info exists pulse_srst]} {
-  ftdi_set_signal nSRST 0
-  ftdi_set_signal nSRST z
+  ftdi set_signal nSRST 0
+  ftdi set_signal nSRST z
 }
 halt
 flash protect 0 64 last off
diff --git a/tcl/board/sifive-hifive1.cfg b/tcl/board/sifive-hifive1.cfg
index 196f540bb..c47485bf2 100644
--- a/tcl/board/sifive-hifive1.cfg
+++ b/tcl/board/sifive-hifive1.cfg
@@ -1,15 +1,15 @@
 adapter speed     10000
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0008 0x001b
-ftdi_layout_signal nSRST -oe 0x0020 -data 0x0020
+ftdi layout_init 0x0008 0x001b
+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
+# ftdi set_signal, but still good to document
 #adapter srst delay 1500
 
 set _CHIPNAME riscv
@@ -23,8 +23,8 @@ flash bank onboard_spi_flash fespi 0x20000000 0 0 0 $_TARGETNAME
 init
 #reset -- This type of reset is not implemented yet
 if {[ info exists pulse_srst]} {
-  ftdi_set_signal nSRST 0
-  ftdi_set_signal nSRST z
+  ftdi set_signal nSRST 0
+  ftdi set_signal nSRST z
   #Wait for the reset stretcher
   #It will work without this, but
   #will incur lots of delays for later commands.
diff --git a/tcl/board/ti_tmdx570ls20susb.cfg b/tcl/board/ti_tmdx570ls20susb.cfg
index 87cab2690..e71136cfe 100644
--- a/tcl/board/ti_tmdx570ls20susb.cfg
+++ b/tcl/board/ti_tmdx570ls20susb.cfg
@@ -12,5 +12,5 @@ reset_config trst_only
 
 # xds100v2 config says add this to the end
 init
-ftdi_set_signal PWR_RST 1
+ftdi set_signal PWR_RST 1
 jtag arp_init
diff --git a/tcl/interface/ftdi/100ask-openjtag.cfg b/tcl/interface/ftdi/100ask-openjtag.cfg
index 3cbd37e06..a12df97af 100644
--- a/tcl/interface/ftdi/100ask-openjtag.cfg
+++ b/tcl/interface/ftdi/100ask-openjtag.cfg
@@ -8,9 +8,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "USB<=>JTAG&RS232"
-ftdi_vid_pid 0x1457 0x5118
+ftdi device_desc "USB<=>JTAG&RS232"
+ftdi vid_pid 0x1457 0x5118
 
-ftdi_layout_init 0x0f08 0x0f1b
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_init 0x0f08 0x0f1b
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
diff --git a/tcl/interface/ftdi/axm0432.cfg b/tcl/interface/ftdi/axm0432.cfg
index 6cc1752e2..84b77a69a 100644
--- a/tcl/interface/ftdi/axm0432.cfg
+++ b/tcl/interface/ftdi/axm0432.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "Symphony SoundBite"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Symphony SoundBite"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0c08 0x0c2b
-ftdi_layout_signal nTRST -data 0x0800
-ftdi_layout_signal nSRST -data 0x0400
+ftdi layout_init 0x0c08 0x0c2b
+ftdi layout_signal nTRST -data 0x0800
+ftdi layout_signal nSRST -data 0x0400
diff --git a/tcl/interface/ftdi/c232hm.cfg b/tcl/interface/ftdi/c232hm.cfg
index 27cf76674..25fcae1b0 100644
--- a/tcl/interface/ftdi/c232hm.cfg
+++ b/tcl/interface/ftdi/c232hm.cfg
@@ -14,18 +14,18 @@
 # http://www.ftdichip.com/Support/Documents/AppNotes/AN_129_FTDI_Hi_Speed_USB_To_JTAG_Example.pdf
 
 adapter driver ftdi
-#ftdi_device_desc "C232HM-DDHSL-0"
-#ftdi_device_desc "C232HM-EDHSL-0"
+#ftdi device_desc "C232HM-DDHSL-0"
+#ftdi device_desc "C232HM-EDHSL-0"
 
 # Common PID for FT232H
-ftdi_vid_pid 0x0403 0x6014
+ftdi vid_pid 0x0403 0x6014
 
 # Layout
 # High data byte 0x40 configures red LED on ACBUS6 initially high (unlit, since active-low)
 # Low data byte 0x08 configures TMS on ACBUS3 initially high (asserted); TCK, TDI low
 # High direction byte 0x40 configures red LED on ACBUS6 as high (output)
 # Low direction byte 0x0b configures TDO on ACBUS2 as low (input)
-ftdi_layout_init 0x4008 0x400b
+ftdi layout_init 0x4008 0x400b
 
 # ---A*BUS-------CCCCCCCC|DDDDDDDD
 # --------\______76543210|76543210
@@ -35,12 +35,12 @@ ftdi_layout_init 0x4008 0x400b
 #GPIOL2	0x0040 = 00000000|01000000 = ADBUS6
 #GPIOL3	0x0080 = 00000000|10000000 = ADBUS7
 # -ndata treats the LED as active-low for expected behavior (toggle when transferring)
-ftdi_layout_signal LED -ndata 0x4000
+ftdi layout_signal LED -ndata 0x4000
 # Available for aliasing as desired
-ftdi_layout_signal GPIOL0 -data 0x0010 -oe 0x0010
-ftdi_layout_signal GPIOL1 -data 0x0020 -oe 0x0020
-ftdi_layout_signal GPIOL2 -data 0x0040 -oe 0x0040
-ftdi_layout_signal GPIOL3 -data 0x0080 -oe 0x0080
+ftdi layout_signal GPIOL0 -data 0x0010 -oe 0x0010
+ftdi layout_signal GPIOL1 -data 0x0020 -oe 0x0020
+ftdi layout_signal GPIOL2 -data 0x0040 -oe 0x0040
+ftdi layout_signal GPIOL3 -data 0x0080 -oe 0x0080
 
 # C232HM		FT232H	JTAG/Other
 # Num	Color	Name	Func
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
index a23ddbfb5..41e597391 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
@@ -11,12 +11,12 @@ echo "experience with this file to openocd-devel mailing list, so it could be ma
 echo "as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "USB-A9260"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "USB-A9260"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
 
 script interface/calao-usb-a9260.cfg
 script target/at91sam9260minimal.cfg
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
index 67427c5c0..001aef59c 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
@@ -11,12 +11,12 @@ echo "experience with this file to openocd-devel mailing list, so it could be ma
 echo "as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "USB-A9260"
-ftdi_vid_pid 0x0403 0x6001
+ftdi device_desc "USB-A9260"
+ftdi vid_pid 0x0403 0x6001
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
 
 script interface/calao-usb-a9260.cfg
 script target/at91sam9260minimal.cfg
diff --git a/tcl/interface/ftdi/cortino.cfg b/tcl/interface/ftdi/cortino.cfg
index 2bc516cc6..c0eae3105 100644
--- a/tcl/interface/ftdi/cortino.cfg
+++ b/tcl/interface/ftdi/cortino.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Cortino"
-ftdi_vid_pid 0x0640 0x0032
+ftdi device_desc "Cortino"
+ftdi vid_pid 0x0640 0x0032
 
-ftdi_layout_init 0x0108 0x010b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200 -oe 0x0200
+ftdi layout_init 0x0108 0x010b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200 -oe 0x0200
diff --git a/tcl/interface/ftdi/digilent-hs1.cfg b/tcl/interface/ftdi/digilent-hs1.cfg
index dfba3393a..55391b9d3 100644
--- a/tcl/interface/ftdi/digilent-hs1.cfg
+++ b/tcl/interface/ftdi/digilent-hs1.cfg
@@ -2,10 +2,10 @@
 # (the later being the OEM on-board version)
 
 adapter driver ftdi
-ftdi_device_desc "Digilent Adept USB Device"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Digilent Adept USB Device"
+ftdi vid_pid 0x0403 0x6010
 # channel 1 does not have any functionality
-ftdi_channel 0
+ftdi channel 0
 # just TCK TDI TDO TMS, no reset
-ftdi_layout_init 0x0088 0x008b
+ftdi layout_init 0x0088 0x008b
 reset_config none
diff --git a/tcl/interface/ftdi/digilent-hs2.cfg b/tcl/interface/ftdi/digilent-hs2.cfg
index ae6ba01bb..269eca0f3 100644
--- a/tcl/interface/ftdi/digilent-hs2.cfg
+++ b/tcl/interface/ftdi/digilent-hs2.cfg
@@ -1,10 +1,10 @@
 # this supports JTAG-HS2 (and apparently Nexys4 as well)
 
 adapter driver ftdi
-ftdi_device_desc "Digilent Adept USB Device"
-ftdi_vid_pid 0x0403 0x6014
+ftdi device_desc "Digilent Adept USB Device"
+ftdi vid_pid 0x0403 0x6014
 
-ftdi_channel 0
-ftdi_layout_init 0x00e8 0x60eb
+ftdi channel 0
+ftdi layout_init 0x00e8 0x60eb
 
 reset_config none
diff --git a/tcl/interface/ftdi/digilent_jtag_hs3.cfg b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
index 7160bed8e..ca2807f80 100644
--- a/tcl/interface/ftdi/digilent_jtag_hs3.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
@@ -3,11 +3,11 @@
 #
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6014
-ftdi_device_desc "Digilent USB Device"
+ftdi vid_pid 0x0403 0x6014
+ftdi device_desc "Digilent USB Device"
 
 # From Digilent support:
 # The SRST pin is [...] 0x20 and 0x10 is the /OE (active low output enable)
 
-ftdi_layout_init 0x2088 0x308b
-ftdi_layout_signal nSRST -data 0x2000 -noe 0x1000
+ftdi layout_init 0x2088 0x308b
+ftdi layout_signal nSRST -data 0x2000 -noe 0x1000
diff --git a/tcl/interface/ftdi/digilent_jtag_smt2.cfg b/tcl/interface/ftdi/digilent_jtag_smt2.cfg
index 55f278bdc..f4ba27bef 100644
--- a/tcl/interface/ftdi/digilent_jtag_smt2.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_smt2.cfg
@@ -8,10 +8,10 @@
 #
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6014
+ftdi vid_pid 0x0403 0x6014
 
-ftdi_layout_init 0x20e8 0x3feb
-ftdi_layout_signal nSRST -data 0x2000
-ftdi_layout_signal GPIO2 -data 0x2000
-ftdi_layout_signal GPIO1 -data 0x0200
-ftdi_layout_signal GPIO0 -data 0x0100
+ftdi layout_init 0x20e8 0x3feb
+ftdi layout_signal nSRST -data 0x2000
+ftdi layout_signal GPIO2 -data 0x2000
+ftdi layout_signal GPIO1 -data 0x0200
+ftdi layout_signal GPIO0 -data 0x0100
diff --git a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
index bc783a46c..a143cd772 100644
--- a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
@@ -8,11 +8,11 @@
 # https://www.xilinx.com/products/boards-and-kits/kcu105.html#documentation
 #
 # Note that the digilent_jtag_smt2 layout does not work and hangs while
-# the ftdi_device_desc from digilent_hs2 is wrong.
+# the ftdi device_desc from digilent_hs2 is wrong.
 
 adapter driver ftdi
-ftdi_device_desc "Digilent USB Device"
-ftdi_vid_pid 0x0403 0x6014
-ftdi_channel 0
-ftdi_layout_init 0x00e8 0x60eb
+ftdi device_desc "Digilent USB Device"
+ftdi vid_pid 0x0403 0x6014
+ftdi channel 0
+ftdi layout_init 0x00e8 0x60eb
 reset_config none
diff --git a/tcl/interface/ftdi/dlp-usb1232h.cfg b/tcl/interface/ftdi/dlp-usb1232h.cfg
index 9ddc2c80a..e9651dd99 100644
--- a/tcl/interface/ftdi/dlp-usb1232h.cfg
+++ b/tcl/interface/ftdi/dlp-usb1232h.cfg
@@ -13,9 +13,9 @@ echo "in ft2232.c. Please report your experience with this file to openocd-devel
 echo "mailing list, so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0008 0x000b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0040 -oe 0x0040
+ftdi layout_init 0x0008 0x000b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0040 -oe 0x0040
diff --git a/tcl/interface/ftdi/dp_busblaster.cfg b/tcl/interface/ftdi/dp_busblaster.cfg
index 86ab4d840..420f788d2 100644
--- a/tcl/interface/ftdi/dp_busblaster.cfg
+++ b/tcl/interface/ftdi/dp_busblaster.cfg
@@ -12,9 +12,9 @@ echo "Info : If you need SWD support, flash KT-Link buffer from https://github.c
 and use dp_busblaster_kt-link.cfg instead"
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
diff --git a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
index d49a4c98f..4924d2619 100644
--- a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
+++ b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
@@ -10,12 +10,12 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x8c28 0xff3b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
-ftdi_layout_signal LED -ndata 0x8000
-ftdi_layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
-ftdi_layout_signal SWDIO_OE -ndata 0x1000
+ftdi layout_init 0x8c28 0xff3b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_signal LED -ndata 0x8000
+ftdi layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
+ftdi layout_signal SWDIO_OE -ndata 0x1000
diff --git a/tcl/interface/ftdi/flossjtag-noeeprom.cfg b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
index 42ed18ec3..7083e6388 100644
--- a/tcl/interface/ftdi/flossjtag-noeeprom.cfg
+++ b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
@@ -18,9 +18,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0008 0x000b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0040 -oe 0x0040
+ftdi layout_init 0x0008 0x000b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0040 -oe 0x0040
diff --git a/tcl/interface/ftdi/flossjtag.cfg b/tcl/interface/ftdi/flossjtag.cfg
index c4ad81dcc..2e3cfca48 100644
--- a/tcl/interface/ftdi/flossjtag.cfg
+++ b/tcl/interface/ftdi/flossjtag.cfg
@@ -18,12 +18,12 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
-ftdi_device_desc "FLOSS-JTAG"
-#ftdi_serial "FJ000001"
+ftdi vid_pid 0x0403 0x6010
+ftdi device_desc "FLOSS-JTAG"
+#ftdi serial "FJ000001"
 
-ftdi_layout_init 0x0008 0x180b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0040 -oe 0x0040
-ftdi_layout_signal LED -data 0x0800
-ftdi_layout_signal LED2 -data 0x1000
+ftdi layout_init 0x0008 0x180b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0040 -oe 0x0040
+ftdi layout_signal LED -data 0x0800
+ftdi layout_signal LED2 -data 0x1000
diff --git a/tcl/interface/ftdi/flyswatter.cfg b/tcl/interface/ftdi/flyswatter.cfg
index 0b849ad53..bfa015b2c 100644
--- a/tcl/interface/ftdi/flyswatter.cfg
+++ b/tcl/interface/ftdi/flyswatter.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Flyswatter"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Flyswatter"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0818 0x0cfb
-ftdi_layout_signal nTRST -data 0x0010
-ftdi_layout_signal nSRST -oe 0x0020
-ftdi_layout_signal LED -data 0x0c00
+ftdi layout_init 0x0818 0x0cfb
+ftdi layout_signal nTRST -data 0x0010
+ftdi layout_signal nSRST -oe 0x0020
+ftdi layout_signal LED -data 0x0c00
diff --git a/tcl/interface/ftdi/flyswatter2.cfg b/tcl/interface/ftdi/flyswatter2.cfg
index 4f4a1f819..0b4a8ef9f 100644
--- a/tcl/interface/ftdi/flyswatter2.cfg
+++ b/tcl/interface/ftdi/flyswatter2.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Flyswatter2"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Flyswatter2"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0538 0x057b
-ftdi_layout_signal LED -ndata 0x0400
-ftdi_layout_signal nTRST -data 0x0010
-ftdi_layout_signal nSRST -data 0x0020 -noe 0x0100
+ftdi layout_init 0x0538 0x057b
+ftdi layout_signal LED -ndata 0x0400
+ftdi layout_signal nTRST -data 0x0010
+ftdi layout_signal nSRST -data 0x0020 -noe 0x0100
diff --git a/tcl/interface/ftdi/ft232h-module-swd.cfg b/tcl/interface/ftdi/ft232h-module-swd.cfg
index 98a8c844f..7fa428359 100644
--- a/tcl/interface/ftdi/ft232h-module-swd.cfg
+++ b/tcl/interface/ftdi/ft232h-module-swd.cfg
@@ -8,27 +8,27 @@
 
 adapter driver ftdi
 
-ftdi_vid_pid 0x0403 0x6014
+ftdi vid_pid 0x0403 0x6014
 
 # data MSB..LSB       direction (1:out) MSB..LSB
 # 0000'0000'0011'0000 0000'0000'0011'1011
-ftdi_layout_init 0x0030 0x003b
+ftdi layout_init 0x0030 0x003b
 # 0xfff8 0xfffb
 # Those signal are only required on some platforms or may required to be
 # enabled explicitly (e.g. nrf5x chips).
-ftdi_layout_signal nSRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nTRST -data 0x0020 -oe 0x0020
+ftdi layout_signal nSRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nTRST -data 0x0020 -oe 0x0020
 
 # swd enable
-ftdi_layout_signal SWD_EN -data 0
+ftdi layout_signal SWD_EN -data 0
 # tri-state (configure as input) TDO/TIO when reading
-ftdi_layout_signal SWDIO_OE -data 0
+ftdi layout_signal SWDIO_OE -data 0
 
 transport select swd
 
 # re-configure TDO as tri-state
-#ftdi_layout_signal TDO -data 0x0002 -oe 0x0002
-#ftdi_layout_signal TDI -data 0x0004
+#ftdi layout_signal TDO -data 0x0002 -oe 0x0002
+#ftdi layout_signal TDI -data 0x0004
 
 # Adafruit      FT232H    JTAG       SWD
 # Name  Pin     Name      Func       Func
diff --git a/tcl/interface/ftdi/gw16042.cfg b/tcl/interface/ftdi/gw16042.cfg
index 1288f77b1..ef3182938 100644
--- a/tcl/interface/ftdi/gw16042.cfg
+++ b/tcl/interface/ftdi/gw16042.cfg
@@ -18,9 +18,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "USB-JTAG"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "USB-JTAG"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0058 0x007b
-ftdi_layout_signal nTRST -data 0x0010
-ftdi_layout_signal nSRST -oe 0x0020
+ftdi layout_init 0x0058 0x007b
+ftdi layout_signal nTRST -data 0x0010
+ftdi layout_signal nSRST -oe 0x0020
diff --git a/tcl/interface/ftdi/hie-jtag.cfg b/tcl/interface/ftdi/hie-jtag.cfg
index 39af87d89..6694df048 100644
--- a/tcl/interface/ftdi/hie-jtag.cfg
+++ b/tcl/interface/ftdi/hie-jtag.cfg
@@ -6,15 +6,15 @@
 #
 
 adapter driver ftdi
-ftdi_channel 0
-ftdi_vid_pid 0x0403 0x6014
-ftdi_device_desc "HIE JTAG Debugger"
+ftdi channel 0
+ftdi vid_pid 0x0403 0x6014
+ftdi device_desc "HIE JTAG Debugger"
 
-ftdi_layout_init 0x0c08 0x4f1b
+ftdi layout_init 0x0c08 0x4f1b
 
 # define both Reset signals
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
 
 # Toggle USB LED
-ftdi_layout_signal LED -ndata 0x4000
+ftdi layout_signal LED -ndata 0x4000
diff --git a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
index 3802f6d2c..d55f636de 100644
--- a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NXHX 10-ETM"
-ftdi_vid_pid 0x0640 0x0028
+ftdi device_desc "NXHX 10-ETM"
+ftdi vid_pid 0x0640 0x0028
 
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
+ftdi layout_init 0x0308 0x030b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
index f2e64b4f5..8c7981561 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NXHX 500-ETM"
-ftdi_vid_pid 0x0640 0x0028
+ftdi device_desc "NXHX 500-ETM"
+ftdi vid_pid 0x0640 0x0028
 
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
+ftdi layout_init 0x0308 0x030b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
index 38f3c690e..9aa2cd516 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NXHX 500-RE"
-ftdi_vid_pid 0x0640 0x0028
+ftdi device_desc "NXHX 500-RE"
+ftdi vid_pid 0x0640 0x0028
 
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
+ftdi layout_init 0x0308 0x030b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
index bff081f18..a64d0e8a4 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NXHX 50-ETM"
-ftdi_vid_pid 0x0640 0x0028
+ftdi device_desc "NXHX 50-ETM"
+ftdi vid_pid 0x0640 0x0028
 
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
+ftdi layout_init 0x0308 0x030b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
index f9fbd015a..277883675 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NXHX50-RE"
-ftdi_vid_pid 0x0640 0x0028
+ftdi device_desc "NXHX50-RE"
+ftdi vid_pid 0x0640 0x0028
 
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
+ftdi layout_init 0x0308 0x030b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hitex_lpc1768stick.cfg b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
index 9fe80f126..87affe84a 100644
--- a/tcl/interface/ftdi/hitex_lpc1768stick.cfg
+++ b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
@@ -6,9 +6,9 @@
 
 
 adapter driver ftdi
-ftdi_device_desc "LPC1768-Stick"
-ftdi_vid_pid 0x0640 0x0026
+ftdi device_desc "LPC1768-Stick"
+ftdi vid_pid 0x0640 0x0026
 
-ftdi_layout_init 0x0388 0x038b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0080 -noe 0x200
+ftdi layout_init 0x0388 0x038b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0080 -noe 0x200
diff --git a/tcl/interface/ftdi/hitex_str9-comstick.cfg b/tcl/interface/ftdi/hitex_str9-comstick.cfg
index 2b3dc3690..6490d65f4 100644
--- a/tcl/interface/ftdi/hitex_str9-comstick.cfg
+++ b/tcl/interface/ftdi/hitex_str9-comstick.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "STR9-comStick"
-ftdi_vid_pid 0x0640 0x002c
+ftdi device_desc "STR9-comStick"
+ftdi vid_pid 0x0640 0x002c
 
-ftdi_layout_init 0x0108 0x010b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200 -oe 0x0200
+ftdi layout_init 0x0108 0x010b
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal nSRST -data 0x0200 -oe 0x0200
diff --git a/tcl/interface/ftdi/icebear.cfg b/tcl/interface/ftdi/icebear.cfg
index 04c27319e..76b2102a5 100644
--- a/tcl/interface/ftdi/icebear.cfg
+++ b/tcl/interface/ftdi/icebear.cfg
@@ -10,9 +10,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "ICEbear JTAG adapter"
-ftdi_vid_pid 0x0403 0xc140
+ftdi device_desc "ICEbear JTAG adapter"
+ftdi vid_pid 0x0403 0xc140
 
-ftdi_layout_init 0x0028 0x002b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0020
+ftdi layout_init 0x0028 0x002b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0020
diff --git a/tcl/interface/ftdi/imx8mp-evk.cfg b/tcl/interface/ftdi/imx8mp-evk.cfg
index 4e04e8cd7..64f3f3db0 100644
--- a/tcl/interface/ftdi/imx8mp-evk.cfg
+++ b/tcl/interface/ftdi/imx8mp-evk.cfg
@@ -11,18 +11,18 @@
 #
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6011
-ftdi_channel 0
+ftdi vid_pid 0x0403 0x6011
+ftdi channel 0
 
-ftdi_layout_init 0x00f8 0x000b
+ftdi layout_init 0x00f8 0x000b
 
-ftdi_layout_signal RESET_B	-data 0x0010 -oe 0x0010
+ftdi layout_signal RESET_B	-data 0x0010 -oe 0x0010
 # Called SYS_nRST in schematics
-ftdi_layout_signal nSRST	-data 0x0020 -oe 0x0020
-ftdi_layout_signal IO_nRST	-data 0x0040 -oe 0x0040
-ftdi_layout_signal ONOFF_B	-data 0x0080 -oe 0x0080
+ftdi layout_signal nSRST	-data 0x0020 -oe 0x0020
+ftdi layout_signal IO_nRST	-data 0x0040 -oe 0x0040
+ftdi layout_signal ONOFF_B	-data 0x0080 -oe 0x0080
 
-ftdi_layout_signal GPIO1	-data 0x0100 -oe 0x0100
-ftdi_layout_signal GPIO2	-data 0x0200 -oe 0x0200
-ftdi_layout_signal GPIO3	-data 0x0400 -oe 0x0400
-ftdi_layout_signal GPIO4	-data 0x0800 -oe 0x0800
+ftdi layout_signal GPIO1	-data 0x0100 -oe 0x0100
+ftdi layout_signal GPIO2	-data 0x0200 -oe 0x0200
+ftdi layout_signal GPIO3	-data 0x0400 -oe 0x0400
+ftdi layout_signal GPIO4	-data 0x0800 -oe 0x0800
diff --git a/tcl/interface/ftdi/incircuit-icprog.cfg b/tcl/interface/ftdi/incircuit-icprog.cfg
index e0bd5ef59..a20095446 100644
--- a/tcl/interface/ftdi/incircuit-icprog.cfg
+++ b/tcl/interface/ftdi/incircuit-icprog.cfg
@@ -7,8 +7,8 @@
 #
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nSRST -noe 0x0400 -data 0x0800
-ftdi_layout_signal nTRST -noe 0x0100 -data 0x0200
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nSRST -noe 0x0400 -data 0x0800
+ftdi layout_signal nTRST -noe 0x0100 -data 0x0200
diff --git a/tcl/interface/ftdi/iotlab-usb.cfg b/tcl/interface/ftdi/iotlab-usb.cfg
index caa0596fd..92ffa840b 100644
--- a/tcl/interface/ftdi/iotlab-usb.cfg
+++ b/tcl/interface/ftdi/iotlab-usb.cfg
@@ -4,8 +4,8 @@
 #
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0008 0x000b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0040 -oe 0x0040
+ftdi layout_init 0x0008 0x000b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0040 -oe 0x0040
diff --git a/tcl/interface/ftdi/isodebug.cfg b/tcl/interface/ftdi/isodebug.cfg
index ead28644c..018998963 100644
--- a/tcl/interface/ftdi/isodebug.cfg
+++ b/tcl/interface/ftdi/isodebug.cfg
@@ -2,26 +2,26 @@
 # 5 kV isolated JTAG/SWD + UART adapter by Unjo AB
 
 adapter driver ftdi
-ftdi_vid_pid 0x22b7 0x150d
+ftdi vid_pid 0x22b7 0x150d
 
-ftdi_layout_init 0x0ff8 0xfffb
+ftdi layout_init 0x0ff8 0xfffb
 
-ftdi_layout_signal LED -ndata 0x0100
-ftdi_layout_signal nTRST -data 0x0200
-ftdi_layout_signal nSRST -noe 0x0400
-ftdi_layout_signal SWDIO_OE -data 0x0008
+ftdi layout_signal LED -ndata 0x0100
+ftdi layout_signal nTRST -data 0x0200
+ftdi layout_signal nSRST -noe 0x0400
+ftdi layout_signal SWDIO_OE -data 0x0008
 
 # Mode signals, either of these needs to be high to drive the JTAG/SWD pins.
 # The power-on state is low for both signals but the init setting above sets
 # JTAG_EN high.
-ftdi_layout_signal SWD_EN -data 0x1000
-ftdi_layout_signal JTAG_EN -data 0x0800
+ftdi layout_signal SWD_EN -data 0x1000
+ftdi layout_signal JTAG_EN -data 0x0800
 
 # In SWD mode, the JTAG_EN signal doubles as SWO_EN_N which switches the
 # second FTDI channel UART RxD to the SWO pin instead of the separate RxD
 # pin. Note that the default init state has this pin high so when OpenOCD
 # starts in SWD mode, SWO is by default disabled. To enable SWO tracing,
-# issue the command 'ftdi_set_signal SWO_EN 1' where tracing is configured.
+# issue the command 'ftdi set_signal SWO_EN 1' where tracing is configured.
 # To switch back to using the separate UART, SWO_EN needs to be disabled
 # before exiting OpenOCD, or the adapter replugged.
-ftdi_layout_signal SWO_EN -nalias JTAG_EN
+ftdi layout_signal SWO_EN -nalias JTAG_EN
diff --git a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
index 82eeaa7b5..3eefecf83 100644
--- a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
+++ b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
@@ -5,12 +5,12 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "JTAG-lock-pick Tiny 2"
-ftdi_vid_pid 0x0403 0x8220
+ftdi device_desc "JTAG-lock-pick Tiny 2"
+ftdi vid_pid 0x0403 0x8220
 
-ftdi_layout_init 0x8c28 0xff3b
-ftdi_layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
-ftdi_layout_signal SWDIO_OE -ndata 0x1000
-ftdi_layout_signal LED -ndata 0x8000
+ftdi layout_init 0x8c28 0xff3b
+ftdi layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_signal SWDIO_OE -ndata 0x1000
+ftdi layout_signal LED -ndata 0x8000
diff --git a/tcl/interface/ftdi/jtagkey.cfg b/tcl/interface/ftdi/jtagkey.cfg
index 06463ab91..511244b3f 100644
--- a/tcl/interface/ftdi/jtagkey.cfg
+++ b/tcl/interface/ftdi/jtagkey.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Amontec JTAGkey"
-ftdi_vid_pid 0x0403 0xcff8
+ftdi device_desc "Amontec JTAGkey"
+ftdi vid_pid 0x0403 0xcff8
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
diff --git a/tcl/interface/ftdi/jtagkey2.cfg b/tcl/interface/ftdi/jtagkey2.cfg
index ba151d3b5..aa33a7528 100644
--- a/tcl/interface/ftdi/jtagkey2.cfg
+++ b/tcl/interface/ftdi/jtagkey2.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Amontec JTAGkey-2"
-ftdi_vid_pid 0x0403 0xcff8
+ftdi device_desc "Amontec JTAGkey-2"
+ftdi vid_pid 0x0403 0xcff8
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
diff --git a/tcl/interface/ftdi/jtagkey2p.cfg b/tcl/interface/ftdi/jtagkey2p.cfg
index acb5047e9..dbfca66c4 100644
--- a/tcl/interface/ftdi/jtagkey2p.cfg
+++ b/tcl/interface/ftdi/jtagkey2p.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Amontec JTAGkey-2P"
-ftdi_vid_pid 0x0403 0xcff8
+ftdi device_desc "Amontec JTAGkey-2P"
+ftdi vid_pid 0x0403 0xcff8
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
diff --git a/tcl/interface/ftdi/kt-link.cfg b/tcl/interface/ftdi/kt-link.cfg
index 5fc5db9d0..112ecf154 100644
--- a/tcl/interface/ftdi/kt-link.cfg
+++ b/tcl/interface/ftdi/kt-link.cfg
@@ -5,12 +5,12 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "KT-LINK"
-ftdi_vid_pid 0x0403 0xbbe2
+ftdi device_desc "KT-LINK"
+ftdi vid_pid 0x0403 0xbbe2
 
-ftdi_layout_init 0x8c28 0xff3b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
-ftdi_layout_signal LED -data 0x8000
-ftdi_layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
-ftdi_layout_signal SWDIO_OE -ndata 0x1000
+ftdi layout_init 0x8c28 0xff3b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_signal LED -data 0x8000
+ftdi layout_signal SWD_EN -ndata 0x0020 -oe 0x2000
+ftdi layout_signal SWDIO_OE -ndata 0x1000
diff --git a/tcl/interface/ftdi/lisa-l.cfg b/tcl/interface/ftdi/lisa-l.cfg
index 4e52f7b7e..3da64a00e 100644
--- a/tcl/interface/ftdi/lisa-l.cfg
+++ b/tcl/interface/ftdi/lisa-l.cfg
@@ -10,11 +10,11 @@ echo "in ft2232.c. Please report your experience with this file to openocd-devel
 echo "mailing list, so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "Lisa/L"
-ftdi_vid_pid 0x0403 0x6010
-ftdi_channel 1
+ftdi device_desc "Lisa/L"
+ftdi vid_pid 0x0403 0x6010
+ftdi channel 1
 
-ftdi_layout_init 0x0008 0x180b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0040 -oe 0x0040
-ftdi_layout_signal LED -data 0x1800
+ftdi layout_init 0x0008 0x180b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0040 -oe 0x0040
+ftdi layout_signal LED -data 0x1800
diff --git a/tcl/interface/ftdi/luminary-icdi.cfg b/tcl/interface/ftdi/luminary-icdi.cfg
index 8bc783e92..08676a348 100644
--- a/tcl/interface/ftdi/luminary-icdi.cfg
+++ b/tcl/interface/ftdi/luminary-icdi.cfg
@@ -16,10 +16,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Luminary Micro ICDI Board"
-ftdi_vid_pid 0x0403 0xbcda
+ftdi device_desc "Luminary Micro ICDI Board"
+ftdi vid_pid 0x0403 0xbcda
 
-ftdi_layout_init 0x00a8 0x00eb
-ftdi_layout_signal nSRST -noe 0x0020
-ftdi_layout_signal SWD_EN -ndata 0x0080
-ftdi_layout_signal SWDIO_OE -data 0x0008
+ftdi layout_init 0x00a8 0x00eb
+ftdi layout_signal nSRST -noe 0x0020
+ftdi layout_signal SWD_EN -ndata 0x0080
+ftdi layout_signal SWDIO_OE -data 0x0008
diff --git a/tcl/interface/ftdi/luminary-lm3s811.cfg b/tcl/interface/ftdi/luminary-lm3s811.cfg
index aac915e34..90f454ef0 100644
--- a/tcl/interface/ftdi/luminary-lm3s811.cfg
+++ b/tcl/interface/ftdi/luminary-lm3s811.cfg
@@ -12,10 +12,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "LM3S811 Evaluation Board"
-ftdi_vid_pid 0x0403 0xbcd9
+ftdi device_desc "LM3S811 Evaluation Board"
+ftdi vid_pid 0x0403 0xbcd9
 
-ftdi_layout_init 0x0088 0x008b
-ftdi_layout_signal nSRST -data 0x0020 -oe 0x0020
-ftdi_layout_signal SWD_EN -ndata 0x0080
-ftdi_layout_signal SWDIO_OE -data 0x0008
+ftdi layout_init 0x0088 0x008b
+ftdi layout_signal nSRST -data 0x0020 -oe 0x0020
+ftdi layout_signal SWD_EN -ndata 0x0080
+ftdi layout_signal SWDIO_OE -data 0x0008
diff --git a/tcl/interface/ftdi/luminary.cfg b/tcl/interface/ftdi/luminary.cfg
index 5e34f8cea..3258b214c 100644
--- a/tcl/interface/ftdi/luminary.cfg
+++ b/tcl/interface/ftdi/luminary.cfg
@@ -25,10 +25,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Stellaris Evaluation Board"
-ftdi_vid_pid 0x0403 0xbcd9
+ftdi device_desc "Stellaris Evaluation Board"
+ftdi vid_pid 0x0403 0xbcd9
 
-ftdi_layout_init 0x00a8 0x00eb
-ftdi_layout_signal nSRST -noe 0x0020
-ftdi_layout_signal SWD_EN -ndata 0x0080
-ftdi_layout_signal SWDIO_OE -data 0x0008
+ftdi layout_init 0x00a8 0x00eb
+ftdi layout_signal nSRST -noe 0x0020
+ftdi layout_signal SWD_EN -ndata 0x0080
+ftdi layout_signal SWDIO_OE -data 0x0008
diff --git a/tcl/interface/ftdi/m53evk.cfg b/tcl/interface/ftdi/m53evk.cfg
index 6597f2d30..2b7c43445 100644
--- a/tcl/interface/ftdi/m53evk.cfg
+++ b/tcl/interface/ftdi/m53evk.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_channel 0
-ftdi_layout_init 0x0008 0x000b
-ftdi_layout_signal nTRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal nSRST -data 0x0020 -oe 0x0020
+ftdi channel 0
+ftdi layout_init 0x0008 0x000b
+ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+ftdi layout_signal nSRST -data 0x0020 -oe 0x0020
diff --git a/tcl/interface/ftdi/mbftdi.cfg b/tcl/interface/ftdi/mbftdi.cfg
index c0ff86574..a34390ba7 100644
--- a/tcl/interface/ftdi/mbftdi.cfg
+++ b/tcl/interface/ftdi/mbftdi.cfg
@@ -10,7 +10,7 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0008 0x000b
+ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/minimodule-swd.cfg b/tcl/interface/ftdi/minimodule-swd.cfg
index 4bc331edb..15b007afb 100644
--- a/tcl/interface/ftdi/minimodule-swd.cfg
+++ b/tcl/interface/ftdi/minimodule-swd.cfg
@@ -38,17 +38,17 @@ adapter driver ftdi
 
 #Select your module type and channel
 
-#ftdi_device_desc "FT2232H MiniModule"
-ftdi_vid_pid 0x0403 0x6010
-#ftdi_channel 1
+#ftdi device_desc "FT2232H MiniModule"
+ftdi vid_pid 0x0403 0x6010
+#ftdi channel 1
 
-#ftdi_device_desc "FT4232H MiniModule"
-#ftdi_vid_pid 0x0403 0x6011
-#ftdi_channel 1
+#ftdi device_desc "FT4232H MiniModule"
+#ftdi vid_pid 0x0403 0x6011
+#ftdi channel 1
 
-ftdi_layout_init 0x0000 0x000b
-ftdi_layout_signal nSRST -data 0x0010 -oe 0x0010
-ftdi_layout_signal SWD_EN -data 0
-ftdi_layout_signal SWDIO_OE -data 0
+ftdi layout_init 0x0000 0x000b
+ftdi layout_signal nSRST -data 0x0010 -oe 0x0010
+ftdi layout_signal SWD_EN -data 0
+ftdi layout_signal SWDIO_OE -data 0
 
 transport select swd
diff --git a/tcl/interface/ftdi/minimodule.cfg b/tcl/interface/ftdi/minimodule.cfg
index 5dcce1fcf..6b2d60c07 100644
--- a/tcl/interface/ftdi/minimodule.cfg
+++ b/tcl/interface/ftdi/minimodule.cfg
@@ -5,12 +5,12 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "FT2232H MiniModule"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "FT2232H MiniModule"
+ftdi vid_pid 0x0403 0x6010
 
 # Every pin set as high impedance except TCK, TDI, TDO and TMS
-ftdi_layout_init 0x0008 0x000b
+ftdi layout_init 0x0008 0x000b
 
 # nSRST defined on pin CN2-13 of the MiniModule (pin ADBUS5 [AD5] on the FT2232H chip)
 # This choice is arbitrary. Use other GPIO pin if desired.
-ftdi_layout_signal nSRST -data 0x0020 -oe 0x0020
+ftdi layout_signal nSRST -data 0x0020 -oe 0x0020
diff --git a/tcl/interface/ftdi/minispartan6.cfg b/tcl/interface/ftdi/minispartan6.cfg
index 97a6abe04..faf820d7a 100644
--- a/tcl/interface/ftdi/minispartan6.cfg
+++ b/tcl/interface/ftdi/minispartan6.cfg
@@ -3,12 +3,12 @@
 adapter driver ftdi
 # The miniSpartan6+ sadly doesn't have a custom device description, so we just
 # have to hope you got it right.
-#ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+#ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 # interface 1 is the uart
-ftdi_channel 0
+ftdi channel 0
 # just TCK TDI TDO TMS, no reset
-ftdi_layout_init 0x0008 0x000b
+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
diff --git a/tcl/interface/ftdi/miniwiggler.cfg b/tcl/interface/ftdi/miniwiggler.cfg
index 6e53daede..ebaa97920 100644
--- a/tcl/interface/ftdi/miniwiggler.cfg
+++ b/tcl/interface/ftdi/miniwiggler.cfg
@@ -25,10 +25,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "DAS JDS miniWiggler V3.1"
-ftdi_vid_pid 0x058b 0x0043
+ftdi device_desc "DAS JDS miniWiggler V3.1"
+ftdi vid_pid 0x058b 0x0043
 
-ftdi_channel 0
-ftdi_layout_init 0x0008 0x001b
-ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
-ftdi_layout_signal nSRST -data 0x0200 -oe 0x0200
+ftdi channel 0
+ftdi layout_init 0x0008 0x001b
+ftdi layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi layout_signal nSRST -data 0x0200 -oe 0x0200
diff --git a/tcl/interface/ftdi/neodb.cfg b/tcl/interface/ftdi/neodb.cfg
index 1cfb3526c..426f5c4c7 100644
--- a/tcl/interface/ftdi/neodb.cfg
+++ b/tcl/interface/ftdi/neodb.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Debug Board for Neo1973"
-ftdi_vid_pid 0x1457 0x5118
+ftdi device_desc "Debug Board for Neo1973"
+ftdi vid_pid 0x1457 0x5118
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200 -noe 0x0100
-ftdi_layout_signal nSRST -data 0x0800 -noe 0x0400
-ftdi_layout_signal nNOR_WP -data 0x0010 -oe 0x0010
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nTRST -data 0x0200 -noe 0x0100
+ftdi layout_signal nSRST -data 0x0800 -noe 0x0400
+ftdi layout_signal nNOR_WP -data 0x0010 -oe 0x0010
diff --git a/tcl/interface/ftdi/ngxtech.cfg b/tcl/interface/ftdi/ngxtech.cfg
index 3aa79ab31..962f25baa 100644
--- a/tcl/interface/ftdi/ngxtech.cfg
+++ b/tcl/interface/ftdi/ngxtech.cfg
@@ -11,9 +11,9 @@ echo "experience with this file to openocd-devel mailing list, so it could be ma
 echo "as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "NGX JTAG"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "NGX JTAG"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200 -noe 0x0100
-ftdi_layout_signal nSRST -data 0x0800 -noe 0x0400
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nTRST -data 0x0200 -noe 0x0100
+ftdi layout_signal nSRST -data 0x0800 -noe 0x0400
diff --git a/tcl/interface/ftdi/olimex-arm-jtag-swd.cfg b/tcl/interface/ftdi/olimex-arm-jtag-swd.cfg
index 2153fd65f..ace0df98d 100644
--- a/tcl/interface/ftdi/olimex-arm-jtag-swd.cfg
+++ b/tcl/interface/ftdi/olimex-arm-jtag-swd.cfg
@@ -5,5 +5,5 @@
 
 transport select swd
 
-ftdi_layout_signal SWD_EN -nalias nTRST
-ftdi_layout_signal SWDIO_OE -alias TMS
+ftdi layout_signal SWD_EN -nalias nTRST
+ftdi layout_signal SWDIO_OE -alias TMS
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
index c8e3befb7..ca014a4d4 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
-ftdi_vid_pid 0x15ba 0x002b
+ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
+ftdi vid_pid 0x15ba 0x002b
 
-ftdi_layout_init 0x0908 0x0b1b
-ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal LED -data 0x0800
+ftdi layout_init 0x0908 0x0b1b
+ftdi layout_signal nSRST -oe 0x0200
+ftdi layout_signal nTRST -data 0x0100
+ftdi layout_signal LED -data 0x0800
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
index f9126d40d..6b9257583 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Olimex OpenOCD JTAG"
-ftdi_vid_pid 0x15ba 0x0003
+ftdi device_desc "Olimex OpenOCD JTAG"
+ftdi vid_pid 0x15ba 0x0003
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal LED -data 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nSRST -oe 0x0200
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal LED -data 0x0800
diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
index eac25b6da..98fe36784 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
-ftdi_vid_pid 0x15ba 0x002a
+ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
+ftdi vid_pid 0x15ba 0x002a
 
-ftdi_layout_init 0x0808 0x0a1b
-ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
-ftdi_layout_signal LED -data 0x0800
+ftdi layout_init 0x0808 0x0a1b
+ftdi layout_signal nSRST -oe 0x0200
+ftdi layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi layout_signal LED -data 0x0800
diff --git a/tcl/interface/ftdi/olimex-jtag-tiny.cfg b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
index 4811f4dda..ebca496d2 100644
--- a/tcl/interface/ftdi/olimex-jtag-tiny.cfg
+++ b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Olimex OpenOCD JTAG TINY"
-ftdi_vid_pid 0x15ba 0x0004
+ftdi device_desc "Olimex OpenOCD JTAG TINY"
+ftdi vid_pid 0x15ba 0x0004
 
-ftdi_layout_init 0x0808 0x0a1b
-ftdi_layout_signal nSRST -oe 0x0200
-ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
-ftdi_layout_signal LED -data 0x0800
+ftdi layout_init 0x0808 0x0a1b
+ftdi layout_signal nSRST -oe 0x0200
+ftdi layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi layout_signal LED -data 0x0800
diff --git a/tcl/interface/ftdi/oocdlink.cfg b/tcl/interface/ftdi/oocdlink.cfg
index deba4a504..367112a6c 100644
--- a/tcl/interface/ftdi/oocdlink.cfg
+++ b/tcl/interface/ftdi/oocdlink.cfg
@@ -11,9 +11,9 @@ echo "experience with this file to openocd-devel mailing list, so it could be ma
 echo "as working or fixed."
 
 adapter driver ftdi
-ftdi_device_desc "OOCDLink"
-ftdi_vid_pid 0x0403 0xbaf8
+ftdi device_desc "OOCDLink"
+ftdi vid_pid 0x0403 0xbaf8
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200 -noe 0x0100
-ftdi_layout_signal nSRST -data 0x0800 -noe 0x0400
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nTRST -data 0x0200 -noe 0x0100
+ftdi layout_signal nSRST -data 0x0800 -noe 0x0400
diff --git a/tcl/interface/ftdi/opendous_ftdi.cfg b/tcl/interface/ftdi/opendous_ftdi.cfg
index 50f32fb3a..f212bf561 100644
--- a/tcl/interface/ftdi/opendous_ftdi.cfg
+++ b/tcl/interface/ftdi/opendous_ftdi.cfg
@@ -8,10 +8,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
-ftdi_channel 1
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
+ftdi channel 1
 
-ftdi_layout_init 0x0c08 0x0f1b
-ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
diff --git a/tcl/interface/ftdi/openocd-usb-hs.cfg b/tcl/interface/ftdi/openocd-usb-hs.cfg
index 6f67689f6..d1a3ff0a2 100644
--- a/tcl/interface/ftdi/openocd-usb-hs.cfg
+++ b/tcl/interface/ftdi/openocd-usb-hs.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232-HS"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232-HS"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200 -noe 0x0100
-ftdi_layout_signal nSRST -data 0x0800 -noe 0x0400
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nTRST -data 0x0200 -noe 0x0100
+ftdi layout_signal nSRST -data 0x0800 -noe 0x0400
diff --git a/tcl/interface/ftdi/openocd-usb.cfg b/tcl/interface/ftdi/openocd-usb.cfg
index ed80a05d9..620d20436 100644
--- a/tcl/interface/ftdi/openocd-usb.cfg
+++ b/tcl/interface/ftdi/openocd-usb.cfg
@@ -5,9 +5,9 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "Dual RS232"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Dual RS232"
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0508 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200 -noe 0x0100
-ftdi_layout_signal nSRST -data 0x0800 -noe 0x0400
+ftdi layout_init 0x0508 0x0f1b
+ftdi layout_signal nTRST -data 0x0200 -noe 0x0100
+ftdi layout_signal nSRST -data 0x0800 -noe 0x0400
diff --git a/tcl/interface/ftdi/openrd.cfg b/tcl/interface/ftdi/openrd.cfg
index 535c5e896..88b2a6e51 100644
--- a/tcl/interface/ftdi/openrd.cfg
+++ b/tcl/interface/ftdi/openrd.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "OpenRD JTAGKey FT2232D B"
-ftdi_vid_pid 0x0403 0x9e90
-ftdi_channel 0
+ftdi device_desc "OpenRD JTAGKey FT2232D B"
+ftdi vid_pid 0x0403 0x9e90
+ftdi channel 0
 
-ftdi_layout_init 0x0608 0x0f1b
-ftdi_layout_signal nTRST -data 0x0200
-ftdi_layout_signal nSRST -noe 0x0400
+ftdi layout_init 0x0608 0x0f1b
+ftdi layout_signal nTRST -data 0x0200
+ftdi layout_signal nSRST -noe 0x0400
diff --git a/tcl/interface/ftdi/pipistrello.cfg b/tcl/interface/ftdi/pipistrello.cfg
index 2074924a3..11fcf077c 100644
--- a/tcl/interface/ftdi/pipistrello.cfg
+++ b/tcl/interface/ftdi/pipistrello.cfg
@@ -1,12 +1,12 @@
 # http://pipistrello.saanlima.com/
 # http://www.saanlima.com/download/pipistrello-v2.0/pipistrello_v2_schematic.pdf
 adapter driver ftdi
-ftdi_device_desc "Pipistrello LX45"
-ftdi_vid_pid 0x0403 0x6010
+ftdi device_desc "Pipistrello LX45"
+ftdi vid_pid 0x0403 0x6010
 # interface 1 is the uart
-ftdi_channel 0
+ftdi channel 0
 # just TCK TDI TDO TMS, no reset
-ftdi_layout_init 0x0008 0x000b
+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
diff --git a/tcl/interface/ftdi/pls_spc5.cfg b/tcl/interface/ftdi/pls_spc5.cfg
index 806f920fe..3b3c2d647 100644
--- a/tcl/interface/ftdi/pls_spc5.cfg
+++ b/tcl/interface/ftdi/pls_spc5.cfg
@@ -27,10 +27,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "PLS USB/JTAG Adapter for SPC5xxx"
-ftdi_vid_pid 0x263d 0x4001
+ftdi device_desc "PLS USB/JTAG Adapter for SPC5xxx"
+ftdi vid_pid 0x263d 0x4001
 
-ftdi_channel 0
-ftdi_layout_init 0x0008 0x000b
-ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
-ftdi_layout_signal nSRST -ndata 0x2000 -oe 0x2000
+ftdi channel 0
+ftdi layout_init 0x0008 0x000b
+ftdi layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi layout_signal nSRST -ndata 0x2000 -oe 0x2000
diff --git a/tcl/interface/ftdi/redbee-econotag.cfg b/tcl/interface/ftdi/redbee-econotag.cfg
index b6f6d23ba..35bedfa7e 100644
--- a/tcl/interface/ftdi/redbee-econotag.cfg
+++ b/tcl/interface/ftdi/redbee-econotag.cfg
@@ -14,8 +14,8 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
+ftdi vid_pid 0x0403 0x6010
 
-ftdi_layout_init 0x0c08 0x0c2b
-ftdi_layout_signal nTRST -data 0x0800
-ftdi_layout_signal nSRST -data 0x0400
+ftdi layout_init 0x0c08 0x0c2b
+ftdi layout_signal nTRST -data 0x0800
+ftdi layout_signal nSRST -data 0x0400
diff --git a/tcl/interface/ftdi/redbee-usb.cfg b/tcl/interface/ftdi/redbee-usb.cfg
index 52ab93e02..a57176610 100644
--- a/tcl/interface/ftdi/redbee-usb.cfg
+++ b/tcl/interface/ftdi/redbee-usb.cfg
@@ -14,9 +14,9 @@ echo "Please report your experience with this file to openocd-devel mailing list
 echo "so it could be marked as working or fixed."
 
 adapter driver ftdi
-ftdi_vid_pid 0x0403 0x6010
-ftdi_channel 1
+ftdi vid_pid 0x0403 0x6010
+ftdi channel 1
 
-ftdi_layout_init 0x0c08 0x0c2b
-ftdi_layout_signal nTRST -data 0x0800
-ftdi_layout_signal nSRST -data 0x0400
+ftdi layout_init 0x0c08 0x0c2b
+ftdi layout_signal nTRST -data 0x0800
+ftdi layout_signal nSRST -data 0x0400
diff --git a/tcl/interface/ftdi/rowley-cc-arm-swd.cfg b/tcl/interface/ftdi/rowley-cc-arm-swd.cfg
index 9a96dbd92..fb416db56 100644
--- a/tcl/interface/ftdi/rowley-cc-arm-swd.cfg
+++ b/tcl/interface/ftdi/rowley-cc-arm-swd.cfg
@@ -6,5 +6,5 @@
 
 transport select swd
 
-ftdi_layout_signal SWD_EN -nalias nTRST
-ftdi_layout_signal SWDIO_OE -alias TMS
+ftdi layout_signal SWD_EN -nalias nTRST
+ftdi layout_signal SWDIO_OE -alias TMS
diff --git a/tcl/interface/ftdi/sheevaplug.cfg b/tcl/interface/ftdi/sheevaplug.cfg
index e58235032..5929453c1 100644
--- a/tcl/interface/ftdi/sheevaplug.cfg
+++ b/tcl/interface/ftdi/sheevaplug.cfg
@@ -5,10 +5,10 @@
 #
 
 adapter driver ftdi
-ftdi_device_desc "SheevaPlug JTAGKey FT2232D B"
-ftdi_vid_pid 0x9e88 0x9e8f
-ftd...
 
[truncated message content]

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-261-g7c38f2452

The Open On-Chip Debugger

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-261-g7c38f2452