Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1520-ge4941a039
|
From: openocd-gerrit <ope...@us...> - 2026-05-17 20:56:09
|
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 e4941a039789227666d5fa2799613db0ca1c7d74 (commit)
from a41341bbf7f1e06910ce967b7e199cf64ab77c3a (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 e4941a039789227666d5fa2799613db0ca1c7d74
Author: Marc Schink <de...@za...>
Date: Mon Apr 27 07:59:25 2026 +0200
adapter/ftdi: Use adapter core USB product name handling
Use the USB product name handling provided by the adapter core instead
of having it in the driver code itself.
Keep the legacy 'ftdi device_desc' command for backwards compatibility,
but mark it as deprecated.
Change-Id: I2948c576c5fa2cc1ca3cf87bb35049279b27f230
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/9609
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 76499deb7..361a024f3 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2767,12 +2767,6 @@ signal. The following output buffer configurations are supported:
These interfaces have several commands, used to configure the driver
before initializing the JTAG scan chain:
-@deffn {Config Command} {ftdi device_desc} description
-Provides the USB device description (the @emph{iProduct string})
-of the adapter. If not specified, the device description is ignored
-during device selection.
-@end deffn
-
@deffn {Config Command} {ftdi channel} channel
Selects the channel of the FTDI device to use for MPSSE operations. Most
adapters use the default, channel 0, but there are exceptions.
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 9f32c2ab5..159aa9eca 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -89,7 +89,6 @@
#define JTAG_MODE_ALT (LSB_FIRST | NEG_EDGE_IN | NEG_EDGE_OUT)
#define SWD_MODE (LSB_FIRST | POS_EDGE_IN | NEG_EDGE_OUT)
-static char *ftdi_device_desc;
static uint8_t ftdi_channel;
static uint8_t ftdi_jtag_mode = JTAG_MODE;
@@ -735,7 +734,7 @@ static int ftdi_initialize(void)
}
mpsse_ctx = mpsse_open(adapter_usb_get_vids(), adapter_usb_get_pids(),
- ftdi_device_desc, adapter_get_required_serial(),
+ adapter_usb_get_product_name(), adapter_get_required_serial(),
adapter_usb_get_location(), ftdi_channel);
if (!mpsse_ctx)
return ERROR_JTAG_INIT_FAILED;
@@ -791,8 +790,6 @@ static int ftdi_quit(void)
sig = next;
}
- free(ftdi_device_desc);
-
free(swd_cmd_queue);
return ERROR_OK;
@@ -1078,18 +1075,6 @@ static void cjtag_reset_online_activate(void)
}
#endif /* #if BUILD_FTDI_CJTAG == 1 */
-COMMAND_HANDLER(ftdi_handle_device_desc_command)
-{
- if (CMD_ARGC == 1) {
- free(ftdi_device_desc);
- ftdi_device_desc = strdup(CMD_ARGV[0]);
- } else {
- LOG_ERROR("expected exactly one argument to ftdi device_desc <description>");
- }
-
- return ERROR_OK;
-}
-
COMMAND_HANDLER(ftdi_handle_channel_command)
{
if (CMD_ARGC == 1)
@@ -1286,13 +1271,6 @@ COMMAND_HANDLER(ftdi_handle_jscan3_mode_command)
#endif
static const struct command_registration ftdi_subcommand_handlers[] = {
- {
- .name = "device_desc",
- .handler = &ftdi_handle_device_desc_command,
- .mode = COMMAND_CONFIG,
- .help = "set the USB device description of the FTDI device",
- .usage = "description_string",
- },
{
.name = "channel",
.handler = &ftdi_handle_channel_command,
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 995a289b0..2706c752f 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -276,10 +276,16 @@ proc "hla newtap" {args} {
eval swj_newdap $args
}
+lappend _telnet_autocomplete_skip "ftdi device_desc"
+proc "ftdi device_desc" args {
+ echo "DEPRECATED! use 'adapter usb product_name' not 'ftdi device_desc'"
+ eval adapter usb product_name $args
+}
+
lappend _telnet_autocomplete_skip ftdi_device_desc
proc ftdi_device_desc args {
- echo "DEPRECATED! use 'ftdi device_desc' not 'ftdi_device_desc'"
- eval ftdi device_desc $args
+ echo "DEPRECATED! use 'adapter usb product_name' not 'ftdi_device_desc'"
+ eval adapter usb product_name $args
}
lappend _telnet_autocomplete_skip ftdi_serial
diff --git a/tcl/board/calao-usb-a9260.cfg b/tcl/board/calao-usb-a9260.cfg
index 26aa535ee..662db345c 100644
--- a/tcl/board/calao-usb-a9260.cfg
+++ b/tcl/board/calao-usb-a9260.cfg
@@ -3,7 +3,7 @@
# CALAO Systems USB-A9260 (C01 and C02)
adapter driver ftdi
-ftdi device_desc "USB-A9260"
+adapter usb product_name "USB-A9260"
adapter usb vid_pid 0x0403 0x6001 0x0403 0x6010
ftdi layout_init 0x0c08 0x0f1b
ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
diff --git a/tcl/board/calao-usb-a9g20-c01.cfg b/tcl/board/calao-usb-a9g20-c01.cfg
index 49d368d8a..214f93b47 100644
--- a/tcl/board/calao-usb-a9g20-c01.cfg
+++ b/tcl/board/calao-usb-a9g20-c01.cfg
@@ -4,7 +4,7 @@
# Authors: Gregory Hermant, Jean-Christophe PLAGNIOL-VILLARD, Wolfram Sang
adapter driver ftdi
-ftdi device_desc "USB-A9G20"
+adapter usb product_name "USB-A9G20"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0c08 0x0f1b
ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
diff --git a/tcl/board/digilent_analog_discovery.cfg b/tcl/board/digilent_analog_discovery.cfg
index fcad50496..453a9dd7d 100644
--- a/tcl/board/digilent_analog_discovery.cfg
+++ b/tcl/board/digilent_analog_discovery.cfg
@@ -10,7 +10,7 @@
#
adapter driver ftdi
-ftdi device_desc "Digilent USB Device"
+adapter usb product_name "Digilent USB Device"
adapter usb vid_pid 0x0403 0x6014
ftdi layout_init 0x8008 0x800b
diff --git a/tcl/board/digilent_anvyl.cfg b/tcl/board/digilent_anvyl.cfg
index 5982ffe78..cd4be2a61 100644
--- a/tcl/board/digilent_anvyl.cfg
+++ b/tcl/board/digilent_anvyl.cfg
@@ -7,7 +7,7 @@
adapter driver ftdi
adapter speed 30000
-ftdi device_desc "Digilent USB Device"
+adapter usb product_name "Digilent USB Device"
adapter usb vid_pid 0x0403 0x6010
# channel 0 is the JTAG channel
diff --git a/tcl/board/digilent_nexys_video.cfg b/tcl/board/digilent_nexys_video.cfg
index 50e529247..dd84b89bd 100644
--- a/tcl/board/digilent_nexys_video.cfg
+++ b/tcl/board/digilent_nexys_video.cfg
@@ -6,7 +6,7 @@
adapter driver ftdi
adapter speed 30000
-ftdi device_desc "Digilent USB Device"
+adapter usb product_name "Digilent USB Device"
adapter usb vid_pid 0x0403 0x6010
# channel 0 is dedicated for Digilent's DPTI Interface
diff --git a/tcl/board/digilent_zybo.cfg b/tcl/board/digilent_zybo.cfg
index ad2797861..ed990dc4a 100644
--- a/tcl/board/digilent_zybo.cfg
+++ b/tcl/board/digilent_zybo.cfg
@@ -9,7 +9,7 @@
adapter driver ftdi
ftdi channel 0
-#ftdi_device_desc "Digilent Adept USB Device"
+#adapter usb product_name "Digilent Adept USB Device"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x3088 0x1f8b
ftdi layout_signal nSRST -data 0x3000 -oe 0x1000
diff --git a/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg b/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg
index 57b0852a8..8992e2bbb 100644
--- a/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg
+++ b/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg
@@ -11,7 +11,7 @@
adapter driver ftdi
# Identify the device
-ftdi device_desc "EasyDevKit"
+adapter usb product_name "EasyDevKit"
adapter usb vid_pid 0x0403 0x6010
# interface 0 is JTAG; interface 1 is the uart
ftdi channel 0
diff --git a/tcl/board/kasli.cfg b/tcl/board/kasli.cfg
index 9256d4b57..3c331b170 100644
--- a/tcl/board/kasli.cfg
+++ b/tcl/board/kasli.cfg
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
adapter driver ftdi
-ftdi device_desc "Quad RS232-HS"
+adapter usb product_name "Quad RS232-HS"
adapter usb vid_pid 0x0403 0x6011
ftdi channel 0
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/board/nds32_corvettef1.cfg b/tcl/board/nds32_corvettef1.cfg
index 0c2114d9e..195977e43 100644
--- a/tcl/board/nds32_corvettef1.cfg
+++ b/tcl/board/nds32_corvettef1.cfg
@@ -7,7 +7,7 @@
adapter speed 10000
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/board/numato_mimas_a7.cfg b/tcl/board/numato_mimas_a7.cfg
index 5f795a1b6..0a357a64f 100644
--- a/tcl/board/numato_mimas_a7.cfg
+++ b/tcl/board/numato_mimas_a7.cfg
@@ -10,7 +10,7 @@
# Therefore, prefer external power supply.
adapter driver ftdi
-ftdi device_desc "Mimas Artix 7 FPGA Module"
+adapter usb product_name "Mimas Artix 7 FPGA Module"
adapter usb vid_pid 0x2a19 0x1009
# channel 0 is for custom purpose by users (like uart, fifo etc)
diff --git a/tcl/board/sayma_amc.cfg b/tcl/board/sayma_amc.cfg
index 2323cf72a..665bd3153 100644
--- a/tcl/board/sayma_amc.cfg
+++ b/tcl/board/sayma_amc.cfg
@@ -13,7 +13,7 @@
# which features an Artix 7 FPGA.
adapter driver ftdi
-ftdi device_desc "Quad RS232-HS"
+adapter usb product_name "Quad RS232-HS"
adapter usb vid_pid 0x0403 0x6011
ftdi channel 0
# Use this to distinguish multiple boards by topology
diff --git a/tcl/board/sifive/hifive1.cfg b/tcl/board/sifive/hifive1.cfg
index 07e654139..fbe096179 100644
--- a/tcl/board/sifive/hifive1.cfg
+++ b/tcl/board/sifive/hifive1.cfg
@@ -3,7 +3,7 @@
adapter speed 10000
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0008 0x001b
diff --git a/tcl/interface/ftdi/100ask-openjtag.cfg b/tcl/interface/ftdi/100ask-openjtag.cfg
index 272d60201..452b4585f 100644
--- a/tcl/interface/ftdi/100ask-openjtag.cfg
+++ b/tcl/interface/ftdi/100ask-openjtag.cfg
@@ -10,7 +10,7 @@
#
adapter driver ftdi
-ftdi device_desc "USB<=>JTAG&RS232"
+adapter usb product_name "USB<=>JTAG&RS232"
adapter usb vid_pid 0x1457 0x5118
ftdi layout_init 0x0f08 0x0f1b
diff --git a/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg b/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg
index 6ea042777..f17589732 100644
--- a/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg
+++ b/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg
@@ -6,7 +6,7 @@
#
adapter driver ftdi
-ftdi device_desc "Opella-LD Debug Probe"
+adapter usb product_name "Opella-LD Debug Probe"
adapter usb vid_pid 0x0B6B 0x0040
ftdi tdo_sample_edge falling
ftdi layout_init 0x0A68 0xFF7B
diff --git a/tcl/interface/ftdi/ashling-opella-ld-swd.cfg b/tcl/interface/ftdi/ashling-opella-ld-swd.cfg
index 107e1b146..1d960efc0 100644
--- a/tcl/interface/ftdi/ashling-opella-ld-swd.cfg
+++ b/tcl/interface/ftdi/ashling-opella-ld-swd.cfg
@@ -6,7 +6,7 @@
#
adapter driver ftdi
-ftdi device_desc "Opella-LD Debug Probe"
+adapter usb product_name "Opella-LD Debug Probe"
adapter usb vid_pid 0x0B6B 0x0040
ftdi layout_init 0x0860 0x0b7b
ftdi channel 0
diff --git a/tcl/interface/ftdi/axm0432.cfg b/tcl/interface/ftdi/axm0432.cfg
index 590d9f239..e0a99ba63 100644
--- a/tcl/interface/ftdi/axm0432.cfg
+++ b/tcl/interface/ftdi/axm0432.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "Symphony SoundBite"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0c08 0x0c2b
diff --git a/tcl/interface/ftdi/c232hm.cfg b/tcl/interface/ftdi/c232hm.cfg
index 43340e9b8..fc78895fc 100644
--- a/tcl/interface/ftdi/c232hm.cfg
+++ b/tcl/interface/ftdi/c232hm.cfg
@@ -16,8 +16,8 @@
# 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"
+#adapter usb product_name "C232HM-DDHSL-0"
+#adapter usb product_name "C232HM-EDHSL-0"
# Common PID for FT232H
adapter usb vid_pid 0x0403 0x6014
diff --git a/tcl/interface/ftdi/cortino.cfg b/tcl/interface/ftdi/cortino.cfg
index 6e4f6e56e..1c28e2a64 100644
--- a/tcl/interface/ftdi/cortino.cfg
+++ b/tcl/interface/ftdi/cortino.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Cortino"
+adapter usb product_name "Cortino"
adapter usb vid_pid 0x0640 0x0032
ftdi layout_init 0x0108 0x010b
diff --git a/tcl/interface/ftdi/digilent-hs1.cfg b/tcl/interface/ftdi/digilent-hs1.cfg
index 5a418fd64..e3021701c 100644
--- a/tcl/interface/ftdi/digilent-hs1.cfg
+++ b/tcl/interface/ftdi/digilent-hs1.cfg
@@ -4,7 +4,7 @@
# (the later being the OEM on-board version)
adapter driver ftdi
-ftdi device_desc "Digilent Adept USB Device"
+adapter usb product_name "Digilent Adept USB Device"
adapter usb vid_pid 0x0403 0x6010
# channel 1 does not have any functionality
ftdi channel 0
diff --git a/tcl/interface/ftdi/digilent-hs2.cfg b/tcl/interface/ftdi/digilent-hs2.cfg
index 4652d62e4..83f1a7446 100644
--- a/tcl/interface/ftdi/digilent-hs2.cfg
+++ b/tcl/interface/ftdi/digilent-hs2.cfg
@@ -7,7 +7,7 @@
# ACBUS5=SEL_TDO controls mux to TDO input: 0=TDO 1=TMS
adapter driver ftdi
-ftdi device_desc "Digilent Adept USB Device"
+adapter usb product_name "Digilent Adept USB Device"
adapter usb vid_pid 0x0403 0x6014
ftdi channel 0
diff --git a/tcl/interface/ftdi/digilent_jtag_hs3.cfg b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
index fc45650ba..9834c6ae5 100644
--- a/tcl/interface/ftdi/digilent_jtag_hs3.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_hs3.cfg
@@ -6,7 +6,7 @@
adapter driver ftdi
adapter usb vid_pid 0x0403 0x6014
-ftdi device_desc "Digilent USB Device"
+adapter usb product_name "Digilent USB Device"
# From Digilent support:
# The SRST pin is [...] 0x20 and 0x10 is the /OE (active low output enable)
diff --git a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
index 5abd31602..439fe41d5 100644
--- a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
+++ b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg
@@ -10,10 +10,10 @@
# 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 adapter usb product_name from digilent_hs2 is wrong.
adapter driver ftdi
-ftdi device_desc "Digilent USB Device"
+adapter usb product_name "Digilent USB Device"
adapter usb vid_pid 0x0403 0x6014
ftdi channel 0
ftdi layout_init 0x00e8 0x60eb
diff --git a/tcl/interface/ftdi/dlp-usb1232h.cfg b/tcl/interface/ftdi/dlp-usb1232h.cfg
index ce855d8b7..96802af3a 100644
--- a/tcl/interface/ftdi/dlp-usb1232h.cfg
+++ b/tcl/interface/ftdi/dlp-usb1232h.cfg
@@ -15,7 +15,7 @@ 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"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/dp_busblaster.cfg b/tcl/interface/ftdi/dp_busblaster.cfg
index 8c6f6c276..7269f31fb 100644
--- a/tcl/interface/ftdi/dp_busblaster.cfg
+++ b/tcl/interface/ftdi/dp_busblaster.cfg
@@ -14,7 +14,7 @@ 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"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
index 20b79a8a0..cbe2b1f2d 100644
--- a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
+++ b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg
@@ -12,7 +12,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x8c28 0xff3b
diff --git a/tcl/interface/ftdi/flossjtag-noeeprom.cfg b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
index 658c0dfd7..e98c9e1cb 100644
--- a/tcl/interface/ftdi/flossjtag-noeeprom.cfg
+++ b/tcl/interface/ftdi/flossjtag-noeeprom.cfg
@@ -20,7 +20,7 @@ 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"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/flossjtag.cfg b/tcl/interface/ftdi/flossjtag.cfg
index 13c413638..f67d1e825 100644
--- a/tcl/interface/ftdi/flossjtag.cfg
+++ b/tcl/interface/ftdi/flossjtag.cfg
@@ -21,7 +21,7 @@ echo "so it could be marked as working or fixed."
adapter driver ftdi
adapter usb vid_pid 0x0403 0x6010
-ftdi device_desc "FLOSS-JTAG"
+adapter usb product_name "FLOSS-JTAG"
# adapter serial "FJ000001"
ftdi layout_init 0x0008 0x180b
diff --git a/tcl/interface/ftdi/flyswatter.cfg b/tcl/interface/ftdi/flyswatter.cfg
index 9f59542c3..4cbca3e39 100644
--- a/tcl/interface/ftdi/flyswatter.cfg
+++ b/tcl/interface/ftdi/flyswatter.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Flyswatter"
+adapter usb product_name "Flyswatter"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0818 0x0cfb
diff --git a/tcl/interface/ftdi/flyswatter2.cfg b/tcl/interface/ftdi/flyswatter2.cfg
index 4c0a5c3e0..fc0a35757 100644
--- a/tcl/interface/ftdi/flyswatter2.cfg
+++ b/tcl/interface/ftdi/flyswatter2.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Flyswatter2"
+adapter usb product_name "Flyswatter2"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0538 0x057b
diff --git a/tcl/interface/ftdi/gw16042.cfg b/tcl/interface/ftdi/gw16042.cfg
index 0e7b097d5..b2b8fc5fb 100644
--- a/tcl/interface/ftdi/gw16042.cfg
+++ b/tcl/interface/ftdi/gw16042.cfg
@@ -20,7 +20,7 @@
#
adapter driver ftdi
-ftdi device_desc "USB-JTAG"
+adapter usb product_name "USB-JTAG"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0058 0x007b
diff --git a/tcl/interface/ftdi/hie-jtag.cfg b/tcl/interface/ftdi/hie-jtag.cfg
index 155e04138..b85200664 100644
--- a/tcl/interface/ftdi/hie-jtag.cfg
+++ b/tcl/interface/ftdi/hie-jtag.cfg
@@ -8,7 +8,7 @@
adapter driver ftdi
ftdi channel 0
adapter usb vid_pid 0x0403 0x6014
-ftdi device_desc "HIE JTAG Debugger"
+adapter usb product_name "HIE JTAG Debugger"
ftdi layout_init 0x0c08 0x4f1b
diff --git a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
index 17a222b31..bd3d43b8c 100644
--- a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "NXHX 10-ETM"
adapter usb vid_pid 0x0640 0x0028
ftdi layout_init 0x0308 0x030b
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
index 5d5c262b4..0367c2349 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "NXHX 500-ETM"
adapter usb vid_pid 0x0640 0x0028
ftdi layout_init 0x0308 0x030b
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
index 39afe43f2..1f76d6fa5 100644
--- a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "NXHX 500-RE"
adapter usb vid_pid 0x0640 0x0028
ftdi layout_init 0x0308 0x030b
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
index 0ae708881..5116f2e2c 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "NXHX 50-ETM"
adapter usb vid_pid 0x0640 0x0028
ftdi layout_init 0x0308 0x030b
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
index fb1bdb2e9..ad45e623b 100644
--- a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
+++ b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "NXHX50-RE"
adapter usb vid_pid 0x0640 0x0028
ftdi layout_init 0x0308 0x030b
diff --git a/tcl/interface/ftdi/hitex_lpc1768stick.cfg b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
index 3d3220195..31c3a7017 100644
--- a/tcl/interface/ftdi/hitex_lpc1768stick.cfg
+++ b/tcl/interface/ftdi/hitex_lpc1768stick.cfg
@@ -8,7 +8,7 @@
adapter driver ftdi
-ftdi device_desc "LPC1768-Stick"
+adapter usb product_name "LPC1768-Stick"
adapter usb vid_pid 0x0640 0x0026
ftdi layout_init 0x0388 0x038b
diff --git a/tcl/interface/ftdi/hitex_str9-comstick.cfg b/tcl/interface/ftdi/hitex_str9-comstick.cfg
index bbeefd15c..0f16a116b 100644
--- a/tcl/interface/ftdi/hitex_str9-comstick.cfg
+++ b/tcl/interface/ftdi/hitex_str9-comstick.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "STR9-comStick"
+adapter usb product_name "STR9-comStick"
adapter usb vid_pid 0x0640 0x002c
ftdi layout_init 0x0108 0x010b
diff --git a/tcl/interface/ftdi/icebear.cfg b/tcl/interface/ftdi/icebear.cfg
index 230d8af0c..c7c95f1be 100644
--- a/tcl/interface/ftdi/icebear.cfg
+++ b/tcl/interface/ftdi/icebear.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "ICEbear JTAG adapter"
adapter usb vid_pid 0x0403 0xc140
ftdi layout_init 0x0028 0x002b
diff --git a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
index 74d4f55a9..f955e817a 100644
--- a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
+++ b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "JTAG-lock-pick Tiny 2"
+adapter usb product_name "JTAG-lock-pick Tiny 2"
adapter usb vid_pid 0x0403 0x8220
ftdi layout_init 0x8c28 0xff3b
diff --git a/tcl/interface/ftdi/jtagkey.cfg b/tcl/interface/ftdi/jtagkey.cfg
index a066cf5e8..25b64466e 100644
--- a/tcl/interface/ftdi/jtagkey.cfg
+++ b/tcl/interface/ftdi/jtagkey.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Amontec JTAGkey"
+adapter usb product_name "Amontec JTAGkey"
adapter usb vid_pid 0x0403 0xcff8
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/interface/ftdi/jtagkey2.cfg b/tcl/interface/ftdi/jtagkey2.cfg
index 68a8fe228..36da3d38d 100644
--- a/tcl/interface/ftdi/jtagkey2.cfg
+++ b/tcl/interface/ftdi/jtagkey2.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Amontec JTAGkey-2"
+adapter usb product_name "Amontec JTAGkey-2"
adapter usb vid_pid 0x0403 0xcff8
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/interface/ftdi/jtagkey2p.cfg b/tcl/interface/ftdi/jtagkey2p.cfg
index 72ab634fb..3a661a1d4 100644
--- a/tcl/interface/ftdi/jtagkey2p.cfg
+++ b/tcl/interface/ftdi/jtagkey2p.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Amontec JTAGkey-2P"
+adapter usb product_name "Amontec JTAGkey-2P"
adapter usb vid_pid 0x0403 0xcff8
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/interface/ftdi/kt-link.cfg b/tcl/interface/ftdi/kt-link.cfg
index 60a9bdd9e..4787724cf 100644
--- a/tcl/interface/ftdi/kt-link.cfg
+++ b/tcl/interface/ftdi/kt-link.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "KT-LINK"
+adapter usb product_name "KT-LINK"
adapter usb vid_pid 0x0403 0xbbe2
ftdi layout_init 0x8c28 0xff3b
diff --git a/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg b/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg
index 7a79183a2..2976b0f2a 100644
--- a/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg
+++ b/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg
@@ -7,7 +7,7 @@
adapter driver ftdi
adapter speed 10000
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0xfff8 0xfffb
diff --git a/tcl/interface/ftdi/lisa-l.cfg b/tcl/interface/ftdi/lisa-l.cfg
index e35e8ce09..f90fb7152 100644
--- a/tcl/interface/ftdi/lisa-l.cfg
+++ b/tcl/interface/ftdi/lisa-l.cfg
@@ -12,7 +12,7 @@ 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"
+adapter usb product_name "Lisa/L"
adapter usb vid_pid 0x0403 0x6010
ftdi channel 1
diff --git a/tcl/interface/ftdi/luminary-icdi.cfg b/tcl/interface/ftdi/luminary-icdi.cfg
index ffc92b6d9..238adf57f 100644
--- a/tcl/interface/ftdi/luminary-icdi.cfg
+++ b/tcl/interface/ftdi/luminary-icdi.cfg
@@ -18,7 +18,7 @@
#
adapter driver ftdi
-ftdi device_desc "Luminary Micro ICDI Board"
+adapter usb product_name "Luminary Micro ICDI Board"
adapter usb vid_pid 0x0403 0xbcda
ftdi layout_init 0x00a8 0x00eb
diff --git a/tcl/interface/ftdi/luminary-lm3s811.cfg b/tcl/interface/ftdi/luminary-lm3s811.cfg
index bf9b2aa64..dcbc0cdfe 100644
--- a/tcl/interface/ftdi/luminary-lm3s811.cfg
+++ b/tcl/interface/ftdi/luminary-lm3s811.cfg
@@ -14,7 +14,7 @@
#
adapter driver ftdi
-ftdi device_desc "LM3S811 Evaluation Board"
+adapter usb product_name "LM3S811 Evaluation Board"
adapter usb vid_pid 0x0403 0xbcd9
ftdi layout_init 0x0088 0x008b
diff --git a/tcl/interface/ftdi/luminary.cfg b/tcl/interface/ftdi/luminary.cfg
index f34d74fca..fd5403476 100644
--- a/tcl/interface/ftdi/luminary.cfg
+++ b/tcl/interface/ftdi/luminary.cfg
@@ -27,7 +27,7 @@
#
adapter driver ftdi
-ftdi device_desc "Stellaris Evaluation Board"
+adapter usb product_name "Stellaris Evaluation Board"
adapter usb vid_pid 0x0403 0xbcd9
ftdi layout_init 0x00a8 0x00eb
diff --git a/tcl/interface/ftdi/m53evk.cfg b/tcl/interface/ftdi/m53evk.cfg
index 409d62ed6..cb2542faa 100644
--- a/tcl/interface/ftdi/m53evk.cfg
+++ b/tcl/interface/ftdi/m53evk.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi channel 0
diff --git a/tcl/interface/ftdi/mbftdi.cfg b/tcl/interface/ftdi/mbftdi.cfg
index dc9f2ca69..1bdebb4e5 100644
--- a/tcl/interface/ftdi/mbftdi.cfg
+++ b/tcl/interface/ftdi/mbftdi.cfg
@@ -12,7 +12,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/minimodule-swd.cfg b/tcl/interface/ftdi/minimodule-swd.cfg
index 8d21503e5..aca361a91 100644
--- a/tcl/interface/ftdi/minimodule-swd.cfg
+++ b/tcl/interface/ftdi/minimodule-swd.cfg
@@ -40,11 +40,11 @@ adapter driver ftdi
#Select your module type and channel
-#ftdi device_desc "FT2232H MiniModule"
+#adapter usb product_name "FT2232H MiniModule"
adapter usb vid_pid 0x0403 0x6010
#ftdi channel 1
-#ftdi device_desc "FT4232H MiniModule"
+#adapter usb product_name "FT4232H MiniModule"
#adapter usb vid_pid 0x0403 0x6011
#ftdi channel 1
diff --git a/tcl/interface/ftdi/minimodule.cfg b/tcl/interface/ftdi/minimodule.cfg
index 4adad7885..cfd18af7a 100644
--- a/tcl/interface/ftdi/minimodule.cfg
+++ b/tcl/interface/ftdi/minimodule.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "FT2232H MiniModule"
+adapter usb product_name "FT2232H MiniModule"
adapter usb vid_pid 0x0403 0x6010
# Every pin set as high impedance except TCK, TDI, TDO and TMS
diff --git a/tcl/interface/ftdi/minispartan6.cfg b/tcl/interface/ftdi/minispartan6.cfg
index c22886c14..74b13bfb2 100644
--- a/tcl/interface/ftdi/minispartan6.cfg
+++ b/tcl/interface/ftdi/minispartan6.cfg
@@ -5,7 +5,7 @@
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"
+#adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
# interface 1 is the uart
ftdi channel 0
diff --git a/tcl/interface/ftdi/miniwiggler.cfg b/tcl/interface/ftdi/miniwiggler.cfg
index e6d6903ca..a10ec49d3 100644
--- a/tcl/interface/ftdi/miniwiggler.cfg
+++ b/tcl/interface/ftdi/miniwiggler.cfg
@@ -25,7 +25,7 @@
#
adapter driver ftdi
-ftdi device_desc "DAS JDS miniWiggler V3.1"
+adapter usb product_name "DAS JDS miniWiggler V3.1"
adapter usb vid_pid 0x058b 0x0043
ftdi channel 0
diff --git a/tcl/interface/ftdi/neodb.cfg b/tcl/interface/ftdi/neodb.cfg
index 42babc2b9..9b90823a3 100644
--- a/tcl/interface/ftdi/neodb.cfg
+++ b/tcl/interface/ftdi/neodb.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Debug Board for Neo1973"
+adapter usb product_name "Debug Board for Neo1973"
adapter usb vid_pid 0x1457 0x5118
ftdi layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/ngxtech.cfg b/tcl/interface/ftdi/ngxtech.cfg
index e961defcc..a5825c83f 100644
--- a/tcl/interface/ftdi/ngxtech.cfg
+++ b/tcl/interface/ftdi/ngxtech.cfg
@@ -13,7 +13,7 @@ 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"
+adapter usb product_name "NGX JTAG"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg
index abd7d90a3..c782ec3b9 100644
--- a/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg
+++ b/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg
@@ -13,7 +13,7 @@
interface ftdi
ftdi oscan1_mode on
-ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
+adapter usb product_name "Olimex OpenOCD JTAG ARM-USB-TINY-H"
adapter usb vid_pid 0x15ba 0x002a
ftdi layout_init 0x0808 0x0a1b
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg
index bbd761388..657fb85f5 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg
@@ -8,7 +8,7 @@
interface ftdi
ftdi oscan1_mode on
-ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
+adapter usb product_name "Olimex OpenOCD JTAG ARM-USB-OCD-H"
adapter usb vid_pid 0x15ba 0x002b
ftdi layout_init 0x0808 0x0a1b
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
index a568b8b0b..dd67b6d57 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
+adapter usb product_name "Olimex OpenOCD JTAG ARM-USB-OCD-H"
adapter usb vid_pid 0x15ba 0x002b
ftdi layout_init 0x0908 0x0b1b
diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
index ba5386af1..9d0b0091c 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Olimex OpenOCD JTAG"
+adapter usb product_name "Olimex OpenOCD JTAG"
adapter usb vid_pid 0x15ba 0x0003
ftdi layout_init 0x0c08 0x0f1b
diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg
index bd32b4b48..62ca02c4d 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg
@@ -13,7 +13,7 @@
interface ftdi
ftdi oscan1_mode on
-ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
+adapter usb product_name "Olimex OpenOCD JTAG ARM-USB-TINY-H"
adapter usb vid_pid 0x15ba 0x002a
ftdi layout_init 0x0808 0x0a1b
diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
index 1e4397440..e77134848 100644
--- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
+++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
+adapter usb product_name "Olimex OpenOCD JTAG ARM-USB-TINY-H"
adapter usb vid_pid 0x15ba 0x002a
ftdi layout_init 0x0808 0x0a1b
diff --git a/tcl/interface/ftdi/olimex-jtag-tiny.cfg b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
index f3a83c8e3..889b4e08b 100644
--- a/tcl/interface/ftdi/olimex-jtag-tiny.cfg
+++ b/tcl/interface/ftdi/olimex-jtag-tiny.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Olimex OpenOCD JTAG TINY"
+adapter usb product_name "Olimex OpenOCD JTAG TINY"
adapter usb vid_pid 0x15ba 0x0004
ftdi layout_init 0x0808 0x0a1b
diff --git a/tcl/interface/ftdi/oocdlink.cfg b/tcl/interface/ftdi/oocdlink.cfg
index 226567b70..88f799a1e 100644
--- a/tcl/interface/ftdi/oocdlink.cfg
+++ b/tcl/interface/ftdi/oocdlink.cfg
@@ -13,7 +13,7 @@ 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"
+adapter usb product_name "OOCDLink"
adapter usb vid_pid 0x0403 0xbaf8
ftdi layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/opendous_ftdi.cfg b/tcl/interface/ftdi/opendous_ftdi.cfg
index 0bd7fdab9..faa3952f6 100644
--- a/tcl/interface/ftdi/opendous_ftdi.cfg
+++ b/tcl/interface/ftdi/opendous_ftdi.cfg
@@ -10,7 +10,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb 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 a270d10fc..4f1ab058d 100644
--- a/tcl/interface/ftdi/openocd-usb-hs.cfg
+++ b/tcl/interface/ftdi/openocd-usb-hs.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232-HS"
+adapter usb product_name "Dual RS232-HS"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/openocd-usb.cfg b/tcl/interface/ftdi/openocd-usb.cfg
index e9dea563c..da39d3660 100644
--- a/tcl/interface/ftdi/openocd-usb.cfg
+++ b/tcl/interface/ftdi/openocd-usb.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232"
+adapter usb product_name "Dual RS232"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0508 0x0f1b
diff --git a/tcl/interface/ftdi/openrd.cfg b/tcl/interface/ftdi/openrd.cfg
index 875ca0a07..19da745ce 100644
--- a/tcl/interface/ftdi/openrd.cfg
+++ b/tcl/interface/ftdi/openrd.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "OpenRD JTAGKey FT2232D B"
+adapter usb product_name "OpenRD JTAGKey FT2232D B"
adapter usb vid_pid 0x0403 0x9e90
ftdi channel 0
diff --git a/tcl/interface/ftdi/pipistrello.cfg b/tcl/interface/ftdi/pipistrello.cfg
index 2a27f45b2..c76112ddf 100644
--- a/tcl/interface/ftdi/pipistrello.cfg
+++ b/tcl/interface/ftdi/pipistrello.cfg
@@ -3,7 +3,7 @@
# http://pipistrello.saanlima.com/
# http://www.saanlima.com/download/pipistrello-v2.0/pipistrello_v2_schematic.pdf
adapter driver ftdi
-ftdi device_desc "Pipistrello LX45"
+adapter usb product_name "Pipistrello LX45"
adapter usb vid_pid 0x0403 0x6010
# interface 1 is the uart
ftdi channel 0
diff --git a/tcl/interface/ftdi/pls_spc5.cfg b/tcl/interface/ftdi/pls_spc5.cfg
index 09a21ff4d..5be8e25e0 100644
--- a/tcl/interface/ftdi/pls_spc5.cfg
+++ b/tcl/interface/ftdi/pls_spc5.cfg
@@ -27,7 +27,7 @@
#
adapter driver ftdi
-ftdi device_desc "PLS USB/JTAG Adapter for SPC5xxx"
+adapter usb product_name "PLS USB/JTAG Adapter for SPC5xxx"
adapter usb vid_pid 0x263d 0x4001
ftdi channel 0
diff --git a/tcl/interface/ftdi/sheevaplug.cfg b/tcl/interface/ftdi/sheevaplug.cfg
index c889a634e..24c9ee77f 100644
--- a/tcl/interface/ftdi/sheevaplug.cfg
+++ b/tcl/interface/ftdi/sheevaplug.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "SheevaPlug JTAGKey FT2232D B"
+adapter usb product_name "SheevaPlug JTAGKey FT2232D B"
adapter usb vid_pid 0x9e88 0x9e8f
ftdi channel 0
diff --git a/tcl/interface/ftdi/signalyzer-lite.cfg b/tcl/interface/ftdi/signalyzer-lite.cfg
index 068de80ef..85459ed49 100644
--- a/tcl/interface/ftdi/signalyzer-lite.cfg
+++ b/tcl/interface/ftdi/signalyzer-lite.cfg
@@ -12,7 +12,7 @@ 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 "Signalyzer LITE"
+adapter usb product_name "Signalyzer LITE"
adapter usb vid_pid 0x0403 0xbca1
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/signalyzer.cfg b/tcl/interface/ftdi/signalyzer.cfg
index 739a5702b..5c055d330 100644
--- a/tcl/interface/ftdi/signalyzer.cfg
+++ b/tcl/interface/ftdi/signalyzer.cfg
@@ -12,7 +12,7 @@ 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 "Signalyzer"
+adapter usb product_name "Signalyzer"
adapter usb vid_pid 0x0403 0xbca0
ftdi layout_init 0x0008 0x000b
diff --git a/tcl/interface/ftdi/sipeed-rv-debugger.cfg b/tcl/interface/ftdi/sipeed-rv-debugger.cfg
index ae4ee90bf..cc8f4f036 100644
--- a/tcl/interface/ftdi/sipeed-rv-debugger.cfg
+++ b/tcl/interface/ftdi/sipeed-rv-debugger.cfg
@@ -7,7 +7,7 @@
adapter driver ftdi
adapter speed 6000
-ftdi device_desc "JTAG Debugger"
+adapter usb product_name "JTAG Debugger"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0008 0x001b
ftdi layout_signal nSRST -oe 0x0020 -data 0x0020
diff --git a/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg b/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg
index b13bc0bf6..cc6455e1a 100644
--- a/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg
+++ b/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Dual RS232"
+adapter usb product_name "Dual RS232"
adapter usb vid_pid 0x0403 0x6010
ftdi channel 0
diff --git a/tcl/interface/ftdi/stm32-stick.cfg b/tcl/interface/ftdi/stm32-stick.cfg
index af9d2a8a5..cbf0a723d 100644
--- a/tcl/interface/ftdi/stm32-stick.cfg
+++ b/tcl/interface/ftdi/stm32-stick.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "STM32-PerformanceStick"
+adapter usb product_name "STM32-PerformanceStick"
adapter usb vid_pid 0x0640 0x002d
ftdi layout_init 0x0388 0x038b
diff --git a/tcl/interface/ftdi/tigard.cfg b/tcl/interface/ftdi/tigard.cfg
index f73d26690..7a14c1688 100644
--- a/tcl/interface/ftdi/tigard.cfg
+++ b/tcl/interface/ftdi/tigard.cfg
@@ -5,7 +5,7 @@
adapter driver ftdi
-ftdi device_desc "Tigard V1.1"
+adapter usb product_name "Tigard V1.1"
adapter usb vid_pid 0x0403 0x6010
ftdi channel 1
diff --git a/tcl/interface/ftdi/turtelizer2-revB.cfg b/tcl/interface/ftdi/turtelizer2-revB.cfg
index 574c69741..29655e6b0 100644
--- a/tcl/interface/ftdi/turtelizer2-revB.cfg
+++ b/tcl/interface/ftdi/turtelizer2-revB.cfg
@@ -12,7 +12,7 @@ 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 "Turtelizer JTAG/RS232 Adapter"
+adapter usb product_name "Turtelizer JTAG/RS232 Adapter"
adapter usb vid_pid 0x0403 0xbdc8
ftdi layout_init 0x0008 0x0c5b
diff --git a/tcl/interface/ftdi/turtelizer2-revC.cfg b/tcl/interface/ftdi/turtelizer2-revC.cfg
index 4afd24cac..858ff6ff8 100644
--- a/tcl/interface/ftdi/turtelizer2-revC.cfg
+++ b/tcl/interface/ftdi/turtelizer2-revC.cfg
@@ -7,7 +7,7 @@
#
adapter driver ftdi
-ftdi device_desc "Turtelizer JTAG/RS232 Adapter"
+adapter usb product_name "Turtelizer JTAG/RS232 Adapter"
adapter usb vid_pid 0x0403 0xbdc8
ftdi layout_init 0x0008 0x0c7b
diff --git a/tcl/interface/ftdi/um232h.cfg b/tcl/interface/ftdi/um232h.cfg
index 657162c0f..1e7f7faa4 100644
--- a/tcl/interface/ftdi/um232h.cfg
+++ b/tcl/interface/ftdi/um232h.cfg
@@ -10,7 +10,7 @@
#
adapter driver ftdi
-#ftdi device_desc "UM232H"
+#adapter usb product_name "UM232H"
adapter usb vid_pid 0x0403 0x6014
ftdi layout_init 0xfff8 0xfffb
diff --git a/tcl/interface/ftdi/vpaclink.cfg b/tcl/interface/ftdi/vpaclink.cfg
index ed8fbcaa8..a7807ab0b 100644
--- a/tcl/interface/ftdi/vpaclink.cfg
+++ b/tcl/interface/ftdi/vpaclink.cfg
@@ -13,7 +13,7 @@ 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 "VPACLink"
+adapter usb product_name "VPACLink"
adapter usb vid_pid 0x0403 0x6010
ftdi layout_init 0x0508 0x0f1b
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 6 ------
src/jtag/drivers/ftdi.c | 24 +---------------------
src/jtag/startup.tcl | 10 +++++++--
tcl/board/calao-usb-a9260.cfg | 2 +-
tcl/board/calao-usb-a9g20-c01.cfg | 2 +-
tcl/board/digilent_analog_discovery.cfg | 2 +-
tcl/board/digilent_anvyl.cfg | 2 +-
tcl/board/digilent_nexys_video.cfg | 2 +-
tcl/board/digilent_zybo.cfg | 2 +-
.../esp32-wrover-e-ftdi-jtag-devkit.cfg | 2 +-
tcl/board/kasli.cfg | 2 +-
tcl/board/nds32_corvettef1.cfg | 2 +-
tcl/board/numato_mimas_a7.cfg | 2 +-
tcl/board/sayma_amc.cfg | 2 +-
tcl/board/sifive/hifive1.cfg | 2 +-
tcl/interface/ftdi/100ask-openjtag.cfg | 2 +-
tcl/interface/ftdi/ashling-opella-ld-jtag.cfg | 2 +-
tcl/interface/ftdi/ashling-opella-ld-swd.cfg | 2 +-
tcl/interface/ftdi/axm0432.cfg | 2 +-
tcl/interface/ftdi/c232hm.cfg | 4 ++--
tcl/interface/ftdi/cortino.cfg | 2 +-
tcl/interface/ftdi/digilent-hs1.cfg | 2 +-
tcl/interface/ftdi/digilent-hs2.cfg | 2 +-
tcl/interface/ftdi/digilent_jtag_hs3.cfg | 2 +-
tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg | 4 ++--
tcl/interface/ftdi/dlp-usb1232h.cfg | 2 +-
tcl/interface/ftdi/dp_busblaster.cfg | 2 +-
tcl/interface/ftdi/dp_busblaster_kt-link.cfg | 2 +-
tcl/interface/ftdi/flossjtag-noeeprom.cfg | 2 +-
tcl/interface/ftdi/flossjtag.cfg | 2 +-
tcl/interface/ftdi/flyswatter.cfg | 2 +-
tcl/interface/ftdi/flyswatter2.cfg | 2 +-
tcl/interface/ftdi/gw16042.cfg | 2 +-
tcl/interface/ftdi/hie-jtag.cfg | 2 +-
tcl/interface/ftdi/hilscher_nxhx10_etm.cfg | 2 +-
tcl/interface/ftdi/hilscher_nxhx500_etm.cfg | 2 +-
tcl/interface/ftdi/hilscher_nxhx500_re.cfg | 2 +-
tcl/interface/ftdi/hilscher_nxhx50_etm.cfg | 2 +-
tcl/interface/ftdi/hilscher_nxhx50_re.cfg | 2 +-
tcl/interface/ftdi/hitex_lpc1768stick.cfg | 2 +-
tcl/interface/ftdi/hitex_str9-comstick.cfg | 2 +-
tcl/interface/ftdi/icebear.cfg | 2 +-
tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg | 2 +-
tcl/interface/ftdi/jtagkey.cfg | 2 +-
tcl/interface/ftdi/jtagkey2.cfg | 2 +-
tcl/interface/ftdi/jtagkey2p.cfg | 2 +-
tcl/interface/ftdi/kt-link.cfg | 2 +-
tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg | 2 +-
tcl/interface/ftdi/lisa-l.cfg | 2 +-
tcl/interface/ftdi/luminary-icdi.cfg | 2 +-
tcl/interface/ftdi/luminary-lm3s811.cfg | 2 +-
tcl/interface/ftdi/luminary.cfg | 2 +-
tcl/interface/ftdi/m53evk.cfg | 2 +-
tcl/interface/ftdi/mbftdi.cfg | 2 +-
tcl/interface/ftdi/minimodule-swd.cfg | 4 ++--
tcl/interface/ftdi/minimodule.cfg | 2 +-
tcl/interface/ftdi/minispartan6.cfg | 2 +-
tcl/interface/ftdi/miniwiggler.cfg | 2 +-
tcl/interface/ftdi/neodb.cfg | 2 +-
tcl/interface/ftdi/ngxtech.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-usb-ocd.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg | 2 +-
tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg | 2 +-
tcl/interface/ftdi/olimex-jtag-tiny.cfg | 2 +-
tcl/interface/ftdi/oocdlink.cfg | 2 +-
tcl/interface/ftdi/opendous_ftdi.cfg | 2 +-
tcl/interface/ftdi/openocd-usb-hs.cfg | 2 +-
tcl/interface/ftdi/openocd-usb.cfg | 2 +-
tcl/interface/ftdi/openrd.cfg | 2 +-
tcl/interface/ftdi/pipistrello.cfg | 2 +-
tcl/interface/ftdi/pls_spc5.cfg | 2 +-
tcl/interface/ftdi/sheevaplug.cfg | 2 +-
tcl/interface/ftdi/signalyzer-lite.cfg | 2 +-
tcl/interface/ftdi/signalyzer.cfg | 2 +-
tcl/interface/ftdi/sipeed-rv-debugger.cfg | 2 +-
tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg | 2 +-
tcl/interface/ftdi/stm32-stick.cfg | 2 +-
tcl/interface/ftdi/tigard.cfg | 2 +-
tcl/interface/ftdi/turtelizer2-revB.cfg | 2 +-
tcl/interface/ftdi/turtelizer2-revC.cfg | 2 +-
tcl/interface/ftdi/um232h.cfg | 2 +-
tcl/interface/ftdi/vpaclink.cfg | 2 +-
85 files changed, 94 insertions(+), 116 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
