esp32/boards/GENERIC_S3: Merge with GENERIC_S3_{SPIRAM,SPIRAM_OCT}.

These are now variants of the GENERIC_S3 board. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
micropython · Aug 15, 2023 · afd407a · afd407a
1 parent b25a675
commit afd407a
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 98 deletions.
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
@@ -6,6 +6,7 @@
     "features": [
         "BLE",
         "External Flash",
+        "External RAM",
         "WiFi"
     ],
     "images": [
@@ -15,5 +16,8 @@
     "product": "ESP32-S3",
     "thumbnail": "",
     "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
+    "vendor": "Espressif",
+    "variants": {
+        "spiram-oct": "Support for Octal-SPIRAM"
+    }
 }
diff --git a/ports/esp32/boards/GENERIC_S3/board.md b/ports/esp32/boards/GENERIC_S3/board.md
@@ -0,0 +1,7 @@
+The following files are firmware that should work on most ESP32-S3-based
+boards with 8MiB of flash, including WROOM and MINI modules.
+
+This firmware supports configurations with and without SPIRAM (also known as
+PSRAM) and will auto-detect a connected SPIRAM chip at startup and allocate
+the MicroPython heap accordingly. However if your board has Octal SPIRAM, then
+use the "spiram-oct" variant.
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -4,5 +4,18 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
     boards/sdkconfig.ble
+    boards/sdkconfig.spiram_sx
     boards/GENERIC_S3/sdkconfig.board
 )
+
+if(MICROPY_BOARD_VARIANT STREQUAL "spiram-oct")
+    set(SDKCONFIG_DEFAULTS
+        ${SDKCONFIG_DEFAULTS}
+        boards/sdkconfig.240mhz
+        boards/sdkconfig.spiram_oct
+    )
+
+    list(APPEND MICROPY_DEF_BOARD
+        MICROPY_HW_BOARD_NAME="Generic ESP32S3 module with Octal-SPIRAM"
+    )
+endif()
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -1,4 +1,7 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S3 module"
+#ifndef MICROPY_HW_BOARD_NAME
+// Can be set by mpconfigboard.cmake.
+#define MICROPY_HW_BOARD_NAME               "Generic ESP32S3 module"
+#endif
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
 #define MICROPY_PY_MACHINE_DAC              (0)

diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board