diff --git a/tcl/board/pico-debug.cfg b/tcl/board/pico-debug.cfg
index ba59f860a..8139663f2 100644
--- a/tcl/board/pico-debug.cfg
+++ b/tcl/board/pico-debug.cfg
@@ -6,5 +6,5 @@
 source [find interface/cmsis-dap.cfg]
 adapter speed 4000
 
-set CHIPNAME rp2040
-source [find target/rp2040-core0.cfg]
+set USE_CORE 0
+source [find target/rp2040.cfg]
diff --git a/tcl/board/pico2-debug.cfg b/tcl/board/pico2-debug.cfg
new file mode 100644
index 000000000..d0a4c6af5
--- /dev/null
+++ b/tcl/board/pico2-debug.cfg
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# pico2-debug is a virtual CMSIS-DAP debug adapter
+# it runs on the very same RP2350 target being debugged without additional hardware
+# https://github.com/majbthrd/pico2-debug
+
+source [find interface/cmsis-dap.cfg]
+adapter speed 4000
+
+set USE_CORE 0
+source [find target/rp2350.cfg]