Merge pull request #9071 from tannewt/idf5.2.1

dhalbert · web-flow · commit a6c6d099fd8c · 2024-03-26T16:13:09.000-04:00
Update ESP-IDF to 5.2.1
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 15775727e7e29cf6b4d748f01d9457479f8f6899
+Subproject commit 60764de56461edbf1e8bafe4e73fdc97ec3d2e6e
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -97,6 +97,7 @@ INC += \
 	-isystem esp-idf/components/esp_adc/include \
 	-isystem esp-idf/components/esp_adc/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/esp_app_format/include \
+	-isystem esp-idf/components/esp_bootloader_format/include \
 	-isystem esp-idf/components/esp_common/include \
 	-isystem esp-idf/components/esp_event/include \
 	-isystem esp-idf/components/esp_hw_support/include \
@@ -110,12 +111,15 @@ INC += \
 	-isystem esp-idf/components/esp_system/include \
 	-isystem esp-idf/components/esp_timer/include \
 	-isystem esp-idf/components/esp_wifi/include \
+	-isystem esp-idf/components/freertos/config/include \
+	-isystem esp-idf/components/freertos/config/include/freertos \
+	-isystem esp-idf/components/freertos/config/$(IDF_TARGET_ARCH)/include \
 	-isystem esp-idf/components/freertos/esp_additions/include \
 	-isystem esp-idf/components/freertos/esp_additions/include/freertos \
-	-isystem esp-idf/components/freertos/esp_additions/arch/$(IDF_TARGET_ARCH)/include \
 	-isystem esp-idf/components/freertos/FreeRTOS-Kernel/include \
 	-isystem esp-idf/components/freertos/FreeRTOS-Kernel/include/freertos \
 	-isystem esp-idf/components/freertos/FreeRTOS-Kernel/portable/$(IDF_TARGET_ARCH)/include \
+	-isystem esp-idf/components/freertos/FreeRTOS-Kernel/portable/$(IDF_TARGET_ARCH)/include/freertos \
 	-isystem esp-idf/components/hal/include \
 	-isystem esp-idf/components/hal/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/hal/platform_port/include \
@@ -134,6 +138,7 @@ INC += \
 	-isystem esp-idf/components/soc/include \
 	-isystem esp-idf/components/soc/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/spi_flash/include \
+	-isystem esp-idf/components/usb/include \
 	-isystem esp-idf/components/ulp/ulp_fsm/include \
 	-isystem esp-idf/components/ulp/ulp_riscv/include \
 	-isystem esp-idf/components/ulp/ulp_common/include \
@@ -498,6 +503,9 @@ endif
 ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0)
 	ESP_IDF_COMPONENTS_LINK += esp_lcd
 endif
+ifneq ($(CIRCUITPY_USB),0)
+	ESP_IDF_COMPONENTS_LINK += usb
+endif
 
 ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
 
@@ -579,7 +587,7 @@ esp-idf-stamp: $(BUILD)/esp-idf/config/sdkconfig.h
 
 $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp $(IDF_CMAKE_TARGETS)
 	$(STEPECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--print-memory-usage -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) $(LIBS) -Wl,--end-group -u newlib_include_pthread_impl -u ld_include_highint_hdl -u __cxx_fatal_exception
+	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--print-memory-usage -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) $(LIBS) -Wl,--end-group -u newlib_include_pthread_impl -u ld_include_highint_hdl -u __cxx_fatal_exception -u esp_app_desc
 
 $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py
 	$(STEPECHO) "Create $@"
diff --git a/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk b/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk
@@ -11,6 +11,6 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 120m
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
 CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1
diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
@@ -13,6 +13,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 40m
 
 CIRCUITPY_CANIO = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk
@@ -11,7 +11,7 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 120m
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
 CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1
 UF2_BOOTLOADER = 0
diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk
@@ -11,6 +11,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 120m
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/CircuitPython_AXP313A
diff --git a/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk b/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk
@@ -9,4 +9,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_PSRAM_SIZE = 8MB
 CIRCUITPY_ESP_PSRAM_MODE = opi
-CIRCUITPY_ESP_PSRAM_FREQ = 120m
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -9,10 +9,13 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_AESIO = 0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_ESPCAMERA = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
-CIRCUITPY_ESPCAMERA = 0
+
+CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 9
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -9,10 +9,13 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
+CIRCUITPY_AESIO = 0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_ESPCAMERA = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib
-CIRCUITPY_ESPCAMERA = 0
+
+CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 9
diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
@@ -151,11 +151,11 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS;
     }
 
-    if (receiver_buffer_size <= UART_FIFO_LEN) {
-        receiver_buffer_size = UART_FIFO_LEN + 8;
+    if (receiver_buffer_size <= UART_HW_FIFO_LEN(self->uart_num)) {
+        receiver_buffer_size = UART_HW_FIFO_LEN(self->uart_num) + 8;
     }
 
-    uart_config.rx_flow_ctrl_thresh = UART_FIFO_LEN - 8;
+    uart_config.rx_flow_ctrl_thresh = UART_HW_FIFO_LEN(self->uart_num) - 8;
     // Install the driver before we change the settings.
     if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK ||
         uart_set_mode(self->uart_num, mode) != ESP_OK) {
diff --git a/ports/espressif/esp-camera b/ports/espressif/esp-camera
@@ -1 +1 @@
-Subproject commit 8f3f2cc8cfb2e4371870b0c5a974d40468114a9e
+Subproject commit d529ebdffb84131b1aadaec32a7373b319b70391
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit c3e368f96933e10d0d70f497c9127dee3034c2ab
+Subproject commit 722fba96a17fba2809434e01d65b6ce88ec4ca2e
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
@@ -39,6 +39,7 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y
 #
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4
 CONFIG_ESP_WIFI_RX_BA_WIN=4
+# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
 # end of Wi-Fi
 
 #
diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
@@ -11,7 +11,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 # Compiler options
 #
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
 # end of Compiler options
 
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -108,6 +108,7 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 #
 # CONFIG_SPI_FLASH_YIELD_DURING_ERASE is not set
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+# CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE is not set
 # end of SPI Flash driver
 
 #
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -56,15 +56,19 @@ CIRCUITPY_USB = 0
 else ifeq ($(IDF_TARGET),esp32c3)
 # Modules
 CIRCUITPY_ALARM = 0
-CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO ?= 0
-CIRCUITPY_COUNTIO = 0
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
-CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_MEMORYMAP = 0
+
+# No I80 support from the IDF
 CIRCUITPY_PARALLELDISPLAYBUS = 0
+
+# No PCNT peripheral
+CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_COUNTIO = 0
 CIRCUITPY_ROTARYIO = 0
+
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 # Features
@@ -74,13 +78,18 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 else ifeq ($(IDF_TARGET),esp32c6)
 # Modules
 CIRCUITPY_ALARM = 0
-CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO ?= 0
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
-CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_RGBMATRIX = 0
+
+# No space for this
+CIRCUITPY_AUDIOBUSIO = 0
+
+# No I80 support from the IDF
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 # Features
@@ -90,16 +99,15 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 else ifeq ($(IDF_TARGET),esp32h2)
 # Modules
 CIRCUITPY_ALARM = 0
-# Turn off analogio because calibration is currently supported.
-# https://github.com/espressif/esp-idf/issues/11038
-CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
-CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_RGBMATRIX = 0
+
+# No I80 support from the IDF
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+
 CIRCUITPY_TOUCHIO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
@@ -407,7 +407,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
-    #ifndef CONFIG_IDF_TARGET_ARCH_RISCV
+    #if CIRCUITPY_DEBUG
     esp_backtrace_print(100);
     #endif
     esp_restart();
diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c
@@ -32,7 +32,9 @@
 #include "shared/readline/readline.h"
 
 #include "hal/gpio_ll.h"
-#include "hal/usb_hal.h"
+
+#include "esp_err.h"
+#include "esp_private/usb_phy.h"
 #include "soc/usb_periph.h"
 
 #include "driver/gpio.h"
@@ -60,6 +62,8 @@
 StackType_t usb_device_stack[USBD_STACK_SIZE];
 StaticTask_t usb_device_taskdef;
 
+static usb_phy_handle_t phy_hdl;
+
 // USB Device Driver task
 // This top level thread process all usb events and invoke callbacks
 STATIC void usb_device_task(void *param) {
@@ -76,37 +80,13 @@ STATIC void usb_device_task(void *param) {
     }
 }
 
-static void configure_pins(usb_hal_context_t *usb) {
-    /* usb_periph_iopins currently configures USB_OTG as USB Device.
-     * Introduce additional parameters in usb_hal_context_t when adding support
-     * for USB Host.
-     */
-    for (const usb_iopin_dsc_t *iopin = usb_periph_iopins; iopin->pin != -1; ++iopin) {
-        if ((usb->use_external_phy) || (iopin->ext_phy_only == 0)) {
-            gpio_pad_select_gpio(iopin->pin);
-            if (iopin->is_output) {
-                gpio_matrix_out(iopin->pin, iopin->func, false, false);
-            } else {
-                gpio_matrix_in(iopin->pin, iopin->func, false);
-                gpio_pad_input_enable(iopin->pin);
-            }
-            gpio_pad_unhold(iopin->pin);
-        }
-    }
-    if (!usb->use_external_phy) {
-        gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
-        gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
-    }
-}
-
 void init_usb_hardware(void) {
-    periph_module_reset(PERIPH_USB_MODULE);
-    periph_module_enable(PERIPH_USB_MODULE);
-    usb_hal_context_t hal = {
-        .use_external_phy = false // use built-in PHY
+    // Configure USB PHY
+    usb_phy_config_t phy_conf = {
+        .controller = USB_PHY_CTRL_OTG,
+        .otg_mode = USB_OTG_MODE_DEVICE,
     };
-    usb_hal_init(&hal);
-    configure_pins(&hal);
+    usb_new_phy(&phy_conf, &phy_hdl);
 
     // Pin the USB task to the same core as CircuitPython. This way we leave
     // the other core for networking.
diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c
@@ -42,7 +42,7 @@ STATIC ringbuf_t ringbuf;
 STATIC uint8_t buf[128];
 STATIC volatile bool connected;
 
-#if CIRCUITPY_ESP_USB_SERIAL_JTAG && !CONFIG_ESP_PHY_ENABLE_USB
+#if CIRCUITPY_ESP_USB_SERIAL_JTAG && defined(SOC_WIFI_PHY_NEEDS_USB_WORKAROUND) && !defined(CONFIG_ESP_PHY_ENABLE_USB)
 #error "CONFIG_ESP_PHY_ENABLE_USB must be enabled in sdkconfig"
 #endif
 
diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py
@@ -56,6 +56,7 @@
     "CONFIG_BT_CTRL_PINNED_TO_CORE",
     "CONFIG_SPIRAM_SPEED_2",
     "CONFIG_SPIRAM_BANKSWITCH_ENABLE",  # For ESP32
+    "CONFIG_ESP_WIFI_RX_IRAM_OPT",
 ]
 
 BOARD_SETTINGS = [
@@ -360,6 +361,11 @@ def update(debug, board, update_all):
                     target_kconfig_snippets.add(loc)
                     target_symbols = target_symbols.union(differing_keys)
 
+            # We treat SPIRAM differently so make sure it isn't a target related
+            # symbol (even though some targets don't support SPIRAM).
+            if "SPIRAM" in target_symbols:
+                target_symbols.remove("SPIRAM")
+
             # kconfig settings can be set by others. item.referenced doesn't
             # know this. So we collect all things that reference this using
             # rev_dep.
@@ -428,7 +434,9 @@ def update(debug, board, update_all):
                     # Always document the above settings. Settings below should
                     # be non-default.
                     pass
-                elif matches_group(config_string, PSRAM_SETTINGS) or psram_reference:
+                elif matches_group(config_string, PSRAM_SETTINGS) or (
+                    psram_reference and not target_setting
+                ):
                     print("  " * (len(current_group) + 1), "psram shared")
                     last_psram_group = add_group(psram_settings, last_psram_group, current_group)
                     psram_settings.append(config_string)

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,11 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`151`	`151`	`uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS;`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (receiver_buffer_size <= UART_FIFO_LEN) {`
`155`		`- receiver_buffer_size = UART_FIFO_LEN + 8;`
	`154`	`+ if (receiver_buffer_size <= UART_HW_FIFO_LEN(self->uart_num)) {`
	`155`	`+ receiver_buffer_size = UART_HW_FIFO_LEN(self->uart_num) + 8;`
`156`	`156`	`}`
`157`	`157`
`158`		`- uart_config.rx_flow_ctrl_thresh = UART_FIFO_LEN - 8;`
	`158`	`+ uart_config.rx_flow_ctrl_thresh = UART_HW_FIFO_LEN(self->uart_num) - 8;`
`159`	`159`	`// Install the driver before we change the settings.`
`160`	`160`	`if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK \|\|`
`161`	`161`	`uart_set_mode(self->uart_num, mode) != ESP_OK) {`