summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/target/arm7_9_common.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 547bf3c4..73ee8490 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -835,9 +835,21 @@ int arm7_9_deassert_reset(target_t *target)
if ((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 */
if ((retval=target->type->examine(target))!=ERROR_OK)
return retval;
+
+ if ((retval=target_poll(target))!=ERROR_OK)
+ {
+ return retval;
+ }
+
+ if ((retval=target_halt(target))!=ERROR_OK)
+ {
+ return retval;
+ }
+
}
return retval;
}