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

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 73ee849063ce9bbe4be9f444ef755f03cd25f03f..be2c48883b9f73781aacd13b72a45c3d11378df4 100644 (file)
--- 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 */