diff --git a/boards/alksesp32.json b/boards/alksesp32.json index 44de9f1..45a1e21 100644 --- a/boards/alksesp32.json +++ b/boards/alksesp32.json @@ -30,6 +30,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 298e597..4df3c9c 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -44,6 +44,7 @@ "esptool", "ftdi", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json index 09f1d0b..018f5a5 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json index b888921..d51c037 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 0444441..e0ebe89 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 335339e..b129fac 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32thing.json b/boards/esp32thing.json index a794a68..8f891e7 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 058ab56..14ffcb9 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/espectro32.json b/boards/espectro32.json index 63b7447..4538ace 100644 --- a/boards/espectro32.json +++ b/boards/espectro32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/espino32.json b/boards/espino32.json index 6676276..894fc89 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/featheresp32.json b/boards/featheresp32.json index efde4f9..4c576c8 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index d35c990..f1d2bbc 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index 6aba02c..8aeda68 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index eae4517..054311f 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin32.json b/boards/lolin32.json index 9f58186..000d16e 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin_d32.json b/boards/lolin_d32.json index 2ff1f80..16f86c5 100644 --- a/boards/lolin_d32.json +++ b/boards/lolin_d32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/lolin_d32_pro.json b/boards/lolin_d32_pro.json index e219bc6..56810dd 100644 --- a/boards/lolin_d32_pro.json +++ b/boards/lolin_d32_pro.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 839d7d2..4ca433e 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 2660eb4..063f33f 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/node32s.json b/boards/node32s.json index a3e37d9..296ecc9 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index f1912c8..cac5326 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/pocket_32.json b/boards/pocket_32.json index 9c4c789..a54d1e7 100644 --- a/boards/pocket_32.json +++ b/boards/pocket_32.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index b1425fb..412efc6 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/wemosbat.json b/boards/wemosbat.json index 91bc766..517eb71 100644 --- a/boards/wemosbat.json +++ b/boards/wemosbat.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/boards/xinabox_cw02.json b/boards/xinabox_cw02.json index 5e2c0db..f6016ce 100644 --- a/boards/xinabox_cw02.json +++ b/boards/xinabox_cw02.json @@ -31,6 +31,7 @@ "protocols": [ "esptool", "esp-prog", + "jlink", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", diff --git a/platform.py b/platform.py index bdb7d4f..56b4d52 100644 --- a/platform.py +++ b/platform.py @@ -45,7 +45,7 @@ class Espressif32Platform(PlatformBase): debug['tools'] = {} available_tools = [ - "esp-prog", "ftdi", "minimodule", "olimex-arm-usb-tiny-h", + "esp-prog", "ftdi", "jlink", "minimodule", "olimex-arm-usb-tiny-h", "olimex-arm-usb-ocd-h", "olimex-arm-usb-ocd", "olimex-jtag-tiny" ] @@ -54,14 +54,16 @@ class Espressif32Platform(PlatformBase): if link not in upload_protocols or link in debug['tools']: continue - if link in ("esp-prog", "ftdi"): - openocd_interface = "esp32_devkitj_v1" - else: + if link == "jlink": openocd_interface = link + elif link in ("esp-prog", "ftdi"): + openocd_interface = "ftdi/esp32_devkitj_v1" + else: + openocd_interface = "ftdi/" + link server_args = [ "-s", "$PACKAGE_DIR/share/openocd/scripts", - "-f", "share/openocd/scripts/interface/ftdi/%s.cfg" % openocd_interface, + "-f", "share/openocd/scripts/interface/%s.cfg" % openocd_interface, "-f", "share/openocd/scripts/board/%s" % debug.get("openocd_board") ]