Skip to content

Commit 71f92c9

Browse files
tom-vanborneoa
authored andcommitted
target/cortex_m: call adapter_deassert_reset() only if srst is configured
Deasserting is useless if reset was not asserted except the very corner case: changed reset_config during reset processing. Change-Id: I1d1ea142980d67293daa348a2869b68ffd78d0eb Signed-off-by: Tomas Vanek <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8734 Reviewed-by: Antonio Borneo <[email protected]> Tested-by: jenkins
1 parent dcf02f4 commit 71f92c9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/target/cortex_m.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,10 +1849,12 @@ static int cortex_m_deassert_reset(struct target *target)
18491849
target_state_name(target),
18501850
target_was_examined(target) ? "" : " not");
18511851

1852+
enum reset_types jtag_reset_config = jtag_get_reset_config();
1853+
18521854
/* deassert reset lines */
1853-
adapter_deassert_reset();
1855+
if (jtag_reset_config & RESET_HAS_SRST)
1856+
adapter_deassert_reset();
18541857

1855-
enum reset_types jtag_reset_config = jtag_get_reset_config();
18561858

18571859
if ((jtag_reset_config & RESET_HAS_SRST) &&
18581860
!(jtag_reset_config & RESET_SRST_NO_GATING) &&

0 commit comments

Comments
 (0)