From b25a67590d2cd123a7d5dd453da5175bf735c748 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Tue, 25 Jul 2023 15:20:05 +1000 Subject: [PATCH] esp32/boards/GENERIC_S2: Merge with ESP32_S2_WROVER. Unsure of the history of the ESP32_S2_WROVER board (and why it wasn't named GENERIC_S2_...) but now it's a variant of the generic S2 board. Also removes the non-existent CONFIG_USB_AND_UART from all S2 boards. This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared --- ports/esp32/boards/ESP32_S2_WROVER/board.json | 20 ------------------- .../ESP32_S2_WROVER/mpconfigboard.cmake | 8 -------- .../boards/ESP32_S2_WROVER/mpconfigboard.h | 8 -------- .../boards/ESP32_S2_WROVER/sdkconfig.board | 10 ---------- ports/esp32/boards/GENERIC_S2/board.json | 1 + ports/esp32/boards/GENERIC_S2/board.md | 6 ++++++ .../boards/GENERIC_S2/mpconfigboard.cmake | 1 + ports/esp32/boards/GENERIC_S2/mpconfigboard.h | 8 ++++---- .../boards/LOLIN_S2_MINI/sdkconfig.board | 1 - .../boards/LOLIN_S2_PICO/sdkconfig.board | 1 - .../boards/UM_FEATHERS2NEO/sdkconfig.board | 1 - ports/esp32/boards/UM_TINYS2/sdkconfig.board | 1 - 12 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/board.json delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h delete mode 100644 ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board create mode 100644 ports/esp32/boards/GENERIC_S2/board.md diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json deleted file mode 100644 index d4c4ce21d..000000000 --- a/ports/esp32/boards/ESP32_S2_WROVER/board.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "deploy": [ - "../deploy_s2.md" - ], - "docs": "", - "features": [ - "BLE", - "External Flash", - "External RAM", - "WiFi" - ], - "images": [ - "ESP32-S2-WROVER_L_0.jpg" - ], - "mcu": "esp32s2", - "product": "ESP32-S2 WROVER", - "thumbnail": "", - "url": "https://www.espressif.com/en/products/modules", - "vendor": "Espressif" -} diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake deleted file mode 100644 index 056c9ab4a..000000000 --- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(IDF_TARGET esp32s2) - -set(SDKCONFIG_DEFAULTS - boards/sdkconfig.base - boards/sdkconfig.spiram_sx - boards/sdkconfig.usb - boards/ESP32_S2_WROVER/sdkconfig.board -) diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h deleted file mode 100644 index a96262c60..000000000 --- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h +++ /dev/null @@ -1,8 +0,0 @@ -#define MICROPY_HW_BOARD_NAME "ESP32-S2-WROVER" -#define MICROPY_HW_MCU_NAME "ESP32-S2" - -#define MICROPY_PY_BLUETOOTH (0) -#define MICROPY_HW_ENABLE_SDCARD (0) - -#define MICROPY_HW_I2C0_SCL (7) -#define MICROPY_HW_I2C0_SDA (6) diff --git a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board deleted file mode 100644 index 40a8e3047..000000000 --- a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_ESPTOOLPY_AFTER_NORESET=y - -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y -CONFIG_USB_AND_UART=y - -# LWIP -CONFIG_LWIP_LOCAL_HOSTNAME="ESP32-S2-WROVER" -# end of LWIP diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json index 102b039bf..35d06f2f7 100644 --- a/ports/esp32/boards/GENERIC_S2/board.json +++ b/ports/esp32/boards/GENERIC_S2/board.json @@ -6,6 +6,7 @@ "features": [ "BLE", "External Flash", + "External RAM", "WiFi" ], "images": [ diff --git a/ports/esp32/boards/GENERIC_S2/board.md b/ports/esp32/boards/GENERIC_S2/board.md new file mode 100644 index 000000000..3e46c0246 --- /dev/null +++ b/ports/esp32/boards/GENERIC_S2/board.md @@ -0,0 +1,6 @@ +The following files are firmware that should work on most ESP32-S2-based +boards with 4MiB of flash, including WROOM, WROVER, 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. diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake index 59ca906f4..76d185d90 100644 --- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake +++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake @@ -3,4 +3,5 @@ set(IDF_TARGET esp32s2) set(SDKCONFIG_DEFAULTS boards/sdkconfig.base boards/sdkconfig.usb + boards/sdkconfig.spiram_sx ) diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h index c4f86a8fc..aaea41bcd 100644 --- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h +++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h @@ -1,8 +1,8 @@ -#define MICROPY_HW_BOARD_NAME "ESP32S2 module" -#define MICROPY_HW_MCU_NAME "ESP32S2" +#define MICROPY_HW_BOARD_NAME "Generic ESP32S2 module" +#define MICROPY_HW_MCU_NAME "ESP32S2" -#define MICROPY_PY_BLUETOOTH (0) -#define MICROPY_HW_ENABLE_SDCARD (0) +#define MICROPY_PY_BLUETOOTH (0) +#define MICROPY_HW_ENABLE_SDCARD (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) diff --git a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board index cbb3ad06d..00ccc281e 100644 --- a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board +++ b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board @@ -1,6 +1,5 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_USB_AND_UART=y # LWIP CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_MINI" # end of LWIP diff --git a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board index eadff2f1b..a49f3936e 100644 --- a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board +++ b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board @@ -1,6 +1,5 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_USB_AND_UART=y # LWIP CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_PICO" # end of LWIP diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board index b2c6979a7..a624f7fd9 100644 --- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board +++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board @@ -1,6 +1,5 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_USB_AND_UART=y CONFIG_ESPTOOLPY_AFTER_NORESET=y # LWIP diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board index 09e0deb07..0a2097e24 100644 --- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board +++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board @@ -1,6 +1,5 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_USB_AND_UART=y CONFIG_ESPTOOLPY_AFTER_NORESET=y # LWIP -- GitLab