Merge remote branch 'origin/master' into HEAD

[openocd.git] / src / target / cortex_a.c

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 82f719ad655f483146e7f06fdfce03b749668c87..c04804f85397039f118e6e8b8affd054c7dea5aa 100644 (file)
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -1587,7 +1587,7 @@ static int cortex_a8_read_memory(struct target *target, uint32_t address,
 
 static int cortex_a8_write_phys_memory(struct target *target,
                 uint32_t address, uint32_t size,
-                uint32_t count, uint8_t *buffer)
+                uint32_t count, const uint8_t *buffer)
 {
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct adiv5_dap *swjdp = &armv7a->dap;
@@ -1748,7 +1748,7 @@ static int cortex_a8_write_phys_memory(struct target *target,
 }
 
 static int cortex_a8_write_memory(struct target *target, uint32_t address,
-                uint32_t size, uint32_t count, uint8_t *buffer)
+                uint32_t size, uint32_t count, const uint8_t *buffer)
 {
         int enabled = 0;
         uint32_t virt, phys;
@@ -1774,7 +1774,7 @@ static int cortex_a8_write_memory(struct target *target, uint32_t address,
 }
 
 static int cortex_a8_bulk_write_memory(struct target *target, uint32_t address,
-               uint32_t count, uint8_t *buffer)
+               uint32_t count, const uint8_t *buffer)
 {
        return cortex_a8_write_memory(target, address, 4, count, buffer);
 }
@@ -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,