diff options
| author | Megan Wachs <megan@sifive.com> | 2018-05-17 16:35:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 16:35:25 -0700 |
| commit | 3344db3d0aef8f3b8c033cb2a098e9ca15e8615c (patch) | |
| tree | bdf25d2e31ece8972c75b5900e6a16d16ebbafdc | |
| parent | 06e6c2297fa6711d9a4f8914581b2b558fe1d823 (diff) | |
| parent | 802c3b4003992455a6480b0aecb48f54e84a8bfc (diff) | |
| download | riscv-openocd-3344db3d0aef8f3b8c033cb2a098e9ca15e8615c.zip riscv-openocd-3344db3d0aef8f3b8c033cb2a098e9ca15e8615c.tar.gz riscv-openocd-3344db3d0aef8f3b8c033cb2a098e9ca15e8615c.tar.bz2 | |
Merge pull request #255 from riscv/reset-unexpected-check
riscv: remove unexpected check during reset
| -rw-r--r-- | src/target/riscv/riscv-013.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index f3fe76b..b150b13 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -1644,15 +1644,12 @@ static int deassert_reset(struct target *target) char *operation; uint32_t expected_field; - uint32_t unexpected_field; if (target->reset_halt) { operation = "halt"; expected_field = DMI_DMSTATUS_ALLHALTED; - unexpected_field = DMI_DMSTATUS_ANYRUNNING; } else { operation = "run"; expected_field = DMI_DMSTATUS_ALLRUNNING; - unexpected_field = DMI_DMSTATUS_ANYHALTED; } LOG_DEBUG("Waiting for hart %d to %s out of reset.", index, operation); while (1) { @@ -1665,11 +1662,6 @@ static int deassert_reset(struct target *target) index, riscv_reset_timeout_sec); if (result != ERROR_OK) return result; - if (get_field(dmstatus, unexpected_field)) { - LOG_ERROR("Unexpected hart %d status during reset. dmstatus=0x%x", - index, dmstatus); - return ERROR_FAIL; - } if (get_field(dmstatus, expected_field)) break; if (time(NULL) - start > riscv_reset_timeout_sec) { |