This is an automated email from Gerrit.

Martin Schmölzer ([email protected]) just uploaded a new 
patch set to Gerrit, which you can find at http://openocd.zylin.com/1699

-- gerrit

commit 38600d473b95307fea6c8f411e921f7a12fe914a
Author: Martin Schmölzer <[email protected]>
Date:   Mon Oct 21 07:23:16 2013 +0200

    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 <[email protected]>

diff --git a/configure.ac b/configure.ac
index b713a30..3f64b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ 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]],
+       [[ulink], [Keil ULINK JTAG Programmer], [ULINK]],
        [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]]])
 
 m4_define([USB_ADAPTERS],
@@ -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]]])
 
 #========================================

-- 

------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to