Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
include(boards/mpconfigboard_esp32s3_common.cmake)

if(NOT MICROPY_DIR)
get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
endif()

set(IDF_TARGET esp32s3)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.240mhz
boards/sdkconfig.spiram_sx
boards/sdkconfig.spiram_oct
boards/sdkconfig.flash_qio_80m
${MICROPY_BOARD_DIR}/sdkconfig.board
)

Expand Down
2 changes: 0 additions & 2 deletions ports/esp32/boards/ARDUINO_NANO_ESP32/sdkconfig.board
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="boards/ARDUINO_NANO_ESP32/partitions-app3M_fat9M_fact512k_16MiB.csv"
Expand Down
5 changes: 1 addition & 4 deletions ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32_common.cmake)
3 changes: 1 addition & 2 deletions ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_D2WD.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_2MiB
boards/ESP32_GENERIC/sdkconfig.d2wd
)
Expand Down
3 changes: 1 addition & 2 deletions ports/esp32/boards/ESP32_GENERIC/mpconfigvariant_OTA.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/ESP32_GENERIC/sdkconfig.ota
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.spiram
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/ESP32_GENERIC/sdkconfig.unicore
)

Expand Down
12 changes: 1 addition & 11 deletions ports/esp32/boards/ESP32_GENERIC_C2/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
set(IDF_TARGET esp32c2)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.ble
boards/sdkconfig.c2
# C2 has unusably low free RAM without these optimisations
boards/sdkconfig.free_ram
)
include(boards/mpconfigboard_esp32c2_common.cmake)

set(MICROPY_SOURCE_BOARD
${MICROPY_BOARD_DIR}/board_init.c
)

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_2MiB
)

Expand Down
9 changes: 1 addition & 8 deletions ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c3)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.ble
boards/ESP32_GENERIC_C3/sdkconfig.c3usb
)
include(boards/mpconfigboard_esp32c3_common.cmake)
12 changes: 3 additions & 9 deletions ports/esp32/boards/ESP32_GENERIC_C5/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
set(IDF_TARGET esp32c5)
include(boards/mpconfigboard_esp32c5_common.cmake)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.ble
boards/sdkconfig.240mhz
boards/sdkconfig.free_ram
boards/ESP32_GENERIC_C5/sdkconfig.board
)
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_qio_80m)
9 changes: 1 addition & 8 deletions ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c6)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.c6
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32c6_common.cmake)
7 changes: 1 addition & 6 deletions ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
set(IDF_TARGET esp32p4)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.p4
)
include(boards/mpconfigboard_esp32p4_common.cmake)
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
set(IDF_TARGET esp32p4)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.p4
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.p4_wifi_common
boards/sdkconfig.p4_wifi_c5
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
set(IDF_TARGET esp32p4)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.p4
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.p4_wifi_common
boards/sdkconfig.p4_wifi_c6
)
Expand Down
7 changes: 1 addition & 6 deletions ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
set(IDF_TARGET esp32s2)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.spiram_sx
)
include(boards/mpconfigboard_esp32s2_common.cmake)
10 changes: 3 additions & 7 deletions ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
set(IDF_TARGET esp32s3)
include(boards/mpconfigboard_esp32s3_common.cmake)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/sdkconfig.spiram_sx
boards/ESP32_GENERIC_S3/sdkconfig.board
)
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_qio_80m)
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
set(SDKCONFIG_DEFAULTS
${SDKCONFIG_DEFAULTS}
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.240mhz
boards/sdkconfig.spiram_oct
)
Expand Down
2 changes: 0 additions & 2 deletions ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c3)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.ble
boards/GARATRONIC_PYBSTICK26_ESP32C3/sdkconfig.board
)
include(boards/mpconfigboard_esp32c3_common.cmake)

This file was deleted.

1 change: 1 addition & 0 deletions ports/esp32/boards/LILYGO_T3_S3/mpconfigboard.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set(SDKCONFIG_DEFAULTS
boards/sdkconfig.ble
boards/sdkconfig.240mhz
boards/sdkconfig.spiram_sx
boards/sdkconfig.flash_qio_80m
${MICROPY_BOARD_DIR}/sdkconfig.board
)

Expand Down
2 changes: 0 additions & 2 deletions ports/esp32/boards/LILYGO_T3_S3/sdkconfig.board
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_LWIP_LOCAL_HOSTNAME="LILYGO-T3S3"
5 changes: 1 addition & 4 deletions ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32_common.cmake)

set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
9 changes: 1 addition & 8 deletions ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
set(IDF_TARGET esp32c3)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.ble
boards/LOLIN_C3_MINI/sdkconfig.board
)
include(boards/mpconfigboard_esp32c3_common.cmake)

set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
4 changes: 0 additions & 4 deletions ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board

This file was deleted.

9 changes: 4 additions & 5 deletions ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
set(IDF_TARGET esp32s2)
include(boards/mpconfigboard_esp32s2_common.cmake)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.spiram_sx
)
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_qio_80m
${MICROPY_BOARD_DIR}/sdkconfig.board)

set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
4 changes: 0 additions & 4 deletions ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
# LWIP
CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_MINI"
# end of LWIP
9 changes: 4 additions & 5 deletions ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
set(IDF_TARGET esp32s2)
include(boards/mpconfigboard_esp32s2_common.cmake)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.spiram_sx
)
list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.flash_qio_80m
${MICROPY_BOARD_DIR}/sdkconfig.board)

set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
4 changes: 0 additions & 4 deletions ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
# LWIP
CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_PICO"
# end of LWIP
7 changes: 4 additions & 3 deletions ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
include(boards/mpconfigboard_esp32_common.cmake)

list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.240mhz
boards/sdkconfig.flash_qio_80m
boards/M5STACK_ATOM/sdkconfig.board
)

Expand Down
2 changes: 0 additions & 2 deletions ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_SPIRAM_SPEED_80M=y
CONFIG_ESP32_REV_MIN_1=y
CONFIG_LWIP_LOCAL_HOSTNAME="M5StackATOM"
11 changes: 5 additions & 6 deletions ports/esp32/boards/M5STACK_ATOMS3_LITE/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
set(IDF_TARGET esp32s3)
include(boards/mpconfigboard_esp32s3_common.cmake)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
boards/ESP32_GENERIC_S3/sdkconfig.board
Comment thread
projectgus marked this conversation as resolved.
)
list(APPEND SDKCONFIG_DEFAULTS boards/sdkconfig.flash_qio_80m)

# This board has no PSRAM
list(REMOVE_ITEM SDKCONFIG_DEFAULTS boards/sdkconfig.spiram_sx)
9 changes: 1 addition & 8 deletions ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c6)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.c6
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32c6_common.cmake)
6 changes: 3 additions & 3 deletions ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
include(boards/mpconfigboard_esp32_common.cmake)

list(APPEND SDKCONFIG_DEFAULTS
boards/OLIMEX_ESP32_EVB/sdkconfig.board
)
6 changes: 3 additions & 3 deletions ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
include(boards/mpconfigboard_esp32_common.cmake)

list(APPEND SDKCONFIG_DEFAULTS
boards/OLIMEX_ESP32_POE/sdkconfig.board
)
9 changes: 1 addition & 8 deletions ports/esp32/boards/SEEED_XIAO_ESP32C6/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c6)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.c6
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32c6_common.cmake)
7 changes: 4 additions & 3 deletions ports/esp32/boards/SIL_MANT1S/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
include(boards/mpconfigboard_esp32_common.cmake)

list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.spiram
boards/sdkconfig.ble
boards/sdkconfig.240mhz
boards/sdkconfig.flash_qio_80m
boards/SIL_MANT1S/sdkconfig.board
)

Expand Down
5 changes: 0 additions & 5 deletions ports/esp32/boards/SIL_MANT1S/sdkconfig.board
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
CONFIG_ESPTOOLPY_FLASHSIZE="8MB"

# Fast flash

CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y

# Partition table

CONFIG_PARTITION_TABLE_CUSTOM=y
Expand Down
7 changes: 4 additions & 3 deletions ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.ble
include(boards/mpconfigboard_esp32_common.cmake)

list(APPEND SDKCONFIG_DEFAULTS
boards/sdkconfig.240mhz
boards/sdkconfig.flash_qio_80m
boards/SIL_WESP32/sdkconfig.board
)
4 changes: 0 additions & 4 deletions ports/esp32/boards/SIL_WESP32/sdkconfig.board
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y

# Fast flash

CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_ESP32_REV_MIN_1=y

# OTA
Expand Down
9 changes: 1 addition & 8 deletions ports/esp32/boards/SOLDERED_NULA_MINI/mpconfigboard.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
set(IDF_TARGET esp32c6)

set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base
boards/sdkconfig.riscv
boards/sdkconfig.c6
boards/sdkconfig.ble
)
include(boards/mpconfigboard_esp32c6_common.cmake)
Loading
Loading