diff options
| author | Dennis Ostermann <dennis.ostermann@renesas.com> | 2018-07-18 11:21:17 +0200 |
|---|---|---|
| committer | Matthias Welwarsky <matthias@welwarsky.de> | 2018-07-20 15:14:46 +0100 |
| commit | e59bb6c285d21ba59f785d4340048abda1c39466 (patch) | |
| tree | 7d1ca0ff3d777a77832a20178b83cefcb6d52d5c /src | |
| parent | 9f93cca42738cf0c5060296ef5899fee53fc642f (diff) | |
target/aarch64: Call aarch64_init_debug_access() earlier in aarch64_deassert_reset()
On Renesas R-Car, calling 'reset halt' and 'reset init' always made DAP inaccessible. Calling 'reset' and 'halt' seperatly worked fine.
The only differences seems to be the point in time when aarch64_init_debug_access() is called. This patch aligns the behaviour.
Change-Id: I2296c65e48414a7d9846f12a395e5eca315b49ca
Signed-off-by: Dennis Ostermann <dennis.ostermann@renesas.com>
Reviewed-on: http://openocd.zylin.com/4607
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/aarch64.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/target/aarch64.c b/src/target/aarch64.c index 14542a65..454de9e9 100644 --- a/src/target/aarch64.c +++ b/src/target/aarch64.c @@ -1694,17 +1694,19 @@ static int aarch64_deassert_reset(struct target *target) if (retval != ERROR_OK) return retval; + retval = aarch64_init_debug_access(target); + if (retval != ERROR_OK) + return retval; + if (target->reset_halt) { if (target->state != TARGET_HALTED) { LOG_WARNING("%s: ran after reset and before halt ...", target_name(target)); retval = target_halt(target); - if (retval != ERROR_OK) - return retval; } } - return aarch64_init_debug_access(target); + return retval; } static int aarch64_write_cpu_memory_slow(struct target *target, |