From 1ee32a8fa183b19dd094c275e76fb56b68e5b24f Mon Sep 17 00:00:00 2001
From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 6 Aug 2009 21:44:18 +0000
Subject: [PATCH] - Bring all the ftdi names inline in the cfg scripts. scripts
 will now work for either ftd2xx or libftdi drivers.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2573 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 tcl/interface/arm-usb-ocd.cfg         | 2 +-
 tcl/interface/axm0432.cfg             | 2 +-
 tcl/interface/calao-usb-a9260-c01.cfg | 2 +-
 tcl/interface/calao-usb-a9260-c02.cfg | 2 +-
 tcl/interface/flyswatter.cfg          | 2 +-
 tcl/interface/hitex_str9-comstick.cfg | 2 +-
 tcl/interface/icebear.cfg             | 2 +-
 tcl/interface/jtagkey.cfg             | 2 +-
 tcl/interface/luminary-lm3s811.cfg    | 2 +-
 tcl/interface/luminary.cfg            | 2 +-
 tcl/interface/olimex-arm-usb-ocd.cfg  | 2 +-
 tcl/interface/olimex-jtag-tiny.cfg    | 2 +-
 tcl/interface/oocdlink.cfg            | 2 +-
 tcl/interface/openocd-usb.cfg         | 2 +-
 tcl/interface/sheevaplug.cfg          | 2 +-
 tcl/interface/signalyzer.cfg          | 2 +-
 tcl/interface/stm32-stick.cfg         | 2 +-
 tcl/interface/turtelizer2.cfg         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tcl/interface/arm-usb-ocd.cfg b/tcl/interface/arm-usb-ocd.cfg
index e1fcf6e5f1..d9ff2e5154 100644
--- a/tcl/interface/arm-usb-ocd.cfg
+++ b/tcl/interface/arm-usb-ocd.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG A"
+ft2232_device_desc "Olimex OpenOCD JTAG"
 ft2232_layout "olimex-jtag"
 ft2232_vid_pid 0x15BA 0x0003
 
diff --git a/tcl/interface/axm0432.cfg b/tcl/interface/axm0432.cfg
index 204c3878a5..d2a2aaa829 100644
--- a/tcl/interface/axm0432.cfg
+++ b/tcl/interface/axm0432.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Symphony SoundBite A"
+ft2232_device_desc "Symphony SoundBite"
 ft2232_layout "axm0432_jtag"
 ft2232_vid_pid 0x0403 0x6010
 
diff --git a/tcl/interface/calao-usb-a9260-c01.cfg b/tcl/interface/calao-usb-a9260-c01.cfg
index 0fbce9cbc6..c6606710ee 100644
--- a/tcl/interface/calao-usb-a9260-c01.cfg
+++ b/tcl/interface/calao-usb-a9260-c01.cfg
@@ -6,7 +6,7 @@
 
 interface ft2232
 ft2232_layout jtagkey
-ft2232_device_desc "USB-A9260 A"
+ft2232_device_desc "USB-A9260"
 ft2232_vid_pid 0x0403 0x6010
 script interface/calao-usb-a9260.cfg
 script target/at91sam9260minimal.cfg
diff --git a/tcl/interface/calao-usb-a9260-c02.cfg b/tcl/interface/calao-usb-a9260-c02.cfg
index d4eff34d44..2461b70dc7 100644
--- a/tcl/interface/calao-usb-a9260-c02.cfg
+++ b/tcl/interface/calao-usb-a9260-c02.cfg
@@ -6,7 +6,7 @@
 
 interface ft2232
 ft2232_layout jtagkey
-ft2232_device_desc "USB-A9260 A"
+ft2232_device_desc "USB-A9260"
 ft2232_vid_pid 0x0403 0x6001
 script interface/calao-usb-a9260.cfg
 script target/at91sam9260minimal.cfg
diff --git a/tcl/interface/flyswatter.cfg b/tcl/interface/flyswatter.cfg
index 7b3c453f12..a5af465cb3 100644
--- a/tcl/interface/flyswatter.cfg
+++ b/tcl/interface/flyswatter.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Flyswatter A"
+ft2232_device_desc "Flyswatter"
 ft2232_layout "flyswatter"
 ft2232_vid_pid 0x0403 0x6010
 jtag_speed 1
diff --git a/tcl/interface/hitex_str9-comstick.cfg b/tcl/interface/hitex_str9-comstick.cfg
index 32f19c6895..a38be78a21 100644
--- a/tcl/interface/hitex_str9-comstick.cfg
+++ b/tcl/interface/hitex_str9-comstick.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "STR9-comStick A"
+ft2232_device_desc "STR9-comStick"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x002c
 
diff --git a/tcl/interface/icebear.cfg b/tcl/interface/icebear.cfg
index 3df42cb55e..88b5e36a2a 100644
--- a/tcl/interface/icebear.cfg
+++ b/tcl/interface/icebear.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-# ft2232_device_desc ""
+ft2232_device_desc "ICEbear JTAG adapter"
 ft2232_layout icebear
 ft2232_vid_pid 0x0403 0xc140
 
diff --git a/tcl/interface/jtagkey.cfg b/tcl/interface/jtagkey.cfg
index beba7da1a1..ca45dfcfcb 100644
--- a/tcl/interface/jtagkey.cfg
+++ b/tcl/interface/jtagkey.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Amontec JTAGkey A"
+ft2232_device_desc "Amontec JTAGkey"
 ft2232_layout jtagkey
 ft2232_vid_pid 0x0403 0xcff8
 
diff --git a/tcl/interface/luminary-lm3s811.cfg b/tcl/interface/luminary-lm3s811.cfg
index 8d90e8581d..3d4b97607e 100644
--- a/tcl/interface/luminary-lm3s811.cfg
+++ b/tcl/interface/luminary-lm3s811.cfg
@@ -5,6 +5,6 @@
 #
 
 interface ft2232
-ft2232_device_desc "LM3S811 Evaluation Board A"
+ft2232_device_desc "LM3S811 Evaluation Board"
 ft2232_layout evb_lm3s811
 
diff --git a/tcl/interface/luminary.cfg b/tcl/interface/luminary.cfg
index bd324b18fc..c86dbb6ebf 100644
--- a/tcl/interface/luminary.cfg
+++ b/tcl/interface/luminary.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Stellaris Evaluation Board A"
+ft2232_device_desc "Stellaris Evaluation Board"
 ft2232_layout evb_lm3s811
 ft2232_vid_pid 0x0403 0xbcd9
 
diff --git a/tcl/interface/olimex-arm-usb-ocd.cfg b/tcl/interface/olimex-arm-usb-ocd.cfg
index 76b6742c45..569dcef598 100644
--- a/tcl/interface/olimex-arm-usb-ocd.cfg
+++ b/tcl/interface/olimex-arm-usb-ocd.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG A"
+ft2232_device_desc "Olimex OpenOCD JTAG"
 ft2232_layout olimex-jtag
 ft2232_vid_pid 0x15ba 0x0003
 
diff --git a/tcl/interface/olimex-jtag-tiny.cfg b/tcl/interface/olimex-jtag-tiny.cfg
index 0ace5cb1d0..f28ed9daab 100644
--- a/tcl/interface/olimex-jtag-tiny.cfg
+++ b/tcl/interface/olimex-jtag-tiny.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG TINY A"
+ft2232_device_desc "Olimex OpenOCD JTAG TINY"
 ft2232_layout olimex-jtag
 ft2232_vid_pid 0x15ba 0x0004
 
diff --git a/tcl/interface/oocdlink.cfg b/tcl/interface/oocdlink.cfg
index 8ef8dbfad5..9022afd2fc 100644
--- a/tcl/interface/oocdlink.cfg
+++ b/tcl/interface/oocdlink.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "OOCDLink A"
+ft2232_device_desc "OOCDLink"
 ft2232_layout oocdlink
 ft2232_vid_pid 0x0403 0xbaf8
 jtag_khz 5
diff --git a/tcl/interface/openocd-usb.cfg b/tcl/interface/openocd-usb.cfg
index 0ef82ab272..8bb9ffe6f4 100644
--- a/tcl/interface/openocd-usb.cfg
+++ b/tcl/interface/openocd-usb.cfg
@@ -6,7 +6,7 @@
 
 interface ft2232
 ft2232_vid_pid 0x0403 0x6010
-ft2232_device_desc "Dual RS232 A"
+ft2232_device_desc "Dual RS232"
 ft2232_layout "oocdlink"
 ft2232_latency 2
 # 6/(1+n) Mhz TCLK
diff --git a/tcl/interface/sheevaplug.cfg b/tcl/interface/sheevaplug.cfg
index 556f44d57f..bbe39ab12d 100644
--- a/tcl/interface/sheevaplug.cfg
+++ b/tcl/interface/sheevaplug.cfg
@@ -7,6 +7,6 @@
 interface ft2232
 ft2232_layout sheevaplug
 ft2232_vid_pid 0x9e88 0x9e8f
-ft2232_device_desc "SheevaPlug JTAGKey FT2232D B"
+ft2232_device_desc "SheevaPlug JTAGKey FT2232D"
 jtag_khz 2000
 
diff --git a/tcl/interface/signalyzer.cfg b/tcl/interface/signalyzer.cfg
index 2c917d234c..ff5f1251ce 100644
--- a/tcl/interface/signalyzer.cfg
+++ b/tcl/interface/signalyzer.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Signalyzer A"
+ft2232_device_desc "Signalyzer"
 ft2232_layout signalyzer
 ft2232_vid_pid 0x0403 0xbca0
 
diff --git a/tcl/interface/stm32-stick.cfg b/tcl/interface/stm32-stick.cfg
index 89bcf67481..9dcf8162bf 100644
--- a/tcl/interface/stm32-stick.cfg
+++ b/tcl/interface/stm32-stick.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "STM32-PerformanceStick A"
+ft2232_device_desc "STM32-PerformanceStick"
 ft2232_layout stm32stick
 ft2232_vid_pid 0x0640 0x002d
 
diff --git a/tcl/interface/turtelizer2.cfg b/tcl/interface/turtelizer2.cfg
index 31c34ff52f..801896d99d 100644
--- a/tcl/interface/turtelizer2.cfg
+++ b/tcl/interface/turtelizer2.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Turtelizer JTAG/RS232 Adapter A"
+ft2232_device_desc "Turtelizer JTAG/RS232 Adapter"
 ft2232_layout turtelizer2
 ft2232_vid_pid 0x0403 0xbdc8
 
-- 
2.30.2