esp32: Remove IDF-version-specific sdkconfig.

This reverts commit 27279e69b4 (plus removes some additional references to the SDKCONFIG_IDF_VERSION_SPECIFIC CMake variable.) Relevant sdkconfig options are added into sdkconfig.base now that IDF >=5.2.0 is required. Signed-off-by: Angus Gratton <angus@redyak.com.au>
2024-11-01 16:29:50 +11:00
parent 6e5d8d0093
commit d90aff5e13
31 changed files with 2 additions and 41 deletions
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -5,10 +5,6 @@
 # needs to be duplicated for out-of-tree builds, and can easily get out of date.
 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.
 if(NOT MICROPY_BOARD)
    set(MICROPY_BOARD ESP32_GENERIC)
@@ -35,12 +31,6 @@ set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 # Save the manifest file set from the cmake command line.
 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):
 # - SDKCONFIG_DEFAULTS
 # - IDF_TARGET
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.cmake
@@ -6,7 +6,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake
@@ -1,5 +1,4 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
 )
--- a/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/ESP32_GENERIC_C3/sdkconfig.c3usb
 )
--- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.c6
    boards/sdkconfig.ble
 )
--- a/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S2/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.spiram_sx
 )
--- a/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_GENERIC_S3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.spiram_sx
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
 )

--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/LOLIN_C3_MINI/sdkconfig.board
 )
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.spiram_sx
    boards/sdkconfig.usb
 )
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s2)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.spiram_sx
    boards/sdkconfig.usb
 )
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
    boards/M5STACK_ATOM/sdkconfig.board
--- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.c6
    boards/sdkconfig.ble
 )
--- a/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
+++ b/ports/esp32/boards/OLIMEX_ESP32_EVB/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/OLIMEX_ESP32_EVB/sdkconfig.board
 )
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/OLIMEX_ESP32_POE/sdkconfig.board
 )
--- a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
    boards/SIL_WESP32/sdkconfig.board
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.spiram_sx
    boards/sdkconfig.usb
    boards/UM_FEATHERS2/sdkconfig.board
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.spiram_sx
    boards/sdkconfig.usb
    boards/UM_FEATHERS2NEO/sdkconfig.board
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3NEO/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_NANOS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_OMGS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_RGBTOUCH_MINI/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32c6)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.c6
    boards/sdkconfig.ble
    boards/UM_TINYC6/sdkconfig.board
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -1,6 +1,5 @@
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
    boards/sdkconfig.spiram
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -1,7 +1,6 @@
 set(IDF_TARGET esp32s2)
 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.spiram_sx
    boards/sdkconfig.usb
    boards/UM_TINYS2/sdkconfig.board
--- a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYWATCHS3/mpconfigboard.cmake
@@ -2,7 +2,6 @@ set(IDF_TARGET esp32s3)

 set(SDKCONFIG_DEFAULTS
    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
    boards/sdkconfig.usb
    boards/sdkconfig.ble
    boards/sdkconfig.240mhz
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -49,7 +49,8 @@ CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
 # FreeRTOS
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
+CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y

 # UDP
 CONFIG_LWIP_PPP_SUPPORT=y
--- a/ports/esp32/boards/sdkconfig.idf52
+++ b/ports/esp32/boards/sdkconfig.idf52
@@ -1,2 +0,0 @@
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
-CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y