Merge branch 'espressif:master' into master

Author: Jason2866

.gitlab-ci.yml

@@ -30,3 +30,7 @@ include:
   - ".gitlab/ci/deploy.yml"
   - ".gitlab/ci/post_deploy.yml"
   - ".gitlab/ci/test-win.yml"
+  - project: "ci/actions/common"
+    file: "templates/idf/deploy-github.yml"
+  - project: "ci/actions/common"
+    file: "templates/idf/deploy-docs.yml"

.gitlab/CODEOWNERS

@@ -98,6 +98,7 @@
 /components/esp_hal_ieee802154/       @esp-idf-codeowners/ieee802154
 /components/esp_hal_pmu/              @esp-idf-codeowners/power-management @esp-idf-codeowners/peripherals
 /components/esp_hal_rtc_timer/        @esp-idf-codeowners/power-management @esp-idf-codeowners/peripherals
+/components/esp_hal_security/         @esp-idf-codeowners/security @esp-idf-codeowners/peripherals
 /components/esp_hid/                  @esp-idf-codeowners/bluetooth
 /components/esp_http_client/          @esp-idf-codeowners/app-utilities
 /components/esp_http_server/          @esp-idf-codeowners/app-utilities
@@ -133,8 +134,6 @@
 /components/fatfs/                    @esp-idf-codeowners/storage
 /components/freertos/                 @esp-idf-codeowners/system
 /components/hal/                      @esp-idf-codeowners/peripherals
-/components/hal/test_apps/crypto/     @esp-idf-codeowners/peripherals @esp-idf-codeowners/security
-/components/hal/test_apps/tee/        @esp-idf-codeowners/peripherals @esp-idf-codeowners/security
 /components/heap/                     @esp-idf-codeowners/system
 /components/http_parser/              @esp-idf-codeowners/app-utilities
 /components/ieee802154/               @esp-idf-codeowners/ieee802154

.gitlab/ci/common.yml

@@ -382,7 +382,7 @@ variables:
     - MIRROR_REPO_URL="${LOCAL_GIT_MIRROR}/${CI_PROJECT_PATH}"
     - cd "${CI_PROJECT_DIR}"
     # since .cache exists in CI_PROJECT_DIR, so can't direct `git clone .`
-    - git clone -b ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_COMMIT_BRANCH}} --depth=1 --recursive --shallow-submodules "${MIRROR_REPO_URL}" tmp
+    - git clone -b ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_COMMIT_REF_NAME}} --depth=1 --recursive --shallow-submodules "${MIRROR_REPO_URL}" tmp
     - mv tmp/.git ./
     - rm -rf tmp
     - git reset --hard

.gitlab/ci/deploy.yml

@@ -47,28 +47,6 @@ check_submodule_sync:
     - git submodule update --recursive
     - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"
 
-push_to_github:
-  extends:
-    - .deploy_job_template
-    - .before_script:minimal
-    - .rules:protected:deploy
-  needs:
-    # submodule must be synced before pushing to github
-    - check_submodule_sync
-  tags: [ brew, github_sync ]
-  variables:
-    GIT_STRATEGY: fetch  # use brew local mirror first
-    GIT_DEPTH: 0  # github needs full record of commits
-  script:
-    - add_github_ssh_keys
-    - git remote remove github &>/dev/null || true
-    - git remote add github git@github.com:espressif/esp-idf.git
-    - tools/ci/push_to_github.sh
-  environment:
-    name: push_to_github_production
-    deployment_tier: production
-    url: "https://github.com/espressif/esp-idf"
-
 deploy_update_SHA_in_esp-dockerfiles:
   extends:
     - .deploy_job_template

.gitlab/ci/docs.yml

@@ -95,7 +95,7 @@ check_docs_lang_sync:
   parallel:
     matrix:
       - DOCLANG: ["en", "zh_CN"]
-        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2", "esp32c6", "esp32c61", "esp32c5", "esp32h2", "esp32h4", "esp32h21", "esp32p4"]
+        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32s31", "esp32c3", "esp32c2", "esp32c6", "esp32c61", "esp32c5", "esp32h2", "esp32h4", "esp32h21", "esp32p4"]
 
 check_docs_gh_links:
   image: $ESP_IDF_DOC_ENV_IMAGE
@@ -143,77 +143,6 @@ build_docs_html_partial:
       - DOCLANG: "zh_CN"
         DOCTGT: "esp32p4"
 
-.deploy_docs_template:
-  image: $ESP_IDF_DOC_ENV_IMAGE
-  variables:
-    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
-    PYTHONUNBUFFERED: 1
-    # ensure all tags are fetched, need to know the latest/stable tag for the docs
-    GIT_STRATEGY: clone
-    GIT_DEPTH: 0
-  stage: test_deploy
-  tags:
-    - brew
-    - amd64
-  script:
-    # ensure all tags are fetched, need to know the latest/stable tag for the docs
-    - git fetch --tags --prune
-    - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
-    - export GIT_VER=$(git describe --always ${PIPELINE_COMMIT_SHA} --)
-    - deploy-docs
-
-# stage: test_deploy
-deploy_docs_preview:
-  extends:
-    - .deploy_docs_template
-  rules:
-    - <<: *if-label-build_docs
-    - <<: *if-label-docs_full
-    - <<: *if-dev-push
-      changes: *patterns-docs-preview
-  needs:
-    - job: build_docs_html_partial
-      optional: true
-    - job: build_docs_html_full
-      optional: true
-  variables:
-    TYPE: "preview"
-    # older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
-    DOCS_DEPLOY_PRIVATEKEY: "$DOCS_DEPLOY_KEY"
-    DOCS_DEPLOY_SERVER: "$DOCS_SERVER"
-    DOCS_DEPLOY_SERVER_USER: "$DOCS_SERVER_USER"
-    DOCS_DEPLOY_PATH: "$DOCS_PATH"
-    DOCS_DEPLOY_URL_BASE: "https://$DOCS_PREVIEW_SERVER_URL/docs/esp-idf"
-  environment:
-    name: deploy_docs_preview
-    deployment_tier: staging
-    url: "https://$DOCS_PREVIEW_SERVER_URL/docs/esp-idf"
-
-# stage: post_deploy
-deploy_docs_production:
-  # The DOCS_PROD_* variables used by this job are "Protected" so these branches must all be marked "Protected" in Gitlab settings
-  extends:
-    - .deploy_docs_template
-    - .rules:protected:deploy
-  stage: post_deploy
-  dependencies:  # set dependencies to null to avoid missing artifacts issue
-  needs: # ensure runs after push_to_github succeeded
-    - build_docs_html_full
-    - job: push_to_github
-      artifacts: false
-  variables:
-    TYPE: "preview"
-    DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY"
-    DOCS_DEPLOY_SERVER: "$DOCS_PROD_SERVER"
-    DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER"
-    DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH"
-    DOCS_DEPLOY_URL_BASE: "https://docs.espressif.com/projects/esp-idf"
-    DEPLOY_STABLE: 1
-  environment:
-    name: deploy_docs_production
-    deployment_tier: production
-    url: "https://docs.espressif.com/projects/esp-idf"
-
 check_doc_links:
   extends:
     - .build_docs_template

.idf_build_apps.toml

@@ -43,7 +43,9 @@ manifest_filepatterns = [
 ]
 
 # dependency-driven build
-deactivate_dependency_driven_build_by_components = [
+deactivate_dependency_driven_build_by_components = []
+
+common_components = [
     'cxx',
     'esp_common',
     'esp_hw_support',

COMPATIBILITY.md

@@ -82,6 +82,8 @@ Supported since ESP-IDF v4.3.
 | release/v5.1           | v5.1.3+     | v5.1.3   |
 | release/v5.2 and above | v5.2+       | v5.2     |
 
+Note: For users that needs to use a different primary console output than the default UART0, please upgrade to v5.0.8+, v5.1.6+, v5.2.4+, v5.3.2+, v5.4 and above. See advisory: [AR2025-006](https://documentation.espressif.com/AR2025-006_Usage_Instructions_for_Configuring_the_Console_Output_Channel_for_the_ESP32-C3_Chip_Revision_v1.1.html).
+
 ### ESP32-S3
 
 #### v0.1, v0.2
@@ -154,11 +156,27 @@ Supported since ESP-IDF v5.3.
 
 ### ESP32-C5
 
-Supported since ESP-IDF v5.5.1.
+#### v1.0
+
+Supported since ESP-IDF v5.5.2.
+
+#### v1.2
+
+| Release branch         | Recommended | Required |
+|------------------------|-------------|----------|
+| release/v5.5 and above | v5.5.2+     | v5.5.2   |
 
 ### ESP32-C61
 
-Supported since ESP-IDF v5.5.1.
+#### v1.0
+
+Supported since ESP-IDF v5.5.2.
+
+#### v1.1
+
+| Release branch         | Recommended | Required |
+|------------------------|-------------|----------|
+| release/v5.5 and above | v5.5.2+     | v5.5.2   |
 
 ### ESP32-H4
 

COMPATIBILITY_CN.md

@@ -82,6 +82,8 @@
 | release/v5.1           | v5.1.3+     | v5.1.3   |
 | release/v5.2 及以上     | v5.2+       | v5.2     |
 
+注意：对于需要使用不同于默认 UART0 的主控制台输出的用户，请升级到 v5.0.8+、v5.1.6+、v5.2.4+、v5.3.2+、v5.4 及以上版本。参阅公告： [AR2025-006](https://documentation.espressif.com/AR2025-006_%E5%85%B3%E4%BA%8EESP32-C3%E8%8A%AF%E7%89%87%E7%89%88%E6%9C%ACv1.1%E9%85%8D%E7%BD%AEconsole%E8%BE%93%E5%87%BA%E9%80%9A%E9%81%93%E7%9A%84%E6%B3%A8%E6%84%8F%E4%BA%8B%E9%A1%B9.html).
+
 ### ESP32-S3
 
 #### v0.1, v0.2
@@ -154,11 +156,27 @@
 
 ### ESP32-C5
 
-从 ESP-IDF v5.5.1 开始支持。
+#### v1.0
+
+从 ESP-IDF v5.5.2 开始支持。
+
+#### v1.2
+
+| 发布分支             | 推荐版本  | 需求版本 |
+|---------------------|----------|---------|
+| release/v5.5 及以上  | v5.5.2+  | v5.5.2  |
 
 ### ESP32-C61
 
-从 ESP-IDF v5.5.1 开始支持。
+#### v1.0
+
+从 ESP-IDF v5.5.2 开始支持。
+
+#### v1.1
+
+| 发布分支             | 推荐版本  | 需求版本  |
+|---------------------|----------|---------|
+| release/v5.5 及以上  | v5.5.2+  | v5.5.2  |
 
 ### ESP32-H4
 

Kconfig

@@ -159,6 +159,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
     config IDF_TARGET_LINUX
         bool
         default "y" if IDF_TARGET="linux"
+        select FREERTOS_UNICORE
 
     config IDF_FIRMWARE_CHIP_ID
         hex

components/app_trace/port/port_uart.c

@@ -11,19 +11,19 @@
 #include "esp_log.h"
 #include "esp_cpu.h"
 #include "esp_attr.h"
-#include "esp_private/uart_share_hw_ctrl.h"
 #include "hal/uart_hal.h"
 #include "hal/gpio_hal.h"
 #include "driver/uart.h"
 #include "hal/uart_periph.h"
 #include "esp_clk_tree.h"
-#include "esp_private/esp_clk_tree_common.h"
 #include "soc/gpio_periph.h"
 #include "esp_rom_gpio.h"
 #include "hal/uart_ll.h"
 #include "esp_intr_alloc.h"
 #include "esp_heap_caps.h"
+#include "esp_private/esp_clk_tree_common.h"
 #include "esp_private/esp_gpio_reserve.h"
+#include "esp_private/periph_ctrl.h"
 
 #include "esp_app_trace_port.h"
 #include "esp_app_trace_util.h"
@@ -244,11 +244,11 @@ static esp_err_t esp_apptrace_uart_init(void *hw_data, const esp_apptrace_config
 
         uart_data->hal_ctx.dev = UART_LL_GET_HW(uart_config->uart_num);
 
-        HP_UART_BUS_CLK_ATOMIC() {
+        PERIPH_RCC_ATOMIC() {
             uart_ll_enable_bus_clock(uart_config->uart_num, true);
             uart_ll_reset_register(uart_config->uart_num);
         }
-        HP_UART_SRC_CLK_ATOMIC() {
+        PERIPH_RCC_ATOMIC() {
             uart_ll_sclk_enable(uart_data->hal_ctx.dev);
         }
 
@@ -260,7 +260,7 @@ static esp_err_t esp_apptrace_uart_init(void *hw_data, const esp_apptrace_config
         /* Initialize UART HAL (sets default 8N1 mode) */
         uart_hal_init(&uart_data->hal_ctx, uart_config->uart_num);
 
-        HP_UART_SRC_CLK_ATOMIC() {
+        PERIPH_RCC_ATOMIC() {
             uart_hal_set_sclk(&uart_data->hal_ctx, UART_SCLK_DEFAULT);
             uart_hal_set_baudrate(&uart_data->hal_ctx, uart_config->baud_rate, sclk_hz);
         }
@@ -338,10 +338,10 @@ static esp_err_t esp_apptrace_uart_init(void *hw_data, const esp_apptrace_config
     heap_caps_free(uart_data->tx_ring.buffer);
 err_init_ring_buff:
     esp_clk_tree_enable_src(UART_SCLK_DEFAULT, false);
-    HP_UART_SRC_CLK_ATOMIC() {
+    PERIPH_RCC_ATOMIC() {
         uart_ll_sclk_disable(uart_data->hal_ctx.dev);
     }
-    HP_UART_BUS_CLK_ATOMIC() {
+    PERIPH_RCC_ATOMIC() {
         uart_ll_enable_bus_clock(uart_config->uart_num, false);
     }
     esp_gpio_revoke(gpio_mask);