X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fft2232.c;h=a3ac142b24fee61f55a39ff905cb5f8e62f8b6f4;hb=e0338293b80211aee4254848ea56e0cf38bf3b9a;hp=c7503f8a46c19bebaab118c7048d3c394091f6b6;hpb=c9e448222cc5d1162f5e495cdfd327732c50a484;p=openocd.git diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index c7503f8a46..a3ac142b24 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -41,7 +41,7 @@ #endif /* project specific includes */ -#include "interface.h" +#include #include #include @@ -2182,6 +2182,11 @@ static int usbjtag_init(void) } else if (strcmp(ft2232_layout, "evb_lm3s811") == 0) { + /* There are multiple revisions of LM3S811 eval boards: + * - Rev B (and older?) boards have no SWO trace support. + * - Rev C boards add ADBUS_6 DBG_ENn and BDBUS_4 SWO_EN; + * they should use the "luminary_icdi" layout instead. + */ nTRST = 0x0; nTRSTnOE = 0x00; nSRST = 0x20; @@ -2191,6 +2196,9 @@ static int usbjtag_init(void) } else if (strcmp(ft2232_layout, "luminary_icdi") == 0) { + /* Most Luminary eval boards support SWO trace output, + * and should use this "luminary_icdi" layout. + */ nTRST = 0x0; nTRSTnOE = 0x00; nSRST = 0x20; @@ -4010,12 +4018,13 @@ static const struct command_registration ft2232_command_handlers[] = { }; struct jtag_interface ft2232_interface = { - .name = "ft2232", - .commands = ft2232_command_handlers, - .init = &ft2232_init, - .quit = &ft2232_quit, - .speed = &ft2232_speed, - .speed_div = &ft2232_speed_div, - .khz = &ft2232_khz, - .execute_queue = &ft2232_execute_queue, - }; + .name = "ft2232", + .commands = ft2232_command_handlers, + + .init = ft2232_init, + .quit = ft2232_quit, + .speed = ft2232_speed, + .speed_div = ft2232_speed_div, + .khz = ft2232_khz, + .execute_queue = ft2232_execute_queue, +};