diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2020-12-02 22:04:12 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2020-12-26 15:47:48 +0000 |
| commit | ed73398eb0b4ce6db63e5cec447ab052d084261a (patch) | |
| tree | c42340153cfda11bb06a7b9625a80ec799cbcd1e /src/target | |
| parent | 722f5797069bc233c8e1b71bdab283766d6be9b3 (diff) | |
| download | riscv-openocd-ed73398eb0b4ce6db63e5cec447ab052d084261a.zip riscv-openocd-ed73398eb0b4ce6db63e5cec447ab052d084261a.tar.gz riscv-openocd-ed73398eb0b4ce6db63e5cec447ab052d084261a.tar.bz2 | |
cortex-a: fix reset on dapdirect transports
The target code for assert reset on cortex_a has been patched on
commit b0698501b0e7 ("cortex_a: fix cortex_a_assert_reset() if
srst_gates_jtag") then in cdba6ba0ad63 ("cortex_a: fix reset for
SWD transport") to workaround the mismatch between jtag and swd
implementations. See discussion for the second patch at
http://openocd.zylin.com/3641/
While all of these mismatches should hopefully be cleaned by the
reset framework rework, an extension of the workaround of the
second patch is required for dapdirect transports, either
dapdirect_swd and dapdirect_jtag.
Extend the existing workaround to all non-jtag transports.
Change-Id: Ia6a9d43bab524cbb3de4c37ce24c45f25187353d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5979
Tested-by: jenkins
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/cortex_a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index f39fd9b..d27c298 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -1681,10 +1681,10 @@ static int cortex_a_assert_reset(struct target *target) */ /* - * FIXME: fix reset when transport is SWD. This is a temporary + * FIXME: fix reset when transport is not JTAG. This is a temporary * work-around for release v0.10 that is not intended to stay! */ - if (transport_is_swd() || + if (!transport_is_jtag() || (target->reset_halt && (jtag_get_reset_config() & RESET_SRST_NO_GATING))) adapter_assert_reset(); |