Automatically generate known debug tools and upload protocols

boards/alksesp32.json

@@ -27,18 +27,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 115200
   },

boards/d-duino-32.json

@@ -1,49 +1,36 @@
 {
-    "build": {
+  "build": {
-      "core": "esp32",
+    "core": "esp32",
-      "extra_flags": "-DARDUINO_D_DUINO_32",
+    "extra_flags": "-DARDUINO_D_DUINO_32",
-      "f_cpu": "240000000L",
+    "f_cpu": "240000000L",
-      "f_flash": "40000000L",
+    "f_flash": "40000000L",
-      "flash_mode": "dio",
+    "flash_mode": "dio",
-      "ldscript": "esp32_out.ld",
+    "ldscript": "esp32_out.ld",
-      "mcu": "esp32",
+    "mcu": "esp32",
-      "variant": "d-duino-32"
+    "variant": "d-duino-32"
-    },
+  },
-    "connectivity": [
+  "connectivity": [
-      "wifi",
+    "wifi",
-      "bluetooth",
+    "bluetooth",
-      "ethernet",
+    "ethernet",
-      "can"
+    "can"
-    ],
+  ],
-    "debug": {
+  "debug": {
-      "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp-wroom-32.cfg"
-    },
+  },
-    "frameworks": [
+  "frameworks": [
-      "arduino",
+    "arduino",
-      "espidf"
+    "espidf"
-    ],
+  ],
-    "name": "D-duino-32",
+  "name": "D-duino-32",
-    "upload": {
+  "upload": {
-      "flash_size": "4MB",
+    "flash_size": "4MB",
-      "maximum_ram_size": 327680,
+    "maximum_ram_size": 327680,
-      "maximum_size": 4194304,
+    "maximum_size": 4194304,
-      "protocol": "esptool",
+    "protocol": "esptool",
-      "protocols": [
+    "require_upload_port": true,
-        "esptool",
+    "speed": 921600
-        "esp-prog",
+  },
-        "jlink",
+  "url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/",
-        "olimex-arm-usb-tiny-h",
+  "vendor": "DSTIKE"
-        "olimex-arm-usb-ocd-h",
+}
-        "olimex-arm-usb-ocd",
-        "olimex-jtag-tiny",
-        "iot-bus-jtag",
-        "tumpa",
-        "minimodule"
-      ],
-      "require_upload_port": true,
-      "speed": 921600
-    },
-    "url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/",
-    "vendor": "DSTIKE"
-  }
-  

boards/esp-wrover-kit.json

@@ -40,16 +40,7 @@
     "protocol": "esptool",
     "protocols": [
       "esptool",
-      "ftdi",
+      "ftdi"
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
     ],
     "require_upload_port": true,
     "speed": 921600

boards/esp32-evb.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32-gateway.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32-pro.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp320.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32dev.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32doit-devkit-v1.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32thing.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/esp32vn-iot-uno.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/espea32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/espectro32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 2000000
   },

boards/espino32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/featheresp32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/firebeetle32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/heltec_wifi_kit_32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/heltec_wifi_lora_32.json

@@ -28,15 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/hornbill32dev.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/hornbill32minima.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/intorobot.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/iotbusio.json

@@ -29,18 +29,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/iotbusproteus.json

@@ -29,18 +29,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/lolin32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/lolin_d32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/lolin_d32_pro.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/lopy.json

@@ -1,4 +1,4 @@
-
+{
   "build": {
     "core": "esp32",
     "extra_flags": "-DARDUINO_LoPy",
@@ -28,15 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/lopy4.json

@@ -28,15 +28,6 @@
     "maximum_ram_size": 1310720,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/m5stack-core-esp32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/m5stack-fire.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/mhetesp32devkit.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/mhetesp32minikit.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/microduino-core-esp32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 2000000
   },

boards/nano32.json

@@ -27,9 +27,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/nina_w10.json

@@ -26,9 +26,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 2097152,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/node32s.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/nodemcu-32s.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/odroid_esp32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/onehorse32dev.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/pico32.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/pocket_32.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/quantum.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/ttgo-lora32-v1.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/wemosbat.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/widora-air.json

@@ -25,9 +25,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
     "protocol": "esptool",
-    "protocols": [
-      "esptool"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

boards/xinabox_cw02.json

@@ -28,18 +28,6 @@
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
     "protocol": "esptool",
-    "protocols": [
-      "esptool",
-      "esp-prog",
-      "jlink",
-      "olimex-arm-usb-tiny-h",
-      "olimex-arm-usb-ocd-h",
-      "olimex-arm-usb-ocd",
-      "olimex-jtag-tiny",
-      "iot-bus-jtag",
-      "tumpa",
-      "minimodule"
-    ],
     "require_upload_port": true,
     "speed": 921600
   },

platform.py

@@ -38,13 +38,29 @@ class Espressif32Platform(PlatformBase):
 
     def _add_default_debug_tools(self, board):
         debug = board.manifest.get("debug", {})
-
+        upload_protocol = board.manifest.get("upload", {}).get("protocol")
         upload_protocols = board.manifest.get("upload", {}).get(
             "protocols", [])
         if "tools" not in debug:
             debug['tools'] = {}
 
         non_debug_protocols = ["esptool"]
+        supported_debu_tools = [
+          "esp-prog",
+          "iot-bus-jtag",
+          "jlink",
+          "minimodule",
+          "olimex-arm-usb-tiny-h",
+          "olimex-arm-usb-ocd-h",
+          "olimex-arm-usb-ocd",
+          "olimex-jtag-tiny",
+          "tumpa"
+        ]
+        if debug:
+            upload_protocols.extend(supported_debu_tools)
+
+        if upload_protocol and upload_protocol not in upload_protocols:
+            upload_protocols.append(upload_protocol)
 
         # Only FTDI based debug probes
         for link in upload_protocols: