X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.c;h=73ee849063ce9bbe4be9f444ef755f03cd25f03f;hp=547bf3c490bac69fda56309b290ff433abc150be;hb=20f505f695df9d9ba4c20780848336afec240a31;hpb=18293612537125c8864d4627c7c4b2b4ba7cc882

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 547bf3c490..73ee849063 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;
 }