summaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-30 17:27:21 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-02 13:26:22 -0800
commit747f8af672026f9778c6272ab48405d93b41acad (patch)
tree14f6decf9347533d4ca1d8f1598b0ab8da5a0e2b /src/openocd.c
parent682910fdc24c8ae970b3cd1e5b4ff7042e0522be (diff)
downloadopenocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.gz
openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.bz2
openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.xz
openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.zip
nand: factor init to 'nand init'
Split NAND initialization into 'nand init', which gets called from the main 'init' command.
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 777e6306..1026379d 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -143,11 +143,10 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL;
LOG_DEBUG("mflash init complete");
- if (nand_init(CMD_CTX) != ERROR_OK)
+ command_context_mode(CMD_CTX, COMMAND_CONFIG);
+ if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
- LOG_DEBUG("NAND init complete");
- command_context_mode(CMD_CTX, COMMAND_CONFIG);
if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC);