From 0ca1eb2804f548a1a325a83d754ff7e2f24de560 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 5 Aug 2008 14:38:10 +0000
Subject: [PATCH] gaffe in previous commit fixed. "reset run" now works again
for arm7/9
git-svn-id: svn://svn.berlios.de/openocd/trunk@891 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/target/arm7_9_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 73ee84906..be2c48883 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -833,7 +833,7 @@ int arm7_9_deassert_reset(target_t *target)
/* deassert reset lines */
jtag_add_reset(0, 0);
- if ((jtag_reset_config & RESET_SRST_PULLS_TRST)!=0)
+ if (target->reset_halt&&(jtag_reset_config & RESET_SRST_PULLS_TRST)!=0)
{
LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
/* set up embedded ice registers again */
--
GitLab