Merge branch 'adafruit:main' into issue-10298

Author: eightycc

.github/actions/deps/ports/espressif/action.yml

@@ -7,6 +7,7 @@ runs:
       run: |
         echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
         echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
+        echo >> $GITHUB_ENV "ESP_ROM_ELF_DIR=$GITHUB_WORKSPACE/.idf_tools"
       shell: bash
 
     - name: Get IDF commit

.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.2
+	branch = circuitpython-v5.4.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git

lib/mbedtls_config/mbedtls_config_port.h

@@ -83,6 +83,9 @@ INC += \
 	-isystem esp-idf/components/esp_psram/include \
 	-isystem esp-idf/components/esp_ringbuf/include \
 	-isystem esp-idf/components/esp_rom/include \
+	-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include \
+	-isystem esp-idf/components/esp_rom/$(IDF_TARGET)/include/$(IDF_TARGET) \
+	-isystem esp-idf/components/esp_security/include \
 	-isystem esp-idf/components/esp_system/include \
 	-isystem esp-idf/components/esp_timer/include \
 	-isystem esp-idf/components/esp_wifi/include \
@@ -115,6 +118,7 @@ INC += \
 	-isystem esp-idf/components/sdmmc/include \
 	-isystem esp-idf/components/soc/include \
 	-isystem esp-idf/components/soc/$(IDF_TARGET)/include \
+	-isystem esp-idf/components/soc/$(IDF_TARGET)/register \
 	-isystem esp-idf/components/spi_flash/include \
 	-isystem esp-idf/components/usb/include \
 	-isystem esp-idf/components/ulp/ulp_fsm/include \
@@ -171,12 +175,12 @@ ifeq ($(DEBUG), 1)
 		OPTIMIZATION_FLAGS ?= -Og
 		CFLAGS += -DDEBUG
 	endif
-	# You may want to enable these flags to make setting breakpoints easier.
-	# CFLAGS += -fno-inline -fno-ipa-sra
+#	You may want to enable these flags to make setting breakpoints easier.
+#	CFLAGS += -fno-inline -fno-ipa-sra
 else
 	CFLAGS += -DNDEBUG
-	# RISC-V is larger than xtensa
-	# Use -Os for RISC-V when it overflows
+#	RISC-V is larger than xtensa
+#	Use -Os for RISC-V when it overflows
 	ifeq ($(IDF_TARGET_ARCH),riscv)
 		OPTIMIZATION_FLAGS ?= -Os
 	else
@@ -238,7 +242,6 @@ ifeq ($(IDF_TARGET),esp32)
 LDFLAGS += \
 	-Tesp32.rom.newlib-data.ld \
 	-Tesp32.rom.newlib-funcs.ld \
-	-Tesp32.rom.newlib-time.ld \
 	-Tesp32.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -261,7 +264,6 @@ CHIP_COMPONENTS = \
 else ifeq ($(IDF_TARGET),esp32c3)
 LDFLAGS += \
 	-Tesp32c3.rom.newlib.ld \
-	-Tesp32c3.rom.newlib-time.ld \
 	-Tesp32c3.rom.version.ld \
 	-Tesp32c3.rom.eco3.ld \
 	-Tesp32c3.rom.bt_funcs.ld
@@ -308,7 +310,6 @@ else ifeq ($(IDF_TARGET),esp32s2)
 LDFLAGS += \
 	-Tesp32s2.rom.newlib-data.ld \
 	-Tesp32s2.rom.newlib-funcs.ld \
-	-Tesp32s2.rom.newlib-time.ld \
 	-Tesp32s2.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -392,7 +393,7 @@ SRC_C += \
 	peripherals/$(IDF_TARGET)/pins.c
 
 ifeq ($(CIRCUITPY_SSL),1)
-SRC_C += lib/mbedtls_config/crt_bundle.c
+SRC_C += common-hal/ssl/crt_bundle.c
 endif
 
 SRC_C += $(wildcard common-hal/espidf/*.c)
@@ -603,7 +604,7 @@ endif
 
 ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
 ifneq ($(CIRCUITPY_WIFI),0)
-	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
+	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp_security esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
 endif
 ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
 	BLE_IMPL_esp32 := esp32
@@ -614,10 +615,10 @@ ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
 	BLE_IMPL_esp32h2 := libble
 	BLE_IMPL = $(BLE_IMPL_$(IDF_TARGET))
 
-	ESP_IDF_COMPONENTS_LINK += bt esp_phy
+	ESP_IDF_COMPONENTS_LINK += bt esp_phy esp_security
 	ifeq ($(BLE_IMPL),esp32)
-		# BLE will hang the ESP32 and trigger an interrupt watchdog without this undefined symbol at
-		# link because a weak version of the interrupt that BLE uses will be linked incorrectly.
+#		BLE will hang the ESP32 and trigger an interrupt watchdog without this undefined symbol at
+#		link because a weak version of the interrupt that BLE uses will be linked incorrectly.
 		REGISTRATION_FUNCTIONS += -u ld_include_hli_vectors_bt
 		BINARY_BLOBS += esp-idf/components/bt/controller/lib_esp32/$(IDF_TARGET)/libbtdm_app.a
 	endif
@@ -636,6 +637,9 @@ ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
 	endif
 	endif
 endif
+ifeq ($(IDF_TARGET),esp32p4)
+    ESP_IDF_COMPONENTS_LINK += esp_security
+endif
 ifneq ($(CIRCUITPY_ESPULP),0)
 	ESP_IDF_COMPONENTS_LINK += ulp
 endif

ports/espressif/Makefile

@@ -10,6 +10,7 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_AESIO = 0
+CIRCUITPY_CANIO = 0
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_ESPCAMERA = 0
 

ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk

@@ -60,7 +60,7 @@ static void display_init(void) {
         240,            // width (after rotation)
         240,            // height (after rotation)
         0,              // column start
-        80,             // row start
+        0,              // row start
         0,              // rotation
         16,             // color depth
         false,          // grayscale

ports/espressif/boards/oxocard_artwork/board.c

@@ -60,7 +60,7 @@ static void display_init(void) {
         240,            // width (after rotation)
         240,            // height (after rotation)
         0,              // column start
-        80,             // row start
+        0,              // row start
         0,              // rotation
         16,             // color depth
         false,          // grayscale

ports/espressif/boards/oxocard_galaxy/board.c

@@ -60,7 +60,7 @@ static void display_init(void) {
         240,            // width (after rotation)
         240,            // height (after rotation)
         0,              // column start
-        80,             // row start
+        0,              // row start
         0,              // rotation
         16,             // color depth
         false,          // grayscale

ports/espressif/boards/oxocard_science/board.c

@@ -0,0 +1,37 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2025 Dan Halbert for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+// In ESP-IDF v5.4, Espressif changed the format of the in-flash cert bundle, which
+// made lib/mbedtls_config/crt_bundle.c no longer work. Rather than update that,
+// just wrap those functions and use the ESP-IDF versions.
+
+#include "py/mperrno.h"
+#include "mbedtls/x509_crt.h"
+#include "lib/mbedtls_config/crt_bundle.h"
+#include "esp_crt_bundle.h"
+
+static int convert_esp_err(esp_err_t ret) {
+    switch (ret) {
+        case ESP_OK:
+            return 0;
+        default:
+        // Right now esp_crt_bundle.c doesn't return very specific errors.
+        case ESP_ERR_INVALID_ARG:
+            return -MP_EINVAL;
+    }
+}
+
+int crt_bundle_attach(mbedtls_ssl_config *ssl_conf) {
+    return convert_esp_err(esp_crt_bundle_attach(ssl_conf));
+}
+
+void crt_bundle_detach(mbedtls_ssl_config *conf) {
+    esp_crt_bundle_detach(conf);
+}
+
+int crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size) {
+    return convert_esp_err(esp_crt_bundle_set(x509_bundle, bundle_size));
+}