Commit 0f18744a authored by oharboe's avatar oharboe
Browse files

fixed gaffe mea culpa

git-svn-id: svn://svn.berlios.de/openocd/trunk@878 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent e2b6de3d
......@@ -267,7 +267,6 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
{
int retval = ERROR_OK;
target_t *target;
struct timeval timeout, now;
target = targets;
while (target)
......@@ -363,11 +362,16 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
if ((reset_mode == RESET_HALT) || (reset_mode == RESET_INIT))
{
/* Wait for reset to complete, maximum 5 seconds. */
if (((retval=target_wait_state(target, TARGET_HALTED, 5000)))==ERROR_OK)
target = targets;
while (target)
{
if (reset_mode == RESET_INIT)
target_invoke_script(cmd_ctx, target, "post_reset");
/* Wait for reset to complete, maximum 5 seconds. */
if (((retval=target_wait_state(target, TARGET_HALTED, 5000)))==ERROR_OK)
{
if (reset_mode == RESET_INIT)
target_invoke_script(cmd_ctx, target, "post_reset");
}
target = target->next;
}
}
......@@ -1702,7 +1706,6 @@ int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, char *cmd,
int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
target_t *target = get_current_target(cmd_ctx);
enum target_reset_mode reset_mode = RESET_RUN;
if (argc >= 1)
......
......@@ -19,7 +19,7 @@ target arm7tdmi little 0 arm7tdmi-s_r4
# at CPU CLK <32kHz this must be disabled
arm7_9 fast_memory_access enable
arm7_9 dcc_downloads enable
arm7_9 sw_bkpts enable
#arm7_9 sw_bkpts enable
flash bank ecosflash 0x01000000 0x200000 2 2 0 ecos/at91eb40a.elf
target_script 0 reset event/zy1000_reset.script
......@@ -27,3 +27,5 @@ target_script 0 reset event/zy1000_reset.script
# required for usable performance. Used for lots of
# other things than flash programming.
working_area 0 0x00000000 0x20000 nobackup
jtag_khz 16000
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment