diff --git a/boards/armstrap_eagle1024.json b/boards/armstrap_eagle1024.json
index 0fa714a4..a5cd467b 100644
--- a/boards/armstrap_eagle1024.json
+++ b/boards/armstrap_eagle1024.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_1024.ld", 
-    "mcu": "stm32f417vgt6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_1024.ld",
+    "mcu": "stm32f417vgt6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 1024", 
+  ],
+  "name": "Armstrap Eagle 1024",
   "upload": {
-    "maximum_ram_size": 196608, 
+    "maximum_ram_size": 196608,
     "maximum_size": 1048576
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
\ No newline at end of file
diff --git a/boards/armstrap_eagle2048.json b/boards/armstrap_eagle2048.json
index 090b8e07..265d03cb 100644
--- a/boards/armstrap_eagle2048.json
+++ b/boards/armstrap_eagle2048.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F427_437xx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_2048.ld", 
-    "mcu": "stm32f427vit6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F427_437xx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_2048.ld",
+    "mcu": "stm32f427vit6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 2048", 
+  ],
+  "name": "Armstrap Eagle 2048",
   "upload": {
-    "maximum_ram_size": 262144, 
+    "maximum_ram_size": 262144,
     "maximum_size": 2091752
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
\ No newline at end of file
diff --git a/boards/armstrap_eagle512.json b/boards/armstrap_eagle512.json
index 3735a8e1..08f6b363 100644
--- a/boards/armstrap_eagle512.json
+++ b/boards/armstrap_eagle512.json
@@ -1,22 +1,34 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "armstrap_eagle_512.ld", 
-    "mcu": "stm32f407vet6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "armstrap_eagle_512.ld",
+    "mcu": "stm32f407vet6",
     "variant": "stm32f4"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
+    "cmsis",
     "spl"
-  ], 
-  "name": "Armstrap Eagle 512", 
+  ],
+  "name": "Armstrap Eagle 512",
   "upload": {
-    "maximum_ram_size": 196608, 
+    "maximum_ram_size": 196608,
     "maximum_size": 524288
-  }, 
-  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://docs.armstrap.org/en/latest/hardware-overview.html",
   "vendor": "Armstrap"
 }
\ No newline at end of file
diff --git a/boards/b96b_f446ve.json b/boards/b96b_f446ve.json
index 8a6a8e10..683f4d77 100644
--- a/boards/b96b_f446ve.json
+++ b/boards/b96b_f446ve.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "168000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "168000000L",
     "mcu": "stm32f446vet6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "96Boards B96B-F446VE", 
+  ],
+  "name": "96Boards B96B-F446VE",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-B96B-F446VE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-B96B-F446VE/",
   "vendor": "96Boards"
 }
\ No newline at end of file
diff --git a/boards/bluepill_f103c8.json b/boards/bluepill_f103c8.json
index 3dfc1726..b49ad3ca 100644
--- a/boards/bluepill_f103c8.json
+++ b/boards/bluepill_f103c8.json
@@ -7,9 +7,45 @@
     "mcu": "stm32f103c8t6",
     "variant": "stm32f1"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": [
-    "mbed",
-    "arduino"
+    "arduino",
+    "mbed"
   ],
   "name": "BluePill F103C8",
   "upload": {
diff --git a/boards/disco_f030r8.json b/boards/disco_f030r8.json
new file mode 100644
index 00000000..407d1c8e
--- /dev/null
+++ b/boards/disco_f030r8.json
@@ -0,0 +1,30 @@
+{
+  "build": {
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
+    "mcu": "stm32f030r8t6"
+  },
+  "frameworks": [
+    "mbed"
+  ],
+  "name": "ST STM32F0308DISCOVERY",
+  "upload": {
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
+    "protocol": "stlink"
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/en/evaluation-tools/32f0308discovery.html",
+  "vendor": "ST"
+}
\ No newline at end of file
diff --git a/boards/disco_f051r8.json b/boards/disco_f051r8.json
index 6d0ab52c..5b0a9a38 100644
--- a/boards/disco_f051r8.json
+++ b/boards/disco_f051r8.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f051r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST STM32F0DISCOVERY", 
+  ],
+  "name": "ST STM32F0DISCOVERY",
   "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF253215",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f100rb.json b/boards/disco_f100rb.json
index b911366b..6315f033 100644
--- a/boards/disco_f100rb.json
+++ b/boards/disco_f100rb.json
@@ -1,18 +1,34 @@
 {
   "build": {
-    "cpu": "cortex-m3", 
-    "f_cpu": "24000000L", 
+    "cpu": "cortex-m3",
+    "f_cpu": "24000000L",
     "mcu": "stm32f100rbt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST STM32VLDISCOVERY", 
+  ],
+  "name": "ST STM32VLDISCOVERY",
   "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 131072, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 131072,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF250863",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f303vc.json b/boards/disco_f303vc.json
index ee3f8678..4fe6d405 100644
--- a/boards/disco_f303vc.json
+++ b/boards/disco_f303vc.json
@@ -1,25 +1,37 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F3 -DSTM32F303xC", 
-    "f_cpu": "72000000L", 
-    "ldscript": "stm32f30xx.ld", 
-    "mcu": "stm32f303vct6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F3 -DSTM32F303xC",
+    "f_cpu": "72000000L",
+    "ldscript": "stm32f30xx.ld",
+    "mcu": "stm32f303vct6",
     "variant": "stm32f303xc"
-  }, 
+  },
   "frameworks": [
-    "mbed", 
-    "cmsis", 
-    "spl", 
+    "mbed",
+    "cmsis",
+    "spl",
     "libopencm3"
-  ], 
-  "name": "ST STM32F3DISCOVERY", 
+  ],
+  "name": "ST STM32F3DISCOVERY",
   "upload": {
-    "maximum_ram_size": 49152, 
-    "maximum_size": 262144, 
+    "maximum_ram_size": 49152,
+    "maximum_size": 262144,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f3discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF254044",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f334c8.json b/boards/disco_f334c8.json
index 740fc84b..6e286d5d 100644
--- a/boards/disco_f334c8.json
+++ b/boards/disco_f334c8.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
     "mcu": "stm32f334c8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32F3348DISCOVERY", 
+  ],
+  "name": "ST 32F3348DISCOVERY",
   "upload": {
-    "maximum_ram_size": 12288, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 12288,
+    "maximum_size": 65536,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/en/catalog/tools/PF260318", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f334discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/en/catalog/tools/PF260318",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f401vc.json b/boards/disco_f401vc.json
index cc6fda1a..fe6d5b25 100644
--- a/boards/disco_f401vc.json
+++ b/boards/disco_f401vc.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "84000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "84000000L",
     "mcu": "stm32f401vct6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32F401CDISCOVERY", 
+  ],
+  "name": "ST 32F401CDISCOVERY",
   "upload": {
-    "maximum_ram_size": 65536, 
-    "maximum_size": 262144, 
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259098",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f407vg.json b/boards/disco_f407vg.json
index 400e296c..bf11be1d 100644
--- a/boards/disco_f407vg.json
+++ b/boards/disco_f407vg.json
@@ -1,25 +1,37 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F4 -DSTM32F407xx -DSTM32F40_41xxx", 
-    "f_cpu": "168000000L", 
-    "ldscript": "stm32f405x6.ld", 
-    "mcu": "stm32f407vgt6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F407xx -DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "ldscript": "stm32f405x6.ld",
+    "mcu": "stm32f407vgt6",
     "variant": "stm32f407xx"
-  }, 
+  },
   "frameworks": [
-    "mbed", 
-    "cmsis", 
-    "spl", 
+    "mbed",
+    "cmsis",
+    "spl",
     "libopencm3"
-  ], 
-  "name": "ST STM32F4DISCOVERY", 
+  ],
+  "name": "ST STM32F4DISCOVERY",
   "upload": {
-    "maximum_ram_size": 131072, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF252419",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f429zi.json b/boards/disco_f429zi.json
index ae85f908..bb15deb0 100644
--- a/boards/disco_f429zi.json
+++ b/boards/disco_f429zi.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
     "mcu": "stm32f429zit6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32F429IDISCOVERY", 
+  ],
+  "name": "ST 32F429IDISCOVERY",
   "upload": {
-    "maximum_ram_size": 262144, 
-    "maximum_size": 2097152, 
+    "maximum_ram_size": 262144,
+    "maximum_size": 2097152,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f429discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF259090",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f469ni.json b/boards/disco_f469ni.json
index 4ae7f532..b4d584ab 100644
--- a/boards/disco_f469ni.json
+++ b/boards/disco_f469ni.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
     "mcu": "stm32f469nih6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32F469IDISCOVERY", 
+  ],
+  "name": "ST 32F469IDISCOVERY",
   "upload": {
-    "maximum_ram_size": 393216, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 393216,
+    "maximum_size": 1048576,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f469discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f746ng.json b/boards/disco_f746ng.json
index 293a715f..f029d449 100644
--- a/boards/disco_f746ng.json
+++ b/boards/disco_f746ng.json
@@ -13,6 +13,18 @@
     "maximum_size": 1048576,
     "protocol": "stlink"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f7discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f746gdiscovery.html",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_f769ni.json b/boards/disco_f769ni.json
index 140cdd06..cd5e0b03 100644
--- a/boards/disco_f769ni.json
+++ b/boards/disco_f769ni.json
@@ -13,6 +13,18 @@
     "maximum_size": 1048576,
     "protocol": "2097152"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32f7discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f769idiscovery.html",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_l053c8.json b/boards/disco_l053c8.json
index c3219328..201b33b6 100644
--- a/boards/disco_l053c8.json
+++ b/boards/disco_l053c8.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
     "mcu": "stm32l053c8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32L0538DISCOVERY", 
+  ],
+  "name": "ST 32L0538DISCOVERY",
   "upload": {
-    "maximum_ram_size": 8192, 
-    "maximum_size": 65536, 
+    "maximum_ram_size": 8192,
+    "maximum_size": 65536,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/en/catalog/tools/PF260319", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32l0discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/en/catalog/tools/PF260319",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_l152rb.json b/boards/disco_l152rb.json
index e5fe908c..0bfd804f 100644
--- a/boards/disco_l152rb.json
+++ b/boards/disco_l152rb.json
@@ -1,24 +1,36 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m3", 
-    "extra_flags": "-DSTM32L1 -DSTM32L152xB -DSTM32L1XX_MD", 
-    "f_cpu": "32000000L", 
-    "ldscript": "stm32l15xx6.ld", 
-    "mcu": "stm32l152rbt6", 
+    "core": "stm32",
+    "cpu": "cortex-m3",
+    "extra_flags": "-DSTM32L1 -DSTM32L152xB -DSTM32L1XX_MD",
+    "f_cpu": "32000000L",
+    "ldscript": "stm32l15xx6.ld",
+    "mcu": "stm32l152rbt6",
     "variant": "stm32l152xb"
-  }, 
+  },
   "frameworks": [
-    "cmsis", 
-    "spl", 
+    "cmsis",
+    "spl",
     "libopencm3"
-  ], 
-  "name": "ST STM32LDISCOVERY", 
+  ],
+  "name": "ST STM32LDISCOVERY",
   "upload": {
-    "maximum_ram_size": 16384, 
-    "maximum_size": 131072, 
+    "maximum_ram_size": 16384,
+    "maximum_size": 131072,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/LN1848/PF258515",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/disco_l476vg.json b/boards/disco_l476vg.json
index 25c20744..ff2f9d47 100644
--- a/boards/disco_l476vg.json
+++ b/boards/disco_l476vg.json
@@ -1,18 +1,30 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
     "mcu": "stm32l476vgt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST 32L476GDISCOVERY", 
+  ],
+  "name": "ST 32L476GDISCOVERY",
   "upload": {
-    "maximum_ram_size": 131072, 
-    "maximum_size": 1048576, 
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
     "protocol": "stlink"
-  }, 
-  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF261635", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/stm32l4discovery.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF261635",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/elmo_f411re.json b/boards/elmo_f411re.json
index ce9051ac..6f9a3995 100644
--- a/boards/elmo_f411re.json
+++ b/boards/elmo_f411re.json
@@ -12,6 +12,17 @@
     "maximum_ram_size": 131072,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/Espotel-ELMO/",
   "vendor": "Espotel"
 }
diff --git a/boards/genericSTM32F103C8.json b/boards/genericSTM32F103C8.json
index 93d7c869..7433e64c 100644
--- a/boards/genericSTM32F103C8.json
+++ b/boards/genericSTM32F103C8.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103c8",
     "variant": "generic_stm32f103c"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103C8 (20k RAM. 64k Flash)",
   "upload": {
diff --git a/boards/genericSTM32F103CB.json b/boards/genericSTM32F103CB.json
index 7132a0b5..7a2e3e62 100644
--- a/boards/genericSTM32F103CB.json
+++ b/boards/genericSTM32F103CB.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103cb",
     "variant": "generic_stm32f103c"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103CB (20k RAM. 128k Flash)",
   "upload": {
diff --git a/boards/genericSTM32F103R8.json b/boards/genericSTM32F103R8.json
index 878c4787..77050911 100644
--- a/boards/genericSTM32F103R8.json
+++ b/boards/genericSTM32F103R8.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103r8",
     "variant": "generic_stm32f103r8"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103R8 (20k RAM. 64 Flash)",
   "upload": {
diff --git a/boards/genericSTM32F103RB.json b/boards/genericSTM32F103RB.json
index 5d3a3bc4..a87b47dd 100644
--- a/boards/genericSTM32F103RB.json
+++ b/boards/genericSTM32F103RB.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103rb",
     "variant": "generic_stm32f103r8"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103RB (20k RAM. 128k Flash)",
   "upload": {
diff --git a/boards/genericSTM32F103RC.json b/boards/genericSTM32F103RC.json
index ca3d9ca7..fd8a2dea 100644
--- a/boards/genericSTM32F103RC.json
+++ b/boards/genericSTM32F103RC.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103rc",
     "variant": "generic_stm32f103r"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103RC (48k RAM. 256k Flash)",
   "upload": {
diff --git a/boards/genericSTM32F103RE.json b/boards/genericSTM32F103RE.json
index d8b0cdf6..e157ff97 100644
--- a/boards/genericSTM32F103RE.json
+++ b/boards/genericSTM32F103RE.json
@@ -12,6 +12,42 @@
     "mcu": "stm32f103re",
     "variant": "generic_stm32f103r"
   },
+  "debug": {
+    "tools": {
+      "stlink-v2": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        },
+        "default": true
+      },
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f1x.cfg"
+          ]
+        }
+      },
+      "blackmagic": {
+        "hwids": [
+          [
+            "0x1d50",
+            "0x6018"
+          ]
+        ],
+        "require_debug_port": true
+      }
+    }
+  },
   "frameworks": ["arduino"],
   "name": "STM32F103RE (64k RAM. 512k Flash)",
   "upload": {
diff --git a/boards/mote_l152rc.json b/boards/mote_l152rc.json
index c8ded703..6b14374d 100644
--- a/boards/mote_l152rc.json
+++ b/boards/mote_l152rc.json
@@ -12,6 +12,17 @@
     "maximum_ram_size": 32768,
     "maximum_size": 262144
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        }
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/NAMote-72/",
   "vendor": "Semtech"
 }
\ No newline at end of file
diff --git a/boards/mts_dragonfly_f411re.json b/boards/mts_dragonfly_f411re.json
index d81741d5..d643fc94 100644
--- a/boards/mts_dragonfly_f411re.json
+++ b/boards/mts_dragonfly_f411re.json
@@ -12,6 +12,17 @@
     "maximum_ram_size": 131072,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/MTS-Dragonfly/",
   "vendor": "MultiTech"
 }
\ No newline at end of file
diff --git a/boards/mts_mdot_f405rg.json b/boards/mts_mdot_f405rg.json
index ecf7d3d1..a701e292 100644
--- a/boards/mts_mdot_f405rg.json
+++ b/boards/mts_mdot_f405rg.json
@@ -12,6 +12,17 @@
     "maximum_ram_size": 131072,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/",
   "vendor": "MultiTech"
 }
\ No newline at end of file
diff --git a/boards/mts_mdot_f411re.json b/boards/mts_mdot_f411re.json
index 2d018550..7135aca9 100644
--- a/boards/mts_mdot_f411re.json
+++ b/boards/mts_mdot_f411re.json
@@ -1,17 +1,28 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
     "mcu": "stm32f411ret6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "MultiTech mDot F411", 
+  ],
+  "name": "MultiTech mDot F411",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/MTS-mDot-F411/",
   "vendor": "MultiTech"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f030r8.json b/boards/nucleo_f030r8.json
index e1f65cd3..3232eb49 100644
--- a/boards/nucleo_f030r8.json
+++ b/boards/nucleo_f030r8.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f030r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F030R8", 
+  ],
+  "name": "ST Nucleo F030R8",
   "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
     "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F030R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F030R8/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f031k6.json b/boards/nucleo_f031k6.json
index b48a90b0..fc211511 100644
--- a/boards/nucleo_f031k6.json
+++ b/boards/nucleo_f031k6.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f031k6t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F031K6", 
+  ],
+  "name": "ST Nucleo F031K6",
   "upload": {
-    "maximum_ram_size": 4096, 
+    "maximum_ram_size": 4096,
     "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F031K6/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F031K6/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f042k6.json b/boards/nucleo_f042k6.json
index 4ac05379..f1972691 100644
--- a/boards/nucleo_f042k6.json
+++ b/boards/nucleo_f042k6.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f042k6t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F042K6", 
+  ],
+  "name": "ST Nucleo F042K6",
   "upload": {
-    "maximum_ram_size": 6144, 
+    "maximum_ram_size": 6144,
     "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F042K6/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F042K6/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f070rb.json b/boards/nucleo_f070rb.json
index 982e5b8d..63c61e23 100644
--- a/boards/nucleo_f070rb.json
+++ b/boards/nucleo_f070rb.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f070rbt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F070RB", 
+  ],
+  "name": "ST Nucleo F070RB",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F070RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F070RB/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f072rb.json b/boards/nucleo_f072rb.json
index 776bac2b..9debe6d2 100644
--- a/boards/nucleo_f072rb.json
+++ b/boards/nucleo_f072rb.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f072rbt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F072RB", 
+  ],
+  "name": "ST Nucleo F072RB",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F072RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F072RB/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f091rc.json b/boards/nucleo_f091rc.json
index b99d30bb..53238988 100644
--- a/boards/nucleo_f091rc.json
+++ b/boards/nucleo_f091rc.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32f091rct6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F091RC", 
+  ],
+  "name": "ST Nucleo F091RC",
   "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
     "maximum_size": 262144
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F091RC/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f0.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F091RC/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f103rb.json b/boards/nucleo_f103rb.json
index 4be7dff4..34421960 100644
--- a/boards/nucleo_f103rb.json
+++ b/boards/nucleo_f103rb.json
@@ -1,21 +1,33 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m3", 
-    "f_cpu": "72000000L", 
-    "ldscript": "stm32f103xb.ld", 
-    "mcu": "stm32f103rbt6", 
+    "core": "stm32",
+    "cpu": "cortex-m3",
+    "f_cpu": "72000000L",
+    "ldscript": "stm32f103xb.ld",
+    "mcu": "stm32f103rbt6",
     "variant": "stm32f1"
-  }, 
+  },
   "frameworks": [
-    "mbed", 
+    "mbed",
     "libopencm3"
-  ], 
-  "name": "ST Nucleo F103RB", 
+  ],
+  "name": "ST Nucleo F103RB",
   "upload": {
-    "maximum_ram_size": 20480, 
+    "maximum_ram_size": 20480,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F103RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f103rb.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F103RB/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f207zg.json b/boards/nucleo_f207zg.json
index d91fdb3b..7f0794a9 100644
--- a/boards/nucleo_f207zg.json
+++ b/boards/nucleo_f207zg.json
@@ -13,6 +13,22 @@
     "maximum_ram_size": 131072,
     "maximum_size": 1048576
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f2x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F207ZG/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f302r8.json b/boards/nucleo_f302r8.json
index fe140367..b21b76c9 100644
--- a/boards/nucleo_f302r8.json
+++ b/boards/nucleo_f302r8.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
     "mcu": "stm32f302r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F302R8", 
+  ],
+  "name": "ST Nucleo F302R8",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F302R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F302R8/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f303k8.json b/boards/nucleo_f303k8.json
index d1529bf6..a65bbd7b 100644
--- a/boards/nucleo_f303k8.json
+++ b/boards/nucleo_f303k8.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
     "mcu": "stm32f303k8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F303K8", 
+  ],
+  "name": "ST Nucleo F303K8",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303K8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303K8/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f303re.json b/boards/nucleo_f303re.json
index 96405b19..197b3c04 100644
--- a/boards/nucleo_f303re.json
+++ b/boards/nucleo_f303re.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
     "mcu": "stm32f303ret6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F303RE", 
+  ],
+  "name": "ST Nucleo F303RE",
   "upload": {
-    "maximum_ram_size": 65536, 
+    "maximum_ram_size": 65536,
     "maximum_size": 524288
-  }, 
-  "url": "http://developer.mbed.org/platforms/ST-Nucleo-F303RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "http://developer.mbed.org/platforms/ST-Nucleo-F303RE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f303ze.json b/boards/nucleo_f303ze.json
index 371cece5..1da5e056 100644
--- a/boards/nucleo_f303ze.json
+++ b/boards/nucleo_f303ze.json
@@ -12,6 +12,18 @@
     "maximum_ram_size": 65536,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303ZE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f334r8.json b/boards/nucleo_f334r8.json
index 6e9df5cf..d329903c 100644
--- a/boards/nucleo_f334r8.json
+++ b/boards/nucleo_f334r8.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "72000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "72000000L",
     "mcu": "stm32f334r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F334R8", 
+  ],
+  "name": "ST Nucleo F334R8",
   "upload": {
-    "maximum_ram_size": 16384, 
+    "maximum_ram_size": 16384,
     "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F334R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f3.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F334R8/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f401re.json b/boards/nucleo_f401re.json
index b31da803..fb47298c 100644
--- a/boards/nucleo_f401re.json
+++ b/boards/nucleo_f401re.json
@@ -1,23 +1,35 @@
 {
   "build": {
-    "core": "stm32", 
-    "cpu": "cortex-m4", 
-    "extra_flags": "-DSTM32F4 -DSTM32F401xE -DSTM32F40_41xxx", 
-    "f_cpu": "84000000L", 
-    "ldscript": "stm32f401xe.ld", 
-    "mcu": "stm32f401ret6", 
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F401xE -DSTM32F40_41xxx",
+    "f_cpu": "84000000L",
+    "ldscript": "stm32f401xe.ld",
+    "mcu": "stm32f401ret6",
     "variant": "stm32f401xe"
-  }, 
+  },
   "frameworks": [
-    "mbed", 
-    "cmsis", 
+    "mbed",
+    "cmsis",
     "spl"
-  ], 
-  "name": "ST Nucleo F401RE", 
+  ],
+  "name": "ST Nucleo F401RE",
   "upload": {
-    "maximum_ram_size": 98304, 
+    "maximum_ram_size": 98304,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F401RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F401RE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f410rb.json b/boards/nucleo_f410rb.json
index 015e7d22..9fa25228 100644
--- a/boards/nucleo_f410rb.json
+++ b/boards/nucleo_f410rb.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
     "mcu": "stm32f410rbt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F410RB", 
+  ],
+  "name": "ST Nucleo F410RB",
   "upload": {
-    "maximum_ram_size": 32768, 
+    "maximum_ram_size": 32768,
     "maximum_size": 131072
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F410RB/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F410RB/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f411re.json b/boards/nucleo_f411re.json
index 7fa6fe8f..299d9078 100644
--- a/boards/nucleo_f411re.json
+++ b/boards/nucleo_f411re.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "100000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "100000000L",
     "mcu": "stm32f411ret6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F411RE", 
+  ],
+  "name": "ST Nucleo F411RE",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F411RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F411RE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f429zi.json b/boards/nucleo_f429zi.json
index f1422473..555750e5 100644
--- a/boards/nucleo_f429zi.json
+++ b/boards/nucleo_f429zi.json
@@ -12,6 +12,18 @@
     "maximum_ram_size": 262144,
     "maximum_size": 2097152
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F429ZI/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f446re.json b/boards/nucleo_f446re.json
index 786ffa8a..7b2c6653 100644
--- a/boards/nucleo_f446re.json
+++ b/boards/nucleo_f446re.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "180000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "180000000L",
     "mcu": "stm32f446ret6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo F446RE", 
+  ],
+  "name": "ST Nucleo F446RE",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446RE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f446ze.json b/boards/nucleo_f446ze.json
index b10f6b51..a5c6e19f 100644
--- a/boards/nucleo_f446ze.json
+++ b/boards/nucleo_f446ze.json
@@ -12,6 +12,18 @@
     "maximum_ram_size": 131072,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f746zg.json b/boards/nucleo_f746zg.json
index 046ac06a..23b10290 100644
--- a/boards/nucleo_f746zg.json
+++ b/boards/nucleo_f746zg.json
@@ -12,6 +12,22 @@
     "maximum_ram_size": 327680,
     "maximum_size": 1048576
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f7x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F446ZE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_f767zi.json b/boards/nucleo_f767zi.json
index bf7f6b0c..f55b5401 100644
--- a/boards/nucleo_f767zi.json
+++ b/boards/nucleo_f767zi.json
@@ -12,6 +12,22 @@
     "maximum_ram_size": 524288,
     "maximum_size": 2097152
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32f7x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-F767ZI/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l011k4.json b/boards/nucleo_l011k4.json
index 16e9fa0f..c8c820ce 100644
--- a/boards/nucleo_l011k4.json
+++ b/boards/nucleo_l011k4.json
@@ -12,6 +12,22 @@
     "maximum_ram_size": 2048,
     "maximum_size": 16384
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ST-Nucleo-L011K4/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l031k6.json b/boards/nucleo_l031k6.json
index 9edb404a..d56ebef4 100644
--- a/boards/nucleo_l031k6.json
+++ b/boards/nucleo_l031k6.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
     "mcu": "stm32l031k6t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L031K6", 
+  ],
+  "name": "ST Nucleo L031K6",
   "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
     "maximum_size": 32768
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L031K6/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L031K6/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l053r8.json b/boards/nucleo_l053r8.json
index e300bf12..1e78cd99 100644
--- a/boards/nucleo_l053r8.json
+++ b/boards/nucleo_l053r8.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m0", 
-    "f_cpu": "48000000L", 
+    "cpu": "cortex-m0",
+    "f_cpu": "48000000L",
     "mcu": "stm32l053r8t6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L053R8", 
+  ],
+  "name": "ST Nucleo L053R8",
   "upload": {
-    "maximum_ram_size": 8192, 
+    "maximum_ram_size": 8192,
     "maximum_size": 65536
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L053R8/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L053R8/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l073rz.json b/boards/nucleo_l073rz.json
index 7be0932a..43d5d3e4 100644
--- a/boards/nucleo_l073rz.json
+++ b/boards/nucleo_l073rz.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m0plus", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m0plus",
+    "f_cpu": "32000000L",
     "mcu": "stm32l073rz"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L073RZ", 
+  ],
+  "name": "ST Nucleo L073RZ",
   "upload": {
-    "maximum_ram_size": 20480, 
+    "maximum_ram_size": 20480,
     "maximum_size": 196608
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L073RZ/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32l0.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L073RZ/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l152re.json b/boards/nucleo_l152re.json
index bbb3279d..1c67e176 100644
--- a/boards/nucleo_l152re.json
+++ b/boards/nucleo_l152re.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m3", 
-    "f_cpu": "32000000L", 
+    "cpu": "cortex-m3",
+    "f_cpu": "32000000L",
     "mcu": "stm32l152ret6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L152RE", 
+  ],
+  "name": "ST Nucleo L152RE",
   "upload": {
-    "maximum_ram_size": 81920, 
+    "maximum_ram_size": 81920,
     "maximum_size": 524288
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L152RE/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l1.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L152RE/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/nucleo_l432kc.json b/boards/nucleo_l432kc.json
index 9cf73298..a8a4c5c1 100644
--- a/boards/nucleo_l432kc.json
+++ b/boards/nucleo_l432kc.json
@@ -1,17 +1,33 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
     "mcu": "stm32l432kcu6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L432KC", 
+  ],
+  "name": "ST Nucleo L432KC",
   "upload": {
-    "maximum_ram_size": 65536, 
+    "maximum_ram_size": 65536,
     "maximum_size": 262144
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L432KC/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/interface/stlink-v2-1.cfg",
+            "-c", "transport select hla_swd",
+            "-f", "scripts/target/stm32l4x.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L432KC/",
   "vendor": "ST"
 }
diff --git a/boards/nucleo_l476rg.json b/boards/nucleo_l476rg.json
index ca51eff3..62229c81 100644
--- a/boards/nucleo_l476rg.json
+++ b/boards/nucleo_l476rg.json
@@ -1,17 +1,29 @@
 {
   "build": {
-    "cpu": "cortex-m4", 
-    "f_cpu": "80000000L", 
+    "cpu": "cortex-m4",
+    "f_cpu": "80000000L",
     "mcu": "stm32l476rgt6"
-  }, 
+  },
   "frameworks": [
     "mbed"
-  ], 
-  "name": "ST Nucleo L476RG", 
+  ],
+  "name": "ST Nucleo L476RG",
   "upload": {
-    "maximum_ram_size": 131072, 
+    "maximum_ram_size": 131072,
     "maximum_size": 1048576
-  }, 
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/", 
+  },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_l476rg.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
+  "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/",
   "vendor": "ST"
 }
\ No newline at end of file
diff --git a/boards/seeedArchMax.json b/boards/seeedArchMax.json
index 6bfff053..a779b33e 100644
--- a/boards/seeedArchMax.json
+++ b/boards/seeedArchMax.json
@@ -12,6 +12,18 @@
     "maximum_ram_size": 196608,
     "maximum_size": 524288
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        },
+        "onboard": true
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/Seeed-Arch-Max/",
   "vendor": "SeeedStudio"
 }
\ No newline at end of file
diff --git a/boards/ublox_evk_odin_w2.json b/boards/ublox_evk_odin_w2.json
index 3e2efb7a..10c86828 100644
--- a/boards/ublox_evk_odin_w2.json
+++ b/boards/ublox_evk_odin_w2.json
@@ -12,6 +12,17 @@
     "maximum_ram_size": 262144,
     "maximum_size": 2097152
   },
+  "debug": {
+    "tools": {
+      "stlink-v2-1": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": ["-f", "scripts/board/st_nucleo_f4.cfg"]
+        }
+      }
+    }
+  },
   "url": "https://developer.mbed.org/platforms/ublox-EVK-ODIN-W2/",
   "vendor": "u-blox"
 }
\ No newline at end of file
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
index 966bd396..b08b673d 100644
--- a/builder/frameworks/arduino.py
+++ b/builder/frameworks/arduino.py
@@ -24,7 +24,7 @@
 
 from os.path import isdir, join
 
-from SCons.Script import DefaultEnvironment
+from SCons.Script import COMMAND_LINE_TARGETS, DefaultEnvironment
 
 env = DefaultEnvironment()
 platform = env.PioPlatform()
@@ -92,6 +92,13 @@
 else:
     env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8000000)])
 
+
+if "__debug" in COMMAND_LINE_TARGETS:
+    env.Append(CPPDEFINES=[
+        "SERIAL_USB", "GENERIC_BOOTLOADER",
+        ("CONFIG_MAPLE_MINI_NO_DISABLE_DEBUG", "1")
+    ])
+
 #
 # Lookup for specific core's libraries
 #
diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
index 10e1c2ef..99c2b360 160000
--- a/builder/frameworks/mbed
+++ b/builder/frameworks/mbed
@@ -1 +1 @@
-Subproject commit 10e1c2efc4260363278104004b41e781a4083432
+Subproject commit 99c2b3604e4c91bb3af647e1ee678c0f334c7ee1
diff --git a/builder/main.py b/builder/main.py
index e057e551..d597dc24 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -25,6 +25,7 @@
     AS="arm-none-eabi-as",
     CC="arm-none-eabi-gcc",
     CXX="arm-none-eabi-g++",
+    GDB="arm-none-eabi-gdb",
     OBJCOPY="arm-none-eabi-objcopy",
     RANLIB="arm-none-eabi-ranlib",
     SIZETOOL="arm-none-eabi-size",
diff --git a/platform.json b/platform.json
index 38646b7c..974e44d4 100644
--- a/platform.json
+++ b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-ststm32.git"
   },
-  "version": "1.8.1",
+  "version": "2.0.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -73,12 +73,17 @@
     "tool-stlink": {
       "type": "uploader",
       "optional": true,
-      "version": "~1.10200.0"
+      "version": "~1.10301.0"
     },
     "tool-stm32duino": {
       "type": "uploader",
       "optional": true,
       "version": "~1.0.0"
+    },
+    "tool-openocd": {
+      "type": "debugger",
+      "optional": true,
+      "version": "~1.1000.0"
     }
   }
 }