Start adding picoprobe as debug tool

boards/nanorp2040connect.json

@@ -48,7 +48,8 @@
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
-      "picotool"
+      "picotool",
+      "picoprobe"
     ]
   },
   "url": "https://blog.arduino.cc/2021/01/20/welcome-raspberry-pi-to-the-world-of-microcontrollers/",

boards/pico.json

@@ -44,7 +44,8 @@
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
-      "picotool"
+      "picotool",
+      "picoprobe"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

builder/main.py

@@ -356,15 +356,25 @@ elif upload_protocol in debug_tools:
         openocd_args.extend(
             ["-c", "adapter speed %s" % env.GetProjectOption("debug_speed")]
         )
-    openocd_args.extend([
-        "-c", "program {$SOURCE} %s verify reset; shutdown;" %
-        board.get("upload.offset_address", "")
-    ])
+    if "uploadfs" in COMMAND_LINE_TARGETS:
+        # filesystem upload. use FS_START.
+        openocd_args.extend([
+            "-c", "program {$SOURCE} ${hex(FS_START)} verify reset; shutdown;"
+        ])
+    else:
+        # normal firmware upload. flash starts at 0x10000000
+        openocd_args.extend([
+            "-c", "program {$SOURCE} %s verify reset; shutdown;" %
+            board.get("upload.offset_address", "0x10000000")
+        ])
     openocd_args = [
         f.replace("$PACKAGE_DIR", platform.get_package_dir(
             "tool-openocd-raspberrypi") or "")
         for f in openocd_args
     ]
+    # use ELF file for upload, not bin (target_firm). otherwise needs
+    # offset 0x10000000
+    #upload_source = target_elf
     env.Replace(
         UPLOADER="openocd",
         UPLOADERFLAGS=openocd_args,

platform.py

@@ -85,7 +85,7 @@ class RaspberrypiPlatform(PlatformBase):
         if "tools" not in debug:
             debug["tools"] = {}
 
-        for link in ("cmsis-dap", "jlink", "raspberrypi-swd"):
+        for link in ("cmsis-dap", "jlink", "raspberrypi-swd", "picoprobe"):
             if link not in upload_protocols or link in debug["tools"]:
                 continue