[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-430-g0fb131c23

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  0fb131c23a1cba9ea128db9c72fcd6479e508513 (commit)
       via  37bce983956cf34f725b096a33a1a6c16ac58d71 (commit)
      from  615709d14049027e6172fbb7f6cf6c898eefaea9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0fb131c23a1cba9ea128db9c72fcd6479e508513
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Oct 8 18:43:06 2021 +0200

    riscv: use relative path to include contrib's data
    
    Doxygen cannot resolve the path of the files in folder contrib.
    Use a path relative to current folder, as done in other files.
    
    Change-Id: If39b416ed422b4854dd108777fa32dd4c809450a
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6635
    Tested-by: jenkins
    Reviewed-by: Tim Newsome <ti...@si...>

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 7579e0f0c..084939e11 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -1987,10 +1987,10 @@ static int riscv_checksum_memory(struct target *target,
 	LOG_DEBUG("address=0x%" TARGET_PRIxADDR "; count=0x%" PRIx32, address, count);
 
 	static const uint8_t riscv32_crc_code[] = {
-#include "contrib/loaders/checksum/riscv32_crc.inc"
+#include "../../../contrib/loaders/checksum/riscv32_crc.inc"
 	};
 	static const uint8_t riscv64_crc_code[] = {
-#include "contrib/loaders/checksum/riscv64_crc.inc"
+#include "../../../contrib/loaders/checksum/riscv64_crc.inc"
 	};
 
 	static const uint8_t *crc_code;

commit 37bce983956cf34f725b096a33a1a6c16ac58d71
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Oct 6 23:27:16 2021 +0200

    openocd: remove 'src' prefix from #include path
    
    There is no reason to add the 'src' prefix.
    Remove it.
    
    Change-Id: Id7d7ee8b3807fb90381cc1d6d545321020bc06c1
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6634
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 319ca380a..53ae1dfae 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -39,7 +39,7 @@
 #include <jtag/swd.h>
 #include <jtag/commands.h>
 #include <jtag/drivers/jtag_usb_common.h>
-#include <src/helper/replacements.h>
+#include <helper/replacements.h>
 #include <target/cortex_m.h>
 
 #include <libjaylink/libjaylink.h>
diff --git a/src/target/arm_coresight.h b/src/target/arm_coresight.h
index 42e6c5eb6..a08f4fb53 100644
--- a/src/target/arm_coresight.h
+++ b/src/target/arm_coresight.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <src/helper/bits.h>
+#include <helper/bits.h>
 
 #define ARM_CS_ALIGN                            (0x1000)
 

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/jlink.c   | 2 +-
 src/target/arm_coresight.h | 2 +-
 src/target/riscv/riscv.c   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository