tcl: replace command "interface" with "adapter driver"

Avoid annoying "deprecated" messages while running the scripts
distributed with OpenOCD code.
Change automatically created with command
	sed -i 's/^interface /adapter driver /' $(find tcl/ -type f)

Change-Id: I2291dfb96e164beecbeb3366ce83f9df2ad6c197
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5283
Reviewed-by: Marc Schink <dev@zapb.de>
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>

70 files changed, 70 insertions, 70 deletions

diff --git a/tcl/interface/ftdi/100ask-openjtag.cfg b/tcl/interface/ftdi/100ask-openjtag.cfg
index 01ae2f7e..3cbd37e0 100644
--- a/tcl/interface/ftdi/100ask-openjtag.cfg
+++ b/tcl/interface/ftdi/100ask-openjtag.cfg
@@ -7,7 +7,7 @@
 # https://blog.matthiasbock.net/wp-content/uploads/2015/04/100ask-JTAGv3.pdf
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB<=>JTAG&RS232"
 ftdi_vid_pid 0x1457 0x5118
 
diff --git a/tcl/interface/ftdi/axm0432.cfg b/tcl/interface/ftdi/axm0432.cfg
index 0c24a333..6cc1752e 100644
--- a/tcl/interface/ftdi/axm0432.cfg
+++ b/tcl/interface/ftdi/axm0432.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Symphony SoundBite"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/c232hm.cfg b/tcl/interface/ftdi/c232hm.cfg
index 4f623e0f..27cf7667 100644
--- a/tcl/interface/ftdi/c232hm.cfg
+++ b/tcl/interface/ftdi/c232hm.cfg
@@ -13,7 +13,7 @@
 # http://www.ftdichip.com/Support/Documents/AppNotes/AN_135_MPSSE_Basics.pdf
 # http://www.ftdichip.com/Support/Documents/AppNotes/AN_129_FTDI_Hi_Speed_USB_To_JTAG_Example.pdf
 
-interface ftdi
+adapter driver ftdi
 #ftdi_device_desc "C232HM-DDHSL-0"
 #ftdi_device_desc "C232HM-EDHSL-0"
 
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
index d3da6b7e..a23ddbfb 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-A9260"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
index dc4dca8f..67427c5c 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-A9260"
 ftdi_vid_pid 0x0403 0x6001
 
diff --git a/tcl/interface/ftdi/cortino.cfg b/tcl/interface/ftdi/cortino.cfg
index 16ede612..2bc516cc 100644
--- a/tcl/interface/ftdi/cortino.cfg
+++ b/tcl/interface/ftdi/cortino.cfg
@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=cortino
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Cortino"
 ftdi_vid_pid 0x0640 0x0032
 
diff --git a/tcl/interface/ftdi/digilent-hs1.cfg b/tcl/interface/ftdi/digilent-hs1.cfg
index e27249b3..dfba3393 100644
--- a/tcl/interface/ftdi/digilent-hs1.cfg
+++ b/tcl/interface/ftdi/digilent-hs1.cfg
@@ -1,7 +1,7 @@
 # this supports JTAG-HS1 and JTAG-SMT1
 # (the later being the OEM on-board version)
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent Adept USB Device"
 ftdi_vid_pid 0x0403 0x6010
 # channel 1 does not have any functionality
diff --git a/tcl/interface/ftdi/digilent-hs2.cfg b/tcl/interface/ftdi/digilent-hs2.cfg
index 2005b66a..ae6ba01b 100644
--- a/tcl/interface/ftdi/digilent-hs2.cfg
+++ b/tcl/interface/ftdi/digilent-hs2.cfg
@@ -1,6 +1,6 @@
 # this supports JTAG-HS2 (and apparently Nexys4 as well)
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent Adept USB Device"
 ftdi_vid_pid 0x0403 0x6014
 
diff --git a/tcl/interface/ftdi/digilent_jtag_hs3.cfg b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
index f7b8e570..7160bed8 100644
--- a/tcl/interface/ftdi/digilent_jtag_hs3.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
@@ -2,7 +2,7 @@
 # Digilent JTAG-HS3
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6014
 ftdi_device_desc "Digilent USB Device"
 
diff --git a/tcl/interface/ftdi/digilent_jtag_smt2.cfg b/tcl/interface/ftdi/digilent_jtag_smt2.cfg
index 014fe147..493ed6af 100644
--- a/tcl/interface/ftdi/digilent_jtag_smt2.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_smt2.cfg
@@ -7,7 +7,7 @@
 # http://electronix.ru/forum/index.php?showtopic=114633&view=findpost&p=1215497 and ZedBoard schematics
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6014
 
 ftdi_layout_init 0x2088 0x3f8b
diff --git a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
index a83a0081..bc783a46 100644
--- a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
@@ -10,7 +10,7 @@
 # Note that the digilent_jtag_smt2 layout does not work and hangs while
 # the ftdi_device_desc from digilent_hs2 is wrong.
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent USB Device"
 ftdi_vid_pid 0x0403 0x6014
 ftdi_channel 0
diff --git a/tcl/interface/ftdi/dlp-usb1232h.cfg b/tcl/interface/ftdi/dlp-usb1232h.cfg
index f447771e..9ddc2c80 100644
--- a/tcl/interface/ftdi/dlp-usb1232h.cfg
+++ b/tcl/interface/ftdi/dlp-usb1232h.cfg
@@ -12,7 +12,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 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."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/dp_busblaster.cfg b/tcl/interface/ftdi/dp_busblaster.cfg
index 73827cfb..86ab4d84 100644
--- a/tcl/interface/ftdi/dp_busblaster.cfg
+++ b/tcl/interface/ftdi/dp_busblaster.cfg
@@ -11,7 +11,7 @@
 echo "Info : If you need SWD support, flash KT-Link buffer from https://github.com/bharrisau/busblaster
 and use dp_busblaster_kt-link.cfg instead"
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
index 2d27519d..d49a4c98 100644
--- a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
+++ b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
@@ -9,7 +9,7 @@
 # http://dangerousprototypes.com/docs/Bus_Blaster
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/flossjtag-noeeprom.cfg b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
index 18046e74..42ed18ec 100644
--- a/tcl/interface/ftdi/flossjtag-noeeprom.cfg
+++ b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
@@ -17,7 +17,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/flossjtag.cfg b/tcl/interface/ftdi/flossjtag.cfg
index 13e1f0bb..c4ad81dc 100644
--- a/tcl/interface/ftdi/flossjtag.cfg
+++ b/tcl/interface/ftdi/flossjtag.cfg
@@ -17,7 +17,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 ftdi_device_desc "FLOSS-JTAG"
 #ftdi_serial "FJ000001"
diff --git a/tcl/interface/ftdi/flyswatter.cfg b/tcl/interface/ftdi/flyswatter.cfg
index 56dab1f3..5e9d4816 100644
--- a/tcl/interface/ftdi/flyswatter.cfg
+++ b/tcl/interface/ftdi/flyswatter.cfg
@@ -4,7 +4,7 @@
 # http://www.tincantools.com/product.php?productid=16134
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Flyswatter"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/flyswatter2.cfg b/tcl/interface/ftdi/flyswatter2.cfg
index 8bd4db4b..45dd0bac 100644
--- a/tcl/interface/ftdi/flyswatter2.cfg
+++ b/tcl/interface/ftdi/flyswatter2.cfg
@@ -4,7 +4,7 @@
 # http://www.tincantools.com/product.php?productid=16153
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Flyswatter2"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/ft232h-module-swd.cfg b/tcl/interface/ftdi/ft232h-module-swd.cfg
index d2bd1da6..e85640bc 100644
--- a/tcl/interface/ftdi/ft232h-module-swd.cfg
+++ b/tcl/interface/ftdi/ft232h-module-swd.cfg
@@ -6,7 +6,7 @@
 #
 #
 
-interface ftdi
+adapter driver ftdi
 
 ftdi_vid_pid 0x0403 0x6014
 
diff --git a/tcl/interface/ftdi/gw16042.cfg b/tcl/interface/ftdi/gw16042.cfg
index 90c6f7c1..1288f77b 100644
--- a/tcl/interface/ftdi/gw16042.cfg
+++ b/tcl/interface/ftdi/gw16042.cfg
@@ -17,7 +17,7 @@
 #   BDBUS1 TXD (input)
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-JTAG"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
index b682333e..3802f6d2 100644
--- a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 10-ETM"
 ftdi_vid_pid 0x0640 0x0028
 
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
index 3483030c..f2e64b4f 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 500-ETM"
 ftdi_vid_pid 0x0640 0x0028
 
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
index b4cada05..38f3c690 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 500-RE"
 ftdi_vid_pid 0x0640 0x0028
 
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
index 67074a26..bff081f1 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 50-ETM"
 ftdi_vid_pid 0x0640 0x0028
 
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
index 966dcd81..f9fbd015 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX50-RE"
 ftdi_vid_pid 0x0640 0x0028
 
diff --git a/tcl/interface/ftdi/hitex_lpc1768stick.cfg b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
index f22d4f7b..3f49522d 100644
--- a/tcl/interface/ftdi/hitex_lpc1768stick.cfg
+++ b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
@@ -5,7 +5,7 @@
 #
 
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "LPC1768-Stick"
 ftdi_vid_pid 0x0640 0x0026
 
diff --git a/tcl/interface/ftdi/hitex_str9-comstick.cfg b/tcl/interface/ftdi/hitex_str9-comstick.cfg
index c46f0322..2b3dc369 100644
--- a/tcl/interface/ftdi/hitex_str9-comstick.cfg
+++ b/tcl/interface/ftdi/hitex_str9-comstick.cfg
@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=383
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "STR9-comStick"
 ftdi_vid_pid 0x0640 0x002c
 
diff --git a/tcl/interface/ftdi/icebear.cfg b/tcl/interface/ftdi/icebear.cfg
index 2c03d417..04c27319 100644
--- a/tcl/interface/ftdi/icebear.cfg
+++ b/tcl/interface/ftdi/icebear.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "ICEbear JTAG adapter"
 ftdi_vid_pid 0x0403 0xc140
 
diff --git a/tcl/interface/ftdi/incircuit-icprog.cfg b/tcl/interface/ftdi/incircuit-icprog.cfg
index 5e90a703..e0bd5ef5 100644
--- a/tcl/interface/ftdi/incircuit-icprog.cfg
+++ b/tcl/interface/ftdi/incircuit-icprog.cfg
@@ -6,7 +6,7 @@
 # http://wiki.in-circuit.de/images/0/06/610000158A_openocd.pdf
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 
 ftdi_layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/iotlab-usb.cfg b/tcl/interface/ftdi/iotlab-usb.cfg
index fbbad0c8..caa0596f 100644
--- a/tcl/interface/ftdi/iotlab-usb.cfg
+++ b/tcl/interface/ftdi/iotlab-usb.cfg
@@ -3,7 +3,7 @@
 # https://github.com/iot-lab/iot-lab/wiki
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 
 ftdi_layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
index c5e5db42..82eeaa7b 100644
--- a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
+++ b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
@@ -4,7 +4,7 @@
 # http://www.distortec.com
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "JTAG-lock-pick Tiny 2"
 ftdi_vid_pid 0x0403 0x8220
 
diff --git a/tcl/interface/ftdi/jtagkey.cfg b/tcl/interface/ftdi/jtagkey.cfg
index 7b87e6df..06463ab9 100644
--- a/tcl/interface/ftdi/jtagkey.cfg
+++ b/tcl/interface/ftdi/jtagkey.cfg
@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey.shtml
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey"
 ftdi_vid_pid 0x0403 0xcff8
 
diff --git a/tcl/interface/ftdi/jtagkey2.cfg b/tcl/interface/ftdi/jtagkey2.cfg
index c6c2b32f..ba151d3b 100644
--- a/tcl/interface/ftdi/jtagkey2.cfg
+++ b/tcl/interface/ftdi/jtagkey2.cfg
@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey2.shtml
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey-2"
 ftdi_vid_pid 0x0403 0xcff8
 
diff --git a/tcl/interface/ftdi/jtagkey2p.cfg b/tcl/interface/ftdi/jtagkey2p.cfg
index dc9c4565..acb5047e 100644
--- a/tcl/interface/ftdi/jtagkey2p.cfg
+++ b/tcl/interface/ftdi/jtagkey2p.cfg
@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey2p.shtml
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey-2P"
 ftdi_vid_pid 0x0403 0xcff8
 
diff --git a/tcl/interface/ftdi/kt-link.cfg b/tcl/interface/ftdi/kt-link.cfg
index 1f28d3a1..5fc5db9d 100644
--- a/tcl/interface/ftdi/kt-link.cfg
+++ b/tcl/interface/ftdi/kt-link.cfg
@@ -4,7 +4,7 @@
 # http://www.kristech.eu
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "KT-LINK"
 ftdi_vid_pid 0x0403 0xbbe2
 
diff --git a/tcl/interface/ftdi/lisa-l.cfg b/tcl/interface/ftdi/lisa-l.cfg
index 67002bb9..4e52f7b7 100644
--- a/tcl/interface/ftdi/lisa-l.cfg
+++ b/tcl/interface/ftdi/lisa-l.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 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."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Lisa/L"
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1
diff --git a/tcl/interface/ftdi/luminary-icdi.cfg b/tcl/interface/ftdi/luminary-icdi.cfg
index 2eea806d..8bc783e9 100644
--- a/tcl/interface/ftdi/luminary-icdi.cfg
+++ b/tcl/interface/ftdi/luminary-icdi.cfg
@@ -15,7 +15,7 @@
 # http://www.luminarymicro.com/products/ek-lm3s9b92.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Luminary Micro ICDI Board"
 ftdi_vid_pid 0x0403 0xbcda
 
diff --git a/tcl/interface/ftdi/luminary-lm3s811.cfg b/tcl/interface/ftdi/luminary-lm3s811.cfg
index 543b1e08..aac915e3 100644
--- a/tcl/interface/ftdi/luminary-lm3s811.cfg
+++ b/tcl/interface/ftdi/luminary-lm3s811.cfg
@@ -11,7 +11,7 @@
 # need to use the "luminary_icdi" layout to work correctly.
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "LM3S811 Evaluation Board"
 ftdi_vid_pid 0x0403 0xbcd9
 
diff --git a/tcl/interface/ftdi/luminary.cfg b/tcl/interface/ftdi/luminary.cfg
index 20b54220..5e34f8ce 100644
--- a/tcl/interface/ftdi/luminary.cfg
+++ b/tcl/interface/ftdi/luminary.cfg
@@ -24,7 +24,7 @@
 # firmware via the ITM module as well as profile data.
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Stellaris Evaluation Board"
 ftdi_vid_pid 0x0403 0xbcd9
 
diff --git a/tcl/interface/ftdi/m53evk.cfg b/tcl/interface/ftdi/m53evk.cfg
index 2b972704..6597f2d3 100644
--- a/tcl/interface/ftdi/m53evk.cfg
+++ b/tcl/interface/ftdi/m53evk.cfg
@@ -4,7 +4,7 @@
 # http://www.denx-cs.de/?q=M53EVK
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/mbftdi.cfg b/tcl/interface/ftdi/mbftdi.cfg
index d051cccb..c0ff8657 100644
--- a/tcl/interface/ftdi/mbftdi.cfg
+++ b/tcl/interface/ftdi/mbftdi.cfg
@@ -9,7 +9,7 @@
 # and http://www.marsohod.org/plata-marsokhod3 for details.
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/minimodule-swd.cfg b/tcl/interface/ftdi/minimodule-swd.cfg
index 5f0b212f..7ab46503 100644
--- a/tcl/interface/ftdi/minimodule-swd.cfg
+++ b/tcl/interface/ftdi/minimodule-swd.cfg
@@ -34,7 +34,7 @@ Supports SWD using the FT2232H or FT4232H minimodule.
 # CN2-22  -  nRESET
 #
 
-interface ftdi
+adapter driver ftdi
 
 #Select your module type and channel
 
diff --git a/tcl/interface/ftdi/minimodule.cfg b/tcl/interface/ftdi/minimodule.cfg
index 7df096d9..5dcce1fc 100644
--- a/tcl/interface/ftdi/minimodule.cfg
+++ b/tcl/interface/ftdi/minimodule.cfg
@@ -4,7 +4,7 @@
 # http://www.ftdichip.com/Support/Documents/DataSheets/Modules/DS_FT2232H_Mini_Module.pdf
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "FT2232H MiniModule"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/minispartan6.cfg b/tcl/interface/ftdi/minispartan6.cfg
index 8f160119..92aebbcf 100644
--- a/tcl/interface/ftdi/minispartan6.cfg
+++ b/tcl/interface/ftdi/minispartan6.cfg
@@ -1,6 +1,6 @@
 # https://www.scarabhardware.com/minispartan6/
 # https://github.com/scarabhardware/miniSpartan6-plus/raw/master/miniSpartan6%2B_Rev_B.pdf
-interface ftdi
+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"
diff --git a/tcl/interface/ftdi/neodb.cfg b/tcl/interface/ftdi/neodb.cfg
index 6cc8ccf7..1cfb3526 100644
--- a/tcl/interface/ftdi/neodb.cfg
+++ b/tcl/interface/ftdi/neodb.cfg
@@ -4,7 +4,7 @@
 # http://wiki.openmoko.org/wiki/Debug_Board_v3
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Debug Board for Neo1973"
 ftdi_vid_pid 0x1457 0x5118
 
diff --git a/tcl/interface/ftdi/ngxtech.cfg b/tcl/interface/ftdi/ngxtech.cfg
index 9eaa3c5b..3aa79ab3 100644
--- a/tcl/interface/ftdi/ngxtech.cfg
+++ b/tcl/interface/ftdi/ngxtech.cfg
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NGX JTAG"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
index 5b27d38b..c8e3befb 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-ocd-h.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
 ftdi_vid_pid 0x15ba 0x002b
 
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
index e1aeeeab..f9126d40 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-ocd.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG"
 ftdi_vid_pid 0x15ba 0x0003
 
diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
index f77c24b2..eac25b6d 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-tiny-h.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
 ftdi_vid_pid 0x15ba 0x002a
 
diff --git a/tcl/interface/ftdi/olimex-jtag-tiny.cfg b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
index b3c6a716..4811f4dd 100644
--- a/tcl/interface/ftdi/olimex-jtag-tiny.cfg
+++ b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-tiny.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG TINY"
 ftdi_vid_pid 0x15ba 0x0004
 
diff --git a/tcl/interface/ftdi/oocdlink.cfg b/tcl/interface/ftdi/oocdlink.cfg
index fc09a163..deba4a50 100644
--- a/tcl/interface/ftdi/oocdlink.cfg
+++ b/tcl/interface/ftdi/oocdlink.cfg
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "OOCDLink"
 ftdi_vid_pid 0x0403 0xbaf8
 
diff --git a/tcl/interface/ftdi/opendous_ftdi.cfg b/tcl/interface/ftdi/opendous_ftdi.cfg
index 6a12d721..50f32fb3 100644
--- a/tcl/interface/ftdi/opendous_ftdi.cfg
+++ b/tcl/interface/ftdi/opendous_ftdi.cfg
@@ -7,7 +7,7 @@
 # (and it has a different pid number).
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1
diff --git a/tcl/interface/ftdi/openocd-usb-hs.cfg b/tcl/interface/ftdi/openocd-usb-hs.cfg
index 37a717dc..6f67689f 100644
--- a/tcl/interface/ftdi/openocd-usb-hs.cfg
+++ b/tcl/interface/ftdi/openocd-usb-hs.cfg
@@ -4,7 +4,7 @@
 # http://shop.embedded-projects.net/index.php?module=artikel&action=artikel&id=14
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/openocd-usb.cfg b/tcl/interface/ftdi/openocd-usb.cfg
index ff537c7b..ed80a05d 100644
--- a/tcl/interface/ftdi/openocd-usb.cfg
+++ b/tcl/interface/ftdi/openocd-usb.cfg
@@ -4,7 +4,7 @@
 # http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/openrd.cfg b/tcl/interface/ftdi/openrd.cfg
index 9ec5b5f6..535c5e89 100644
--- a/tcl/interface/ftdi/openrd.cfg
+++ b/tcl/interface/ftdi/openrd.cfg
@@ -4,7 +4,7 @@
 # http://www.marvell.com/products/embedded_processors/developer/kirkwood/openrd.jsp
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "OpenRD JTAGKey FT2232D B"
 ftdi_vid_pid 0x0403 0x9e90
 ftdi_channel 0
diff --git a/tcl/interface/ftdi/pipistrello.cfg b/tcl/interface/ftdi/pipistrello.cfg
index 5ee5be5b..4e392942 100644
--- a/tcl/interface/ftdi/pipistrello.cfg
+++ b/tcl/interface/ftdi/pipistrello.cfg
@@ -1,6 +1,6 @@
 # http://pipistrello.saanlima.com/
 # http://www.saanlima.com/download/pipistrello-v2.0/pipistrello_v2_schematic.pdf
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Pipistrello LX45"
 ftdi_vid_pid 0x0403 0x6010
 # interface 1 is the uart
diff --git a/tcl/interface/ftdi/redbee-econotag.cfg b/tcl/interface/ftdi/redbee-econotag.cfg
index 70c30d65..b6f6d23b 100644
--- a/tcl/interface/ftdi/redbee-econotag.cfg
+++ b/tcl/interface/ftdi/redbee-econotag.cfg
@@ -13,7 +13,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 
 ftdi_layout_init 0x0c08 0x0c2b
diff --git a/tcl/interface/ftdi/redbee-usb.cfg b/tcl/interface/ftdi/redbee-usb.cfg
index b79300d5..52ab93e0 100644
--- a/tcl/interface/ftdi/redbee-usb.cfg
+++ b/tcl/interface/ftdi/redbee-usb.cfg
@@ -13,7 +13,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1
 
diff --git a/tcl/interface/ftdi/sheevaplug.cfg b/tcl/interface/ftdi/sheevaplug.cfg
index 625aad39..d4ec72e6 100644
--- a/tcl/interface/ftdi/sheevaplug.cfg
+++ b/tcl/interface/ftdi/sheevaplug.cfg
@@ -4,7 +4,7 @@
 # http://www.marvell.com/products/embedded_processors/developer/kirkwood/sheevaplug.jsp
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "SheevaPlug JTAGKey FT2232D B"
 ftdi_vid_pid 0x9e88 0x9e8f
 ftdi_channel 0
diff --git a/tcl/interface/ftdi/signalyzer-lite.cfg b/tcl/interface/ftdi/signalyzer-lite.cfg
index 4988a3bf..47784200 100644
--- a/tcl/interface/ftdi/signalyzer-lite.cfg
+++ b/tcl/interface/ftdi/signalyzer-lite.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Signalyzer LITE"
 ftdi_vid_pid 0x0403 0xbca1
 
diff --git a/tcl/interface/ftdi/signalyzer.cfg b/tcl/interface/ftdi/signalyzer.cfg
index e2629bee..24392983 100644
--- a/tcl/interface/ftdi/signalyzer.cfg
+++ b/tcl/interface/ftdi/signalyzer.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Signalyzer"
 ftdi_vid_pid 0x0403 0xbca0
 
diff --git a/tcl/interface/ftdi/stm32-stick.cfg b/tcl/interface/ftdi/stm32-stick.cfg
index 2aff1fe8..7ae02bd8 100644
--- a/tcl/interface/ftdi/stm32-stick.cfg
+++ b/tcl/interface/ftdi/stm32-stick.cfg
@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=340
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "STM32-PerformanceStick"
 ftdi_vid_pid 0x0640 0x002d
 
diff --git a/tcl/interface/ftdi/ti-icdi.cfg b/tcl/interface/ftdi/ti-icdi.cfg
index 6af809cd..55085eae 100644
--- a/tcl/interface/ftdi/ti-icdi.cfg
+++ b/tcl/interface/ftdi/ti-icdi.cfg
@@ -6,7 +6,7 @@
 # support) but the USB IDs are different.
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0451 0xc32a
 
 ftdi_layout_init 0x00a8 0x00eb
diff --git a/tcl/interface/ftdi/tumpa-lite.cfg b/tcl/interface/ftdi/tumpa-lite.cfg
index 657515a9..7f576e91 100644
--- a/tcl/interface/ftdi/tumpa-lite.cfg
+++ b/tcl/interface/ftdi/tumpa-lite.cfg
@@ -4,7 +4,7 @@
 # http://www.diygadget.com/tiao-usb-multi-protocol-adapter-lite-jtag-spi-i2c-serial.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x8a99
 
 ftdi_layout_init 0x0038 0x087b
diff --git a/tcl/interface/ftdi/tumpa.cfg b/tcl/interface/ftdi/tumpa.cfg
index e4b59b11..1a4e3cdf 100644
--- a/tcl/interface/ftdi/tumpa.cfg
+++ b/tcl/interface/ftdi/tumpa.cfg
@@ -4,7 +4,7 @@
 # http://www.diygadget.com/tiao-usb-multi-protocol-adapter-jtag-spi-i2c-serial.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x8a98 0x0403 0x6010
 
 ftdi_layout_init 0x0038 0x087b
diff --git a/tcl/interface/ftdi/turtelizer2-revB.cfg b/tcl/interface/ftdi/turtelizer2-revB.cfg
index 45840402..34ae8612 100644
--- a/tcl/interface/ftdi/turtelizer2-revB.cfg
+++ b/tcl/interface/ftdi/turtelizer2-revB.cfg
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 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."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Turtelizer JTAG/RS232 Adapter"
 ftdi_vid_pid 0x0403 0xbdc8
 
diff --git a/tcl/interface/ftdi/turtelizer2-revC.cfg b/tcl/interface/ftdi/turtelizer2-revC.cfg
index 918ac497..f5192fb3 100644
--- a/tcl/interface/ftdi/turtelizer2-revC.cfg
+++ b/tcl/interface/ftdi/turtelizer2-revC.cfg
@@ -4,7 +4,7 @@
 # http://www.ethernut.de/en/hardware/turtelizer/index.html
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Turtelizer JTAG/RS232 Adapter"
 ftdi_vid_pid 0x0403 0xbdc8
 
diff --git a/tcl/interface/ftdi/um232h.cfg b/tcl/interface/ftdi/um232h.cfg
index 6ba6f43b..2dabbec4 100644
--- a/tcl/interface/ftdi/um232h.cfg
+++ b/tcl/interface/ftdi/um232h.cfg
@@ -7,7 +7,7 @@
 # Note that UM232H and UM232H-B are 3.3V only.
 #
 
-interface ftdi
+adapter driver ftdi
 #ftdi_device_desc "UM232H"
 ftdi_vid_pid 0x0403 0x6014
 
diff --git a/tcl/interface/ftdi/vpaclink.cfg b/tcl/interface/ftdi/vpaclink.cfg
index 20576196..ed4895a6 100644
--- a/tcl/interface/ftdi/vpaclink.cfg
+++ b/tcl/interface/ftdi/vpaclink.cfg
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."
 
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "VPACLink"
 ftdi_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/ftdi/xds100v2.cfg b/tcl/interface/ftdi/xds100v2.cfg
index 2628aa08..860a7585 100644
--- a/tcl/interface/ftdi/xds100v2.cfg
+++ b/tcl/interface/ftdi/xds100v2.cfg
@@ -7,7 +7,7 @@
 # to the registered TI users.
 #
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0xa6d0 0x0403 0x6010
 
 ftdi_layout_init 0x0038 0x597b