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>

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 7da57b4980cb09e3377570368b7584a59f1b5a37..a65cabf5acfc20095b5274ca637a2f698cd47288 100644 (file)
--- 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) {