Fix JLink device names for RP2350 in PIO boards (#3001)

maxgerhardt · web-flow · commit 5dba6f2d1c51 · 2025-06-19T18:30:37.000-07:00
diff --git a/tools/json/adafruit_feather_rp2350_adalogger.json b/tools/json/adafruit_feather_rp2350_adalogger.json
@@ -25,7 +25,7 @@
         "variant": "adafruit_feather_rp2350_adalogger"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/adafruit_feather_rp2350_hstx.json b/tools/json/adafruit_feather_rp2350_hstx.json
@@ -25,7 +25,7 @@
         "variant": "adafruit_feather_rp2350_hstx"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/adafruit_fruitjam.json b/tools/json/adafruit_fruitjam.json
@@ -25,7 +25,7 @@
         "variant": "adafruit_fruitjam"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/adafruit_metro_rp2350.json b/tools/json/adafruit_metro_rp2350.json
@@ -25,7 +25,7 @@
         "variant": "adafruit_metro_rp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/challenger_2350_bconnect.json b/tools/json/challenger_2350_bconnect.json
@@ -25,7 +25,7 @@
         "variant": "challenger_2350_bconnect"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/challenger_2350_wifi6_ble5.json b/tools/json/challenger_2350_wifi6_ble5.json
@@ -25,7 +25,7 @@
         "variant": "challenger_2350_wifi6_ble5"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/cytron_iriv_io_controller.json b/tools/json/cytron_iriv_io_controller.json
@@ -25,7 +25,7 @@
         "variant": "cytron_iriv_io_controller"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/cytron_motion_2350_pro.json b/tools/json/cytron_motion_2350_pro.json
@@ -25,7 +25,7 @@
         "variant": "cytron_motion_2350_pro"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/datanoisetv_picoadk_v2.json b/tools/json/datanoisetv_picoadk_v2.json
@@ -25,7 +25,7 @@
         "variant": "datanoisetv_picoadk_v2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/generic_rp2350.json b/tools/json/generic_rp2350.json
@@ -25,7 +25,7 @@
         "variant": "generic_rp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/jumperless_v5.json b/tools/json/jumperless_v5.json
@@ -25,7 +25,7 @@
         "variant": "jumperless_v5"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/olimex_pico2xl.json b/tools/json/olimex_pico2xl.json
@@ -25,7 +25,7 @@
         "variant": "olimex_pico2xl"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/olimex_pico2xxl.json b/tools/json/olimex_pico2xxl.json
@@ -25,7 +25,7 @@
         "variant": "olimex_pico2xxl"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/pimoroni_pga2350.json b/tools/json/pimoroni_pga2350.json
@@ -25,7 +25,7 @@
         "variant": "pimoroni_pga2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/pimoroni_pico_plus_2.json b/tools/json/pimoroni_pico_plus_2.json
@@ -25,7 +25,7 @@
         "variant": "pimoroni_pico_plus_2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/pimoroni_pico_plus_2w.json b/tools/json/pimoroni_pico_plus_2w.json
@@ -25,7 +25,7 @@
         "variant": "pimoroni_pico_plus_2w"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/pimoroni_plasma2350.json b/tools/json/pimoroni_plasma2350.json
@@ -25,7 +25,7 @@
         "variant": "pimoroni_plasma2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/pimoroni_tiny2350.json b/tools/json/pimoroni_tiny2350.json
@@ -25,7 +25,7 @@
         "variant": "pimoroni_tiny2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/rpipico2.json b/tools/json/rpipico2.json
@@ -25,7 +25,7 @@
         "variant": "rpipico2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/rpipico2w.json b/tools/json/rpipico2w.json
@@ -25,7 +25,7 @@
         "variant": "rpipico2w"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/seeed_xiao_rp2350.json b/tools/json/seeed_xiao_rp2350.json
@@ -25,7 +25,7 @@
         "variant": "seeed_xiao_rp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/solderparty_rp2350_stamp.json b/tools/json/solderparty_rp2350_stamp.json
@@ -25,7 +25,7 @@
         "variant": "solderparty_rp2350_stamp"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/solderparty_rp2350_stamp_xl.json b/tools/json/solderparty_rp2350_stamp_xl.json
@@ -25,7 +25,7 @@
         "variant": "solderparty_rp2350_stamp_xl"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/sparkfun_iotnode_lorawanrp2350.json b/tools/json/sparkfun_iotnode_lorawanrp2350.json
@@ -25,7 +25,7 @@
         "variant": "sparkfun_iotnode_lorawanrp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/sparkfun_iotredboard_rp2350.json b/tools/json/sparkfun_iotredboard_rp2350.json
@@ -25,7 +25,7 @@
         "variant": "sparkfun_iotredboard_rp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/sparkfun_promicrorp2350.json b/tools/json/sparkfun_promicrorp2350.json
@@ -25,7 +25,7 @@
         "variant": "sparkfun_promicrorp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/sparkfun_thingplusrp2350.json b/tools/json/sparkfun_thingplusrp2350.json
@@ -25,7 +25,7 @@
         "variant": "sparkfun_thingplusrp2350"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/sparkfun_xrp_controller.json b/tools/json/sparkfun_xrp_controller.json
@@ -25,7 +25,7 @@
         "variant": "sparkfun_xrp_controller"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/waveshare_rp2350_lcd_0_96.json b/tools/json/waveshare_rp2350_lcd_0_96.json
@@ -25,7 +25,7 @@
         "variant": "waveshare_rp2350_lcd_0_96"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/waveshare_rp2350_plus.json b/tools/json/waveshare_rp2350_plus.json
@@ -25,7 +25,7 @@
         "variant": "waveshare_rp2350_plus"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/wiznet_5100s_evb_pico2.json b/tools/json/wiznet_5100s_evb_pico2.json
@@ -25,7 +25,7 @@
         "variant": "wiznet_5100s_evb_pico2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/wiznet_5500_evb_pico2.json b/tools/json/wiznet_5500_evb_pico2.json
@@ -25,7 +25,7 @@
         "variant": "wiznet_5500_evb_pico2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/json/wiznet_6300_evb_pico2.json b/tools/json/wiznet_6300_evb_pico2.json
@@ -25,7 +25,7 @@
         "variant": "wiznet_6300_evb_pico2"
     },
     "debug": {
-        "jlink_device": "RP2350_0",
+        "jlink_device": "RP2350_M33_0",
         "openocd_target": "rp2350.cfg",
         "svd_path": "rp2350.svd"
     },
diff --git a/tools/makeboards.py b/tools/makeboards.py
@@ -415,12 +415,12 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
     elif chip == "rp2350":
         cpu = "cortex-m33"
         ramsize = 512
-        jlink = "RP2350_0"
+        jlink = "RP2350_M33_0"
         fcpu = "150000000L"
     elif chip == "rp2350-riscv":
         cpu = "riscv"
         ramsize = 512
-        jlink = "RP2350_0"
+        jlink = "RP2350_RV32_0"
         fcpu = "150000000L"
     j = {
     "build": {
