From 05928d2aab51df3f2ec2ace6ef5d9739615aadd1 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 30 Apr 2017 16:36:21 +0300 Subject: [PATCH] Do not override reset config for OCD --- boards/bluepill_f103c8.json | 6 ++---- boards/disco_f100rb.json | 3 +-- boards/genericSTM32F103C8.json | 6 ++---- boards/genericSTM32F103CB.json | 6 ++---- boards/genericSTM32F103R8.json | 6 ++---- boards/genericSTM32F103RB.json | 6 ++---- boards/genericSTM32F103RC.json | 6 ++---- boards/genericSTM32F103RE.json | 6 ++---- boards/nucleo_f207zg.json | 3 +-- boards/nucleo_f746zg.json | 3 +-- boards/nucleo_f767zi.json | 3 +-- boards/nucleo_l011k4.json | 3 +-- boards/nucleo_l031k6.json | 3 +-- boards/nucleo_l053r8.json | 3 +-- boards/nucleo_l073rz.json | 3 +-- boards/nucleo_l432kc.json | 3 +-- 16 files changed, 23 insertions(+), 46 deletions(-) diff --git a/boards/bluepill_f103c8.json b/boards/bluepill_f103c8.json index 6a380af..b49ad3c 100644 --- a/boards/bluepill_f103c8.json +++ b/boards/bluepill_f103c8.json @@ -16,8 +16,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -29,8 +28,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/disco_f100rb.json b/boards/disco_f100rb.json index 816e565..6315f03 100644 --- a/boards/disco_f100rb.json +++ b/boards/disco_f100rb.json @@ -22,8 +22,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32f1x.cfg" ] }, "onboard": true diff --git a/boards/genericSTM32F103C8.json b/boards/genericSTM32F103C8.json index 0c817b6..7433e64 100644 --- a/boards/genericSTM32F103C8.json +++ b/boards/genericSTM32F103C8.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/genericSTM32F103CB.json b/boards/genericSTM32F103CB.json index cc8c8a3..7a2e3e6 100644 --- a/boards/genericSTM32F103CB.json +++ b/boards/genericSTM32F103CB.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/genericSTM32F103R8.json b/boards/genericSTM32F103R8.json index 7ed94a0..7705091 100644 --- a/boards/genericSTM32F103R8.json +++ b/boards/genericSTM32F103R8.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/genericSTM32F103RB.json b/boards/genericSTM32F103RB.json index 340d3a2..a87b47d 100644 --- a/boards/genericSTM32F103RB.json +++ b/boards/genericSTM32F103RB.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/genericSTM32F103RC.json b/boards/genericSTM32F103RC.json index 8a23a7d..fd8a2de 100644 --- a/boards/genericSTM32F103RC.json +++ b/boards/genericSTM32F103RC.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/genericSTM32F103RE.json b/boards/genericSTM32F103RE.json index 57f61dd..e157ff9 100644 --- a/boards/genericSTM32F103RE.json +++ b/boards/genericSTM32F103RE.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] }, "default": true @@ -34,8 +33,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f1x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f1x.cfg" ] } }, diff --git a/boards/nucleo_f207zg.json b/boards/nucleo_f207zg.json index c3ce662..7f0794a 100644 --- a/boards/nucleo_f207zg.json +++ b/boards/nucleo_f207zg.json @@ -22,8 +22,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f2x.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32f2x.cfg" ] }, "onboard": true diff --git a/boards/nucleo_f746zg.json b/boards/nucleo_f746zg.json index 4ab659d..23b1029 100644 --- a/boards/nucleo_f746zg.json +++ b/boards/nucleo_f746zg.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f7x.cfg", - "-c", "reset_config srst_nogate" + "-f", "scripts/target/stm32f7x.cfg" ] }, "onboard": true diff --git a/boards/nucleo_f767zi.json b/boards/nucleo_f767zi.json index 6cf7d5a..f55b540 100644 --- a/boards/nucleo_f767zi.json +++ b/boards/nucleo_f767zi.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32f7x.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32f7x.cfg" ] }, "onboard": true diff --git a/boards/nucleo_l011k4.json b/boards/nucleo_l011k4.json index 360edab..c8c820c 100644 --- a/boards/nucleo_l011k4.json +++ b/boards/nucleo_l011k4.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32l0.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32l0.cfg" ] }, "onboard": true diff --git a/boards/nucleo_l031k6.json b/boards/nucleo_l031k6.json index 0add012..d56ebef 100644 --- a/boards/nucleo_l031k6.json +++ b/boards/nucleo_l031k6.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32l0.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32l0.cfg" ] }, "onboard": true diff --git a/boards/nucleo_l053r8.json b/boards/nucleo_l053r8.json index 1eb02e4..1e78cd9 100644 --- a/boards/nucleo_l053r8.json +++ b/boards/nucleo_l053r8.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32l0.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32l0.cfg" ] }, "onboard": true diff --git a/boards/nucleo_l073rz.json b/boards/nucleo_l073rz.json index 2884fab..43d5d3e 100644 --- a/boards/nucleo_l073rz.json +++ b/boards/nucleo_l073rz.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32l0.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32l0.cfg" ] }, "onboard": true diff --git a/boards/nucleo_l432kc.json b/boards/nucleo_l432kc.json index 91c4330..a8a4c5c 100644 --- a/boards/nucleo_l432kc.json +++ b/boards/nucleo_l432kc.json @@ -21,8 +21,7 @@ "arguments": [ "-f", "scripts/interface/stlink-v2-1.cfg", "-c", "transport select hla_swd", - "-f", "scripts/target/stm32l4x.cfg", - "-c", "reset_config srst_only" + "-f", "scripts/target/stm32l4x.cfg" ] }, "onboard": true