Merge pull request #9928 from tannewt/idf5.3.2

Update to IDF 5.3.2
adafruit · Jan 9, 2025 · 800802e · 800802e
2 parents 77b9880 + 60ada1d
commit 800802e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.3.1
+	branch = circuitpython-v5.3.2
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -75,6 +75,7 @@ INC += \
 	-isystem esp-idf/components/esp_hw_support/dma/include \
 	-isystem esp-idf/components/esp_hw_support/include \
 	-isystem esp-idf/components/esp_hw_support/include/soc \
+	-isystem esp-idf/components/esp_hw_support/port/$(IDF_TARGET)/private_include \
 	-isystem esp-idf/components/esp_mm/include \
 	-isystem esp-idf/components/esp_netif/include \
 	-isystem esp-idf/components/esp_partition/include \
@@ -245,6 +246,7 @@ CHIP_COMPONENTS = \
 
 else ifeq ($(IDF_TARGET),esp32c2)
 LDFLAGS += \
+	-Tesp32c2.rom.ble.ld \
 	-Tesp32c2.rom.heap.ld \
 	-Tesp32c2.rom.newlib.ld \
 	-Tesp32c2.rom.version.ld \
@@ -261,7 +263,8 @@ LDFLAGS += \
 	-Tesp32c3.rom.newlib.ld \
 	-Tesp32c3.rom.newlib-time.ld \
 	-Tesp32c3.rom.version.ld \
-	-Tesp32c3.rom.eco3.ld
+	-Tesp32c3.rom.eco3.ld \
+	-Tesp32c3.rom.bt_funcs.ld
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens
@@ -317,7 +320,8 @@ LDFLAGS += \
 	-Tesp32s3.rom.newlib.ld \
 	-Tesp32s3.rom.version.ld \
 	-Tesp32s3.rom.systimer.ld \
-	-Tesp32s3.rom.wdt.ld
+	-Tesp32s3.rom.wdt.ld \
+	-Tesp32s3.rom.bt_funcs.ld
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens
@@ -626,8 +630,12 @@ ifneq ($(CIRCUITPY_BLEIO),0)
 	endif
 
 	ifeq ($(BLE_IMPL),libble)
-	BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
-					esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/libble_app.a
+	BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a
+	ifeq ($(IDF_TARGET),esp32c6)
+		BINARY_BLOBS += esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/$(IDF_TARGET)/libble_app.a
+	else
+		BINARY_BLOBS += esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/libble_app.a
+	endif
 	endif
 endif
 ifneq ($(CIRCUITPY_ESPULP),0)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults
@@ -1,6 +1,10 @@
 #
 # Espressif IoT Development Framework Configuration
 #
+# Compiler options
+#
+CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
+# end of Compiler options
 #
 # Component config
 #

diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
@@ -1,6 +1,10 @@
 #
 # Espressif IoT Development Framework Configuration
 #
+# Compiler options
+#
+CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
+# end of Compiler options
 #
 # Component config
 #

diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py
@@ -139,10 +139,9 @@ def sym_default(sym):
     # to n or the symbol to m in those cases).
     if (
         sym.choice
-        and not sym.choice.is_optional
         and sym.choice._selection_from_defaults() is sym
-        and sym.orig_type is kconfiglib.core.BOOL
-        and sym.tri_value == 2
+        and sym.orig_type == kconfiglib.core.BOOL
+        and sym.bool_value == 2
     ):
         return True