openocd: bump to version 0.8.0
PATCH 1/1 openocd: bump to version 0.8.0
Refresh a few patches. Drop the ones, which are upstream already. (Keep patches numbers steady for easier review.) Adapt configure options. Add hash file.
Signed-off-by Vincent Stehl? <[email protected]>
Cc Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Gustavo Zacarias <[email protected]>
---
Hi,
Here is a proposal to "bump" OpenOCD. Buildroot is at v0.5.0 but this is v0.8.0 upstream already.
This "works for me" for one board and a few compilation tries, but this is only lightly tested in view of all possible configurations. Feedbacks and tests are very welcome!
Also, I can change the patches numbering if this is preferred.
Best regards,
V.
...s-compilation-host-libsub-was-used-before.patch | 33 ------------------ ...002-fix-xscale-uninitialise-breakpoint_pc.patch | 27 ++++++++------- package/openocd/openocd-0003-force-gnu99.patch | 22 +++++++----- .../openocd/openocd-0004-force_jimtcl_static.patch | 22 ++++++------ .../openocd/openocd-0005-dont-force-ldflags.patch | 37 -------------------- package/openocd/openocd-0006-automake-compat.patch | 40 ---------------------- package/openocd/openocd.hash | 3 ++ package/openocd/openocd.mk | 6 ++-- 8 files changed, 46 insertions(+), 144 deletions(-) delete mode 100644 package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch delete mode 100644 package/openocd/openocd-0005-dont-force-ldflags.patch delete mode 100644 package/openocd/openocd-0006-automake-compat.patch create mode 100644 package/openocd/openocd.hash
package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 3728c4af7f6303ccedab56ec220797f8f290580e Mon Sep 17 00:00:00 2001 -From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> -Date: Wed, 10 Aug 2011 00:17:29 +0800 -Subject: [PATCH] fix cross compilation: host libsub was used before - -tested in buildroot - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> ---- - configure.in | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index dfa1e8f..cfe2218 100644 ---- a/configure.in -+++ b/configure.in -@@ -1046,8 +1046,11 @@ build_usb=no - if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \ - $build_rlink = yes -o $build_ulink = yes -o $build_armjtagew = yes - then -- AC_CHECK_HEADERS([usb.h],[], -- [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])]) -+ dnl check for libusb -+ PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11) -+ CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -+ LDFLAGS="$LDFLAGS $LIBUSB_LDFLAGS" -+ LIBS="$LIBS $LIBUSB_LIBS" - build_usb=yes - fi - --- -1.7.5.4 -
package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch +15 -12
@@ -1,20 +1,23 @@ xscale: fix uninitialise breakpoint_pc Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + +[Refresh for v0.8.0] +Signed-off-by: Vincent Stehl? <[email protected]> --- - src/target/xscale.c | 2 +- + src/target/xscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: b/src/target/xscale.c -=================================================================== +diff --git a/src/target/xscale.c b/src/target/xscale.c +index e88a231..8d773b1 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c -@@ -2811,7 +2811,7 @@ static int xscale_analyze_trace(struct t - struct xscale_common *xscale = target_to_xscale(target); - struct xscale_trace_data *trace_data = xscale->trace.data; - int i, retval; -- uint32_t breakpoint_pc; -+ uint32_t breakpoint_pc = 0; - struct arm_instruction instruction; - uint32_t current_pc = 0; /* initialized when address determined */ - +@@ -2667,7 +2667,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c + struct xscale_common *xscale = target_to_xscale(target); + struct xscale_trace_data *trace_data = xscale->trace.data; + int i, retval; +- uint32_t breakpoint_pc; ++ uint32_t breakpoint_pc = 0; + struct arm_instruction instruction; + uint32_t current_pc = 0;/* initialized when address determined */ +
package/openocd/openocd-0003-force-gnu99.patch +13 -9
@@ -1,19 +1,23 @@ force gnu99 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + +[Refresh for v0.8.0] +Signed-off-by: Vincent Stehl? <[email protected]> --- - configure.in | 1 + - 1 file changed, 1 insertion(+) + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -28,6 +28,7 @@ AC_DISABLE_SHARED +diff --git a/configure.ac b/configure.ac +index 27fdb2c..9b2d4f3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,6 +29,8 @@ AC_DISABLE_SHARED AC_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) + AC_SUBST([LIBTOOL_DEPS]) +CFLAGS="$CFLAGS -std=gnu99" - ++ dnl configure checks required for Jim files (these are obsolete w/ C99) AC_C_CONST + AC_TYPE_LONG_LONG_INT
package/openocd/openocd-0004-force_jimtcl_static.patch +12 -10
@@ -1,25 +1,27 @@ force jimtcl to build static Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> + +[Refresh for v0.8.0] +Signed-off-by: Vincent Stehl? <[email protected]> --- - jimtcl/auto.def | 5 ----- - 1 file changed, 5 deletions(-) + jimtcl/auto.def | 4 ---- + 1 file changed, 4 deletions(-) -Index: b/jimtcl/auto.def -=================================================================== +diff --git a/jimtcl/auto.def b/jimtcl/auto.def +index ddb0c1e..13d3ab3 100644 --- a/jimtcl/auto.def +++ b/jimtcl/auto.def -@@ -148,13 +148,8 @@ if {[opt-bool references]} { +@@ -181,12 +181,8 @@ if {[opt-bool references]} { msg-result "Enabling references" define JIM_REFERENCES } -if {[opt-bool shared with-jim-shared]} { - msg-result "Building shared library" -- define JIM_LIBTYPE shared -} else { msg-result "Building static library" - define JIM_LIBTYPE static + define JIM_STATICLIB -} - if {[opt-bool install-jim]} { - define install_jim 1 - } else { + define JIM_INSTALL [opt-bool install-jim] + + # Attributes of the extensions
package/openocd/openocd-0005-dont-force-ldflags.patch deleted +0 -37
@@ -1,37 +0,0 @@ -[PATCH] don't force library search path / rpath settings - -openocd adds -L$exec_prefix/lib -Wl,rpath,$exec_prefix/lib to the compile -LDFLAGS if it isn't installed into /usr/local, which breaks cross compilation -as the compiler ends up using host libraries. ---- - configure.in | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: openocd-0.5.0/configure.in -=================================================================== ---- openocd-0.5.0.orig/configure.in -+++ openocd-0.5.0/configure.in -@@ -174,23 +174,6 @@ - # Let make expand exec_prefix. - test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix" - --# what matters is the "exec-prefix" --if test "$OCDxprefix" != "$ac_default_prefix" --then -- # We are installing in a non-standard place -- # Nonstandard --prefix and/or --exec-prefix -- # We have an override of some sort. -- # use build specific install library dir -- -- LDFLAGS="$LDFLAGS -L$OCDxprefix/lib" -- # RPATH becomes an issue on Linux only -- if test $host_os = linux-gnu || test $host_os = linux ; then -- LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib" -- fi -- # The "INCDIR" is also usable -- CFLAGS="$CFLAGS -I$includedir" --fi -- - AC_ARG_WITH(ftd2xx, - AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]), - [
package/openocd/openocd-0006-automake-compat.patch deleted +0 -40
@@ -1,40 +0,0 @@ -Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116 -Fix for automake 1.11.2+ - -Signed-off-by: Gustavo Zacarias <[email protected]> - -diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am ---- openocd-0.5.0/src/jtag/drivers/Makefile.am 2011-08-09 02:34:19.000000000 -0300 -+++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am 2012-05-01 13:57:01.007561480 -0300 -@@ -5,7 +5,8 @@ - libocdjtagdrivers_la_SOURCES = \ - $(DRIVERFILES) - --nobase_dist_pkglib_DATA = -+ocddatadir = $(pkglibdir) -+nobase_dist_ocddata_DATA = - - ULINK_FIRMWARE = $(srcdir)/OpenULINK - -@@ -64,7 +65,7 @@ - endif - if ULINK - DRIVERFILES += ulink.c --nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex -+nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex - endif - if VSLLINK - DRIVERFILES += vsllink.c -diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am ---- openocd-0.5.0/src/target/Makefile.am 2011-08-09 02:34:19.000000000 -0300 -+++ openocd-0.5.0.automake/src/target/Makefile.am 2012-05-01 13:57:01.934567076 -0300 -@@ -165,7 +165,7 @@ - avr32_mem.h \ - avr32_regs.h - --nobase_dist_pkglib_DATA = --nobase_dist_pkglib_DATA += ecos/at91eb40a.elf -+ocddatadir = $(pkglibdir) -+nobase_dist_ocddata_DATA = ecos/at91eb40a.elf - - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
package/openocd/openocd.hash new file +3 -0
@@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/openocd/files/openocd/0.8.0/ +sha1 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 openocd-0.8.0.tar.bz2 +md5 6d83c34763a5f1d1ac7ad83c5a11f4fb openocd-0.8.0.tar.bz2
package/openocd/openocd.mk +3 -3
@@ -4,7 +4,7 @@ # ################################################################################ -OPENOCD_VERSION = 0.5.0 +OPENOCD_VERSION = 0.8.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION) OPENOCD_LICENSE = GPLv2+
@@ -21,7 +21,7 @@ OPENOCD_DEPENDENCIES = libusb-compat # Adapters ifeq ($(BR2_PACKAGE_OPENOCD_FT2XXX),y) -OPENOCD_CONF_OPTS += --enable-ft2232_libftdi +OPENOCD_CONF_OPTS += --enable-ftdi OPENOCD_DEPENDENCIES += libftdi endif
@@ -38,7 +38,7 @@ HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi HOST_OPENOCD_CONF_OPTS = \ --disable-doxygen-html \ --enable-dummy \ - --enable-ft2232_libftdi \ + --enable-ftdi \ --enable-jlink \ --enable-vsllink
Signature · 1 line
2.1.4
PATCH 1/1 openocd: bump to version 0.8.0
Dear Vincent Stehl?,
Quoted 8 lines · Vincent Stehl?
Refresh a few patches. Drop the ones, which are upstream already. (Keep patches numbers steady for easier review.) Adapt configure options. Add hash file.
Signed-off-by Vincent Stehl? <[email protected]>Cc Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gustavo Zacarias <[email protected]>
Thanks for this contribution. There is already a patch in patchwork to bump OpenOCD to version 0.8.0, see
http://patchwork.ozlabs.org/patch/420900/. Would it be possible to sync with this proposal to propose a single patch set for OpenOCD ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 openocd: bump to version 0.8.0
+Claudio
Quoted 4 lines · Thomas Petazzoni
Thanks for this contribution. There is already a patch in patchwork to bump OpenOCD to version 0.8.0, see
http://patchwork.ozlabs.org/patch/420900/. Would it be possible to sync with this proposal to propose a single patch set for OpenOCD ?
Thanks Thomas; you are right, I forgot to check the patch tracker. Now I picked patch 420900 in my branch and it works fine for me (on one configuration).
Dear Claudio, thank you for your patch. You may add a
Tested-by Vincent Stehl? <[email protected]>
...if you want (for what it's worth :). All what is left of my submission is the hash file addition. I'll re-send that right away. Please feel free to "squash it" into patch 420900, or keep it separate as you prefer.
Best regards,
V.
PATCH 1/1 openocd: add hash file
In reply to Thomas PetazzoniSigned-off-by Vincent Stehl? <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Claudio Laurita <[email protected]>
--- package/openocd/openocd.hash | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package/openocd/openocd.hash
package/openocd/openocd.hash new file +3 -0
@@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/openocd/files/openocd/0.8.0/ +sha1 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 openocd-0.8.0.tar.bz2 +md5 6d83c34763a5f1d1ac7ad83c5a11f4fb openocd-0.8.0.tar.bz2
Signature · 1 line
2.1.4
PATCH 1/1 openocd: add hash file
Dear Vincent Stehl?,
Quoted 8 lines · Vincent Stehl?
Signed-off-by Vincent Stehl? <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Claudio Laurita <[email protected]>--- package/openocd/openocd.hash | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 package/openocd/openocd.hash
I've folded this patch into Claudio's bump of OpenOCD. Indeed, a hash file for OpenOCD 0.5.0 was added in the mean time by Yann E. Morin to fix download failures for packages downloaded from Sourceforge.
Patch marked as superseded in patchwork.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 openocd: bump to version 0.8.0
In reply to Vincent StehléDear Vincent Stehl?,
Quoted 8 lines · Vincent Stehl?
Refresh a few patches. Drop the ones, which are upstream already. (Keep patches numbers steady for easier review.) Adapt configure options. Add hash file.
Signed-off-by Vincent Stehl? <[email protected]>Cc Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gustavo Zacarias <[email protected]>
I've marked this patch as "Superseded" in patchwork, as I've applied Claudio's patch instead.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com