cortex: Set default memaccess_tck only during examine

It's currently set during target creation but the AP that will be used
for the target is not even known.

Change-Id: I4502e7eb1fa8d90f746445b8cf8a4c21cb7d519e
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3155
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 11558b9a6988d6b225869e9126c2d367cc4d37ee..5e3a1a4b9a2dc6d2d8f275152e1a1a608c2d4b20 100644 (file)
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2929,6 +2929,8 @@ static int cortex_a_examine_first(struct target *target)
                return retval;
        }
 
+       armv7a->debug_ap->memaccess_tck = 80;
+
        /* Search for the AHB-AB.
         * REVISIT: We should search for AXI-AP as well and make sure the AP's MEMTYPE says it
         * can access system memory. */
@@ -3117,7 +3119,6 @@ static int cortex_a_init_arch_info(struct target *target,
                tap->dap->tap = tap;
        }
 
-       tap->dap->ap[dap_ap_get_select(tap->dap)].memaccess_tck = 80;
        armv7a->arm.dap = tap->dap;
 
        cortex_a->fast_reg_read = 0;

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index b813bd7e01b9be05f3f8a13b8db12a409951a71c..d539a8241667c9e55f18e6524b4795e8d3a8cca3 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2122,9 +2122,6 @@ static int cortex_m_init_arch_info(struct target *target,
 
        armv7m->arm.dap = tap->dap;
 
-       /* Leave (only) generic DAP stuff for debugport_init(); */
-       tap->dap->ap[dap_ap_get_select(tap->dap)].memaccess_tck = 8;
-
        /* register arch-specific functions */
        armv7m->examine_debug_reason = cortex_m_examine_debug_reason;