projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aarch64: Add support for debugging in HYP mode on ARMv8-A cores
[fw/openocd]
/
src
/
openocd.c
diff --git
a/src/openocd.c
b/src/openocd.c
index bd52f4acf57b36aee476ae1b79f5a0dd6dc41bdb..886228425d79c7dafac6ef7934be7796cbfbd3da 100644
(file)
--- a/
src/openocd.c
+++ b/
src/openocd.c
@@
-36,7
+36,6
@@
#include <flash/nor/core.h>
#include <flash/nand/core.h>
#include <pld/pld.h>
#include <flash/nor/core.h>
#include <flash/nand/core.h>
#include <pld/pld.h>
-#include <flash/mflash.h>
#include <target/arm_cti.h>
#include <target/arm_adi_v5.h>
#include <target/arm_cti.h>
#include <target/arm_adi_v5.h>
@@
-87,13
+86,13
@@
static int log_target_callback_event_handler(struct target *target,
{
switch (event) {
case TARGET_EVENT_GDB_START:
{
switch (event) {
case TARGET_EVENT_GDB_START:
- target->
display = 0
;
+ target->
verbose_halt_msg = false
;
break;
case TARGET_EVENT_GDB_END:
break;
case TARGET_EVENT_GDB_END:
- target->
display = 1
;
+ target->
verbose_halt_msg = true
;
break;
case TARGET_EVENT_HALTED:
break;
case TARGET_EVENT_HALTED:
- if (target->
display
) {
+ if (target->
verbose_halt_msg
) {
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
/* do not display information when debugger caused the halt */
target_arch_state(target);
}
@@
-165,9
+164,6
@@
COMMAND_HANDLER(handle_init_command)
if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
return ERROR_FAIL;
if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
return ERROR_FAIL;
- if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
- return ERROR_FAIL;
-
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
@@
-257,7
+253,6
@@
struct command_context *setup_command_handler(Jim_Interp *interp)
&flash_register_commands,
&nand_register_commands,
&pld_register_commands,
&flash_register_commands,
&nand_register_commands,
&pld_register_commands,
- &mflash_register_commands,
&cti_register_commands,
&dap_register_commands,
NULL
&cti_register_commands,
&dap_register_commands,
NULL
@@
-350,19
+345,28
@@
int openocd_main(int argc, char *argv[])
command_context_mode(cmd_ctx, COMMAND_CONFIG);
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
command_context_mode(cmd_ctx, COMMAND_CONFIG);
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+ server_host_os_entry();
+
/* Start the executable meat that can evolve into thread in future. */
ret = openocd_thread(argc, argv, cmd_ctx);
/* Start the executable meat that can evolve into thread in future. */
ret = openocd_thread(argc, argv, cmd_ctx);
+ flash_free_all_banks();
gdb_service_free();
server_free();
unregister_all_commands(cmd_ctx, NULL);
gdb_service_free();
server_free();
unregister_all_commands(cmd_ctx, NULL);
- /* Shutdown commandline interface */
- command_exit(cmd_ctx);
+ /* free all DAP and CTI objects */
+ dap_cleanup_all();
+ arm_cti_cleanup_all();
adapter_quit();
adapter_quit();
+ server_host_os_close();
+
+ /* Shutdown commandline interface */
+ command_exit(cmd_ctx);
+
free_config();
if (ERROR_FAIL == ret)
free_config();
if (ERROR_FAIL == ret)