X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fstm32_stlink.c;h=9afaae0bfc383acabafce477ea5b6cdc085c8f1a;hp=f9daa014a0de3851093b19b4dec497c2e839169a;hb=bb3793c9a4ccd232c4ee3ce0a36bf200589ca0bb;hpb=cc4a934d37136dfedfdceeee35aa016e8e781f14

diff --git a/src/target/stm32_stlink.c b/src/target/stm32_stlink.c
index f9daa014a0..9afaae0bfc 100644
--- a/src/target/stm32_stlink.c
+++ b/src/target/stm32_stlink.c
@@ -278,6 +278,7 @@ static int stm32_stlink_init_arch_info(struct target *target,
 	armv7m->store_core_reg_u32 = stm32_stlink_store_core_reg_u32;
 
 	armv7m->examine_debug_reason = stm32_stlink_examine_debug_reason;
+	armv7m->stlink = true;
 
 	return ERROR_OK;
 }
@@ -406,7 +407,7 @@ static int stm32_stlink_poll(struct target *target)
 
 static int stm32_stlink_assert_reset(struct target *target)
 {
-	int res;
+	int res = ERROR_OK;
 	struct stlink_interface_s *stlink_if = target_to_stlink(target);
 	struct armv7m_common *armv7m = target_to_armv7m(target);
 	bool use_srst_fallback = true;
@@ -415,12 +416,22 @@ static int stm32_stlink_assert_reset(struct target *target)
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
 
+	bool srst_asserted = false;
+
+	if (jtag_reset_config & RESET_SRST_NO_GATING) {
+		jtag_add_reset(0, 1);
+		res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0);
+		srst_asserted = true;
+	}
+
 	stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DHCSR, DBGKEY|C_DEBUGEN);
 	stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DEMCR, VC_CORERESET);
 
 	if (jtag_reset_config & RESET_HAS_SRST) {
-		jtag_add_reset(0, 1);
-		res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0);
+		if (!srst_asserted) {
+			jtag_add_reset(0, 1);
+			res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0);
+		}
 		if (res == ERROR_COMMAND_NOTFOUND)
 			LOG_ERROR("Hardware srst not supported, falling back to software reset");
 		else if (res == ERROR_OK) {