]> git.sur5r.net Git - openocd/commitdiff
cortex-a: use -dbgbase option
authorØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 30 Mar 2011 11:34:50 +0000 (13:34 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Thu, 31 Mar 2011 07:30:48 +0000 (09:30 +0200)
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/target/cortex_a.c

index 82f719ad655f483146e7f06fdfce03b749668c87..5ff6bacbdf6542c2b4505164a6ce661b9d1f95ce 100644 (file)
@@ -1861,7 +1861,7 @@ static int cortex_a8_examine_first(struct target *target)
        int i;
        int retval = ERROR_OK;
        uint32_t didr, ctypr, ttypr, cpuid;
-       uint32_t dbgbase, apid;
+       uint32_t dbgbase;
 
        /* We do one extra read to ensure DAP is configured,
         * we call ahbap_debugport_init(swjdp) instead
@@ -1870,10 +1870,17 @@ static int cortex_a8_examine_first(struct target *target)
        if (retval != ERROR_OK)
                return retval;
 
-       /* Get ROM Table base */
-       retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid);
-       if (retval != ERROR_OK)
-               return retval;
+       if (!target->dbgbase_set)
+       {
+               /* Get ROM Table base */
+               uint32_t apid;
+               retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid);
+               if (retval != ERROR_OK)
+                       return retval;
+       } else
+       {
+               dbgbase = target->dbgbase;
+       }
 
        /* Lookup 0x15 -- Processor DAP */
        retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15,