[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-rc1-31-g8b7569c21

[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  8b7569c2196ea69e72d5daf5c7294d98feb20268 (commit)
       via  0b248e04c1e58b374e82bad0361e42a5e8a96b77 (commit)
      from  2dc9c1df81b6458875233fc3710ab9d3e871743d (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 8b7569c2196ea69e72d5daf5c7294d98feb20268
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jan 9 19:51:42 2021 +0100

    configure.ac: drop macro 'AC_PROG_CC_C99' from autoconf 2.70
    
    The macro AC_PROG_CC_C99 has been obsoleted by autoconf 2.70 and
    triggers a set of warnings from both 'aclocal' and 'autoconf'.
    The test of AC_PROG_CC_C99 is now included in AC_PROG_CC.
    
    For autoconf 2.69 and earlier the macro is still required, so
    cannot be simply dropped.
    
    Use a conditional test to avoid the warning on autoconf 2.70 but
    still use AC_PROG_CC_C99 on older autoconf.
    
    Change-Id: I5e8437f5a826fb63be6d07bcb5bb824f94683020
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6009
    Tested-by: jenkins
    Reviewed-by: Marc Schink <de...@za...>

diff --git a/configure.ac b/configure.ac
index 012486666..6d0c7d096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,8 @@ AH_BOTTOM([
 
 AC_LANG([C])
 AC_PROG_CC
-AC_PROG_CC_C99
+# autoconf 2.70 obsoletes AC_PROG_CC_C99 and includes it in AC_PROG_CC
+m4_version_prereq([2.70],[],[AC_PROG_CC_C99])
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
 PKG_PROG_PKG_CONFIG([0.23])

commit 0b248e04c1e58b374e82bad0361e42a5e8a96b77
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Mar 5 17:00:50 2020 +0100

    driver/ftdi: skip trst in swd mode
    
    When using the adapter olimex arm-jtag-swd (to convert to SWD a
    JTAG-only FTDI adapter), the pin trst on JTAG side is re-used to
    control the direction of pin SWDIO on SWD side.
    There is a single reset API at adapter driver to assert/deassert
    either srst and/or trst. A request to assert/deassert srst can
    cause also trst to change value, hanging the SWD communication.
    
    In SWD mode, ignore the value passed to trst.
    
    Change-Id: I5fe1eed851177d405d77ae6079da9642dc1a08f1
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6006
    Tested-by: jenkins

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 9d1c85cbd..9e47d3cad 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -524,17 +524,19 @@ static int ftdi_reset(int trst, int srst)
 
 	LOG_DEBUG_IO("reset trst: %i srst %i", trst, srst);
 
-	if (trst == 1) {
-		if (sig_ntrst)
-			ftdi_set_signal(sig_ntrst, '0');
-		else
-			LOG_ERROR("Can't assert TRST: nTRST signal is not defined");
-	} else if (sig_ntrst && jtag_get_reset_config() & RESET_HAS_TRST &&
-			trst == 0) {
-		if (jtag_get_reset_config() & RESET_TRST_OPEN_DRAIN)
-			ftdi_set_signal(sig_ntrst, 'z');
-		else
-			ftdi_set_signal(sig_ntrst, '1');
+	if (!swd_mode) {
+		if (trst == 1) {
+			if (sig_ntrst)
+				ftdi_set_signal(sig_ntrst, '0');
+			else
+				LOG_ERROR("Can't assert TRST: nTRST signal is not defined");
+		} else if (sig_ntrst && jtag_get_reset_config() & RESET_HAS_TRST &&
+				trst == 0) {
+			if (jtag_get_reset_config() & RESET_TRST_OPEN_DRAIN)
+				ftdi_set_signal(sig_ntrst, 'z');
+			else
+				ftdi_set_signal(sig_ntrst, '1');
+		}
 	}
 
 	if (srst == 1) {

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

Summary of changes:
 configure.ac            |  3 ++-
 src/jtag/drivers/ftdi.c | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository