As promised, here's v2 of the patch.

It adds support for the ARM-USB-OCD, as well as the -H versions (untested). I eventually settled on "arm-usb-###(-h)" for the new designations. I've also edited the mock-up wiki to reflect these changes [1] (you can pick the wiki source at [2]). I'll send a separate patch for the updated man page later.

Also attached the verbose logs for probe/read/write against an Asus P5B Deluxe motherboard, using an ARM-USB-TINY.

Signed-off-by: Pete Batard <pbatard at gmail.com>

Regards,

/Pete

[1] https://sourceforge.net/apps/mediawiki/libwdi/index.php?title=Flashrom_ftdi_proposed_changes#Olimex_ARM-USB-TINY_and_related_devices [2] http://sourceforge.net/apps/mediawiki/libwdi/index.php?title=Flashrom_ftdi_proposed_changes&action=edit
Index: ft2232_spi.c
===================================================================
--- ft2232_spi.c        (revision 1325)
+++ ft2232_spi.c        (working copy)
@@ -38,6 +38,12 @@
 #define FIC_VID                        0x1457
 #define OPENMOKO_DBGBOARD_PID  0x5118
 
+#define OLIMEX_VID             0x15BA
+#define OLIMEX_ARM_OCD_PID     0x0003
+#define OLIMEX_ARM_TINY_PID    0x0004
+#define OLIMEX_ARM_OCD_H_PID   0x002B
+#define OLIMEX_ARM_TINY_H_PID  0x002A
+
 const struct usbdev_status devs_ft2232spi[] = {
        {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"},
        {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"},
@@ -45,6 +51,10 @@
        {FIC_VID, OPENMOKO_DBGBOARD_PID, OK,
                "First International Computer, Inc.",
                "OpenMoko Neo1973 Debug board (V2+)"},
+       {OLIMEX_VID, OLIMEX_ARM_OCD_PID, OK, "Olimex", "ARM-USB-OCD"},
+       {OLIMEX_VID, OLIMEX_ARM_TINY_PID, OK, "Olimex", "ARM-USB-TINY"},
+       {OLIMEX_VID, OLIMEX_ARM_OCD_H_PID, OK, "Olimex", "ARM-USB-OCD-H"},
+       {OLIMEX_VID, OLIMEX_ARM_TINY_H_PID, OK, "Olimex", "ARM-USB-TINY-H"},
        {},
 };
 
@@ -167,6 +177,22 @@
                        ft2232_vid = FIC_VID;
                        ft2232_type = OPENMOKO_DBGBOARD_PID;
                        ft2232_interface = INTERFACE_A;
+               } else if (!strcasecmp(arg, "arm-usb-ocd")) {
+                       ft2232_vid = OLIMEX_VID;
+                       ft2232_type = OLIMEX_ARM_OCD_PID;
+                       ft2232_interface = INTERFACE_A;
+               } else if (!strcasecmp(arg, "arm-usb-tiny")) {
+                       ft2232_vid = OLIMEX_VID;
+                       ft2232_type = OLIMEX_ARM_TINY_PID;
+                       ft2232_interface = INTERFACE_A;
+               } else if (!strcasecmp(arg, "arm-usb-ocd-h")) {
+                       ft2232_vid = OLIMEX_VID;
+                       ft2232_type = OLIMEX_ARM_OCD_H_PID;
+                       ft2232_interface = INTERFACE_A;
+               } else if (!strcasecmp(arg, "arm-usb-tiny-h")) {
+                       ft2232_vid = OLIMEX_VID;
+                       ft2232_type = OLIMEX_ARM_TINY_H_PID;
+                       ft2232_interface = INTERFACE_A;
                } else {
                        msg_perr("Error: Invalid device type specified.\n");
                        free(arg);

Attachment: olimex_logs.tar.gz
Description: GNU Zip compressed data

_______________________________________________
flashrom mailing list
[email protected]
http://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to