Unless I'm mistaken, recent OpenOCD versions will automatically work with both "A" and non-"A" variants of the ft2232_device_desc variables. For example, ft2232_device_desc "Amontec JTAGkey" and ft2232_device_desc "Amontec JTAGkey A" should both work fine, on Windows as well as on Mac OS X and Linux, correct? If that is the case, let's drop all non-A variants, see patch.
Also: Let JTAGkey-tiny include JTAGkey, as they're the same. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Index: src/target/interface/calao-usb-a9260-c01.cfg =================================================================== --- src/target/interface/calao-usb-a9260-c01.cfg (Revision 1454) +++ src/target/interface/calao-usb-a9260-c01.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/luminary.cfg =================================================================== --- src/target/interface/luminary.cfg (Revision 1454) +++ src/target/interface/luminary.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/olimex-jtag-tiny.cfg =================================================================== --- src/target/interface/olimex-jtag-tiny.cfg (Revision 1454) +++ src/target/interface/olimex-jtag-tiny.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/sheevaplug.cfg =================================================================== --- src/target/interface/sheevaplug.cfg (Revision 1454) +++ src/target/interface/sheevaplug.cfg (Arbeitskopie) @@ -7,5 +7,6 @@ interface ft2232 ft2232_layout sheevaplug ft2232_vid_pid 0x0403 0x6010 +# TODO: Add ft2232_device_desc? jtag_khz 3000 Index: src/target/interface/flyswatter.cfg =================================================================== --- src/target/interface/flyswatter.cfg (Revision 1454) +++ src/target/interface/flyswatter.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/olimex-arm-usb-ocd.cfg =================================================================== --- src/target/interface/olimex-arm-usb-ocd.cfg (Revision 1454) +++ src/target/interface/olimex-arm-usb-ocd.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/luminary-libftdi.cfg =================================================================== --- src/target/interface/luminary-libftdi.cfg (Revision 1454) +++ src/target/interface/luminary-libftdi.cfg (Arbeitskopie) @@ -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 - Index: src/target/interface/openocd-usb.cfg =================================================================== --- src/target/interface/openocd-usb.cfg (Revision 1454) +++ src/target/interface/openocd-usb.cfg (Arbeitskopie) @@ -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 Index: src/target/interface/jtagkey-tiny.cfg =================================================================== --- src/target/interface/jtagkey-tiny.cfg (Revision 1454) +++ src/target/interface/jtagkey-tiny.cfg (Arbeitskopie) @@ -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] Index: src/target/interface/olimex-jtag-tiny-a.cfg =================================================================== --- src/target/interface/olimex-jtag-tiny-a.cfg (Revision 1454) +++ src/target/interface/olimex-jtag-tiny-a.cfg (Arbeitskopie) @@ -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 -
_______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
