lpc2148: redo to the new target configuration scheme

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 7347cad8e5b0d5ba3cb8122d078a78d5517f6bc6..109f0e198e25feffd77d96a5af5089c935bb7f2a 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -42,7 +42,6 @@
 
 #include <server/server.h>
 #include <server/gdb_server.h>
-#include <server/httpd.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -337,13 +336,14 @@ int openocd_main(int argc, char *argv[])
        if (ret != ERROR_OK)
                return EXIT_FAILURE;
 
-       if (httpd_start(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
-
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
                return EXIT_FAILURE;
 
+       ret = command_run_line(cmd_ctx, "init_targets");
+       if (ERROR_OK != ret)
+               ret = EXIT_FAILURE;
+
        if (init_at_startup)
        {
                ret = command_run_line(cmd_ctx, "init");
@@ -357,8 +357,6 @@ int openocd_main(int argc, char *argv[])
 
        server_quit();
 
-       httpd_stop();
-
        unregister_all_commands(cmd_ctx, NULL);
 
        /* free commandline interface */