diff options
| author | Martin Schmölzer <martin.schmoelzer@student.tuwien.ac.at> | 2013-10-21 07:23:16 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-21 21:15:36 +0000 |
| commit | 504f79a9061e2263f761597debeb5f4d6531086f (patch) | |
| tree | b8922823a8361d8656ca0bf71ffe68586600678d /configure.ac | |
| parent | b68bc7d95e2fcfd300a7d8d3835888951d59157c (diff) | |
Fix ULINK driver dependencies in configure.ac
Commit dd6274deed65c47ba2ef46e14259167d393399d8 (see
http://openocd.zylin.com/#/c/1475/ for futher information) adds the wrong
libusb dependency for the ULINK driver (libusb-0.1), when in fact the ULINK
driver uses the libusb-1.0 API since commit
f684252b2530d86f3a8330940105b86c770231f1.
Change-Id: I6946f1fdc0e26bfc7bdcff27a721e05a05b464a5
Signed-off-by: Martin Schmölzer <martin.schmoelzer@student.tuwien.ac.at>
Reviewed-on: http://openocd.zylin.com/1699
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b713a307..a5abdfd3 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,8 @@ m4_define([ADAPTER_OPT], [m4_translit(ADAPTER_ARG($1), [_], [-])]) m4_define([USB1_ADAPTERS], [[[ftdi], [MPSSE mode of FTDI based devices], [FTDI]], [[stlink], [ST-Link JTAG Programmer], [HLADAPTER_STLINK]], - [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]]]) + [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]], + [[ulink], [Keil ULINK JTAG Programmer], [ULINK]]]) m4_define([USB_ADAPTERS], [[[jlink], [Segger J-Link JTAG Programmer], [JLINK]], @@ -206,7 +207,6 @@ m4_define([USB0_ADAPTERS], [[[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]], [[usbprog], [USBProg JTAG Programmer], [USBPROG]], [[rlink], [Raisonance RLink JTAG Programmer], [RLINK]], - [[ulink], [Keil ULINK JTAG Programmer], [ULINK]], [[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]]) #======================================== |