openocd: Update to latest git version

Update to the latest git version and allow native builds.

The 0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch has
been merged into master, so we can remove it.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 4 insertions, 64 deletions

diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch
deleted file mode 100644
index c80d9f19f..000000000
--- a/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 May 2019 23:24:26 -0700
-Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE
-
-PAGE_SIZE is defined in system includes on some systems, this would
-avoid the unintended conflict
-
-Fixes
-| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined]
-| #define PAGE_SIZE                       4096
-|         ^
-| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu
-de/limits.h:89:9: note: previous definition is here
-| #define PAGE_SIZE PAGESIZE
-
-Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2]
-Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/flash/nor/esirisc_flash.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c
-index 4e33b942..3bed0658 100644
---- a/src/flash/nor/esirisc_flash.c
-+++ b/src/flash/nor/esirisc_flash.c
-@@ -92,7 +92,7 @@
- #endif
- 
- #define CONTROL_TIMEOUT                5000            /* 5s    */
--#define PAGE_SIZE                      4096
-+#define FLASH_PAGE_SIZE                4096
- #define PB_MAX                         32
- 
- #define NUM_NS_PER_S           1000000000ULL
-@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
-        (void)esirisc_flash_disable_protect(bank);
- 
-        for (int page = first; page < last; ++page) {
--               uint32_t address = page * PAGE_SIZE;
-+               uint32_t address = page * FLASH_PAGE_SIZE;
- 
-                target_write_u32(target, esirisc_info->cfg + ADDRESS, address);
- 
-@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank)
-        if (target->state != TARGET_HALTED)
-                return ERROR_TARGET_NOT_HALTED;
- 
--       bank->num_sectors = bank->size / PAGE_SIZE;
--       bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors);
-+       bank->num_sectors = bank->size / FLASH_PAGE_SIZE;
-+       bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors);
- 
-        retval = esirisc_flash_init(bank);
-        if (retval != ERROR_OK) {
--- 
-2.21.0
-
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb
index 241b4baa3..9ec77fdc4 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -9,22 +9,21 @@ SRC_URI = " \
     git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \
     git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \
     git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \
-    file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \
     file://0001-Do-not-include-syscrtl.h-with-glibc.patch \
 "
 
 SRCREV_FORMAT = "openocd"
-SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9"
+SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d"
 SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba"
-SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787"
-SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b"
+SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98"
+SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b"
 
 PV = "0.10+gitr${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools-brokensep gettext
 
-BBCLASSEXTEND += "nativesdk"
+BBCLASSEXTEND += "native nativesdk"
 
 EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror"