[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-159-g3a85fd52b

[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  3a85fd52b66360a7cc3fa7ee236f31ac4c46daeb (commit)
      from  d3a859cc448441a0220287bfeecd0fab72cb31ca (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 3a85fd52b66360a7cc3fa7ee236f31ac4c46daeb
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Fri May 7 14:40:14 2021 +0100

    cortex_m: do not perform soft_reset_halt on targets without VECTRESET
    
    Change-Id: Ib3df457e0afe4e342c82ad1af25e03aad6979d87
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6209
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index e35cdbe2f..245490c08 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -727,6 +727,11 @@ static int cortex_m_soft_reset_halt(struct target *target)
 	 * core, not the peripherals */
 	LOG_DEBUG("soft_reset_halt is discouraged, please use 'reset halt' instead.");
 
+	if (!cortex_m->vectreset_supported) {
+		LOG_ERROR("VECTRESET is not supported on this Cortex-M core");
+		return ERROR_FAIL;
+	}
+
 	/* Set C_DEBUGEN */
 	retval = cortex_m_write_debug_halt_mask(target, 0, C_STEP | C_MASKINTS);
 	if (retval != ERROR_OK)

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

Summary of changes:
 src/target/cortex_m.c | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository