From: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Date: Tue, 9 Feb 2016 13:49:20 +0000 (+0100)
Subject: cortex_a: fix cortex_a_assert_reset() if srst_gates_jtag
X-Git-Tag: v0.10.0-rc1~196
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b0698501b0e789091e9f9f1427b32af304888769;p=openocd

cortex_a: fix cortex_a_assert_reset() if srst_gates_jtag

The cortex_a specific assert_reset function must only apply nSRST if
the reset configuration states that JTAG can be used while nSRST is
asserted.

Change-Id: If604a65fdea5bcb46ec723ada547a4e8d6fa8c59
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Reviewed-on: http://openocd.zylin.com/3356
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
---

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 4c0d163f..f9ffccd0 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -1912,7 +1912,9 @@ static int cortex_a_assert_reset(struct target *target)
 		/* REVISIT handle "pulls" cases, if there's
 		 * hardware that needs them to work.
 		 */
-		jtag_add_reset(0, 1);
+		if (target->reset_halt)
+			if (jtag_get_reset_config() & RESET_SRST_NO_GATING)
+				jtag_add_reset(0, 1);
 	} else {
 		LOG_ERROR("%s: how to reset?", target_name(target));
 		return ERROR_FAIL;