From 738e48eed576d4d36aa5ea8950f2c274ddc54777 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 2 Sep 2019 14:35:35 +0200 Subject: [PATCH] Do not issue JTAG reset on stlink-v1 --- src/tools/flash.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/tools/flash.c b/src/tools/flash.c index 768e983..b926a8f 100644 --- a/src/tools/flash.c +++ b/src/tools/flash.c @@ -92,9 +92,11 @@ int main(int ac, char** av) } if (o.reset){ - if (stlink_jtag_reset(sl, 2)) { - printf("Failed to reset JTAG\n"); - goto on_error; + if (sl->version.stlink_v > 1) { + if (stlink_jtag_reset(sl, 2)) { + printf("Failed to reset JTAG\n"); + goto on_error; + } } if (stlink_reset(sl)) { @@ -185,9 +187,11 @@ int main(int ac, char** av) } } else if (o.cmd == CMD_RESET) { - if (stlink_jtag_reset(sl, 2)) { - printf("Failed to reset JTAG\n"); - goto on_error; + if (sl->version.stlink_v > 1) { + if (stlink_jtag_reset(sl, 2)) { + printf("Failed to reset JTAG\n"); + goto on_error; + } } if (stlink_reset(sl)) { @@ -212,7 +216,7 @@ int main(int ac, char** av) } if (o.reset){ - stlink_jtag_reset(sl,2); + if (sl->version.stlink_v > 1) stlink_jtag_reset(sl, 2); stlink_reset(sl); }