summaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-30 17:38:02 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-02 13:26:22 -0800
commit37201c019ffc6b806aa61bf2eb8fc18c58083f02 (patch)
tree7d97714a0f11462daadbd1262c7d4fefc6d5a516 /src/openocd.c
parent1de0b9d351313f186433f4d71d31241c95665cbf (diff)
downloadopenocd+libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.gz
openocd+libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.bz2
openocd+libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.xz
openocd+libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.zip
flash: factor init to 'flash init'
Split flash initialiation into 'flash init', called from 'init'.
Diffstat (limited to 'src/openocd.c')
-rw-r--r--src/openocd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openocd.c b/src/openocd.c
index ff35f878..aaa45314 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -135,11 +135,10 @@ COMMAND_HANDLER(handle_init_command)
}
}
- if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+ command_context_mode(CMD_CTX, COMMAND_CONFIG);
+ if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
return ERROR_FAIL;
- LOG_DEBUG("flash init complete");
- command_context_mode(CMD_CTX, COMMAND_CONFIG);
if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
return ERROR_FAIL;