openocd: update rules

Signed-off-by: Michael Grzeschik <mgr@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 49 insertions, 71 deletions

diff --git a/patches/openocd-0.10.0-870-gaf952850b549/autogen.sh b/patches/openocd-0.10.0-870-gaf952850b549/autogen.sh
new file mode 100755
index 000000000..7d344d32f
--- /dev/null
+++ b/patches/openocd-0.10.0-870-gaf952850b549/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec ./bootstrap
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
deleted file mode 100644
index a7c65b740..000000000
--- a/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/openocd-0.8.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/openocd-0.8.0/series b/patches/openocd-0.8.0/series
deleted file mode 100644
index 23230ef4b..000000000
--- a/patches/openocd-0.8.0/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch
diff --git a/rules/openocd.in b/rules/openocd.in
index d8fc4004d..36281722a 100644
--- a/rules/openocd.in
+++ b/rules/openocd.in
@@ -5,12 +5,14 @@ menuconfig OPENOCD
 	prompt "OpenOCD                       "
 
 	# libusb-1.x
-	select LIBUSB		if OPENOCD_FTDI || OPENOCD_STLINK || OPENOCD_TI_ICDI || OPENOCD_ULINK || OPENOCD_USB_BLASTER_2
+	select LIBUSB		if OPENOCD_FTDI || OPENOCD_STLINK || OPENOCD_TI_ICDI || OPENOCD_ULINK || OPENOCD_USB_BLASTER_2 || OPENOCD_FT232R || OPENOCD_XDS110
 	# libusb-1.x or libusb-0.1
 	select LIBUSB		if OPENOCD_JLINK || OPENOCD_OSBDM || OPENOCD_OPENDOUS || OPENOCD_AICE
 	# libusb-0.1
 	select LIBUSB_COMPAT	if OPENOCD_VSLLINK || OPENOCD_USBPROG || OPENOCD_RLINK || OPENOCD_ARMJTAGEW
-	select LIBFTDI1		if OPENOCD_USB_BLASTER_LIBFTDI || OPENOCD_PRESTO_LIBFTDI || OPENOCD_OPENJTAG_FTDI
+	select LIBFTDI1		if OPENOCD_USB_BLASTER || OPENOCD_PRESTO || OPENOCD_OPENJTAG
+	select LIBJAYLINK	if OPENOCD_JLINK
+	select JIMTCL
 
 	help
 	  The Open On-Chip Debugger (OpenOCD) provides debugging, in-system
@@ -70,6 +72,14 @@ config OPENOCD_USB_BLASTER_2
 	bool
 	prompt "Altera USB-Blaster II Compatible"
 
+config OPENOCD_FT232R
+	bool
+	prompt "Bitbang mode of FT232R based devices"
+
+config OPENOCD_XDS110
+	bool
+	prompt "TI XDS110 Debug Probe"
+
 # --- libusb-1.x or libusb-0.1 based
 
 config OPENOCD_JLINK
@@ -113,6 +123,12 @@ config OPENOCD_CMSIS_DAP
 	depends on BROKEN
 	prompt "CMSIS-DAP Compliant Debugger"
 
+config OPENOCD_KITPROG
+	bool
+	# needs libhidapi
+	depends on BROKEN
+	prompt "KITPROG Debugger"
+
 # --- various
 
 config OPENOCD_PARPORT
@@ -134,15 +150,9 @@ config OPENOCD_JTAG_VPI
 	bool
 	prompt "JTAG VPI"
 
-config OPENOCD_USB_BLASTER_LIBFTDI
+config OPENOCD_USB_BLASTER
 	bool
-	prompt "Altera USB-Blaster (libftdi driver, opensource)"
-
-config OPENOCD_USB_BLASTER_FTD2XX
-	bool
-	# needs ftd2xx
-	depends on BROKEN
-	prompt "Altera USB-Blaster (FTD2XX driver from ftdichip.com)"
+	prompt "Altera USB-Blaster"
 
 config OPENOCD_AMTJTAGACCEL
 	bool
@@ -176,29 +186,21 @@ config OPENOCD_BCM2835GPIO
 	bool
 	prompt "bitbanging on BCM2835 (as found in Raspberry Pi)"
 
-config OPENOCD_GW16012
-	bool
-	prompt "Gateworks GW16012 JTAG Programmer"
-
-config OPENOCD_PRESTO_LIBFTDI
+config OPENOCD_IMX_GPIO
 	bool
-	prompt "ASIX Presto Programmer using the libftdi driver"
+	prompt "bitbanging on IMX (as found on riotboard)"
 
-config OPENOCD_PRESTO_FTD2XX
-	# needs ftd2xx
-	depends on BROKEN
+config OPENOCD_GW16012
 	bool
-	prompt "ASIX Presto Programmer using the FTD2XX driver"
+	prompt "Gateworks GW16012 JTAG Programmer"
 
-config OPENOCD_OPENJTAG_FTD2XX
-	# needs ftd2xx
-	depends on BROKEN
+config OPENOCD_PRESTO
 	bool
-	prompt "OpenJTAG Programmer with ftd2xx driver"
+	prompt "ASIX Presto Programmer"
 
-config OPENOCD_OPENJTAG_FTDI
+config OPENOCD_OPENJTAG
 	bool
-	prompt "OpenJTAG Programmer with ftdi driver"
+	prompt "OpenJTAG Programmer"
 
 config OPENOCD_OOCD_TRACE
 	bool
diff --git a/rules/openocd.make b/rules/openocd.make
index 192d70a0d..922a953d3 100644
--- a/rules/openocd.make
+++ b/rules/openocd.make
@@ -10,11 +10,11 @@
 
 PACKAGES-$(PTXCONF_OPENOCD) += openocd
 
-OPENOCD_VERSION	:= 0.8.0
-OPENOCD_MD5	:= 6d83c34763a5f1d1ac7ad83c5a11f4fb
+OPENOCD_VERSION	:= 0.10.0-870-gaf952850b549
+OPENOCD_MD5	:= 868283eb1622af03f772495c6fcffa82
 OPENOCD		:= openocd-$(OPENOCD_VERSION)
 OPENOCD_SUFFIX	:= tar.bz2
-OPENOCD_URL	:= $(call ptx/mirror, SF, openocd/$(OPENOCD).$(OPENOCD_SUFFIX))
+OPENOCD_URL	:= git://repo.or.cz/openocd;tag=v$(OPENOCD_VERSION)
 OPENOCD_SOURCE	:= $(SRCDIR)/$(OPENOCD).$(OPENOCD_SUFFIX)
 OPENOCD_DIR	:= $(BUILDDIR)/$(OPENOCD)
 # License: OpenOCD: GPLv2+, jimtcl: BSD
@@ -28,6 +28,8 @@ OPENOCD_CONF_TOOL	:= autoconf
 OPENOCD_CONF_ENV	:= \
 	CCACHE=none
 OPENOCD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
+	--enable-shared \
+	--disable-static \
 	--disable-werror \
 	--$(call ptx/endis, PTXCONF_OPENOCD_DUMMY)-dummy \
 	--$(call ptx/endis, PTXCONF_OPENOCD_FTDI)-ftdi \
@@ -35,7 +37,11 @@ OPENOCD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_OPENOCD_TI_ICDI)-ti-icdi \
 	--$(call ptx/endis, PTXCONF_OPENOCD_ULINK)-ulink \
 	--$(call ptx/endis, PTXCONF_OPENOCD_USB_BLASTER_2)-usb-blaster-2 \
+	--disable-internal-jimtcl \
+	--disable-internal-libjaylink \
 	--$(call ptx/endis, PTXCONF_OPENOCD_JLINK)-jlink \
+	--$(call ptx/endis, PTXCONF_OPENOCD_FT232R)-ft232r \
+	--$(call ptx/endis, PTXCONF_OPENOCD_XDS110)-xds110 \
 	--$(call ptx/endis, PTXCONF_OPENOCD_OSBDM)-osbdm \
 	--$(call ptx/endis, PTXCONF_OPENOCD_OPENDOUS)-opendous \
 	--$(call ptx/endis, PTXCONF_OPENOCD_AICE)-aice \
@@ -44,12 +50,12 @@ OPENOCD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_OPENOCD_RLINK)-rlink \
 	--$(call ptx/endis, PTXCONF_OPENOCD_ARMJTAGEW)-armjtagew \
 	--$(call ptx/endis, PTXCONF_OPENOCD_CMSIS_DAP)-cmsis-dap \
+	--$(call ptx/endis, PTXCONF_OPENOCD_KITPROG)-kitprog \
 	--$(call ptx/endis, PTXCONF_OPENOCD_PARPORT)-parport \
 	--$(call ptx/disen, PTXCONF_OPENOCD_PARPORT_DISABLE_PARPORT_PPDEV)-parport-ppdev \
 	--$(call ptx/endis, PTXCONF_OPENOCD_PARPORT_GIVEIO)-parport-giveio \
 	--$(call ptx/endis, PTXCONF_OPENOCD_JTAG_VPI)-jtag_vpi \
-	--$(call ptx/endis, PTXCONF_OPENOCD_USB_BLASTER_LIBFTDI)-usb_blaster_libftdi \
-	--$(call ptx/endis, PTXCONF_OPENOCD_USB_BLASTER_FTD2XX)-usb_blaster_ftd2xx \
+	--$(call ptx/endis, PTXCONF_OPENOCD_USB_BLASTER)-usb_blaster \
 	--$(call ptx/endis, PTXCONF_OPENOCD_AMTJTAGACCEL)-amtjtagaccel \
 	--$(call ptx/endis, PTXCONF_OPENOCD_ZY1000)-zy1000 \
 	--$(call ptx/endis, PTXCONF_OPENOCD_ZY1000_MASTER)-zy1000-master \
@@ -57,16 +63,18 @@ OPENOCD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_OPENOCD_EP93XX)-ep93xx \
 	--$(call ptx/endis, PTXCONF_OPENOCD_AT91RM9200)-at91rm9200 \
 	--$(call ptx/endis, PTXCONF_OPENOCD_BCM2835GPIO)-bcm2835gpio \
+	--$(call ptx/endis, PTXCONF_OPENOCD_IMX_GPIO)-imx_gpio \
 	--$(call ptx/endis, PTXCONF_OPENOCD_GW16012)-gw16012 \
-	--$(call ptx/endis, PTXCONF_OPENOCD_PRESTO_LIBFTDI)-presto_libftdi \
-	--$(call ptx/endis, PTXCONF_OPENOCD_PRESTO_FTD2XX)-presto_ftd2xx \
-	--$(call ptx/endis, PTXCONF_OPENOCD_OPENJTAG_FTD2XX)-openjtag_ftd2xx \
-	--$(call ptx/endis, PTXCONF_OPENOCD_OPENJTAG_FTDI)-openjtag_ftdi \
+	--$(call ptx/endis, PTXCONF_OPENOCD_PRESTO)-presto \
+	--$(call ptx/endis, PTXCONF_OPENOCD_OPENJTAG)-openjtag \
 	--$(call ptx/endis, PTXCONF_OPENOCD_OOCD_TRACE)-oocd_trace \
 	--$(call ptx/endis, PTXCONF_OPENOCD_BUSPIRATE)-buspirate \
 	--$(call ptx/endis, PTXCONF_OPENOCD_SYSFSGPIO)-sysfsgpio \
 	--disable-minidriver-dummy \
-	--$(call ptx/endis, PTXCONF_OPENOCD_REMOTE_BITBANG)-remote-bitbang
+	--$(call ptx/endis, PTXCONF_OPENOCD_REMOTE_BITBANG)-remote-bitbang \
+	--disable-doxygen-pdf \
+	--disable-doxygen-html
+
 
 # ----------------------------------------------------------------------------
 # Target-Install