- Bring all the ftdi names inline in the cfg scripts. scripts will now work for eithe...

git-svn-id: svn://svn.berlios.de/openocd/trunk@2573 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/tcl/interface/arm-usb-ocd.cfg b/tcl/interface/arm-usb-ocd.cfg
index e1fcf6e5f1402a7ca5122d8d2168a7c144058419..d9ff2e51540cccc9d18e881f07bc2f0cce30375e 100644 (file)
--- 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 204c3878a530387b51fbc0f26306f1afbd4ee829..d2a2aaa8295a79b57b2f1a98592078e6a5625f37 100644 (file)
--- 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 0fbce9cbc62ca24f4e7eecb67e7e652237f2557c..c6606710eef8f7a3db7ef84fa629ff787d9e4207 100644 (file)
--- 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 d4eff34d440acbb76f06b0374fd5b41842abd27f..2461b70dc72ca35576ddc903d308da06c19aa2f9 100644 (file)
--- 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 7b3c453f126a712e5c0f105859550d739e759280..a5af465cb3bcd1fef5e661d0f43737388501a72e 100644 (file)
--- 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 32f19c68950eed375275876fe7c4b6ac348c1a60..a38be78a21581424eb11c1b765f662cee2d6c3f5 100644 (file)
--- 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 3df42cb55ee24525fafe1a5143cba213fbc03b48..88b5e36a2ad8ebcd77f5e95af7b8f6f101c8d8ab 100644 (file)
--- 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 beba7da1a1481d7ca06af89150882aeacfa9c91a..ca45dfcfcb9b57aee1fa03d9d6c7c20ffe76865d 100644 (file)
--- 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 8d90e8581d8dbfce3a05338d55ab012344de8c00..3d4b97607e2d322396f786339b21481b2bf70493 100644 (file)
--- 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 bd324b18fcf5d2a4943c145e0f0cbe56da86f87e..c86dbb6ebf409e6faaac32180834a5fba05490ee 100644 (file)
--- 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 76b6742c45089df410096a68494ced463a928941..569dcef598f874b70a358659c3b3c7b96d8492a7 100644 (file)
--- 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 0ace5cb1d09a8d386c4545bc1c6fdcdd18c83056..f28ed9daabbdec08c85ea8a1caffad07d9794856 100644 (file)
--- 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 8ef8dbfad5add01585ff77ea58127e52e214497e..9022afd2fc2bf11d8a6c7fc063e03dcb29b33715 100644 (file)
--- 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 0ef82ab272ae000cf43e8d3316cc1b95ae8421df..8bb9ffe6f413d99ddf7379f2369b9d28420b8fc2 100644 (file)
--- 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 556f44d57f0f2dbd89882c2fe0a39645ed5328d5..bbe39ab12d42efc809da55755b5add83921df9b4 100644 (file)
--- 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 2c917d234cdb4a42c1d32726604daffbc3e1f8c4..ff5f1251ce2773bcc0a197db5b7394c476c31662 100644 (file)
--- 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 89bcf67481293e4b1a195851ea08cd162c6e958a..9dcf8162bf9a8bede5377cf30ae63a709792b779 100644 (file)
--- 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 31c34ff52f97034474beef739a56a1f6b20f2073..801896d99dbaca0969105f7000f8c3260da640db 100644 (file)
--- 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