From 390c9aca1f9400d956020b3d1657237bcc1ffe68 Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Sat, 7 Jan 2017 17:04:30 +0100
Subject: [PATCH] tcl at91samdXX.cfg: partially revert change 3722
Commit 25d7ba19c9e70cf5b912f660cf6aaa93d9ca120f introduced a problem
with 'reset halt' due to setting srst_pulls_trst:
Error: cortex_m.c:595 cortex_m_halt(): can't request a halt while
in reset if nSRST pulls nTRST
Sorry, I don't know why I overlooked it when I tested #3722.
Change-Id: I41e9473dd91a86d93cf3e78b1fbbdfe1dd188d83
Reported-by: Ladislav Laska <laska@kam.mff.cuni.cz>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/3942
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
---
tcl/target/at91samdXX.cfg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tcl/target/at91samdXX.cfg b/tcl/target/at91samdXX.cfg
index 9a3c29282..93a95c8eb 100644
--- a/tcl/target/at91samdXX.cfg
+++ b/tcl/target/at91samdXX.cfg
@@ -50,7 +50,8 @@ $_TARGETNAME configure -event reset-deassert-post {
}
# SRST (wired to RESET_N) resets debug circuitry
-reset_config srst_gates_jtag srst_pulls_trst
+# srst_pulls_trst is not configured here to avoid an error raised in reset halt
+reset_config srst_gates_jtag
# Do not use a reset button with other SWD adapter than Atmel's EDBG.
# DSU usually locks MCU in reset state until you issue a reset command
--
GitLab