improve gdb_init() sequence

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 629d50ae890bff1d9f73298d250c6d423a1fd524..7f6af4c5c676aaf448b0caabdc9ed2943ac80728 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -109,6 +109,8 @@ COMMAND_HANDLER(handle_init_command)
 
        atexit(exit_handler);
 
+       command_context_mode(CMD_CTX, COMMAND_EXEC);
+
        if (target_init(CMD_CTX) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("target init complete");
@@ -152,7 +154,7 @@ COMMAND_HANDLER(handle_init_command)
 
        /* initialize telnet subsystem */
        telnet_init("Open On-Chip Debugger");
-       gdb_init();
+       gdb_target_add_all(all_targets);
        tcl_init(); /* allows tcl to just connect without going thru telnet */
 
        target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
@@ -267,7 +269,6 @@ int openocd_main(int argc, char *argv[])
 
        if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
        {
-               command_context_mode(cmd_ctx, COMMAND_EXEC);
                if (command_run_line(cmd_ctx, "init") != ERROR_OK)
                        return EXIT_FAILURE;