Commit 6c213d64 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Peter Korsgaard
Browse files

package: add openocd support 



with only the following Adapters
 - FTDI FT2xxx/FT4xxx
 - J-Link (Segger and Atmel SAM-ICE)
 - Versaloon-Link JTAG Adapter

[Peter: Config.in tweaks]
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 4d33cb70

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ source "package/memtester/Config.in" 
source "package/mtd/Config.in"

source "package/ntfs-3g/Config.in"

source "package/ntfsprogs/Config.in"

source "package/openocd/Config.in"

source "package/pciutils/Config.in"

source "package/rng-tools/Config.in"

source "package/sdparm/Config.in"

package/openocd/Config.in

0 → 100644
+29 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_OPENOCD

	bool "openocd"

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT

	help

	  OpenOCD - Open On-Chip Debugger



	  http://openocd.berlios.de/web/



if BR2_PACKAGE_OPENOCD



comment "Adapters"



config BR2_PACKAGE_OPENOCD_FT2XXX

	bool "FT2xxx/FT4xxx Based JTAG Programmer"

	select BR2_PACKAGE_LIBFTDI

	help

	  Enable building support for FT2232 based devices

	  using the libftdi driver, opensource alternate of FTD2XX



config BR2_PACKAGE_OPENOCD_JLINK

	bool "Segger J-Link JTAG Programmer"

	help

	  Segger J-Link JTAG Programmer and clone such as Atmel SAM-ICE



config BR2_PACKAGE_OPENOCD_VSLLINK

	bool "Versaloon-Link JTAG Programmr"



endif # BR2_PACKAGE_OPENOCD

package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch

0 → 100644
+33 −0
Original line number Diff line number Diff line 
From 3728c4af7f6303ccedab56ec220797f8f290580e Mon Sep 17 00:00:00 2001

From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

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 <plagnioj@jcrosoft.com>

---

 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="$LFFLAGS $LIBUSB_LDFLAGS"

+  LIBS="$LIBS $LIBUSB_LIBS"

   build_usb=yes

 fi

 

-- 

1.7.5.4

package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
xscale: fix uninitialise breakpoint_pc



Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

---

 src/target/xscale.c |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



Index: b/src/target/xscale.c

===================================================================

--- 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 */

package/openocd/openocd-0003-force-gnu99.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
force gnu99



Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

---

 configure.in |    1 +

 1 file changed, 1 insertion(+)



Index: b/configure.in

===================================================================

--- a/configure.in

+++ b/configure.in

@@ -28,6 +28,7 @@ AC_DISABLE_SHARED

 AC_PROG_LIBTOOL

 AC_SUBST(LIBTOOL_DEPS)

 

+CFLAGS="$CFLAGS -std=gnu99"

 

 dnl configure checks required for Jim files (these are obsolete w/ C99)

 AC_C_CONST