diff options
| author | Oleksij Rempel <linux@rempel-privat.de> | 2014-01-21 20:48:14 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2014-08-19 20:17:55 +0000 |
| commit | c13ca4de40d510c7d88d8ce7a43065e8f9209c65 (patch) | |
| tree | 1491d21a57e0637f27a28042d7e94f1faa3388a7 /src/target/mips32.c | |
| parent | 91bfd9dbf2edef5373278ecf0d520dd0430de8d1 (diff) | |
| download | riscv-openocd-c13ca4de40d510c7d88d8ce7a43065e8f9209c65.zip riscv-openocd-c13ca4de40d510c7d88d8ce7a43065e8f9209c65.tar.gz riscv-openocd-c13ca4de40d510c7d88d8ce7a43065e8f9209c65.tar.bz2 | |
mips32.c: fix IB and DB bits check for EJTAG v2.0
Change-Id: I4e28dddc1d5d9c2b923ae17beacdd7f73591b1d0
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Reviewed-on: http://openocd.zylin.com/1931
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/target/mips32.c')
| -rw-r--r-- | src/target/mips32.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/target/mips32.c b/src/target/mips32.c index b05a563..795efdd 100644 --- a/src/target/mips32.c +++ b/src/target/mips32.c @@ -536,10 +536,15 @@ int mips32_configure_break_unit(struct target *target) if (retval != ERROR_OK) return retval; - /* EJTAG 2.0 does not specify EJTAG_DCR_IB and EJTAG_DCR_DB bits, - * assume IB and DB registers are always present. */ - if (ejtag_info->ejtag_version == EJTAG_VERSION_20) - dcr |= EJTAG_DCR_IB | EJTAG_DCR_DB; + /* EJTAG 2.0 defines IB and DB bits in IMP instead of DCR. + * Since these DCR bits should be reserved on EJTAG 2.0, we can + * just remap them. */ + if (ejtag_info->ejtag_version == EJTAG_VERSION_20) { + if (!(ejtag_info->impcode & EJTAG_V20_IMP_NOIB)) + dcr |= EJTAG_DCR_IB; + if (!(ejtag_info->impcode & EJTAG_V20_IMP_NODB)) + dcr |= EJTAG_DCR_DB; + } if (dcr & EJTAG_DCR_IB) { retval = mips32_configure_ibs(target); |