Skip to content

Commit 5dba6f2

Browse files
maxgerhardtmaxgerhardt
authored
Fix JLink device names for RP2350 in PIO boards (earlephilhower#3001)
1 parent 53583b2 commit 5dba6f2

34 files changed

+35
-35
lines changed

‎tools/json/adafruit_feather_rp2350_adalogger.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "adafruit_feather_rp2350_adalogger"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/adafruit_feather_rp2350_hstx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "adafruit_feather_rp2350_hstx"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/adafruit_fruitjam.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "adafruit_fruitjam"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/adafruit_metro_rp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "adafruit_metro_rp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/challenger_2350_bconnect.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "challenger_2350_bconnect"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/challenger_2350_wifi6_ble5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "challenger_2350_wifi6_ble5"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/cytron_iriv_io_controller.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "cytron_iriv_io_controller"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/cytron_motion_2350_pro.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "cytron_motion_2350_pro"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/datanoisetv_picoadk_v2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "datanoisetv_picoadk_v2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/generic_rp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "generic_rp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/jumperless_v5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "jumperless_v5"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/olimex_pico2xl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "olimex_pico2xl"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/olimex_pico2xxl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "olimex_pico2xxl"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/pimoroni_pga2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "pimoroni_pga2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/pimoroni_pico_plus_2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "pimoroni_pico_plus_2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/pimoroni_pico_plus_2w.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "pimoroni_pico_plus_2w"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/pimoroni_plasma2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "pimoroni_plasma2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/pimoroni_tiny2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "pimoroni_tiny2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/rpipico2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "rpipico2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/rpipico2w.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "rpipico2w"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/seeed_xiao_rp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "seeed_xiao_rp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/solderparty_rp2350_stamp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "solderparty_rp2350_stamp"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/solderparty_rp2350_stamp_xl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "solderparty_rp2350_stamp_xl"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/sparkfun_iotnode_lorawanrp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "sparkfun_iotnode_lorawanrp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/sparkfun_iotredboard_rp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "sparkfun_iotredboard_rp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/sparkfun_promicrorp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "sparkfun_promicrorp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/sparkfun_thingplusrp2350.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "sparkfun_thingplusrp2350"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/sparkfun_xrp_controller.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "sparkfun_xrp_controller"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/waveshare_rp2350_lcd_0_96.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "waveshare_rp2350_lcd_0_96"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/waveshare_rp2350_plus.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "waveshare_rp2350_plus"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/wiznet_5100s_evb_pico2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "wiznet_5100s_evb_pico2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/wiznet_5500_evb_pico2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "wiznet_5500_evb_pico2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/json/wiznet_6300_evb_pico2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"variant": "wiznet_6300_evb_pico2"
2626
},
2727
"debug": {
28-
"jlink_device": "RP2350_0",
28+
"jlink_device": "RP2350_M33_0",
2929
"openocd_target": "rp2350.cfg",
3030
"svd_path": "rp2350.svd"
3131
},

‎tools/makeboards.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,12 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
415415
elif chip == "rp2350":
416416
cpu = "cortex-m33"
417417
ramsize = 512
418-
jlink = "RP2350_0"
418+
jlink = "RP2350_M33_0"
419419
fcpu = "150000000L"
420420
elif chip == "rp2350-riscv":
421421
cpu = "riscv"
422422
ramsize = 512
423-
jlink = "RP2350_0"
423+
jlink = "RP2350_RV32_0"
424424
fcpu = "150000000L"
425425
j = {
426426
"build": {

0 commit comments

Comments
 (0)