[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1474-g990a01b70

[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  990a01b70203a512b120e562dd991c29ee9201b2 (commit)
       via  8e281b76ea26f5da79875ad927c4660fb7b1502b (commit)
       via  850e85fa6fec275cb9f2bc76faefee51136e878e (commit)
      from  9cce6b3c763e883faea545b9ffbda19ec8164804 (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 990a01b70203a512b120e562dd991c29ee9201b2
Author: Jonathan McDowell <no...@ea...>
Date:   Sun Nov 1 12:10:23 2020 +0000

    tcl/interface/ftdi: Add HIE JTAG Debugger config
    
    Change-Id: Ibb7a2bb8807c442394982e89258874557a2baaad
    Signed-off-by: Jonathan McDowell <no...@ea...>
    Reviewed-on: http://openocd.zylin.com/5910
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/interface/ftdi/hie-jtag.cfg b/tcl/interface/ftdi/hie-jtag.cfg
new file mode 100644
index 000000000..39af87d89
--- /dev/null
+++ b/tcl/interface/ftdi/hie-jtag.cfg
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Hofstädtler Industrie-Electronic (HIE) JTAG Debugger
+#
+# https://www.hofstaedtler.com/jtag
+#
+
+adapter driver ftdi
+ftdi_channel 0
+ftdi_vid_pid 0x0403 0x6014
+ftdi_device_desc "HIE JTAG Debugger"
+
+ftdi_layout_init 0x0c08 0x4f1b
+
+# define both Reset signals
+ftdi_layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi_layout_signal nSRST -data 0x0200 -noe 0x0800
+
+# Toggle USB LED
+ftdi_layout_signal LED -ndata 0x4000

commit 8e281b76ea26f5da79875ad927c4660fb7b1502b
Author: Marc Schink <de...@za...>
Date:   Tue Nov 3 13:38:59 2020 +0100

    doc: Improve 'jlink usb' description
    
    Change-Id: Ica44980ac0ba8a4f0ff03b42ce37d1de861d4fb5
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: http://openocd.zylin.com/5918
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index b01e5a6c1..ee7186746 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2881,8 +2881,8 @@ The following example shows how to read 4 bytes from the EMUCOM channel 0x0:
 @deffn {Config} {jlink usb} <@option{0} to @option{3}>
 Set the USB address of the interface, in case more than one adapter is connected
 to the host. If not specified, USB addresses are not considered. Device
-selection via USB address is deprecated and the serial number should be used
-instead.
+selection via USB address is not always unambiguous. It is recommended to use
+the serial number instead, if possible.
 
 As a configuration command, it can be used only before 'init'.
 @end deffn

commit 850e85fa6fec275cb9f2bc76faefee51136e878e
Author: Adrian Negreanu <adr...@nx...>
Date:   Thu Nov 5 11:56:16 2020 +0200

    semihosting: print the semihosting operation id
    
    Change-Id: If5c3568bd1c99a48ac492137f48da0d9764efe14
    Signed-off-by: Adrian Negreanu <adr...@nx...>
    Reviewed-on: http://openocd.zylin.com/5923
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Jonathan McDowell <noo...@ea...>
    Reviewed-by: Tim Newsome <ti...@si...>

diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c
index 61f1e7801..723be577e 100644
--- a/src/target/arm_semihosting.c
+++ b/src/target/arm_semihosting.c
@@ -315,7 +315,7 @@ int arm_semihosting(struct target *target, int *retval)
 		if (0 <= semihosting->op && semihosting->op <= 0x31) {
 			*retval = semihosting_common(target);
 			if (*retval != ERROR_OK) {
-				LOG_ERROR("Failed semihosting operation");
+				LOG_ERROR("Failed semihosting operation (0x%02X)", semihosting->op);
 				return 0;
 			}
 		} else {
diff --git a/src/target/riscv/riscv_semihosting.c b/src/target/riscv/riscv_semihosting.c
index 99d6c7713..c0e81eae4 100644
--- a/src/target/riscv/riscv_semihosting.c
+++ b/src/target/riscv/riscv_semihosting.c
@@ -140,7 +140,7 @@ semihosting_result_t riscv_semihosting(struct target *target, int *retval)
 		if (0 <= semihosting->op && semihosting->op <= 0x31) {
 			*retval = semihosting_common(target);
 			if (*retval != ERROR_OK) {
-				LOG_ERROR("Failed semihosting operation");
+				LOG_ERROR("Failed semihosting operation (0x%02X)", semihosting->op);
 				return SEMI_ERROR;
 			}
 		} else {

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

Summary of changes:
 doc/openocd.texi                     |  4 ++--
 src/target/arm_semihosting.c         |  2 +-
 src/target/riscv/riscv_semihosting.c |  2 +-
 tcl/interface/ftdi/hie-jtag.cfg      | 20 ++++++++++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 tcl/interface/ftdi/hie-jtag.cfg


hooks/post-receive
-- 
Main OpenOCD repository