From 62525e9ea04cee40ba65d12b1a7336a7351ad00f Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 2 Jan 2025 13:48:16 -0800 Subject: [PATCH 1/4] Update to IDF 5.3.2 Fixes #9917. Fixes #9915 --- .gitmodules | 2 +- ports/espressif/Makefile | 6 ++++-- ports/espressif/esp-idf | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2185e9207941..feac17154651 100644 --- 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 index 9ae5d2646d2b..64ad44710b47 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -261,7 +261,8 @@ LDFLAGS += \ -Tesp32c3.rom.newlib.ld \ -Tesp32c3.rom.newlib-time.ld \ -Tesp32c3.rom.version.ld \ - -Tesp32c3.rom.eco3.ld + -Tesp32c3.rom.eco3.ld \ + -Tesp32s3.rom.bt_funcs.ld CHIP_COMPONENTS = \ esp_driver_tsens @@ -317,7 +318,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 diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 3ecf6bafcf04..f388200aba73 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 3ecf6bafcf045e0d2705ef49524456801df4f754 +Subproject commit f388200aba73826b9039be6f4fb5385c6b7136c6 From 542f22ce4f3abd4736ff7abbad0d7ca39c18729b Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 3 Jan 2025 09:54:18 -0800 Subject: [PATCH 2/4] Fix moved files --- ports/espressif/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 64ad44710b47..b0b449c394fa 100644 --- 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 \ @@ -262,7 +263,7 @@ LDFLAGS += \ -Tesp32c3.rom.newlib-time.ld \ -Tesp32c3.rom.version.ld \ -Tesp32c3.rom.eco3.ld \ - -Tesp32s3.rom.bt_funcs.ld + -Tesp32c3.rom.bt_funcs.ld CHIP_COMPONENTS = \ esp_driver_tsens @@ -628,8 +629,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) From 18785bd1cd9d786ad25fc297f0ca29c3cd6eba6c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 3 Jan 2025 11:03:59 -0800 Subject: [PATCH 3/4] Fix c2 link --- ports/espressif/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index b0b449c394fa..ff64a3b03cf2 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -246,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 \ From 60ada1d19c5adf7c8da3717117ac2c6d7c329bd3 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 3 Jan 2025 14:14:28 -0800 Subject: [PATCH 4/4] Shrink C2 and C3 builds --- ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults | 4 ++++ ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults | 4 ++++ ports/espressif/tools/update_sdkconfig.py | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults index bf9e57494c73..19c73ca5ee5c 100644 --- 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 index bf9e57494c73..19c73ca5ee5c 100644 --- 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 index c1e7ebd349c2..f69e8453742c 100644 --- 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