From: OpenOCD-Gerrit <ope...@us...> - 2018-08-22 07:24:34
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 2a3b709aa5d1ab83faed1dc7c296ffc117022d62 (commit) from 704d7ac2d0551514b81650addd76e35327c7beb0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2a3b709aa5d1ab83faed1dc7c296ffc117022d62 Author: Guido Günther <ag...@si...> Date: Fri Aug 10 12:01:17 2018 +0200 target: armv8: Ensure target is halted for virt2phys Othewise the error reported as Timeout waiting for dpm prepare Change-Id: Ieed2fdcd94ae4e877a749df3eec07a01dbf80b10 Closes: https://sourceforge.net/p/openocd/tickets/201/ Found-by: Matthias Welwarsky <mat...@we...> Signed-off-by: Guido Günther <gui...@pu...> Reviewed-on: http://openocd.zylin.com/4647 Tested-by: jenkins Reviewed-by: Matthias Welwarsky <mat...@we...> diff --git a/src/target/armv8.c b/src/target/armv8.c index dfa2c67a5..75ada896d 100644 --- a/src/target/armv8.c +++ b/src/target/armv8.c @@ -936,6 +936,11 @@ int armv8_mmu_translate_va_pa(struct target *target, target_addr_t va, "Secure", "Not Secure" }; + if (target->state != TARGET_HALTED) { + LOG_WARNING("target %s not halted", target_name(target)); + return ERROR_TARGET_NOT_HALTED; + } + retval = dpm->prepare(dpm); if (retval != ERROR_OK) return retval; ----------------------------------------------------------------------- Summary of changes: src/target/armv8.c | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- Main OpenOCD repository |