diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2015-12-06 01:19:19 +0100 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2015-12-29 20:27:42 +0000 |
| commit | cd12c423dcc68c2a8ef3ba43a7b9f55e84de3d5d (patch) | |
| tree | e2042c32c6bbf916a125d81f29b6b77aab012a99 /src | |
| parent | 5ae2fbda2b8744752f9a8d5dbdb0090df812a894 (diff) | |
cortex_a: Call ahbap_debugport_init on the discovered AP and not 0
Change-Id: I76bb9bd800697776a375ab803402780c3c7bea35
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3145
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/cortex_a.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index 7da57b49..a65cabf5 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -2935,19 +2935,20 @@ static int cortex_a_examine_first(struct target *target) int retval = ERROR_OK; uint32_t didr, ctypr, ttypr, cpuid, dbg_osreg; - /* We do one extra read to ensure DAP is configured, - * we call ahbap_debugport_init(swjdp) instead - */ - retval = ahbap_debugport_init(swjdp, 0); - if (retval != ERROR_OK) - return retval; - /* Search for the APB-AB - it is needed for access to debug registers */ retval = dap_find_ap(swjdp, AP_TYPE_APB_AP, &armv7a->debug_ap); if (retval != ERROR_OK) { LOG_ERROR("Could not find APB-AP for debug access"); return retval; } + + /* We do one extra read to ensure DAP is configured, + * we call ahbap_debugport_init(swjdp) instead + */ + retval = ahbap_debugport_init(swjdp, armv7a->debug_ap); + if (retval != ERROR_OK) + return retval; + /* Search for the AHB-AB */ retval = dap_find_ap(swjdp, AP_TYPE_AHB_AP, &armv7a->memory_ap); if (retval != ERROR_OK) { |