summaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-01-09 11:44:01 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-01-09 11:44:01 +0000
commit59ff8d24d84ad734ca470aa37e9516be806499c9 (patch)
treeeb849b9e30295482f04be9121245c04599bdfc55 /src/openocd.c
parent5bbf2ae519c31b45e7609918a1bc36b849ba53f5 (diff)
downloadopenocd+libswd-59ff8d24d84ad734ca470aa37e9516be806499c9.tar.gz
openocd+libswd-59ff8d24d84ad734ca470aa37e9516be806499c9.tar.bz2
openocd+libswd-59ff8d24d84ad734ca470aa37e9516be806499c9.tar.xz
openocd+libswd-59ff8d24d84ad734ca470aa37e9516be806499c9.zip
moved ioutil init to the right spot: before config scripts
git-svn-id: svn://svn.berlios.de/openocd/trunk@1311 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/openocd.c')
-rw-r--r--src/openocd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/openocd.c b/src/openocd.c
index e46f62d2..df4f8a9f 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -139,13 +139,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
atexit(exit_handler);
-#if BUILD_IOUTIL
- if (ioutil_init(cmd_ctx) != ERROR_OK)
- {
- return ERROR_FAIL;
- }
-#endif
-
if (target_init(cmd_ctx) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("target init complete");
@@ -251,6 +244,13 @@ int openocd_main(int argc, char *argv[])
cmd_ctx = setup_command_handler();
+#if BUILD_IOUTIL
+ if (ioutil_init(cmd_ctx) != ERROR_OK)
+ {
+ return EXIT_FAILURE;
+ }
+#endif
+
LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
print_version();