esp32/boards/GENERIC: Merge with GENERIC_{SPIRAM,OTA,D2WD,UNICORE}.

These are now variants of the GENERIC board.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
pull/12088/head
Jim Mussared 2023-07-25 15:03:30 +10:00
rodzic 9573d31071
commit 2fbf42d3ad
22 zmienionych plików z 69 dodań i 118 usunięć

Wyświetl plik

@ -13,11 +13,15 @@
"esp32_devkitc.jpg"
],
"mcu": "esp32",
"product": "ESP32",
"product": "ESP32 / WROOM",
"thumbnail": "",
"url": "https://www.espressif.com/en/products/modules",
"variants": {
"idf3": "Compiled with IDF 3.x"
"idf3": "Compiled with IDF 3.x",
"d2wd": "ESP32 D2WD",
"spiram": "Support for SPIRAM / WROVER",
"unicore": "ESP32 Unicore",
"ota": "Support for OTA"
},
"vendor": "Espressif"
}

Wyświetl plik

@ -1 +1,9 @@
The following files are firmware for ESP32-based boards without external SPIRAM.
The following files are firmware that should work on most ESP32-based boards
with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
If your board is based on a WROVER module, or otherwise has SPIRAM (also known
as PSRAM), then use the "spiram" variant.
The "d2wd" variant is for ESP32-D2WD chips (with 2MiB flash), and "unicore" is
for single-core ESP32 chips (e.g. the "SOLO" modules). The "ota" variant sets
up the partition table to allow for Over-the-Air updates.

Wyświetl plik

@ -2,3 +2,47 @@ set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
)
if(MICROPY_BOARD_VARIANT STREQUAL "d2wd")
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
boards/GENERIC/sdkconfig.d2wd
)
list(APPEND MICROPY_DEF_BOARD
MICROPY_HW_MCU_NAME="ESP32-D2WD"
)
endif()
if(MICROPY_BOARD_VARIANT STREQUAL "ota")
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
boards/GENERIC/sdkconfig.ota
)
list(APPEND MICROPY_DEF_BOARD
MICROPY_HW_BOARD_NAME="Generic ESP32 module with OTA"
)
endif()
if(MICROPY_BOARD_VARIANT STREQUAL "spiram")
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
boards/sdkconfig.spiram
)
list(APPEND MICROPY_DEF_BOARD
MICROPY_HW_BOARD_NAME="Generic ESP32 module with SPIRAM"
)
endif()
if(MICROPY_BOARD_VARIANT STREQUAL "unicore")
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
boards/GENERIC/sdkconfig.unicore
)
list(APPEND MICROPY_DEF_BOARD
MICROPY_HW_MCU_NAME="ESP32-UNICORE"
)
endif()

Wyświetl plik

@ -1,2 +1,10 @@
#define MICROPY_HW_BOARD_NAME "ESP32 module"
// Both of these can be set by mpconfigboard.cmake if a BOARD_VARIANT is
// specified.
#ifndef MICROPY_HW_BOARD_NAME
#define MICROPY_HW_BOARD_NAME "Generic ESP32 module"
#endif
#ifndef MICROPY_HW_MCU_NAME
#define MICROPY_HW_MCU_NAME "ESP32"
#endif

Wyświetl plik

@ -1,20 +0,0 @@
{
"deploy": [
"../deploy.md"
],
"docs": "",
"features": [
"BLE",
"External Flash",
"WiFi"
],
"id": "esp32-d2wd",
"images": [
"generic_d2wd.jpg"
],
"mcu": "esp32",
"product": "ESP32 D2WD",
"thumbnail": "",
"url": "https://www.espressif.com/en/products/modules",
"vendor": "Espressif"
}

Wyświetl plik

@ -1,5 +0,0 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/GENERIC_D2WD/sdkconfig.board
)

Wyświetl plik

@ -1,2 +0,0 @@
#define MICROPY_HW_BOARD_NAME "Generic ESP32-D2WD module"
#define MICROPY_HW_MCU_NAME "ESP32-D2WD"

Wyświetl plik

@ -1,20 +0,0 @@
{
"deploy": [
"../deploy.md"
],
"docs": "",
"features": [
"BLE",
"External Flash",
"WiFi"
],
"id": "esp32-ota",
"images": [
"esp32_devkitc.jpg"
],
"mcu": "esp32",
"product": "ESP32 with OTA support",
"thumbnail": "",
"url": "https://www.espressif.com/en/products/modules",
"vendor": "Espressif"
}

Wyświetl plik

@ -1,5 +0,0 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/GENERIC_OTA/sdkconfig.board
)

Wyświetl plik

@ -1,2 +0,0 @@
#define MICROPY_HW_BOARD_NAME "4MB/OTA module"
#define MICROPY_HW_MCU_NAME "ESP32"

Wyświetl plik

@ -1,24 +0,0 @@
{
"deploy": [
"../deploy.md"
],
"docs": "",
"features": [
"BLE",
"External Flash",
"External RAM",
"WiFi"
],
"id": "esp32spiram",
"images": [
"esp32_psram.jpg"
],
"mcu": "esp32",
"product": "ESP32 with SPIRAM",
"thumbnail": "",
"url": "https://www.espressif.com/en/products/modules",
"variants": {
"idf3": "Compiled with IDF 3.x"
},
"vendor": "Espressif"
}

Wyświetl plik

@ -1 +0,0 @@
The following files are firmware for ESP32-based boards with external SPIRAM (also known as PSRAM).

Wyświetl plik

@ -1,5 +0,0 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/sdkconfig.spiram
)

Wyświetl plik

@ -1,2 +0,0 @@
#define MICROPY_HW_BOARD_NAME "ESP32 module (spiram)"
#define MICROPY_HW_MCU_NAME "ESP32"

Wyświetl plik

@ -1,20 +0,0 @@
{
"deploy": [
"../deploy.md"
],
"docs": "",
"features": [
"BLE",
"External Flash",
"WiFi"
],
"id": "esp32-unicore",
"images": [
"generic_unicore.jpg"
],
"mcu": "esp32",
"product": "ESP32 Unicore",
"thumbnail": "",
"url": "https://www.espressif.com/en/products/modules",
"vendor": "Espressif"
}

Wyświetl plik

@ -1 +0,0 @@
The following files are daily firmware for single-core ESP32-based boards without external SPIRAM.

Wyświetl plik

@ -1,5 +0,0 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/GENERIC_UNICORE/sdkconfig.board
)

Wyświetl plik

@ -1,2 +0,0 @@
#define MICROPY_HW_BOARD_NAME "ESP32 Unicore module"
#define MICROPY_HW_MCU_NAME "ESP32-UNICORE"

Wyświetl plik

@ -170,6 +170,7 @@ set(MICROPY_CROSS_FLAGS -march=xtensawin)
# Set compile options for this port.
target_compile_definitions(${MICROPY_TARGET} PUBLIC
${MICROPY_DEF_CORE}
${MICROPY_DEF_BOARD}
MICROPY_ESP_IDF_4=1
MICROPY_VFS_FAT=1
MICROPY_VFS_LFS2=1