From 2e399c94ed74a6dd09fe7e8ecf074d9df1b1491f Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <max.gerhardt@physec.de>
Date: Wed, 23 Nov 2022 12:33:48 +0100
Subject: [PATCH] Add SCORPIO and Waveshre RP2040 Zero, update Arduino-Pico

---
 boards/adafruit_feather_scorpio.json | 54 ++++++++++++++++++++++++++++
 boards/waveshare_rp2040_zero.json    | 54 ++++++++++++++++++++++++++++
 platform.json                        |  2 +-
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 boards/adafruit_feather_scorpio.json
 create mode 100644 boards/waveshare_rp2040_zero.json

diff --git a/boards/adafruit_feather_scorpio.json b/boards/adafruit_feather_scorpio.json
new file mode 100644
index 0000000..02973e9
--- /dev/null
+++ b/boards/adafruit_feather_scorpio.json
@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239A",
+        "usb_pid": "0x8121"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_SCORPIO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8121"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "adafruit_feather_scorpio"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Feather RP2040 SCORPIO",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Adafruit"
+}
diff --git a/boards/waveshare_rp2040_zero.json b/boards/waveshare_rp2040_zero.json
new file mode 100644
index 0000000..d04692f
--- /dev/null
+++ b/boards/waveshare_rp2040_zero.json
@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q16jvxq_4_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x0003"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_WAVESHARE_RP2040_ZERO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x0003"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "waveshare_rp2040_zero"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "RP2040 Zero",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Waveshare"
+}
diff --git a/platform.json b/platform.json
index a23e00b..a2cb74a 100644
--- a/platform.json
+++ b/platform.json
@@ -47,7 +47,7 @@
       "type": "framework",
       "optional": true,
       "owner": "earlephilhower",
-      "version": "https://github.com/earlephilhower/arduino-pico.git#852219caf583f0d3e5ca7fe2c9c725f0f798019a"
+      "version": "https://github.com/earlephilhower/arduino-pico.git#a7cf5cd1caf1afc8aebc8723776847227fed8966"
     },
     "tool-rp2040tools": {
       "type": "uploader",