summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-05 14:38:10 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-05 14:38:10 +0000
commit0ca1eb2804f548a1a325a83d754ff7e2f24de560 (patch)
tree24d62201717bbb575bcf530cf6dd7f5deed2c381 /src
parentf370d70670bd5e30befe6fbfbc8d472e760f032b (diff)
downloadopenocd_libswd-0ca1eb2804f548a1a325a83d754ff7e2f24de560.tar.gz
openocd_libswd-0ca1eb2804f548a1a325a83d754ff7e2f24de560.tar.bz2
openocd_libswd-0ca1eb2804f548a1a325a83d754ff7e2f24de560.tar.xz
openocd_libswd-0ca1eb2804f548a1a325a83d754ff7e2f24de560.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/target/arm7_9_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 73ee8490..be2c4888 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 */