diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-06 23:34:34 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-06 23:34:34 +0000 |
| commit | d40fd9e0f42c32d180a580962d76d55e73be8232 (patch) | |
| tree | cbf6be429f0371247d73240f678536820234cb6d /src/jtag/jlink.c | |
| parent | 1ee32a8fa183b19dd094c275e76fb56b68e5b24f (diff) | |
| download | openocd+libswd-d40fd9e0f42c32d180a580962d76d55e73be8232.tar.gz openocd+libswd-d40fd9e0f42c32d180a580962d76d55e73be8232.tar.bz2 openocd+libswd-d40fd9e0f42c32d180a580962d76d55e73be8232.tar.xz openocd+libswd-d40fd9e0f42c32d180a580962d76d55e73be8232.zip | |
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
Diffstat (limited to 'src/jtag/jlink.c')
| -rw-r--r-- | src/jtag/jlink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index d8bfb0f3..1ec73b2d 100644 --- 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(); } } |