Merge branch 'espressif:master' into master

Author: Jason2866

.github/ISSUE_TEMPLATE/01_build_install_bug.yml

@@ -95,6 +95,26 @@ body:
       render: plain
     validations:
       required: false
+  - type: textarea
+    id: diag
+    attributes:
+      label: Diagnostic report archive.
+      description: |
+        Diagnostic report for ESP-IDF created using [idf.py diag](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-diag.html) or [esp-idf-diag](https://github.com/espressif/esp-idf-diag). The `idf.py diag` command is available beginning with ESP-IDF version 5.5. For older versions, you may want to consider using the `esp-idf-diag` command.
+
+        In your project directory, execute the following command:
+
+        Using `idf.py diag`
+           1. idf.py diag
+
+        Using `esp-idf-diag`
+           1. pip install esp-idf-diag
+           2. esp-idf-diag create
+
+        Once the report is generated, the tool will guide you with the next steps.
+      placeholder: Please attach the diagnostic report zip file here.
+    validations:
+      required: false
   - type: textarea
     id: more-info
     attributes:

.github/ISSUE_TEMPLATE/02_runtime_bug.yml

@@ -123,6 +123,26 @@ body:
       render: plain
     validations:
       required: false
+  - type: textarea
+    id: diag
+    attributes:
+      label: Diagnostic report archive.
+      description: |
+        Diagnostic report for ESP-IDF created using [idf.py diag](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-diag.html) or [esp-idf-diag](https://github.com/espressif/esp-idf-diag). The `idf.py diag` command is available beginning with ESP-IDF version 5.5. For older versions, you may want to consider using the `esp-idf-diag` command.
+
+        In your project directory, execute the following command:
+
+        Using `idf.py diag`
+           1. idf.py diag
+
+        Using `esp-idf-diag`
+           1. pip install esp-idf-diag
+           2. esp-idf-diag create
+
+        Once the report is generated, the tool will guide you with the next steps.
+      placeholder: Please attach the diagnostic report zip file here.
+    validations:
+      required: false
   - type: textarea
     id: more-info
     attributes:

.gitlab/CODEOWNERS

@@ -106,7 +106,8 @@
 /components/esp_partition/            @esp-idf-codeowners/storage
 /components/esp_phy/                  @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
 /components/esp_pm/                   @esp-idf-codeowners/power-management @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/system
-/components/esp_psram/                @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/esp_psram/                @esp-idf-codeowners/peripherals
+/components/esp_psram/system_layer/   @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
 /components/esp_ringbuf/              @esp-idf-codeowners/system
 /components/esp_rom/                  @esp-idf-codeowners/system @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi
 /components/esp_security/             @esp-idf-codeowners/security

.gitlab/ci/default-build-test-rules.yml

@@ -13,6 +13,7 @@ extra_default_build_targets:
 
 bypass_check_test_targets:
   - esp32h21
+  - esp32h4
 
 #
 # These lines would

.gitlab/ci/host-test.yml

@@ -34,6 +34,7 @@ check_public_headers:
     - IDF_TARGET=esp32p4 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
     - IDF_TARGET=esp32c61 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
     - IDF_TARGET=esp32h21 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
+    - IDF_TARGET=esp32h4 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
 
 test_nvs_coverage:
   extends:

.gitlab/ci/rules.yml

@@ -35,6 +35,7 @@
   # Add folders excluded by "???[!t]" and "??[!s]?"
   # pre-commit: tools/ci/check_rules_components_patterns.py
   - "components/bt/host/**/*"
+  - "components/esp_psram/system_layer/*"
 
 .patterns-downloadable-tools: &patterns-downloadable-tools
   - "tools/idf_tools.py"

.pre-commit-config.yaml

@@ -223,7 +223,7 @@ repos:
       - id: file-contents-sorter
         files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt|check_copyright_ignore\.txt)'
   - repo: https://github.com/espressif/check-copyright/
-    rev: v1.1.0
+    rev: v1.1.1
     hooks:
       - id: check-copyright
         args: ['--ignore', 'tools/ci/check_copyright_ignore.txt', '--config', 'tools/ci/check_copyright_config.yaml']

Kconfig

@@ -147,6 +147,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
     config IDF_TARGET_ESP32H4
         bool
         default "y" if IDF_TARGET="esp32h4"
+        select FREERTOS_UNICORE  # TODO: [ESP32H4] IDF-12319, need remove
         select IDF_TARGET_ARCH_RISCV
         select IDF_ENV_FPGA
         select IDF_ENV_BRINGUP

ROADMAP.md

@@ -31,6 +31,10 @@ Below are the main objectives that ESP-IDF project/teams would like to implement
     -   Do more bugfix releases for IDF v5.2 and IDF v5.3 before release/5.2 and release/5.3 enter maintenance period
     -   Do more bug fixes releases for release/5.4 and release/5.5, and push the two releases to be more stable and production-ready
 
+-   Major Changes
+
+    -   We plan to upgrade MbedTLS to v4.x series in IDF v6.0. In addition, we will also be migrating to newer PSA crypto API as part of this upgrade. Please note that this may involve some breaking changes on the application side for the crypto API usage.
+
 Please note that support status of previous silicones could be found on [ESP-IDF Release and SoC Compatibility](https://github.com/espressif/esp-idf#esp-idf-release-and-soc-compatibility).
 
 ### Roadmap Details
@@ -50,7 +54,7 @@ Below are the main roadmap details for functional areas inside ESP-IDF.
 
     -   Do bugfix releases v5.0.8 and v5.0.9 and stop maintaining ESP-IDF v5.0 in May 2025
     -   Do bugfix releases v5.1.6 and v5.1.7 and stop maintaining ESP-IDF v5.1 in December 2025
-    -   Release bugfix IDF v5.2.4 and IDF v5.2.5 in 2025, and push release/5.2 to maintenance period from February 2025
+    -   Release bugfix IDF v5.2.4, IDF v5.2.5 and IDF v5.2.6 in 2025, and push release/5.2 to maintenance period from February 2025
     -   Release bugfix IDF v5.3.3 and IDF v5.3.4 in 2025, and push release/5.3 to maintenance period from July 2025
     -   Do more bug fixes releases for release/5.4 (IDF v5.4.1, IDF v5.4.2, IDF v5.4.3) and release/5.5 (IDF v5.5.1, IDF v5.5.2), and push releases to be more stable and more production-ready
 
@@ -79,9 +83,6 @@ timeline
           v6.0-RC2 : 2026/02/06  
           v6.0 : 2026/02/13   
 ```
-
-> [!NOTE]
-> However for the December release, we are also considering another minor version v5.6. We would consolidate the planning in the middle of 2025 and replace v6.0 with v5.6 if v5.6 version planning is decided.
 
 ### ESP-IDF Minor Releases
 
@@ -111,15 +112,16 @@ timeline
         section 2025 Q1 <br> Bugfix Release Planning
           v5.0.8 : 2025/01/14
           v5.1.6 : 2025/02/18
-          v5.2.4 : 2025/02/23        
+          v5.2.4 : 2025/02/23
+          v5.2.5 : 2025/02/28     
           v5.4.1 : 2025/03/27
           v5.3.3 : 2025/04/04                
         section 2025 Q2 <br> Bugfix Release Planning
           v5.0.9 : 2025/05/16
           v5.4.2 : 2025/06/30 
         section 2025 Q3 <br> Bugfix Release Planning
           v5.3.4 : 2025/08/03
-          v5.2.5 : 2025/09/04
+          v5.2.6 : 2025/09/04
           v5.5.1 : 2025/09/11   
           v5.4.3 : 2025/10/08
         section 2025 Q4 <br> Bugfix Release Planning

ROADMAP_CN.md

@@ -31,6 +31,10 @@
 	* 在 release/5.2 分支和 release/5.3 分支进入维护周期之前，发布更多 bugfix 版本
 	* release/5.4 分支和 release/5.5 分支发布更多 bugfix 版本，使这两个分支更加稳定和产品化
 
+* 重大变更
+
+	* 我们计划在 IDF v6.0 中将 MbedTLS 版本升级到 v4.x。另外，我们还会在升级中迁移到更新版的 PSA 加密 API，但请注意，这可能会导致应用程序端在使用加密 API 时出现一些非兼容性更新。
+
 请注意，获取之前芯片的支持状态，请参阅 [ESP-IDF 发布和 SoC 兼容性](https://github.com/espressif/esp-idf/blob/master/README_CN.md#esp-idf-与乐鑫芯片)。
 
 ### 路线图细节
@@ -50,7 +54,7 @@ ESP-IDF 项目重视持续维护和更新，确保我们的客户始终处于技
 
 	* 发布 Bugfix 版本 IDF v5.0.8 和 IDF v5.0.9，并在 2025 年 5 月底停止维护 ESP-IDF v5.0
 	* 发布 Bugfix 版本 IDF v5.1.6 和 IDF v5.1.7，并在 2025 年 12 月底停止维护 ESP-IDF v5.1
-	* 发布 Bugfix 版本 IDF v5.2.4 和 IDF v5.2.5，release/5.2 分支自 2025 年 2 月进入维护周期
+	* 发布 Bugfix 版本 IDF v5.2.4，IDF v5.2.5 和 IDF v5.2.6，release/5.2 分支自 2025 年 2 月进入维护周期
 	* 发布 Bugfix 版本 IDF v5.3.3 和 IDF v5.3.4，release/5.3 分支自 2025 年 7 月进入维护周期
 	* release/5.4 分支发布更多 bugfix 版本，包括 IDF v5.4.1、IDF v5.4.2、IDF v5.4.3；release/5.5 分支发布更多 bugfix 版本，包括 IDF v5.5.1、IDF v5.5.2。通过发布这些 Bugfix 版本，使 release/5.4 分支和 release/5.5 分支更加稳定和产品化。
 
@@ -79,9 +83,6 @@ timeline
           v6.0-RC2 : 2026/02/06  
           v6.0 : 2026/02/13   
 ```
-
-> [!NOTE]
-> 但对于 12 月份的发布，我们也在考虑发布另外一个次要版本。我们将在 2025 年中期确定 v5.6 的计划，如一经确定，我们将把 12 月份的 v6.0 发布变更为 v5.6 发布。
 
 ### ESP-IDF 次要版本发布
 
@@ -111,15 +112,16 @@ timeline
         section 2025 Q1 <br> Bugfix Release Planning
           v5.0.8 : 2025/01/14
           v5.1.6 : 2025/02/18
-          v5.2.4 : 2025/02/23        
+          v5.2.4 : 2025/02/23
+          v5.2.5 : 2025/02/28         
           v5.4.1 : 2025/03/27
           v5.3.3 : 2025/04/04                
         section 2025 Q2 <br> Bugfix Release Planning
           v5.0.9 : 2025/05/16
           v5.4.2 : 2025/06/30 
         section 2025 Q3 <br> Bugfix Release Planning
           v5.3.4 : 2025/08/03
-          v5.2.5 : 2025/09/04
+          v5.2.6 : 2025/09/04
           v5.5.1 : 2025/09/11   
           v5.4.3 : 2025/10/08
         section 2025 Q4 <br> Bugfix Release Planning