From ac51448c460a5a8ac35a58c6e3eb435f2501f677 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 13 Oct 2020 23:27:15 +0200
Subject: [PATCH 1/2] Removed experimental debugger definitions

---
 boards.txt   | 11 -----------
 platform.txt | 10 ----------
 2 files changed, 21 deletions(-)

diff --git a/boards.txt b/boards.txt
index 7be76ca6c..91adede0d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -20,7 +20,6 @@ arduino_zero_edbg.name=Arduino Zero (Programming Port)
 arduino_zero_edbg.vid.0=0x03eb
 arduino_zero_edbg.pid.0=0x2157
 
-arduino_zero_edbg.debug.tool=gdb-openocd
 arduino_zero_edbg.upload.tool=openocd
 arduino_zero_edbg.upload.protocol=sam-ba
 arduino_zero_edbg.upload.maximum_size=262144
@@ -91,7 +90,6 @@ mkr1000.pid.2=0x824e
 mkr1000.vid.3=0x2341
 mkr1000.pid.3=0x024e
 
-mkr1000.debug.tool=gdb-openocd
 mkr1000.upload.tool=bossac
 mkr1000.upload.protocol=sam-ba
 mkr1000.upload.maximum_size=262144
@@ -122,7 +120,6 @@ mkrzero.pid.0=0x804f
 mkrzero.vid.1=0x2341
 mkrzero.pid.1=0x004f
 
-mkrzero.debug.tool=gdb-openocd
 mkrzero.upload.tool=bossac
 mkrzero.upload.protocol=sam-ba
 mkrzero.upload.maximum_size=262144
@@ -153,7 +150,6 @@ mkrwifi1010.pid.0=0x8054
 mkrwifi1010.vid.1=0x2341
 mkrwifi1010.pid.1=0x0054
 
-mkrwifi1010.debug.tool=gdb-openocd
 mkrwifi1010.upload.tool=bossac
 mkrwifi1010.upload.protocol=sam-ba
 mkrwifi1010.upload.maximum_size=262144
@@ -185,7 +181,6 @@ nano_33_iot.pid.0=0x8057
 nano_33_iot.vid.1=0x2341
 nano_33_iot.pid.1=0x0057
 
-nano_33_iot.debug.tool=gdb-openocd
 nano_33_iot.upload.tool=bossac
 nano_33_iot.upload.protocol=sam-ba
 nano_33_iot.upload.maximum_size=262144
@@ -216,7 +211,6 @@ mkrfox1200.pid.0=0x8050
 mkrfox1200.vid.1=0x2341
 mkrfox1200.pid.1=0x0050
 
-mkrfox1200.debug.tool=gdb-openocd
 mkrfox1200.upload.tool=bossac
 mkrfox1200.upload.protocol=sam-ba
 mkrfox1200.upload.maximum_size=262144
@@ -247,7 +241,6 @@ mkrwan1300.pid.0=0x8053
 mkrwan1300.vid.1=0x2341
 mkrwan1300.pid.1=0x0053
 
-mkrwan1300.debug.tool=gdb-openocd
 mkrwan1300.upload.tool=bossac
 mkrwan1300.upload.protocol=sam-ba
 mkrwan1300.upload.maximum_size=262144
@@ -278,7 +271,6 @@ mkrwan1310.pid.0=0x8059
 mkrwan1310.vid.1=0x2341
 mkrwan1310.pid.1=0x0059
 
-mkrwan1310.debug.tool=gdb-openocd
 mkrwan1310.upload.tool=bossac
 mkrwan1310.upload.protocol=sam-ba
 mkrwan1310.upload.maximum_size=262144
@@ -309,7 +301,6 @@ mkrgsm1400.pid.0=0x8052
 mkrgsm1400.vid.1=0x2341
 mkrgsm1400.pid.1=0x0052
 
-mkrgsm1400.debug.tool=gdb-openocd
 mkrgsm1400.upload.tool=bossac
 mkrgsm1400.upload.protocol=sam-ba
 mkrgsm1400.upload.maximum_size=262144
@@ -340,7 +331,6 @@ mkrnb1500.pid.0=0x8055
 mkrnb1500.vid.1=0x2341
 mkrnb1500.pid.1=0x0055
 
-mkrnb1500.debug.tool=gdb-openocd
 mkrnb1500.upload.tool=bossac
 mkrnb1500.upload.protocol=sam-ba
 mkrnb1500.upload.maximum_size=262144
@@ -371,7 +361,6 @@ mkrvidor4000.pid.0=0x8056
 mkrvidor4000.vid.1=0x2341
 mkrvidor4000.pid.1=0x0056
 
-mkrvidor4000.debug.tool=gdb-openocd
 mkrvidor4000.upload.tool=bossacI
 mkrvidor4000.upload.protocol=sam-ba
 mkrvidor4000.upload.maximum_size=262144
diff --git a/platform.txt b/platform.txt
index 7c0b73992..1aeef21a7 100644
--- a/platform.txt
+++ b/platform.txt
@@ -227,13 +227,3 @@ tools.openocd-withbootsize.bootloader.params.verbose=-d2
 tools.openocd-withbootsize.bootloader.params.quiet=-d0
 tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
 
-#
-# GDB (Debugger)
-#
-# EXPERIMENTAL feature: debug.pattern
-#  - this is alpha and may be subject to change without notice
-tools.gdb-openocd.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
-tools.gdb-openocd.cmd=arm-none-eabi-gdb
-tools.gdb-openocd.cmd.windows=arm-none-eabi-gdb.exe
-tools.gdb-openocd.interpreter=console
-tools.gdb-openocd.debug.pattern="{path}/{cmd}" --interpreter={interpreter} -ex "set remotetimeout 5" -ex "set pagination off" -ex 'target extended-remote | "{tools.openocd.path}/{tools.openocd.cmd}" -s "{tools.openocd.path}/share/openocd/scripts/" --file "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "gdb_port pipe" -c "telnet_port 0"' "{build.path}/{build.project_name}.elf"

From ebac2b46414e7f2556ef131dfb2640c96f4905ee Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 1 Dec 2020 10:29:07 +0100
Subject: [PATCH 2/2] Upgrades for debugging support on arduino-cli (alpha)

---
 platform.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/platform.txt b/platform.txt
index 1aeef21a7..b778776bf 100644
--- a/platform.txt
+++ b/platform.txt
@@ -120,6 +120,20 @@ recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build
 recipe.size.regex=^(?:\.text|\.data|)\s+([0-9]+).*
 recipe.size.regex.data=^(?:\.data|\.bss)\s+([0-9]+).*
 
+
+# Debugger configuration (general options)
+# ----------------------------------------
+# EXPERIMENTAL feature:
+#  - this is alpha and may be subject to change without notice
+debug.executable={build.path}/{build.project_name}.elf
+debug.toolchain=gcc
+debug.toolchain.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
+debug.toolchain.prefix=arm-none-eabi-
+debug.server=openocd
+debug.server.openocd.path={runtime.tools.openocd-0.10.0-arduino7.path}/bin/openocd
+debug.server.openocd.scripts_dir={runtime.tools.openocd-0.10.0-arduino7.path}/share/openocd/scripts/
+debug.server.openocd.script={runtime.platform.path}/variants/{build.variant}/{build.openocdscript}
+
 # Upload/Debug tools
 # ------------------