Gary Carlson [gcarlson@carlson-minot.com]:

- revert patch from rev1507 as it was causing reset issues with arm9 cores

git-svn-id: svn://svn.berlios.de/openocd/trunk@2574 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index d8bfb0f391162b0e9f461ba855b4e851d4789a67..1ec73b2d24be103df3ac4e7907dc01d839074b59 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -499,12 +499,10 @@ static void jlink_reset(int trst, int srst)
        {
                jlink_simple_command(EMU_CMD_HW_TRST0);
        }
+
        if (trst == 0)
        {
                jlink_simple_command(EMU_CMD_HW_TRST1);
-               jtag_sleep(5000);
-               jlink_end_state(TAP_RESET);
-               jlink_state_move();
        }
 }