cortex_a: fix gaffe in first implementation of -dbgbase

This commit is contained in:
Michel JAOUEN 2011-04-01 17:54:28 +02:00 committed by Øyvind Harboe
parent 3b7c9585db
commit 930d70f1a3
1 changed files with 10 additions and 10 deletions

View File

@ -1861,7 +1861,6 @@ static int cortex_a8_examine_first(struct target *target)
int i; int i;
int retval = ERROR_OK; int retval = ERROR_OK;
uint32_t didr, ctypr, ttypr, cpuid; uint32_t didr, ctypr, ttypr, cpuid;
uint32_t dbgbase;
/* We do one extra read to ensure DAP is configured, /* We do one extra read to ensure DAP is configured,
* we call ahbap_debugport_init(swjdp) instead * we call ahbap_debugport_init(swjdp) instead
@ -1872,21 +1871,22 @@ static int cortex_a8_examine_first(struct target *target)
if (!target->dbgbase_set) if (!target->dbgbase_set)
{ {
uint32_t dbgbase;
/* Get ROM Table base */ /* Get ROM Table base */
uint32_t apid; uint32_t apid;
retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid); retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
} else
{
dbgbase = target->dbgbase;
}
/* Lookup 0x15 -- Processor DAP */ /* Lookup 0x15 -- Processor DAP */
retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15, retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15,
&armv7a->debug_base); &armv7a->debug_base);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
}
else
{
armv7a->debug_base = target->dbgbase;
}
#if 0 #if 0
/* /*