From 4cbee5b1392e216d493676e5c5260d5e25de014f Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 16 Mar 2021 06:45:25 -0700 Subject: [PATCH] openocd: Bump to a more recent build Signed-off-by: Alistair Francis --- ...g-Make-bitbang_swd-extern-definition.patch | 42 ------------------- .../recipes-devtools/openocd/openocd_riscv.bb | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch b/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch deleted file mode 100644 index d42b628..0000000 --- a/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 428f9f3c4a5be973e4c7fc1325ae9dbe41040df2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Aug 2020 17:47:35 -0700 -Subject: [PATCH] bitbang: Make bitbang_swd extern definition - -Fixes build with gcc10+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/jtag/drivers/bitbang.c | 1 + - src/jtag/drivers/bitbang.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c -index b5078c080..f8612aade 100644 ---- a/src/jtag/drivers/bitbang.c -+++ b/src/jtag/drivers/bitbang.c -@@ -43,6 +43,7 @@ static int bitbang_stableclocks(int num_cycles); - static void bitbang_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_delay_clk); - - struct bitbang_interface *bitbang_interface; -+const struct swd_driver bitbang_swd; - - /* DANGER!!!! clock absolutely *MUST* be 0 in idle or reset won't work! - * -diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h -index 577717ebd..0faf5d9ae 100644 ---- a/src/jtag/drivers/bitbang.h -+++ b/src/jtag/drivers/bitbang.h -@@ -57,7 +57,7 @@ struct bitbang_interface { - void (*swdio_drive)(bool on); - }; - --const struct swd_driver bitbang_swd; -+extern const struct swd_driver bitbang_swd; - - extern bool swd_mode; - --- -2.28.0 - diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb b/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb index b860962..1c7b4df 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/openocd/openocd_riscv.bb @@ -7,9 +7,8 @@ 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-bitbang-Make-bitbang_swd-extern-definition.patch \ " -SRCREV_openocd = "03f943ae239f59727ef47e46fffc31dd405a642d" +SRCREV_openocd = "50a5971be27ff11061776afc8014bbff22870b7c" COMPATIBLE_HOST = "(x86_64.*|i.86.*|riscv32|riscv64).*-linux"