Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to IDF 5.3.2 #9928

Merged
merged 4 commits into from
Jan 9, 2025
+24 −9
Merged

Update to IDF 5.3.2 #9928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62525e9
Update to IDF 5.3.2
tannewt Jan 2, 2025
542f22c
Fix moved files
tannewt Jan 3, 2025
18785bd
Fix c2 link
tannewt Jan 3, 2025
60ada1d
Shrink C2 and C3 builds
tannewt Jan 3, 2025
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions ports/espressif/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/esp-idf
Open in desktop
Submodule esp-idf updated 1621 files
4 changes: 4 additions & 0 deletions ports/espressif/esp-idf-config/sdkconfig-esp32c2.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#
# Espressif IoT Development Framework Configuration
#
# Compiler options
#
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
# end of Compiler options
#
# Component config
#
Expand Down
4 changes: 4 additions & 0 deletions ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#
# Espressif IoT Development Framework Configuration
#
# Compiler options
#
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
# end of Compiler options
#
# Component config
#
Expand Down
5 changes: 2 additions & 3 deletions ports/espressif/tools/update_sdkconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down