diff options
| author | Andreas Pretzsch <apr@cn-eng.de> | 2014-10-07 01:18:18 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-11-17 09:45:10 +0100 |
| commit | 71db7033cd0b11fb4e4c0a6fc9870cc8f22b5096 (patch) | |
| tree | b71cb92e2d479e61cf6fc52181258f8320d5a4f8 /patches/openocd-0.8.0 | |
| parent | 78ff5cf32f526cb9a2fb61805e84ba75bdd0c7fe (diff) | |
| download | ptxdist-71db7033cd0b11fb4e4c0a6fc9870cc8f22b5096.tar.gz ptxdist-71db7033cd0b11fb4e4c0a6fc9870cc8f22b5096.tar.xz | |
openocd: new package for openocd-0.8.0
Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
[mol: cleanup]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/openocd-0.8.0')
| -rw-r--r-- | patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 33 | ||||
| l--------- | patches/openocd-0.8.0/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/openocd-0.8.0/series | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000000000..a7c65b740 --- /dev/null +++ b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,33 @@ +From 930e41a2921b8c2905690153514099c8abf05828 Mon Sep 17 00:00:00 2001 +From: Paul Fertser <fercerpav@gmail.com> +Date: Sat, 31 May 2014 08:19:51 +0400 +Subject: [PATCH] configure.ac: correct test for USB_BLASTER_DRIVER AM symbol + +Blaster II should depend on the corresponding symbol, not on libusb-1 +presence. + +Change-Id: I3d27a1005a78fe81042cb7b515618604612c3ece +Signed-off-by: Paul Fertser <fercerpav@gmail.com> +Reviewed-on: http://openocd.zylin.com/2159 +Tested-by: jenkins +Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1b4870e..9943beb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1174,7 +1174,7 @@ AM_CONDITIONAL([FT2232_DRIVER], [test $build_ft2232_ftd2xx = yes -o $build_ft223 + AM_CONDITIONAL([USB_BLASTER_LIBFTDI], [test $build_usb_blaster_libftdi = yes]) + AM_CONDITIONAL([USB_BLASTER_FTD2XX], [test $build_usb_blaster_ftd2xx = yes]) + AM_CONDITIONAL([JTAG_VPI], [test $build_jtag_vpi = yes -o $build_jtag_vpi = yes]) +-AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes]) ++AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no]) + AM_CONDITIONAL([AMTJTAGACCEL], [test $build_amtjtagaccel = yes]) + AM_CONDITIONAL([GW16012], [test $build_gw16012 = yes]) + AM_CONDITIONAL([PRESTO_LIBFTDI], [test $build_presto_libftdi = yes]) +-- +2.1.0 + diff --git a/patches/openocd-0.8.0/autogen.sh b/patches/openocd-0.8.0/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/openocd-0.8.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/openocd-0.8.0/series b/patches/openocd-0.8.0/series new file mode 100644 index 000000000..23230ef4b --- /dev/null +++ b/patches/openocd-0.8.0/series @@ -0,0 +1 @@ +0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch |