diff options
| author | Michel JAOUEN <michel.jaouen@stericsson.com> | 2011-04-01 17:54:28 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-04-01 18:59:02 +0200 |
| commit | 930d70f1a3cc7db19fba2546ba2feea98a91a057 (patch) | |
| tree | 753aebc804fef7458c3da2dd66f9b39dc6e435d0 /src | |
| parent | 3b7c9585db2dd49b48123d50e9e8af7bc527be52 (diff) | |
| download | openocd+libswd-930d70f1a3cc7db19fba2546ba2feea98a91a057.tar.gz openocd+libswd-930d70f1a3cc7db19fba2546ba2feea98a91a057.tar.bz2 openocd+libswd-930d70f1a3cc7db19fba2546ba2feea98a91a057.tar.xz openocd+libswd-930d70f1a3cc7db19fba2546ba2feea98a91a057.zip | |
cortex_a: fix gaffe in first implementation of -dbgbase
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/cortex_a.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index c04804f8..033bdc16 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -1861,7 +1861,6 @@ static int cortex_a8_examine_first(struct target *target) int i; int retval = ERROR_OK; uint32_t didr, ctypr, ttypr, cpuid; - uint32_t dbgbase; /* We do one extra read to ensure DAP is configured, * we call ahbap_debugport_init(swjdp) instead @@ -1872,22 +1871,23 @@ static int cortex_a8_examine_first(struct target *target) if (!target->dbgbase_set) { + uint32_t dbgbase; /* Get ROM Table base */ uint32_t apid; retval = dap_get_debugbase(swjdp, 1, &dbgbase, &apid); if (retval != ERROR_OK) return retval; - } else + /* Lookup 0x15 -- Processor DAP */ + retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15, + &armv7a->debug_base); + if (retval != ERROR_OK) + return retval; + } + else { - dbgbase = target->dbgbase; + armv7a->debug_base = target->dbgbase; } - /* Lookup 0x15 -- Processor DAP */ - retval = dap_lookup_cs_component(swjdp, 1, dbgbase, 0x15, - &armv7a->debug_base); - if (retval != ERROR_OK) - return retval; - #if 0 /* * FIXME: assuming omap4430 |