Allow using CMSIS-DAP as upload protocol // Resolve #287

2020-11-26 21:16:12 +02:00
parent 49ef2a905c
commit 252752d7c2
201 changed files with 4154 additions and 10 deletions
--- a/boards/1bitsy_stm32f415rgt.json
+++ b/boards/1bitsy_stm32f415rgt.json
@@ -29,6 +29,7 @@
    "protocol": "blackmagic",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/afroflight_f103cb.json
+++ b/boards/afroflight_f103cb.json
@@ -26,6 +26,7 @@
    "protocol": "serial",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu",
--- a/boards/armed_v1.json
+++ b/boards/armed_v1.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/armstrap_eagle1024.json
+++ b/boards/armstrap_eagle1024.json
@@ -32,6 +32,7 @@
    "protocol": "blackmagic",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/armstrap_eagle2048.json
+++ b/boards/armstrap_eagle2048.json
@@ -32,6 +32,7 @@
    "protocol": "blackmagic",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/armstrap_eagle512.json
+++ b/boards/armstrap_eagle512.json
@@ -32,6 +32,7 @@
    "protocol": "blackmagic",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/b96b_argonkey.json
+++ b/boards/b96b_argonkey.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/b96b_f446ve.json
+++ b/boards/b96b_f446ve.json
@@ -21,6 +21,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f4",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F446x.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/b96b_neonkey.json
+++ b/boards/b96b_neonkey.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/black_f407ve.json
+++ b/boards/black_f407ve.json
@@ -33,6 +33,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/black_f407vg.json
+++ b/boards/black_f407vg.json
@@ -32,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/black_f407ze.json
+++ b/boards/black_f407ze.json
@@ -32,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/black_f407zg.json
+++ b/boards/black_f407zg.json
@@ -36,6 +36,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/blackpill_f103c8.json
+++ b/boards/blackpill_f103c8.json
@@ -47,6 +47,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/blackpill_f103c8_128.json
+++ b/boards/blackpill_f103c8_128.json
@@ -47,6 +47,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/blackpill_f401cc.json
+++ b/boards/blackpill_f401cc.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/blackpill_f401ce.json
+++ b/boards/blackpill_f401ce.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/blackpill_f411ce.json
+++ b/boards/blackpill_f411ce.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/blue_f407ve_mini.json
+++ b/boards/blue_f407ve_mini.json
@@ -32,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/bluepill_f103c6.json
+++ b/boards/bluepill_f103c6.json
@@ -43,6 +43,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/bluepill_f103c8.json
+++ b/boards/bluepill_f103c8.json
@@ -48,6 +48,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed",
--- a/boards/bluepill_f103c8_128k.json
+++ b/boards/bluepill_f103c8_128k.json
@@ -47,6 +47,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu"
--- a/boards/cloud_jam.json
+++ b/boards/cloud_jam.json
@@ -17,6 +17,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f4",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F401xE.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/cloud_jam_l4.json
+++ b/boards/cloud_jam_l4.json
@@ -15,6 +15,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_l4",
+    "openocd_target": "stm32l4x",
    "svd_path": "STM32L4x6.svd"
  },
  "frameworks": [
@@ -30,6 +31,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/coreboard_f401rc.json
+++ b/boards/coreboard_f401rc.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "hid",
--- a/boards/demo_f030f4.json
+++ b/boards/demo_f030f4.json
@@ -25,6 +25,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/disco_f030r8.json
+++ b/boards/disco_f030r8.json
@@ -16,6 +16,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f0discovery",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F030.svd"
  },
  "frameworks": [
@@ -32,6 +33,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f051r8.json
+++ b/boards/disco_f051r8.json
@@ -18,6 +18,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f0discovery",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F0xx.svd"
  },
  "frameworks": [
@@ -34,6 +35,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f072rb.json
+++ b/boards/disco_f072rb.json
@@ -40,6 +40,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f100rb.json
+++ b/boards/disco_f100rb.json
@@ -32,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f303vc.json
+++ b/boards/disco_f303vc.json
@@ -20,6 +20,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f3discovery",
+    "openocd_target": "stm32f3x",
    "svd_path": "STM32F30x.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f334c8.json
+++ b/boards/disco_f334c8.json
@@ -15,6 +15,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f334discovery",
+    "openocd_target": "stm32f3x",
    "svd_path": "STM32F334x.svd"
  },
  "frameworks": [
@@ -30,6 +31,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f401vc.json
+++ b/boards/disco_f401vc.json
@@ -15,6 +15,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f4discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F401x.svd"
  },
  "frameworks": [
@@ -30,6 +31,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f407vg.json
+++ b/boards/disco_f407vg.json
@@ -20,6 +20,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f4discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F40x.svd"
  },
  "frameworks": [
@@ -38,6 +39,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f411ve.json
+++ b/boards/disco_f411ve.json
@@ -18,6 +18,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f4discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F411xx.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f412zg.json
+++ b/boards/disco_f412zg.json
@@ -18,6 +18,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f4",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F41x.svd"
  },
  "frameworks": [
@@ -34,6 +35,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f413zh.json
+++ b/boards/disco_f413zh.json
@@ -20,6 +20,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f4discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F41x.svd"
  },
  "frameworks": [
@@ -36,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f429zi.json
+++ b/boards/disco_f429zi.json
@@ -21,6 +21,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f429discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F429x.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f469ni.json
+++ b/boards/disco_f469ni.json
@@ -21,6 +21,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f469discovery",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F46_79x.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f723ie.json
+++ b/boards/disco_f723ie.json
@@ -22,6 +22,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f7discovery",
+    "openocd_target": "stm32f7x",
    "svd_path": "STM32F7x3.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f746ng.json
+++ b/boards/disco_f746ng.json
@@ -23,6 +23,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f7discovery",
+    "openocd_target": "stm32f7x",
    "svd_path": "STM32F7x6.svd"
  },
  "frameworks": [
@@ -40,6 +41,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_f750n8.json
+++ b/boards/disco_f750n8.json
@@ -19,6 +19,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f7discovery",
+    "openocd_target": "stm32f7x",
    "svd_path": "STM32F7x.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_f769ni.json
+++ b/boards/disco_f769ni.json
@@ -22,6 +22,7 @@
      "stlink"
    ],
    "openocd_board": "stm32f7discovery",
+    "openocd_target": "stm32f7x",
    "svd_path": "STM32F7x9.svd"
  },
  "frameworks": [
@@ -38,6 +39,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_g031j6.json
+++ b/boards/disco_g031j6.json
@@ -13,6 +13,7 @@
  },
  "debug": {
    "jlink_device": "STM32G031J6",
+    "openocd_target": "stm32g0x",
    "svd_path": "STM32G031.svd"
  },
  "frameworks": [
@@ -28,6 +29,7 @@
    "protocol": "mbed",
    "protocols": [
      "blackmagic",
+      "cmsis-dap",
      "dfu",
      "jlink",
      "serial",
--- a/boards/disco_h747xi.json
+++ b/boards/disco_h747xi.json
@@ -22,6 +22,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_h743zi",
+    "openocd_target": "stm32h7x",
    "svd_path": "STM32H7x7.svd"
  },
  "frameworks": [
@@ -38,6 +39,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_l053c8.json
+++ b/boards/disco_l053c8.json
@@ -15,6 +15,7 @@
      "stlink"
    ],
    "openocd_board": "stm32l0discovery",
+    "openocd_target": "stm32l0",
    "svd_path": "STM32L053x.svd"
  },
  "frameworks": [
@@ -30,6 +31,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_l072cz_lrwan1.json
+++ b/boards/disco_l072cz_lrwan1.json
@@ -22,6 +22,7 @@
      "stlink"
    ],
    "openocd_board": "stm32l0discovery",
+    "openocd_target": "stm32l0",
    "svd_path": "STM32L07x.svd"
  },
  "frameworks": [
@@ -39,6 +40,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_l100rc.json
+++ b/boards/disco_l100rc.json
@@ -16,6 +16,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_l1",
+    "openocd_target": "stm32l1",
    "svd_path": "STM32L1xx.svd"
  },
  "frameworks": [
--- a/boards/disco_l152rb.json
+++ b/boards/disco_l152rb.json
@@ -17,6 +17,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_l1",
+    "openocd_target": "stm32l1",
    "svd_path": "STM32L1xx.svd"
  },
  "frameworks": [
@@ -32,6 +33,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/disco_l475vg_iot01a.json
+++ b/boards/disco_l475vg_iot01a.json
@@ -27,6 +27,7 @@
      "stlink"
    ],
    "openocd_board": "stm32l4discovery",
+    "openocd_target": "stm32l4x",
    "svd_path": "STM32L4x5.svd"
  },
  "frameworks": [
@@ -44,6 +45,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_l476vg.json
+++ b/boards/disco_l476vg.json
@@ -21,6 +21,7 @@
      "stlink"
    ],
    "openocd_board": "stm32l4discovery",
+    "openocd_target": "stm32l4x",
    "svd_path": "STM32L4x6.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/disco_l496ag.json
+++ b/boards/disco_l496ag.json
@@ -21,6 +21,7 @@
      "stlink"
    ],
    "openocd_board": "stm32l4discovery",
+    "openocd_target": "stm32l4x",
    "svd_path": "STM32L4x6.svd"
  },
  "frameworks": [
@@ -37,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/diymore_f407vgt.json
+++ b/boards/diymore_f407vgt.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/electrosmith_daisy.json
+++ b/boards/electrosmith_daisy.json
@@ -27,6 +27,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/elmo_f411re.json
+++ b/boards/elmo_f411re.json
@@ -12,6 +12,7 @@
    ],
    "jlink_device": "STM32F411RE",
    "openocd_board": "st_nucleo_f4",
+    "openocd_target": "stm32f4x",
    "svd_path": "STM32F411xx.svd"
  },
  "frameworks": [
@@ -27,6 +28,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/eval_f072vb.json
+++ b/boards/eval_f072vb.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/eval_f107vc.json
+++ b/boards/eval_f107vc.json
@@ -27,6 +27,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/eval_f373vc.json
+++ b/boards/eval_f373vc.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/eval_l073z.json
+++ b/boards/eval_l073z.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/fk407m1.json
+++ b/boards/fk407m1.json
@@ -29,6 +29,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/fysetc_s6.json
+++ b/boards/fysetc_s6.json
@@ -32,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103C8.json
+++ b/boards/genericSTM32F103C8.json
@@ -38,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103CB.json
+++ b/boards/genericSTM32F103CB.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103R8.json
+++ b/boards/genericSTM32F103R8.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103RB.json
+++ b/boards/genericSTM32F103RB.json
@@ -38,6 +38,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103RC.json
+++ b/boards/genericSTM32F103RC.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103RE.json
+++ b/boards/genericSTM32F103RE.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103T8.json
+++ b/boards/genericSTM32F103T8.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103TB.json
+++ b/boards/genericSTM32F103TB.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103VB.json
+++ b/boards/genericSTM32F103VB.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103VC.json
+++ b/boards/genericSTM32F103VC.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103VD.json
+++ b/boards/genericSTM32F103VD.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103VE.json
+++ b/boards/genericSTM32F103VE.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103ZC.json
+++ b/boards/genericSTM32F103ZC.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103ZD.json
+++ b/boards/genericSTM32F103ZD.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F103ZE.json
+++ b/boards/genericSTM32F103ZE.json
@@ -37,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/genericSTM32F303CB.json
+++ b/boards/genericSTM32F303CB.json
@@ -27,6 +27,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/hy_tinystm103tb.json
+++ b/boards/hy_tinystm103tb.json
@@ -37,6 +37,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial",
--- a/boards/malyanm200_f070cb.json
+++ b/boards/malyanm200_f070cb.json
@@ -28,6 +28,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/malyanm200_f103cb.json
+++ b/boards/malyanm200_f103cb.json
@@ -40,6 +40,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "serial"
--- a/boards/maple.json
+++ b/boards/maple.json
@@ -37,6 +37,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu"
--- a/boards/maple_mini_b20.json
+++ b/boards/maple_mini_b20.json
@@ -37,6 +37,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu"
--- a/boards/maple_mini_origin.json
+++ b/boards/maple_mini_origin.json
@@ -40,6 +40,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu",
--- a/boards/maple_ret6.json
+++ b/boards/maple_ret6.json
@@ -37,6 +37,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu"
--- a/boards/mbed_connect_odin.json
+++ b/boards/mbed_connect_odin.json
@@ -31,9 +31,9 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
-      "blackmagic",
-      "cmsis-dap"
+      "blackmagic"
    ]
  },
  "url": "https://os.mbed.com/platforms/mbed-Connect-Cloud/",
--- a/boards/microduino32_flash.json
+++ b/boards/microduino32_flash.json
@@ -38,6 +38,7 @@
    "protocol": "dfu",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "dfu"
--- a/boards/mkr_sharky.json
+++ b/boards/mkr_sharky.json
@@ -24,6 +24,7 @@
    "protocol": "mbed",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "blackmagic",
      "mbed",
      "serial",
--- a/boards/mote_l152rc.json
+++ b/boards/mote_l152rc.json
@@ -9,6 +9,7 @@
  "debug": {
    "jlink_device": "STM32L152RC",
    "openocd_board": "st_nucleo_l1",
+    "openocd_target": "stm32l1",
    "svd_path": "STM32L1xx.svd"
  },
  "frameworks": [
@@ -24,6 +25,7 @@
    "protocol": "mbed",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/mtb_ublox_odin_w2.json
+++ b/boards/mtb_ublox_odin_w2.json
@@ -30,6 +30,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/mts_dragonfly_f411re.json
+++ b/boards/mts_dragonfly_f411re.json
@@ -25,6 +25,7 @@
    "protocol": "mbed",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/mts_mdot_f405rg.json
+++ b/boards/mts_mdot_f405rg.json
@@ -22,6 +22,7 @@
    "protocol": "mbed",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/mts_mdot_f411re.json
+++ b/boards/mts_mdot_f411re.json
@@ -23,6 +23,7 @@
    "protocol": "mbed",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/mxchip_az3166.json
+++ b/boards/mxchip_az3166.json
@@ -40,6 +40,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic"
    ]
--- a/boards/nucleo_f030r8.json
+++ b/boards/nucleo_f030r8.json
@@ -16,6 +16,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F030.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f031k6.json
+++ b/boards/nucleo_f031k6.json
@@ -17,6 +17,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F031x.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f042k6.json
+++ b/boards/nucleo_f042k6.json
@@ -18,6 +18,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F042x.svd"
  },
  "frameworks": [
@@ -33,6 +34,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f070rb.json
+++ b/boards/nucleo_f070rb.json
@@ -15,6 +15,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F0xx.svd"
  },
  "frameworks": [
@@ -31,6 +32,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f072rb.json
+++ b/boards/nucleo_f072rb.json
@@ -20,6 +20,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F072x.svd"
  },
  "frameworks": [
@@ -36,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f091rc.json
+++ b/boards/nucleo_f091rc.json
@@ -19,6 +19,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f0",
+    "openocd_target": "stm32f0x",
    "svd_path": "STM32F091x.svd"
  },
  "frameworks": [
@@ -36,6 +37,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/boards/nucleo_f103rb.json
+++ b/boards/nucleo_f103rb.json
@@ -17,6 +17,7 @@
      "stlink"
    ],
    "openocd_board": "st_nucleo_f103rb",
+    "openocd_target": "stm32f1x",
    "svd_path": "STM32F103xx.svd"
  },
  "frameworks": [
@@ -34,6 +35,7 @@
    "protocol": "stlink",
    "protocols": [
      "jlink",
+      "cmsis-dap",
      "stlink",
      "blackmagic",
      "mbed"
--- a/Show More
+++ b/Show More