From 5376bfd21c300d8d12a8e8d216264b4ea1c455a7 Mon Sep 17 00:00:00 2001 From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> Date: Wed, 22 Apr 2009 06:16:53 +0000 Subject: [PATCH] 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 --- src/target/interface/calao-usb-a9260-c01.cfg | 2 +- src/target/interface/flyswatter.cfg | 2 +- src/target/interface/jtagkey-tiny.cfg | 6 ++---- src/target/interface/luminary-libftdi.cfg | 11 ----------- src/target/interface/luminary.cfg | 3 ++- src/target/interface/olimex-arm-usb-ocd.cfg | 2 +- src/target/interface/olimex-jtag-tiny-a.cfg | 11 ----------- src/target/interface/olimex-jtag-tiny.cfg | 6 +----- src/target/interface/openocd-usb.cfg | 2 +- src/target/interface/sheevaplug.cfg | 1 + 10 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 src/target/interface/luminary-libftdi.cfg delete mode 100644 src/target/interface/olimex-jtag-tiny-a.cfg diff --git a/src/target/interface/calao-usb-a9260-c01.cfg b/src/target/interface/calao-usb-a9260-c01.cfg index c6606710e..0fbce9cbc 100644 --- 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 a5af465cb..7b3c453f1 100644 --- 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 9414d8353..633fdda8a 100644 --- 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 index c86dbb6eb..000000000 --- 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 cf3a06e88..bd324b18f 100644 --- 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 569dcef59..76b6742c4 100644 --- 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 index 0ace5cb1d..000000000 --- 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 b81285a4f..0ace5cb1d 100644 --- 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 8bb9ffe6f..0ef82ab27 100644 --- 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 a0d61acef..1fdfe7a60 100644 --- 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 -- GitLab