Uwe Hermann <uwe@hermann-uwe.de> Drop non-A variants of ft2232 targets

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

diff --git a/src/target/interface/calao-usb-a9260-c01.cfg b/src/target/interface/calao-usb-a9260-c01.cfg
index c6606710eef8f7a3db7ef84fa629ff787d9e4207..0fbce9cbc62ca24f4e7eecb67e7e652237f2557c 100644 (file)
--- a/src/target/interface/calao-usb-a9260-c01.cfg
+++ b/src/target/interface/calao-usb-a9260-c01.cfg
@@ -6,7 +6,7 @@
 
 interface ft2232
 ft2232_layout jtagkey
-ft2232_device_desc "USB-A9260"
+ft2232_device_desc "USB-A9260 A"
 ft2232_vid_pid 0x0403 0x6010
 script interface/calao-usb-a9260.cfg
 script target/at91sam9260minimal.cfg

diff --git a/src/target/interface/flyswatter.cfg b/src/target/interface/flyswatter.cfg
index a5af465cb3bcd1fef5e661d0f43737388501a72e..7b3c453f126a712e5c0f105859550d739e759280 100644 (file)
--- a/src/target/interface/flyswatter.cfg
+++ b/src/target/interface/flyswatter.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Flyswatter"
+ft2232_device_desc "Flyswatter A"
 ft2232_layout "flyswatter"
 ft2232_vid_pid 0x0403 0x6010
 jtag_speed 1

diff --git a/src/target/interface/jtagkey-tiny.cfg b/src/target/interface/jtagkey-tiny.cfg
index 9414d8353b72f8b91e115e701f99baa8f1b8c681..633fdda8aa32004b9979160b6c07e34795976f41 100644 (file)
--- a/src/target/interface/jtagkey-tiny.cfg
+++ b/src/target/interface/jtagkey-tiny.cfg
@@ -4,8 +4,6 @@
 # http://www.amontec.com/jtagkey-tiny.shtml
 #
 
-interface ft2232
-ft2232_device_desc "Amontec JTAGkey"
-ft2232_layout jtagkey
-ft2232_vid_pid 0x0403 0xcff8
+# The JTAGkey-tiny uses exactly the same config as the JTAGkey.
+source [find interface/jtagkey.cfg]
 

diff --git a/src/target/interface/luminary-libftdi.cfg b/src/target/interface/luminary-libftdi.cfg
deleted file mode 100644 (file)
index c86dbb6..0000000
--- a/src/target/interface/luminary-libftdi.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Luminary Micro Stellaris LM3S811 Evaluation Kit
-#
-# http://www.luminarymicro.com/products/stellaris_811_evaluation_kits.html
-#
-
-interface ft2232
-ft2232_device_desc "Stellaris Evaluation Board"
-ft2232_layout evb_lm3s811
-ft2232_vid_pid 0x0403 0xbcd9
-

diff --git a/src/target/interface/luminary.cfg b/src/target/interface/luminary.cfg
index cf3a06e880e3c0f8134b65021d51c0dd69bf54e5..bd324b18fcf5d2a4943c145e0f0cbe56da86f87e 100644 (file)
--- a/src/target/interface/luminary.cfg
+++ b/src/target/interface/luminary.cfg
@@ -1,5 +1,5 @@
 #
-# Luminary Micro LM3S811 Evaluation Kit(s)
+# Luminary Micro Stellaris LM3S811 Evaluation Kit
 #
 # http://www.luminarymicro.com/products/stellaris_811_evaluation_kits.html
 #
@@ -7,4 +7,5 @@
 interface ft2232
 ft2232_device_desc "Stellaris Evaluation Board A"
 ft2232_layout evb_lm3s811
+ft2232_vid_pid 0x0403 0xbcd9
 

diff --git a/src/target/interface/olimex-arm-usb-ocd.cfg b/src/target/interface/olimex-arm-usb-ocd.cfg
index 569dcef598f874b70a358659c3b3c7b96d8492a7..76b6742c45089df410096a68494ced463a928941 100644 (file)
--- a/src/target/interface/olimex-arm-usb-ocd.cfg
+++ b/src/target/interface/olimex-arm-usb-ocd.cfg
@@ -5,7 +5,7 @@
 #
 
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
+ft2232_device_desc "Olimex OpenOCD JTAG A"
 ft2232_layout olimex-jtag
 ft2232_vid_pid 0x15ba 0x0003
 

diff --git a/src/target/interface/olimex-jtag-tiny-a.cfg b/src/target/interface/olimex-jtag-tiny-a.cfg
deleted file mode 100644 (file)
index 0ace5cb..0000000
--- a/src/target/interface/olimex-jtag-tiny-a.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Olimex ARM-USB-TINY
-#
-# http://www.olimex.com/dev/arm-usb-tiny.html
-#
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG TINY A"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0004
-

diff --git a/src/target/interface/olimex-jtag-tiny.cfg b/src/target/interface/olimex-jtag-tiny.cfg
index b81285a4ffb7c7bdb2d8460846869a1b75abbeab..0ace5cb1d09a8d386c4545bc1c6fdcdd18c83056 100644 (file)
--- a/src/target/interface/olimex-jtag-tiny.cfg
+++ b/src/target/interface/olimex-jtag-tiny.cfg
@@ -4,12 +4,8 @@
 # http://www.olimex.com/dev/arm-usb-tiny.html
 #
 
-# TODO: FIXME
-# Linux USB tends to see the device description without the 'A' as in target/olimex-jtag-tiny.cfg,
-# but Windows still needs the 'A'. This is a replacement for Linux users.
-
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG TINY"
+ft2232_device_desc "Olimex OpenOCD JTAG TINY A"
 ft2232_layout olimex-jtag
 ft2232_vid_pid 0x15ba 0x0004
 

diff --git a/src/target/interface/openocd-usb.cfg b/src/target/interface/openocd-usb.cfg
index 8bb9ffe6f413d99ddf7379f2369b9d28420b8fc2..0ef82ab272ae000cf43e8d3316cc1b95ae8421df 100644 (file)
--- a/src/target/interface/openocd-usb.cfg
+++ b/src/target/interface/openocd-usb.cfg
@@ -6,7 +6,7 @@
 
 interface ft2232
 ft2232_vid_pid 0x0403 0x6010
-ft2232_device_desc "Dual RS232"
+ft2232_device_desc "Dual RS232 A"
 ft2232_layout "oocdlink"
 ft2232_latency 2
 # 6/(1+n) Mhz TCLK

diff --git a/src/target/interface/sheevaplug.cfg b/src/target/interface/sheevaplug.cfg
index a0d61acef2b7fd18f3c88fde1b74de9ceb1f0e73..1fdfe7a6023380d9d4c8eb0f65cecac671fee39e 100644 (file)
--- a/src/target/interface/sheevaplug.cfg
+++ b/src/target/interface/sheevaplug.cfg
@@ -7,5 +7,6 @@
 interface ft2232
 ft2232_layout sheevaplug
 ft2232_vid_pid 0x0403 0x6010
+# TODO: Add ft2232_device_desc?
 jtag_khz 3000