From 34b2ce085e78bdf0c2446bd7708fd5691afdcfc4 Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Thu, 27 Apr 2023 14:45:08 +0200 Subject: [PATCH 1/3] openocd: 0.11->0.12 Update OpenOcd to the neweset release. Signed-off-by: Steffen Trumtrar --- ...p-cc-check-tools-check-only-the-name.patch | 30 ------------------- .../recipes-devtools/openocd/openocd_git.bb | 7 ++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch deleted file mode 100644 index 165c658d082..00000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 29e8dfae4593c91f11d7ea31a4722a6d82f6c950 Mon Sep 17 00:00:00 2001 -From: Kory Maincent -Date: Wed, 2 Nov 2022 16:39:30 +0100 -Subject: [PATCH] autosetup: cc-check-tools: check only the name of the tool - without its params - -Update the tool existence check. Test only the first word of the -args to keep only the executable without its parameters. - -Signed-off-by: Kory Maincent ---- - autosetup/cc.tcl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jimtcl/autosetup/cc.tcl b/jimtcl/autosetup/cc.tcl -index 585d259..4c87854 100644 ---- a/jimtcl/autosetup/cc.tcl -+++ b/jimtcl/autosetup/cc.tcl -@@ -264,7 +264,7 @@ proc cc-check-tools {args} { - foreach tool $args { - set TOOL [string toupper $tool] - set exe [get-env $TOOL [get-define cross]$tool] -- if {[find-executable {*}$exe]} { -+ if {[find-executable {*}[regexp -inline {\S+} $exe]]} { - define $TOOL $exe - continue - } --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 06d77b6a9ec..ce10a92644e 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" DEPENDS = "libusb-compat libftdi" RDEPENDS:${PN} = "libusb1" @@ -9,16 +9,15 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ - file://0001-autosetup-cc-check-tools-check-only-the-name.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "f342aac0845a69d591ad39a025d74e9c765f6420" +SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "0aa0fb4e3a38d38a49de9eb585d93d63a370dcf6" SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" -PV = "0.11+gitr${SRCPV}" +PV = "0.12+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext From 32be5b65967f420930378e1ca98f2a93399dede9 Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Thu, 27 Apr 2023 14:47:21 +0200 Subject: [PATCH 2/3] openocd: fix jimtcl url The repo.cz URL is marked as deprecated. The official, maintained version is hosted on github. Signed-off-by: Steffen Trumtrar --- meta-oe/recipes-devtools/openocd/openocd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index ce10a92644e..ee621ecf149 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -7,14 +7,14 @@ RDEPENDS:${PN} = "libusb1" SRC_URI = " \ git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ - git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://github.com/msteveb/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ " SRCREV_FORMAT = "openocd" SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "0aa0fb4e3a38d38a49de9eb585d93d63a370dcf6" +SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" PV = "0.12+gitr${SRCPV}" From 23ef85dc2710dbe4a0de5ede3d8f1505067af5f3 Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Thu, 27 Apr 2023 14:57:30 +0200 Subject: [PATCH 3/3] openocd: enable jtag-vpi and buspirate Enable support for the virtual JTAG VPI adapter, for use with a Verilog Simulator and the Buspirate. Signed-off-by: Steffen Trumtrar --- meta-oe/recipes-devtools/openocd/openocd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index ee621ecf149..d30d9c34663 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -24,7 +24,7 @@ inherit pkgconfig autotools-brokensep gettext BBCLASSEXTEND += "native nativesdk" -EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" +EXTRA_OECONF = "--enable-ftdi --enable-jtag_vpi --enable-buspirate --disable-doxygen-html --disable-werror" do_configure() { ./bootstrap nosubmodule