Merge branch 'espressif:master' into main

Author: Jason2866

.github/workflows/cron.yml

@@ -38,9 +38,9 @@ jobs:
           # - idf_branch: "release/v5.3"
           #   lib_builder_branch: "release/v5.3"
           #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
-          - idf_branch: "release/v5.4"
-            lib_builder_branch: "master"
-            targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
+          # - idf_branch: "release/v5.4"
+          #   lib_builder_branch: "release/v5.4"
+          #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
           - idf_branch: "release/v5.5"
-            lib_builder_branch: "release/v5.5"
+            lib_builder_branch: "master"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5"

.github/workflows/push.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
+        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4, esp32c5]
       fail-fast: false
     steps:
     - name: Checkout repository

build.sh

@@ -226,7 +226,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
     if [ $? -ne 0 ]; then exit 1; fi
 
-    if [ "$target" == "esp32s3" ]; then
+    if [ "$target" == "esp32s3" ] || [ "$target" == "esp32p4" ]; then
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" srmodels_bin
         if [ $? -ne 0 ]; then exit 1; fi
         AR_SDK="$AR_TOOLS/esp32-arduino-libs/$target"

clean.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+rm -rf build dist managed_components out sdkconfig dependencies.lock

configs/builds.json

@@ -4,7 +4,7 @@
 			"file":"libspi_flash.a",
 			"src":"build/esp-idf/spi_flash/libspi_flash.a",
 			"out":"lib/libspi_flash.a",
-			"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4"]
+			"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32c5"]
 		},
 		{
 			"file":"libesp_psram.a",
@@ -45,7 +45,7 @@
 	],
 	"targets":[
 		{
-			"target": "esp32p4",
+			"target": "esp32c5",
 			"features":["qio_ram"],
 			"idf_libs":["qio","80m"],
 			"bootloaders":[
@@ -58,6 +58,20 @@
 				["dio","80m"]
 			]
 		},
+		{
+			"target": "esp32p4",
+			"features":["qio_ram","esp_sr"],
+			"idf_libs":["qio","80m_200m"],
+			"bootloaders":[
+				["qio","80m_200m"],
+				["dio","80m_200m"],
+				["qio","40m_200m"],
+				["dio","40m_200m"]
+			],
+			"mem_variants":[
+				["dio","80m_200m"]
+			]
+		},
 		{
 			"target": "esp32c2",
 			"skip": 1,

configs/defconfig.40m_200m

@@ -0,0 +1,2 @@
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_SPIRAM_SPEED_200M=y

configs/defconfig.80m_200m

@@ -0,0 +1,2 @@
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_SPIRAM_SPEED_200M=y

configs/defconfig.common

@@ -57,6 +57,7 @@ CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
 CONFIG_LWIP_TCP_SYNMAXRTX=6
 CONFIG_LWIP_TCP_MSS=1436
 CONFIG_LWIP_TCP_RTO_TIME=3000
+CONFIG_LWIP_TCP_SACK_OUT=y
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_MAX_SOCKETS=16
@@ -111,6 +112,7 @@ CONFIG_DIAG_ENABLE_HEAP_METRICS=y
 CONFIG_DIAG_ENABLE_WIFI_METRICS=y
 CONFIG_DIAG_ENABLE_VARIABLES=y
 CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
+CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
 CONFIG_ESP_COREDUMP_ENABLE=y
 CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
 CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
@@ -125,12 +127,17 @@ CONFIG_I2S_ISR_IRAM_SAFE=y
 # Matter Settings
 #
 # Disable Matter BLE
-CONFIG_ENABLE_CHIPOBLE=n
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 # ESP Insights
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
+# Do not use minimal mDNS within Matter Core
+CONFIG_USE_MINIMAL_MDNS=n
+# Changes Matter Memory Allocation Mode to use the default malloc() that can use PSRAM is enabled
+CONFIG_ESP_MATTER_MEM_ALLOC_MODE_DEFAULT=y
+# Disable default mode that only allocates memory from DRAM
+CONFIG_ESP_MATTER_MEM_ALLOC_MODE_INTERNAL=n
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2

configs/defconfig.esp32

@@ -20,3 +20,9 @@ CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
+# increase the maximum number of endpoints per device
+CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=32
+

configs/defconfig.esp32c2

@@ -1,7 +1,13 @@
 CONFIG_XTAL_FREQ_26=y
 CONFIG_XTAL_FREQ=26
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
+CONFIG_BT_NIMBLE_NVS_PERSIST=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304