From 6a4f0a7342502324cb0882b216a466ca8393a004 Mon Sep 17 00:00:00 2001
From: EngineerWill <eng33@waveshare.com>
Date: Wed, 1 Jul 2026 17:18:00 +0800
Subject: [PATCH] esp32/boards: Add WAVESHARE_ESP32_S3_PICO board
 configuration.

Signed-off-by: eng33 <eng33@waveshare.com>
---
 .../boards/WAVESHARE_ESP32_S3_PICO/board.json | 23 ++++++++++++++
 .../boards/WAVESHARE_ESP32_S3_PICO/board.md   |  1 +
 .../mpconfigboard.cmake                       |  5 +++
 .../WAVESHARE_ESP32_S3_PICO/mpconfigboard.h   |  8 +++++
 .../boards/WAVESHARE_ESP32_S3_PICO/pins.csv   | 31 +++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.json
 create mode 100644 ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.md
 create mode 100644 ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.h
 create mode 100644 ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/pins.csv

diff --git a/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.json b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.json
new file mode 100644
index 00000000000..3739e9bc5dd
--- /dev/null
+++ b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "deploy_options": {
+        "flash_offset": "0"
+    },
+    "docs": "",
+    "features": [
+        "BLE",
+        "External Flash",
+        "External RAM",
+        "WiFi"
+    ],
+    "images": [
+        "generic_s3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "Waveshare ESP32-S3-Pico",
+    "thumbnail": "",
+    "url": "https://www.waveshare.com/ESP32-S3-Pico.htm",
+    "vendor": "Waveshare"
+}
diff --git a/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.md b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.md
new file mode 100644
index 00000000000..8cd6324e798
--- /dev/null
+++ b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/board.md
@@ -0,0 +1 @@
+The following files are firmware for the Waveshare ESP32-S3-Pico.
diff --git a/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.cmake b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.cmake
new file mode 100644
index 00000000000..53375032304
--- /dev/null
+++ b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+include(boards/mpconfigboard_esp32s3_common.cmake)
+
+list(APPEND SDKCONFIG_DEFAULTS
+    boards/sdkconfig.flash_qio_80m
+)
diff --git a/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.h b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.h
new file mode 100644
index 00000000000..0f20a49a60d
--- /dev/null
+++ b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/mpconfigboard.h
@@ -0,0 +1,8 @@
+#define MICROPY_HW_BOARD_NAME               "Waveshare ESP32-S3-Pico"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3"
+
+#define MICROPY_HW_I2C0_SCL                 (7)
+#define MICROPY_HW_I2C0_SDA                 (6)
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
diff --git a/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/pins.csv b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/pins.csv
new file mode 100644
index 00000000000..7e601b96429
--- /dev/null
+++ b/ports/esp32/boards/WAVESHARE_ESP32_S3_PICO/pins.csv
@@ -0,0 +1,31 @@
+D0,GPIO11
+D1,GPIO12
+D2,GPIO13
+D3,GPIO14
+D4,GPIO15
+D5,GPIO16
+D6,GPIO17
+D7,GPIO18
+D8,GPIO33
+D9,GPIO34
+D10,GPIO35
+D11,GPIO36
+D12,GPIO37
+D13,GPIO38
+D14,GPIO39
+D15,GPIO40
+D16,GPIO42
+D17,GPIO41
+D18,GPIO1
+D19,GPIO2
+D20,GPIO4
+D21,GPIO5
+D22,GPIO6
+D26,GPIO7
+D27,GPIO8
+D28,GPIO9
+A1,GPIO7
+A2,GPIO8
+A3,GPIO9
+RGB_PIN,GPIO21
+USB_ADC,GPIO3