]> git.sur5r.net Git - openocd/commitdiff
tcl at91samdXX.cfg: partially revert change 3722
authorTomas Vanek <vanekt@fbl.cz>
Sat, 7 Jan 2017 16:04:30 +0000 (17:04 +0100)
committerPaul Fertser <fercerpav@gmail.com>
Sun, 15 Jan 2017 11:01:00 +0000 (11:01 +0000)
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

index 9a3c29282aa8fa5f29a380e5f5cfe9519549cc2b..93a95c8eb9bc6d3817a21ad65d0fd0f83daedcad 100644 (file)
@@ -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