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>

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"
+    }
 }

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.

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()

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)

ports/esp32/boards/GENERIC_S3_SPIRAM/board.json

@@ -1,19 +0,0 @@
-{
-    "deploy": [
-        "../deploy_s3.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "images": [
-        "generic_s3.jpg"
-    ],
-    "mcu": "esp32s3",
-    "product": "Generic ESP32-S3 (SPIRAM)",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}

ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake

@@ -1,9 +0,0 @@
-set(IDF_TARGET esp32s3)
-
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.usb
-    boards/sdkconfig.ble
-    boards/sdkconfig.spiram_sx
-    boards/GENERIC_S3_SPIRAM/sdkconfig.board
-)

ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h

@@ -1,10 +0,0 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram)"
-#define MICROPY_HW_MCU_NAME                 "ESP32S3"
-
-#define MICROPY_PY_MACHINE_DAC              (0)
-
-// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
-#define MICROPY_HW_ENABLE_UART_REPL         (1)
-
-#define MICROPY_HW_I2C0_SCL                 (9)
-#define MICROPY_HW_I2C0_SDA                 (8)

ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board

@@ -1,9 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"

ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json

@@ -1,19 +0,0 @@
-{
-    "deploy": [
-        "../deploy_s3.md"
-    ],
-    "docs": "",
-    "features": [
-        "BLE",
-        "External Flash",
-        "WiFi"
-    ],
-    "images": [
-        "generic_s3.jpg"
-    ],
-    "mcu": "esp32s3",
-    "product": "Generic ESP32-S3 (SPIRAM Octal)",
-    "thumbnail": "",
-    "url": "https://www.espressif.com/en/products/modules",
-    "vendor": "Espressif"
-}

ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake

@@ -1,11 +0,0 @@
-set(IDF_TARGET esp32s3)
-
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    boards/sdkconfig.usb
-    boards/sdkconfig.ble
-    boards/sdkconfig.240mhz
-    boards/sdkconfig.spiram_sx
-    boards/sdkconfig.spiram_oct
-    boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
-)

ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h

@@ -1,10 +0,0 @@
-#define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram octal)"
-#define MICROPY_HW_MCU_NAME                 "ESP32S3"
-
-#define MICROPY_PY_MACHINE_DAC              (0)
-
-// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
-#define MICROPY_HW_ENABLE_UART_REPL         (1)
-
-#define MICROPY_HW_I2C0_SCL                 (9)
-#define MICROPY_HW_I2C0_SDA                 (8)

ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board

@@ -1,9 +0,0 @@
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"