djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2023-07-25 15:20:05 +10:00
parent 4815af75bc
commit b25a67590d
12 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/esp32/boards/ESP32_S2_WROVER/board.json
View File

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

8
ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
View File

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

8
ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
View File

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

10
ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
View File

@ -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

1
ports/esp32/boards/GENERIC_S2/board.json
View File

@ -6,6 +6,7 @@
"features": [
"BLE",
"External Flash",
"External RAM",
"WiFi"
],
"images": [

6
ports/esp32/boards/GENERIC_S2/board.md Normal file
View File

@ -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.

1
ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
View File

@ -3,4 +3,5 @@ set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.usb
boards/sdkconfig.spiram_sx
)

8
ports/esp32/boards/GENERIC_S2/mpconfigboard.h
View File

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

1
ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
View File

@ -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

1
ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
View File

@ -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

1
ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
View File

@ -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

1
ports/esp32/boards/UM_TINYS2/sdkconfig.board
View File

@ -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