fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

esp32: Add IDF-version-specific sdkconfig.

Browse Source 
The new IDF v5.2 deprecated the task cleanup callback we use, so support
for the new option has been implemented in the previous commit.  This also
requires a change in the sdkconfig, via a new variable
${SDKCONFIG_IDF_VERSION_SPECIFIC} which is used in all mpconfigboard.cmake
files to include an extra sdkconfig file based on the IDF version in use.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
This commit is contained in:
Daniël van de Giessen 2024-02-29 13:05:00 +01:00 committed by Damien George
parent d6176c1f5e
commit 27279e69b4
23 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/esp32/CMakeLists.txt
View File

@ -2,6 +2,10 @@
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
# Retrieve IDF version
include($ENV{IDF_PATH}/tools/cmake/version.cmake)
set(IDF_VERSION "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
# Set the board if it's not already set. # Set the board if it's not already set.
if(NOT MICROPY_BOARD) if(NOT MICROPY_BOARD)
set(MICROPY_BOARD ESP32_GENERIC) set(MICROPY_BOARD ESP32_GENERIC)
@ -21,6 +25,12 @@ set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
# Save the manifest file set from the cmake command line. # Save the manifest file set from the cmake command line.
set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST}) set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
# Specific options for IDF v5.2 and later
set(SDKCONFIG_IDF_VERSION_SPECIFIC "")
if (IDF_VERSION VERSION_GREATER_EQUAL "5.2.0")
set(SDKCONFIG_IDF_VERSION_SPECIFIC boards/sdkconfig.idf52)
endif()
# Include board config; this is expected to set (among other options): # Include board config; this is expected to set (among other options):
# - SDKCONFIG_DEFAULTS # - SDKCONFIG_DEFAULTS
# - IDF_TARGET # - IDF_TARGET

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

@ -6,6 +6,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/ESP32_GENERIC_C3/sdkconfig.c3usb boards/ESP32_GENERIC_C3/sdkconfig.c3usb
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32c3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/LOLIN_C3_MINI/sdkconfig.board boards/LOLIN_C3_MINI/sdkconfig.board
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
boards/sdkconfig.usb boards/sdkconfig.usb
) )

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
boards/sdkconfig.usb boards/sdkconfig.usb
) )

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz
boards/M5STACK_ATOM/sdkconfig.board boards/M5STACK_ATOM/sdkconfig.board

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/OLIMEX_ESP32_POE/sdkconfig.board boards/OLIMEX_ESP32_POE/sdkconfig.board
) )

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz
boards/SIL_WESP32/sdkconfig.board boards/SIL_WESP32/sdkconfig.board

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

@ -1,6 +1,7 @@
set(IDF_TARGET esp32s2) set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
boards/sdkconfig.usb boards/sdkconfig.usb
boards/UM_FEATHERS2/sdkconfig.board boards/UM_FEATHERS2/sdkconfig.board

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

@ -1,6 +1,7 @@
set(IDF_TARGET esp32s2) set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
boards/sdkconfig.usb boards/sdkconfig.usb
boards/UM_FEATHERS2NEO/sdkconfig.board boards/UM_FEATHERS2NEO/sdkconfig.board

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

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

@ -1,5 +1,6 @@
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz
boards/sdkconfig.spiram boards/sdkconfig.spiram

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

@ -1,6 +1,7 @@
set(IDF_TARGET esp32s2) set(IDF_TARGET esp32s2)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.spiram_sx boards/sdkconfig.spiram_sx
boards/sdkconfig.usb boards/sdkconfig.usb
boards/UM_TINYS2/sdkconfig.board boards/UM_TINYS2/sdkconfig.board

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

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

@ -2,6 +2,7 @@ set(IDF_TARGET esp32s3)
set(SDKCONFIG_DEFAULTS set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
${SDKCONFIG_IDF_VERSION_SPECIFIC}
boards/sdkconfig.usb boards/sdkconfig.usb
boards/sdkconfig.ble boards/sdkconfig.ble
boards/sdkconfig.240mhz boards/sdkconfig.240mhz

2
ports/esp32/boards/sdkconfig.idf52 Normal file
View File

@ -0,0 +1,2 @@
CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y