Merge pull request #828 from trabucayre/fix_reset_stlinkv1

Do not issue JTAG reset on stlink-v1
stlink-org · Sep 3, 2019 · c4283f4 · c4283f4
2 parents 4909dd8 + 738e48e
commit c4283f4
Showing 1 changed file with 11 additions and 7 deletions.
diff --git 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);
     }