Add Waveshare RP2350 Plus (#3000)

* Add Waveshare RP2350 Plus

* Refactor to use flash size menu

Replaces separate board entries for Waveshare RP2350 Plus 4MB and 16MB variants with a flash size menu.

Author: shubham0x13

README.md

@@ -115,6 +115,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Waveshare RP2040 LCD 1.28
 * Waveshare RP2040 Matrix
 * Waveshare RP2040 PiZero
+* Waveshare RP2350 Plus
 * Waveshare RP2350 LCD 0.96
 * WIZnet W5100S-EVB-Pico
 * WIZnet W5100S-EVB-Pico2

boards.txt

@@ -374,6 +374,9 @@
                   {
                      "name": "Waveshare RP2040 LCD 1.28"
                   },
+                  {
+                     "name": "Waveshare RP2350 Plus"
+                  },
                   {
                      "name": "Waveshare RP2350 LCD 0.96"
                   },

package/package_pico_index.template.json

@@ -0,0 +1,56 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "none.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x10B1"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": "-DARDUINO_WAVESHARE_RP2350_PLUS -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x10B1"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "waveshare_rp2350_plus"
+    },
+    "debug": {
+        "jlink_device": "RP2350_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "arduino",
+        "picosdk"
+    ],
+    "name": "RP2350 Plus",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 4194304,
+        "require_upload_port": true,
+        "native_usb": true,
+        "use_1200bps_touch": true,
+        "wait_for_upload_port": false,
+        "protocol": "picotool",
+        "protocols": [
+            "blackmagic",
+            "cmsis-dap",
+            "jlink",
+            "raspberrypi-swd",
+            "picotool",
+            "picoprobe"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Waveshare"
+}

tools/json/waveshare_rp2350_plus.json

@@ -327,7 +327,7 @@ def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine,
         tup = "riscv32-unknown-elf"
         opts = "-march=rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb -mabi=ilp32"
     else:
-        raise Exception("Unknown board type " + str(chip));
+        raise Exception("Unknown board type " + str(chip))
     BuildHeader(name, chip, tup, opts, vendor_name, product_name, vid, pid, pwr, boarddefine, name, flashsizemb * 1024 * 1024, psramsize, boot2, extra)
     if (name == "generic") or (name == "generic_rp2350") or (name == "vccgnd_yd_rp2040"):
         smfs =  [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
@@ -350,6 +350,9 @@ def MakeBoard(name, chip, vendor_name, product_name, vid, pid, pwr, boarddefine,
         BuildCountry(name)
         BuildFlashMenu(name, chip, 8*1024*1024, [0, 7*1024*1024, 4*1024*1024, 2*1024*1024])
         BuildFlashMenu(name, chip, 16*1024*1024, [0, 15*1024*1024, 14*1024*1024, 12*1024*1024, 8*1024*1024, 4*1024*1024, 2*1024*1024])
+    elif name == "waveshare_rp2350_plus":
+        BuildFlashMenu(name, chip, 4*1024*1024, [*smallfs, 1024*1024, 2*1024*1024, 3*1024*1024])
+        BuildFlashMenu(name, chip, 16*1024*1024, [0, 15*1024*1024, 14*1024*1024, 12*1024*1024, 8*1024*1024, 4*1024*1024, 2*1024*1024])
     else:
         BuildFlashMenu(name, chip, flashsizemb * 1024 * 1024, fssizelist)
     if (chip == "rp2350") or (chip == "rp2350-riscv"):
@@ -693,6 +696,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
 MakeBoard("waveshare_rp2040_plus_16mb", "rp2040", "Waveshare", "RP2040 Plus 16MB", "0x2e8a", "0x1020", 500, "WAVESHARE_RP2040_PLUS", 16, 0, "boot2_w25q080_2_padded_checksum")
 MakeBoard("waveshare_rp2040_lcd_0_96", "rp2040", "Waveshare", "RP2040 LCD 0.96", "0x2e8a", "0x1021", 500, "WAVESHARE_RP2040_LCD_0_96", 2, 0, "boot2_w25q16jvxq_4_padded_checksum")
 MakeBoard("waveshare_rp2040_lcd_1_28", "rp2040", "Waveshare", "RP2040 LCD 1.28", "0x2e8a", "0x1039", 500, "WAVESHARE_RP2040_LCD_1_28", 2, 0, "boot2_w25q16jvxq_4_padded_checksum")
+MakeBoard("waveshare_rp2350_plus", "rp2350", "Waveshare", "RP2350 Plus", "0x2e8a", "0x10B1", 500, "WAVESHARE_RP2350_PLUS", 4, 0, "none")
 MakeBoard("waveshare_rp2350_lcd_0_96", "rp2350", "Waveshare", "RP2350 LCD 0.96", "0x2e8a", "0x10B7", 500, "WAVESHARE_RP2350_LCD_0_96", 4, 0, "none")
 
 # WIZnet

tools/makeboards.py

@@ -0,0 +1,73 @@
+#pragma once
+
+// Waveshare RP2350 Plus
+// https://www.waveshare.com/wiki/RP2350-Plus
+// https://files.waveshare.com/wiki/RP2350-Plus/RP2350_Plus.pdf
+// https://www.waveshare.com/w/upload/3/3c/680px-RP2350-Plus-details-inter.jpg
+//
+
+/*
+                  Pin#                Pin#
+                       ___(_____)___
+           GPIO0   1  |   *USB C*   | 40   VBUS
+           GPIO1   2  |             | 39   VSYS
+             GND   3  |             | 38   GND
+           GPIO2   4  |             | 37   3V3_EN
+           GPIO3   5  |             | 36   3V3(OUT)
+           GPIO4   6  |             | 35   ADC_VREF
+           GPIO5   7  |             | 34   GPIO28
+             GND   8  |             | 33   GND
+           GPIO6   9  |             | 32   GPIO27
+           GPIO7  10  |             | 31   GPIO26
+           GPIO8  11  |             | 30   RUN
+           GPIO9  12  |             | 29   GPIO22
+             GND  13  |             | 28   GND
+          GPIO10  14  |             | 27   GPIO21
+          GPIO11  15  |             | 25   GPIO20
+          GPIO12  16  |             | 25   GPIO19
+          GPIO13  17  |             | 24   GPIO18
+             GND  18  |             | 23   GND
+          GPIO14  19  |             | 22   GPIO17
+          GPIO15  20  |____|_|_|____| 21   GPIO16
+                           S G S
+                           W N W
+                           C D D
+                           L   I
+                           K   N
+*/
+
+#define PICO_RP2350A 1
+
+// LEDs
+#define PIN_LED (25u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+#define PIN_SERIAL2_TX (8u)
+#define PIN_SERIAL2_RX (9u)
+
+// SPI
+#define PIN_SPI0_MISO (16u)
+#define PIN_SPI0_MOSI (19u)
+#define PIN_SPI0_SCK (18u)
+#define PIN_SPI0_SS (17u)
+
+#define PIN_SPI1_MISO (12u)
+#define PIN_SPI1_MOSI (15u)
+#define PIN_SPI1_SCK (14u)
+#define PIN_SPI1_SS (13u)
+
+// Wire
+#define PIN_WIRE0_SDA (8u)
+#define PIN_WIRE0_SCL (9u)
+
+#define PIN_WIRE1_SDA (6u)
+#define PIN_WIRE1_SCL (7u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY (2u)
+#define WIRE_HOWMANY (2u)
+
+#include "../generic/common.h"