target/riscv: fix 'reset run' after 'reset halt'

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 12bd52c585ddfe2ad03706bbb8600be0b6832ab0..fdc4a874b6eab13b658a4d3bc5ab1086348f5b5b 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "openocd.h"
-#include <jtag/driver.h>
+#include <jtag/adapter.h>
 #include <jtag/jtag.h>
 #include <transport/transport.h>
 #include <helper/util.h>
@@ -182,6 +182,9 @@ COMMAND_HANDLER(handle_init_command)
 
        target_register_event_callback(log_target_callback_event_handler, CMD_CTX);
 
+       if (command_run_line(CMD_CTX, "_run_post_init_commands") != ERROR_OK)
+               return ERROR_FAIL;
+
        return ERROR_OK;
 }
 
@@ -312,7 +315,7 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
                &log_register_commands,
                &rtt_server_register_commands,
                &transport_register_commands,
-               &interface_register_commands,
+               &adapter_register_commands,
                &target_register_commands,
                &flash_register_commands,
                &nand_register_commands,
@@ -437,6 +440,8 @@ int openocd_main(int argc, char *argv[])
        rtt_exit();
        free_config();
 
+       log_exit();
+
        if (ret == ERROR_FAIL)
                return EXIT_FAILURE;
        else if (ret != ERROR_OK)