change(version): Update version to 6.1-dev

Start of v6.1 development

.codespellrc

@@ -1,4 +1,4 @@
 [codespell]
-skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,components/newlib/COPYING.*
+skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,*/COPYING*,docs/sphinx-known-warnings.txt
 ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen,parms
 write-changes = true

.github/ISSUE_TEMPLATE/02_runtime_bug.yml

@@ -26,7 +26,7 @@ body:
     id: chip_revision
     attributes:
       label: Espressif SoC revision.
-      description: On which Espressif SoC revision does your application run on? Run `esptool chip_id` to find it.
+      description: On which Espressif SoC revision does your application run on? Run `esptool chip-id` to find it.
       placeholder: ex. ESP32-C3 (QFN32) (revision v0.3)
     validations:
       required: true

.github/workflows/docker.yml

@@ -21,7 +21,7 @@ jobs:
     # Disable the job in forks
     if: ${{ github.repository_owner == 'espressif' }}
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-X64-large
     steps:
       # Depending on the branch/tag, set CLONE_BRANCH_OR_TAG variable (used in the Dockerfile
       # as a build arg) and TAG_NAME (used when tagging the image).

.github/workflows/issue_comment.yml

@@ -14,10 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Sync issue comments to JIRA
-        uses: espressif/github-actions/sync_issues_to_jira@master
+        uses: espressif/sync-jira-actions@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_PASS: ${{ secrets.JIRA_PASS }}
           JIRA_PROJECT: IDFGH
           JIRA_URL: ${{ secrets.JIRA_URL }}
           JIRA_USER: ${{ secrets.JIRA_USER }}
+          WEBHOOK_URL: ${{ secrets.JIRA_ISSUE_COMMENT_WEBHOOK_URL }}

.github/workflows/new_issues.yml

@@ -14,10 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Sync GitHub issues to Jira project
-        uses: espressif/github-actions/sync_issues_to_jira@master
+        uses: espressif/sync-jira-actions@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JIRA_PASS: ${{ secrets.JIRA_PASS }}
           JIRA_PROJECT: IDFGH
           JIRA_URL: ${{ secrets.JIRA_URL }}
           JIRA_USER: ${{ secrets.JIRA_USER }}
+          WEBHOOK_URL: ${{ secrets.JIRA_ISSUE_COMMENT_WEBHOOK_URL }}

.github/workflows/pre_commit_check.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@master
         with:
-          python-version: v3.8
+          python-version: "3.10"
       - name: Install python packages
         run: |
           pip install pre-commit

.gitignore

@@ -37,6 +37,7 @@ components/**/build/
 components/**/build_*_*/
 components/**/sdkconfig
 components/**/sdkconfig.old
+components/**/test_apps/wifi_nvs_config/nvs_data_suffix.csv
 
 # Example project files
 examples/**/build/
@@ -65,8 +66,6 @@ build_summary_*.xml
 coverage.info
 coverage_report/
 
-test_multi_heap_host
-
 # VS Code Settings
 .vscode/
 
@@ -99,7 +98,7 @@ managed_components
 pytest-embedded/
 # legacy one
 pytest_embedded_log/
-list_job*.txt
+app_info_*.txt
 size_info*.txt
 XUNIT_RESULT*.xml
 .manifest_sha

.gitlab-ci.yml

@@ -3,16 +3,14 @@ workflow:
     # Disable those non-protected push triggered pipelines
     - if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $CI_COMMIT_TAG !~ /^qa-test/ && $CI_PIPELINE_SOURCE == "push"'
       when: never
-    # when running merged result pipelines, CI_COMMIT_SHA represents the temp commit it created.
-    # Please use PIPELINE_COMMIT_SHA at all places that require a commit sha of the original commit.
-    - if: $CI_OPEN_MERGE_REQUESTS != null
+    # merged result pipelines
+    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA
       variables:
         PIPELINE_COMMIT_SHA: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA
-        IS_MR_PIPELINE: 1
-    - if: $CI_OPEN_MERGE_REQUESTS == null
+    # else
+    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA == null || $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA == ""
       variables:
         PIPELINE_COMMIT_SHA: $CI_COMMIT_SHA
-        IS_MR_PIPELINE: 0
     - when: always
 
 # Place the default settings in `.gitlab/ci/common.yml` instead

.gitlab/CODEOWNERS

@@ -2,5 +2,249 @@
 #
 #    https://docs.gitlab.com/ee/user/project/code_owners.html#the-syntax-of-code-owners-files
 #
+# If more than one rule matches a given file, the latest rule is used.
+# The file should be generally kept sorted, except when it is necessary
+# to use a different order due to the fact above. In that case, use
+# '# sort-order-reset' comment line to reset the sort order.
+#
+# Recipes for a few common cases:
+#
+# 1. Specific directory with all its contents:
+#
+#    /components/app_trace/
+#
+#    Note the trailing slash!
+#
+# 2. File with certain extension in any subdirectory of a certain directory:
+#
+#    /examples/**/*.py
+#
+#    This includes an *.py files in /examples/ directory as well.
+#
+# 3. Contents of a directory with a certain name, anywhere in the tree:
+#
+#    test_*_host/
+#
+#    Will match everything under components/efuse/test_efuse_host/,
+#    components/heap/test_multi_heap_host/, components/lwip/test_afl_host/, etc.
+#
+# 4. Same as above, except limited to a specific place in the tree:
+#
+#    /components/esp32*/
+#
+#    Matches everything under /components/esp32, /components/esp32s2, etc.
+#    Doesn't match /tools/some-test/components/esp32s5.
+#
+# 5. Specific file:
+#
+#    /tools/tools.json
+#
+# 6. File with a certain name anywhere in the tree
+#
+#    .gitignore
+#
 
-* @esp-idf-codeowners/all-maintainers
+* @esp-idf-codeowners/other
+
+/.*                                   @esp-idf-codeowners/tools
+/.codespellrc                         @esp-idf-codeowners/ci
+/.github/workflows/                   @esp-idf-codeowners/ci
+/.gitlab-ci.yml                       @esp-idf-codeowners/ci
+/.gitlab/ci/                          @esp-idf-codeowners/ci
+/.idf_build_apps.toml                 @esp-idf-codeowners/ci
+/.idf_ci.toml                         @esp-idf-codeowners/ci
+/.pre-commit-config.yaml              @esp-idf-codeowners/ci
+/.vale.ini                            @esp-idf-codeowners/docs
+/CMakeLists.txt                       @esp-idf-codeowners/build-config
+/COMPATIBILITY*.md                    @esp-idf-codeowners/peripherals
+/CONTRIBUTING.md                      @esp-idf-codeowners/docs
+/Kconfig                              @esp-idf-codeowners/build-config
+/README*.md                           @esp-idf-codeowners/docs
+/ROADMAP*.md                          @esp-idf-codeowners/docs
+/SUPPORT_POLICY*.md                   @esp-idf-codeowners/docs
+/add_path.sh                          @esp-idf-codeowners/tools
+/conftest.py                          @esp-idf-codeowners/ci
+/export.*                             @esp-idf-codeowners/tools
+/install.*                            @esp-idf-codeowners/tools
+/pytest.ini                           @esp-idf-codeowners/ci
+/ruff.toml                            @esp-idf-codeowners/tools
+/sdkconfig.rename                     @esp-idf-codeowners/build-config
+/sonar-project.properties             @esp-idf-codeowners/ci
+
+# sort-order-reset
+
+/components/app_trace/                @esp-idf-codeowners/debugging
+/components/app_update/               @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/bootloader*/              @esp-idf-codeowners/system @esp-idf-codeowners/security
+/components/bootloader_support/bootloader_flash/    @esp-idf-codeowners/peripherals
+/components/bt/                       @esp-idf-codeowners/bluetooth
+/components/cmock/                    @esp-idf-codeowners/system
+/components/console/                  @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities/console
+/components/cxx/                      @esp-idf-codeowners/system
+/components/driver/                   @esp-idf-codeowners/peripherals
+/components/efuse/                    @esp-idf-codeowners/system
+/components/esp_adc/                  @esp-idf-codeowners/peripherals
+/components/esp_app_format/           @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/esp_blockdev/             @esp-idf-codeowners/storage
+/components/esp_bootloader_format/    @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/esp_coex/                 @esp-idf-codeowners/wifi @esp-idf-codeowners/bluetooth @esp-idf-codeowners/ieee802154
+/components/esp_common/               @esp-idf-codeowners/system
+/components/esp_driver_*/             @esp-idf-codeowners/peripherals
+/components/esp_driver_sdmmc/         @esp-idf-codeowners/peripherals @esp-idf-codeowners/storage
+/components/esp_eth/                  @esp-idf-codeowners/network
+/components/esp_event/                @esp-idf-codeowners/system
+/components/esp_gdbstub/              @esp-idf-codeowners/debugging
+/components/esp_hal_*/                @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
+/components/esp_https_ota/            @esp-idf-codeowners/app-utilities
+/components/esp_https_server/         @esp-idf-codeowners/app-utilities
+/components/esp_hw_support/           @esp-idf-codeowners/system @esp-idf-codeowners/peripherals
+/components/esp_hw_support/lowpower/  @esp-idf-codeowners/power-management
+/components/esp_hw_support/usb_phy/   @esp-idf-codeowners/peripherals/usb
+/components/esp_lcd/                  @esp-idf-codeowners/peripherals
+/components/esp_libc/                 @esp-idf-codeowners/system @esp-idf-codeowners/toolchain
+/components/esp_local_ctrl/           @esp-idf-codeowners/app-utilities
+/components/esp_mm/                   @esp-idf-codeowners/peripherals
+/components/esp_netif/                @esp-idf-codeowners/network
+/components/esp_netif_stack/          @esp-idf-codeowners/network
+/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
+/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
+/components/esp_stdio/                @esp-idf-codeowners/storage @esp-idf-codeowners/system
+/components/esp_system/               @esp-idf-codeowners/system
+/components/esp_tee/                  @esp-idf-codeowners/security
+/components/esp_timer/                @esp-idf-codeowners/system
+/components/esp-tls/                  @esp-idf-codeowners/app-utilities
+/components/esp_usb_cdc_rom_console/  @esp-idf-codeowners/system @esp-idf-codeowners/peripherals/usb
+/components/esp_wifi/                 @esp-idf-codeowners/wifi
+/components/espcoredump/              @esp-idf-codeowners/debugging
+/components/esptool_py/               @esp-idf-codeowners/tools
+/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/idf_test/                 @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/ieee802154/               @esp-idf-codeowners/ieee802154
+/components/linux/                    @esp-idf-codeowners/system
+/components/log/                      @esp-idf-codeowners/system
+/components/lwip/                     @esp-idf-codeowners/lwip
+/components/mbedtls/                  @esp-idf-codeowners/app-utilities/mbedtls @esp-idf-codeowners/security
+/components/mqtt/                     @esp-idf-codeowners/network
+/components/nvs_flash/                @esp-idf-codeowners/storage
+/components/nvs_sec_provider/         @esp-idf-codeowners/storage @esp-idf-codeowners/security
+/components/openthread/               @esp-idf-codeowners/ieee802154
+/components/partition_table/          @esp-idf-codeowners/system
+/components/perfmon/                  @esp-idf-codeowners/debugging
+/components/protobuf-c/               @esp-idf-codeowners/app-utilities
+/components/protocomm/                @esp-idf-codeowners/app-utilities/provisioning
+/components/pthread/                  @esp-idf-codeowners/system
+/components/riscv/                    @esp-idf-codeowners/system
+/components/rt/                       @esp-idf-codeowners/system
+/components/sdmmc/                    @esp-idf-codeowners/storage
+/components/soc/                      @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/spi_flash/                @esp-idf-codeowners/peripherals
+/components/spiffs/                   @esp-idf-codeowners/storage
+/components/tcp_transport/            @esp-idf-codeowners/network
+/components/ulp/                      @esp-idf-codeowners/system
+/components/unity/                    @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/vfs/                      @esp-idf-codeowners/storage
+/components/wear_levelling/           @esp-idf-codeowners/storage
+/components/wpa_supplicant/           @esp-idf-codeowners/wifi @esp-idf-codeowners/app-utilities/mbedtls
+/components/xtensa/                   @esp-idf-codeowners/system
+
+/docs/                                      @esp-idf-codeowners/docs
+/docs/docs_not_updated/                     @esp-idf-codeowners/all-maintainers
+/docs/**/api-guides/tools/                  @esp-idf-codeowners/tools
+/docs/en/api-guides/core_dump.rst           @esp-idf-codeowners/debugging
+/docs/**/api-guides/wifi*                   @esp-idf-codeowners/wifi
+/docs/**/api-guides/esp-wifi-mesh.rst       @esp-idf-codeowners/wifi
+/docs/en/api-guides/jtag-debugging/         @esp-idf-codeowners/debugging
+/docs/**/api-reference/bluetooth/           @esp-idf-codeowners/bluetooth
+/docs/**/api-reference/network/             @esp-idf-codeowners/network @esp-idf-codeowners/wifi
+/docs/**/api-reference/peripherals/         @esp-idf-codeowners/peripherals
+/docs/**/api-reference/peripherals/usb*     @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/docs/**/api-reference/peripherals/usb*/    @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/docs/**/api-reference/protocols/           @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/docs/**/api-reference/provisioning/        @esp-idf-codeowners/app-utilities/provisioning
+/docs/**/api-reference/storage/             @esp-idf-codeowners/storage
+/docs/**/api-reference/system/              @esp-idf-codeowners/system
+/docs/**/security/                          @esp-idf-codeowners/security
+/docs/**/migration-guides/                  @esp-idf-codeowners/docs @esp-idf-codeowners/all-maintainers
+/docs/**/contribute/install-pre-commit-hook.rst @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+/examples/README.md           @esp-idf-codeowners/docs @esp-idf-codeowners/ci
+/examples/**/*.py             @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+/examples/bluetooth/          @esp-idf-codeowners/bluetooth
+/examples/build_system/       @esp-idf-codeowners/build-config
+/examples/common_components/  @esp-idf-codeowners/system @esp-idf-codeowners/wifi @esp-idf-codeowners/lwip @esp-idf-codeowners/network
+/examples/custom_bootloader/  @esp-idf-codeowners/system
+/examples/cxx/                @esp-idf-codeowners/system
+/examples/ethernet/           @esp-idf-codeowners/network
+/examples/get-started/        @esp-idf-codeowners/system
+/examples/ieee802154/         @esp-idf-codeowners/ieee802154
+/examples/lowpower/           @esp-idf-codeowners/power-management @esp-idf-codeowners/system
+/examples/mesh/               @esp-idf-codeowners/wifi
+/examples/network/            @esp-idf-codeowners/network @esp-idf-codeowners/wifi
+/examples/openthread/         @esp-idf-codeowners/ieee802154
+/examples/peripherals/        @esp-idf-codeowners/peripherals
+/examples/peripherals/usb/    @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/examples/phy/                @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
+/examples/protocols/          @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/examples/security/           @esp-idf-codeowners/security
+/examples/storage/            @esp-idf-codeowners/storage
+/examples/system/             @esp-idf-codeowners/system
+/examples/system/ota/         @esp-idf-codeowners/app-utilities
+/examples/wifi/               @esp-idf-codeowners/wifi
+/examples/zigbee/             @esp-idf-codeowners/ieee802154
+
+/tools/                       @esp-idf-codeowners/tools
+/tools/ble/                   @esp-idf-codeowners/app-utilities
+/tools/bt/                    @esp-idf-codeowners/bluetooth
+/tools/ci/                    @esp-idf-codeowners/ci
+/tools/cmake/                 @esp-idf-codeowners/build-config
+/tools/cmake/toolchain-*.cmake      @esp-idf-codeowners/toolchain
+/tools/esp_app_trace/         @esp-idf-codeowners/debugging
+/tools/gdb_panic_server.py    @esp-idf-codeowners/debugging
+/tools/kconfig*/              @esp-idf-codeowners/build-config
+/tools/ldgen/                 @esp-idf-codeowners/build-config
+/tools/mass_mfg/              @esp-idf-codeowners/app-utilities
+/tools/mocks/                 @esp-idf-codeowners/system
+
+/tools/test_apps/                    @esp-idf-codeowners/ci
+/tools/test_apps/README.md           @esp-idf-codeowners/docs @esp-idf-codeowners/ci
+
+## Note: owners here should be the same as the owners for the same example subdir, above
+/tools/test_apps/build_system/          @esp-idf-codeowners/build-config
+/tools/test_apps/components/test_utils/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/tools/test_apps/configs/               @esp-idf-codeowners/system
+/tools/test_apps/linux_compatible/      @esp-idf-codeowners/system
+/tools/test_apps/phy/                   @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
+/tools/test_apps/protocols/             @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/tools/test_apps/security/              @esp-idf-codeowners/security
+/tools/test_apps/storage/               @esp-idf-codeowners/storage
+/tools/test_apps/system/                @esp-idf-codeowners/system
+
+/tools/test_apps/**/*.py             @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+/tools/test_build_system/     @esp-idf-codeowners/tools @esp-idf-codeowners/build-config
+
+/tools/tools.json             @esp-idf-codeowners/tools @esp-idf-codeowners/toolchain @esp-idf-codeowners/debugging
+
+# sort-order-reset
+
+/components/**/test_apps/**/*.py     @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+# ignore lists
+/tools/ci/check_copyright_config.yaml                   @esp-idf-codeowners/all-maintainers
+/tools/ci/check_copyright_ignore.txt                    @esp-idf-codeowners/all-maintainers
+/tools/ci/mypy_ignore_list.txt                          @esp-idf-codeowners/tools

.gitlab/ci/README.md

@@ -250,76 +250,9 @@ We're using the latest version of [idf-build-apps][idf-build-apps]. Please refer
 In ESP-IDF CI, there's a few more special rules are additionally supported to disable the check app dependencies feature:
 
 - Add MR labels `BUILD_AND_TEST_ALL_APPS`
+- Pipeline variable `IDF_CI_SELECT_ALL_PYTEST_CASES=1`
 - Run in protected branches
 
 ## Upload/Download Artifacts to Internal Minio Server
 
-### Users Without Access to Minio
-
-If you don't have access to the internal Minio server, you can still download the artifacts from the shared link in the job log.
-
-The log will look like this:
-
-```shell
-Pipeline ID    : 587355
-Job name       : build_clang_test_apps_esp32
-Job ID         : 40272275
-Created archive file: 40272275.zip, uploading as 587355/build_dir_without_map_and_elf_files/build_clang_test_apps_esp32/40272275.zip
-Please download the archive file includes build_dir_without_map_and_elf_files from [INTERNAL_URL]
-```
-
-### Users With Access to Minio
-
-#### Env Vars for Minio
-
-Minio takes these env vars to connect to the server:
-
-- `IDF_S3_SERVER`
-- `IDF_S3_ACCESS_KEY`
-- `IDF_S3_SECRET_KEY`
-- `IDF_S3_BUCKET`
-
-#### Artifacts Types and File Patterns
-
-The artifacts types and corresponding file patterns are defined in tools/ci/artifacts_handler.py, inside `ArtifactType` and `TYPE_PATTERNS_DICT`.
-
-#### Upload
-
-```shell
-python tools/ci/artifacts_handler.py upload
-```
-
- will upload the files that match the file patterns to minio object storage with name:
-
-`<pipeline_id>/<artifact_type>/<job_name>/<job_id>.zip`
-
-For example, job 39043328 will upload these four files:
-
-- `575500/map_and_elf_files/build_pytest_examples_esp32/39043328.zip`
-- `575500/build_dir_without_map_and_elf_files/build_pytest_examples_esp32/39043328.zip`
-- `575500/logs/build_pytest_examples_esp32/39043328.zip`
-- `575500/size_reports/build_pytest_examples_esp32/39043328.zip`
-
-#### Download
-
-You may run
-
-```shell
-python tools/ci/artifacts_handler.py download --pipeline_id <pipeline_id>
-```
-
-to download all files of the pipeline, or
-
-```shell
-python tools/ci/artifacts_handler.py download --pipeline_id <pipeline_id> --job_name <job_name_or_pattern>
-```
-
-to download all files with the specified job name or pattern, or
-
-```shell
-python tools/ci/artifacts_handler.py download --pipeline_id <pipeline_id> --job_name <job_name_or_pattern> --type <artifact_type> <artifact_type> ...
-```
-
-to download all files with the specified job name or pattern and artifact type(s).
-
-You may check all detailed documentation with `python tools/ci/artifacts_handler.py download -h`
+Please refer to the documentation [here](https://docs.espressif.com/projects/idf-ci/en/latest/guides/cli.html)

.gitlab/ci/build.yml

@@ -3,10 +3,7 @@
   extends:
     - .after_script:build:ccache-show-stats:upload-failed-job-logs
   image: $ESP_ENV_IMAGE
-  tags:
-    - build
-    # build only on shiny servers since shiny storage server is at the same location
-    - shiny
+  tags: [build, shiny]
   variables:
     # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
     IDF_CCACHE_ENABLE: "1"
@@ -24,7 +21,7 @@
     - pipeline_variables
   artifacts:
     paths:
-      # The other artifacts patterns are defined under tools/ci/artifacts_handler.py
+      # The other artifacts patterns are defined under .idf_ci.toml
       # Now we're uploading/downloading the binary files from our internal storage server
       #
       # keep the log file to help debug
@@ -37,19 +34,16 @@
   variables:
     IDF_TOOLCHAIN: clang
     TEST_BUILD_OPTS_EXTRA: ""
-    TEST_DIR: tools/test_apps/system/clang_build_test
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
     # CI specific options start from "--parallel-count xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
+    - run_cmd idf-build-apps build
+      -p tools/test_apps/system/clang_build_test
       -t $IDF_TARGET
-      --copy-sdkconfig
       --parallel-count ${CI_NODE_TOTAL:-1}
       --parallel-index ${CI_NODE_INDEX:-1}
       --modified-components ${MR_MODIFIED_COMPONENTS}
       --modified-files ${MR_MODIFIED_FILES}
       $TEST_BUILD_OPTS_EXTRA
-    - python tools/ci/artifacts_handler.py upload
 
 ######################
 # build_template_app #
@@ -108,7 +102,7 @@ gcc_static_analyzer:
     ANALYZING_APP: "examples/get-started/hello_world"
   script:
     - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
-    - python -m idf_build_apps build -v -p ${ANALYZING_APP} -t all
+    - idf-build-apps build -p ${ANALYZING_APP}
 
 ########################################
 # Clang Build Apps Without Tests Cases #
@@ -211,7 +205,7 @@ build_clang_test_apps_esp32p4:
   script:
     - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
     - cd ${IDF_PATH}/tools/test_build_system
-    - python ${IDF_PATH}/tools/ci/get_known_failure_cases_file.py
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
     - pytest
       --cleanup-idf-copy
       --parallel-count ${CI_NODE_TOTAL:-1}
@@ -220,6 +214,43 @@ build_clang_test_apps_esp32p4:
       --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
+.test_build_system_macos_template_extension:
+  tags:
+    - macos
+  variables:
+    PYENV_VERSION: "3.10"
+    # CCACHE_DIR: "/cache/idf_ccache". On macOS, you cannot write to this folder due to insufficient permissions.
+    CCACHE_DIR: "" # ccache will use "$HOME/Library/Caches/ccache".
+    # Workaround for a bug in Parallels executor where CI_PROJECT_DIR is not an absolute path,
+    # but a relative path to the build directory (builds/espressif/esp-idf instead of ~/builds/espressif/esp-idf.
+    # GitLab sets the project dir to this template `<builds_dir>/<namespace>/<project_name>`
+    IDF_PATH: "/Users/espressif/builds/espressif/esp-idf"
+
+.test_build_system_minimal_cmake_template:
+  extends: .test_build_system_template
+  variables:
+    INSTALL_EXTRA_TOOLS: cmake@3.22.1
+  script:
+    - MINIMAL_SUPPORTED_CMAKE_VERSION=$(echo "${INSTALL_EXTRA_TOOLS}" | sed -n 's/.*cmake@\([0-9.]*\).*/\1/p')
+    - export PATH=$(echo "$PATH" | sed -E "s|/tools/cmake/[0-9.]+|/tools/cmake/${MINIMAL_SUPPORTED_CMAKE_VERSION}|")
+    - ACTUAL_CMAKE_VERSION=$(cmake --version | head -n1 | awk '{print $3}')
+    - |
+      if [ "${ACTUAL_CMAKE_VERSION}" != "${MINIMAL_SUPPORTED_CMAKE_VERSION}" ]; then
+        echo "ERROR: Wrong minimal CMake version! Detected: ${ACTUAL_CMAKE_VERSION}, but should be: ${MINIMAL_SUPPORTED_CMAKE_VERSION}"
+        exit 1
+      fi
+    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
+    - cd ${IDF_PATH}/tools/test_build_system
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest
+      -k cmake
+      --cleanup-idf-copy
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+      --work-dir ${CI_PROJECT_DIR}/test_build_system
+      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
+      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
+
 pytest_build_system:
   extends: .test_build_system_template
   parallel: 3
@@ -227,17 +258,25 @@ pytest_build_system:
 pytest_build_system_macos:
   extends:
     - .test_build_system_template
+    - .test_build_system_macos_template_extension
     - .before_script:build:macos
     - .after_script:build:macos:upload-failed-job-logs:ccache-show-stats
     - .rules:build:macos
-  tags:
-    - macos_shell
   parallel: 3
+
+pytest_build_system_minimal_cmake:
+  extends: .test_build_system_minimal_cmake_template
+
+pytest_build_system_macos_minimal_cmake:
+  extends:
+    - .test_build_system_minimal_cmake_template
+    - .test_build_system_macos_template_extension
+    - .before_script:build:macos
+    - .after_script:build:macos:upload-failed-job-logs:ccache-show-stats
+    - .rules:build:macos
   variables:
-    PYENV_VERSION: "3.9"
-    # CCACHE_DIR: "/cache/idf_ccache". On macOS, you cannot write to this folder due to insufficient permissions.
-    CCACHE_DIR: "" # ccache will use "$HOME/Library/Caches/ccache".
-    CCACHE_MAXSIZE: "5G" # To preserve the limited Macbook storage. CCACHE automatically prunes old caches to fit the set limit.
+    INSTALL_EXTRA_TOOLS: ninja cmake@3.22.1
+
 build_docker:
   extends:
     - .before_script:minimal
@@ -245,17 +284,11 @@ build_docker:
   stage: host_test
   needs: []
   image: espressif/docker-builder:1
-  tags:
-    - build_docker_amd64_brno
+  tags: [shiny, dind]
   variables:
     DOCKER_TMP_IMAGE_NAME: "idf_tmp_image"
   script:
-    - export LOCAL_CI_REPOSITORY_URL=$CI_REPOSITORY_URL
-    - if [ -n "$LOCAL_GITLAB_HTTPS_HOST" ]; then export LOCAL_CI_REPOSITORY_URL="https://gitlab-ci-token:${CI_JOB_TOKEN}@${LOCAL_GITLAB_HTTPS_HOST}/${CI_PROJECT_PATH}"; fi
-    - if [ -n "$LOCAL_GIT_MIRROR" ]; then export LOCAL_CI_REPOSITORY_URL="${LOCAL_GIT_MIRROR}/${CI_PROJECT_PATH}"; fi
-    - echo "Using repository at $LOCAL_CI_REPOSITORY_URL"
-    - export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${LOCAL_CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$PIPELINE_COMMIT_SHA}"
-    # Build
+    - export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} --build-arg IDF_CLONE_SHALLOW=1 --build-arg IDF_GITHUB_ASSETS=${INTERNAL_GITHUB_ASSETS}"
     - docker build --tag ${DOCKER_TMP_IMAGE_NAME} ${DOCKER_BUILD_ARGS} tools/docker/
     # We can't mount $PWD/examples/get-started/blink into the container, see https://gitlab.com/gitlab-org/gitlab-ce/issues/41227.
     # The workaround mentioned there works, but leaves around directories which need to be cleaned up manually.
@@ -292,11 +325,7 @@ generate_build_child_pipeline:
       - non_test_related_apps.txt
     expire_in: 1 week
     when: always
-  variables:
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
-    # requires basic pytest dependencies
-    - run_cmd bash install.sh --enable-pytest
     - run_cmd python tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py
 
 build_child_pipeline:
@@ -308,12 +337,9 @@ build_child_pipeline:
     - pipeline_variables
     - generate_build_child_pipeline
   variables:
-    IS_MR_PIPELINE: $IS_MR_PIPELINE
     MR_MODIFIED_COMPONENTS: $MR_MODIFIED_COMPONENTS
     MR_MODIFIED_FILES: $MR_MODIFIED_FILES
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
-    BUILD_AND_TEST_ALL_APPS: $BUILD_AND_TEST_ALL_APPS
-    REPORT_EXIT_CODE: $REPORT_EXIT_CODE
   # https://gitlab.com/gitlab-org/gitlab/-/issues/214340
   inherit:
     variables: false
@@ -322,3 +348,22 @@ build_child_pipeline:
       - artifact: build_child_pipeline.yml
         job: generate_build_child_pipeline
     strategy: depend
+
+generate_disabled_apps_report:
+  extends:
+    - .build_template
+  tags: [fast_run, shiny]
+  dependencies: # set dependencies to null to avoid missing artifacts issue
+  needs:
+    - pipeline_variables
+    - job: baseline_manifest_sha
+      optional: true
+  artifacts:
+    paths:
+      - disabled_report.html
+    expire_in: 1 week
+    when: always
+  script:
+    - pip install dominate idf-build-apps
+    - run_cmd python tools/ci/gen_disabled_report.py --output disabled_report.html --verbose --enable-preview-targets
+    - echo "Report generated at https://${CI_PAGES_HOSTNAME}:${CI_SERVER_PORT}/-/esp-idf/-/jobs/${CI_JOB_ID}/artifacts/disabled_report.html"

.gitlab/ci/common.yml

@@ -30,17 +30,14 @@ variables:
   # - set GIT_STRATEGY: "clone" to shiny runners
   # - set GIT_STRATEGY: "fetch" to brew runners
   GIT_STRATEGY: clone
-  # we will download archive for each submodule instead of clone.
-  # we don't do "recursive" when fetch submodule as they're not used in CI now.
-  GIT_SUBMODULE_STRATEGY: none
-  # since we're using merged-result pipelines, the last commit should work for most cases
   GIT_DEPTH: 1
-  # --no-recurse-submodules: we use cache for submodules
+  GIT_SUBMODULE_STRATEGY: none  # here we use cache for submodules, so we don't need to fetch them every time
+  # since we're using merged-result pipelines, the last commit should work for most cases
   # --prune --prune-tags: in case remote branch or tag is force pushed
   GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags"
   # we're using .cache folder for caches
   GIT_CLEAN_FLAGS: -ffdx -e .cache/
-  LATEST_GIT_TAG: v5.5
+  LATEST_GIT_TAG: v6.1-dev
 
   SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
   # by default we will fetch all submodules
@@ -55,11 +52,10 @@ variables:
   CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
 
   # Docker images
-  ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:3"
-  ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:3-1"
-  TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:2"
+  ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v6.1:1"
+  ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v6.1:1-1"
+  TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v6.1:1"
   SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
-  PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"
 
   # cache python dependencies
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -70,7 +66,7 @@ variables:
   CI_PYTHON_CONSTRAINT_BRANCH: ""
 
   # Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH.
-  CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.5.txt"
+  CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v6.1.txt"
 
   # Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI.
   # Keep the variable empty when not used.
@@ -101,6 +97,7 @@ variables:
   CCACHE_MAXSIZE: "50G"
 
   FF_USE_NEW_BASH_EVAL_STRATEGY: "true"
+  FORCE_COLOR: "1"  # rich print with color
 
 ################################################
 # `before_script` and `after_script` Templates #
@@ -123,7 +120,12 @@ variables:
   source tools/ci/configure_ci_environment.sh
 
   # add extra python packages
-  export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/esp_app_trace:$IDF_PATH/components/partition_table:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
+  export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci:$IDF_PATH/tools/esp_app_trace:$IDF_PATH/components/partition_table:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
+
+  # minio configuration
+  # added here since the precedence of variables in gitlab-ci.yml is lower than project settings
+  export IDF_S3_SERVER="$IDF_S3_NEW_SERVER"
+  export IDF_S3_ACCESS_KEY="$IDF_S3_NEW_ACCESS_KEY"
 
 .setup_tools_and_idf_python_venv: &setup_tools_and_idf_python_venv |
   # must use after setup_tools_except_target_test
@@ -140,24 +142,27 @@ variables:
   if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then
     export IDF_MIRROR_PREFIX_MAP=
   fi
+  # Optimize pip install
+  if echo "${CI_RUNNER_TAGS}" | grep "shiny"; then
+    export PIP_INDEX_URL="${PIP_INDEX_URL_SHINY}"
+  fi
+  if [[ "$(uname -m)" == "x86_64" ]] || [[ "$(uname -m)" == "aarch64" ]]; then
+    export IDF_PIP_WHEELS_URL=""
+  fi
 
+  # install.sh
   if [[ "${CI_JOB_STAGE}" != "target_test" ]]; then
     section_start "running_install_sh" "Running install.sh"
     if [[ "${CI_JOB_STAGE}" == "build_doc" ]]; then
       run_cmd bash install.sh --enable-ci --enable-docs
-    elif [[ "${CI_JOB_STAGE}" == "build" ]]; then
-      run_cmd bash install.sh --enable-ci
     else
-      if ! echo "${CI_JOB_NAME}" | egrep ".*pytest.*"; then
-        run_cmd bash install.sh --enable-ci
-      else
-        run_cmd bash install.sh --enable-ci --enable-pytest --enable-test-specific
-      fi
+      run_cmd bash install.sh --enable-ci
     fi
     section_end "running_install_sh"
   else
-    section_start "install_python_env" "Install Python environment"
-    run_cmd python tools/idf_tools.py install-python-env --features ci,pytest,test-specific
+    section_start "install_python_env" "Install Python environment, skip required tools check"
+    run_cmd python tools/idf_tools.py install-python-env --features ci,test-specific
+    export IDF_SKIP_TOOLS_CHECK=1
     section_end "install_python_env"
   fi
 
@@ -172,11 +177,6 @@ variables:
     $IDF_PATH/tools/idf_tools.py --non-interactive install esp-clang
   fi
 
-  if [[ "${CI_JOB_STAGE}" == "target_test" ]]; then
-    section_start "IDF_SKIP_TOOLS_CHECK" "Skip required tools check"
-    export IDF_SKIP_TOOLS_CHECK=1
-    section_end "IDF_SKIP_TOOLS_CHECK"
-  fi
   section_start "source_export" "Source export.sh"
   source ./export.sh
   section_end "source_export"
@@ -222,7 +222,7 @@ variables:
 
 .upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts |
   if [ $CI_JOB_STATUS = "failed" ]; then
-    python tools/ci/artifacts_handler.py upload --type logs
+    run_cmd idf-ci gitlab upload-artifacts --type log
   fi
 
 .before_script:minimal:
@@ -236,8 +236,6 @@ variables:
     # Ensure pyenv and PYENV_VERSION installed
     - eval "$(pyenv init -)"
     - *common-before_scripts
-    # On macOS, these tools need to be installed
-    - export IDF_TOOLS_PATH="${HOME}/.espressif_runner_${CI_RUNNER_ID}_${CI_CONCURRENT_ID}"
     # remove idf-env.json, since it may contains enabled "features"
     - rm -f $IDF_TOOLS_PATH/idf-env.json
     # This adds tools (compilers) and the version-specific Python environment to PATH
@@ -266,11 +264,17 @@ variables:
 
 .after_script:build:ccache-show-stats:
   after_script:
+    - source tools/ci/utils.sh
+    - section_start "ccache_show_stats" "Show ccache statistics"
     - *show_ccache_statistics
+    - section_end "ccache_show_stats"
 
 .after_script:build:ccache-show-stats:upload-failed-job-logs:
   after_script:
+    - source tools/ci/utils.sh
+    - section_start "ccache_show_stats" "Show ccache statistics"
     - *show_ccache_statistics
+    - section_end "ccache_show_stats"
     - *upload_failed_job_log_artifacts
 
 ##############################
@@ -331,9 +335,10 @@ variables:
       TEMP_FILE=$(mktemp)
       # merged results pipelines, by default
       if [[ -n $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA ]]; then
-        git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git fetch origin $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA > "$TEMP_FILE"
+        git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_SHA
+        git fetch origin $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA
+
+        git diff --name-only $CI_MERGE_REQUEST_TARGET_BRANCH_SHA...$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA > "$TEMP_FILE"
         GIT_DIFF_OUTPUT=$(cat "$TEMP_FILE")
         git fetch origin $CI_COMMIT_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
       # merge request pipelines, when the mr got conflicts

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

@@ -2,19 +2,15 @@
 # - extra_default_build_targets:
 #     besides of the SUPPORTED_TARGETS in IDF,
 #     enable build for the specified targets by default as well.
+# !!! DEPRECATED: use `additional_build_targets` in .idf_build_apps.toml instead
+#
 # - bypass_check_test_targets:
 #     suppress the check_build_test_rules check-test-script warnings for the specified targets
 #
 # This file should ONLY be used during bringup. Should be reset to empty after the bringup process
-extra_default_build_targets:
-  - esp32c5
-  - esp32c61
-  - esp32h21
-  - esp32h4
 
 bypass_check_test_targets:
   - esp32h21
-  - esp32c61
   - esp32h4
   - esp32c5
 

.gitlab/ci/dependencies/dependencies.yml

@@ -1,19 +1,3 @@
-.all_targets: &all_targets
-  - esp32
-  - esp32s2
-  - esp32s3
-  - esp32c3
-  - esp32c2
-  - esp32c6
-  - esp32c5
-  - esp32h2
-  - esp32p4
-
-.target_test: &target_test
-  - example_test
-  - custom_test
-  - component_ut
-
 ##############
 # Build Jobs #
 ##############
@@ -43,13 +27,13 @@
 
 "build:macos":
   labels:
-    - build
+#    - build
     - macos
     - macos_test  # for backward compatibility
-  patterns:
-    - build_system
-    - build_macos
-    - downloadable-tools
+#  patterns:
+#    - build_system
+#    - build_macos
+#    - downloadable-tools
 
 # ---------------------------
 # Add patterns to build rules
@@ -91,4 +75,4 @@
   specific_rules:
     - if-schedule-test-build-system-windows
   patterns:
-    - build_system
+    - build_system_win

.gitlab/ci/deploy.yml

@@ -3,7 +3,6 @@
   image: $ESP_ENV_IMAGE
   tags: [ deploy ]
 
-# Check this before push_to_github
 check_submodule_sync:
   extends:
     - .deploy_job_template
@@ -12,13 +11,13 @@ check_submodule_sync:
   tags: [ brew, github_sync ]
   retry: 2
   variables:
-    # for brew runners, we always set GIT_STRATEGY to fetch
-    GIT_STRATEGY: fetch
+    GIT_STRATEGY: fetch  # use brew local mirror first
     SUBMODULES_TO_FETCH: "none"
     PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
   dependencies: []
   script:
     - git submodule deinit --force .
+    - rm -rf .git/modules  # remove all the cached metadata
     # setting the default remote URL to the public one, to resolve relative location URLs
     - git config remote.origin.url ${PUBLIC_IDF_URL}
     # check if all submodules are correctly synced to public repository
@@ -31,31 +30,37 @@ push_to_github:
   extends:
     - .deploy_job_template
     - .before_script:minimal
-    - .rules:push_to_github
+    - .rules:protected:deploy
   needs:
+    # submodule must be synced before pushing to github
     - check_submodule_sync
   tags: [ brew, github_sync ]
   variables:
-    # for brew runners, we always set GIT_STRATEGY to fetch
-    GIT_STRATEGY: fetch
-    # github also need full record of commits
-    GIT_DEPTH: 0
+    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
     - .before_script:minimal
-    - .rules:protected-no_label-always
+    - .rules:protected:deploy
   dependencies: []
   variables:
     GIT_DEPTH: 2
-  tags: [ shiny, build ]
+  tags: [build, shiny]
   script:
     - 'curl --header "PRIVATE-TOKEN: ${ESPCI_SCRIPTS_TOKEN}" -o create_MR_in_esp_dockerfile.sh $GITLAB_HTTP_SERVER/api/v4/projects/1260/repository/files/create_MR_in_esp_dockerfile%2Fcreate_MR_in_esp_dockerfile.sh/raw\?ref\=master'
     - chmod +x create_MR_in_esp_dockerfile.sh
     - ./create_MR_in_esp_dockerfile.sh
+  environment:
+    name: deploy_update_SHA_in_esp-dockerfiles_production
+    deployment_tier: production

.gitlab/ci/docs.yml

@@ -4,11 +4,11 @@
   - "**/*.rst"
   - "CONTRIBUTING.rst"
   - "**/soc_caps.h"
+  - "**/Kconfig*"
 
 .patterns-docs-partial: &patterns-docs-partial
   - "components/**/*.h"
-  - "components/**/Kconfig*"
-  - "components/**/CMakeList.txt"
+  - "components/**/CMakeLists.txt"
   - "components/**/sdkconfig*"
   - "tools/tools.json"
   - "tools/idf_tools.py"
@@ -19,12 +19,9 @@
 .patterns-docs-preview: &patterns-docs-preview
   - "docs/**/*"
 
-.if-protected: &if-protected
+.if-protected-check: &if-protected-check
   if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/)'
 
-.if-protected-no_label: &if-protected-no_label
-  if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && $BOT_TRIGGER_WITH_LABEL == null'
-
 .if-qa-test-tag: &if-qa-test-tag
   if: '$CI_COMMIT_TAG =~ /^qa-test/'
 
@@ -41,7 +38,7 @@
   rules:
     - <<: *if-qa-test-tag
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build_docs
     - <<: *if-label-docs_full
     - <<: *if-dev-push
@@ -61,10 +58,10 @@
 check_readme_links:
   extends:
     - .pre_check_template
-  tags: ["build", "amd64", "internet"]
+  tags: ["amd64", "brew"]
   allow_failure: true
   rules:
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-dev-push
       changes: *patterns-example-readme
   script:
@@ -96,7 +93,7 @@ check_docs_lang_sync:
   parallel:
     matrix:
       - DOCLANG: ["en", "zh_CN"]
-        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2", "esp32c6", "esp32c61", "esp32c5","esp32h2", "esp32h21", "esp32p4"]
+        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2", "esp32c6", "esp32c61", "esp32c5", "esp32h2", "esp32h4", "esp32h21", "esp32p4"]
 
 check_docs_gh_links:
   image: $ESP_IDF_DOC_ENV_IMAGE
@@ -151,8 +148,8 @@ build_docs_html_partial:
     GIT_DEPTH: 0
   stage: test_deploy
   tags:
-    - deploy
-    - shiny
+    - brew
+    - amd64
   script:
     # ensure all tags are fetched, need to know the latest/stable tag for the docs
     - git fetch --tags --prune
@@ -182,14 +179,17 @@ deploy_docs_preview:
     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:
-    - <<: *if-protected-no_label
+    - .rules:protected:deploy
   stage: post_deploy
   dependencies:  # set dependencies to null to avoid missing artifacts issue
   needs: # ensure runs after push_to_github succeeded
@@ -204,12 +204,15 @@ deploy_docs_production:
     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
-  rules:
-    - <<: *if-protected-no_label
+    - .rules:protected:deploy
   stage: post_deploy
   needs:
     - job: deploy_docs_production

.gitlab/ci/host-test.yml

@@ -2,8 +2,7 @@
   extends: .rules:test:host_test
   stage: host_test
   image: $ESP_ENV_IMAGE
-  tags:
-    - host_test
+  tags: [build, shiny]
   dependencies: # set dependencies to null to avoid missing artifacts issue
   # run host_test jobs immediately, only after upload cache
   needs:
@@ -78,24 +77,12 @@ test_fatfsgen_on_host:
     - ./test_wl_fatfsgen.py
     - ./test_fatfsparse.py
 
-test_multi_heap_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/heap/test_multi_heap_host
-    - ./test_all_configs.sh
-
 test_certificate_bundle_on_host:
   extends: .host_test_template
   script:
     - cd components/mbedtls/esp_crt_bundle/test_gen_crt_bundle/
     - ./test_gen_crt_bundle.py
 
-test_gdbstub_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/esp_gdbstub/test_gdbstub_host
-    - make test
-
 # Test for create virtualenv. It must be invoked from Python, not from virtualenv.
 # Use docker image system python without any extra dependencies
 test_cli_installer:
@@ -113,7 +100,8 @@ test_cli_installer:
   script:
     # Tools must be downloaded for testing
     # We could use "idf_tools.py download all", but we don't want to install clang because of its huge size
-    - python3 ${IDF_PATH}/tools/idf_tools.py download required qemu-riscv32 qemu-xtensa cmake
+    #                                                                      cmake@version that is supported
+    - python3 ${IDF_PATH}/tools/idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.22.1
     - cd ${IDF_PATH}/tools/test_idf_tools
     - python3 -m pip install jsonschema
     - python3 ./test_idf_tools.py -v
@@ -200,20 +188,21 @@ test_tools:
     INSTALL_EXTRA_TOOLS: "qemu-xtensa qemu-riscv32"  # for test_idf_qemu.py
   script:
     - stat=0
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
     - cd ${IDF_PATH}/tools/ci/test_autocomplete
-    - pytest --noconftest test_autocomplete.py --junitxml=${IDF_PATH}/XUNIT_AUTOCOMP.xml                  || stat=1
+    - run_cmd pytest --noconftest test_autocomplete.py --junitxml=${IDF_PATH}/XUNIT_AUTOCOMP.xml     --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}/tools/test_idf_py
-    - pytest --noconftest test_idf_py.py       --junitxml=${IDF_PATH}/XUNIT_IDF_PY.xml                    || stat=1
-    - pytest --noconftest test_hints.py        --junitxml=${IDF_PATH}/XUNIT_HINTS.xml                     || stat=1
-    - pytest --noconftest test_idf_qemu.py     --junitxml=${IDF_PATH}/XUNIT_IDF_PY_QEMU.xml               || stat=1
+    - run_cmd pytest --noconftest test_idf_py.py       --junitxml=${IDF_PATH}/XUNIT_IDF_PY.xml       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
+    - run_cmd pytest --noconftest test_hints.py        --junitxml=${IDF_PATH}/XUNIT_HINTS.xml        --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
+    - run_cmd pytest --noconftest test_idf_qemu.py     --junitxml=${IDF_PATH}/XUNIT_IDF_PY_QEMU.xml  --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}/tools/test_bsasm
-    - pytest --noconftest test_bsasm.py        --junitxml=${IDF_PATH}/XUNIT_BSASM.xml                     || stat=1
+    - run_cmd pytest --noconftest test_bsasm.py        --junitxml=${IDF_PATH}/XUNIT_BSASM.xml        --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}/tools/test_mkdfu
-    - pytest --noconftest test_mkdfu.py        --junitxml=${IDF_PATH}/XUNIT_MKDFU.xml                     || stat=1
+    - run_cmd pytest --noconftest test_mkdfu.py        --junitxml=${IDF_PATH}/XUNIT_MKDFU.xml        --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}/tools/test_idf_size
-    - pytest --noconftest test_idf_size.py     --junitxml=${IDF_PATH}/XUNIT_IDF_SIZE.xml                  || stat=1
+    - run_cmd pytest --noconftest test_idf_size.py     --junitxml=${IDF_PATH}/XUNIT_IDF_SIZE.xml     --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}/tools/test_idf_diag
-    - pytest --noconftest test_idf_diag.py     --junitxml=${IDF_PATH}/XUNIT_IDF_DIAG.xml                  || stat=1
+    - run_cmd pytest --noconftest test_idf_diag.py     --junitxml=${IDF_PATH}/XUNIT_IDF_DIAG.xml     --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}             || stat=1
     - cd ${IDF_PATH}
     - shellcheck -s sh tools/detect_python.sh                                                             || stat=1
     - shellcheck -s bash tools/detect_python.sh                                                           || stat=1
@@ -230,13 +219,6 @@ test_split_path_by_spaces:
     - cd ${IDF_PATH}/tools
     - python -m unittest split_paths_by_spaces.py
 
-test_mqtt_on_host:
-  extends: .host_test_template
-  script:
-    - cd ${IDF_PATH}/components/mqtt/esp-mqtt/host_test
-    - idf.py build
-    - LSAN_OPTIONS=verbosity=1:log_threads=1 build/host_mqtt_client_test.elf
-
 test_transport_on_host:
   extends: .host_test_template
   allow_failure: true # IDFCI-2781 [v5.5, v5.4] test_transport_on_host fails on ubuntu 24.04
@@ -297,22 +279,18 @@ test_pytest_qemu:
         INSTALL_EXTRA_TOOLS: "qemu-riscv32"
         IDF_TOOLCHAIN: [gcc, clang]
   script:
-    - run_cmd python tools/ci/ci_build_apps.py . -v
+    - run_cmd idf-ci build run
+      --build-system cmake
       --target $IDF_TARGET
-      --pytest-apps
       -m qemu
-      --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt"
-      --modified-components ${MR_MODIFIED_COMPONENTS}
       --modified-files ${MR_MODIFIED_FILES}
-    - python tools/ci/get_known_failure_cases_file.py
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
     - run_cmd pytest
       --target $IDF_TARGET
-      --log-cli-level DEBUG
       -m qemu
       --embedded-services idf,qemu
       --junitxml=XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-      --app-info-filepattern \"list_job_*.txt\"
       --qemu-extra-args \"-global driver=timer.$IDF_TARGET.timg,property=wdt_disable,value=true\"
 
 test_pytest_linux:
@@ -327,28 +305,25 @@ test_pytest_linux:
     reports:
       junit: XUNIT_RESULT.xml
   script:
-    - run_cmd python tools/ci/ci_build_apps.py components examples tools/test_apps -v
+    - run_cmd idf-ci build run
+      --build-system cmake
+      -p components -p examples -p tools/test_apps
       --target linux
-      --pytest-apps
-      -m host_test
-      --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt"
-      --modified-components ${MR_MODIFIED_COMPONENTS}
+      --only-test-related
       --modified-files ${MR_MODIFIED_FILES}
-    - python tools/ci/get_known_failure_cases_file.py
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
     - run_cmd pytest
       --target linux
-      -m host_test
       --embedded-services idf
       --junitxml=XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-      --app-info-filepattern \"list_job_*.txt\"
 
 test_pytest_macos:
   extends:
     - .host_test_template
     - .before_script:build:macos
   tags:
-    - macos_shell
+    - macos
   artifacts:
     paths:
       - XUNIT_RESULT.xml
@@ -357,38 +332,25 @@ test_pytest_macos:
     reports:
       junit: XUNIT_RESULT.xml
   variables:
-    PYENV_VERSION: "3.9"
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
+    PYENV_VERSION: "3.10"
+    # Workaround for a bug in Parallels executor where CI_PROJECT_DIR is not an absolute path,
+    # but a relative path to the build directory (builds/espressif/esp-idf instead of ~/builds/espressif/esp-idf.
+    # GitLab sets the project dir to this template `<builds_dir>/<namespace>/<project_name>`
+    IDF_PATH: "/Users/espressif/builds/espressif/esp-idf"
   script:
-    - run_cmd python tools/ci/ci_build_apps.py components examples tools/test_apps -v
+    - run_cmd idf-ci build run
+      -p components -p examples -p tools/test_apps
+      --build-system cmake
       --target linux
-      --pytest-apps
-      -m \"host_test and macos_shell\"
-      --collect-app-info "list_job_${CI_JOB_NAME_SLUG}.txt"
-      --modified-components ${MR_MODIFIED_COMPONENTS}
+      --only-test-related
+      -m macos
       --modified-files ${MR_MODIFIED_FILES}
-    - python tools/ci/get_known_failure_cases_file.py
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
     - run_cmd pytest
       --target linux
-      -m \"host_test and macos_shell\"
+      -m macos
       --junitxml=XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-      --app-info-filepattern \"list_job_*.txt\"
-
-test_idf_pytest_plugin:
-  extends:
-    - .host_test_template
-    - .rules:patterns:idf-pytest-plugin
-  variables:
-    SUBMODULES_TO_FETCH: "none"
-  artifacts:
-    reports:
-      junit: XUNIT_RESULT.xml
-  script:
-    - cd ${IDF_PATH}/tools/ci/dynamic_pipelines/tests/test_report_generator
-    - python -m unittest test_report_generator.py
-    - cd ${IDF_PATH}/tools/ci/idf_pytest
-    - pytest --junitxml=${CI_PROJECT_DIR}/XUNIT_RESULT.xml
 
 test_idf_build_apps_load_soc_caps:
   extends: .host_test_template

.gitlab/ci/integration_test.yml

@@ -60,6 +60,9 @@ child_integration_test_pipeline:
   stage: assign_test
   needs:
     - gen_integration_pipeline
+  variables:
+    IDF_S3_SERVER: $IDF_S3_NEW_SERVER
+    IDF_S3_ACCESS_KEY: $IDF_S3_NEW_ACCESS_KEY
   trigger:
     include:
       - artifact: idf-integration-ci/child_pipeline/pipeline.yml

.gitlab/ci/post_deploy.yml

@@ -1,11 +1,15 @@
-generate_failed_jobs_report:
+.post_deploy_template:
   stage: post_deploy
-  tags: [build, shiny]
   image: $ESP_ENV_IMAGE
+
+generate_failed_jobs_report:
+  extends:
+    - .post_deploy_template
+  tags: [build, shiny]
   when: always
   dependencies: []  # Do not download artifacts from the previous stages
   artifacts:
-    expire_in: 1 week
+    expire_in: 2 week
     when: always
     paths:
       - job_report.html
@@ -13,12 +17,16 @@ generate_failed_jobs_report:
     - python tools/ci/dynamic_pipelines/scripts/generate_report.py --report-type job
 
 sync_support_status:
-  stage: post_deploy
   extends:
-    - .rules:sync_support_status
+    - .post_deploy_template
+    - .rules:master:push
+  tags: [ brew, github_sync ]
   needs:
     - push_to_github
-  image: $ESP_ENV_IMAGE
-  tags: [ brew, github_sync ]
+  cache: []
+  before_script: []
   script:
     - curl --fail --request POST --form token="$IDF_STATUS_TRIG_TOKEN" --form ref="$IDF_STATUS_BRANCH" --form "variables[UPLOAD_TO_S3]=true" "$IDF_STATUS_TRIG_URL"
+  environment:
+    name: sync_support_status_production
+    deployment_tier: production

.gitlab/ci/pre_check.yml

@@ -1,8 +1,7 @@
 .pre_check_template:
   stage: pre_check
   image: $ESP_ENV_IMAGE
-  tags:
-    - host_test
+  tags: [build, shiny]
   dependencies: # set dependencies to null to avoid missing artifacts issue
 
 check_version:
@@ -10,7 +9,7 @@ check_version:
   # esp_idf_version.h in a branch before tagging the next version.
   extends:
     - .pre_check_template
-    - .rules:protected
+    - .rules:protected:check
   tags: [ brew, github_sync ]
   variables:
     # need a full clone to get the latest tag
@@ -117,22 +116,10 @@ check_test_scripts_build_test_rules:
   extends:
     - .pre_check_template
     - .before_script:build
-  variables:
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
   script:
     # requires basic pytest dependencies
-    - run_cmd bash install.sh --enable-pytest
     - python tools/ci/check_build_test_rules.py check-test-scripts examples/ tools/test_apps components
 
-check_configure_ci_environment_parsing:
-  extends:
-    - .pre_check_template
-    - .before_script:build
-    - .rules:build
-  script:
-    - cd tools/ci
-    - python -m unittest ci_build_apps.py
-
 pipeline_variables:
   extends:
     - .pre_check_template
@@ -142,11 +129,10 @@ pipeline_variables:
     # MODIFIED_FILES is a list of files that changed, could be used everywhere
     - MODIFIED_FILES=$(echo "$GIT_DIFF_OUTPUT" | xargs)
     - echo "MODIFIED_FILES=$MODIFIED_FILES" >> pipeline.env
-    - echo "REPORT_EXIT_CODE=0" >> pipeline.env
     # MR_MODIFIED_FILES and MR_MODIFIED_COMPONENTS are semicolon separated lists that is used in MR only
     # for non MR pipeline, these are empty lists
     - |
-      if [ $IS_MR_PIPELINE == "0" ]; then
+      if [ -z "$CI_MERGE_REQUEST_IID" ]; then
         echo "MR_MODIFIED_FILES=\"\"" >> pipeline.env
         echo "MR_MODIFIED_COMPONENTS=\"\"" >> pipeline.env
       else
@@ -157,19 +143,14 @@ pipeline_variables:
         echo "MR_MODIFIED_COMPONENTS=\"$MR_MODIFIED_COMPONENTS\"" >> pipeline.env
       fi
     - |
-      if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)BUILD_AND_TEST_ALL_APPS(,|$)"; then
-        echo "BUILD_AND_TEST_ALL_APPS=1" >> pipeline.env
-      fi
-    # run full pipeline if testing constraint branch
-    - |
-      if [ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]; then
-        echo "BUILD_AND_TEST_ALL_APPS=1" >> pipeline.env
+      if [ -n "$PIPELINE_COMMIT_SHA" ]; then
+        echo "PIPELINE_COMMIT_SHA=$PIPELINE_COMMIT_SHA" >> pipeline.env
       fi
     - echo "OOCD_DISTRO_URL_ARMHF=$OOCD_DISTRO_URL_ARMHF" >> pipeline.env
     - echo "OOCD_DISTRO_URL_ARM64=$OOCD_DISTRO_URL_ARM64" >> pipeline.env
-    - python tools/ci/ci_process_description.py
+    - run_cmd idf-ci gitlab pipeline-variables >> pipeline.env
     - cat pipeline.env
-    - python tools/ci/artifacts_handler.py upload --type modified_files_and_components_report
+    - run_cmd idf-ci gitlab upload-artifacts --type env
   artifacts:
     reports:
       dotenv: pipeline.env
@@ -211,13 +192,12 @@ baseline_manifest_sha:
     when: always
 
 redundant_pass_job:
-  stage: pre_check
+  extends:
+    - .pre_check_template
   tags: [shiny, fast_run]
-  image: $ESP_ENV_IMAGE
-  dependencies: null
-  before_script: []
   cache: []
-  extends: []
+  variables:
+    GIT_STRATEGY: none
+  before_script: []
   script:
     - echo "This job is redundant to ensure the 'retry_failed_jobs' job can exist and not be skipped"
-  when: always

.gitlab/ci/pre_commit.yml

@@ -2,33 +2,20 @@
   extends:
     - .before_script:minimal
   stage: pre_check
-  image: $PRE_COMMIT_IMAGE
-  tags: [cache, shiny]
+  image: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:2"
+  tags: [pre-commit]
+  variables:
+    # Both shiny and brew runners can pick this job
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 1
+    SUBMODULES_TO_FETCH: "all"
   needs:
     - pipeline_variables
-  variables:
-    # cache pre_commit
-    PRE_COMMIT_HOME: "$CI_PROJECT_DIR/.cache/pre-commit"
   script:
     - fetch_submodules
     - pre-commit run --files $MODIFIED_FILES
     - pre-commit run --hook-stage post-commit validate-sbom-manifest
 
-check_pre_commit_upload_cache:
-  extends:
-    - .check_pre_commit_template
-  rules:
-    - if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/) && $CI_PIPELINE_SOURCE == "push"'
-  cache:
-    - key: pre_commit-cache-${LATEST_GIT_TAG}
-      paths:
-        - .cache/pre-commit
-      policy: pull-push
-    - key: submodule-cache-${LATEST_GIT_TAG}
-      paths:
-        - .cache/submodule_archives
-      policy: pull
-
 check_pre_commit:
   extends:
     - .check_pre_commit_template
@@ -37,10 +24,6 @@ check_pre_commit:
       when: never
     - when: on_success
   cache:
-    - key: pre_commit-cache-${LATEST_GIT_TAG}
-      paths:
-        - .cache/pre-commit
-      policy: pull
     - key: submodule-cache-${LATEST_GIT_TAG}
       paths:
         - .cache/submodule_archives
@@ -56,25 +39,20 @@ check_powershell:
   tags:
     - dind
     - amd64
+    - brew # faster "apk add"
   needs:
     - pipeline_variables
   variables:
-    # cache pre_commit
-    PRE_COMMIT_HOME: "$CI_PROJECT_DIR/.cache/pre-commit"
+    # brew runners always use fetch
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 1
+    SUBMODULES_TO_FETCH: "none"
   rules:
     - changes:
         - "*.ps1"
+        - ".gitlab/ci/pre_commit.yml"
   script:
     - apk add python3
     - apk add py3-pip
     - pip install pre-commit --break-system-packages
     - pre-commit run --hook-stage manual check-powershell-scripts --files $MODIFIED_FILES
-  cache:
-    - key: pre_commit-cache-${LATEST_GIT_TAG}
-      paths:
-        - .cache/pre-commit
-      policy: pull
-    - key: submodule-cache-${LATEST_GIT_TAG}
-      paths:
-        - .cache/submodule_archives
-      policy: pull

.gitlab/ci/rules.yml

@@ -10,7 +10,7 @@
   - "**/*.{c,C,cpp}"
   - "**/*.{h,H,hpp}"
   - "components/**/Kconfig"
-  - "components/**/CMakeList.txt"
+  - "components/**/CMakeLists.txt"
 
 .patterns-python-cache: &patterns-python-cache
   - "tools/requirements.json"
@@ -53,7 +53,9 @@
   - "tools/ci/ignore_build_warnings.txt"
   - "tools/ci/test_build_system*.sh"
   - "tools/ci/test_build_system*.py"
-  - "tools/ci/ci_build_apps.py"
+  - "tools/test_build_system/**/*"
+
+.patterns-build_system_win: &patterns-build_system_win
   - "tools/test_build_system/**/*"
 
 .patterns-build_macos: &patterns-build_macos
@@ -145,7 +147,6 @@
   - "components/esp_phy/lib"
   - "components/esp_wifi/lib"
   - "components/esp_coex/lib"
-  - "components/json/cJSON"
   - "components/lwip/lwip"
   - "components/mbedtls/mbedtls"
   - "components/mqtt/esp-mqtt"
@@ -160,29 +161,22 @@
   - "components/bt/esp_ble_mesh/lib/lib"
   - ".gitmodules"
 
-.patterns-idf-pytest-plugin: &patterns-idf-pytest-plugin
-  - "tools/ci/idf_pytest/**/*"
-  - "tools/ci/dynamic_pipelines/tests/**/*"
-
 ##############
 # if anchors #
 ##############
-.if-ref-master: &if-ref-master
-  if: '$CI_COMMIT_REF_NAME == "master"'
+.if-master-push: &if-master-push
+  if: '$CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "push"'
 
-.if-ref-master-no_label: &if-ref-master-no_label
-  if: '$CI_COMMIT_REF_NAME == "master" && $BOT_TRIGGER_WITH_LABEL == null'
-
-.if-tag-release: &if-tag-release
+.if-release-tag: &if-release-tag
   if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/'
 
-.if-protected: &if-protected
+.if-protected-check: &if-protected-check
   if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) || $CI_COMMIT_TAG =~ /^qa-test/'
 
-.if-protected-no_label: &if-protected-no_label
-  if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && $BOT_TRIGGER_WITH_LABEL == null'
+.if-protected-deploy: &if-protected-deploy
+  if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/) && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "api")'
 
-.if-protected-ref-push: &if-protected-ref-push
+.if-protected-branch-push: &if-protected-branch-push
   # rules:changes always evaluates to true for new branch pipelines or when there is no Git push event
   if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/) && $CI_PIPELINE_SOURCE == "push"'
 
@@ -192,9 +186,6 @@
 .if-dev-push: &if-dev-push
   if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $CI_COMMIT_TAG !~ /^qa-test/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")'
 
-.if-schedule: &if-schedule
-  if: '$CI_PIPELINE_SOURCE == "schedule"'
-
 .if-schedule-nightly: &if-schedule-nightly
   if: '$CI_PIPELINE_SOURCE == "schedule" && $INCLUDE_NIGHTLY_RUN == "1"'
 
@@ -214,51 +205,41 @@
 # Rules #
 #########
 ### Branches ###
-.rules:protected:
+.rules:protected:check:
   rules:
-    - <<: *if-protected
+    - <<: *if-protected-check
 
-.rules:push_to_github:
+.rules:protected:deploy:
   rules:
     - <<: *if-qa-test-tag
       when: never
-    - <<: *if-protected-no_label
+    - <<: *if-protected-deploy
 
-# Not uploading on release branches
-.rules:sync_support_status:
+.rules:master:push:
   rules:
-    - <<: *if-ref-master-no_label
-
-.rules:protected-no_label-always:
-  rules:
-    - <<: *if-qa-test-tag
-      when: never
-    - <<: *if-protected-no_label
-      when: always
+    - <<: *if-master-push
 
 .rules:tag:release:
   rules:
-    - <<: *if-tag-release
+    - <<: *if-release-tag
 
 .rules:dev-push:
   rules:
     - <<: *if-dev-push
 
-# Do not upload caches on dev branches by default
 .rules:upload-python-cache:
   rules:
-    - <<: *if-tag-release
+    - <<: *if-release-tag
     - <<: *if-schedule-nightly
-    - <<: *if-protected-ref-push
+    - <<: *if-protected-branch-push
       changes: *patterns-python-cache
     - <<: *if-label-upload_cache
       when: manual
 
 .rules:upload-submodule-cache:
   rules:
-    # Needn't upload submodule cache in schedule pipeline
-    - <<: *if-tag-release
-    - <<: *if-protected-ref-push
+    - <<: *if-release-tag
+    - <<: *if-protected-branch-push
       changes: *patterns-submodule
     - <<: *if-label-upload_cache
       when: manual
@@ -266,11 +247,10 @@
 ### Patterns ###
 .rules:patterns:clang_tidy:
   rules:
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-dev-push
       changes: *patterns-c-files
 
-
 #.rules:patterns:static-code-analysis-preview:
 #  rules:
 #    - <<: *if-dev-push
@@ -280,12 +260,6 @@
 #    - <<: *if-dev-push
 #      changes: *patterns-sonarqube-files
 
-.rules:patterns:idf-pytest-plugin:
-  rules:
-    - <<: *if-protected
-    - <<: *if-dev-push
-      changes: *patterns-idf-pytest-plugin
-
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # DO NOT place comments or maintain any code from this line
 #
@@ -326,7 +300,7 @@
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build
     - <<: *if-dev-push
       changes: *patterns-build_components
@@ -339,7 +313,7 @@
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build
     - <<: *if-dev-push
       changes: *patterns-build_check
@@ -354,7 +328,7 @@
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build
     - <<: *if-label-docker
     - <<: *if-dev-push
@@ -370,22 +344,15 @@
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
-    - <<: *if-label-build
+    - <<: *if-protected-check
     - <<: *if-label-macos
     - <<: *if-label-macos_test
-    - <<: *if-dev-push
-      changes: *patterns-build_macos
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
 
 .rules:build:target_test:
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build
     - <<: *if-dev-push
       changes: *patterns-build_components
@@ -409,13 +376,13 @@
     - <<: *if-schedule-test-build-system-windows
     - <<: *if-label-windows
     - <<: *if-dev-push
-      changes: *patterns-build_system
+      changes: *patterns-build_system_win
 
 .rules:test:host_test:
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build-only
       when: never
     - <<: *if-label-host_test
@@ -426,7 +393,7 @@
   rules:
     - <<: *if-revert-branch
       when: never
-    - <<: *if-protected
+    - <<: *if-protected-check
     - <<: *if-label-build-only
       when: never
     - <<: *if-label-submodule

.gitlab/ci/static-code-analysis.yml

@@ -85,7 +85,7 @@ clang_tidy_check:
 #code_quality_report:
 #  extends:
 #    - .sonar_scan_template
-#    - .rules:protected
+#    - .rules:protected:check
 #  allow_failure: true  # it's using exit code to indicate the code analysis result,
 #                       # we don't want to block ci when critical issues founded
 #  script:

.gitlab/ci/test-win.yml

@@ -3,8 +3,7 @@
   extends: .rules:test:host_test
   stage: host_test
   image: $ESP_ENV_IMAGE
-  tags:
-    - windows-build
+  tags: [windows-build, brew]
   dependencies: # set dependencies to null to avoid missing artifacts issue
   # run host_test jobs immediately, only after upload cache
   needs:
@@ -14,13 +13,21 @@
     - job: upload-submodules-cache
       optional: true
       artifacts: false
-  before_script: []
+  variables:
+    GIT_STRATEGY: fetch  # use brew local mirror first
+  before_script:
+    - if ($env:IDF_DONT_USE_MIRRORS) {
+        $env:IDF_MIRROR_PREFIX_MAP = ""
+      }
   after_script: []
 
 test_cli_installer_win:
+  rules:
+    - when: never
   extends:
     - .host_test_win_template
     - .rules:labels:windows_pytest_build_system
+  allow_failure: true
   artifacts:
     when: on_failure
     paths:
@@ -30,10 +37,10 @@ test_cli_installer_win:
   variables:
     IDF_PATH: "$CI_PROJECT_DIR"
   timeout: 3h
-  allow_failure: true
   script:
     # Tools must be downloaded for testing
-    - python ${IDF_PATH}\tools\idf_tools.py download required qemu-riscv32 qemu-xtensa cmake
+    #                                                                     cmake@version that is supported
+    - python ${IDF_PATH}\tools\idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.22.1
     - cd ${IDF_PATH}\tools\test_idf_tools
     - python -m pip install jsonschema
     - python .\test_idf_tools.py
@@ -43,6 +50,7 @@ test_tools_win:
   extends:
     - .host_test_win_template
     - .rules:labels:windows_pytest_build_system
+  parallel: 4
   artifacts:
     paths:
       - ${IDF_PATH}/*.out
@@ -56,12 +64,12 @@ test_tools_win:
     PYTHONPATH: "$PYTHONPATH;$IDF_PATH\\tools;$IDF_PATH\\tools\\esp_app_trace;$IDF_PATH\\components\\partition_table;$IDF_PATH\\tools\\ci\\python_packages"
   script:
     - python -m pip install jsonschema
-    - .\install.ps1 --enable-ci --enable-pytest
+    - .\install.ps1 --enable-ci
     - .\export.ps1
     - python "${SUBMODULE_FETCH_TOOL}" -s "all"
     - cd ${IDF_PATH}/tools/test_idf_py
-    - pytest --noconftest test_idf_py.py       --junitxml=${IDF_PATH}/XUNIT_IDF_PY.xml
-    - pytest --noconftest test_hints.py        --junitxml=${IDF_PATH}/XUNIT_HINTS.xml
+    - idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${IDF_PATH}/XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
 # Build tests
 .test_build_system_template_win:
@@ -74,20 +82,20 @@ test_tools_win:
   after_script: []
   timeout: 4 hours
   script:
-    - .\install.ps1 --enable-ci --enable-pytest
+    - .\install.ps1 --enable-ci
     - . .\export.ps1
     - python "${SUBMODULE_FETCH_TOOL}" -s "all"
     - cd ${IDF_PATH}\tools\test_build_system
-    - pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml
+    - idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest --parallel-count ${CI_NODE_TOTAL} --parallel-index ${CI_NODE_INDEX} --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
 pytest_build_system_win:
   extends:
     - .test_build_system_template_win
     - .rules:labels:windows_pytest_build_system
-  parallel: 2
+  parallel: 6
   needs: []
-  tags:
-    - windows-build
+  tags: [windows-build, brew]
   artifacts:
     paths:
       - XUNIT_RESULT.xml
@@ -96,3 +104,35 @@ pytest_build_system_win:
     reports:
       junit: XUNIT_RESULT.xml
     when: always
+
+pytest_build_system_win_minimal_cmake:
+  extends:
+    - .test_build_system_template_win
+    - .rules:labels:windows_pytest_build_system
+  needs: []
+  tags: [windows-build, brew]
+  artifacts:
+    paths:
+      - XUNIT_RESULT.xml
+      - test_build_system
+    expire_in: 2 days
+    reports:
+      junit: XUNIT_RESULT.xml
+    when: always
+  variables:
+    MINIMAL_CMAKE_VERSION: "3.22.1"
+  script:
+    - .\install.ps1 --enable-ci
+    - . .\export.ps1
+    - python ${IDF_PATH}\tools\idf_tools.py install cmake@${MINIMAL_CMAKE_VERSION}
+    - $Env:PATH = "$Env:USERPROFILE\.espressif\tools\cmake\${MINIMAL_CMAKE_VERSION}\bin;$Env:PATH"
+    - |
+      $actualVersion = (& cmake --version).Split()[2]
+      if ($actualVersion -ne $Env:MINIMAL_CMAKE_VERSION) {
+        Write-Error "ERROR: Wrong CMake version! Detected: $actualVersion, but expected: $Env:MINIMAL_CMAKE_VERSION"
+        exit 1
+      }
+    - python "${SUBMODULE_FETCH_TOOL}" -s "all"
+    - cd ${IDF_PATH}\tools\test_build_system
+    - idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest -k cmake --junitxml=${CI_PROJECT_DIR}\XUNIT_RESULT.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}

.gitlab/ci/upload_cache.yml

@@ -21,7 +21,7 @@ upload-pip-cache:
     policy: push
   script:
     - rm -rf .cache/pip  # clear old packages
-    - bash install.sh --enable-ci --enable-pytest
+    - bash install.sh --enable-ci --enable-test-specific
   parallel:
     matrix:
       - GEO: [ 'shiny',  'brew' ]

.gitlab/merge_request_templates/Minimal_Template.md

@@ -9,11 +9,6 @@
 ## Related <!-- Optional -->
 <!-- Related Jira issues and Github issues or write "No related issues"-->
 
-## Release notes <!-- Mandatory -->
-<!-- Either state release notes or write "No release notes" -->
-
-<!-- ## Breaking change notes --><!-- Optional -->
-
 <!-- ## Dynamic Pipeline Configuration
 ```yaml
 Test Case Filters:

.gitlab/merge_request_templates/Mixed Template.md

@@ -39,27 +39,5 @@ _For other small/non-public changes, which are not expected to be in the release
 * Mention submodule MR, if there is
 * Mention backport(ed) MR, if there is
 
-_Don't touch the subsection titles below, they will be parsed by scripts._
-
-## Release notes <!-- Mandatory -->
-
-_Changes made in this MR that should go into the **Release Notes** should be listed here. Please use **past tense** and *specify the area (see maintainers page of IDF internal wiki)*. If there is a subscope, include it and separate with slash (`/`). Minor changes can go to the descriptions above without a release notes entry._
-
-_Write all the changes in a **list** (Start at the beginning of the line with `-` or `*`). If multiple changes are made, each of them should take a single line. If there is only one change to list, it should still be the only line of a list. If this MR does not need any release notes, write "No release notes" here without the `-` or `*`. e.g._
-
-* [WiFi] Changed/fixed/updated xxx
-* [WiFi] Added support of xxx
-* [Peripheral Drivers/I2S] Fixed xxx (https://github.com/espressif/esp-idf/issues/xxxx)
-
-## Breaking change notes
-
-_Remove this subsection if not used._
-
-_If there are any breaking changes, please mention it here. Talking about (1) what is not accepted any more, (2) the alternative solution and (3) the benefits/reason. e.g._
-
-_Please strictly follow the breaking change restriction, which means, if there is a breaking change but you are merging to non-major versions, you have to separate the breaking part out to another MR for a major version. The breaking change subsection is only accepted in MRs merging to major versions._
-
-* [VFS/UART] Now vfs_uart_set_rts_cts accept one more instance argument, to support configuration to different ports.
-
 <!-- Don't remove the next line - assigns the MR author as the assignee -->
 /assign me

.gitmodules

@@ -46,19 +46,6 @@
 	sbom-description = Wear-leveled SPI flash file system for embedded devices
 	sbom-hash = 0dbb3f71c5f6fae3747a9d935372773762baf852
 
-[submodule "components/json/cJSON"]
-	path = components/json/cJSON
-	url = ../../DaveGamble/cJSON.git
-	sbom-version = 1.7.18
-	sbom-cpe = cpe:2.3:a:cjson_project:cjson:{}:*:*:*:*:*:*:*
-	sbom-supplier = Person: Dave Gamble
-	sbom-url = https://github.com/DaveGamble/cJSON
-	sbom-description = Ultralightweight JSON parser in ANSI C
-	sbom-hash = 8f2beb57ddad1f94bed899790b00f46df893ccac
-	sbom-cve-exclude-list = CVE-2024-31755 Resolved in v1.7.18
-	sbom-cve-exclude-list = CVE-2023-26819 Resolved in commit a328d65ad490b64da8c87523cbbfe16050ba5bf6
-	sbom-cve-exclude-list = CVE-2023-53154 Resolved in v1.7.18
-
 [submodule "components/mbedtls/mbedtls"]
 	path = components/mbedtls/mbedtls
 	url = ../../espressif/mbedtls.git

.idf_build_apps.toml

@@ -0,0 +1,68 @@
+config_rules = [
+    'sdkconfig.ci=default',
+    'sdkconfig.ci.*=',
+    '=default',
+]
+
+extra_pythonpaths = [
+    '$IDF_PATH/tools/ci/python_packages',
+    '$IDF_PATH/tools/ci',
+    '$IDF_PATH/tools',
+]
+build_system = "idf_ci_local.app:IdfCMakeApp"
+
+recursive = true
+check_warnings = true
+keep_going = true
+copy_sdkconfig = true
+ignore_warning_files = [
+    '$IDF_PATH/tools/ci/ignore_build_warnings.txt',
+]
+
+build_dir = "build_@t_@w"
+build_log_filename = "build_log.txt"
+size_json_filename = "size_${CI_JOB_ID}.json"
+
+verbose = 1  # INFO
+
+additional_build_targets = [
+    'esp32h21',
+    'esp32h4',
+]
+
+# collect
+collect_app_info_filename = "app_info_${CI_JOB_NAME_SLUG}.txt"
+junitxml = "build_summary_${CI_JOB_NAME_SLUG}.xml"
+
+# manifest
+check_manifest_rules = true
+manifest_rootpath = "$IDF_PATH"
+manifest_filepatterns = [
+    '**/.build-test-rules.yml',
+]
+
+# dependency-driven build
+deactivate_dependency_driven_build_by_components = [
+    'cxx',
+    'esp_common',
+    'esp_hw_support',
+    'esp_rom',
+    'esp_system',
+    'esp_timer',
+    'freertos',
+    'hal',
+    'heap',
+    'log',
+    'esp_libc',
+    'riscv',
+    'soc',
+    'xtensa',
+]
+
+deactivate_dependency_driven_build_by_filepatterns = [
+    # tools
+    'tools/cmake/**/*',
+    'tools/tools.json',
+    # ci
+    'tools/ci/ignore_build_warnings.txt',
+]

.idf_ci.toml

@@ -0,0 +1,106 @@
+preserve_non_test_related_apps = false
+exclude_dirs = [
+    'tools/test_mkdfu',
+    'tools/test_idf_size',
+    'tools/test_idf_py',
+    'tools/test_idf_diag',
+    'tools/test_bsasm',
+    'tools/ci/test_autocomplete',
+    'tools/test_build_system',
+]
+
+[local_runtime_envs]
+EXTRA_CFLAGS = "-Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function -Wstrict-prototypes"
+EXTRA_CXXFLAGS = "-Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
+LDGEN_CHECK_MAPPING = "1"
+IDF_CI_BUILD = "1"
+
+[gitlab]
+
+[gitlab.build_pipeline]
+workflow_name = "build_child_pipeline"
+presigned_json_job_name = 'generate_pytest_build_report'
+
+job_tags = ['build', 'shiny']
+job_template_name = '.dynamic_build_template'
+job_template_jinja = ''  # write in tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+pre_yaml_jinja = """
+include:
+  - .gitlab/ci/common.yml
+  - tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+  - tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml
+"""
+yaml_jinja = """
+{{ settings.gitlab.build_pipeline.pre_yaml_jinja }}
+
+workflow:
+  name: {{ settings.gitlab.build_pipeline.workflow_name }}
+  rules:
+    - when: always
+
+{{ jobs }}
+"""  # simplified since we included the tools/ci/dynamic_pipelines/templates/test_child_pipeline.yml
+
+[gitlab.test_pipeline]
+job_template_name = '.dynamic_target_test_template'
+job_template_jinja = ''  # write in tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+pre_yaml_jinja = """
+include:
+  - .gitlab/ci/common.yml
+  - tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+  - tools/ci/dynamic_pipelines/templates/generate_target_test_report.yml
+"""
+
+[gitlab.artifacts.s3.debug]
+bucket = "idf-artifacts"
+patterns = [
+    '**/build*/bootloader/*.map',
+    '**/build*/bootloader/*.elf',
+    '**/build*/*.map',
+    '**/build*/*.elf',
+    # customized
+    '**/build*/esp_tee/*.map',
+    '**/build*/esp_tee/*.elf',
+    '**/build*/gdbinit/*',
+]
+
+[gitlab.artifacts.s3.flash]
+bucket = "idf-artifacts"
+patterns = [
+    '**/build*/bootloader/*.bin',
+    '**/build*/*.bin',
+    '**/build*/partition_table/*.bin',
+    '**/build*/flasher_args.json',
+    '**/build*/flash_project_args',
+    '**/build*/config/sdkconfig.json',
+    '**/build*/sdkconfig',
+    '**/build*/project_description.json',
+    # customized
+    '**/build*/esp_tee/*.bin',
+]
+
+[gitlab.artifacts.s3.log]
+bucket = "idf-artifacts"
+patterns = [
+    '**/build*/build_log.txt',
+    '**/build*/size*.json',
+]
+
+[gitlab.artifacts.s3.junit]
+bucket = "idf-artifacts"
+patterns = [
+    'XUNIT_RESULT_*.xml',
+]
+
+[gitlab.artifacts.s3.env]
+bucket = "idf-artifacts"
+patterns = [
+    'pipeline.env',
+]
+
+[gitlab.artifacts.s3.longterm]
+bucket = "longterm"
+if_clause = '"$CI_COMMIT_REF_NAME" == "master"'
+patterns = [
+    '**/build*/size.json',
+]

.mypy.ini

@@ -1,7 +1,7 @@
 [mypy]
 
 # Specifies the Python version used to parse and check the target program
-python_version = 3.9
+python_version = 3.10
 
 # Disallows defining functions without type annotations or with incomplete type annotations
 # True => enforce type annotation in all function definitions

.pre-commit-config.yaml

@@ -9,27 +9,7 @@ repos:
     hooks:
       - id: ruff-format
       - id: ruff
-        args: [ "--fix" ]
-  - repo: local
-    hooks:
-      - id: pytest-linter
-        name: Pytest Linter Check
-        entry: tools/ci/check_test_files.py
-        language: python
-        files: 'pytest_.*\.py$'
-        require_serial: true
-        additional_dependencies:
-          - pytest-embedded-idf[serial]~=1.16
-          - pytest-embedded-jtag~=1.16
-          - pytest-embedded-qemu~=1.16
-          - pytest-ignore-test-results~=0.3
-          - pytest-rerunfailures
-          - pytest-timeout
-          - idf-build-apps~=2.8
-          - python-gitlab
-          - minio
-          - click
-          - esp-idf-monitor
+        args: [ "--fix", "--show-fixes" ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -51,6 +31,7 @@ repos:
             .*.pb-c.c|
             .*.yuv|
             .*.rgb|
+            .*.gray|
             .*COPYING.*|
             docs/sphinx-known-warnings\.txt
           )$
@@ -70,7 +51,6 @@ repos:
     rev: v2.3.0
     hooks:
       - id: codespell
-        exclude: ^docs/sphinx-known-warnings\.txt$
   - repo: local
     hooks:
       - id: check-executables
@@ -164,7 +144,7 @@ repos:
         require_serial: true
         additional_dependencies:
           - PyYAML == 5.3.1
-          - idf-build-apps>=2.8,<3
+          - idf-build-apps~=2.13
       - id: sort-yaml-files
         name: sort yaml files
         entry: tools/ci/sort_yaml.py
@@ -179,15 +159,6 @@ repos:
         files: 'tools/ci/sort_yaml\.py$'
         additional_dependencies:
           - ruamel.yaml
-      - id: check-build-test-rules-path-exists
-        name: check path in .build-test-rules.yml exists
-        entry: tools/ci/check_build_test_rules.py check-exist
-        language: python
-        additional_dependencies:
-          - PyYAML == 5.3.1
-        always_run: true
-        pass_filenames: false
-        require_serial: true
       - id: cleanup-ignore-lists
         name: Remove non-existing patterns from ignore lists
         entry: tools/ci/cleanup_ignore_lists.py
@@ -206,14 +177,19 @@ repos:
     rev: v4.0.1
     hooks:
       - id: file-contents-sorter
-        files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt|check_copyright_ignore\.txt)'
+        files: "tools/ci/(\
+          executable-list\\.txt\
+          |mypy_ignore_list\\.txt\
+          |check_copyright_ignore\\.txt\
+          |exclude_check_tools_files\\.txt\
+        )"
   - repo: https://github.com/espressif/check-copyright/
     rev: v1.1.1
     hooks:
       - id: check-copyright
         args: ['--ignore', 'tools/ci/check_copyright_ignore.txt', '--config', 'tools/ci/check_copyright_config.yaml']
   - repo: https://github.com/espressif/conventional-precommit-linter
-    rev: v1.7.0
+    rev: v1.10.0
     hooks:
       - id: conventional-precommit-linter
         stages: [commit-msg]
@@ -251,7 +227,7 @@ repos:
         name: Lint rST files in docs folder using Sphinx Lint
         files: ^(docs/en|docs/zh_CN)/.*\.(rst|inc)$
   - repo: https://github.com/espressif/esp-idf-kconfig.git
-    rev: v2.5.0
+    rev: v3.2.0
     hooks:
       - id: check-kconfig-files
       - id: check-deprecated-kconfig-options

.readthedocs.yml

@@ -1,21 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Optionally build your docs in additional formats such as PDF and ePub
-formats:
-  - pdf
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 2.7
-  install:
-    - requirements: docs/requirements.txt
-
-# We need to list all the submodules included in documentation build by Doxygen
-submodules:
-  include:
-    - components/mqtt/esp-mqtt

CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.16)
-project(esp-idf C CXX ASM)
+cmake_minimum_required(VERSION 3.22)
 
 if(CMAKE_CURRENT_LIST_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "Current directory '${CMAKE_CURRENT_LIST_DIR}' is not buildable. "
-    "Change directories to one of the example projects in '${CMAKE_CURRENT_LIST_DIR}/examples' and try "
-    "again.")
+    "Change directories to one of the example projects in '${CMAKE_CURRENT_LIST_DIR}/examples' and try again.")
 endif()
 
+project(esp-idf C CXX ASM)
+
 # Variables compile_options, c_compile_options, cxx_compile_options, compile_definitions, link_options shall
 # not be unset as they may already contain flags, set by toolchain-TARGET.cmake files.
 
@@ -23,14 +23,15 @@ if(BOOTLOADER_BUILD)
         endif()
         if(CMAKE_C_COMPILER_ID MATCHES "GNU")
             list(APPEND compile_options "-freorder-blocks")
+            if(CONFIG_IDF_TARGET_ARCH_XTENSA)
+                list(APPEND compile_options "-mno-target-align")
+            endif()
         endif()
     elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG)
         list(APPEND compile_options "-Og")
         if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND NOT CONFIG_IDF_TARGET_LINUX)
             list(APPEND compile_options "-fno-shrink-wrap")  # Disable shrink-wrapping to reduce binary size
         endif()
-    elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE)
-        list(APPEND compile_options "-O0")
     elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF)
         list(APPEND compile_options "-O2")
     endif()
@@ -54,6 +55,9 @@ else()
         endif()
         if(CMAKE_C_COMPILER_ID MATCHES "GNU")
             list(APPEND compile_options "-freorder-blocks")
+            if(CONFIG_IDF_TARGET_ARCH_XTENSA)
+                list(APPEND compile_options "-mno-target-align")
+            endif()
         endif()
     elseif(CONFIG_COMPILER_OPTIMIZATION_DEBUG)
         list(APPEND compile_options "-Og")
@@ -105,8 +109,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     list(APPEND compile_options "-Wno-char-subscripts")
     # Clang seems to notice format string issues which GCC doesn't.
     list(APPEND compile_options "-Wno-format-security")
-    # Logic bug in essl component
-    list(APPEND compile_options "-Wno-tautological-overlap-compare")
     # Some pointer checks in mDNS component check addresses which can't be NULL
     list(APPEND compile_options "-Wno-tautological-pointer-compare")
     # Similar to the above, in tcp_transport
@@ -169,6 +171,18 @@ if(CONFIG_COMPILER_DUMP_RTL_FILES)
     list(APPEND compile_options "-fdump-rtl-expand")
 endif()
 
+if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 15.0)
+    list(APPEND c_compile_options "-fzero-init-padding-bits=all" "-fno-malloc-dce")
+endif()
+
+if(CONFIG_COMPILER_CXX_GLIBCXX_CONSTEXPR_COLD_CONSTEXPR)
+    list(APPEND cxx_compile_options "-D_GLIBCXX20_CONSTEXPR=__attribute__((cold)) constexpr")
+    list(APPEND cxx_compile_options "-D_GLIBCXX23_CONSTEXPR=__attribute__((cold)) constexpr")
+elseif(CONFIG_COMPILER_CXX_GLIBCXX_CONSTEXPR_COLD)
+    list(APPEND cxx_compile_options "-D_GLIBCXX20_CONSTEXPR=__attribute__((cold))")
+    list(APPEND cxx_compile_options "-D_GLIBCXX23_CONSTEXPR=__attribute__((cold))")
+endif()
+
 __generate_prefix_map(prefix_map_compile_options)
 list(APPEND compile_options ${prefix_map_compile_options})
 
@@ -188,6 +202,15 @@ if(CONFIG_COMPILER_DISABLE_GCC14_WARNINGS)
     list(APPEND compile_options "-Wno-calloc-transposed-args")
 endif()
 
+if(CONFIG_COMPILER_DISABLE_GCC15_WARNINGS)
+    list(APPEND c_compile_options "-Wno-unterminated-string-initialization")
+    list(APPEND c_compile_options "-Wno-header-guard")
+    list(APPEND cxx_compile_options "-Wno-self-move")
+    list(APPEND cxx_compile_options "-Wno-template-body")
+    list(APPEND cxx_compile_options "-Wno-dangling-reference")
+    list(APPEND cxx_compile_options "-Wno-defaulted-function-deleted")
+endif()
+
 if(CONFIG_COMPILER_DISABLE_DEFAULT_ERRORS)
     if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
         idf_build_replace_option_from_property(COMPILE_OPTIONS "-Werror" "-Werror=all")
@@ -305,3 +328,12 @@ foreach(component_target ${build_component_targets})
     endif()
     set(__idf_component_context 0)
 endforeach()
+
+# Run component validation checks after all components have been processed
+# Only run validation for the main project, not subprojects like bootloader
+idf_build_get_property(bootloader_build BOOTLOADER_BUILD)
+idf_build_get_property(esp_tee_build ESP_TEE_BUILD)
+if(NOT bootloader_build AND NOT esp_tee_build)
+    include("${CMAKE_CURRENT_LIST_DIR}/tools/cmake/component_validation.cmake")
+    __component_validation_run_checks()
+endif()

COMPATIBILITY.md

@@ -8,9 +8,9 @@ This document describes the compatibility between ESP-IDF releases and Espressif
 
 NOTE: This document on release branches may be out-of-date. Check the [Compatibility file on master](https://github.com/espressif/esp-idf/blob/master/COMPATIBILITY.md) for the most accurate information.
 
-See [Compatibility Advisory for Chip Revision Numbering Scheme](https://www.espressif.com.cn/sites/default/files/advisory_downloads/AR2022-005%20Compatibility%20Advisory%20for%20Chip%20Revision%20Numbering%20%20Scheme.pdf) on the versioning of Espressif SoC revisions.
+See [Compatibility Advisory for Chip Revision Numbering Scheme](https://www.espressif.com/sites/default/files/advisory_downloads/AR2022-005%20Compatibility%20Advisory%20for%20Chip%20Revision%20Numbering%20%20Scheme.pdf) on the versioning of Espressif SoC revisions.
 
-You can run `esptool chip_id` to detect the series and revision of an SoC. See [SoC Errata](https://www.espressif.com.cn/en/support/documents/technical-documents?keys=errata) for more on how to distinguish between chip revisions, and the improvements provided by chip revisions. And run `idf.py --version` to know the version of current ESP-IDF.
+You can run `esptool chip-id` to detect the series and revision of an SoC. See [SoC Errata](https://www.espressif.com/en/support/documents/technical-documents?keys=errata) for more on how to distinguish between chip revisions, and the improvements provided by chip revisions. And run `idf.py --version` to know the version of current ESP-IDF.
 
 ## ESP-IDF Support for Different Chip Revisions
 

COMPATIBILITY_CN.md

@@ -10,7 +10,7 @@
 
 有关乐鑫芯片版本的编码方式，请参考 [关于芯片版本 (Chip Revision) 编码方式的兼容性公告](https://www.espressif.com/sites/default/files/advisory_downloads/AR2022-005%20%E5%85%B3%E4%BA%8E%E8%8A%AF%E7%89%87%E7%89%88%E6%9C%AC%E7%BC%96%E7%A0%81%E6%96%B9%E5%BC%8F%20%28Chip%20Revision%29%20%E7%9A%84%E5%85%BC%E5%AE%B9%E6%80%A7%E5%85%AC%E5%91%8A.pdf)。
 
-运行 `esptool chip_id` 可查看芯片系列及其版本。有关区分芯片版本及版本改进内容的更多信息，请参考 [芯片勘误表](https://www.espressif.com.cn/zh-hans/support/documents/technical-documents?keys=%E5%8B%98%E8%AF%AF%E8%A1%A8)。运行 `idf.py --version` 可查看当前的 ESP-IDF 版本。
+运行 `esptool chip-id` 可查看芯片系列及其版本。有关区分芯片版本及版本改进内容的更多信息，请参考 [芯片勘误表](https://www.espressif.com.cn/zh-hans/support/documents/technical-documents?keys=%E5%8B%98%E8%AF%AF%E8%A1%A8)。运行 `idf.py --version` 可查看当前的 ESP-IDF 版本。
 
 ## ESP-IDF 对各芯片版本的支持
 

Kconfig

@@ -118,8 +118,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default "y" if IDF_TARGET="esp32c5"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
-        # TODO: [ESPTOOL-1044] remove when stub supported
-        select IDF_ENV_BRINGUP
 
     config IDF_TARGET_ESP32P4
         bool
@@ -143,16 +141,15 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default "y" if IDF_TARGET="esp32h21"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
-        select IDF_ENV_FPGA
         select IDF_ENV_BRINGUP
+        select IDF_ENV_FPGA if ESP32H21_SELECTS_REV_MP
 
     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
+        select IDF_ENV_FPGA if ESP32H4_SELECTS_REV_MP
 
     config IDF_TARGET_LINUX
         bool
@@ -222,10 +219,10 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 When loading the BIN with UART, the ROM will jump to ram and run the app after finishing the ROM
                 startup code, so there's no additional startup initialization required. You can use the
-                `load_ram` in esptool.py to load the generated .bin file into ram and execute.
+                `load-ram` in esptool to load the generated .bin file into ram and execute.
 
                 Example:
-                    esptool.py --chip {chip} -p {port} -b {baud} --no-stub load_ram {app.bin}
+                    esptool --chip {chip} -p {port} -b {baud} --no-stub load-ram {app.bin}
 
                 Recommended sdkconfig.defaults for building loadable ELF files is as follows.
                 CONFIG_APP_BUILD_TYPE_RAM is required, other options help reduce application
@@ -233,7 +230,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                     CONFIG_APP_BUILD_TYPE_RAM=y
                     CONFIG_VFS_SUPPORT_TERMIOS=
-                    CONFIG_NEWLIB_NANO_FORMAT=y
+                    CONFIG_LIBC_NEWLIB_NANO_FORMAT=y
                     CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
                     CONFIG_ESP_DEBUG_STUBS_ENABLE=
                     CONFIG_ESP_ERR_TO_NAME_LOOKUP=
@@ -410,7 +407,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         config COMPILER_ASSERT_NDEBUG_EVALUATE
             bool "Enable the evaluation of the expression inside assert(X) when NDEBUG is set"
-            default y
+            default n
             help
                 When NDEBUG is set, assert(X) will not cause code to trigger an assertion.
                 With this option set, assert(X) will still evaluate the expression X, though
@@ -420,9 +417,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 This is not according to the standard, which states that the assert(X) should
                 be replaced with ((void)0) if NDEBUG is defined.
 
-                In ESP-IDF v6.0 the default behavior will change to "no" to be in line with the
-                standard.
-
         choice COMPILER_FLOAT_LIB_FROM
             prompt "Compiler float lib source"
             default COMPILER_FLOAT_LIB_FROM_RVFPLIB if ESP_ROM_HAS_RVFPLIB
@@ -581,7 +575,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         config COMPILER_DISABLE_DEFAULT_ERRORS
             bool "Disable errors for default warnings"
-            default "y"
+            default "n"
             help
                 Enable this option if you do not want default warnings to be considered as errors,
                 especially when updating IDF.
@@ -614,6 +608,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 Enable this option if use GCC 14 or newer, and want to disable warnings which don't appear with
                 GCC 13.
 
+        config COMPILER_DISABLE_GCC15_WARNINGS
+            bool "Disable new warnings introduced in GCC 15"
+            default "n"
+            help
+                Enable this option if use GCC 15 or newer, and want to disable warnings which don't appear with
+                GCC 14.
+
         config COMPILER_DUMP_RTL_FILES
             bool "Dump RTL files during compilation"
             help
@@ -650,7 +651,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         choice COMPILER_ORPHAN_SECTIONS
             prompt "Orphan sections handling"
-            default COMPILER_ORPHAN_SECTIONS_WARNING
+            default COMPILER_ORPHAN_SECTIONS_ERROR
             depends on !IDF_TARGET_LINUX
             help
                 If the linker finds orphan sections, it attempts to place orphan sections after sections of the same
@@ -658,6 +659,11 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 That means that orphan sections could placed between sections defined in IDF linker scripts.
                 This could lead to corruption of the binary image. Configure the linker action here.
 
+            config COMPILER_ORPHAN_SECTIONS_ERROR
+                bool "Fail if orphan sections found"
+                help
+                    Fails the link step with an error if orphan sections are detected.
+
             config COMPILER_ORPHAN_SECTIONS_WARNING
                 bool "Place with warning"
                 help
@@ -676,6 +682,34 @@ mainmenu "Espressif IoT Development Framework Configuration"
             help
                 Enable compiler static analyzer. This may produce false-positive results and increases compile time.
 
+        choice COMPILER_CXX_GLIBCXX_CONSTEXPR
+            prompt "Define _GLIBCXX_CONSTEXPR"
+            default COMPILER_CXX_GLIBCXX_CONSTEXPR_NO_CHANGE
+            depends on IDF_TOOLCHAIN_GCC && !IDF_TARGET_LINUX
+            help
+                Modify libstdc++ _GLIBCXX20_CONSTEXPR and _GLIBCXX23_CONSTEXPR definitions to provide size
+                optimizations. The total size optimization depends on the application's structure.
+                There is no robust way to determine which option would be better in a particular case.
+                Please try all available options to find the best size optimization.
+
+            config COMPILER_CXX_GLIBCXX_CONSTEXPR_NO_CHANGE
+                bool "No change"
+                help
+                    Use default _GLIBCXX20_CONSTEXPR and _GLIBCXX23_CONSTEXPR defined in libstdc++
+
+            config COMPILER_CXX_GLIBCXX_CONSTEXPR_COLD_CONSTEXPR
+                bool "_GLIBCXX2X_CONSTEXPR=__attribute__((cold)) constexpr"
+                help
+                    Define _GLIBCXX20_CONSTEXPR=__attribute__((cold)) constexpr
+                    Define _GLIBCXX23_CONSTEXPR=__attribute__((cold)) constexpr
+
+            config COMPILER_CXX_GLIBCXX_CONSTEXPR_COLD
+                bool "_GLIBCXX2X_CONSTEXPR=__attribute__((cold))"
+                help
+                    Define _GLIBCXX20_CONSTEXPR=__attribute__((cold)).
+                    Define _GLIBCXX23_CONSTEXPR=__attribute__((cold)).
+        endchoice
+
     endmenu # Compiler Options
 
     menu "Component config"
@@ -707,3 +741,5 @@ mainmenu "Espressif IoT Development Framework Configuration"
             - CONFIG_ESP_WIFI_ENABLE_ROAMING_APP
             - CONFIG_USB_HOST_EXT_PORT_RESET_ATTEMPTS
             - CONFIG_LIBC_PICOLIBC
+            - CONFIG_GDMA_ENABLE_WEIGHTED_ARBITRATION
+            - CONFIG_I3C_MASTER_ENABLED

README.md

@@ -15,18 +15,19 @@ ESP-IDF is the development framework for Espressif SoCs supported on Windows, Li
 
 The following table shows ESP-IDF support of Espressif SoCs where ![alt text][preview] and ![alt text][supported] denote preview status and support, respectively. The preview support is usually limited in time and intended for beta versions of chips. Please use an ESP-IDF release where the desired SoC is already supported.
 
-|Chip         |         v5.1           |         v5.2           |         v5.3           |          v5.4           |          v5.5           |                                                                    |
-|:----------- |:--------------------: | :--------------------: | :--------------------: |  :--------------------: |  :--------------------: |:------------------------------------------------------------------- |
-|ESP32        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |                                                                    |
-|ESP32-S2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |   ![alt text][supported] |                                                                    |
-|ESP32-C3     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |                                                                     |
-|ESP32-S3     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_S3) |
-|ESP32-C2     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32-C2)           |
-|ESP32-C6     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_C6)           |
-|ESP32-H2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_H2)           |
-|ESP32-P4     |                        |                        | ![alt text][supported] |  ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32-P4)           |
-|ESP32-C5      |                        |                        |                        |               |![alt text][preview]   |[Announcement](https://www.espressif.com/en/news/ESP32-C5)           |
-|ESP32-C61     |                       |                        |                        |               |![alt text][preview]   |[Announcement](https://www.espressif.com/en/products/socs/esp32-c61) |
+|Chip         |         v5.1           |         v5.2           |         v5.3           |          v5.4           |          v5.5          |          v6.0           |                                                                     |
+|:----------- |:---------------------: |:---------------------: |:---------------------: | :---------------------: |  :-------------------: |  :--------------------: |:------------------------------------------------------------------- |
+|ESP32        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |                                                                     |
+|ESP32-S2     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |                                                                     |
+|ESP32-C3     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |                                                                     |
+|ESP32-S3     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_S3)           |
+|ESP32-C2     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32-C2)           |
+|ESP32-C6     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_C6)           |
+|ESP32-H2     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32_H2)           |
+|ESP32-P4     |                        |                        | ![alt text][supported] |  ![alt text][supported] | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32-P4)           |
+|ESP32-C5     |                        |                        |                        |                         | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/news/ESP32-C5)           |
+|ESP32-C61    |                        |                        |                        |                         | ![alt text][supported] |  ![alt text][supported] |[Announcement](https://www.espressif.com/en/products/socs/esp32-c61) |
+|ESP32-H4     |                        |                        |                        |                         |                        |  ![alt text][preview]   |[Announcement](https://www.espressif.com/en/news/ESP32-H4)           |
 
 [supported]: https://img.shields.io/badge/-supported-green "supported"
 [preview]: https://img.shields.io/badge/-preview-orange "preview"
@@ -82,7 +83,7 @@ See the Getting Started guide links above for a detailed setup guide. This is a
 
 ## Flashing the Project
 
-When the build finishes, it will print a command line to use esptool.py to flash the chip. However you can also do this automatically by running:
+When the build finishes, it will print a command line to use `esptool` to flash the chip. However you can also do this automatically by running:
 
 `idf.py -p PORT flash`
 

README_CN.md

@@ -15,19 +15,19 @@ ESP-IDF 是乐鑫官方推出的物联网开发框架，支持 Windows、Linux
 
 下表总结了乐鑫芯片在 ESP-IDF 各版本中的支持状态，其中 ![alt text][supported] 代表已支持，![alt text][preview] 代表目前处于预览支持状态。预览支持状态通常有时间限制，而且仅适用于测试版芯片。请确保使用与芯片相匹配的 ESP-IDF 版本。
 
-芯片         |          v5.1          |          v5.2          |          v5.3          |          v5.4          |          v5.5          |                                                                           |
-|:----------- | :--------------------: | :--------------------: | :--------------------: | :--------------------: |  :--------------------: |:------------------------------------------------------------------------ |
-|ESP32        |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] |                                                              |
-|ESP32-S2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                              |
-|ESP32-C3     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                              |
-|ESP32-S3     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_S3)           |
-|ESP32-C2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C2)           |
-|ESP32-C6     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_C6)           |
-|ESP32-H2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_H2)           |
-|ESP32-P4     |                         |                        | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-P4)           |
-|ESP32-C5       |                        |                        |                   |                        |![alt text][preview] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C5)           |
-|ESP32-C61      |                       |                        |                    |                        |![alt text][preview] | [芯片发布公告](https://www.espressif.com/zh-hans/products/socs/esp32-c61) |
-
+|芯片         |          v5.1         |          v5.2          |          v5.3          |          v5.4          |          v5.5          |          v6.0         |                                                                           |
+|:----------- | :-------------------: | :--------------------: | :--------------------: | :--------------------: |  :-------------------: | :-------------------: |:------------------------------------------------------------------------- |
+|ESP32        |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] |                                                                           |
+|ESP32-S2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] |                                                                           |
+|ESP32-C3     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] |                                                                           |
+|ESP32-S3     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_S3)           |
+|ESP32-C2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C2)           |
+|ESP32-C6     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_C6)           |
+|ESP32-H2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_H2)           |
+|ESP32-P4     |                       |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-P4)           |
+|ESP32-C5     |                       |                        |                        |                        | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C5)           |
+|ESP32-C61    |                       |                        |                        |                        | ![alt text][supported] |![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/products/socs/esp32-c61) |
+|ESP32-H4     |                       |                        |                        |                        |                        |![alt text][preview]   | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-H4)           |
 
 [supported]: https://img.shields.io/badge/-%E6%94%AF%E6%8C%81-green "supported"
 [preview]: https://img.shields.io/badge/-%E9%A2%84%E8%A7%88-orange "preview"
@@ -83,7 +83,7 @@ ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodu
 
 ## 烧写项目
 
-当构建结束，终端会打印出一条命令行，告知如何使用 esptool.py 工具烧写项目到芯片中。但你也可以运行下面这条命令来自动烧写：
+当构建结束，终端会打印出一条命令行，告知如何使用 `esptool` 工具烧写项目到芯片中。但你也可以运行下面这条命令来自动烧写：
 
 `idf.py -p PORT flash`
 

components/README.md

@@ -10,7 +10,7 @@ The core components are organized into two groups.
 
 The first group (referred to as `G0`) includes `hal`, `arch` (where `arch` is either `riscv` or `xtensa` depending on the chip), `esp_rom`, `esp_common`, and `soc`. This group contains information about and provides low-level access to the underlying hardware. In the case of `esp_common`, it contains hardware-agnostic code and utilities. These components may have dependencies on each other within the group, but outside dependencies should be minimized. The reason for this approach is that these components are fundamental, and many other components may require them. Ideally, the dependency relationship only goes one way, making it easier for this group to be usable in other projects.
 
-The second group (referred to as `G1`) operates at a higher level than the first group. `G1` includes the components `esp_hw_support`, `esp_system`, `newlib`, `spi_flash`, `freertos`, `log`, and `heap`. Like the first group, circular dependencies within this group are allowed, and these components can have dependencies on the first group. G1 components represent essential software mechanisms for building other components.
+The second group (referred to as `G1`) operates at a higher level than the first group. `G1` includes the components `esp_hw_support`, `esp_system`, `esp_libc`, `spi_flash`, `freertos`, `log`, and `heap`. Like the first group, circular dependencies within this group are allowed, and these components can have dependencies on the first group. G1 components represent essential software mechanisms for building other components.
 
 ## Descriptions
 
@@ -40,7 +40,7 @@ Example:
 
 #### `esp_common`
 
-Contains hardware-agnostic definitions, constants, macros, utilities, 'pure' and/or algorithmic functions that is useable by all other components (that is, barring there being a more appropriate component to put them in).
+Contains hardware-agnostic definitions, constants, macros, utilities, 'pure' and/or algorithmic functions that is usable by all other components (that is, barring there being a more appropriate component to put them in).
 
 Example:
 
@@ -85,7 +85,7 @@ Logging library.
 
 Heap implementation.
 
-#### `newlib`
+#### `esp_libc`
 
 Some functions n the standard library are implemented here, especially those needing other `G1` components.
 

components/app_trace/CMakeLists.txt

@@ -4,45 +4,35 @@ if(${target} STREQUAL "linux")
     return() # This component is not supported by the POSIX/Linux simulator
 endif()
 
-set(srcs
-    "app_trace.c"
-    "app_trace_util.c"
-    "host_file_io.c")
+if(CONFIG_APPTRACE_ENABLE)
+    set(srcs
+        "app_trace.c"
+        "app_trace_util.c"
+        "host_file_io.c"
+        )
 
-if(CONFIG_ESP_DEBUG_STUBS_ENABLE)
-    list(APPEND srcs
-        "debug_stubs.c")
+    if(NOT CONFIG_APPTRACE_DEST_UART)  # JTAG or ALL
+        if(CONFIG_IDF_TARGET_ARCH_XTENSA)
+            list(APPEND srcs "port/xtensa/port_jtag.c")
+        elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
+            list(APPEND srcs "port/riscv/port_jtag.c")
+        endif()
+        list(APPEND srcs "app_trace_membufs_proto.c")
+    endif()
+
+    if(NOT CONFIG_APPTRACE_DEST_JTAG)  # UART or ALL
+        list(APPEND srcs "port/port_uart.c")
+    endif()
 endif()
 
-if(CONFIG_APPTRACE_GCOV_ENABLE)
-    if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-        list(APPEND srcs
-            "gcov/gcov_rtio.c")
-    else()
-        fail_at_build_time(app_trace "Only GNU compiler can link with Gcov library")
-    endif()
+if(CONFIG_ESP_DEBUG_STUBS_ENABLE)
+    list(APPEND srcs "debug_stubs.c")
 endif()
 
 set(include_dirs "include")
 
 set(priv_include_dirs "private_include" "port/include")
 
-if(CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE)
-    list(APPEND srcs
-        "app_trace_membufs_proto.c")
-
-    if(CONFIG_IDF_TARGET_ARCH_XTENSA)
-        list(APPEND srcs
-            "port/xtensa/port.c")
-    endif()
-    if(CONFIG_IDF_TARGET_ARCH_RISCV)
-        list(APPEND srcs
-            "port/riscv/port.c")
-    endif()
-endif()
-list(APPEND srcs
-    "port/port_uart.c")
-
 if(CONFIG_APPTRACE_SV_ENABLE)
     list(APPEND include_dirs
         sys_view/Config
@@ -68,56 +58,6 @@ endif()
 idf_component_register(SRCS "${srcs}"
                        INCLUDE_DIRS "${include_dirs}"
                        PRIV_INCLUDE_DIRS "${priv_include_dirs}"
-                       PRIV_REQUIRES esp_driver_gptimer esp_driver_gpio esp_driver_uart
-                       REQUIRES esp_timer
+                       PRIV_REQUIRES esp_driver_gptimer
+                       REQUIRES esp_timer esp_driver_uart
                        LDFRAGMENTS linker.lf)
-
-# Force app_trace to also appear later than gcov in link line
-idf_component_get_property(app_trace app_trace COMPONENT_LIB)
-
-if(CONFIG_APPTRACE_GCOV_ENABLE)
-    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-        # Coverage info is not supported when clang is used
-        # TODO: LLVM-214
-        message(FATAL_ERROR "Coverage info is not supported when building with Clang!")
-    endif()
-
-    # The original Gcov library from toolchain will be objcopy with symbols redefinitions (see file gcov/io_sym.map).
-    # This needs because ESP has no file-system onboard, and redefined functions solves this problem and transmits
-    # output file to host PC.
-
-    # Set a name for Gcov library
-    set(GCOV_LIB libgcov_rtio)
-
-    # Set include direcrory of Gcov internal headers
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=plugin
-                    OUTPUT_VARIABLE gcc_plugin_dir
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
-    set_source_files_properties(gcov/gcov_rtio.c
-                                PROPERTIES COMPILE_FLAGS "-I${gcc_plugin_dir}/include")
-
-    # Copy libgcov.a with symbols redefinition
-    find_library(GCOV_LIBRARY_PATH gcov ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
-    add_custom_command(OUTPUT ${GCOV_LIB}.a
-                       COMMAND ${_CMAKE_TOOLCHAIN_PREFIX}objcopy
-                               --redefine-syms ${CMAKE_CURRENT_LIST_DIR}/gcov/io_sym.map
-                               ${GCOV_LIBRARY_PATH} ${GCOV_LIB}.a
-                       MAIN_DEPENDENCY ${GCOV_LIBRARY_PATH}
-                       VERBATIM)
-    add_custom_target(${GCOV_LIB}_target DEPENDS ${GCOV_LIB}.a)
-    add_library(${GCOV_LIB} STATIC IMPORTED)
-    set_target_properties(${GCOV_LIB}
-                          PROPERTIES
-                          IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${GCOV_LIB}.a)
-    add_dependencies(${GCOV_LIB} ${GCOV_LIB}_target)
-    add_dependencies(${COMPONENT_LIB} ${GCOV_LIB})
-
-    # disable --coverage for this component, as it is used as transport for gcov
-    target_compile_options(${COMPONENT_LIB} PRIVATE "-fno-profile-arcs" "-fno-test-coverage")
-    target_link_options(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=__gcov_init")
-
-    target_link_libraries(${COMPONENT_LIB} INTERFACE ${GCOV_LIB} $<TARGET_FILE:${app_trace}> c)
-else()
-    target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${app_trace}> c)
-endif()

components/app_trace/Kconfig

@@ -1,81 +1,73 @@
 menu "Application Level Tracing"
 
-    choice APPTRACE_DESTINATION1
-        prompt "Data Destination 1"
-        default APPTRACE_DEST_NONE
+    config APPTRACE_ENABLE
+        bool "Enable Application Level Tracing"
+        default n
         help
-            Select destination for application trace: JTAG or none (to disable).
+            Enables/disable application tracing module.
+            This must be enabled to use any tracing library.
+
+    choice APPTRACE_DESTINATION
+        prompt "Data Destination"
+        default APPTRACE_DEST_JTAG if !PM_ENABLE
+        default APPTRACE_DEST_UART if PM_ENABLE
+        depends on APPTRACE_ENABLE
+        help
+            Select destination for application trace: JTAG or UART.
+            When SystemView is enabled, this also controls the SystemView destination.
 
         config APPTRACE_DEST_JTAG
             bool "JTAG"
-            select APPTRACE_DEST_TRAX if IDF_TARGET_ARCH_XTENSA
-            select APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
-            select APPTRACE_ENABLE
+            select APPTRACE_TRAX_ENABLE if IDF_TARGET_ARCH_XTENSA
+            depends on !PM_ENABLE
+
+        config APPTRACE_DEST_UART
+            bool "UART"
 
         config APPTRACE_DEST_NONE
-            bool "None"
+            bool "None (runtime selection)"
+            help
+                Compile both JTAG and UART interfaces. Increases IRAM usage.
+                Allows runtime selection via esp_apptrace_get_user_params().
 
+                With this option, destination and configuration must be provided
+                at runtime. Default JTAG and UART settings are defined in
+                components/app_trace/include/esp_app_trace_config.h.
+
+                Override these by implementing esp_apptrace_get_user_params()
+                in your application.
     endchoice
 
-    config APPTRACE_DEST_UART
-        bool
-
-    config APPTRACE_DEST_UART_NOUSB
-        bool
-
-    choice APPTRACE_DESTINATION2
-        prompt "Data Destination 2"
-        default APPTRACE_DEST_UART_NONE
+    config APPTRACE_BUF_SIZE
+        int "Size of the apptrace buffer"
+        depends on APPTRACE_DEST_JTAG && !APPTRACE_TRAX_ENABLE
+        default 16384
         help
-            Select destination for application trace: UART(XX) or none (to disable).
+            Size of the memory buffer for trace data in bytes.
 
-        config APPTRACE_DEST_UART0
-            bool "UART0"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=0)
-
-        config APPTRACE_DEST_UART1
-            bool "UART1"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=1)
-
-        config APPTRACE_DEST_UART2
-            bool "UART2"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2)
-
-        config APPTRACE_DEST_USB_CDC
-            bool "USB_CDC"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            depends on !ESP_CONSOLE_USB_CDC && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3) && !USB_ENABLED
-
-        config APPTRACE_DEST_UART_NONE
-            bool "None"
-    endchoice
+    config APPTRACE_DEST_UART_NUM
+        int "UART port number"
+        depends on APPTRACE_DEST_UART
+        range 0 1 if (SOC_UART_NUM <= 2)
+        range 0 2 if (SOC_UART_NUM <= 3)
+        range 0 5 if (SOC_UART_NUM <= 6)
+        default 1
+        help
+            UART communication port number for the apptrace destination.
+            See UART documentation for available port numbers.
 
     config APPTRACE_UART_TX_GPIO
         int "UART TX on GPIO<num>"
-        depends on APPTRACE_DEST_UART_NOUSB
+        depends on APPTRACE_DEST_UART
         range 0 46
-        default 12 if IDF_TARGET_ESP32
-        default 12 if IDF_TARGET_ESP32C3
         default 12
         help
             This GPIO is used for UART TX pin.
 
     config APPTRACE_UART_RX_GPIO
         int "UART RX on GPIO<num>"
-        depends on APPTRACE_DEST_UART_NOUSB
+        depends on APPTRACE_DEST_UART
         range 0 46
-        default 13 if IDF_TARGET_ESP32
-        default 13 if IDF_TARGET_ESP32C3
         default 13
         help
             This GPIO is used for UART RX pin.
@@ -129,13 +121,14 @@ menu "Application Level Tracing"
     config APPTRACE_UART_TASK_PRIO
         int
         prompt "UART Task Priority" if APPTRACE_DEST_UART
+        depends on APPTRACE_DEST_UART
         default 1
         range 1 32
         help
             UART task priority. In case of high events rate,
             this parameter could be changed up to (configMAX_PRIORITIES-1).
 
-    config APPTRACE_DEST_TRAX
+    config APPTRACE_TRAX_ENABLE
         bool
         depends on IDF_TARGET_ARCH_XTENSA && !ESP32_TRAX && !ESP32S2_TRAX && !ESP32S3_TRAX
         select ESP32_MEMMAP_TRACEMEM
@@ -148,23 +141,13 @@ menu "Application Level Tracing"
         help
             Enables/disable TRAX tracing HW.
 
-    config APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
-        bool
-        default n
-        help
-            Enables/disable swapping memory buffers tracing protocol.
-
-    config APPTRACE_ENABLE
-        bool
-        default n
-        help
-            Enables/disable application tracing module.
-
     config APPTRACE_LOCK_ENABLE
-        bool
-        default !APPTRACE_SV_ENABLE
+        bool "Internal Sync Lock Enable"
+        depends on APPTRACE_ENABLE
+        default n
         help
             Enables/disable application tracing module internal sync lock.
+            Keep in mind this will slow down the trace data transfer to the host.
 
     config APPTRACE_ONPANIC_HOST_FLUSH_TMO
         int "Timeout for flushing last trace data to host on panic"
@@ -184,22 +167,6 @@ menu "Application Level Tracing"
             Threshold for flushing last trace data to host on panic in post-mortem mode.
             This is minimal amount of data needed to perform flush. In bytes.
 
-    config APPTRACE_BUF_SIZE
-        int "Size of the apptrace buffer"
-        depends on APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE && !APPTRACE_DEST_TRAX
-        default 16384
-        help
-            Size of the memory buffer for trace data in bytes.
-
-    config APPTRACE_PENDING_DATA_SIZE_MAX
-        int "Size of the pending data buffer"
-        depends on APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
-        default 0
-        help
-            Size of the buffer for events in bytes. It is useful for buffering events from
-            the time critical code (scheduler, ISRs etc). If this parameter is 0 then
-            events will be discarded when main HW buffer is full.
-
     menu "FreeRTOS SystemView Tracing"
         depends on APPTRACE_ENABLE
         config APPTRACE_SV_ENABLE
@@ -209,30 +176,9 @@ menu "Application Level Tracing"
             help
                 Enables support for SEGGER SystemView tracing functionality.
 
-        choice APPTRACE_SV_DEST
-            prompt "SystemView destination"
-            depends on APPTRACE_SV_ENABLE
-            default APPTRACE_SV_DEST_JTAG
-            help
-                SystemView will transfer data through the defined interface.
-
-            config APPTRACE_SV_DEST_JTAG
-                bool "Data destination JTAG"
-                depends on  !PM_ENABLE && !APPTRACE_DEST_NONE
-                help
-                    Send SEGGER SystemView events through JTAG interface.
-
-            config APPTRACE_SV_DEST_UART
-                bool "Data destination UART"
-                depends on APPTRACE_DEST_UART
-                help
-                    Send SEGGER SystemView events through UART interface.
-
-        endchoice
-
         choice APPTRACE_SV_CPU
             prompt "CPU to trace"
-            depends on APPTRACE_SV_DEST_UART && !ESP_SYSTEM_SINGLE_CORE_MODE
+            depends on APPTRACE_SV_ENABLE && APPTRACE_DEST_UART && !ESP_SYSTEM_SINGLE_CORE_MODE
             default APPTRACE_SV_DEST_CPU_0
             help
                 Define the CPU to trace by SystemView.
@@ -249,7 +195,6 @@ menu "Application Level Tracing"
 
         endchoice
 
-
         choice APPTRACE_SV_TS_SOURCE
             prompt "Timer to use as timestamp source"
             depends on APPTRACE_SV_ENABLE
@@ -382,19 +327,4 @@ menu "Application Level Tracing"
 
     endmenu
 
-    config APPTRACE_GCOV_ENABLE
-        bool "GCOV to Host Enable"
-        depends on APPTRACE_ENABLE && !APPTRACE_SV_ENABLE
-        select ESP_DEBUG_STUBS_ENABLE
-        default n
-        help
-            Enables support for GCOV data transfer to host.
-
-    config APPTRACE_GCOV_DUMP_TASK_STACK_SIZE
-        int "Gcov dump task stack size"
-        depends on APPTRACE_GCOV_ENABLE
-        default 2048
-        help
-            Configures stack size of Gcov dump task
-
 endmenu

components/app_trace/app_trace.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
@@ -7,20 +7,14 @@
 #include <string.h>
 #include "esp_cpu.h"
 #include "esp_log.h"
+#include "esp_rom_sys.h"
 #include "esp_app_trace.h"
 #include "esp_app_trace_port.h"
+#include "esp_app_trace_types.h"
 #include "esp_private/startup_internal.h"
 
-#ifdef CONFIG_APPTRACE_DEST_UART0
-#define ESP_APPTRACE_DEST_UART_NUM 0
-#elif CONFIG_APPTRACE_DEST_UART1
-#define ESP_APPTRACE_DEST_UART_NUM 1
-#elif CONFIG_APPTRACE_DEST_UART2
-#define ESP_APPTRACE_DEST_UART_NUM 2
-#elif CONFIG_APPTRACE_DEST_USB_CDC
-#define ESP_APPTRACE_DEST_UART_NUM 10
-#else
-#define ESP_APPTRACE_DEST_UART_NUM 0
+#if CONFIG_ESP_CONSOLE_UART && CONFIG_APPTRACE_DEST_UART && (CONFIG_APPTRACE_DEST_UART_NUM == CONFIG_ESP_CONSOLE_UART_NUM)
+#error "Application trace UART and console UART cannot use the same port number"
 #endif
 
 #define ESP_APPTRACE_MAX_VPRINTF_ARGS 256
@@ -32,263 +26,205 @@ const static char *TAG = "esp_apptrace";
 typedef struct {
     esp_apptrace_hw_t *hw;
     void               *hw_data;
+    esp_apptrace_dest_t dest;
 } esp_apptrace_channel_t;
 
-static esp_apptrace_channel_t   s_trace_channels[ESP_APPTRACE_DEST_MAX];
-static bool s_inited;
+static esp_apptrace_channel_t s_trace_ch;
+static volatile int s_trace_ch_hw_initialized = 0;
 
-esp_err_t esp_apptrace_init(void)
+static esp_err_t esp_apptrace_init(const esp_apptrace_config_t *config)
 {
-    int res;
-    esp_apptrace_hw_t *hw = NULL;
-    void *hw_data = NULL;
+    __attribute__((unused)) void *hw_data = NULL;
 
-    // 'esp_apptrace_init()' is called on every core, so ensure to do main initialization only once
     if (esp_cpu_get_core_id() == 0) {
-        memset(&s_trace_channels, 0, sizeof(s_trace_channels));
-        hw = esp_apptrace_jtag_hw_get(&hw_data);
-        ESP_APPTRACE_LOGD("HW interface %p", hw);
-        if (hw != NULL) {
-            s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw = hw;
-            s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw_data = hw_data;
+#if CONFIG_APPTRACE_DEST_JTAG
+        s_trace_ch.hw = esp_apptrace_jtag_hw_get(&hw_data);
+        s_trace_ch.hw_data = hw_data;
+#elif CONFIG_APPTRACE_DEST_UART
+        const esp_apptrace_uart_config_t *uart_config = &config->dest_cfg.uart;
+        s_trace_ch.hw = esp_apptrace_uart_hw_get(uart_config->uart_num, &hw_data);
+        s_trace_ch.hw_data = hw_data;
+#else // CONFIG_APPTRACE_DEST_NONE allows runtime selection
+        if (config->dest == ESP_APPTRACE_DEST_JTAG) {
+            s_trace_ch.hw = esp_apptrace_jtag_hw_get(&hw_data);
+            s_trace_ch.hw_data = hw_data;
+        } else if (config->dest == ESP_APPTRACE_DEST_UART) {
+            const esp_apptrace_uart_config_t *uart_config = &config->dest_cfg.uart;
+            s_trace_ch.hw = esp_apptrace_uart_hw_get(uart_config->uart_num, &hw_data);
+            s_trace_ch.hw_data = hw_data;
+        } else {
+            s_trace_ch.hw = NULL;
+            s_trace_ch.hw_data = NULL;
+            ESP_APPTRACE_LOGE("Invalid destination type (%d)!", config->dest);
+            return ESP_ERR_INVALID_ARG;
         }
-        hw = esp_apptrace_uart_hw_get(ESP_APPTRACE_DEST_UART_NUM, &hw_data);
-        if (hw != NULL) {
-            s_trace_channels[ESP_APPTRACE_DEST_UART].hw = hw;
-            s_trace_channels[ESP_APPTRACE_DEST_UART].hw_data = hw_data;
+#endif
+        s_trace_ch.dest = config->dest;
+        s_trace_ch_hw_initialized = 1;
+    } else {
+        // There is NO guarantee that system init functions will execute on core 0 first
+        // So we need to wait for core 0 to set up the hardware interface
+        while (!s_trace_ch_hw_initialized) {
+            esp_rom_delay_us(10);
         }
-        s_inited = true;
     }
 
-    // esp_apptrace_init() is called on every core, so initialize trace channel on every core
-    for (int i = 0; i < sizeof(s_trace_channels) / sizeof(s_trace_channels[0]); i++) {
-        esp_apptrace_channel_t *ch = &s_trace_channels[i];
-        if (ch->hw) {
-            res = ch->hw->init(ch->hw_data);
-            if (res != ESP_OK) {
-                ESP_APPTRACE_LOGE("Failed to init trace channel HW interface (%d)!", res);
-                return res;
-            }
+    if (s_trace_ch.hw) {
+        int res = s_trace_ch.hw->init(s_trace_ch.hw_data, config);
+        if (res != ESP_OK) {
+            ESP_APPTRACE_LOGE("Failed to init trace channel HW interface (%d)!", res);
+            return res;
         }
     }
 
     return ESP_OK;
 }
 
-ESP_SYSTEM_INIT_FN(esp_apptrace_init, SECONDARY, ESP_SYSTEM_INIT_ALL_CORES, 115)
+esp_err_t esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
 {
-    return esp_apptrace_init();
-}
-
-void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
-{
-    esp_apptrace_channel_t *ch;
-
-    if (!s_inited) {
-        return;
-    }
-    // currently down buffer is supported for JTAG interface only
-    // TODO: one more argument should be added to this function to specify HW interface: JTAG, UART0 etc
-    ch = &s_trace_channels[ESP_APPTRACE_DEST_JTAG];
-    if (ch->hw != NULL) {
-        if (ch->hw->down_buffer_config != NULL) {
-            ch->hw->down_buffer_config(ch->hw_data, buf, size);
-        }
-    } else {
-        ESP_APPTRACE_LOGD("Trace destination for JTAG not supported!");
-    }
-    ch = &s_trace_channels[ESP_APPTRACE_DEST_UART];
-    if (ch->hw != NULL) {
-        if (ch->hw->down_buffer_config != NULL) {
-            ch->hw->down_buffer_config(ch->hw_data, buf, size);
-        }
-    } else {
-        ESP_APPTRACE_LOGD("Trace destination for UART not supported!");
-    }
-}
-
-uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, uint32_t *size, uint32_t user_tmo)
-{
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
-    ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
-        return NULL;
-    }
-    if (size == NULL || *size == 0) {
-        return NULL;
-    }
-    if (!s_inited) {
-        return NULL;
-    }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return NULL;
-    }
-    if (ch->hw->get_down_buffer == NULL) {
-        return NULL;
-    }
-
-    esp_apptrace_tmo_init(&tmo, user_tmo);
-    return ch->hw->get_down_buffer(ch->hw_data, size, &tmo);
-}
-
-esp_err_t esp_apptrace_down_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32_t user_tmo)
-{
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
-    ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+    if (!buf || size == 0) {
         return ESP_ERR_INVALID_ARG;
     }
-    if (ptr == NULL) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    if (ch->hw->get_down_buffer == NULL) {
-        return ESP_ERR_NOT_SUPPORTED;
+    if (s_trace_ch.hw->down_buffer_config) {
+        s_trace_ch.hw->down_buffer_config(s_trace_ch.hw_data, buf, size);
     }
 
-    esp_apptrace_tmo_init(&tmo, user_tmo);
-    return ch->hw->put_down_buffer(ch->hw_data, ptr, &tmo);
+    return ESP_OK;
 }
 
-esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *buf, uint32_t *size, uint32_t user_tmo)
+uint8_t *esp_apptrace_down_buffer_get(uint32_t *size, uint32_t user_tmo)
 {
-    int res = ESP_OK;
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+
+    if (!size || *size == 0) {
+        return NULL;
+    }
+    if (!s_trace_ch.hw) {
+        return NULL;
+    }
+    if (!s_trace_ch.hw->get_down_buffer) {
+        return NULL;
+    }
+
+    esp_apptrace_tmo_t tmo;
+    esp_apptrace_tmo_init(&tmo, user_tmo);
+
+    return s_trace_ch.hw->get_down_buffer(s_trace_ch.hw_data, size, &tmo);
+}
+
+esp_err_t esp_apptrace_down_buffer_put(uint8_t *ptr, uint32_t user_tmo)
+{
+    ESP_APPTRACE_LOGV("%s(): enter", __func__);
+
+    if (!ptr) {
         return ESP_ERR_INVALID_ARG;
     }
-    if (buf == NULL || size == NULL || *size == 0) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
+    if (!s_trace_ch.hw->get_down_buffer) {
         return ESP_ERR_NOT_SUPPORTED;
     }
-    if (ch->hw->get_down_buffer == NULL || ch->hw->put_down_buffer == NULL) {
+
+    esp_apptrace_tmo_t tmo;
+    esp_apptrace_tmo_init(&tmo, user_tmo);
+
+    return s_trace_ch.hw->put_down_buffer(s_trace_ch.hw_data, ptr, &tmo);
+}
+
+esp_err_t esp_apptrace_read(void *buf, uint32_t *size, uint32_t user_tmo)
+{
+    ESP_APPTRACE_LOGV("%s(): enter", __func__);
+
+    if (!buf || !size || *size == 0) {
+        return ESP_ERR_INVALID_ARG;
+    }
+    if (!s_trace_ch.hw) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    if (!s_trace_ch.hw->get_down_buffer || !s_trace_ch.hw->put_down_buffer) {
         return ESP_ERR_NOT_SUPPORTED;
     }
 
     //TODO: callback system
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, user_tmo);
+
     uint32_t act_sz = *size;
     *size = 0;
-    uint8_t *ptr = ch->hw->get_down_buffer(ch->hw_data, &act_sz, &tmo);
+    uint8_t *ptr = s_trace_ch.hw->get_down_buffer(s_trace_ch.hw_data, &act_sz, &tmo);
     if (ptr && act_sz > 0) {
         ESP_APPTRACE_LOGD("Read %" PRIu32 " bytes from host", act_sz);
         memcpy(buf, ptr, act_sz);
-        res = ch->hw->put_down_buffer(ch->hw_data, ptr, &tmo);
         *size = act_sz;
-    } else {
-        res = ESP_ERR_TIMEOUT;
+        return s_trace_ch.hw->put_down_buffer(s_trace_ch.hw_data, ptr, &tmo);
     }
 
-    return res;
+    return ESP_ERR_TIMEOUT;
 }
 
-uint8_t *esp_apptrace_buffer_get(esp_apptrace_dest_t dest, uint32_t size, uint32_t user_tmo)
+uint8_t *esp_apptrace_buffer_get(uint32_t size, uint32_t user_tmo)
 {
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
-        return NULL;
-    }
+
     if (size == 0) {
         return NULL;
     }
-    if (!s_inited) {
+    if (!s_trace_ch.hw) {
         return NULL;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return NULL;
-    }
-    if (ch->hw->get_up_buffer == NULL) {
+    if (!s_trace_ch.hw->get_up_buffer) {
         return NULL;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, user_tmo);
-    return ch->hw->get_up_buffer(ch->hw_data, size, &tmo);
+
+    return s_trace_ch.hw->get_up_buffer(s_trace_ch.hw_data, size, &tmo);
 }
 
-esp_err_t esp_apptrace_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32_t user_tmo)
+esp_err_t esp_apptrace_buffer_put(uint8_t *ptr, uint32_t user_tmo)
 {
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+
+    if (!ptr) {
         return ESP_ERR_INVALID_ARG;
     }
-    if (ptr == NULL) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    if (ch->hw->put_up_buffer == NULL) {
+    if (!s_trace_ch.hw->put_up_buffer) {
         return ESP_ERR_NOT_SUPPORTED;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, user_tmo);
-    return ch->hw->put_up_buffer(ch->hw_data, ptr, &tmo);
+
+    return s_trace_ch.hw->put_up_buffer(s_trace_ch.hw_data, ptr, &tmo);
 }
 
-esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_t size, uint32_t user_tmo)
+esp_err_t esp_apptrace_write(const void *data, uint32_t size, uint32_t user_tmo)
 {
-    uint8_t *ptr = NULL;
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+
+    if (!data || size == 0) {
         return ESP_ERR_INVALID_ARG;
     }
-    if (data == NULL || size == 0) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    if (ch->hw->get_up_buffer == NULL || ch->hw->put_up_buffer == NULL) {
+    if (!s_trace_ch.hw->get_up_buffer || !s_trace_ch.hw->put_up_buffer) {
         return ESP_ERR_NOT_SUPPORTED;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, user_tmo);
-    ptr = ch->hw->get_up_buffer(ch->hw_data, size, &tmo);
-    if (ptr == NULL) {
+
+    uint8_t *ptr = s_trace_ch.hw->get_up_buffer(s_trace_ch.hw_data, size, &tmo);
+    if (!ptr) {
         return ESP_ERR_NO_MEM;
     }
 
@@ -297,36 +233,29 @@ esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_
     memcpy(ptr, data, size);
 
     // now indicate that this buffer is ready to be sent off to host
-    return ch->hw->put_up_buffer(ch->hw_data, ptr, &tmo);
+    return s_trace_ch.hw->put_up_buffer(s_trace_ch.hw_data, ptr, &tmo);
 }
 
-int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const char *fmt, va_list ap)
+int esp_apptrace_vprintf_to(uint32_t user_tmo, const char *fmt, va_list ap)
 {
     uint16_t nargs = 0;
     uint8_t *pout, *p = (uint8_t *)fmt;
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
 
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+
+    if (!fmt) {
         return -1;
     }
-    if (fmt == NULL) {
+    if (!s_trace_ch.hw) {
         return -1;
     }
-    if (!s_inited) {
-        return -1;
-    }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return -1;
-    }
-    if (ch->hw->get_up_buffer == NULL || ch->hw->put_up_buffer == NULL) {
+    if (!s_trace_ch.hw->get_up_buffer || !s_trace_ch.hw->put_up_buffer) {
         return -1;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, user_tmo);
+
     ESP_APPTRACE_LOGD("fmt %p", fmt);
     while ((p = (uint8_t *)strchr((char *)p, '%')) && nargs < ESP_APPTRACE_MAX_VPRINTF_ARGS) {
         p++;
@@ -339,8 +268,8 @@ int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const c
         ESP_APPTRACE_LOGE("Failed to store all printf args!");
     }
 
-    pout = ch->hw->get_up_buffer(ch->hw_data, 1 + sizeof(char *) + nargs * sizeof(uint32_t), &tmo);
-    if (pout == NULL) {
+    pout = s_trace_ch.hw->get_up_buffer(s_trace_ch.hw_data, 1 + sizeof(char *) + nargs * sizeof(uint32_t), &tmo);
+    if (!pout) {
         ESP_APPTRACE_LOGE("Failed to get buffer!");
         return -1;
     }
@@ -356,7 +285,7 @@ int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const c
         ESP_APPTRACE_LOGD("arg %" PRIx32, arg);
     }
 
-    int ret = ch->hw->put_up_buffer(ch->hw_data, p, &tmo);
+    int ret = s_trace_ch.hw->put_up_buffer(s_trace_ch.hw_data, p, &tmo);
     if (ret != ESP_OK) {
         ESP_APPTRACE_LOGE("Failed to put printf buf (%d)!", ret);
         return -1;
@@ -367,85 +296,81 @@ int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const c
 
 int esp_apptrace_vprintf(const char *fmt, va_list ap)
 {
-    return esp_apptrace_vprintf_to(ESP_APPTRACE_DEST_JTAG, 0, fmt, ap);
+    return esp_apptrace_vprintf_to(0, fmt, ap);
 }
 
-esp_err_t esp_apptrace_flush_nolock(esp_apptrace_dest_t dest, uint32_t min_sz, uint32_t usr_tmo)
+esp_err_t esp_apptrace_flush_nolock(uint32_t min_sz, uint32_t usr_tmo)
 {
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    if (ch->hw->flush_up_buffer_nolock == NULL) {
+    if (!s_trace_ch.hw->flush_up_buffer_nolock) {
         return ESP_ERR_NOT_SUPPORTED;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, usr_tmo);
-    return ch->hw->flush_up_buffer_nolock(ch->hw_data, min_sz, &tmo);
+
+    return s_trace_ch.hw->flush_up_buffer_nolock(s_trace_ch.hw_data, min_sz, &tmo);
 }
 
-esp_err_t esp_apptrace_flush(esp_apptrace_dest_t dest, uint32_t usr_tmo)
+esp_err_t esp_apptrace_flush(uint32_t usr_tmo)
 {
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    if (!s_inited) {
+
+    if (!s_trace_ch.hw) {
         return ESP_ERR_INVALID_STATE;
     }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    if (ch->hw->flush_up_buffer == NULL) {
+    if (!s_trace_ch.hw->flush_up_buffer) {
         return ESP_ERR_NOT_SUPPORTED;
     }
 
+    esp_apptrace_tmo_t tmo;
     esp_apptrace_tmo_init(&tmo, usr_tmo);
-    return ch->hw->flush_up_buffer(ch->hw_data, &tmo);
+
+    return s_trace_ch.hw->flush_up_buffer(s_trace_ch.hw_data, &tmo);
 }
 
-bool esp_apptrace_host_is_connected(esp_apptrace_dest_t dest)
+bool esp_apptrace_host_is_connected(void)
 {
-    esp_apptrace_channel_t *ch;
-
     ESP_APPTRACE_LOGV("%s(): enter", __func__);
-    if (dest >= ESP_APPTRACE_DEST_MAX) {
+
+    if (!s_trace_ch.hw) {
         return false;
     }
-    if (!s_inited) {
-        return false;
-    }
-    ch = &s_trace_channels[dest];
-    if (ch->hw == NULL) {
-        ESP_APPTRACE_LOGE("Trace destination %d not supported!", dest);
-        return false;
-    }
-    if (ch->hw->host_is_connected == NULL) {
+    if (!s_trace_ch.hw->host_is_connected) {
         return false;
     }
 
-    return ch->hw->host_is_connected(ch->hw_data);
+    return s_trace_ch.hw->host_is_connected(s_trace_ch.hw_data);
 }
 
-#if !CONFIG_APPTRACE_DEST_JTAG
-esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
+esp_apptrace_dest_t esp_apptrace_get_destination(void)
 {
-    return NULL;
+    return s_trace_ch.dest;
+}
+
+esp_err_t esp_apptrace_set_header_size(esp_apptrace_header_size_t header_size)
+{
+    if (!s_trace_ch.hw) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    if (s_trace_ch.hw->set_header_size) {
+        s_trace_ch.hw->set_header_size(s_trace_ch.hw_data, header_size);
+    }
+    return ESP_OK;
+}
+
+esp_apptrace_config_t __attribute__((weak)) esp_apptrace_get_user_params(void)
+{
+    esp_apptrace_config_t default_config = APPTRACE_CONFIG_DEFAULT();
+    return default_config;
+}
+
+ESP_SYSTEM_INIT_FN(apptrace_early_init, SECONDARY, ESP_SYSTEM_INIT_ALL_CORES, 115)
+{
+    esp_apptrace_config_t config = esp_apptrace_get_user_params();
+    return esp_apptrace_init(&config);
 }
-#endif

components/app_trace/app_trace_membufs_proto.c

@@ -18,13 +18,16 @@
  * In this case host SW will see that wr_sz < block_sz and will report error.
  */
 typedef struct {
-#if CONFIG_APPTRACE_SV_ENABLE
-    uint8_t   block_sz; // size of allocated block for user data
-    uint8_t   wr_sz;    // size of actually written data
-#else
-    uint16_t   block_sz; // size of allocated block for user data
-    uint16_t   wr_sz;    // size of actually written data
-#endif
+    union {
+        struct {
+            uint8_t  block_sz_8;
+            uint8_t  wr_sz_8;
+        };
+        struct {
+            uint16_t block_sz_16;
+            uint16_t wr_sz_16;
+        };
+    };
 } esp_tracedata_hdr_t;
 
 /** TODO: docs
@@ -33,41 +36,29 @@ typedef struct {
     uint16_t   block_sz; // size of allocated block for user data
 } esp_hostdata_hdr_t;
 
-#if CONFIG_APPTRACE_SV_ENABLE
-#define ESP_APPTRACE_USR_BLOCK_CORE(_cid_)          (0)
-#define ESP_APPTRACE_USR_BLOCK_LEN(_v_)             (_v_)
-#define ESP_APPTRACE_USR_DATA_LEN_MAX(_hw_data_)    255UL
-#else
-#define ESP_APPTRACE_USR_BLOCK_CORE(_cid_)      ((_cid_) << 15)
-#define ESP_APPTRACE_USR_BLOCK_LEN(_v_)         (~(1 << 15) & (_v_))
-#define ESP_APPTRACE_USR_DATA_LEN_MAX(_hw_data_)       (ESP_APPTRACE_INBLOCK(_hw_data_)->sz - sizeof(esp_tracedata_hdr_t))
-#endif
-#define ESP_APPTRACE_USR_BLOCK_RAW_SZ(_s_)     ((_s_) + sizeof(esp_tracedata_hdr_t))
+#define ESP_APPTRACE_INBLOCK_MARKER(_hw_data_) \
+    ((_hw_data_)->state.markers[(_hw_data_)->state.in_block % 2])
 
-#define ESP_APPTRACE_INBLOCK_MARKER(_hw_data_)          ((_hw_data_)->state.markers[(_hw_data_)->state.in_block % 2])
-#define ESP_APPTRACE_INBLOCK_MARKER_UPD(_hw_data_, _v_)   do {(_hw_data_)->state.markers[(_hw_data_)->state.in_block % 2] += (_v_);}while(0)
-#define ESP_APPTRACE_INBLOCK(_hw_data_)             (&(_hw_data_)->blocks[(_hw_data_)->state.in_block % 2])
+#define ESP_APPTRACE_INBLOCK(_hw_data_) \
+    (&(_hw_data_)->blocks[(_hw_data_)->state.in_block % 2])
 
 const static char *TAG = "esp_apptrace";
 
-static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membufs_proto_data_t *proto, uint8_t *data, uint32_t size);
+static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membufs_proto_data_t *proto,
+                                                              uint8_t *data, uint32_t size);
 
-
-esp_err_t esp_apptrace_membufs_init(esp_apptrace_membufs_proto_data_t *proto, const esp_apptrace_mem_block_t blocks_cfg[2])
+esp_err_t esp_apptrace_membufs_init(esp_apptrace_membufs_proto_data_t *proto,
+                                    const esp_apptrace_mem_block_t blocks_cfg[2])
 {
     // disabled by default
     esp_apptrace_rb_init(&proto->rb_down, NULL, 0);
     // membufs proto init
-    for (unsigned i = 0; i < 2; i++) {
+    for (unsigned int i = 0; i < 2; i++) {
         proto->blocks[i].start = blocks_cfg[i].start;
         proto->blocks[i].sz = blocks_cfg[i].sz;
         proto->state.markers[i] = 0;
     }
     proto->state.in_block = 0;
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-    esp_apptrace_rb_init(&proto->rb_pend, proto->pending_data,
-                        sizeof(proto->pending_data));
-#endif
     return ESP_OK;
 }
 
@@ -81,10 +72,10 @@ static esp_err_t esp_apptrace_membufs_swap(esp_apptrace_membufs_proto_data_t *pr
 {
     int prev_block_num = proto->state.in_block % 2;
     int new_block_num = prev_block_num ? (0) : (1);
-    esp_err_t res = ESP_OK;
 
-    res = proto->hw->swap_start(proto->state.in_block);
+    esp_err_t res = proto->hw->swap_start(proto->state.in_block);
     if (res != ESP_OK) {
+        ESP_APPTRACE_LOGE("Failed to swap to new block: %d", res);
         return res;
     }
 
@@ -92,7 +83,7 @@ static esp_err_t esp_apptrace_membufs_swap(esp_apptrace_membufs_proto_data_t *pr
     // switch to new block
     proto->state.in_block++;
 
-    proto->hw->swap(new_block_num);
+    proto->hw->swap(new_block_num, proto->state.markers[prev_block_num]);
 
     // handle data from host
     esp_hostdata_hdr_t *hdr = (esp_hostdata_hdr_t *)proto->blocks[new_block_num].start;
@@ -101,40 +92,19 @@ static esp_err_t esp_apptrace_membufs_swap(esp_apptrace_membufs_proto_data_t *pr
         // TODO: add support for multiple blocks from host, currently there is no need for that
         uint8_t *p = proto->blocks[new_block_num].start + proto->blocks[new_block_num].sz;
         ESP_APPTRACE_LOGD("Recvd %" PRIu16 " bytes from host (@ %p) [%x %x %x %x %x %x %x %x .. %x %x %x %x %x %x %x %x]",
-            hdr->block_sz, proto->blocks[new_block_num].start,
-            *(proto->blocks[new_block_num].start+0), *(proto->blocks[new_block_num].start+1),
-            *(proto->blocks[new_block_num].start+2), *(proto->blocks[new_block_num].start+3),
-            *(proto->blocks[new_block_num].start+4), *(proto->blocks[new_block_num].start+5),
-            *(proto->blocks[new_block_num].start+6), *(proto->blocks[new_block_num].start+7),
-            *(p-8), *(p-7), *(p-6), *(p-5), *(p-4), *(p-3), *(p-2), *(p-1));
-        uint32_t sz = esp_apptrace_membufs_down_buffer_write_nolock(proto, (uint8_t *)(hdr+1), hdr->block_sz);
+                          hdr->block_sz, proto->blocks[new_block_num].start,
+                          *(proto->blocks[new_block_num].start + 0), *(proto->blocks[new_block_num].start + 1),
+                          *(proto->blocks[new_block_num].start + 2), *(proto->blocks[new_block_num].start + 3),
+                          *(proto->blocks[new_block_num].start + 4), *(proto->blocks[new_block_num].start + 5),
+                          *(proto->blocks[new_block_num].start + 6), *(proto->blocks[new_block_num].start + 7),
+                          *(p - 8), *(p - 7), *(p - 6), *(p - 5), *(p - 4), *(p - 3), *(p - 2), *(p - 1));
+        uint32_t sz = esp_apptrace_membufs_down_buffer_write_nolock(proto, (uint8_t *)(hdr + 1), hdr->block_sz);
         if (sz != hdr->block_sz) {
-            ESP_APPTRACE_LOGE("Failed to write %" PRIu32 " bytes to down buffer (%" PRIu16 " %" PRIu32 ")!", hdr->block_sz - sz, hdr->block_sz, sz);
+            ESP_APPTRACE_LOGE("Failed to write %" PRIu32 " bytes to down buffer (%" PRIu16 " %" PRIu32 ")!",
+                              hdr->block_sz - sz, hdr->block_sz, sz);
         }
         hdr->block_sz = 0;
     }
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-    // copy pending data to  block if any
-    while (proto->state.markers[new_block_num] < proto->blocks[new_block_num].sz) {
-        uint32_t read_sz = esp_apptrace_rb_read_size_get(&proto->rb_pend);
-        if (read_sz == 0) {
-            break; // no more data in pending buffer
-        }
-        if (read_sz > proto->blocks[new_block_num].sz - proto->state.markers[new_block_num]) {
-            read_sz = proto->blocks[new_block_num].sz - proto->state.markers[new_block_num];
-        }
-        uint8_t *ptr = esp_apptrace_rb_consume(&proto->rb_pend, read_sz);
-        if (!ptr) {
-            assert(false && "Failed to consume pended bytes!!");
-            break;
-        }
-        ESP_APPTRACE_LOGD("Pump %d pend bytes [%x %x %x %x : %x %x %x %x : %x %x %x %x : %x %x...%x %x]",
-            read_sz, *(ptr+0), *(ptr+1), *(ptr+2), *(ptr+3), *(ptr+4),
-            *(ptr+5), *(ptr+6), *(ptr+7), *(ptr+8), *(ptr+9), *(ptr+10), *(ptr+11), *(ptr+12), *(ptr+13), *(ptr+read_sz-2), *(ptr+read_sz-1));
-        memcpy(proto->blocks[new_block_num].start + proto->state.markers[new_block_num], ptr, read_sz);
-        proto->state.markers[new_block_num] += read_sz;
-    }
-#endif
     proto->hw->swap_end(proto->state.in_block, proto->state.markers[prev_block_num]);
     return res;
 }
@@ -164,7 +134,8 @@ static esp_err_t esp_apptrace_membufs_swap_waitus(esp_apptrace_membufs_proto_dat
     return res;
 }
 
-uint8_t *esp_apptrace_membufs_down_buffer_get(esp_apptrace_membufs_proto_data_t *proto, uint32_t *size, esp_apptrace_tmo_t *tmo)
+uint8_t *esp_apptrace_membufs_down_buffer_get(esp_apptrace_membufs_proto_data_t *proto,
+                                              uint32_t *size, esp_apptrace_tmo_t *tmo)
 {
     uint8_t *ptr = NULL;
 
@@ -197,19 +168,21 @@ uint8_t *esp_apptrace_membufs_down_buffer_get(esp_apptrace_membufs_proto_data_t
     return ptr;
 }
 
-esp_err_t esp_apptrace_membufs_down_buffer_put(esp_apptrace_membufs_proto_data_t *proto, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+esp_err_t esp_apptrace_membufs_down_buffer_put(esp_apptrace_membufs_proto_data_t *proto,
+                                               uint8_t *ptr, esp_apptrace_tmo_t *tmo)
 {
     /* nothing todo */
     return ESP_OK;
 }
 
-static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membufs_proto_data_t *proto, uint8_t *data, uint32_t size)
+static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membufs_proto_data_t *proto,
+                                                              uint8_t *data, uint32_t size)
 {
     uint32_t total_sz = 0;
 
     while (total_sz < size) {
         ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock WRS %" PRIu32 "-%" PRIu32 "-%" PRIu32 " %" PRIu32, proto->rb_down.wr, proto->rb_down.rd,
-            proto->rb_down.cur_size, size);
+                          proto->rb_down.cur_size, size);
         uint32_t wr_sz = esp_apptrace_rb_write_size_get(&proto->rb_down);
         if (wr_sz == 0) {
             break;
@@ -231,126 +204,55 @@ static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membu
     return total_sz;
 }
 
-static inline uint8_t *esp_apptrace_membufs_wait4buf(esp_apptrace_membufs_proto_data_t *proto, uint16_t size, esp_apptrace_tmo_t *tmo, int *pended)
+static inline uint32_t esp_apptrace_membufs_usr_data_len_max(esp_apptrace_membufs_proto_data_t *proto)
 {
-    uint8_t *ptr = NULL;
-
-    int res = esp_apptrace_membufs_swap_waitus(proto, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-    // check if we still have pending data
-    if (esp_apptrace_rb_read_size_get(&proto->rb_pend) > 0) {
-        // if after block switch we still have pending data (not all pending data have been pumped to block)
-        // alloc new pending buffer
-        *pended = 1;
-        ptr = esp_apptrace_rb_produce(&proto->rb_pend, size);
-        if (!ptr) {
-            ESP_APPTRACE_LOGE("Failed to alloc pend buf 1: w-r-s %d-%d-%d!", proto->rb_pend.wr, proto->rb_pend.rd, proto->rb_pend.cur_size);
-        }
-    } else
-#endif
-    {
-        // update block pointers
-        if (ESP_APPTRACE_INBLOCK_MARKER(proto) + size > ESP_APPTRACE_INBLOCK(proto)->sz) {
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-            *pended = 1;
-            ptr = esp_apptrace_rb_produce(&proto->rb_pend, size);
-            if (ptr == NULL) {
-                ESP_APPTRACE_LOGE("Failed to alloc pend buf 2: w-r-s %d-%d-%d!", proto->rb_pend.wr, proto->rb_pend.rd, proto->rb_pend.cur_size);
-            }
-#endif
-        } else {
-            *pended = 0;
-            ptr = ESP_APPTRACE_INBLOCK(proto)->start + ESP_APPTRACE_INBLOCK_MARKER(proto);
-        }
-    }
-
-    return ptr;
+    return proto->header_size == ESP_APPTRACE_HEADER_SIZE_32 ?
+           ESP_APPTRACE_INBLOCK(proto)->sz - ESP_APPTRACE_HEADER_SIZE_32 : 255;
 }
 
-static inline uint8_t *esp_apptrace_membufs_pkt_start(uint8_t *ptr, uint16_t size)
+uint8_t *esp_apptrace_membufs_up_buffer_get(esp_apptrace_membufs_proto_data_t *proto,
+                                            uint32_t size, esp_apptrace_tmo_t *tmo)
 {
-    // it is safe to use esp_cpu_get_core_id() in macro call because arg is used only once inside it
-    ((esp_tracedata_hdr_t *)ptr)->block_sz = ESP_APPTRACE_USR_BLOCK_CORE(esp_cpu_get_core_id()) | size;
-    ((esp_tracedata_hdr_t *)ptr)->wr_sz = 0;
-    return ptr + sizeof(esp_tracedata_hdr_t);
-}
-
-static inline void esp_apptrace_membufs_pkt_end(uint8_t *ptr)
-{
-    esp_tracedata_hdr_t *hdr = (esp_tracedata_hdr_t *)(ptr - sizeof(esp_tracedata_hdr_t));
-    // update written size
-    hdr->wr_sz = hdr->block_sz;
-}
-
-uint8_t *esp_apptrace_membufs_up_buffer_get(esp_apptrace_membufs_proto_data_t *proto, uint32_t size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *buf_ptr = NULL;
-
-    if (size > ESP_APPTRACE_USR_DATA_LEN_MAX(proto)) {
+    if (size > esp_apptrace_membufs_usr_data_len_max(proto)) {
         ESP_APPTRACE_LOGE("Too large user data size %" PRIu32 "!", size);
         return NULL;
     }
 
-    // check for data in the pending buffer
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-    if (esp_apptrace_rb_read_size_get(&proto->rb_pend) > 0) {
-        // if we have buffered data try to switch  block
-        esp_apptrace_membufs_swap(proto);
-        // if switch was successful, part or all pended data have been copied to  block
-    }
-    if (esp_apptrace_rb_read_size_get(&proto->rb_pend) > 0) {
-        // if we have buffered data alloc new pending buffer
-        ESP_APPTRACE_LOGD("Get %d bytes from PEND buffer", size);
-        buf_ptr = esp_apptrace_rb_produce(&proto->rb_pend, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size));
-        if (buf_ptr == NULL) {
-            int pended_buf;
-            buf_ptr = esp_apptrace_membufs_wait4buf(proto, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size), tmo, &pended_buf);
-            if (buf_ptr && !pended_buf) {
-                ESP_APPTRACE_LOGD("Get %d bytes from block", size);
-                // update cur block marker
-                ESP_APPTRACE_INBLOCK_MARKER_UPD(proto, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size));
-            }
+    if (ESP_APPTRACE_INBLOCK_MARKER(proto) + size + proto->header_size > ESP_APPTRACE_INBLOCK(proto)->sz) {
+        int res = esp_apptrace_membufs_swap_waitus(proto, tmo);
+        if (res != ESP_OK) {
+            return NULL;
         }
-    } else {
-#else
-    if (1) {
-#endif
-        if (ESP_APPTRACE_INBLOCK_MARKER(proto) + ESP_APPTRACE_USR_BLOCK_RAW_SZ(size) > ESP_APPTRACE_INBLOCK(proto)->sz) {
-            #if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-            ESP_APPTRACE_LOGD("Block full. Get %" PRIu32 " bytes from PEND buffer", size);
-            buf_ptr = esp_apptrace_rb_produce(&proto->rb_pend, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size));
-            #endif
-            if (buf_ptr == NULL) {
-                int pended_buf;
-                ESP_APPTRACE_LOGD(" full. Get %" PRIu32 " bytes from pend buffer", size);
-                buf_ptr = esp_apptrace_membufs_wait4buf(proto, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size), tmo, &pended_buf);
-                if (buf_ptr && !pended_buf) {
-                    ESP_APPTRACE_LOGD("Got %" PRIu32 " bytes from block", size);
-                    // update cur block marker
-                    ESP_APPTRACE_INBLOCK_MARKER_UPD(proto, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size));
-                }
-            }
-        } else {
-            ESP_APPTRACE_LOGD("Get %" PRIu32 " bytes from  buffer", size);
-            // fit to curr  nlock
-            buf_ptr = ESP_APPTRACE_INBLOCK(proto)->start + ESP_APPTRACE_INBLOCK_MARKER(proto);
-            // update cur block marker
-            ESP_APPTRACE_INBLOCK_MARKER_UPD(proto, ESP_APPTRACE_USR_BLOCK_RAW_SZ(size));
-        }
-    }
-    if (buf_ptr) {
-        buf_ptr = esp_apptrace_membufs_pkt_start(buf_ptr, size);
     }
 
-    return buf_ptr;
+    uint8_t *buf_ptr = ESP_APPTRACE_INBLOCK(proto)->start + ESP_APPTRACE_INBLOCK_MARKER(proto);
+    // update cur block marker
+    proto->state.markers[proto->state.in_block % 2] += size + proto->header_size;
+
+    // update header
+    esp_tracedata_hdr_t *hdr = (esp_tracedata_hdr_t *)buf_ptr;
+    if (proto->header_size == ESP_APPTRACE_HEADER_SIZE_32) {
+        hdr->block_sz_16 = (esp_cpu_get_core_id() << 15) | size;
+        hdr->wr_sz_16 = 0;
+    } else {
+        hdr->block_sz_8 = size;
+        hdr->wr_sz_8 = 0;
+    }
+    ESP_APPTRACE_LOGD("Got %" PRIu32 " bytes from  block", size);
+
+    return buf_ptr + proto->header_size;
 }
 
-esp_err_t esp_apptrace_membufs_up_buffer_put(esp_apptrace_membufs_proto_data_t *proto, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+esp_err_t esp_apptrace_membufs_up_buffer_put(esp_apptrace_membufs_proto_data_t *proto,
+                                             uint8_t *ptr, esp_apptrace_tmo_t *tmo)
 {
-    esp_apptrace_membufs_pkt_end(ptr);
+    // update header
+    esp_tracedata_hdr_t *hdr = (esp_tracedata_hdr_t *)(ptr - proto->header_size);
+    if (proto->header_size == ESP_APPTRACE_HEADER_SIZE_32) {
+        hdr->wr_sz_16 = hdr->block_sz_16;
+    } else {
+        hdr->wr_sz_8 = hdr->block_sz_8;
+    }
     // TODO: mark block as busy in order not to reuse it for other tracing calls until it is completely written
     // TODO: avoid potential situation when all memory is consumed by low prio tasks which can not complete writing due to
     // higher prio tasks and the latter can not allocate buffers at all
@@ -359,7 +261,8 @@ esp_err_t esp_apptrace_membufs_up_buffer_put(esp_apptrace_membufs_proto_data_t *
     return ESP_OK;
 }
 
-esp_err_t esp_apptrace_membufs_flush_nolock(esp_apptrace_membufs_proto_data_t *proto, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
+esp_err_t esp_apptrace_membufs_flush_nolock(esp_apptrace_membufs_proto_data_t *proto,
+                                            uint32_t min_sz, esp_apptrace_tmo_t *tmo)
 {
     int res = ESP_OK;
 
@@ -367,15 +270,16 @@ esp_err_t esp_apptrace_membufs_flush_nolock(esp_apptrace_membufs_proto_data_t *p
         ESP_APPTRACE_LOGI("Ignore flush request for min %" PRIu32 " bytes. Bytes in  block: %" PRIu32, min_sz, ESP_APPTRACE_INBLOCK_MARKER(proto));
         return ESP_OK;
     }
-    // switch  block while size of data (including that in pending buffer) is more than min size
+    // switch  block while size of data is more than min size
     while (ESP_APPTRACE_INBLOCK_MARKER(proto) > min_sz) {
-        ESP_APPTRACE_LOGD("Try to flush %" PRIu32 " bytes. Wait until block switch for %" PRIi64 " us", ESP_APPTRACE_INBLOCK_MARKER(proto), tmo->tmo);
+        ESP_APPTRACE_LOGD("Try to flush %" PRIu32 " bytes", ESP_APPTRACE_INBLOCK_MARKER(proto));
         res = esp_apptrace_membufs_swap_waitus(proto, tmo);
         if (res != ESP_OK) {
-            if (tmo->tmo != ESP_APPTRACE_TMO_INFINITE)
-                ESP_APPTRACE_LOGW("Failed to switch to another block in %lld us!", tmo->tmo);
-            else
-                ESP_APPTRACE_LOGE("Failed to switch to another block in %lld us!", tmo->tmo);
+            if (res == ESP_ERR_TIMEOUT) {
+                ESP_APPTRACE_LOGW("Failed to switch to another block in %" PRId32 " us!", (int32_t)tmo->elapsed);
+            } else {
+                ESP_APPTRACE_LOGE("Failed to switch to another block, res: %d", res);
+            }
             return res;
         }
     }

components/app_trace/app_trace_util.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
@@ -44,7 +44,7 @@ void esp_apptrace_log_unlock(void)
 
 esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo)
 {
-    if (tmo->tmo != (int64_t)-1) {
+    if (tmo->tmo != (int64_t) -1) {
         tmo->elapsed = esp_timer_get_time() - tmo->start;
         if (tmo->elapsed >= tmo->tmo) {
             return ESP_ERR_TIMEOUT;
@@ -57,6 +57,12 @@ esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo)
 ///////////////////////////////// LOCK ////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
+void esp_apptrace_lock_init(esp_apptrace_lock_t *lock)
+{
+    portMUX_INITIALIZE(&lock->mux);
+    lock->int_state = 0;
+}
+
 esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *tmo)
 {
     esp_err_t ret;

components/app_trace/debug_stubs.c

@@ -9,11 +9,11 @@
 //
 
 #include "esp_private/startup_internal.h"
-#include "dbg_stubs.h"
+#include "esp_dbg_stubs.h"
 #include "esp_attr.h"
 
 /*
-    Debug stubs is actually a table of 4-byte entries. Every entry is equal to zero or must contain meaningfull data.
+    Debug stubs is actually a table of 4-byte entries. Every entry is equal to zero or must contain meaningful data.
     The first entry is a service one and has the followinf format:
         - tramp_addr, 4 bytes; Address of buffer for trampoline/code. Max size is ESP_DBG_STUBS_CODE_BUF_SIZE.
         - min_stack_addr, 4 bytes; Start of the buffer for minimal onboard stack or data. Max size is ESP_DBG_STUBS_STACK_MIN_SIZE.

components/app_trace/gcov/gcov_rtio.c

@@ -1,197 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// This module implements runtime file I/O API for GCOV.
-
-#include <string.h>
-#include "esp_task_wdt.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/semphr.h"
-#include "soc/timer_periph.h"
-#include "esp_app_trace.h"
-#include "esp_freertos_hooks.h"
-#include "dbg_stubs.h"
-#include "esp_private/esp_ipc.h"
-#include "esp_attr.h"
-#include "hal/wdt_hal.h"
-
-#if CONFIG_APPTRACE_GCOV_ENABLE
-
-#define ESP_GCOV_DOWN_BUF_SIZE  4200
-
-#include "esp_log.h"
-const static char *TAG = "esp_gcov_rtio";
-static volatile bool s_create_gcov_task = false;
-static volatile bool s_gcov_task_running = false;
-
-extern void __gcov_dump(void);
-extern void __gcov_reset(void);
-
-void gcov_dump_task(void *pvParameter)
-{
-    int dump_result = 0;
-    bool *running = (bool *)pvParameter;
-
-    ESP_EARLY_LOGV(TAG, "%s stack use in %d", __FUNCTION__, uxTaskGetStackHighWaterMark(NULL));
-
-    ESP_EARLY_LOGV(TAG, "Alloc apptrace down buf %d bytes", ESP_GCOV_DOWN_BUF_SIZE);
-    void *down_buf = malloc(ESP_GCOV_DOWN_BUF_SIZE);
-    if (down_buf == NULL) {
-        ESP_EARLY_LOGE(TAG, "Could not allocate memory for the buffer");
-        dump_result = ESP_ERR_NO_MEM;
-        goto gcov_exit;
-    }
-    ESP_EARLY_LOGV(TAG, "Config apptrace down buf");
-    esp_apptrace_down_buffer_config(down_buf, ESP_GCOV_DOWN_BUF_SIZE);
-    ESP_EARLY_LOGV(TAG, "Dump data...");
-    __gcov_dump();
-    // reset dump status to allow incremental data accumulation
-    __gcov_reset();
-    free(down_buf);
-    ESP_EARLY_LOGV(TAG, "Finish file transfer session");
-    dump_result = esp_apptrace_fstop(ESP_APPTRACE_DEST_TRAX);
-    if (dump_result != ESP_OK) {
-        ESP_EARLY_LOGE(TAG, "Failed to send files transfer stop cmd (%d)!", dump_result);
-    }
-
-gcov_exit:
-    ESP_EARLY_LOGV(TAG, "dump_result %d", dump_result);
-    if (running) {
-        *running = false;
-    }
-
-    ESP_EARLY_LOGV(TAG, "%s stack use out %d", __FUNCTION__, uxTaskGetStackHighWaterMark(NULL));
-
-    vTaskDelete(NULL);
-}
-
-void gcov_create_task(void *arg)
-{
-    ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
-    xTaskCreatePinnedToCore(&gcov_dump_task, "gcov_dump_task", CONFIG_APPTRACE_GCOV_DUMP_TASK_STACK_SIZE,
-		(void *)&s_gcov_task_running, configMAX_PRIORITIES - 1, NULL, 0);
-}
-
-static IRAM_ATTR
-void gcov_create_task_tick_hook(void)
-{
-    if (s_create_gcov_task) {
-        if (esp_ipc_call_nonblocking(xPortGetCoreID(), &gcov_create_task, NULL) == ESP_OK) {
-            s_create_gcov_task = false;
-        }
-    }
-}
-
-/**
- * @brief Triggers gcov info dump task
- *        This function is to be called by OpenOCD, not by normal user code.
- * TODO: what about interrupted flash access (when cache disabled)
- *
- * @return ESP_OK on success, otherwise see esp_err_t
- */
-static int esp_dbg_stub_gcov_entry(void)
-{
-    /* we are in isr context here */
-    s_create_gcov_task = true;
-    return ESP_OK;
-}
-
-void gcov_rtio_init(void)
-{
-    uint32_t stub_entry = 0;
-    ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
-    assert(esp_dbg_stub_entry_get(ESP_DBG_STUB_ENTRY_GCOV, &stub_entry) == ESP_OK);
-    if (stub_entry != 0) {
-        /* "__gcov_init()" can be called several times. We must avoid multiple tick hook registration */
-        return;
-    }
-    esp_dbg_stub_entry_set(ESP_DBG_STUB_ENTRY_GCOV, (uint32_t)&esp_dbg_stub_gcov_entry);
-    assert(esp_dbg_stub_entry_get(ESP_DBG_STUB_ENTRY_CAPABILITIES, &stub_entry) == ESP_OK);
-    esp_dbg_stub_entry_set(ESP_DBG_STUB_ENTRY_CAPABILITIES, stub_entry | ESP_DBG_STUB_CAP_GCOV_TASK);
-    esp_register_freertos_tick_hook(gcov_create_task_tick_hook);
-}
-
-void esp_gcov_dump(void)
-{
-    ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
-
-    while (!esp_apptrace_host_is_connected(ESP_APPTRACE_DEST_TRAX)) {
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
-
-    /* We are not in isr context here. Waiting for the completion is safe */
-    s_gcov_task_running = true;
-    s_create_gcov_task = true;
-    while (s_gcov_task_running) {
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
-}
-
-void *gcov_rtio_fopen(const char *path, const char *mode)
-{
-    ESP_EARLY_LOGV(TAG, "%s '%s' '%s'", __FUNCTION__, path, mode);
-    void *f = esp_apptrace_fopen(ESP_APPTRACE_DEST_TRAX, path, mode);
-    ESP_EARLY_LOGV(TAG, "%s ret %p", __FUNCTION__, f);
-    return f;
-}
-
-int gcov_rtio_fclose(void *stream)
-{
-    ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
-    return esp_apptrace_fclose(ESP_APPTRACE_DEST_TRAX, stream);
-}
-
-size_t gcov_rtio_fread(void *ptr, size_t size, size_t nmemb, void *stream)
-{
-    ESP_EARLY_LOGV(TAG, "%s read %u", __FUNCTION__, size * nmemb);
-    size_t sz = esp_apptrace_fread(ESP_APPTRACE_DEST_TRAX, ptr, size, nmemb, stream);
-    ESP_EARLY_LOGV(TAG, "%s actually read %u", __FUNCTION__, sz);
-    return sz;
-}
-
-size_t gcov_rtio_fwrite(const void *ptr, size_t size, size_t nmemb, void *stream)
-{
-    ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
-    return esp_apptrace_fwrite(ESP_APPTRACE_DEST_TRAX, ptr, size, nmemb, stream);
-}
-
-int gcov_rtio_fseek(void *stream, long offset, int whence)
-{
-    int ret = esp_apptrace_fseek(ESP_APPTRACE_DEST_TRAX, stream, offset, whence);
-    ESP_EARLY_LOGV(TAG, "%s(%p %ld %d) = %d", __FUNCTION__, stream, offset, whence, ret);
-    return ret;
-}
-
-long gcov_rtio_ftell(void *stream)
-{
-    long ret = esp_apptrace_ftell(ESP_APPTRACE_DEST_TRAX, stream);
-    ESP_EARLY_LOGV(TAG, "%s(%p) = %ld", __FUNCTION__, stream, ret);
-    return ret;
-}
-
-int gcov_rtio_feof(void *stream)
-{
-    int ret = esp_apptrace_feof(ESP_APPTRACE_DEST_TRAX, stream);
-    ESP_EARLY_LOGV(TAG, "%s(%p) = %d", __FUNCTION__, stream, ret);
-    return ret;
-}
-
-void gcov_rtio_setbuf(void *arg1 __attribute__ ((unused)), void *arg2 __attribute__ ((unused)))
-{
-    return;
-}
-
-/* Wrappers for Gcov functions */
-
-extern void __real___gcov_init(void *info);
-void __wrap___gcov_init(void *info)
-{
-    __real___gcov_init(info);
-    gcov_rtio_init();
-}
-
-#endif

components/app_trace/gcov/io_sym.map

@@ -1,8 +0,0 @@
-fopen          gcov_rtio_fopen
-fclose         gcov_rtio_fclose
-fwrite         gcov_rtio_fwrite
-fread          gcov_rtio_fread
-fseek          gcov_rtio_fseek
-ftell          gcov_rtio_ftell
-setbuf         gcov_rtio_setbuf
-feof           gcov_rtio_feof

components/app_trace/heap_trace_tohost.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "sdkconfig.h"
-
+#include "freertos/FreeRTOS.h"
 #include "esp_heap_trace.h"
 #include "esp_heap_caps.h"
 #if CONFIG_APPTRACE_SV_ENABLE
@@ -33,7 +33,7 @@ esp_err_t heap_trace_init_tohost(void)
 esp_err_t heap_trace_start(heap_trace_mode_t mode_param)
 {
 #if CONFIG_APPTRACE_SV_ENABLE
-    esp_err_t ret = esp_sysview_heap_trace_start((uint32_t)-1);
+    esp_err_t ret = esp_sysview_heap_trace_start((uint32_t) -1);
     if (ret != ESP_OK) {
         return ret;
     }

components/app_trace/host_file_io.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,8 +17,6 @@
 #include <string.h>
 #include "esp_app_trace.h"
 
-#if CONFIG_APPTRACE_ENABLE
-
 #include "esp_log.h"
 const static char *TAG = "esp_host_file_io";
 
@@ -79,13 +77,13 @@ typedef struct {
     void *file;
 } esp_apptrace_ftell_args_t;
 
-static esp_err_t esp_apptrace_file_cmd_send(esp_apptrace_dest_t dest, uint8_t cmd, void (*prep_args)(uint8_t *, void *), void *args, uint32_t args_len)
+static esp_err_t esp_apptrace_file_cmd_send(uint8_t cmd, void (*prep_args)(uint8_t *, void *), void *args, uint32_t args_len)
 {
     esp_err_t ret;
     esp_apptrace_fcmd_hdr_t *hdr;
 
     ESP_EARLY_LOGV(TAG, "%s %d", __func__, cmd);
-    uint8_t *ptr = esp_apptrace_buffer_get(dest, sizeof(*hdr) + args_len, ESP_APPTRACE_TMO_INFINITE); //TODO: finite tmo
+    uint8_t *ptr = esp_apptrace_buffer_get(sizeof(*hdr) + args_len, ESP_APPTRACE_TMO_INFINITE); //TODO: finite tmo
     if (ptr == NULL) {
         return ESP_ERR_NO_MEM;
     }
@@ -97,13 +95,13 @@ static esp_err_t esp_apptrace_file_cmd_send(esp_apptrace_dest_t dest, uint8_t cm
     }
 
     // now indicate that this buffer is ready to be sent off to host
-    ret = esp_apptrace_buffer_put(dest, ptr, ESP_APPTRACE_TMO_INFINITE);//TODO: finite tmo
+    ret = esp_apptrace_buffer_put(ptr, ESP_APPTRACE_TMO_INFINITE);//TODO: finite tmo
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to put apptrace buffer (%d)!", ret);
         return ret;
     }
 
-    ret = esp_apptrace_flush(dest, ESP_APPTRACE_TMO_INFINITE);//TODO: finite tmo
+    ret = esp_apptrace_flush(ESP_APPTRACE_TMO_INFINITE);//TODO: finite tmo
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to flush apptrace buffer (%d)!", ret);
         return ret;
@@ -112,12 +110,12 @@ static esp_err_t esp_apptrace_file_cmd_send(esp_apptrace_dest_t dest, uint8_t cm
     return ESP_OK;
 }
 
-static esp_err_t esp_apptrace_file_rsp_recv(esp_apptrace_dest_t dest, uint8_t *buf, uint32_t buf_len)
+static esp_err_t esp_apptrace_file_rsp_recv(uint8_t *buf, uint32_t buf_len)
 {
     uint32_t tot_rd = 0;
     while (tot_rd < buf_len) {
         uint32_t rd_size = buf_len - tot_rd;
-        esp_err_t ret = esp_apptrace_read(dest, buf + tot_rd, &rd_size, ESP_APPTRACE_TMO_INFINITE); //TODO: finite tmo
+        esp_err_t ret = esp_apptrace_read(buf + tot_rd, &rd_size, ESP_APPTRACE_TMO_INFINITE); //TODO: finite tmo
         if (ret != ESP_OK) {
             ESP_EARLY_LOGE(TAG, "Failed to read (%d)!", ret);
             return ret;
@@ -137,7 +135,7 @@ static void esp_apptrace_fopen_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf + args->path_len, args->mode, args->mode_len);
 }
 
-void *esp_apptrace_fopen(esp_apptrace_dest_t dest, const char *path, const char *mode)
+void *esp_apptrace_fopen(const char *path, const char *mode)
 {
     esp_apptrace_fopen_args_t cmd_args;
 
@@ -151,8 +149,8 @@ void *esp_apptrace_fopen(esp_apptrace_dest_t dest, const char *path, const char
     cmd_args.mode = mode;
     cmd_args.mode_len = strlen(mode) + 1;
 
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FOPEN, esp_apptrace_fopen_args_prepare,
-                        &cmd_args, cmd_args.path_len+cmd_args.mode_len);
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FOPEN, esp_apptrace_fopen_args_prepare,
+                                               &cmd_args, cmd_args.path_len + cmd_args.mode_len);
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return NULL;
@@ -160,7 +158,7 @@ void *esp_apptrace_fopen(esp_apptrace_dest_t dest, const char *path, const char
 
     // now read the answer
     void *resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return NULL;
@@ -176,13 +174,13 @@ static void esp_apptrace_fclose_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf, &args->file, sizeof(args->file));
 }
 
-int esp_apptrace_fclose(esp_apptrace_dest_t dest, void *stream)
+int esp_apptrace_fclose(void *stream)
 {
     esp_apptrace_fclose_args_t cmd_args;
 
     cmd_args.file = stream;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FCLOSE, esp_apptrace_fclose_args_prepare,
-                        &cmd_args, sizeof(cmd_args));
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FCLOSE, esp_apptrace_fclose_args_prepare,
+                                               &cmd_args, sizeof(cmd_args));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return EOF;
@@ -190,7 +188,7 @@ int esp_apptrace_fclose(esp_apptrace_dest_t dest, void *stream)
 
     // now read the answer
     int resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return EOF;
@@ -207,11 +205,11 @@ static void esp_apptrace_fwrite_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf + sizeof(args->file), args->buf, args->size);
 }
 
-size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t size, size_t nmemb, void *stream)
+size_t esp_apptrace_fwrite(const void *ptr, size_t size, size_t nmemb, void *stream)
 {
     esp_apptrace_fwrite_args_t cmd_args;
 
-    ESP_EARLY_LOGV(TAG, "esp_apptrace_fwrite f %p l %d", stream, size*nmemb);
+    ESP_EARLY_LOGV(TAG, "esp_apptrace_fwrite f %p l %d", stream, size * nmemb);
 
     if (ptr == NULL) {
         return 0;
@@ -220,8 +218,8 @@ size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t siz
     cmd_args.buf = (void *)ptr;
     cmd_args.size = size * nmemb;
     cmd_args.file = stream;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FWRITE, esp_apptrace_fwrite_args_prepare,
-                        &cmd_args, sizeof(cmd_args.file)+cmd_args.size);
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FWRITE, esp_apptrace_fwrite_args_prepare,
+                                               &cmd_args, sizeof(cmd_args.file) + cmd_args.size);
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return 0;
@@ -229,7 +227,7 @@ size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t siz
 
     // now read the answer
     size_t resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return 0;
@@ -249,11 +247,11 @@ static void esp_apptrace_fread_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf + sizeof(args->file), &args->size, sizeof(args->size));
 }
 
-size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size_t nmemb, void *stream)
+size_t esp_apptrace_fread(void *ptr, size_t size, size_t nmemb, void *stream)
 {
     esp_apptrace_fread_args_t cmd_args;
 
-    ESP_EARLY_LOGV(TAG, "esp_apptrace_fread f %p l %d", stream, size*nmemb);
+    ESP_EARLY_LOGV(TAG, "esp_apptrace_fread f %p l %d", stream, size * nmemb);
 
     if (ptr == NULL) {
         return 0;
@@ -261,8 +259,8 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
 
     cmd_args.size = size * nmemb;
     cmd_args.file = stream;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FREAD, esp_apptrace_fread_args_prepare,
-                        &cmd_args, sizeof(cmd_args));
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FREAD, esp_apptrace_fread_args_prepare,
+                                               &cmd_args, sizeof(cmd_args));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return 0;
@@ -270,7 +268,7 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
 
     // now read the answer
     size_t resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return 0;
@@ -279,7 +277,7 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
         return 0;
     }
 
-    ret = esp_apptrace_file_rsp_recv(dest, ptr, resp);
+    ret = esp_apptrace_file_rsp_recv(ptr, resp);
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read file data (%d)!", ret);
         return 0;
@@ -288,7 +286,7 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
      *      fread(buf, 1 ,size, file);
      * So, total read bytes count returns
      */
-    return resp/size; // return the number of items read
+    return resp / size; // return the number of items read
 }
 
 static void esp_apptrace_fseek_args_prepare(uint8_t *buf, void *priv)
@@ -300,7 +298,7 @@ static void esp_apptrace_fseek_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf + sizeof(args->file) + sizeof(args->offset), &args->whence, sizeof(args->whence));
 }
 
-int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int whence)
+int esp_apptrace_fseek(void *stream, long offset, int whence)
 {
     esp_apptrace_fseek_args_t cmd_args;
 
@@ -309,8 +307,8 @@ int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int
     cmd_args.file = stream;
     cmd_args.offset = offset;
     cmd_args.whence = whence;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FSEEK, esp_apptrace_fseek_args_prepare,
-                        &cmd_args, sizeof(cmd_args));
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FSEEK, esp_apptrace_fseek_args_prepare,
+                                               &cmd_args, sizeof(cmd_args));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return -1;
@@ -318,7 +316,7 @@ int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int
 
     // now read the answer
     int resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return -1;
@@ -334,13 +332,13 @@ static void esp_apptrace_ftell_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf, &args->file, sizeof(args->file));
 }
 
-int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream)
+int esp_apptrace_ftell(void *stream)
 {
     esp_apptrace_ftell_args_t cmd_args;
 
     cmd_args.file = stream;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FTELL, esp_apptrace_ftell_args_prepare,
-                        &cmd_args, sizeof(cmd_args));
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FTELL, esp_apptrace_ftell_args_prepare,
+                                               &cmd_args, sizeof(cmd_args));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return -1;
@@ -348,7 +346,7 @@ int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream)
 
     // now read the answer
     int resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return -1;
@@ -357,10 +355,10 @@ int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream)
     return resp;
 }
 
-int esp_apptrace_fstop(esp_apptrace_dest_t dest)
+int esp_apptrace_fstop(void)
 {
     ESP_EARLY_LOGV(TAG, "%s", __func__);
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_STOP, NULL, NULL, 0);
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_STOP, NULL, NULL, 0);
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send files transfer stop cmd (%d)!", ret);
     }
@@ -374,13 +372,13 @@ static void esp_apptrace_feof_args_prepare(uint8_t *buf, void *priv)
     memcpy(buf, &args->file, sizeof(args->file));
 }
 
-int esp_apptrace_feof(esp_apptrace_dest_t dest, void *stream)
+int esp_apptrace_feof(void *stream)
 {
     esp_apptrace_feof_args_t cmd_args;
 
     cmd_args.file = stream;
-    esp_err_t ret = esp_apptrace_file_cmd_send(dest, ESP_APPTRACE_FILE_CMD_FEOF, esp_apptrace_feof_args_prepare,
-                        &cmd_args, sizeof(cmd_args));
+    esp_err_t ret = esp_apptrace_file_cmd_send(ESP_APPTRACE_FILE_CMD_FEOF, esp_apptrace_feof_args_prepare,
+                                               &cmd_args, sizeof(cmd_args));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
         return EOF;
@@ -388,7 +386,7 @@ int esp_apptrace_feof(esp_apptrace_dest_t dest, void *stream)
 
     // now read the answer
     int resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
+    ret = esp_apptrace_file_rsp_recv((uint8_t *)&resp, sizeof(resp));
     if (ret != ESP_OK) {
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return EOF;
@@ -396,5 +394,3 @@ int esp_apptrace_feof(esp_apptrace_dest_t dest, void *stream)
 
     return resp;
 }
-
-#endif

components/app_trace/include/esp_app_trace.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@
 
 #include <stdarg.h>
 #include "esp_err.h"
+#include "esp_app_trace_config.h"
 #include "esp_app_trace_util.h" // ESP_APPTRACE_TMO_INFINITE
 
 #ifdef __cplusplus
@@ -15,24 +16,17 @@ extern "C" {
 #endif
 
 /**
- * Application trace data destinations bits.
- */
-typedef enum {
-    ESP_APPTRACE_DEST_JTAG = 1,                         ///< JTAG destination
-    ESP_APPTRACE_DEST_TRAX = ESP_APPTRACE_DEST_JTAG, 	///< xxx_TRAX name is obsolete, use more common xxx_JTAG
-    ESP_APPTRACE_DEST_UART,	                            ///< UART destination
-    ESP_APPTRACE_DEST_MAX = ESP_APPTRACE_DEST_UART+1,
-    ESP_APPTRACE_DEST_NUM
-} esp_apptrace_dest_t;
-
-/**
- * @brief  Initializes application tracing module.
+ * @brief Get custom trace initialization parameters (optional callback)
  *
- * @note   Should be called before any esp_apptrace_xxx call.
+ * This is an optional callback function that user applications can implement to provide
+ * custom trace configuration. A weak default implementation exists in the app_trace component
+ * that returns menuconfig defaults (APPTRACE_CONFIG_DEFAULT()). User applications can override
+ * this by providing their own implementation.
+ *
+ * This function is called during early system initialization (before app_main) on all cores.
  *
- * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_init(void);
+esp_apptrace_config_t esp_apptrace_get_user_params(void);
 
 /**
  * @brief Configures down buffer.
@@ -41,56 +35,54 @@ esp_err_t esp_apptrace_init(void);
  *
  * @param buf Address of buffer to use for down channel (host to target) data.
  * @param size Size of the buffer.
+ *
+ * @return ESP_OK on success, otherwise see esp_err_t
  */
-void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size);
+esp_err_t esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size);
 
 /**
  * @brief Allocates buffer for trace data.
  *        Once the data in the buffer is ready to be sent, esp_apptrace_buffer_put must be called to indicate it.
  *
- * @param dest Indicates HW interface to send data.
  * @param size Size of data to write to trace buffer.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return non-NULL on success, otherwise NULL.
  */
-uint8_t *esp_apptrace_buffer_get(esp_apptrace_dest_t dest, uint32_t size, uint32_t tmo);
+uint8_t *esp_apptrace_buffer_get(uint32_t size, uint32_t tmo);
 
 /**
  * @brief Indicates that the data in the buffer is ready to be sent.
  *        This function is a counterpart of and must be preceded by esp_apptrace_buffer_get.
  *
- * @param dest Indicates HW interface to send data. Should be identical to the same parameter in call to esp_apptrace_buffer_get.
  * @param ptr  Address of trace buffer to release. Should be the value returned by call to esp_apptrace_buffer_get.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32_t tmo);
+esp_err_t esp_apptrace_buffer_put(uint8_t *ptr, uint32_t tmo);
 
 /**
  * @brief  Writes data to trace buffer.
  *
- * @param dest Indicates HW interface to send data.
  * @param data Address of data to write to trace buffer.
  * @param size Size of data to write to trace buffer.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_t size, uint32_t tmo);
+esp_err_t esp_apptrace_write(const void *data, uint32_t size, uint32_t tmo);
 
 /**
  * @brief vprintf-like function to send log messages to host via specified HW interface.
  *
- * @param dest Indicates HW interface to send data.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  * @param fmt  Address of format string.
  * @param ap   List of arguments.
  *
  * @return Number of bytes written.
  */
-int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t tmo, const char *fmt, va_list ap);
+int esp_apptrace_vprintf_to(uint32_t tmo, const char *fmt, va_list ap);
 
 /**
  * @brief vprintf-like function to send log messages to host.
@@ -105,172 +97,200 @@ int esp_apptrace_vprintf(const char *fmt, va_list ap);
 /**
  * @brief Flushes remaining data in trace buffer to host.
  *
- * @param dest Indicates HW interface to flush data on.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_flush(esp_apptrace_dest_t dest, uint32_t tmo);
+esp_err_t esp_apptrace_flush(uint32_t tmo);
 
 /**
  * @brief Flushes remaining data in trace buffer to host without locking internal data.
  *        This is a special version of esp_apptrace_flush which should be called from panic handler.
  *
- * @param dest   Indicates HW interface to flush data on.
- * @param min_sz Threshold for flushing data. If current filling level is above this value, data will be flushed. TRAX destinations only.
+ * @param min_sz Threshold for flushing data. If current filling level is above this value, data will be flushed. JTAG destinations only.
  * @param tmo    Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_flush_nolock(esp_apptrace_dest_t dest, uint32_t min_sz, uint32_t tmo);
+esp_err_t esp_apptrace_flush_nolock(uint32_t min_sz, uint32_t tmo);
 
 /**
  * @brief Reads host data from trace buffer.
  *
- * @param dest Indicates HW interface to read the data on.
  * @param data Address of buffer to put data from trace buffer.
  * @param size Pointer to store size of read data. Before call to this function pointed memory must hold requested size of data
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *data, uint32_t *size, uint32_t tmo);
+esp_err_t esp_apptrace_read(void *data, uint32_t *size, uint32_t tmo);
 
 /**
  * @brief Retrieves incoming data buffer if any.
  *        Once data in the buffer is processed, esp_apptrace_down_buffer_put must be called to indicate it.
  *
- * @param dest Indicates HW interface to receive data.
  * @param size Address to store size of available data in down buffer. Must be initialized with requested value.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return non-NULL on success, otherwise NULL.
  */
-uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, uint32_t *size, uint32_t tmo);
+uint8_t *esp_apptrace_down_buffer_get(uint32_t *size, uint32_t tmo);
 
 /**
  * @brief Indicates that the data in the down buffer is processed.
  *        This function is a counterpart of and must be preceded by esp_apptrace_down_buffer_get.
  *
- * @param dest Indicates HW interface to receive data. Should be identical to the same parameter in call to esp_apptrace_down_buffer_get.
  * @param ptr  Address of trace buffer to release. Should be the value returned by call to esp_apptrace_down_buffer_get.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-esp_err_t esp_apptrace_down_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32_t tmo);
+esp_err_t esp_apptrace_down_buffer_put(uint8_t *ptr, uint32_t tmo);
 
 /**
  * @brief Checks whether host is connected.
  *
- * @param dest Indicates HW interface to use.
- *
  * @return true if host is connected, otherwise false
  */
-bool esp_apptrace_host_is_connected(esp_apptrace_dest_t dest);
+bool esp_apptrace_host_is_connected(void);
+
+/**
+ * @brief Gets the destination of the application trace.
+ *
+ * @return The destination of the application trace.
+ */
+esp_apptrace_dest_t esp_apptrace_get_destination(void);
+
+/**
+ * @brief Sets the header size of the application trace packet.
+ *
+ * @param header_size The header size to set.
+ *
+ * @return ESP_OK on success, otherwise see esp_err_t
+ */
+esp_err_t esp_apptrace_set_header_size(esp_apptrace_header_size_t header_size);
 
 /**
  * @brief Opens file on host.
- *		  This function has the same semantic as 'fopen' except for the first argument.
+ *        This function has the same semantic as 'fopen' except for the first argument.
  *
- * @param dest Indicates HW interface to use.
  * @param path Path to file.
  * @param mode Mode string. See fopen for details.
  *
  * @return non zero file handle on success, otherwise 0
  */
-void *esp_apptrace_fopen(esp_apptrace_dest_t dest, const char *path, const char *mode);
+void *esp_apptrace_fopen(const char *path, const char *mode);
 
 /**
  * @brief Closes file on host.
- *		  This function has the same semantic as 'fclose' except for the first argument.
+ *        This function has the same semantic as 'fclose' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
  * @param stream File handle returned by esp_apptrace_fopen.
  *
  * @return Zero on success, otherwise non-zero. See fclose for details.
  */
-int esp_apptrace_fclose(esp_apptrace_dest_t dest, void *stream);
+int esp_apptrace_fclose(void *stream);
 
 /**
  * @brief Writes to file on host.
- *		  This function has the same semantic as 'fwrite' except for the first argument.
+ *        This function has the same semantic as 'fwrite' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
- * @param ptr 	 Address of data to write.
- * @param size 	 Size of an item.
+ * @param ptr    Address of data to write.
+ * @param size   Size of an item.
  * @param nmemb  Number of items to write.
  * @param stream File handle returned by esp_apptrace_fopen.
  *
  * @return Number of written items. See fwrite for details.
  */
-size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t size, size_t nmemb, void *stream);
+size_t esp_apptrace_fwrite(const void *ptr, size_t size, size_t nmemb, void *stream);
 
 /**
  * @brief Read file on host.
- *		  This function has the same semantic as 'fread' except for the first argument.
+ *        This function has the same semantic as 'fread' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
- * @param ptr 	 Address to store read data.
- * @param size 	 Size of an item.
+ * @param ptr    Address to store read data.
+ * @param size   Size of an item.
  * @param nmemb  Number of items to read.
  * @param stream File handle returned by esp_apptrace_fopen.
  *
  * @return Number of read items. See fread for details.
  */
-size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size_t nmemb, void *stream);
+size_t esp_apptrace_fread(void *ptr, size_t size, size_t nmemb, void *stream);
 
 /**
  * @brief Set position indicator in file on host.
- *		  This function has the same semantic as 'fseek' except for the first argument.
+ *        This function has the same semantic as 'fseek' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
  * @param stream File handle returned by esp_apptrace_fopen.
  * @param offset Offset. See fseek for details.
  * @param whence Position in file. See fseek for details.
  *
  * @return Zero on success, otherwise non-zero. See fseek for details.
  */
-int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int whence);
+int esp_apptrace_fseek(void *stream, long offset, int whence);
 
 /**
  * @brief Get current position indicator for file on host.
- *		  This function has the same semantic as 'ftell' except for the first argument.
+ *        This function has the same semantic as 'ftell' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
  * @param stream File handle returned by esp_apptrace_fopen.
  *
  * @return Current position in file. See ftell for details.
  */
-int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream);
+int esp_apptrace_ftell(void *stream);
 
 /**
  * @brief Indicates to the host that all file operations are complete.
- *		  This function should be called after all file operations are finished and
- *		  indicate to the host that it can perform cleanup operations (close open files etc.).
- *
- * @param dest   Indicates HW interface to use.
+ *        This function should be called after all file operations are finished and
+ *        indicate to the host that it can perform cleanup operations (close open files etc.).
  *
  * @return ESP_OK on success, otherwise see esp_err_t
  */
-int esp_apptrace_fstop(esp_apptrace_dest_t dest);
+int esp_apptrace_fstop(void);
 
 /**
  * @brief Test end-of-file indicator on a stream.
- *		  This function has the same semantic as 'feof' except for the first argument.
+ *        This function has the same semantic as 'feof' except for the first argument.
  *
- * @param dest   Indicates HW interface to use.
  * @param stream File handle returned by esp_apptrace_fopen.
  *
  * @return Non-Zero if end-of-file indicator is set for stream. See feof for details.
  */
-int esp_apptrace_feof(esp_apptrace_dest_t dest, void *stream);
+int esp_apptrace_feof(void *stream);
 
-/**
- * @brief Triggers gcov info dump.
- *		  This function waits for the host to connect to target before dumping data.
- */
-void esp_gcov_dump(void);
+#if !CONFIG_APPTRACE_DEST_UART // JTAG or NONE
+#define APPTRACE_JTAG_CONFIG_DEFAULT() {                 \
+    .dest = ESP_APPTRACE_DEST_JTAG,                      \
+    .dest_cfg.jtag = {0},                                \
+    .panic_flush_tmo    = CONFIG_APPTRACE_ONPANIC_HOST_FLUSH_TMO, \
+    .panic_flush_thresh = CONFIG_APPTRACE_POSTMORTEM_FLUSH_THRESH, \
+}
+#endif
+
+#if !CONFIG_APPTRACE_DEST_JTAG // UART or NONE
+#define APPTRACE_UART_CONFIG_DEFAULT() {                    \
+    .dest = ESP_APPTRACE_DEST_UART,                         \
+    .dest_cfg.uart = {                                      \
+        .uart_num     = CONFIG_APPTRACE_DEST_UART_NUM,      \
+        .tx_pin_num   = CONFIG_APPTRACE_UART_TX_GPIO,       \
+        .rx_pin_num   = CONFIG_APPTRACE_UART_RX_GPIO,       \
+        .baud_rate    = CONFIG_APPTRACE_UART_BAUDRATE,      \
+        .rx_buff_size = CONFIG_APPTRACE_UART_RX_BUFF_SIZE,  \
+        .tx_buff_size = CONFIG_APPTRACE_UART_TX_BUFF_SIZE,  \
+        .tx_msg_size  = CONFIG_APPTRACE_UART_TX_MSG_SIZE,   \
+        .task_prio    = CONFIG_APPTRACE_UART_TASK_PRIO,     \
+    },                                                      \
+    .panic_flush_tmo    = CONFIG_APPTRACE_ONPANIC_HOST_FLUSH_TMO, \
+    .panic_flush_thresh = CONFIG_APPTRACE_POSTMORTEM_FLUSH_THRESH, \
+}
+#endif
+
+// Default picks JTAG if available, otherwise UART
+#if !CONFIG_APPTRACE_DEST_UART
+#define APPTRACE_CONFIG_DEFAULT() APPTRACE_JTAG_CONFIG_DEFAULT()
+#else
+#define APPTRACE_CONFIG_DEFAULT() APPTRACE_UART_CONFIG_DEFAULT()
+#endif
 
 #ifdef __cplusplus
 }

components/app_trace/include/esp_app_trace_config.h

@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ESP_APP_TRACE_CONFIG_H_
+#define ESP_APP_TRACE_CONFIG_H_
+
+#include "sdkconfig.h"
+
+/* Default configurations for runtime selection (CONFIG_APPTRACE_DEST_NONE)
+ * These values are used when CONFIG_APPTRACE_DEST_NONE is selected in menuconfig.
+ * To customize at runtime, implement esp_apptrace_get_user_params()
+ * in your application. See esp_app_trace.h for details.
+ */
+
+#if !defined(CONFIG_APPTRACE_UART_TX_GPIO) || !defined(CONFIG_APPTRACE_UART_RX_GPIO)
+#include "soc/uart_pins.h"
+#endif
+
+#ifndef CONFIG_APPTRACE_BUF_SIZE
+#define CONFIG_APPTRACE_BUF_SIZE 16384
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_RX_BUFF_SIZE
+#define CONFIG_APPTRACE_UART_RX_BUFF_SIZE 128
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_TX_BUFF_SIZE
+#define CONFIG_APPTRACE_UART_TX_BUFF_SIZE 4096
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_TX_MSG_SIZE
+#define CONFIG_APPTRACE_UART_TX_MSG_SIZE 128
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_BAUDRATE
+#define CONFIG_APPTRACE_UART_BAUDRATE 1000000
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_TASK_PRIO
+#define CONFIG_APPTRACE_UART_TASK_PRIO 1
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_TX_GPIO
+#define CONFIG_APPTRACE_UART_TX_GPIO U1TXD_GPIO_NUM
+#endif
+
+#ifndef CONFIG_APPTRACE_UART_RX_GPIO
+#define CONFIG_APPTRACE_UART_RX_GPIO U1RXD_GPIO_NUM
+#endif
+
+#ifndef CONFIG_APPTRACE_DEST_UART_NUM
+#define CONFIG_APPTRACE_DEST_UART_NUM 1
+#endif
+
+#ifndef CONFIG_APPTRACE_SV_DEST_CPU_0
+#define CONFIG_APPTRACE_SV_DEST_CPU_0 1
+#endif
+
+#endif /* ESP_APP_TRACE_CONFIG_H_ */

components/app_trace/include/esp_app_trace_types.h

@@ -0,0 +1,97 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ESP_APP_TRACE_TYPES_H_
+#define ESP_APP_TRACE_TYPES_H_
+
+#include <stdint.h>
+#include "spinlock.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Structure which holds data necessary for measuring time intervals.
+ *
+ *  After initialization via esp_apptrace_tmo_init() user needs to call esp_apptrace_tmo_check()
+ *  periodically to check timeout for expiration.
+ */
+typedef struct {
+    int64_t   start;   ///< time interval start (in us)
+    int64_t   tmo;     ///< timeout value (in us)
+    int64_t   elapsed; ///< elapsed time (in us)
+} esp_apptrace_tmo_t;
+
+/** Tracing module synchronization lock */
+typedef struct {
+    spinlock_t mux;
+    unsigned int_state;
+} esp_apptrace_lock_t;
+
+/** Ring buffer control structure.
+ *
+ * @note For purposes of application tracing module if there is no enough space for user data and write pointer can be wrapped
+ *       current ring buffer size can be temporarily shrunk in order to provide buffer with requested size.
+ */
+typedef struct {
+    uint8_t *data;      ///< pointer to data storage
+    volatile uint32_t size;      ///< size of data storage
+    volatile uint32_t cur_size;  ///< current size of data storage
+    volatile uint32_t rd;        ///< read pointer
+    volatile uint32_t wr;        ///< write pointer
+} esp_apptrace_rb_t;
+
+/**
+ * Application trace data destinations
+ */
+typedef enum {
+    ESP_APPTRACE_DEST_JTAG,
+    ESP_APPTRACE_DEST_UART,
+} esp_apptrace_dest_t;
+
+/**
+ * Application trace configuration for UART destination
+ */
+typedef struct {
+    int uart_num;           ///< Port number
+    int tx_pin_num;         ///< TX pin number
+    int rx_pin_num;         ///< RX pin number
+    int baud_rate;          ///< Baud rate
+    uint32_t rx_buff_size;  ///< RX ring buffer size
+    uint32_t tx_buff_size;  ///< TX ring buffer size
+    uint32_t tx_msg_size;   ///< Maximum size of the single message to transfer.
+    int task_prio;          ///< Task priority
+} esp_apptrace_uart_config_t;
+
+/**
+ * Application trace trace header size in bytes. It is 2 bytes for SEGGER SystemView
+ */
+typedef enum {
+    ESP_APPTRACE_HEADER_SIZE_16 = 2,
+    ESP_APPTRACE_HEADER_SIZE_32 = 4,
+} esp_apptrace_header_size_t;
+
+/**
+ * Application trace configuration
+ */
+typedef struct {
+    esp_apptrace_dest_t dest; ///< Destination type (JTAG or UART)
+
+    union {
+        esp_apptrace_uart_config_t uart; ///< UART configuration (when dest is ESP_APPTRACE_DEST_UART)
+        struct {                         ///< Reserved for JTAG (when dest is ESP_APPTRACE_DEST_JTAG)
+            uint8_t _unused;
+        } jtag;
+    } dest_cfg; ///< Destination-specific configuration
+
+    uint32_t panic_flush_tmo;    ///< Panic flush timeout in milliseconds
+    uint32_t panic_flush_thresh; ///< Panic flush threshold in bytes
+} esp_apptrace_config_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_APP_TRACE_TYPES_H_ */

components/app_trace/include/esp_app_trace_util.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,34 +10,23 @@
 extern "C" {
 #endif
 
-#include "freertos/FreeRTOS.h"
 #include "esp_err.h"
 #include "esp_timer.h"
+#include "esp_app_trace_types.h"
 
 /** Infinite waiting timeout */
 #define ESP_APPTRACE_TMO_INFINITE               ((uint32_t)-1)
 
-/** Structure which holds data necessary for measuring time intervals.
- *
- *  After initialization via esp_apptrace_tmo_init() user needs to call esp_apptrace_tmo_check()
- *  periodically to check timeout for expiration.
- */
-typedef struct {
-    int64_t   start;   ///< time interval start (in us)
-    int64_t   tmo;     ///< timeout value (in us)
-    int64_t   elapsed; ///< elapsed time (in us)
-} esp_apptrace_tmo_t;
-
 /**
  * @brief Initializes timeout structure.
  *
  * @param tmo       Pointer to timeout structure to be initialized.
- * @param user_tmo  Timeout value (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ * @param user_tmo  Timeout value (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
 */
 static inline void esp_apptrace_tmo_init(esp_apptrace_tmo_t *tmo, uint32_t user_tmo)
 {
     tmo->start = esp_timer_get_time();
-    tmo->tmo = user_tmo == ESP_APPTRACE_TMO_INFINITE ? (int64_t)-1 : (int64_t)user_tmo;
+    tmo->tmo = user_tmo == ESP_APPTRACE_TMO_INFINITE ? (int64_t) -1 : (int64_t)user_tmo;
     tmo->elapsed = 0;
 }
 
@@ -52,25 +41,15 @@ esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo);
 
 static inline uint32_t esp_apptrace_tmo_remaining_us(esp_apptrace_tmo_t *tmo)
 {
-    return tmo->tmo != (int64_t)-1 ? (tmo->elapsed - tmo->tmo) : ESP_APPTRACE_TMO_INFINITE;
+    return tmo->tmo != (int64_t) -1 ? (tmo->elapsed - tmo->tmo) : ESP_APPTRACE_TMO_INFINITE;
 }
 
-/** Tracing module synchronization lock */
-typedef struct {
-    spinlock_t mux;
-    unsigned int_state;
-} esp_apptrace_lock_t;
-
 /**
  * @brief Initializes lock structure.
  *
  * @param lock Pointer to lock structure to be initialized.
  */
-static inline void esp_apptrace_lock_init(esp_apptrace_lock_t *lock)
-{
-    portMUX_INITIALIZE(&lock->mux);
-    lock->int_state = 0;
-}
+void esp_apptrace_lock_init(esp_apptrace_lock_t *lock);
 
 /**
  * @brief Tries to acquire lock in specified time period.
@@ -91,19 +70,6 @@ esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *
  */
 esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock);
 
-/** Ring buffer control structure.
- *
- * @note For purposes of application tracing module if there is no enough space for user data and write pointer can be wrapped
- *       current ring buffer size can be temporarily shrinked in order to provide buffer with requested size.
- */
-typedef struct {
-    uint8_t *data;      ///< pointer to data storage
-    volatile uint32_t size;      ///< size of data storage
-    volatile uint32_t cur_size;  ///< current size of data storage
-    volatile uint32_t rd;        ///< read pointer
-    volatile uint32_t wr;        ///< write pointer
-} esp_apptrace_rb_t;
-
 /**
  * @brief Initializes ring buffer control  structure.
  *

components/app_trace/include/esp_dbg_stubs.h

@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ESP_DBG_STUBS_H_
+#define ESP_DBG_STUBS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "esp_err.h"
+
+/**
+ * Debug stubs entries IDs
+ */
+typedef enum {
+    ESP_DBG_STUB_MAGIC_NUM,
+    ESP_DBG_STUB_TABLE_SIZE,
+    ESP_DBG_STUB_CONTROL_DATA,   ///< stubs descriptor entry
+    ESP_DBG_STUB_ENTRY_FIRST,
+    ESP_DBG_STUB_ENTRY_GCOV ///< GCOV entry
+    = ESP_DBG_STUB_ENTRY_FIRST,
+    ESP_DBG_STUB_ENTRY_CAPABILITIES,
+    ESP_DBG_STUB_ENTRY_MAX
+} esp_dbg_stub_id_t;
+
+#define ESP_DBG_STUB_MAGIC_NUM_VAL      0xFEEDBEEF
+#define ESP_DBG_STUB_CAP_GCOV_TASK      (1 << 0)
+
+/**
+ * @brief  Initializes debug stubs.
+ *
+ * @note   Must be called after esp_apptrace_init() if app tracing is enabled.
+ */
+void esp_dbg_stubs_init(void);
+
+/**
+ * @brief  Initializes application tracing module.
+ *
+ * @note   Should be called before any esp_apptrace_xxx call.
+ *
+ * @param id    Stub ID.
+ * @param entry Stub entry. Usually it is stub entry function address,
+ *              but can be any value meaningful for OpenOCD command/code
+ *              such as capabilities
+ * @return ESP_OK on success, otherwise see esp_err_t
+ */
+esp_err_t esp_dbg_stub_entry_set(esp_dbg_stub_id_t id, uint32_t entry);
+
+/**
+ * @brief   Retrieves the corresponding stub entry
+ *
+ * @param id    Stub ID.
+ * @param entry Stub entry. Usually it is stub entry function address,
+ *              but can be any value meaningful for OpenOCD command/code
+ *              such as capabilities
+ *
+ * @return ESP_OK on success, otherwise see esp_err_t
+ */
+esp_err_t esp_dbg_stub_entry_get(esp_dbg_stub_id_t id, uint32_t *entry);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ESP_DBG_STUBS_H_

components/app_trace/include/esp_sysview_trace.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -18,7 +18,7 @@ extern "C" {
 /**
  * @brief Flushes remaining data in SystemView trace buffer to host.
  *
- * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+ * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
  *
  * @return ESP_OK.
  */

components/app_trace/linker.lf

@@ -1,13 +1,14 @@
 [mapping:app_trace]
 archive: libapp_trace.a
 entries:
-    app_trace (noflash)
-    port_uart (noflash)
-    app_trace_util (noflash)
-    if APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE:
-      app_trace_membufs_proto (noflash)
-    if APPTRACE_DEST_JTAG = y:
-      port (noflash)
+    if APPTRACE_ENABLE = y:
+        app_trace (noflash)
+        app_trace_util (noflash)
+        if APPTRACE_DEST_JTAG = y || APPTRACE_DEST_NONE = y:
+            port_jtag (noflash)
+            app_trace_membufs_proto (noflash)
+        if APPTRACE_DEST_UART = y || APPTRACE_DEST_NONE = y:
+            port_uart (noflash)
     if APPTRACE_SV_ENABLE = y:
       SEGGER_SYSVIEW (noflash)
       SEGGER_RTT_esp (noflash)
@@ -18,6 +19,6 @@ entries:
 archive: libesp_driver_gptimer.a
 entries:
     if APPTRACE_SV_TS_SOURCE_GPTIMER = y:
-      gptimer: gptimer_get_raw_count (noflash)
+        gptimer: gptimer_get_raw_count (noflash)
     else:
-      * (default)
+        * (default)

components/app_trace/port/include/esp_app_trace_port.h

@@ -15,7 +15,7 @@ extern "C" {
 
 /** Apptrace HW interface. */
 typedef struct {
-    esp_err_t (*init)(void *hw_data);
+    esp_err_t (*init)(void *hw_data, const esp_apptrace_config_t *config);
     uint8_t *(*get_up_buffer)(void *hw_data, uint32_t, esp_apptrace_tmo_t *);
     esp_err_t (*put_up_buffer)(void *hw_data, uint8_t *, esp_apptrace_tmo_t *);
     esp_err_t (*flush_up_buffer_nolock)(void *hw_data, uint32_t, esp_apptrace_tmo_t *);
@@ -24,6 +24,7 @@ typedef struct {
     uint8_t *(*get_down_buffer)(void *hw_data, uint32_t *, esp_apptrace_tmo_t *);
     esp_err_t (*put_down_buffer)(void *hw_data, uint8_t *, esp_apptrace_tmo_t *);
     bool (*host_is_connected)(void *hw_data);
+    void (*set_header_size)(void *hw_data, esp_apptrace_header_size_t header_size);
 } esp_apptrace_hw_t;
 
 esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data);

components/app_trace/port/port_uart.c

@@ -1,24 +1,17 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
+#include <string.h>
 #include "soc/soc.h"
 #include "esp_log.h"
 #include "esp_cpu.h"
+#include "esp_app_trace_config.h"
 #include "esp_app_trace_port.h"
 
 #include "driver/uart.h"
 #include "hal/uart_ll.h"
-#include "string.h"
-#include "driver/gpio.h"
-
-
-#define APPTRACE_DEST_UART (CONFIG_APPTRACE_DEST_UART0 | CONFIG_APPTRACE_DEST_UART1 | CONFIG_APPTRACE_DEST_UART2)
-
-#define APP_TRACE_MAX_TX_BUFF_UART          CONFIG_APPTRACE_UART_TX_BUFF_SIZE
-#define APP_TRACE_MAX_TX_MSG_UART           CONFIG_APPTRACE_UART_TX_MSG_SIZE
 
 /** UART HW transport data */
 typedef struct {
@@ -27,67 +20,34 @@ typedef struct {
     esp_apptrace_lock_t                 lock;   // sync lock
 #endif
     uart_port_t port_num;
-// TX data ring buffer
+
+    /* TX data ring buffer */
     uint8_t *tx_data_buff;
+    uint32_t tx_data_buff_size;
     int32_t tx_data_buff_in;
     int32_t tx_data_buff_out;
-// TX message buffer
+
+    /* TX message buffer */
     uint8_t *tx_msg_buff;
     uint32_t tx_msg_buff_size;
+    uint32_t tx_pending_msg_size;
 
-// RX message buffer
+    /* RX message buffer */
     uint8_t *down_buffer;
     uint32_t down_buffer_size;
-// Buffer overflow flags
+
+    /* Buffer overflow flags */
     bool message_buff_overflow;
     bool circular_buff_overflow;
 } esp_apptrace_uart_data_t;
 
-#if APPTRACE_DEST_UART
-static esp_err_t esp_apptrace_uart_init(esp_apptrace_uart_data_t *hw_data);
-static esp_err_t esp_apptrace_uart_flush(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_flush_nolock(esp_apptrace_uart_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo);
-static uint8_t *esp_apptrace_uart_up_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_up_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static void esp_apptrace_uart_down_buffer_config(esp_apptrace_uart_data_t *hw_data, uint8_t *buf, uint32_t size);
-static uint8_t *esp_apptrace_uart_down_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_down_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static bool esp_apptrace_uart_host_is_connected(esp_apptrace_uart_data_t *hw_data);
-
-#endif // APPTRACE_DEST_UART
 const static char *TAG = "esp_apptrace_uart";
 
-esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
-{
-    ESP_LOGD(TAG,"esp_apptrace_uart_hw_get - %i", num);
-#if APPTRACE_DEST_UART
-    static esp_apptrace_uart_data_t s_uart_hw_data = {
-    };
-    static esp_apptrace_hw_t s_uart_hw = {
-        .init = (esp_err_t (*)(void *))esp_apptrace_uart_init,
-        .get_up_buffer = (uint8_t *(*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_uart_up_buffer_get,
-        .put_up_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_up_buffer_put,
-        .flush_up_buffer_nolock = (esp_err_t (*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_uart_flush_nolock,
-        .flush_up_buffer = (esp_err_t (*)(void *, esp_apptrace_tmo_t *))esp_apptrace_uart_flush,
-        .down_buffer_config = (void (*)(void *, uint8_t *, uint32_t ))esp_apptrace_uart_down_buffer_config,
-        .get_down_buffer = (uint8_t *(*)(void *, uint32_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_down_buffer_get,
-        .put_down_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_down_buffer_put,
-        .host_is_connected = (bool (*)(void *))esp_apptrace_uart_host_is_connected,
-    };
-    s_uart_hw_data.port_num = num;
-    *data = &s_uart_hw_data;
-    return &s_uart_hw;
-#else
-    return NULL;
-#endif
-}
-
-#if APPTRACE_DEST_UART
-
-static esp_err_t esp_apptrace_uart_lock(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_uart_lock(void *hw_data, esp_apptrace_tmo_t *tmo)
 {
 #if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_err_t ret = esp_apptrace_lock_take(&hw_data->lock, tmo);
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+    esp_err_t ret = esp_apptrace_lock_take(&uart_data->lock, tmo);
     if (ret != ESP_OK) {
         return ESP_FAIL;
     }
@@ -95,11 +55,12 @@ static esp_err_t esp_apptrace_uart_lock(esp_apptrace_uart_data_t *hw_data, esp_a
     return ESP_OK;
 }
 
-static esp_err_t esp_apptrace_uart_unlock(esp_apptrace_uart_data_t *hw_data)
+static esp_err_t esp_apptrace_uart_unlock(void *hw_data)
 {
     esp_err_t ret = ESP_OK;
 #if CONFIG_APPTRACE_LOCK_ENABLE
-    ret = esp_apptrace_lock_give(&hw_data->lock);
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+    ret = esp_apptrace_lock_give(&uart_data->lock);
 #endif
     return ret;
 }
@@ -109,64 +70,73 @@ static inline void esp_apptrace_uart_hw_init(void)
     ESP_APPTRACE_LOGI("Initialized UART on CPU%d", esp_cpu_get_core_id());
 }
 
-
 /*****************************************************************************************/
 /***************************** Apptrace HW iface *****************************************/
 /*****************************************************************************************/
 
-static esp_err_t esp_apptrace_send_uart_data(esp_apptrace_uart_data_t *hw_data, const char *data, uint32_t size, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_send_uart_data(void *hw_data, const char *data, uint32_t size, esp_apptrace_tmo_t *tmo)
 {
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+    esp_err_t res = esp_apptrace_uart_lock(uart_data, tmo);
     if (res != ESP_OK) {
         return res;
     }
     // We store current out position to handle it without lock
-    volatile int32_t out_position = hw_data->tx_data_buff_out;
+    volatile int32_t out_position = uart_data->tx_data_buff_out;
 
-    int len_free = APP_TRACE_MAX_TX_BUFF_UART - (hw_data->tx_data_buff_in - out_position);
-    if (out_position > hw_data->tx_data_buff_in) {
-        len_free = out_position - hw_data->tx_data_buff_in;
+    int len_free = uart_data->tx_data_buff_size - (uart_data->tx_data_buff_in - out_position);
+    if (out_position > uart_data->tx_data_buff_in) {
+        len_free = out_position - uart_data->tx_data_buff_in;
     }
-    int check_len = APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in;
-    if (size <= len_free)
-    {
-        if ( check_len >= size) {
-            memcpy(&hw_data->tx_data_buff[hw_data->tx_data_buff_in], data, size);
-            hw_data->tx_data_buff_in += size;
+    int check_len = uart_data->tx_data_buff_size - uart_data->tx_data_buff_in;
+    if (size <= len_free) {
+        if (check_len >= size) {
+            memcpy(&uart_data->tx_data_buff[uart_data->tx_data_buff_in], data, size);
+            uart_data->tx_data_buff_in += size;
         } else {
-            memcpy(&hw_data->tx_data_buff[hw_data->tx_data_buff_in], data, APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in);
-            memcpy(&hw_data->tx_data_buff[0], &data[APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in], size - (APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in));
-            hw_data->tx_data_buff_in = size - (APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in);
+            memcpy(&uart_data->tx_data_buff[uart_data->tx_data_buff_in],
+                   data,
+                   uart_data->tx_data_buff_size - uart_data->tx_data_buff_in);
+            memcpy(&uart_data->tx_data_buff[0],
+                   &data[uart_data->tx_data_buff_size - uart_data->tx_data_buff_in],
+                   size - (uart_data->tx_data_buff_size - uart_data->tx_data_buff_in));
+            uart_data->tx_data_buff_in = size - (uart_data->tx_data_buff_size - uart_data->tx_data_buff_in);
         }
-        if (hw_data->tx_data_buff_in >= APP_TRACE_MAX_TX_BUFF_UART) {
-            hw_data->tx_data_buff_in = 0;
+        if (uart_data->tx_data_buff_in >= uart_data->tx_data_buff_size) {
+            uart_data->tx_data_buff_in = 0;
         }
     } else {
-        hw_data->circular_buff_overflow = true;
+        uart_data->circular_buff_overflow = true;
     }
 
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
+    if (esp_apptrace_uart_unlock(uart_data) != ESP_OK) {
         assert(false && "Failed to unlock apptrace data!");
     }
 
     return ESP_OK;
 }
 
-static void send_buff_data(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
+static void send_buff_data(void *hw_data, esp_apptrace_tmo_t *tmo)
 {
-    if (hw_data->tx_data_buff_in == hw_data->tx_data_buff_out) {
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+
+    if (uart_data->tx_data_buff_in == uart_data->tx_data_buff_out) {
         return;
     }
     // We store current in position to handle it without lock
-    volatile int32_t in_position = hw_data->tx_data_buff_in;
-    if (in_position > hw_data->tx_data_buff_out) {
-        int bytes_sent = uart_write_bytes(hw_data->port_num, &hw_data->tx_data_buff[hw_data->tx_data_buff_out], in_position - hw_data->tx_data_buff_out);
-        hw_data->tx_data_buff_out += bytes_sent;
+    volatile int32_t in_position = uart_data->tx_data_buff_in;
+    if (in_position > uart_data->tx_data_buff_out) {
+        int bytes_sent = uart_write_bytes(uart_data->port_num,
+                                          &uart_data->tx_data_buff[uart_data->tx_data_buff_out],
+                                          in_position - uart_data->tx_data_buff_out);
+        uart_data->tx_data_buff_out += bytes_sent;
     } else {
-        int bytes_sent = uart_write_bytes(hw_data->port_num, &hw_data->tx_data_buff[hw_data->tx_data_buff_out], APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_out);
-        hw_data->tx_data_buff_out += bytes_sent;
-        if (hw_data->tx_data_buff_out >= APP_TRACE_MAX_TX_BUFF_UART) {
-            hw_data->tx_data_buff_out = 0;
+        int bytes_sent = uart_write_bytes(uart_data->port_num,
+                                          &uart_data->tx_data_buff[uart_data->tx_data_buff_out],
+                                          uart_data->tx_data_buff_size - uart_data->tx_data_buff_out);
+        uart_data->tx_data_buff_out += bytes_sent;
+        if (uart_data->tx_data_buff_out >= uart_data->tx_data_buff_size) {
+            uart_data->tx_data_buff_out = 0;
         }
     }
 }
@@ -175,22 +145,21 @@ static void send_buff_data(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t
 
 static void esp_apptrace_send_uart_tx_task(void *arg)
 {
-    esp_apptrace_uart_data_t *hw_data = (esp_apptrace_uart_data_t *)arg;
+    esp_apptrace_uart_data_t *uart_data = arg;
     esp_apptrace_tmo_t tmo;
+
     esp_apptrace_tmo_init(&tmo, APP_TRACE_UART_STOP_WAIT_TMO);
 
     vTaskDelay(10);
     while (1) {
-        send_buff_data(hw_data, &tmo);
+        send_buff_data(uart_data, &tmo);
         vTaskDelay(10);
-        if (hw_data->circular_buff_overflow == true)
-        {
-            hw_data->circular_buff_overflow = false;
+        if (uart_data->circular_buff_overflow == true) {
+            uart_data->circular_buff_overflow = false;
             ESP_LOGE(TAG, "Buffer overflow. Please increase UART baudrate, or increase UART TX ring buffer size in menuconfig.");
         }
-        if (hw_data->message_buff_overflow == true)
-        {
-            hw_data->message_buff_overflow = false;
+        if (uart_data->message_buff_overflow == true) {
+            uart_data->message_buff_overflow = false;
             ESP_LOGE(TAG, "Message size more then message buffer!");
         }
     }
@@ -198,158 +167,202 @@ static void esp_apptrace_send_uart_tx_task(void *arg)
 
 static const int APP_TRACE_UART_RX_BUF_SIZE = 4024;
 
-static esp_err_t esp_apptrace_uart_init(esp_apptrace_uart_data_t *hw_data)
+static esp_err_t esp_apptrace_uart_init(void *hw_data, const esp_apptrace_config_t *config)
 {
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+    const esp_apptrace_uart_config_t *apptrace_uart_config = &config->dest_cfg.uart;
+
+    /* esp_apptrace_uart_init() is called on every core, so ensure to do main initialization only once */
     int core_id = esp_cpu_get_core_id();
     if (core_id == 0) {
-        hw_data->tx_data_buff = (uint8_t *)heap_caps_malloc(APP_TRACE_MAX_TX_BUFF_UART, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-        if (hw_data->tx_data_buff == NULL){
+        uart_data->tx_data_buff_size = apptrace_uart_config->tx_buff_size;
+        uart_data->tx_data_buff = heap_caps_malloc(uart_data->tx_data_buff_size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
+        if (uart_data->tx_data_buff == NULL) {
             return ESP_ERR_NO_MEM;
         }
-        hw_data->tx_data_buff_in = 0;
-        hw_data->tx_data_buff_out = 0;
-        hw_data->tx_msg_buff =  (uint8_t *)heap_caps_malloc(APP_TRACE_MAX_TX_MSG_UART, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-        if (hw_data->tx_msg_buff == NULL)
-        {
+        uart_data->tx_data_buff_in = 0;
+        uart_data->tx_data_buff_out = 0;
+        uart_data->tx_msg_buff_size = apptrace_uart_config->tx_msg_size;
+        uart_data->tx_msg_buff = heap_caps_malloc(uart_data->tx_msg_buff_size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
+        if (uart_data->tx_msg_buff == NULL) {
             return ESP_ERR_NO_MEM;
         }
-        hw_data->tx_msg_buff_size = 0;
-        hw_data->down_buffer_size = 0;
-        hw_data->message_buff_overflow = false;
-        hw_data->circular_buff_overflow = false;
+        uart_data->tx_pending_msg_size = 0;
+        uart_data->down_buffer_size = 0;
+        uart_data->message_buff_overflow = false;
+        uart_data->circular_buff_overflow = false;
 
-        assert((hw_data->port_num <= SOC_UART_NUM) && "Not possible to configure UART. Please check selected UART port");
+        assert((uart_data->port_num <= SOC_UART_NUM) && "Not possible to configure UART. Please check selected UART port");
 
         int source_clk = UART_SCLK_DEFAULT;
 #if SOC_UART_LP_NUM > 0
-        if (hw_data->port_num >= SOC_UART_HP_NUM)
+        if (uart_data->port_num >= SOC_UART_HP_NUM) {
             source_clk = LP_UART_SCLK_DEFAULT;
+        }
 #endif
 
         const uart_config_t uart_config = {
-            .baud_rate = CONFIG_APPTRACE_UART_BAUDRATE,
+            .baud_rate = apptrace_uart_config->baud_rate,
             .data_bits = UART_DATA_8_BITS,
             .parity = UART_PARITY_DISABLE,
             .stop_bits = UART_STOP_BITS_1,
             .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
             .source_clk = source_clk,
         };
-        ESP_LOGI(TAG, "UART baud rate: %i", CONFIG_APPTRACE_UART_BAUDRATE);
+        ESP_LOGI(TAG, "UART baud rate: %i", apptrace_uart_config->baud_rate);
         // We won't use a buffer for sending data.
-        esp_err_t err = uart_driver_install(hw_data->port_num, APP_TRACE_UART_RX_BUF_SIZE, APP_TRACE_UART_RX_BUF_SIZE, 0, NULL, 0);
-        assert((err == ESP_OK) && "Not possible to install UART. Please check and change menuconfig parameters!");
-        err = uart_param_config(hw_data->port_num, &uart_config);
-        assert((err == ESP_OK) && "Not possible to configure UART. Please check and change menuconfig parameters!");
-        err = uart_set_pin(hw_data->port_num, CONFIG_APPTRACE_UART_TX_GPIO, CONFIG_APPTRACE_UART_RX_GPIO, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
-        assert((err == ESP_OK) && "Not possible to configure UART RX/TX pins. Please check and change menuconfig parameters!");
+        esp_err_t __attribute__((unused)) err = uart_driver_install(uart_data->port_num,
+                                                                    APP_TRACE_UART_RX_BUF_SIZE,
+                                                                    APP_TRACE_UART_RX_BUF_SIZE,
+                                                                    0,
+                                                                    NULL,
+                                                                    0);
+        assert((err == ESP_OK) && "Not possible to install UART. Please check and change uart parameters!");
+        err = uart_param_config(uart_data->port_num, &uart_config);
+        assert((err == ESP_OK) && "Not possible to configure UART. Please check and change uart parameters!");
+        err = uart_set_pin(uart_data->port_num,
+                           apptrace_uart_config->tx_pin_num,
+                           apptrace_uart_config->rx_pin_num,
+                           UART_PIN_NO_CHANGE,
+                           UART_PIN_NO_CHANGE);
+        assert((err == ESP_OK) && "Not possible to configure UART RX/TX pins. Please check and change the uart pins!");
 
-        int uart_prio = CONFIG_APPTRACE_UART_TASK_PRIO;
-        if (uart_prio >= (configMAX_PRIORITIES-1)) uart_prio = configMAX_PRIORITIES - 1;
-        err = xTaskCreate(esp_apptrace_send_uart_tx_task, "app_trace_uart_tx_task", 2500, hw_data, uart_prio, NULL);
+        int uart_prio = apptrace_uart_config->task_prio;
+        if (uart_prio >= (configMAX_PRIORITIES - 1)) {
+            uart_prio = configMAX_PRIORITIES - 1;
+        }
+        err = xTaskCreate(esp_apptrace_send_uart_tx_task, "app_trace_uart_tx_task", 2500, uart_data, uart_prio, NULL);
         assert((err == pdPASS) && "Not possible to configure UART. Not possible to create task!");
 
 #if CONFIG_APPTRACE_LOCK_ENABLE
-        esp_apptrace_lock_init(&hw_data->lock);
+        esp_apptrace_lock_init(&uart_data->lock);
 #endif
     }
     // init UART on this CPU
     esp_apptrace_uart_hw_init();
-    hw_data->inited |= 1 << core_id;
+    uart_data->inited |= 1 << core_id;
 
     return ESP_OK;
 }
 
-static uint8_t *esp_apptrace_uart_up_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
+static uint8_t *esp_apptrace_uart_up_buffer_get(void *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
 {
-    uint8_t *ptr;
-    if (size > APP_TRACE_MAX_TX_MSG_UART) {
-        hw_data->message_buff_overflow = true;
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+
+    if (size > uart_data->tx_msg_buff_size) {
+        uart_data->message_buff_overflow = true;
         return NULL;
     }
-    if (hw_data->tx_msg_buff_size != 0)
-    {
+    if (uart_data->tx_pending_msg_size != 0) {
         // A previous message was not sent.
         return NULL;
     }
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
+    esp_err_t res = esp_apptrace_uart_lock(uart_data, tmo);
     if (res != ESP_OK) {
         return NULL;
     }
-    ptr = hw_data->tx_msg_buff;
-    hw_data->tx_msg_buff_size = size;
+    uint8_t *ptr = uart_data->tx_msg_buff;
+
+    // Set the amount of data to send
+    uart_data->tx_pending_msg_size = size;
 
     // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
+    if (esp_apptrace_uart_unlock(uart_data) != ESP_OK) {
         assert(false && "Failed to unlock apptrace data!");
     }
     return ptr;
 }
 
-static esp_err_t esp_apptrace_uart_up_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_uart_up_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
 {
-    esp_err_t res = esp_apptrace_send_uart_data(hw_data, (const char *)ptr, hw_data->tx_msg_buff_size, tmo);
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+    esp_err_t res = esp_apptrace_send_uart_data(uart_data, (const char *)ptr, uart_data->tx_pending_msg_size, tmo);
     // Clear size to indicate that we've sent data
-    hw_data->tx_msg_buff_size = 0;
+    uart_data->tx_pending_msg_size = 0;
     return res;
 }
 
-static void esp_apptrace_uart_down_buffer_config(esp_apptrace_uart_data_t *hw_data, uint8_t *buf, uint32_t size)
+static void esp_apptrace_uart_down_buffer_config(void *hw_data, uint8_t *buf, uint32_t size)
 {
-    hw_data->down_buffer = (uint8_t *)malloc(size);
-    if (hw_data->down_buffer == NULL){
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+
+    uart_data->down_buffer = (uint8_t *)malloc(size);
+    if (uart_data->down_buffer == NULL) {
         assert(false && "Failed to allocate apptrace uart down buffer!");
     }
-    hw_data->down_buffer_size = size;
+    uart_data->down_buffer_size = size;
 }
 
-static uint8_t *esp_apptrace_uart_down_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
+static uint8_t *esp_apptrace_uart_down_buffer_get(void *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
 {
+    esp_apptrace_uart_data_t *uart_data = hw_data;
     uint8_t *ptr = NULL;
 
-    if (*size > hw_data->down_buffer_size) {
+    if (*size > uart_data->down_buffer_size) {
         return NULL;
     }
 
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
+    esp_err_t res = esp_apptrace_uart_lock(uart_data, tmo);
     if (res != ESP_OK) {
         return NULL;
     }
 
     size_t uart_fifolen = 0;
-    uart_get_buffered_data_len(hw_data->port_num, &uart_fifolen);
+    uart_get_buffered_data_len(uart_data->port_num, &uart_fifolen);
     if (uart_fifolen > 0) {
         if (*size < uart_fifolen) {
             uart_fifolen = *size;
         }
         *size = uart_fifolen;
-        ptr = hw_data->down_buffer;
-        *size =uart_read_bytes(hw_data->port_num, ptr, uart_fifolen, 0);
+        ptr = uart_data->down_buffer;
+        *size = uart_read_bytes(uart_data->port_num, ptr, uart_fifolen, 0);
     }
 
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
+    if (esp_apptrace_uart_unlock(uart_data) != ESP_OK) {
         assert(false && "Failed to unlock apptrace data!");
     }
     return ptr;
 }
 
-static esp_err_t esp_apptrace_uart_down_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_uart_down_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
 {
     return ESP_OK;
 }
 
-static bool esp_apptrace_uart_host_is_connected(esp_apptrace_uart_data_t *hw_data)
+static bool esp_apptrace_uart_host_is_connected(void *hw_data)
 {
-    return hw_data->inited & 1;
+    esp_apptrace_uart_data_t *uart_data = hw_data;
+
+    return uart_data->inited & 1;
 }
 
-static esp_err_t esp_apptrace_uart_flush_nolock(esp_apptrace_uart_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_uart_flush_nolock(void *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
 {
     return ESP_OK;
 }
 
-static esp_err_t esp_apptrace_uart_flush(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
+static esp_err_t esp_apptrace_uart_flush(void *hw_data, esp_apptrace_tmo_t *tmo)
 {
     return ESP_OK;
 }
 
-#endif // APPTRACE_DEST_UART
+esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
+{
+    ESP_LOGD(TAG, "esp_apptrace_uart_hw_get - %i", num);
+
+    static esp_apptrace_uart_data_t s_uart_hw_data;
+    static esp_apptrace_hw_t s_uart_hw = {
+        .init = esp_apptrace_uart_init,
+        .get_up_buffer = esp_apptrace_uart_up_buffer_get,
+        .put_up_buffer = esp_apptrace_uart_up_buffer_put,
+        .flush_up_buffer_nolock = esp_apptrace_uart_flush_nolock,
+        .flush_up_buffer = esp_apptrace_uart_flush,
+        .down_buffer_config = esp_apptrace_uart_down_buffer_config,
+        .get_down_buffer = esp_apptrace_uart_down_buffer_get,
+        .put_down_buffer = esp_apptrace_uart_down_buffer_put,
+        .host_is_connected = esp_apptrace_uart_host_is_connected,
+    };
+    s_uart_hw_data.port_num = num;
+    *data = &s_uart_hw_data;
+    return &s_uart_hw;
+}

components/app_trace/port/riscv/port.c

@@ -1,367 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
-
-#include "sdkconfig.h"
-#include "esp_cpu.h"
-#include "esp_log.h"
-#include "esp_app_trace_membufs_proto.h"
-#include "esp_app_trace_port.h"
-#include "riscv/semihosting.h"
-
-/** RISCV HW transport data */
-typedef struct {
-    uint8_t                             inited; // initialization state flags for every core
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_apptrace_lock_t                 lock;   // sync lock
-#endif
-    esp_apptrace_membufs_proto_data_t   membufs;
-} esp_apptrace_riscv_data_t;
-
-/** RISCV memory host iface control block */
-typedef struct {
-    uint32_t                    ctrl;
-    // - Guard field. If this register is not zero then CPU is changing this struct and
-    //   this guard field holds address of the instruction which application will execute when CPU finishes with those modifications.
-    uint32_t                    stat;
-    esp_apptrace_mem_block_t *  mem_blocks;
-} esp_apptrace_riscv_ctrl_block_t;
-
-#define ESP_APPTRACE_RISCV_BLOCK_LEN_MSK         0x7FFFUL
-#define ESP_APPTRACE_RISCV_BLOCK_LEN(_l_)        ((_l_) & ESP_APPTRACE_RISCV_BLOCK_LEN_MSK)
-#define ESP_APPTRACE_RISCV_BLOCK_LEN_GET(_v_)    ((_v_) & ESP_APPTRACE_RISCV_BLOCK_LEN_MSK)
-#define ESP_APPTRACE_RISCV_BLOCK_ID_MSK          0x7FUL
-#define ESP_APPTRACE_RISCV_BLOCK_ID(_id_)        (((_id_) & ESP_APPTRACE_RISCV_BLOCK_ID_MSK) << 15)
-#define ESP_APPTRACE_RISCV_BLOCK_ID_GET(_v_)     (((_v_) >> 15) & ESP_APPTRACE_RISCV_BLOCK_ID_MSK)
-#define ESP_APPTRACE_RISCV_HOST_DATA             (1 << 22)
-#define ESP_APPTRACE_RISCV_HOST_CONNECT          (1 << 23)
-
-#define ESP_APPTRACE_RISCV_INITED(_hw_)          ((_hw_)->inited & (1 << 0/*esp_cpu_get_core_id()*/))
-
-static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data);
-static esp_err_t esp_apptrace_riscv_flush(esp_apptrace_riscv_data_t *hw_data, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_riscv_flush_nolock(esp_apptrace_riscv_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo);
-static uint8_t *esp_apptrace_riscv_up_buffer_get(esp_apptrace_riscv_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_riscv_up_buffer_put(esp_apptrace_riscv_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static void esp_apptrace_riscv_down_buffer_config(esp_apptrace_riscv_data_t *hw_data, uint8_t *buf, uint32_t size);
-static uint8_t *esp_apptrace_riscv_down_buffer_get(esp_apptrace_riscv_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_riscv_down_buffer_put(esp_apptrace_riscv_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static bool esp_apptrace_riscv_host_is_connected(esp_apptrace_riscv_data_t *hw_data);
-static esp_err_t esp_apptrace_riscv_buffer_swap_start(uint32_t curr_block_id);
-static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id);
-static esp_err_t esp_apptrace_riscv_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len);
-static bool esp_apptrace_riscv_host_data_pending(void);
-
-
-const static char *TAG = "esp_apptrace";
-
-#if SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE
-#define APPTRACE_DRAM_ATTR TCM_DRAM_ATTR
-#else
-#define APPTRACE_DRAM_ATTR
-#endif
-
-static APPTRACE_DRAM_ATTR esp_apptrace_riscv_ctrl_block_t s_tracing_ctrl[CONFIG_FREERTOS_NUMBER_OF_CORES];
-
-esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
-{
-#if CONFIG_APPTRACE_DEST_JTAG
-    static esp_apptrace_membufs_proto_hw_t s_trace_proto_hw = {
-        .swap_start = esp_apptrace_riscv_buffer_swap_start,
-        .swap = esp_apptrace_riscv_buffer_swap,
-        .swap_end = esp_apptrace_riscv_buffer_swap_end,
-        .host_data_pending = esp_apptrace_riscv_host_data_pending,
-    };
-    static esp_apptrace_riscv_data_t s_trace_hw_data = {
-        .membufs = {
-            .hw = &s_trace_proto_hw,
-        },
-    };
-    static esp_apptrace_hw_t s_trace_hw = {
-        .init = (esp_err_t (*)(void *))esp_apptrace_riscv_init,
-        .get_up_buffer = (uint8_t *(*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_riscv_up_buffer_get,
-        .put_up_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_riscv_up_buffer_put,
-        .flush_up_buffer_nolock = (esp_err_t (*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_riscv_flush_nolock,
-        .flush_up_buffer = (esp_err_t (*)(void *, esp_apptrace_tmo_t *))esp_apptrace_riscv_flush,
-        .down_buffer_config = (void (*)(void *, uint8_t *, uint32_t ))esp_apptrace_riscv_down_buffer_config,
-        .get_down_buffer = (uint8_t *(*)(void *, uint32_t *, esp_apptrace_tmo_t *))esp_apptrace_riscv_down_buffer_get,
-        .put_down_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_riscv_down_buffer_put,
-        .host_is_connected = (bool (*)(void *))esp_apptrace_riscv_host_is_connected,
-    };
-    *data = &s_trace_hw_data;
-    return &s_trace_hw;
-#else
-    return NULL;
-#endif
-}
-
-/* Advertises apptrace control block address to host.
-   This function can be overridden with custom implementation,
-   e.g. OpenOCD flasher stub use own implementation of it. */
-__attribute__((weak)) int esp_apptrace_advertise_ctrl_block(void *ctrl_block_addr)
-{
-    if (!esp_cpu_dbgr_is_attached()) {
-        return 0;
-    }
-    return (int) semihosting_call_noerrno(ESP_SEMIHOSTING_SYS_APPTRACE_INIT, (long*)ctrl_block_addr);
-}
-
-/* Returns up buffers config.
-   This function can be overridden with custom implementation,
-   e.g. OpenOCD flasher stub use own implementation of it. */
-__attribute__((weak)) void esp_apptrace_get_up_buffers(esp_apptrace_mem_block_t mem_blocks_cfg[2])
-{
-    static uint8_t s_mem_blocks[2][CONFIG_APPTRACE_BUF_SIZE];
-
-    mem_blocks_cfg[0].start = s_mem_blocks[0];
-    mem_blocks_cfg[0].sz = CONFIG_APPTRACE_BUF_SIZE;
-    mem_blocks_cfg[1].start = s_mem_blocks[1];
-    mem_blocks_cfg[1].sz = CONFIG_APPTRACE_BUF_SIZE;
-}
-
-static esp_err_t esp_apptrace_riscv_lock(esp_apptrace_riscv_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_err_t ret = esp_apptrace_lock_take(&hw_data->lock, tmo);
-    if (ret != ESP_OK) {
-        return ESP_FAIL;
-    }
-#endif
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_riscv_unlock(esp_apptrace_riscv_data_t *hw_data)
-{
-    esp_err_t ret = ESP_OK;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    ret = esp_apptrace_lock_give(&hw_data->lock);
-#endif
-    return ret;
-}
-
-/*****************************************************************************************/
-/***************************** Apptrace HW iface *****************************************/
-/*****************************************************************************************/
-
-static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data)
-{
-    int core_id = esp_cpu_get_core_id();
-
-    if (hw_data->inited == 0) {
-        esp_apptrace_mem_block_t mem_blocks_cfg[2];
-        esp_apptrace_get_up_buffers(mem_blocks_cfg);
-        esp_err_t res = esp_apptrace_membufs_init(&hw_data->membufs, mem_blocks_cfg);
-        if (res != ESP_OK) {
-            ESP_APPTRACE_LOGE("Failed to init membufs proto (%d)!", res);
-            return res;
-        }
-#if CONFIG_APPTRACE_LOCK_ENABLE
-        esp_apptrace_lock_init(&hw_data->lock);
-#endif
-    }
-    hw_data->inited |= 1 << core_id;
-    ESP_APPTRACE_LOGI("Apptrace initialized on CPU%d. Tracing control block @ %p.", core_id, &s_tracing_ctrl[core_id]);
-    s_tracing_ctrl[core_id].mem_blocks = hw_data->membufs.blocks;
-    for (int i = 0; i < 2; i++) {
-        ESP_APPTRACE_LOGD("Mem buf[%d] %" PRIu32 " bytes @ %p (%p/%p)", i,
-            s_tracing_ctrl[core_id].mem_blocks[i].sz, s_tracing_ctrl[core_id].mem_blocks[i].start,
-            &(s_tracing_ctrl[core_id].mem_blocks[i].start), &(s_tracing_ctrl[core_id].mem_blocks[i].sz));
-    }
-    // notify host about control block address
-    int res = esp_apptrace_advertise_ctrl_block(&s_tracing_ctrl[core_id]);
-    assert(res == 0 && "Failed to send config to host!");
-
-    return ESP_OK;
-}
-
-static uint8_t *esp_apptrace_riscv_up_buffer_get(esp_apptrace_riscv_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr;
-
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_riscv_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    ptr = esp_apptrace_membufs_up_buffer_get(&hw_data->membufs, size, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_riscv_up_buffer_put(esp_apptrace_riscv_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    // Can avoid locking because esp_apptrace_membufs_up_buffer_put() just modifies buffer's header
-    esp_err_t res = esp_apptrace_membufs_up_buffer_put(&hw_data->membufs, ptr, tmo);
-    return res;
-}
-
-static void esp_apptrace_riscv_down_buffer_config(esp_apptrace_riscv_data_t *hw_data, uint8_t *buf, uint32_t size)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return;
-    }
-    esp_apptrace_membufs_down_buffer_config(&hw_data->membufs, buf, size);
-}
-
-static uint8_t *esp_apptrace_riscv_down_buffer_get(esp_apptrace_riscv_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr;
-
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_riscv_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    ptr = esp_apptrace_membufs_down_buffer_get(&hw_data->membufs, size, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_riscv_down_buffer_put(esp_apptrace_riscv_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    // Can avoid locking because esp_apptrace_membufs_down_buffer_put() does nothing
-    /*esp_err_t res = esp_apptrace_riscv_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return res;
-    }*/
-
-    esp_err_t res = esp_apptrace_membufs_down_buffer_put(&hw_data->membufs, ptr, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    /*if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }*/
-    return res;
-}
-
-static bool esp_apptrace_riscv_host_is_connected(esp_apptrace_riscv_data_t *hw_data)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return false;
-    }
-    return s_tracing_ctrl[esp_cpu_get_core_id()].ctrl & ESP_APPTRACE_RISCV_HOST_CONNECT ? true : false;
-}
-
-static esp_err_t esp_apptrace_riscv_flush_nolock(esp_apptrace_riscv_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    return esp_apptrace_membufs_flush_nolock(&hw_data->membufs, min_sz, tmo);
-}
-
-static esp_err_t esp_apptrace_riscv_flush(esp_apptrace_riscv_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    esp_err_t res = esp_apptrace_riscv_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return res;
-    }
-
-    res = esp_apptrace_membufs_flush_nolock(&hw_data->membufs, 0, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return res;
-}
-
-/*****************************************************************************************/
-/************************** Membufs proto HW iface ***************************************/
-/*****************************************************************************************/
-
-static inline void esp_apptrace_riscv_buffer_swap_lock(void)
-{
-    extern uint32_t __esp_apptrace_riscv_updated;
-
-    // indicate to host that we are about to update.
-    // this is used only to place CPU into streaming mode at tracing startup
-    // before starting streaming host can halt us after we read  ESP_APPTRACE_RISCV_CTRL_REG and before we updated it
-    // HACK: in this case host will set breakpoint just after ESP_APPTRACE_RISCV_CTRL_REG update,
-    // here we set address to set bp at
-    // enter ERI update critical section
-    s_tracing_ctrl[esp_cpu_get_core_id()].stat = (uint32_t)&__esp_apptrace_riscv_updated;
-}
-
-static __attribute__((noinline)) void esp_apptrace_riscv_buffer_swap_unlock(void)
-{
-    // exit ERI update critical section
-    s_tracing_ctrl[esp_cpu_get_core_id()].stat = 0;
-    // TODO: currently host sets breakpoint, use break instruction to stop;
-    // it will allow to use ESP_APPTRACE_RISCV_STAT_REG for other purposes
-    asm volatile (
-        "    .global     __esp_apptrace_riscv_updated\n"
-        "__esp_apptrace_riscv_updated:\n"); // host will set bp here to resolve collision at streaming start
-}
-
-static esp_err_t esp_apptrace_riscv_buffer_swap_start(uint32_t curr_block_id)
-{
-    esp_err_t res = ESP_OK;
-
-    esp_apptrace_riscv_buffer_swap_lock();
-
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
-    uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
-    if (host_connected) {
-        uint32_t acked_block = ESP_APPTRACE_RISCV_BLOCK_ID_GET(ctrl_reg);
-        uint32_t host_to_read = ESP_APPTRACE_RISCV_BLOCK_LEN_GET(ctrl_reg);
-        if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK)) {
-            ESP_APPTRACE_LOGD("[%d]: Can not switch %" PRIx32 " %" PRIu32 " %" PRIx32 " %" PRIx32 "/%" PRIx32, esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
-                curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK, curr_block_id);
-            res = ESP_ERR_NO_MEM;
-            goto _on_err;
-        }
-    }
-    return ESP_OK;
-_on_err:
-    esp_apptrace_riscv_buffer_swap_unlock();
-    return res;
-}
-
-static esp_err_t esp_apptrace_riscv_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len)
-{
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
-    uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
-    s_tracing_ctrl[esp_cpu_get_core_id()].ctrl = ESP_APPTRACE_RISCV_BLOCK_ID(new_block_id) |
-              host_connected | ESP_APPTRACE_RISCV_BLOCK_LEN(prev_block_len);
-    esp_apptrace_riscv_buffer_swap_unlock();
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id)
-{
-    /* do nothing */
-    return ESP_OK;
-}
-
-static bool esp_apptrace_riscv_host_data_pending(void)
-{
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
-    // ESP_APPTRACE_LOGV("%s() 0x%x", __func__, ctrl_reg);
-    return (ctrl_reg & ESP_APPTRACE_RISCV_HOST_DATA) ? true : false;
-}

components/app_trace/port/riscv/port_jtag.c

@@ -0,0 +1,373 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ */
+
+#include "sdkconfig.h"
+#include "esp_cpu.h"
+#include "esp_log.h"
+#include "esp_app_trace_config.h"
+#include "esp_app_trace_membufs_proto.h"
+#include "esp_app_trace_port.h"
+#include "riscv/semihosting.h"
+
+/** RISCV HW transport data */
+typedef struct {
+    uint8_t                             inited; // initialization state flags for every core
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_lock_t                 lock;   // sync lock
+#endif
+    esp_apptrace_membufs_proto_data_t   membufs;
+} esp_apptrace_riscv_data_t;
+
+/** RISCV memory host iface control block */
+typedef struct {
+    uint32_t                    ctrl;
+    // - Guard field. If this register is not zero then CPU is changing this struct and
+    //   this guard field holds address of the instruction which application will execute when CPU finishes with those modifications.
+    uint32_t                    stat;
+    esp_apptrace_mem_block_t *  mem_blocks;
+} esp_apptrace_riscv_ctrl_block_t;
+
+#define ESP_APPTRACE_RISCV_BLOCK_LEN_MSK         0x7FFFUL
+#define ESP_APPTRACE_RISCV_BLOCK_LEN(_l_)        ((_l_) & ESP_APPTRACE_RISCV_BLOCK_LEN_MSK)
+#define ESP_APPTRACE_RISCV_BLOCK_LEN_GET(_v_)    ((_v_) & ESP_APPTRACE_RISCV_BLOCK_LEN_MSK)
+#define ESP_APPTRACE_RISCV_BLOCK_ID_MSK          0x7FUL
+#define ESP_APPTRACE_RISCV_BLOCK_ID(_id_)        (((_id_) & ESP_APPTRACE_RISCV_BLOCK_ID_MSK) << 15)
+#define ESP_APPTRACE_RISCV_BLOCK_ID_GET(_v_)     (((_v_) >> 15) & ESP_APPTRACE_RISCV_BLOCK_ID_MSK)
+#define ESP_APPTRACE_RISCV_HOST_DATA             (1 << 22)
+#define ESP_APPTRACE_RISCV_HOST_CONNECT          (1 << 23)
+
+#define ESP_APPTRACE_RISCV_INITED(_hw_)          ((_hw_)->inited & (1 << 0/*esp_cpu_get_core_id()*/))
+
+const static char *TAG = "esp_apptrace";
+
+#if SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE
+#define APPTRACE_DRAM_ATTR TCM_DRAM_ATTR
+#else
+#define APPTRACE_DRAM_ATTR
+#endif
+
+static APPTRACE_DRAM_ATTR esp_apptrace_riscv_ctrl_block_t s_tracing_ctrl[CONFIG_FREERTOS_NUMBER_OF_CORES];
+
+/* Advertises apptrace control block address to host.
+   This function can be overridden with custom implementation,
+   e.g. OpenOCD flasher stub use own implementation of it. */
+__attribute__((weak)) int esp_apptrace_advertise_ctrl_block(void *ctrl_block_addr)
+{
+    if (!esp_cpu_dbgr_is_attached()) {
+        return 0;
+    }
+    return (int) semihosting_call_noerrno(ESP_SEMIHOSTING_SYS_APPTRACE_INIT, (long*)ctrl_block_addr);
+}
+
+/* Returns up buffers config.
+   This function can be overridden with custom implementation,
+   e.g. OpenOCD flasher stub use own implementation of it. */
+__attribute__((weak)) void esp_apptrace_get_up_buffers(esp_apptrace_mem_block_t mem_blocks_cfg[2])
+{
+    static uint8_t s_mem_blocks[2][CONFIG_APPTRACE_BUF_SIZE];
+
+    mem_blocks_cfg[0].start = s_mem_blocks[0];
+    mem_blocks_cfg[0].sz = CONFIG_APPTRACE_BUF_SIZE;
+    mem_blocks_cfg[1].start = s_mem_blocks[1];
+    mem_blocks_cfg[1].sz = CONFIG_APPTRACE_BUF_SIZE;
+}
+
+static esp_err_t esp_apptrace_riscv_lock(void *hw_data, esp_apptrace_tmo_t *tmo)
+{
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+    esp_err_t ret = esp_apptrace_lock_take(&riscv_data->lock, tmo);
+    if (ret != ESP_OK) {
+        return ESP_FAIL;
+    }
+#endif
+    return ESP_OK;
+}
+
+static esp_err_t esp_apptrace_riscv_unlock(void *hw_data)
+{
+    esp_err_t ret = ESP_OK;
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+    ret = esp_apptrace_lock_give(&riscv_data->lock);
+#endif
+    return ret;
+}
+
+/*****************************************************************************************/
+/***************************** Apptrace HW iface *****************************************/
+/*****************************************************************************************/
+
+static esp_err_t esp_apptrace_riscv_init(void *hw_data, const esp_apptrace_config_t *config)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    /* esp_apptrace_riscv_init() is called on every core, so ensure to do main initialization only once */
+    int core_id = esp_cpu_get_core_id();
+    if (core_id == 0) {
+        esp_apptrace_mem_block_t mem_blocks_cfg[2];
+        esp_apptrace_get_up_buffers(mem_blocks_cfg);
+        riscv_data->membufs.header_size = ESP_APPTRACE_HEADER_SIZE_32;
+        esp_err_t res = esp_apptrace_membufs_init(&riscv_data->membufs, mem_blocks_cfg);
+        if (res != ESP_OK) {
+            ESP_APPTRACE_LOGE("Failed to init membufs proto (%d)!", res);
+            return res;
+        }
+#if CONFIG_APPTRACE_LOCK_ENABLE
+        esp_apptrace_lock_init(&riscv_data->lock);
+#endif
+    }
+    riscv_data->inited |= 1 << core_id;
+    ESP_APPTRACE_LOGI("Apptrace initialized on CPU%d. Tracing control block @ %p.", core_id, &s_tracing_ctrl[core_id]);
+    s_tracing_ctrl[core_id].mem_blocks = riscv_data->membufs.blocks;
+    for (int i = 0; i < 2; i++) {
+        ESP_APPTRACE_LOGD("Mem buf[%d] %" PRIu32 " bytes @ %p (%p/%p)", i,
+                          s_tracing_ctrl[core_id].mem_blocks[i].sz, s_tracing_ctrl[core_id].mem_blocks[i].start,
+                          &(s_tracing_ctrl[core_id].mem_blocks[i].start), &(s_tracing_ctrl[core_id].mem_blocks[i].sz));
+    }
+    // notify host about control block address
+    int __attribute__((unused)) res = esp_apptrace_advertise_ctrl_block(&s_tracing_ctrl[core_id]);
+    assert(res == 0 && "Failed to send config to host!");
+
+    return ESP_OK;
+}
+
+static uint8_t *esp_apptrace_riscv_up_buffer_get(void *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return NULL;
+    }
+    esp_err_t res = esp_apptrace_riscv_lock(riscv_data, tmo);
+    if (res != ESP_OK) {
+        return NULL;
+    }
+
+    uint8_t *ptr = esp_apptrace_membufs_up_buffer_get(&riscv_data->membufs, size, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_riscv_unlock(riscv_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return ptr;
+}
+
+static esp_err_t esp_apptrace_riscv_up_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    // Can avoid locking because esp_apptrace_membufs_up_buffer_put() just modifies buffer's header
+    esp_err_t res = esp_apptrace_membufs_up_buffer_put(&riscv_data->membufs, ptr, tmo);
+    return res;
+}
+
+static void esp_apptrace_riscv_down_buffer_config(void *hw_data, uint8_t *buf, uint32_t size)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return;
+    }
+    esp_apptrace_membufs_down_buffer_config(&riscv_data->membufs, buf, size);
+}
+
+static uint8_t *esp_apptrace_riscv_down_buffer_get(void *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return NULL;
+    }
+    esp_err_t res = esp_apptrace_riscv_lock(riscv_data, tmo);
+    if (res != ESP_OK) {
+        return NULL;
+    }
+
+    uint8_t *ptr = esp_apptrace_membufs_down_buffer_get(&riscv_data->membufs, size, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return ptr;
+}
+
+static esp_err_t esp_apptrace_riscv_down_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    // Can avoid locking because esp_apptrace_membufs_down_buffer_put() does nothing
+    /*esp_err_t res = esp_apptrace_riscv_lock(hw_data, tmo);
+    if (res != ESP_OK) {
+        return res;
+    }*/
+
+    esp_err_t res = esp_apptrace_membufs_down_buffer_put(&riscv_data->membufs, ptr, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    /*if (esp_apptrace_riscv_unlock(hw_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }*/
+    return res;
+}
+
+static bool esp_apptrace_riscv_host_is_connected(void *hw_data)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return false;
+    }
+    return s_tracing_ctrl[esp_cpu_get_core_id()].ctrl & ESP_APPTRACE_RISCV_HOST_CONNECT ? true : false;
+}
+
+static esp_err_t esp_apptrace_riscv_flush_nolock(void *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    return esp_apptrace_membufs_flush_nolock(&riscv_data->membufs, min_sz, tmo);
+}
+
+static esp_err_t esp_apptrace_riscv_flush(void *hw_data, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+
+    if (!ESP_APPTRACE_RISCV_INITED(riscv_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    esp_err_t res = esp_apptrace_riscv_lock(riscv_data, tmo);
+    if (res != ESP_OK) {
+        return res;
+    }
+
+    res = esp_apptrace_membufs_flush_nolock(&riscv_data->membufs, 0, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_riscv_unlock(riscv_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return res;
+}
+
+/*****************************************************************************************/
+/************************** Membufs proto HW iface ***************************************/
+/*****************************************************************************************/
+
+static inline void esp_apptrace_riscv_buffer_swap_lock(void)
+{
+    extern uint32_t __esp_apptrace_riscv_updated;
+
+    // indicate to host that we are about to update.
+    // this is used only to place CPU into streaming mode at tracing startup
+    // before starting streaming host can halt us after we read  ESP_APPTRACE_RISCV_CTRL_REG and before we updated it
+    // HACK: in this case host will set breakpoint just after ESP_APPTRACE_RISCV_CTRL_REG update,
+    // here we set address to set bp at
+    // enter ERI update critical section
+    s_tracing_ctrl[esp_cpu_get_core_id()].stat = (uint32_t)&__esp_apptrace_riscv_updated;
+}
+
+static __attribute__((noinline)) void esp_apptrace_riscv_buffer_swap_unlock(void)
+{
+    // exit ERI update critical section
+    s_tracing_ctrl[esp_cpu_get_core_id()].stat = 0;
+    // TODO: currently host sets breakpoint, use break instruction to stop;
+    // it will allow to use ESP_APPTRACE_RISCV_STAT_REG for other purposes
+    asm volatile(
+        "    .global     __esp_apptrace_riscv_updated\n"
+        "__esp_apptrace_riscv_updated:\n"); // host will set bp here to resolve collision at streaming start
+}
+
+static esp_err_t esp_apptrace_riscv_buffer_swap_start(uint32_t curr_block_id)
+{
+    esp_err_t res = ESP_OK;
+
+    esp_apptrace_riscv_buffer_swap_lock();
+
+    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
+    if (host_connected) {
+        uint32_t acked_block = ESP_APPTRACE_RISCV_BLOCK_ID_GET(ctrl_reg);
+        uint32_t host_to_read = ESP_APPTRACE_RISCV_BLOCK_LEN_GET(ctrl_reg);
+        if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK)) {
+            ESP_APPTRACE_LOGD("[%d]: Can not switch %" PRIx32 " %" PRIu32 " %" PRIx32 " %" PRIx32 "/%" PRIx32, esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
+                              curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK, curr_block_id);
+            res = ESP_ERR_NO_MEM;
+            goto _on_err;
+        }
+    }
+    return ESP_OK;
+_on_err:
+    esp_apptrace_riscv_buffer_swap_unlock();
+    return res;
+}
+
+static esp_err_t esp_apptrace_riscv_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len)
+{
+    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
+    s_tracing_ctrl[esp_cpu_get_core_id()].ctrl = ESP_APPTRACE_RISCV_BLOCK_ID(new_block_id) |
+                                                 host_connected | ESP_APPTRACE_RISCV_BLOCK_LEN(prev_block_len);
+    esp_apptrace_riscv_buffer_swap_unlock();
+    return ESP_OK;
+}
+
+static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id, uint32_t prev_block_len)
+{
+    /* do nothing */
+    return ESP_OK;
+}
+
+static bool esp_apptrace_riscv_host_data_pending(void)
+{
+    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    // ESP_APPTRACE_LOGV("%s() 0x%x", __func__, ctrl_reg);
+    return (ctrl_reg & ESP_APPTRACE_RISCV_HOST_DATA) ? true : false;
+}
+
+static void esp_apptrace_riscv_set_header_size(void *hw_data, esp_apptrace_header_size_t header_size)
+{
+    esp_apptrace_riscv_data_t *riscv_data = hw_data;
+    riscv_data->membufs.header_size = header_size;
+}
+
+esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
+{
+    static esp_apptrace_membufs_proto_hw_t s_trace_proto_hw = {
+        .swap_start = esp_apptrace_riscv_buffer_swap_start,
+        .swap = esp_apptrace_riscv_buffer_swap,
+        .swap_end = esp_apptrace_riscv_buffer_swap_end,
+        .host_data_pending = esp_apptrace_riscv_host_data_pending,
+    };
+    static esp_apptrace_riscv_data_t s_trace_hw_data = {
+        .membufs = {
+            .hw = &s_trace_proto_hw,
+        },
+    };
+    static esp_apptrace_hw_t s_trace_hw = {
+        .init = esp_apptrace_riscv_init,
+        .get_up_buffer = esp_apptrace_riscv_up_buffer_get,
+        .put_up_buffer = esp_apptrace_riscv_up_buffer_put,
+        .flush_up_buffer_nolock = esp_apptrace_riscv_flush_nolock,
+        .flush_up_buffer = esp_apptrace_riscv_flush,
+        .down_buffer_config = esp_apptrace_riscv_down_buffer_config,
+        .get_down_buffer = esp_apptrace_riscv_down_buffer_get,
+        .put_down_buffer = esp_apptrace_riscv_down_buffer_put,
+        .host_is_connected = esp_apptrace_riscv_host_is_connected,
+        .set_header_size = esp_apptrace_riscv_set_header_size,
+    };
+    *data = &s_trace_hw_data;
+    return &s_trace_hw;
+}

components/app_trace/port/xtensa/port.c

@@ -1,552 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
-
-//
-// How It Works
-// ************
-
-// 1. Components Overview
-// ======================
-
-// Xtensa has useful feature: TRAX debug module. It allows recording program execution flow at run-time without disturbing CPU.
-// Execution flow data are written to configurable Trace RAM block. Besides accessing Trace RAM itself TRAX module also allows to read/write
-// trace memory via its registers by means of JTAG, APB or ERI transactions.
-// ESP32 has two Xtensa cores with separate TRAX modules on them and provides two special memory regions to be used as trace memory.
-// Chip allows muxing access to those trace memory blocks in such a way that while one block is accessed by CPUs another one can be accessed by host
-// by means of reading/writing TRAX registers via JTAG. Blocks muxing is configurable at run-time and allows switching trace memory blocks between
-// accessors in round-robin fashion so they can read/write separate memory blocks without disturbing each other.
-// This module implements application tracing feature based on above mechanisms. It allows to transfer arbitrary user data to/from
-// host via JTAG with minimal impact on system performance. This module is implied to be used in the following tracing scheme.
-
-//                                                        ------>------                                         ----- (host components) -----
-//                                                        |           |                                         |                           |
-// -------------------   -----------------------     -----------------------     ----------------    ------     ---------   -----------------
-// |trace data source|-->|target tracing module|<--->|TRAX_MEM0 | TRAX_MEM1|---->|TRAX_DATA_REGS|<-->|JTAG|<--->|OpenOCD|-->|trace data sink|
-// -------------------   -----------------------     -----------------------     ----------------    ------     ---------   -----------------
-//                                 |                      |           |                                |
-//                                 |                      ------<------          ----------------      |
-//                                 |<------------------------------------------->|TRAX_CTRL_REGS|<---->|
-//                                                                               ----------------
-
-// In general tracing goes in the following way. User application requests tracing module to send some data by calling esp_apptrace_buffer_get(),
-// module allocates necessary buffer in current input trace block. Then user fills received buffer with data and calls esp_apptrace_buffer_put().
-// When current input trace block is filled with app data it is exposed to host and the second block becomes input one and buffer filling restarts.
-// While target application fills one TRAX block host reads another one via JTAG.
-// This module also allows communication in the opposite direction: from host to target. As it was said ESP32 and host can access different TRAX blocks
-// simultaneously, so while target writes trace data to one block host can write its own data (e.g. tracing commands) to another one then when
-// blocks are switched host receives trace data and target receives data written by host application. Target user application can read host data
-// by calling esp_apptrace_read() API.
-// To control buffer switching and for other communication purposes this implementation uses some TRAX registers. It is safe since HW TRAX tracing
-// can not be used along with application tracing feature so these registers are freely readable/writeable via JTAG from host and via ERI from ESP32 cores.
-// Overhead of this implementation on target CPU is produced only by allocating/managing buffers and copying of data.
-// On the host side special OpenOCD command must be used to read trace data.
-
-// 2. TRAX Registers layout
-// ========================
-
-// This module uses two TRAX HW registers and one Performance Monitor register to communicate with host SW (OpenOCD).
-//  - Control register uses TRAX_DELAYCNT as storage. Only lower 24 bits of TRAX_DELAYCNT are writable. Control register has the following bitfields:
-//   | 31..XXXXXX..24 | 23 .(host_connect). 23| 22..(block_id)..15 | 14..(block_len)..0 |
-//    14..0  bits - actual length of user data in trace memory block. Target updates it every time it fills memory block and exposes it to host.
-//                  Host writes zero to this field when it finishes reading exposed block;
-//    21..15 bits - trace memory block transfer ID. Block counter. It can overflow. Updated by target, host should not modify it. Actually can be 2 bits;
-//    22     bit  - 'host data present' flag. If set to one there is data from host, otherwise - no host data;
-//    23     bit  - 'host connected' flag. If zero then host is not connected and tracing module works in post-mortem mode, otherwise in streaming mode;
-//  - Status register uses TRAX_TRIGGERPC as storage. If this register is not zero then current CPU is changing TRAX registers and
-//    this register holds address of the instruction which application will execute when it finishes with those registers modifications.
-//    See 'Targets Connection' section for details.
-//  - CRC16 register uses ERI_PERFMON_PM1 as storage. This register is used to store CRC16 checksum of the exposed trace memory block.
-//    The register has the following format:
-//    | 31..16 (CRC indicator) | 15..0 (CRC16 value) |
-//    CRC indicator (0xA55A) is used to distinguish valid CRC values from other data that might be in the register.
-//    CRC16 is calculated over the entire exposed block and is updated every time a block is exposed to the host.
-//    This allows the host to verify data integrity of the received trace data.
-
-// 3. Modes of operation
-// =====================
-
-// This module supports two modes of operation:
-//  - Post-mortem mode. This is the default mode. In this mode application tracing module does not check whether host has read all the data from block
-//    exposed to it and switches block in any case. The mode does not need host interaction for operation and so can be useful when only the latest
-//    trace data are necessary, e.g. for analyzing crashes. On panic the latest data from current input block are exposed to host and host can read them.
-//    It can happen that system panic occurs when there are very small amount of data which are not exposed to host yet (e.g. crash just after the
-//    TRAX block switch). In this case the previous 16KB of collected data will be dropped and host will see the latest, but very small piece of trace.
-//    It can be insufficient to diagnose the problem. To avoid such situations there is menuconfig option
-//    CONFIG_APPTRACE_POSTMORTEM_FLUSH_THRESH
-//    which controls the threshold for flushing data in case of panic.
-//  - Streaming mode. Tracing module enters this mode when host connects to target and sets respective bits in control registers (per core).
-//    In this mode before switching the block tracing module waits for the host to read all the data from the previously exposed block.
-//    On panic tracing module also waits (timeout is configured via menuconfig via CONFIG_APPTRACE_ONPANIC_HOST_FLUSH_TMO) for the host to read all data.
-
-// 4. Communication Protocol
-// =========================
-
-// 4.1 Trace Memory Blocks
-// -----------------------
-
-// Communication is controlled via special register. Host periodically polls control register on each core to find out if there are any data available.
-// When current input memory block is filled it is exposed to host and 'block_len' and 'block_id' fields are updated in the control register.
-// Host reads new register value and according to it's value starts reading data from exposed block. Meanwhile target starts filling another trace block.
-// When host finishes reading the block it clears 'block_len' field in control register indicating to the target that it is ready to accept the next one.
-// If the host has some data to transfer to the target it writes them to trace memory block before clearing 'block_len' field. Then it sets
-// 'host_data_present' bit and clears 'block_len' field in control register. Upon every block switch target checks 'host_data_present' bit and if it is set
-// reads them to down buffer before writing any trace data to switched TRAX block.
-
-// 4.2 User Data Chunks Level
-// --------------------------
-
-// Since trace memory block is shared between user data chunks and data copying is performed on behalf of the API user (in its normal context) in
-// multithreading environment it can happen that task/ISR which copies data is preempted by another high prio task/ISR. So it is possible situation
-// that task/ISR will fail to complete filling its data chunk before the whole trace block is exposed to the host. To handle such conditions tracing
-// module prepends all user data chunks with header which contains allocated buffer size and actual data length within it. OpenOCD command
-// which reads application traces reports error when it reads incomplete user data block.
-// Data which are transffered from host to target are also prepended with a header. Down channel data header is simple and consists of one two bytes field
-// containing length of host data following the header.
-
-// 4.3 Data Buffering
-// ------------------
-
-// It takes some time for the host to read TRAX memory block via JTAG. In streaming mode it can happen that target has filled its TRAX block, but host
-// has not completed reading of the previous one yet. So in this case time critical tracing calls (which can not be delayed for too long time due to
-// the lack of free memory in TRAX block) can be dropped. To avoid such scenarios tracing module implements data buffering. Buffered data will be sent
-// to the host later when TRAX block switch occurs. The maximum size of the buffered data is controlled by menuconfig option
-// CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX.
-
-// 4.4 Target Connection/Disconnection
-// -----------------------------------
-
-// When host is going to start tracing in streaming mode it needs to put both ESP32 cores into initial state when 'host connected' bit is set
-// on both cores. To accomplish this host halts both cores and sets this bit in TRAX registers. But target code can be halted in state when it has read control
-// register but has not updated its value. To handle such situations target code indicates to the host that it is updating control register by writing
-// non-zero value to status register. Actually it writes address of the instruction which it will execute when it finishes with
-// the registers update. When target is halted during control register update host sets breakpoint at the address from status register and resumes CPU.
-// After target code finishes with register update it is halted on breakpoint, host detects it and safely sets 'host connected' bit. When both cores
-// are set up they are resumed. Tracing starts without further intrusion into CPUs work.
-// When host is going to stop tracing in streaming mode it needs to disconnect targets. Disconnection process is done using the same algorithm
-// as for connecting, but 'host connected' bits are cleared on ESP32 cores.
-
-// 5. Module Access Synchronization
-// ================================
-
-// Access to internal module's data is synchronized with custom mutex. Mutex is a wrapper for portMUX_TYPE and uses almost the same sync mechanism as in
-// vPortCPUAcquireMutex/vPortCPUReleaseMutex. The mechanism uses S32C1I Xtensa instruction to implement exclusive access to module's data from tasks and
-// ISRs running on both cores. Also custom mutex allows specifying timeout for locking operation. Locking routine checks underlying mutex in cycle until
-// it gets its ownership or timeout expires. The differences of application tracing module's mutex implementation from vPortCPUAcquireMutex/vPortCPUReleaseMutex are:
-// - Support for timeouts.
-// - Local IRQs for CPU which owns the mutex are disabled till the call to unlocking routine. This is made to avoid possible task's prio inversion.
-//   When low prio task takes mutex and enables local IRQs gets preempted by high prio task which in its turn can try to acquire mutex using infinite timeout.
-//   So no local task switch occurs when mutex is locked. But this does not apply to tasks on another CPU.
-//   WARNING: Priority inversion can happen when low prio task works on one CPU and medium and high prio tasks work on another.
-// WARNING: Care must be taken when selecting timeout values for trace calls from ISRs. Tracing module does not care about watchdogs when waiting
-// on internal locks and for host to complete previous block reading, so if timeout value exceeds watchdog's one it can lead to the system reboot.
-
-// 6. Timeouts
-// ===========
-
-// Timeout mechanism is based on xthal_get_ccount() routine and supports timeout values in microseconds.
-// There are two situations when task/ISR can be delayed by tracing API call. Timeout mechanism takes into account both conditions:
-// - Trace data are locked by another task/ISR. When waiting on trace data lock.
-// - Current TRAX memory input block is full when working in streaming mode (host is connected). When waiting for host to complete previous block reading.
-// When waiting for any of above conditions xthal_get_ccount() is called periodically to calculate time elapsed from trace API routine entry. When elapsed
-// time exceeds specified timeout value operation is canceled and ESP_ERR_TIMEOUT code is returned.
-#include "sdkconfig.h"
-#include "soc/soc.h"
-#include "soc/dport_reg.h"
-#include "soc/tracemem_config.h"
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-#include "soc/sensitive_reg.h"
-#endif
-#include "eri.h"
-#include "esp_private/trax.h"
-#include "esp_cpu.h"
-#include "esp_log.h"
-#include "esp_app_trace_membufs_proto.h"
-#include "esp_app_trace_port.h"
-#include "esp_rom_crc.h"
-
-// TRAX is disabled, so we use its registers for our own purposes
-// | 31..XXXXXX..24 | 23 .(host_connect). 23 | 22 .(host_data). 22| 21..(block_id)..15 | 14..(block_len)..0 |
-#define ESP_APPTRACE_TRAX_CTRL_REG              ERI_TRAX_DELAYCNT
-#define ESP_APPTRACE_TRAX_STAT_REG              ERI_TRAX_TRIGGERPC
-#define ESP_APPTRACE_TRAX_CRC16_REG             ERI_PERFMON_PM1
-
-#define ESP_APPTRACE_CRC_INDICATOR              (0xA55AU << 16)
-
-#define ESP_APPTRACE_TRAX_BLOCK_LEN_MSK         0x7FFFUL
-#define ESP_APPTRACE_TRAX_BLOCK_LEN(_l_)        ((_l_) & ESP_APPTRACE_TRAX_BLOCK_LEN_MSK)
-#define ESP_APPTRACE_TRAX_BLOCK_LEN_GET(_v_)    ((_v_) & ESP_APPTRACE_TRAX_BLOCK_LEN_MSK)
-#define ESP_APPTRACE_TRAX_BLOCK_ID_MSK          0x7FUL
-#define ESP_APPTRACE_TRAX_BLOCK_ID(_id_)        (((_id_) & ESP_APPTRACE_TRAX_BLOCK_ID_MSK) << 15)
-#define ESP_APPTRACE_TRAX_BLOCK_ID_GET(_v_)     (((_v_) >> 15) & ESP_APPTRACE_TRAX_BLOCK_ID_MSK)
-#define ESP_APPTRACE_TRAX_HOST_DATA             (1 << 22)
-#define ESP_APPTRACE_TRAX_HOST_CONNECT          (1 << 23)
-
-#define ESP_APPTRACE_TRAX_INITED(_hw_)          ((_hw_)->inited & (1 << esp_cpu_get_core_id()))
-
-#define ESP_APPTRACE_TRAX_BLOCK_SIZE            (0x4000UL)
-
-/** TRAX HW transport data */
-typedef struct {
-    uint8_t                             inited;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_apptrace_lock_t                 lock;   // sync lock
-#endif
-    esp_apptrace_membufs_proto_data_t   membufs;
-} esp_apptrace_trax_data_t;
-
-
-static esp_err_t esp_apptrace_trax_init(esp_apptrace_trax_data_t *hw_data);
-static esp_err_t esp_apptrace_trax_flush(esp_apptrace_trax_data_t *hw_data, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_trax_flush_nolock(esp_apptrace_trax_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo);
-static uint8_t *esp_apptrace_trax_up_buffer_get(esp_apptrace_trax_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_trax_up_buffer_put(esp_apptrace_trax_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static void esp_apptrace_trax_down_buffer_config(esp_apptrace_trax_data_t *hw_data, uint8_t *buf, uint32_t size);
-static uint8_t *esp_apptrace_trax_down_buffer_get(esp_apptrace_trax_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_trax_down_buffer_put(esp_apptrace_trax_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static bool esp_apptrace_trax_host_is_connected(esp_apptrace_trax_data_t *hw_data);
-static esp_err_t esp_apptrace_trax_buffer_swap_start(uint32_t curr_block_id);
-static esp_err_t esp_apptrace_trax_buffer_swap(uint32_t new_block_id);
-static esp_err_t esp_apptrace_trax_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len);
-static bool esp_apptrace_trax_host_data_pending(void);
-
-
-const static char *TAG = "esp_apptrace";
-
-static uint8_t * const s_trax_blocks[] = {
-    (uint8_t *)TRACEMEM_BLK0_ADDR,
-    (uint8_t *)TRACEMEM_BLK1_ADDR
-};
-
-esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
-{
-#if CONFIG_APPTRACE_DEST_JTAG
-    static esp_apptrace_membufs_proto_hw_t s_trax_proto_hw = {
-        .swap_start = esp_apptrace_trax_buffer_swap_start,
-        .swap = esp_apptrace_trax_buffer_swap,
-        .swap_end = esp_apptrace_trax_buffer_swap_end,
-        .host_data_pending = esp_apptrace_trax_host_data_pending,
-    };
-    static esp_apptrace_trax_data_t s_trax_hw_data = {
-        .membufs = {
-            .hw = &s_trax_proto_hw,
-        },
-    };
-    static esp_apptrace_hw_t s_trax_hw = {
-        .init = (esp_err_t (*)(void *))esp_apptrace_trax_init,
-        .get_up_buffer = (uint8_t *(*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_trax_up_buffer_get,
-        .put_up_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_trax_up_buffer_put,
-        .flush_up_buffer_nolock = (esp_err_t (*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_trax_flush_nolock,
-        .flush_up_buffer = (esp_err_t (*)(void *, esp_apptrace_tmo_t *))esp_apptrace_trax_flush,
-        .down_buffer_config = (void (*)(void *, uint8_t *, uint32_t ))esp_apptrace_trax_down_buffer_config,
-        .get_down_buffer = (uint8_t *(*)(void *, uint32_t *, esp_apptrace_tmo_t *))esp_apptrace_trax_down_buffer_get,
-        .put_down_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_trax_down_buffer_put,
-        .host_is_connected = (bool (*)(void *))esp_apptrace_trax_host_is_connected,
-    };
-    *data = &s_trax_hw_data;
-    return &s_trax_hw;
-#else
-    return NULL;
-#endif
-}
-
-static esp_err_t esp_apptrace_trax_lock(esp_apptrace_trax_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_err_t ret = esp_apptrace_lock_take(&hw_data->lock, tmo);
-    if (ret != ESP_OK) {
-        return ESP_FAIL;
-    }
-#endif
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_trax_unlock(esp_apptrace_trax_data_t *hw_data)
-{
-    esp_err_t ret = ESP_OK;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    ret = esp_apptrace_lock_give(&hw_data->lock);
-#endif
-    return ret;
-}
-
-static inline void esp_apptrace_trax_hw_init(void)
-{
-    // Stop trace, if any (on the current CPU)
-    eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TRSTP);
-    eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TMEN);
-    eri_write(ESP_APPTRACE_TRAX_CTRL_REG, ESP_APPTRACE_TRAX_BLOCK_ID(0));
-    // this is for OpenOCD to let him know where stub entries vector is resided
-    // must be read by host before any transfer using TRAX
-    eri_write(ESP_APPTRACE_TRAX_STAT_REG, 0);
-
-    ESP_APPTRACE_LOGI("Initialized TRAX on CPU%d", esp_cpu_get_core_id());
-}
-
-static inline void esp_apptrace_trax_select_memory_block(int block_num)
-{
-    // select memory block to be exposed to the TRAX module (accessed by host)
-#if CONFIG_IDF_TARGET_ESP32
-    DPORT_WRITE_PERI_REG(DPORT_TRACEMEM_MUX_MODE_REG, block_num ? TRACEMEM_MUX_BLK0_ONLY : TRACEMEM_MUX_BLK1_ONLY);
-#elif CONFIG_IDF_TARGET_ESP32S2
-    WRITE_PERI_REG(DPORT_PMS_OCCUPY_3_REG, block_num ? BIT(TRACEMEM_MUX_BLK0_NUM-4) : BIT(TRACEMEM_MUX_BLK1_NUM-4));
-#elif CONFIG_IDF_TARGET_ESP32S3
-    // select memory block to be exposed to the TRAX module (accessed by host)
-    uint32_t block_bits = block_num ? TRACEMEM_CORE0_MUX_BLK_BITS(TRACEMEM_MUX_BLK0_NUM)
-                        : TRACEMEM_CORE0_MUX_BLK_BITS(TRACEMEM_MUX_BLK1_NUM);
-    block_bits |= block_num ? TRACEMEM_CORE1_MUX_BLK_BITS(TRACEMEM_MUX_BLK0_NUM)
-                        : TRACEMEM_CORE1_MUX_BLK_BITS(TRACEMEM_MUX_BLK1_NUM);
-    ESP_EARLY_LOGV(TAG, "Select block %d @ %p (bits 0x%" PRIx32 ")", block_num, s_trax_blocks[block_num], block_bits);
-    DPORT_WRITE_PERI_REG(SENSITIVE_INTERNAL_SRAM_USAGE_2_REG, block_bits);
-#endif
-}
-
-static inline void esp_apptrace_trax_memory_enable(void)
-{
-#if CONFIG_IDF_TARGET_ESP32
-        /* Enable trace memory on PRO CPU */
-        DPORT_WRITE_PERI_REG(DPORT_PRO_TRACEMEM_ENA_REG, DPORT_PRO_TRACEMEM_ENA_M);
-#if CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE == 0
-        /* Enable trace memory on APP CPU */
-        DPORT_WRITE_PERI_REG(DPORT_APP_TRACEMEM_ENA_REG, DPORT_APP_TRACEMEM_ENA_M);
-#endif
-#endif
-}
-
-/*****************************************************************************************/
-/***************************** Apptrace HW iface *****************************************/
-/*****************************************************************************************/
-
-static esp_err_t esp_apptrace_trax_init(esp_apptrace_trax_data_t *hw_data)
-{
-    int core_id = esp_cpu_get_core_id();
-
-    // 'esp_apptrace_trax_init()' is called on every core, so ensure to do main initialization only once
-    if (core_id == 0) {
-        esp_apptrace_mem_block_t mem_blocks_cfg[2] = {
-            {
-                .start = s_trax_blocks[0],
-                .sz = ESP_APPTRACE_TRAX_BLOCK_SIZE
-            },
-            {
-                .start = s_trax_blocks[1],
-                .sz = ESP_APPTRACE_TRAX_BLOCK_SIZE
-            },
-        };
-        esp_err_t res = esp_apptrace_membufs_init(&hw_data->membufs, mem_blocks_cfg);
-        if (res != ESP_OK) {
-            ESP_APPTRACE_LOGE("Failed to init membufs proto (%d)!", res);
-            return res;
-        }
-#if CONFIG_APPTRACE_LOCK_ENABLE
-        esp_apptrace_lock_init(&hw_data->lock);
-#endif
-        esp_apptrace_trax_memory_enable();
-        esp_apptrace_trax_select_memory_block(0);
-    }
-    // init TRAX on this CPU
-    esp_apptrace_trax_hw_init();
-    hw_data->inited |= 1 << core_id;
-
-    return ESP_OK;
-}
-
-static uint8_t *esp_apptrace_trax_up_buffer_get(esp_apptrace_trax_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr;
-
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_trax_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    ptr = esp_apptrace_membufs_up_buffer_get(&hw_data->membufs, size, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_trax_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_trax_up_buffer_put(esp_apptrace_trax_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    // Can avoid locking because esp_apptrace_membufs_up_buffer_put() just modifies buffer's header
-    esp_err_t res = esp_apptrace_membufs_up_buffer_put(&hw_data->membufs, ptr, tmo);
-    return res;
-}
-
-static void esp_apptrace_trax_down_buffer_config(esp_apptrace_trax_data_t *hw_data, uint8_t *buf, uint32_t size)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return;
-    }
-    esp_apptrace_membufs_down_buffer_config(&hw_data->membufs, buf, size);
-}
-
-static uint8_t *esp_apptrace_trax_down_buffer_get(esp_apptrace_trax_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr;
-
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_trax_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    ptr = esp_apptrace_membufs_down_buffer_get(&hw_data->membufs, size, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_trax_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_trax_down_buffer_put(esp_apptrace_trax_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    // Can avoid locking because esp_apptrace_membufs_down_buffer_put() does nothing
-    /*esp_err_t res = esp_apptrace_trax_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return res;
-    }*/
-
-    esp_err_t res = esp_apptrace_membufs_down_buffer_put(&hw_data->membufs, ptr, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    /*if (esp_apptrace_trax_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }*/
-    return res;
-}
-
-static bool esp_apptrace_trax_host_is_connected(esp_apptrace_trax_data_t *hw_data)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return false;
-    }
-    return eri_read(ESP_APPTRACE_TRAX_CTRL_REG) & ESP_APPTRACE_TRAX_HOST_CONNECT ? true : false;
-}
-
-static esp_err_t esp_apptrace_trax_flush_nolock(esp_apptrace_trax_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    return esp_apptrace_membufs_flush_nolock(&hw_data->membufs, min_sz, tmo);
-}
-
-static esp_err_t esp_apptrace_trax_flush(esp_apptrace_trax_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-    if (!ESP_APPTRACE_TRAX_INITED(hw_data)) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    esp_err_t res = esp_apptrace_trax_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return res;
-    }
-
-    res = esp_apptrace_membufs_flush_nolock(&hw_data->membufs, 0, tmo);
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_trax_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return res;
-}
-
-/*****************************************************************************************/
-/************************** Membufs proto HW iface ***************************************/
-/*****************************************************************************************/
-
-static inline void esp_apptrace_trax_buffer_swap_lock(void)
-{
-    extern uint32_t __esp_apptrace_trax_eri_updated;
-
-    // indicate to host that we are about to update.
-    // this is used only to place CPU into streaming mode at tracing startup
-    // before starting streaming host can halt us after we read  ESP_APPTRACE_TRAX_CTRL_REG and before we updated it
-    // HACK: in this case host will set breakpoint just after ESP_APPTRACE_TRAX_CTRL_REG update,
-    // here we set address to set bp at
-    // enter ERI update critical section
-    eri_write(ESP_APPTRACE_TRAX_STAT_REG, (uint32_t)&__esp_apptrace_trax_eri_updated);
-}
-
-static __attribute__((noinline)) void esp_apptrace_trax_buffer_swap_unlock(void)
-{
-    // exit ERI update critical section
-    eri_write(ESP_APPTRACE_TRAX_STAT_REG, 0x0);
-    // TODO: currently host sets breakpoint, use break instruction to stop;
-    // it will allow to use ESP_APPTRACE_TRAX_STAT_REG for other purposes
-    asm volatile (
-        "    .global     __esp_apptrace_trax_eri_updated\n"
-        "__esp_apptrace_trax_eri_updated:\n"); // host will set bp here to resolve collision at streaming start
-}
-
-static esp_err_t esp_apptrace_trax_buffer_swap_start(uint32_t curr_block_id)
-{
-    esp_err_t res = ESP_OK;
-
-    esp_apptrace_trax_buffer_swap_lock();
-
-    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
-    uint32_t host_connected = ESP_APPTRACE_TRAX_HOST_CONNECT & ctrl_reg;
-    if (host_connected) {
-        uint32_t acked_block = ESP_APPTRACE_TRAX_BLOCK_ID_GET(ctrl_reg);
-        uint32_t host_to_read = ESP_APPTRACE_TRAX_BLOCK_LEN_GET(ctrl_reg);
-        if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK)) {
-            ESP_APPTRACE_LOGD("HC[%d]: Can not switch %" PRIx32 " %" PRIu32 " %" PRIx32 " %" PRIx32 "/%" PRIx32,
-                esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
-                curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK, curr_block_id);
-            res = ESP_ERR_NO_MEM;
-            goto _on_err;
-        }
-    }
-    return ESP_OK;
-_on_err:
-    esp_apptrace_trax_buffer_swap_unlock();
-    return res;
-}
-
-static esp_err_t esp_apptrace_trax_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len)
-{
-    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
-    uint32_t host_connected = ESP_APPTRACE_TRAX_HOST_CONNECT & ctrl_reg;
-
-    /* calculate CRC16 of the already switched block */
-    if (prev_block_len > 0) {
-        const uint8_t *prev_block_start = s_trax_blocks[!((new_block_id % 2))];
-        uint16_t crc16 = esp_rom_crc16_le(0, prev_block_start, prev_block_len);
-        eri_write(ESP_APPTRACE_TRAX_CRC16_REG, crc16 | ESP_APPTRACE_CRC_INDICATOR);
-        ESP_APPTRACE_LOGD("CRC16:%x %d @%x", crc16, prev_block_len, prev_block_start);
-    }
-    eri_write(ESP_APPTRACE_TRAX_CTRL_REG, ESP_APPTRACE_TRAX_BLOCK_ID(new_block_id) |
-              host_connected | ESP_APPTRACE_TRAX_BLOCK_LEN(prev_block_len));
-    esp_apptrace_trax_buffer_swap_unlock();
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_trax_buffer_swap(uint32_t new_block_id)
-{
-    esp_apptrace_trax_select_memory_block(new_block_id);
-    return ESP_OK;
-}
-
-static bool esp_apptrace_trax_host_data_pending(void)
-{
-    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
-    return (ctrl_reg & ESP_APPTRACE_TRAX_HOST_DATA) ? true : false;
-}

components/app_trace/port/xtensa/port_jtag.c

@@ -0,0 +1,546 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ */
+
+//
+// How It Works
+// ************
+
+// 1. Components Overview
+// ======================
+
+// Xtensa has useful feature: TRAX debug module. It allows recording program execution flow at run-time without disturbing CPU.
+// Execution flow data are written to configurable Trace RAM block. Besides accessing Trace RAM itself TRAX module also allows to read/write
+// trace memory via its registers by means of JTAG, APB or ERI transactions.
+// ESP32 has two Xtensa cores with separate TRAX modules on them and provides two special memory regions to be used as trace memory.
+// Chip allows muxing access to those trace memory blocks in such a way that while one block is accessed by CPUs another one can be accessed by host
+// by means of reading/writing TRAX registers via JTAG. Blocks muxing is configurable at run-time and allows switching trace memory blocks between
+// accessors in round-robin fashion so they can read/write separate memory blocks without disturbing each other.
+// This module implements application tracing feature based on above mechanisms. It allows to transfer arbitrary user data to/from
+// host via JTAG with minimal impact on system performance. This module is implied to be used in the following tracing scheme.
+
+//                                                        ------>------                                         ----- (host components) -----
+//                                                        |           |                                         |                           |
+// -------------------   -----------------------     -----------------------     ----------------    ------     ---------   -----------------
+// |trace data source|-->|target tracing module|<--->|TRAX_MEM0 | TRAX_MEM1|---->|TRAX_DATA_REGS|<-->|JTAG|<--->|OpenOCD|-->|trace data sink|
+// -------------------   -----------------------     -----------------------     ----------------    ------     ---------   -----------------
+//                                 |                      |           |                                |
+//                                 |                      ------<------          ----------------      |
+//                                 |<------------------------------------------->|TRAX_CTRL_REGS|<---->|
+//                                                                               ----------------
+
+// In general tracing goes in the following way. User application requests tracing module to send some data by calling esp_apptrace_buffer_get(),
+// module allocates necessary buffer in current input trace block. Then user fills received buffer with data and calls esp_apptrace_buffer_put().
+// When current input trace block is filled with app data it is exposed to host and the second block becomes input one and buffer filling restarts.
+// While target application fills one TRAX block host reads another one via JTAG.
+// This module also allows communication in the opposite direction: from host to target. As it was said ESP32 and host can access different TRAX blocks
+// simultaneously, so while target writes trace data to one block host can write its own data (e.g. tracing commands) to another one then when
+// blocks are switched host receives trace data and target receives data written by host application. Target user application can read host data
+// by calling esp_apptrace_read() API.
+// To control buffer switching and for other communication purposes this implementation uses some TRAX registers. It is safe since HW TRAX tracing
+// can not be used along with application tracing feature so these registers are freely readable/writeable via JTAG from host and via ERI from ESP32 cores.
+// Overhead of this implementation on target CPU is produced only by allocating/managing buffers and copying of data.
+// On the host side special OpenOCD command must be used to read trace data.
+
+// 2. TRAX Registers layout
+// ========================
+
+// This module uses two TRAX HW registers and one Performance Monitor register to communicate with host SW (OpenOCD).
+//  - Control register uses TRAX_DELAYCNT as storage. Only lower 24 bits of TRAX_DELAYCNT are writable. Control register has the following bitfields:
+//   | 31..XXXXXX..24 | 23 .(host_connect). 23| 22..(block_id)..15 | 14..(block_len)..0 |
+//    14..0  bits - actual length of user data in trace memory block. Target updates it every time it fills memory block and exposes it to host.
+//                  Host writes zero to this field when it finishes reading exposed block;
+//    21..15 bits - trace memory block transfer ID. Block counter. It can overflow. Updated by target, host should not modify it. Actually can be 2 bits;
+//    22     bit  - 'host data present' flag. If set to one there is data from host, otherwise - no host data;
+//    23     bit  - 'host connected' flag. If zero then host is not connected and tracing module works in post-mortem mode, otherwise in streaming mode;
+//  - Status register uses TRAX_TRIGGERPC as storage. If this register is not zero then current CPU is changing TRAX registers and
+//    this register holds address of the instruction which application will execute when it finishes with those registers modifications.
+//    See 'Targets Connection' section for details.
+//  - CRC16 register uses ERI_PERFMON_PM1 as storage. This register is used to store CRC16 checksum of the exposed trace memory block.
+//    The register has the following format:
+//    | 31..16 (CRC indicator) | 15..0 (CRC16 value) |
+//    CRC indicator (0xA55A) is used to distinguish valid CRC values from other data that might be in the register.
+//    CRC16 is calculated over the entire exposed block and is updated every time a block is exposed to the host.
+//    This allows the host to verify data integrity of the received trace data.
+
+// 3. Modes of operation
+// =====================
+
+// This module supports two modes of operation:
+//  - Post-mortem mode. This is the default mode. In this mode application tracing module does not check whether host has read all the data from block
+//    exposed to it and switches block in any case. The mode does not need host interaction for operation and so can be useful when only the latest
+//    trace data are necessary, e.g. for analyzing crashes. On panic the latest data from current input block are exposed to host and host can read them.
+//    It can happen that system panic occurs when there are very small amount of data which are not exposed to host yet (e.g. crash just after the
+//    TRAX block switch). In this case the previous 16KB of collected data will be dropped and host will see the latest, but very small piece of trace.
+//    It can be insufficient to diagnose the problem. To avoid such situations there is menuconfig option
+//    CONFIG_APPTRACE_POSTMORTEM_FLUSH_THRESH
+//    which controls the threshold for flushing data in case of panic.
+//  - Streaming mode. Tracing module enters this mode when host connects to target and sets respective bits in control registers (per core).
+//    In this mode before switching the block tracing module waits for the host to read all the data from the previously exposed block.
+//    On panic tracing module also waits (timeout is configured via menuconfig via CONFIG_APPTRACE_ONPANIC_HOST_FLUSH_TMO) for the host to read all data.
+
+// 4. Communication Protocol
+// =========================
+
+// 4.1 Trace Memory Blocks
+// -----------------------
+
+// Communication is controlled via special register. Host periodically polls control register on each core to find out if there are any data available.
+// When current input memory block is filled it is exposed to host and 'block_len' and 'block_id' fields are updated in the control register.
+// Host reads new register value and according to it's value starts reading data from exposed block. Meanwhile target starts filling another trace block.
+// When host finishes reading the block it clears 'block_len' field in control register indicating to the target that it is ready to accept the next one.
+// If the host has some data to transfer to the target it writes them to trace memory block before clearing 'block_len' field. Then it sets
+// 'host_data_present' bit and clears 'block_len' field in control register. Upon every block switch target checks 'host_data_present' bit and if it is set
+// reads them to down buffer before writing any trace data to switched TRAX block.
+
+// 4.2 User Data Chunks Level
+// --------------------------
+
+// Since trace memory block is shared between user data chunks and data copying is performed on behalf of the API user (in its normal context) in
+// multithreading environment it can happen that task/ISR which copies data is preempted by another high prio task/ISR. So it is possible situation
+// that task/ISR will fail to complete filling its data chunk before the whole trace block is exposed to the host. To handle such conditions tracing
+// module prepends all user data chunks with header which contains allocated buffer size and actual data length within it. OpenOCD command
+// which reads application traces reports error when it reads incomplete user data block.
+// Data which are transffered from host to target are also prepended with a header. Down channel data header is simple and consists of one two bytes field
+// containing length of host data following the header.
+
+// 4.3 Target Connection/Disconnection
+// -----------------------------------
+
+// When host is going to start tracing in streaming mode it needs to put both ESP32 cores into initial state when 'host connected' bit is set
+// on both cores. To accomplish this host halts both cores and sets this bit in TRAX registers. But target code can be halted in state when it has read control
+// register but has not updated its value. To handle such situations target code indicates to the host that it is updating control register by writing
+// non-zero value to status register. Actually it writes address of the instruction which it will execute when it finishes with
+// the registers update. When target is halted during control register update host sets breakpoint at the address from status register and resumes CPU.
+// After target code finishes with register update it is halted on breakpoint, host detects it and safely sets 'host connected' bit. When both cores
+// are set up they are resumed. Tracing starts without further intrusion into CPUs work.
+// When host is going to stop tracing in streaming mode it needs to disconnect targets. Disconnection process is done using the same algorithm
+// as for connecting, but 'host connected' bits are cleared on ESP32 cores.
+
+// 5. Module Access Synchronization
+// ================================
+
+// Access to internal module's data is synchronized with custom mutex. Mutex is a wrapper for portMUX_TYPE and uses almost the same sync mechanism as in
+// vPortCPUAcquireMutex/vPortCPUReleaseMutex. The mechanism uses S32C1I Xtensa instruction to implement exclusive access to module's data from tasks and
+// ISRs running on both cores. Also custom mutex allows specifying timeout for locking operation. Locking routine checks underlying mutex in cycle until
+// it gets its ownership or timeout expires. The differences of application tracing module's mutex implementation from vPortCPUAcquireMutex/vPortCPUReleaseMutex are:
+// - Support for timeouts.
+// - Local IRQs for CPU which owns the mutex are disabled till the call to unlocking routine. This is made to avoid possible task's prio inversion.
+//   When low prio task takes mutex and enables local IRQs gets preempted by high prio task which in its turn can try to acquire mutex using infinite timeout.
+//   So no local task switch occurs when mutex is locked. But this does not apply to tasks on another CPU.
+//   WARNING: Priority inversion can happen when low prio task works on one CPU and medium and high prio tasks work on another.
+// WARNING: Care must be taken when selecting timeout values for trace calls from ISRs. Tracing module does not care about watchdogs when waiting
+// on internal locks and for host to complete previous block reading, so if timeout value exceeds watchdog's one it can lead to the system reboot.
+
+// 6. Timeouts
+// ===========
+
+// Timeout mechanism is based on xthal_get_ccount() routine and supports timeout values in microseconds.
+// There are two situations when task/ISR can be delayed by tracing API call. Timeout mechanism takes into account both conditions:
+// - Trace data are locked by another task/ISR. When waiting on trace data lock.
+// - Current TRAX memory input block is full when working in streaming mode (host is connected). When waiting for host to complete previous block reading.
+// When waiting for any of above conditions xthal_get_ccount() is called periodically to calculate time elapsed from trace API routine entry. When elapsed
+// time exceeds specified timeout value operation is canceled and ESP_ERR_TIMEOUT code is returned.
+#include "sdkconfig.h"
+#include "soc/soc.h"
+#include "soc/dport_reg.h"
+#include "soc/tracemem_config.h"
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#include "soc/sensitive_reg.h"
+#endif
+#include "eri.h"
+#include "esp_private/trax.h"
+#include "esp_cpu.h"
+#include "esp_log.h"
+#include "esp_app_trace_membufs_proto.h"
+#include "esp_app_trace_port.h"
+#include "esp_rom_crc.h"
+
+// TRAX is disabled, so we use its registers for our own purposes
+// | 31..XXXXXX..24 | 23 .(host_connect). 23 | 22 .(host_data). 22| 21..(block_id)..15 | 14..(block_len)..0 |
+#define ESP_APPTRACE_TRAX_CTRL_REG              ERI_TRAX_DELAYCNT
+#define ESP_APPTRACE_TRAX_STAT_REG              ERI_TRAX_TRIGGERPC
+#define ESP_APPTRACE_TRAX_CRC16_REG             ERI_PERFMON_PM1
+
+#define ESP_APPTRACE_CRC_INDICATOR              (0xA55AU << 16)
+
+#define ESP_APPTRACE_TRAX_BLOCK_LEN_MSK         0x7FFFUL
+#define ESP_APPTRACE_TRAX_BLOCK_LEN(_l_)        ((_l_) & ESP_APPTRACE_TRAX_BLOCK_LEN_MSK)
+#define ESP_APPTRACE_TRAX_BLOCK_LEN_GET(_v_)    ((_v_) & ESP_APPTRACE_TRAX_BLOCK_LEN_MSK)
+#define ESP_APPTRACE_TRAX_BLOCK_ID_MSK          0x7FUL
+#define ESP_APPTRACE_TRAX_BLOCK_ID(_id_)        (((_id_) & ESP_APPTRACE_TRAX_BLOCK_ID_MSK) << 15)
+#define ESP_APPTRACE_TRAX_BLOCK_ID_GET(_v_)     (((_v_) >> 15) & ESP_APPTRACE_TRAX_BLOCK_ID_MSK)
+#define ESP_APPTRACE_TRAX_HOST_DATA             (1 << 22)
+#define ESP_APPTRACE_TRAX_HOST_CONNECT          (1 << 23)
+
+#define ESP_APPTRACE_TRAX_INITED(_hw_)          ((_hw_)->inited & (1 << esp_cpu_get_core_id()))
+
+#define ESP_APPTRACE_TRAX_BLOCK_SIZE            (0x4000UL)
+
+/** TRAX HW transport data */
+typedef struct {
+    uint8_t                             inited;
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_lock_t                 lock;   // sync lock
+#endif
+    esp_apptrace_membufs_proto_data_t   membufs;
+} esp_apptrace_trax_data_t;
+
+const static char *TAG = "esp_apptrace";
+
+static uint8_t * const s_trax_blocks[] = {
+    (uint8_t *)TRACEMEM_BLK0_ADDR,
+    (uint8_t *)TRACEMEM_BLK1_ADDR
+};
+
+static esp_err_t esp_apptrace_trax_lock(void *hw_data, esp_apptrace_tmo_t *tmo)
+{
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+    esp_err_t ret = esp_apptrace_lock_take(&trax_data->lock, tmo);
+    if (ret != ESP_OK) {
+        return ESP_FAIL;
+    }
+#endif
+    return ESP_OK;
+}
+
+static esp_err_t esp_apptrace_trax_unlock(void *hw_data)
+{
+    esp_err_t ret = ESP_OK;
+#if CONFIG_APPTRACE_LOCK_ENABLE
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+    ret = esp_apptrace_lock_give(&trax_data->lock);
+#endif
+    return ret;
+}
+
+static inline void esp_apptrace_trax_hw_init(void)
+{
+    // Stop trace, if any (on the current CPU)
+    eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TRSTP);
+    eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TMEN);
+    eri_write(ESP_APPTRACE_TRAX_CTRL_REG, ESP_APPTRACE_TRAX_BLOCK_ID(0));
+    // this is for OpenOCD to let him know where stub entries vector is resided
+    // must be read by host before any transfer using TRAX
+    eri_write(ESP_APPTRACE_TRAX_STAT_REG, 0);
+
+    ESP_APPTRACE_LOGI("Initialized TRAX on CPU%d", esp_cpu_get_core_id());
+}
+
+static inline void esp_apptrace_trax_select_memory_block(int block_num)
+{
+    // select memory block to be exposed to the TRAX module (accessed by host)
+#if CONFIG_IDF_TARGET_ESP32
+    DPORT_WRITE_PERI_REG(DPORT_TRACEMEM_MUX_MODE_REG, block_num ? TRACEMEM_MUX_BLK0_ONLY : TRACEMEM_MUX_BLK1_ONLY);
+#elif CONFIG_IDF_TARGET_ESP32S2
+    WRITE_PERI_REG(DPORT_PMS_OCCUPY_3_REG, block_num ? BIT(TRACEMEM_MUX_BLK0_NUM - 4) : BIT(TRACEMEM_MUX_BLK1_NUM - 4));
+#elif CONFIG_IDF_TARGET_ESP32S3
+    // select memory block to be exposed to the TRAX module (accessed by host)
+    uint32_t block_bits = block_num ? TRACEMEM_CORE0_MUX_BLK_BITS(TRACEMEM_MUX_BLK0_NUM)
+                          : TRACEMEM_CORE0_MUX_BLK_BITS(TRACEMEM_MUX_BLK1_NUM);
+    block_bits |= block_num ? TRACEMEM_CORE1_MUX_BLK_BITS(TRACEMEM_MUX_BLK0_NUM)
+                  : TRACEMEM_CORE1_MUX_BLK_BITS(TRACEMEM_MUX_BLK1_NUM);
+    ESP_EARLY_LOGV(TAG, "Select block %d @ %p (bits 0x%" PRIx32 ")", block_num, s_trax_blocks[block_num], block_bits);
+    DPORT_WRITE_PERI_REG(SENSITIVE_INTERNAL_SRAM_USAGE_2_REG, block_bits);
+#endif
+}
+
+static inline void esp_apptrace_trax_memory_enable(void)
+{
+#if CONFIG_IDF_TARGET_ESP32
+    /* Enable trace memory on PRO CPU */
+    DPORT_WRITE_PERI_REG(DPORT_PRO_TRACEMEM_ENA_REG, DPORT_PRO_TRACEMEM_ENA_M);
+#if CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE == 0
+    /* Enable trace memory on APP CPU */
+    DPORT_WRITE_PERI_REG(DPORT_APP_TRACEMEM_ENA_REG, DPORT_APP_TRACEMEM_ENA_M);
+#endif
+#endif
+}
+
+/*****************************************************************************************/
+/***************************** Apptrace HW iface *****************************************/
+/*****************************************************************************************/
+
+static esp_err_t esp_apptrace_trax_init(void *hw_data, const esp_apptrace_config_t *config)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    // 'esp_apptrace_trax_init()' is called on every core, so ensure to do main initialization only once
+    int core_id = esp_cpu_get_core_id();
+    if (core_id == 0) {
+        esp_apptrace_mem_block_t mem_blocks_cfg[2] = {
+            {
+                .start = s_trax_blocks[0],
+                .sz = ESP_APPTRACE_TRAX_BLOCK_SIZE
+            },
+            {
+                .start = s_trax_blocks[1],
+                .sz = ESP_APPTRACE_TRAX_BLOCK_SIZE
+            },
+        };
+        trax_data->membufs.header_size = ESP_APPTRACE_HEADER_SIZE_32;
+        esp_err_t res = esp_apptrace_membufs_init(&trax_data->membufs, mem_blocks_cfg);
+        if (res != ESP_OK) {
+            ESP_APPTRACE_LOGE("Failed to init membufs proto (%d)!", res);
+            return res;
+        }
+#if CONFIG_APPTRACE_LOCK_ENABLE
+        esp_apptrace_lock_init(&trax_data->lock);
+#endif
+        esp_apptrace_trax_memory_enable();
+        esp_apptrace_trax_select_memory_block(0);
+    }
+    // init TRAX on this CPU
+    esp_apptrace_trax_hw_init();
+    trax_data->inited |= 1 << core_id;
+
+    return ESP_OK;
+}
+
+static uint8_t *esp_apptrace_trax_up_buffer_get(void *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return NULL;
+    }
+    esp_err_t res = esp_apptrace_trax_lock(trax_data, tmo);
+    if (res != ESP_OK) {
+        return NULL;
+    }
+
+    uint8_t *ptr = esp_apptrace_membufs_up_buffer_get(&trax_data->membufs, size, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_trax_unlock(trax_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return ptr;
+}
+
+static esp_err_t esp_apptrace_trax_up_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    // Can avoid locking because esp_apptrace_membufs_up_buffer_put() just modifies buffer's header
+    esp_err_t res = esp_apptrace_membufs_up_buffer_put(&trax_data->membufs, ptr, tmo);
+    return res;
+}
+
+static void esp_apptrace_trax_down_buffer_config(void *hw_data, uint8_t *buf, uint32_t size)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return;
+    }
+    esp_apptrace_membufs_down_buffer_config(&trax_data->membufs, buf, size);
+}
+
+static uint8_t *esp_apptrace_trax_down_buffer_get(void *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return NULL;
+    }
+    esp_err_t res = esp_apptrace_trax_lock(trax_data, tmo);
+    if (res != ESP_OK) {
+        return NULL;
+    }
+
+    uint8_t *ptr = esp_apptrace_membufs_down_buffer_get(&trax_data->membufs, size, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_trax_unlock(trax_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return ptr;
+}
+
+static esp_err_t esp_apptrace_trax_down_buffer_put(void *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    // Can avoid locking because esp_apptrace_membufs_down_buffer_put() does nothing
+    /*esp_err_t res = esp_apptrace_trax_lock(hw_data, tmo);
+    if (res != ESP_OK) {
+        return res;
+    }*/
+
+    esp_err_t res = esp_apptrace_membufs_down_buffer_put(&trax_data->membufs, ptr, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    /*if (esp_apptrace_trax_unlock(hw_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }*/
+    return res;
+}
+
+static bool esp_apptrace_trax_host_is_connected(void *hw_data)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return false;
+    }
+    return eri_read(ESP_APPTRACE_TRAX_CTRL_REG) & ESP_APPTRACE_TRAX_HOST_CONNECT ? true : false;
+}
+
+static esp_err_t esp_apptrace_trax_flush_nolock(void *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    return esp_apptrace_membufs_flush_nolock(&trax_data->membufs, min_sz, tmo);
+}
+
+static esp_err_t esp_apptrace_trax_flush(void *hw_data, esp_apptrace_tmo_t *tmo)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+
+    if (!ESP_APPTRACE_TRAX_INITED(trax_data)) {
+        return ESP_ERR_INVALID_STATE;
+    }
+    esp_err_t res = esp_apptrace_trax_lock(trax_data, tmo);
+    if (res != ESP_OK) {
+        return res;
+    }
+
+    res = esp_apptrace_membufs_flush_nolock(&trax_data->membufs, 0, tmo);
+
+    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
+    if (esp_apptrace_trax_unlock(trax_data) != ESP_OK) {
+        assert(false && "Failed to unlock apptrace data!");
+    }
+    return res;
+}
+
+/*****************************************************************************************/
+/************************** Membufs proto HW iface ***************************************/
+/*****************************************************************************************/
+
+static inline void esp_apptrace_trax_buffer_swap_lock(void)
+{
+    extern uint32_t __esp_apptrace_trax_eri_updated;
+
+    // indicate to host that we are about to update.
+    // this is used only to place CPU into streaming mode at tracing startup
+    // before starting streaming host can halt us after we read  ESP_APPTRACE_TRAX_CTRL_REG and before we updated it
+    // HACK: in this case host will set breakpoint just after ESP_APPTRACE_TRAX_CTRL_REG update,
+    // here we set address to set bp at
+    // enter ERI update critical section
+    eri_write(ESP_APPTRACE_TRAX_STAT_REG, (uint32_t)&__esp_apptrace_trax_eri_updated);
+}
+
+static __attribute__((noinline)) void esp_apptrace_trax_buffer_swap_unlock(void)
+{
+    // exit ERI update critical section
+    eri_write(ESP_APPTRACE_TRAX_STAT_REG, 0x0);
+    // TODO: currently host sets breakpoint, use break instruction to stop;
+    // it will allow to use ESP_APPTRACE_TRAX_STAT_REG for other purposes
+    asm volatile(
+        "    .global     __esp_apptrace_trax_eri_updated\n"
+        "__esp_apptrace_trax_eri_updated:\n"); // host will set bp here to resolve collision at streaming start
+}
+
+static esp_err_t esp_apptrace_trax_buffer_swap_start(uint32_t curr_block_id)
+{
+    esp_err_t res = ESP_OK;
+
+    esp_apptrace_trax_buffer_swap_lock();
+
+    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
+    uint32_t host_connected = ESP_APPTRACE_TRAX_HOST_CONNECT & ctrl_reg;
+    if (host_connected) {
+        uint32_t acked_block = ESP_APPTRACE_TRAX_BLOCK_ID_GET(ctrl_reg);
+        uint32_t host_to_read = ESP_APPTRACE_TRAX_BLOCK_LEN_GET(ctrl_reg);
+        if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK)) {
+            ESP_APPTRACE_LOGD("HC[%d]: Can not switch %" PRIx32 " %" PRIu32 " %" PRIx32 " %" PRIx32 "/%" PRIx32,
+                              esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
+                              curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK, curr_block_id);
+            res = ESP_ERR_NO_MEM;
+            goto _on_err;
+        }
+    }
+    return ESP_OK;
+_on_err:
+    esp_apptrace_trax_buffer_swap_unlock();
+    return res;
+}
+
+static esp_err_t esp_apptrace_trax_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len)
+{
+    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
+    uint32_t host_connected = ESP_APPTRACE_TRAX_HOST_CONNECT & ctrl_reg;
+
+    eri_write(ESP_APPTRACE_TRAX_CTRL_REG, ESP_APPTRACE_TRAX_BLOCK_ID(new_block_id) |
+              host_connected | ESP_APPTRACE_TRAX_BLOCK_LEN(prev_block_len));
+    esp_apptrace_trax_buffer_swap_unlock();
+    return ESP_OK;
+}
+
+static esp_err_t esp_apptrace_trax_buffer_swap(uint32_t new_block_id, uint32_t prev_block_len)
+{
+    /* Before switching to the new block, calculate CRC16 of the current block */
+    if (prev_block_len > 0) {
+        const uint8_t *prev_block_start = s_trax_blocks[!((new_block_id % 2))];
+        uint16_t crc16 = esp_rom_crc16_le(0, prev_block_start, prev_block_len);
+        eri_write(ESP_APPTRACE_TRAX_CRC16_REG, crc16 | ESP_APPTRACE_CRC_INDICATOR);
+        ESP_APPTRACE_LOGD("CRC16:%x %d @%x", crc16, prev_block_len, prev_block_start);
+    }
+    esp_apptrace_trax_select_memory_block(new_block_id);
+    return ESP_OK;
+}
+
+static bool esp_apptrace_trax_host_data_pending(void)
+{
+    uint32_t ctrl_reg = eri_read(ESP_APPTRACE_TRAX_CTRL_REG);
+    return (ctrl_reg & ESP_APPTRACE_TRAX_HOST_DATA) ? true : false;
+}
+
+static void esp_apptrace_trax_set_header_size(void *hw_data, esp_apptrace_header_size_t header_size)
+{
+    esp_apptrace_trax_data_t *trax_data = hw_data;
+    trax_data->membufs.header_size = header_size;
+}
+
+esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
+{
+    static esp_apptrace_membufs_proto_hw_t s_trax_proto_hw = {
+        .swap_start = esp_apptrace_trax_buffer_swap_start,
+        .swap = esp_apptrace_trax_buffer_swap,
+        .swap_end = esp_apptrace_trax_buffer_swap_end,
+        .host_data_pending = esp_apptrace_trax_host_data_pending,
+    };
+    static esp_apptrace_trax_data_t s_trax_hw_data = {
+        .membufs = {
+            .hw = &s_trax_proto_hw,
+        },
+    };
+    static esp_apptrace_hw_t s_trax_hw = {
+        .init = esp_apptrace_trax_init,
+        .get_up_buffer = esp_apptrace_trax_up_buffer_get,
+        .put_up_buffer = esp_apptrace_trax_up_buffer_put,
+        .flush_up_buffer_nolock = esp_apptrace_trax_flush_nolock,
+        .flush_up_buffer = esp_apptrace_trax_flush,
+        .down_buffer_config = esp_apptrace_trax_down_buffer_config,
+        .get_down_buffer = esp_apptrace_trax_down_buffer_get,
+        .put_down_buffer = esp_apptrace_trax_down_buffer_put,
+        .host_is_connected = esp_apptrace_trax_host_is_connected,
+        .set_header_size = esp_apptrace_trax_set_header_size,
+    };
+    *data = &s_trax_hw_data;
+    return &s_trax_hw;
+}

components/app_trace/private_include/dbg_stubs.h

@@ -1,69 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ESP_DBG_STUBS_H_
-#define ESP_DBG_STUBS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "esp_err.h"
-
-/**
- * Debug stubs entries IDs
- */
-typedef enum {
-    ESP_DBG_STUB_MAGIC_NUM,
-    ESP_DBG_STUB_TABLE_SIZE,
-    ESP_DBG_STUB_CONTROL_DATA,   ///< stubs descriptor entry
-    ESP_DBG_STUB_ENTRY_FIRST,
-    ESP_DBG_STUB_ENTRY_GCOV ///< GCOV entry
-    = ESP_DBG_STUB_ENTRY_FIRST,
-    ESP_DBG_STUB_ENTRY_CAPABILITIES,
-    ESP_DBG_STUB_ENTRY_MAX
-} esp_dbg_stub_id_t;
-
-#define ESP_DBG_STUB_MAGIC_NUM_VAL      0xFEEDBEEF
-#define ESP_DBG_STUB_CAP_GCOV_TASK      (1 << 0)
-
-/**
- * @brief  Initializes debug stubs.
- *
- * @note   Must be called after esp_apptrace_init() if app tracing is enabled.
- */
-void esp_dbg_stubs_init(void);
-
-/**
- * @brief  Initializes application tracing module.
- *
- * @note   Should be called before any esp_apptrace_xxx call.
- *
- * @param id    Stub ID.
- * @param entry Stub entry. Usually it is stub entry function address,
- *              but can be any value meaningfull for OpenOCD command/code
- *              such as capabilities
- * @return ESP_OK on success, otherwise see esp_err_t
- */
-esp_err_t esp_dbg_stub_entry_set(esp_dbg_stub_id_t id, uint32_t entry);
-
-/**
- * @brief   Retrives the corresponding stub entry
- *
- * @param id    Stub ID.
- * @param entry Stub entry. Usually it is stub entry function address,
- *              but can be any value meaningfull for OpenOCD command/code
- *              such as capabilities
- *
- * @return ESP_OK on success, otherwise see esp_err_t
- */
-esp_err_t esp_dbg_stub_entry_get(esp_dbg_stub_id_t id, uint32_t *entry);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // ESP_DBG_STUBS_H_

components/app_trace/private_include/esp_app_trace_membufs_proto.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -29,7 +29,7 @@ typedef struct {
 
 typedef struct {
     esp_err_t (*swap_start)(uint32_t curr_block_id);
-    esp_err_t (*swap)(uint32_t new_block_id);
+    esp_err_t (*swap)(uint32_t new_block_id, uint32_t prev_block_len);
     esp_err_t (*swap_end)(uint32_t new_block_id, uint32_t prev_block_len);
     bool (*host_data_pending)(void);
 } esp_apptrace_membufs_proto_hw_t;
@@ -38,14 +38,9 @@ typedef struct {
     esp_apptrace_membufs_proto_hw_t *       hw;
     volatile esp_apptrace_membufs_state_t   state;       // state
     esp_apptrace_mem_block_t                blocks[2];   // memory blocks
-#if CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX > 0
-    // ring buffer control struct for pending user blocks
-    esp_apptrace_rb_t                   rb_pend;
-    // storage for pending user blocks
-    uint8_t                             pending_data[CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX + 1];
-#endif
     // ring buffer control struct for data from host (down buffer)
     esp_apptrace_rb_t                       rb_down;
+    int                                     header_size; ///< Size of the trace header (2 or 4 bytes)
 } esp_apptrace_membufs_proto_data_t;
 
 esp_err_t esp_apptrace_membufs_init(esp_apptrace_membufs_proto_data_t *proto, const esp_apptrace_mem_block_t blocks_cfg[2]);

components/app_trace/project_include.cmake

@@ -1,41 +0,0 @@
-# idf_create_lcov_report
-#
-# Create coverage report.
-function(idf_create_coverage_report report_dir)
-    set(gcov_tool ${_CMAKE_TOOLCHAIN_PREFIX}gcov)
-    idf_build_get_property(project_name PROJECT_NAME)
-
-    file(TO_NATIVE_PATH "${report_dir}" _report_dir)
-    file(TO_NATIVE_PATH "${project_dir}" _project_dir)
-    file(TO_NATIVE_PATH "${report_dir}/html/index.html" _index_path)
-
-    add_custom_target(pre-cov-report
-        COMMENT "Generating coverage report in: ${_report_dir}"
-        COMMAND ${CMAKE_COMMAND} -E echo "Using gcov: ${gcov_tool}"
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${_report_dir}/html
-        )
-
-    add_custom_target(lcov-report
-        COMMENT "WARNING: lcov-report is deprecated. Please use gcovr-report instead."
-        COMMAND lcov --gcov-tool ${gcov_tool} -c -d ${CMAKE_CURRENT_BINARY_DIR} -o ${_report_dir}/${project_name}.info
-        COMMAND genhtml -o ${_report_dir}/html ${_report_dir}/${project_name}.info
-        DEPENDS pre-cov-report
-        )
-
-    add_custom_target(gcovr-report
-        COMMAND gcovr -r ${_project_dir} --gcov-executable ${gcov_tool} -s --html-details ${_index_path}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS pre-cov-report
-        )
-endfunction()
-
-# idf_clean_coverage_report
-#
-# Clean coverage report.
-function(idf_clean_coverage_report report_dir)
-    file(TO_CMAKE_PATH "${report_dir}" _report_dir)
-
-    add_custom_target(cov-data-clean
-        COMMENT "Clean coverage report in: ${_report_dir}"
-        COMMAND ${CMAKE_COMMAND} -E remove_directory ${_report_dir})
-endfunction()

components/app_trace/sdkconfig.rename

@@ -2,14 +2,11 @@
 # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
 
 CONFIG_ESP32_APPTRACE_DESTINATION      					CONFIG_APPTRACE_DESTINATION
-CONFIG_ESP32_APPTRACE_DEST_NONE							CONFIG_APPTRACE_DEST_NONE
 CONFIG_ESP32_APPTRACE_DEST_TRAX							CONFIG_APPTRACE_DEST_JTAG
 CONFIG_ESP32_APPTRACE_ENABLE							CONFIG_APPTRACE_ENABLE
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE						CONFIG_APPTRACE_LOCK_ENABLE
 CONFIG_ESP32_APPTRACE_ONPANIC_HOST_FLUSH_TMO			CONFIG_APPTRACE_ONPANIC_HOST_FLUSH_TMO
 CONFIG_ESP32_APPTRACE_POSTMORTEM_FLUSH_TRAX_THRESH      CONFIG_APPTRACE_POSTMORTEM_FLUSH_THRESH
-CONFIG_ESP32_APPTRACE_PENDING_DATA_SIZE_MAX				CONFIG_APPTRACE_PENDING_DATA_SIZE_MAX
-CONFIG_ESP32_GCOV_ENABLE								CONFIG_APPTRACE_GCOV_ENABLE
 
 CONFIG_SYSVIEW_ENABLE							        CONFIG_APPTRACE_SV_ENABLE
 CONFIG_SYSVIEW_TS_SOURCE							    CONFIG_APPTRACE_SV_TS_SOURCE

components/app_trace/sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-1-Clause
  *
- * SPDX-FileContributor: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2017-2025 Espressif Systems (Shanghai) CO LTD
  */
 /*********************************************************************
 *                    SEGGER Microcontroller GmbH                     *
@@ -65,6 +65,7 @@ Revision: $Rev: 7745 $
 #include "esp_app_trace.h"
 #include "esp_app_trace_util.h"
 #include "esp_intr_alloc.h"
+#include "esp_clk_tree.h"
 #include "esp_cpu.h"
 #include "soc/soc.h"
 #include "soc/interrupts.h"
@@ -84,11 +85,7 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 // The target device name
 #define SYSVIEW_DEVICE_NAME     CONFIG_IDF_TARGET
 // The target core name
-#if CONFIG_IDF_TARGET_ARCH_XTENSA
-#define SYSVIEW_CORE_NAME       "xtensa"
-#elif CONFIG_IDF_TARGET_ARCH_RISCV
-#define SYSVIEW_CORE_NAME       "riscv"
-#endif
+#define SYSVIEW_CORE_NAME       "core0" // In dual core, this will be renamed by OpenOCD as core1
 
 // Determine which timer to use as timestamp source
 #if CONFIG_APPTRACE_SV_TS_SOURCE_CCOUNT
@@ -105,9 +102,6 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 // Timer group timer divisor
 #define SYSVIEW_TIMER_DIV       2
 
-// Frequency of the timestamp, using APB as GPTimer source clock
-#define SYSVIEW_TIMESTAMP_FREQ  (esp_clk_apb_freq() / SYSVIEW_TIMER_DIV)
-
 // GPTimer handle
 gptimer_handle_t s_sv_gptimer;
 
@@ -177,30 +171,38 @@ static void _cbSendSystemDesc(void) {
 *
 **********************************************************************
 */
-static void SEGGER_SYSVIEW_TS_Init(void)
+static int SEGGER_SYSVIEW_TS_Init(void)
 {
     /* We only need to initialize something if we use Timer Group.
      * esp_timer and ccount can be used as is.
      */
 #if TS_USE_TIMERGROUP
+    // get clock source frequency
+    uint32_t counter_src_hz = 0;
+    ESP_ERROR_CHECK(esp_clk_tree_src_get_freq_hz(
+        (soc_module_clk_t)GPTIMER_CLK_SRC_DEFAULT,
+        ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &counter_src_hz));
     gptimer_config_t config = {
         .clk_src = GPTIMER_CLK_SRC_DEFAULT,
         .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = SYSVIEW_TIMESTAMP_FREQ,
+        .resolution_hz = counter_src_hz / SYSVIEW_TIMER_DIV,
     };
     // pick any free GPTimer instance
     ESP_ERROR_CHECK(gptimer_new_timer(&config, &s_sv_gptimer));
     /* Start counting */
     gptimer_enable(s_sv_gptimer);
     gptimer_start(s_sv_gptimer);
+    return config.resolution_hz;
+#else
+    return SYSVIEW_TIMESTAMP_FREQ;
 #endif // TS_USE_TIMERGROUP
 }
 
 void SEGGER_SYSVIEW_Conf(void) {
     U32 disable_evts = 0;
 
-    SEGGER_SYSVIEW_TS_Init();
-    SEGGER_SYSVIEW_Init(SYSVIEW_TIMESTAMP_FREQ, SYSVIEW_CPU_FREQ,
+    int timestamp_freq = SEGGER_SYSVIEW_TS_Init();
+    SEGGER_SYSVIEW_Init(timestamp_freq, SYSVIEW_CPU_FREQ,
                         &SYSVIEW_X_OS_TraceAPI, _cbSendSystemDesc);
     SEGGER_SYSVIEW_SetRAMBase(SYSVIEW_RAM_BASE);
 

components/app_trace/sys_view/esp/SEGGER_RTT_esp.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -32,19 +32,12 @@ static uint8_t s_events_buf[SYSVIEW_EVENTS_BUF_SZ];
 static uint16_t s_events_buf_filled;
 static uint8_t s_down_buf[SYSVIEW_DOWN_BUF_SIZE];
 
-#if CONFIG_APPTRACE_SV_DEST_UART
-
-#define ESP_APPTRACE_DEST_SYSVIEW ESP_APPTRACE_DEST_UART
 #if CONFIG_APPTRACE_SV_DEST_CPU_0 || CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
 #define APPTRACE_SV_DEST_CPU 0
 #else
 #define APPTRACE_SV_DEST_CPU 1
 #endif // CONFIG_APPTRACE_SV_DEST_CPU_0
 
-#elif CONFIG_APPTRACE_SV_DEST_JTAG || (CONFIG_APPTRACE_ENABLE && CONFIG_APPTRACE_DEST_UART_NONE)
-#define ESP_APPTRACE_DEST_SYSVIEW ESP_APPTRACE_DEST_TRAX
-#endif
-
 /*********************************************************************
 *
 *       Public code
@@ -60,8 +53,8 @@ static uint8_t s_down_buf[SYSVIEW_DOWN_BUF_SIZE];
 *    Flushes buffered events.
 *
 *  Parameters
-*    min_sz  Threshold for flushing data. If current filling level is above this value, data will be flushed. TRAX destinations only.
-*    tmo     Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+*    min_sz  Threshold for flushing data. If current filling level is above this value, data will be flushed. JTAG destinations only.
+*    tmo     Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
 *
 *  Return value
 *    None.
@@ -70,15 +63,15 @@ void SEGGER_RTT_ESP_FlushNoLock(unsigned long min_sz, unsigned long tmo)
 {
     esp_err_t res;
     if (s_events_buf_filled > 0) {
-      res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, s_events_buf, s_events_buf_filled, tmo);
-      if (res != ESP_OK) {
-        ESP_LOGE(TAG, "Failed to flush buffered events (%d)!", res);
-      }
+        res = esp_apptrace_write(s_events_buf, s_events_buf_filled, tmo);
+        if (res != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to flush buffered events (%d)!", res);
+        }
     }
     // flush even if we failed to write buffered events, because no new events will be sent after STOP
-    res = esp_apptrace_flush_nolock(ESP_APPTRACE_DEST_SYSVIEW, min_sz, tmo);
+    res = esp_apptrace_flush_nolock(min_sz, tmo);
     if (res != ESP_OK) {
-      ESP_LOGE(TAG, "Failed to flush apptrace data (%d)!", res);
+        ESP_LOGE(TAG, "Failed to flush apptrace data (%d)!", res);
     }
     s_events_buf_filled = 0;
 }
@@ -91,8 +84,8 @@ void SEGGER_RTT_ESP_FlushNoLock(unsigned long min_sz, unsigned long tmo)
 *    Flushes buffered events.
 *
 *  Parameters
-*    min_sz  Threshold for flushing data. If current filling level is above this value, data will be flushed. TRAX destinations only.
-*    tmo     Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinetly.
+*    min_sz  Threshold for flushing data. If current filling level is above this value, data will be flushed. JTAG destinations only.
+*    tmo     Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
 *
 *  Return value
 *    None.
@@ -121,13 +114,14 @@ void SEGGER_RTT_ESP_Flush(unsigned long min_sz, unsigned long tmo)
 *  Return value
 *    Number of bytes that have been read.
 */
-unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned BufferSize) {
-  uint32_t size = BufferSize;
-  esp_err_t res = esp_apptrace_read(ESP_APPTRACE_DEST_SYSVIEW, pData, &size, 0);
-  if (res != ESP_OK) {
-    return 0;
-  }
-  return size;
+unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned BufferSize)
+{
+    uint32_t size = BufferSize;
+    esp_err_t res = esp_apptrace_read(pData, &size, 0);
+    if (res != ESP_OK) {
+        return 0;
+    }
+    return size;
 }
 
 /*********************************************************************
@@ -154,80 +148,79 @@ unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned Buffe
 *        and may only be called after RTT has been initialized.
 *        Either by calling SEGGER_RTT_Init() or calling another RTT API function first.
 */
-unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes) {
-  uint8_t *pbuf = (uint8_t *)pBuffer;
-  uint8_t event_id = *pbuf;
-#if CONFIG_APPTRACE_SV_DEST_UART
-  if (
-    (APPTRACE_SV_DEST_CPU != esp_cpu_get_core_id()) &&
-    (
-      (event_id == SYSVIEW_EVTID_ISR_ENTER) ||
-      (event_id == SYSVIEW_EVTID_ISR_EXIT) ||
-      (event_id == SYSVIEW_EVTID_TASK_START_EXEC) ||
-      (event_id == SYSVIEW_EVTID_TASK_STOP_EXEC) ||
-      (event_id == SYSVIEW_EVTID_TASK_START_READY) ||
-      (event_id == SYSVIEW_EVTID_TASK_STOP_READY) ||
-      (event_id == SYSVIEW_EVTID_MARK_START) ||
-      (event_id == SYSVIEW_EVTID_MARK_STOP) ||
-      (event_id == SYSVIEW_EVTID_TIMER_ENTER) ||
-      (event_id == SYSVIEW_EVTID_TIMER_EXIT) ||
-      (event_id == SYSVIEW_EVTID_STACK_INFO) ||
-      (event_id == SYSVIEW_EVTID_MODULEDESC)
-    )
-  ){
-    return NumBytes;
-  }
+unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes)
+{
+    uint8_t *pbuf = (uint8_t *)pBuffer;
+    uint8_t event_id = *pbuf;
 
-// This is workaround for SystemView!
-// Without this line SystemView will hangs on when heap tracing enabled.
-  if(event_id == SYSVIEW_EVTID_MODULEDESC){
-    return NumBytes;
-  }
-#endif // CONFIG_APPTRACE_SV_DEST_UART
+    if (esp_apptrace_get_destination() == ESP_APPTRACE_DEST_UART) {
+        if (
+            (APPTRACE_SV_DEST_CPU != esp_cpu_get_core_id()) &&
+            (
+                (event_id == SYSVIEW_EVTID_ISR_ENTER) ||
+                (event_id == SYSVIEW_EVTID_ISR_EXIT) ||
+                (event_id == SYSVIEW_EVTID_TASK_START_EXEC) ||
+                (event_id == SYSVIEW_EVTID_TASK_STOP_EXEC) ||
+                (event_id == SYSVIEW_EVTID_TASK_START_READY) ||
+                (event_id == SYSVIEW_EVTID_TASK_STOP_READY) ||
+                (event_id == SYSVIEW_EVTID_MARK_START) ||
+                (event_id == SYSVIEW_EVTID_MARK_STOP) ||
+                (event_id == SYSVIEW_EVTID_TIMER_ENTER) ||
+                (event_id == SYSVIEW_EVTID_TIMER_EXIT) ||
+                (event_id == SYSVIEW_EVTID_STACK_INFO) ||
+                (event_id == SYSVIEW_EVTID_MODULEDESC)
+            )
+        ) {
+            return NumBytes;
+        }
 
-  if (NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
-      ESP_LOGE(TAG, "Too large event %u bytes!", NumBytes);
-      return 0;
-  }
-#if CONFIG_APPTRACE_SV_DEST_JTAG
-  if (esp_cpu_get_core_id()) { // dual core specific code
-    // use the highest - 1 bit of event ID to indicate core ID
-    // the highest bit can not be used due to event ID encoding method
-    // this reduces supported ID range to [0..63] (for 1 byte IDs) plus [128..16383] (for 2 bytes IDs)
-    if (*pbuf & 0x80) { // 2 bytes ID
-      *(pbuf + 1) |= (1 << 6);
-    } else if (NumBytes != 10 || *pbuf != 0) { // ignore sync sequence
-      *pbuf |= (1 << 6);
+        // This is workaround for SystemView!
+        // Without this line SystemView will hangs on when heap tracing enabled.
+        if (event_id == SYSVIEW_EVTID_MODULEDESC) {
+            return NumBytes;
+        }
     }
-  }
-#endif // CONFIG_APPTRACE_SV_DEST_JTAG
-#if CONFIG_APPTRACE_SV_DEST_JTAG
-  if (s_events_buf_filled + NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
 
-    esp_err_t res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, s_events_buf, s_events_buf_filled, SEGGER_HOST_WAIT_TMO);
-    if (res != ESP_OK) {
-      return 0; // skip current data buffer only, accumulated events are kept
+    if (NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
+        ESP_LOGE(TAG, "Too large event %u bytes!", NumBytes);
+        return 0;
     }
-    s_events_buf_filled = 0;
-  }
-#endif
-  memcpy(&s_events_buf[s_events_buf_filled], pBuffer, NumBytes);
-  s_events_buf_filled += NumBytes;
+    if (esp_apptrace_get_destination() == ESP_APPTRACE_DEST_JTAG) {
+        if (esp_cpu_get_core_id()) { // dual core specific code
+            // use the highest - 1 bit of event ID to indicate core ID
+            // the highest bit can not be used due to event ID encoding method
+            // this reduces supported ID range to [0..63] (for 1 byte IDs) plus [128..16383] (for 2 bytes IDs)
+            if (*pbuf & 0x80) { // 2 bytes ID
+                *(pbuf + 1) |= (1 << 6);
+            } else if (NumBytes != 10 || *pbuf != 0) { // ignore sync sequence
+                *pbuf |= (1 << 6);
+            }
+        }
 
-#if CONFIG_APPTRACE_SV_DEST_UART
-  esp_err_t res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, pBuffer, NumBytes, SEGGER_HOST_WAIT_TMO);
-  if (res != ESP_OK)
-  {
-    return 0; // skip current data buffer only, accumulated events are kept
-  }
-  s_events_buf_filled = 0;
-#endif
+        if (s_events_buf_filled + NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
 
-  if (event_id == SYSVIEW_EVTID_TRACE_STOP)
-  {
-    SEGGER_RTT_ESP_FlushNoLock(0, SEGGER_STOP_WAIT_TMO);
-  }
-  return NumBytes;
+            esp_err_t res = esp_apptrace_write(s_events_buf, s_events_buf_filled, SEGGER_HOST_WAIT_TMO);
+            if (res != ESP_OK) {
+                return 0; // skip current data buffer only, accumulated events are kept
+            }
+            s_events_buf_filled = 0;
+        }
+    }
+    memcpy(&s_events_buf[s_events_buf_filled], pBuffer, NumBytes);
+    s_events_buf_filled += NumBytes;
+
+    if (esp_apptrace_get_destination() == ESP_APPTRACE_DEST_UART) {
+        esp_err_t res = esp_apptrace_write(pBuffer, NumBytes, SEGGER_HOST_WAIT_TMO);
+        if (res != ESP_OK) {
+            return 0; // skip current data buffer only, accumulated events are kept
+        }
+        s_events_buf_filled = 0;
+    }
+
+    if (event_id == SYSVIEW_EVTID_TRACE_STOP) {
+        SEGGER_RTT_ESP_FlushNoLock(0, SEGGER_STOP_WAIT_TMO);
+    }
+    return NumBytes;
 }
 
 /*********************************************************************
@@ -255,9 +248,10 @@ unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, u
 *    May only be called once per buffer.
 *    Buffer name and flags can be reconfigured using the appropriate functions.
 */
-int SEGGER_RTT_ConfigUpBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags) {
-  s_events_buf_filled = 0;
-  return 0;
+int SEGGER_RTT_ConfigUpBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags)
+{
+    s_events_buf_filled = 0;
+    return 0;
 }
 
 /*********************************************************************
@@ -285,22 +279,22 @@ int SEGGER_RTT_ConfigUpBuffer(unsigned BufferIndex, const char* sName, void* pBu
 *    May only be called once per buffer.
 *    Buffer name and flags can be reconfigured using the appropriate functions.
 */
-int SEGGER_RTT_ConfigDownBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags) {
-  esp_apptrace_down_buffer_config(s_down_buf, sizeof(s_down_buf));
-  return 0;
+int SEGGER_RTT_ConfigDownBuffer(unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags)
+{
+    return esp_apptrace_down_buffer_config(s_down_buf, sizeof(s_down_buf));
 }
 
 /*************************** Init hook ****************************
  *
- * This init function is placed here because this port file will be
- * linked whenever SystemView is used.
+ * This init function is placed here because this port file will be linked whenever SystemView is used.
+ * It is used to initialize SystemView and app trace configuration by the init hook function.
+ * Otherwise, SystemView and app trace initialization needs to be done later in the app_main.
  */
-
-ESP_SYSTEM_INIT_FN(sysview_init, SECONDARY, BIT(0), 120)
+ESP_SYSTEM_INIT_FN(sysview_early_init, SECONDARY, BIT(0), 120)
 {
+    esp_apptrace_set_header_size(ESP_APPTRACE_HEADER_SIZE_16);
     SEGGER_SYSVIEW_Conf();
+
     return ESP_OK;
 }
-
-
 /*************************** End of file ****************************/

components/app_trace/sys_view/ext/heap_trace_module.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -27,14 +27,13 @@ static SEGGER_SYSVIEW_MODULE s_esp_sysview_heap_module = {
 
 static bool s_mod_registered;
 
-
 esp_err_t esp_sysview_heap_trace_start(uint32_t tmo)
 {
-    uint32_t tmo_ticks = tmo/(1000*portTICK_PERIOD_MS);
+    uint32_t tmo_ticks = tmo / (1000 * portTICK_PERIOD_MS);
 
     ESP_EARLY_LOGV(TAG, "%s", __func__);
     do {
-        if (tmo != (uint32_t)-1) {
+        if (tmo != (uint32_t) -1) {
             // Currently timeout implementation is simple and has granularity of 1 OS tick,
             // so just count down the number of times to call vTaskDelay
             if (tmo_ticks-- == 0) {
@@ -42,7 +41,7 @@ esp_err_t esp_sysview_heap_trace_start(uint32_t tmo)
             }
         }
         vTaskDelay(1);
-    } while(!SEGGER_SYSVIEW_Started());
+    } while (!SEGGER_SYSVIEW_Started());
 
     SEGGER_SYSVIEW_RegisterModule(&s_esp_sysview_heap_module);
     s_mod_registered = true;
@@ -58,7 +57,7 @@ esp_err_t esp_sysview_heap_trace_stop(void)
 
 void esp_sysview_heap_trace_alloc(const void *addr, uint32_t size, const void *callers)
 {
-    U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + (2+CALLSTACK_SIZE)*SEGGER_SYSVIEW_QUANTA_U32];
+    U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + (2 + CALLSTACK_SIZE)*SEGGER_SYSVIEW_QUANTA_U32];
     U8* pPayload = SEGGER_SYSVIEW_PREPARE_PACKET(aPacket);
     U32 *calls = (U32 *)callers;
 
@@ -76,7 +75,7 @@ void esp_sysview_heap_trace_alloc(const void *addr, uint32_t size, const void *c
 
 void esp_sysview_heap_trace_free(const void *addr, const void *callers)
 {
-    U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + (1+CALLSTACK_SIZE)*SEGGER_SYSVIEW_QUANTA_U32];
+    U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + (1 + CALLSTACK_SIZE)*SEGGER_SYSVIEW_QUANTA_U32];
     U8* pPayload = SEGGER_SYSVIEW_PREPARE_PACKET(aPacket);
     U32 *calls = (U32 *)callers;
 

components/app_trace/test_apps/.build-test-rules.yml

@@ -5,9 +5,10 @@ components/app_trace/test_apps:
     - app_trace
     - esp_timer
     - soc
-    - driver
     - esp_hw_support
+    - esp_driver_uart
+    - esp_driver_gptimer
   disable:
-    - if: IDF_TARGET in ["esp32c5", "esp32c61", "esp32h21", "esp32h4"]
+    - if: IDF_TARGET in ["esp32h21", "esp32h4"]
       temporary: true
-      reason: not support yet # TODO: [ESP32C5] IDF-8705, [ESP32C61] IDF-9306, [ESP32H21] IDF-11539 [ESP32H4] IDF-12325
+      reason: not support yet # TODO: [ESP32H21] IDF-11539 [ESP32H4] IDF-12325

components/app_trace/test_apps/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 set(COMPONENTS main)

components/app_trace/test_apps/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # app_trace test
 

components/app_trace/test_apps/main/test_trace.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,16 +17,15 @@
 #include "freertos/semphr.h"
 #include "freertos/task.h"
 
+#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
+#include "esp_log.h"
 #include "esp_app_trace.h"
-#include "esp_app_trace_util.h"
 
 #define ESP_APPTRACE_TEST_USE_PRINT_LOCK        0
 #define ESP_APPTRACE_TEST_PRN_WRERR_MAX         5
 #define ESP_APPTRACE_TEST_BLOCKS_BEFORE_CRASH   100
 #define ESP_APPTRACE_TEST_BLOCK_SIZE            1024
 
-#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
-#include "esp_log.h"
 const static char *TAG = "esp_apptrace_test";
 
 #if ESP_APPTRACE_TEST_USE_PRINT_LOCK == 1
@@ -67,9 +66,9 @@ const static char *TAG = "esp_apptrace_test";
 #define ESP_APPTRACE_TEST_LOGO( format, ... )  ESP_APPTRACE_TEST_LOG_LEVEL(E, ESP_LOG_NONE, format, ##__VA_ARGS__)
 
 #if CONFIG_APPTRACE_SV_ENABLE == 0
-#define ESP_APPTRACE_TEST_WRITE(_b_, _s_)            esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, _b_, _s_, ESP_APPTRACE_TMO_INFINITE)
-#define ESP_APPTRACE_TEST_WRITE_FROM_ISR(_b_, _s_)   esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, _b_, _s_, 0UL)
-#define ESP_APPTRACE_TEST_WRITE_NOWAIT(_b_, _s_)     esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, _b_, _s_, 0)
+#define ESP_APPTRACE_TEST_WRITE(_b_, _s_)            esp_apptrace_write(_b_, _s_, ESP_APPTRACE_TMO_INFINITE)
+#define ESP_APPTRACE_TEST_WRITE_FROM_ISR(_b_, _s_)   esp_apptrace_write(_b_, _s_, 0UL)
+#define ESP_APPTRACE_TEST_WRITE_NOWAIT(_b_, _s_)     esp_apptrace_write(_b_, _s_, 0)
 
 typedef struct {
     uint8_t *buf;
@@ -625,7 +624,7 @@ static int esp_logtrace_printf(const char *fmt, ...)
 
     va_start(ap, fmt);
 
-    int ret = esp_apptrace_vprintf_to(ESP_APPTRACE_DEST_TRAX, ESP_APPTRACE_TMO_INFINITE, fmt, ap);
+    int ret = esp_apptrace_vprintf_to(ESP_APPTRACE_TMO_INFINITE, fmt, ap);
 
     va_end(ap);
 
@@ -657,7 +656,7 @@ static void esp_logtrace_task(void *p)
             break;
         }
     }
-    esp_err_t ret = esp_apptrace_flush(ESP_APPTRACE_DEST_TRAX, ESP_APPTRACE_TMO_INFINITE);
+    esp_err_t ret = esp_apptrace_flush(ESP_APPTRACE_TMO_INFINITE);
     if (ret != ESP_OK) {
         ESP_APPTRACE_TEST_LOGE("Failed to flush printf buf (%d)!", ret);
     }

components/app_trace/test_apps/sdkconfig.defaults

@@ -1,2 +1,3 @@
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
+CONFIG_APPTRACE_ENABLE=y
 CONFIG_APPTRACE_DEST_JTAG=y

components/app_update/CMakeLists.txt

@@ -4,7 +4,7 @@ if(${target} STREQUAL "linux")
     return() # This component is not supported by the POSIX/Linux simulator
 endif()
 
-idf_component_register(SRCS "esp_ota_ops.c" "esp_ota_app_desc.c"
+idf_component_register(SRCS "esp_ota_ops.c"
                     INCLUDE_DIRS "include"
                     REQUIRES partition_table bootloader_support esp_app_format esp_bootloader_format esp_partition
                     PRIV_REQUIRES esptool_py efuse spi_flash)
@@ -29,7 +29,9 @@ if(NOT BOOTLOADER_BUILD)
 
         add_custom_target(blank_ota_data ALL DEPENDS ${blank_otadata_file})
         add_dependencies(flash blank_ota_data)
-        add_dependencies(encrypted-flash blank_ota_data)
+        if(CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT)
+            add_dependencies(encrypted-flash blank_ota_data)
+        endif()
 
         set(otatool_py "${python}" "${COMPONENT_DIR}/otatool.py")
 

components/app_update/esp_ota_app_desc.c

@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <assert.h>
-#include <sys/param.h>
-#include "esp_ota_ops.h"
-#include "esp_attr.h"
-#include "sdkconfig.h"
-
-const esp_app_desc_t *esp_ota_get_app_description(void)
-{
-    return esp_app_get_description();
-}
-
-int esp_ota_get_app_elf_sha256(char* dst, size_t size)
-{
-   return esp_app_get_elf_sha256(dst, size);
-}

components/app_update/esp_ota_ops.c

@@ -33,7 +33,7 @@
 #include "esp_flash.h"
 #include "esp_flash_internal.h"
 
-#define SUB_TYPE_ID(i) (i & 0x0F)
+#define OTA_SLOT(i) (i & 0x0F)
 #define ALIGN_UP(num, align) (((num) + ((align) - 1)) & ~((align) - 1))
 
 /* Partial_data is word aligned so no reallocation is necessary for encrypted flash write */
@@ -539,6 +539,69 @@ static esp_err_t rewrite_ota_seq(esp_ota_select_entry_t *two_otadata, uint32_t s
     }
 }
 
+/**
+ * @brief Calculate the next OTA sequence number that will boot the given OTA slot.
+ *
+ * Based on the ESP-IDF OTA boot scheme, the system selects the OTA slot to boot by:
+ *   boot_slot = (seq - 1) % ota_app_count
+ *
+ * This function determines the required seq value that would cause the given ota_slot_idx
+ * to be selected on next boot.
+ *
+ * @param current_seq     Current active OTA sequence number
+ * @param ota_slot_idx    Target OTA slot index (0-based)
+ * @param ota_app_count   Total number of OTA slots
+ *
+ * @return New sequence number that will result in booting ota_slot_idx
+ */
+static uint32_t compute_ota_seq_for_target_slot(uint32_t current_seq, uint32_t ota_slot_idx, uint8_t ota_app_count)
+{
+    if (ota_app_count == 0) {
+        return 0;
+    }
+    /* ESP-IDF stores OTA boot information in the OTA data partition, which consists of two sectors.
+     * Each sector holds an esp_ota_select_entry_t structure: otadata[0] and otadata[1].
+     * These structures record the OTA sequence number (ota_seq) used to determine the current boot partition.
+     *
+     * Boot selection logic:
+     * - If both otadata[0].ota_seq and otadata[1].ota_seq are 0xFFFFFFFF (invalid), it is the initial state:
+     *     → Boot the factory app, if it exists.
+     *     → Otherwise, fall back to booting ota[0].
+     *
+     * - If both otadata entries have valid sequence numbers and CRCs:
+     *     → Choose the higher sequence number (max_seq).
+     *     → Determine the OTA partition for boot (or running partition) using:
+     *          running_ota_slot = (max_seq - 1) % ota_app_count
+     *       where ota_app_count is the total number of OTA app partitions.
+     *
+     * Example:
+     *     otadata[0].ota_seq = 4
+     *     otadata[1].ota_seq = 5
+     *     ota_app_count = 8 (available OTA slots: ota_0 to ota_7)
+     *     → max_seq = 5
+     *     → running slot = (5 - 1) % 8 = 4
+     *     → So ota_4 is currently running
+     *
+     * If you want to switch to boot a different OTA slot (e.g., ota_7):
+     *     → You need to compute a new sequence number such that:
+     *          (new_seq - 1) % ota_app_count == 7
+     *       while ensuring new_seq > current_seq.
+     *
+     * General formula:
+     *         x = current OTA slot ID
+     *         ota_slot_idx = desired OTA slot ID
+     *         seq = current ota_seq
+     *
+     *     To find the next ota_seq that will boot ota_y, use:
+     *         new_seq = ((ota_slot_idx + 1) % ota_app_count) + ota_app_count * i;
+     *         // where i is the smallest non-negative integer such that new_seq > seq
+     */
+    uint32_t i = 0;
+    uint32_t base = (ota_slot_idx + 1) % ota_app_count;
+    while (current_seq > (base + i * ota_app_count)) { i++; };
+    return base + i * ota_app_count;
+}
+
 uint8_t esp_ota_get_app_partition_count(void)
 {
     uint16_t ota_app_count = 0;
@@ -549,6 +612,30 @@ uint8_t esp_ota_get_app_partition_count(void)
     return ota_app_count;
 }
 
+/**
+ * @brief Update the OTA data partition to set the given OTA app subtype as the next boot target.
+ *
+ * ESP-IDF uses the OTA data partition to track which OTA app should boot.
+ * This partition contains two entries (otadata[0] and otadata[1]), each storing an esp_ota_select_entry_t struct,
+ * which includes the OTA sequence number (ota_seq).
+ *
+ * On boot, the chip determines the current running OTA slot using:
+ *     current_slot = (max(ota_seq) - 1) % ota_app_count
+ *
+ * This function updates the OTA data to switch the next boot to the partition with the given subtype.
+ *
+ * Behavior:
+ * - If the currently selected OTA slot already matches the requested subtype,
+ *   only the state field is updated (e.g., to mark the app as newly downloaded).
+ * - Otherwise, it calculates the next valid ota_seq that will cause the bootloader to select
+ *   the requested OTA slot on reboot, and writes it to the inactive OTA data sector.
+ *
+ * @param subtype The OTA partition subtype (e.g., ESP_PARTITION_SUBTYPE_APP_OTA_0, ..._OTA_1, ...)
+ * @return
+ *     - ESP_OK if update was successful
+ *     - ESP_ERR_NOT_FOUND if OTA data partition not found
+ *     - ESP_ERR_INVALID_ARG if subtype is out of range
+ */
 static esp_err_t esp_rewrite_ota_data(esp_partition_subtype_t subtype)
 {
     esp_ota_select_entry_t otadata[2];
@@ -558,42 +645,31 @@ static esp_err_t esp_rewrite_ota_data(esp_partition_subtype_t subtype)
     }
 
     uint8_t ota_app_count = esp_ota_get_app_partition_count();
-    if (SUB_TYPE_ID(subtype) >= ota_app_count) {
+    if (OTA_SLOT(subtype) >= ota_app_count) {
         return ESP_ERR_INVALID_ARG;
     }
-
-    //esp32_idf use two sector for store information about which partition is running
-    //it defined the two sector as ota data partition,two structure esp_ota_select_entry_t is saved in the two sector
-    //named data in first sector as otadata[0], second sector data as otadata[1]
-    //e.g.
-    //if otadata[0].ota_seq == otadata[1].ota_seq == 0xFFFFFFFF,means ota info partition is in init status
-    //so it will boot factory application(if there is),if there's no factory application,it will boot ota[0] application
-    //if otadata[0].ota_seq != 0 and otadata[1].ota_seq != 0,it will choose a max seq ,and get value of max_seq%max_ota_app_number
-    //and boot a subtype (mask 0x0F) value is (max_seq - 1)%max_ota_app_number,so if want switch to run ota[x],can use next formulas.
-    //for example, if otadata[0].ota_seq = 4, otadata[1].ota_seq = 5, and there are 8 ota application,
-    //current running is (5-1)%8 = 4,running ota[4],so if we want to switch to run ota[7],
-    //we should add otadata[0].ota_seq (is 4) to 4 ,(8-1)%8=7,then it will boot ota[7]
-    //if      A=(B - C)%D
-    //then    B=(A + C)%D + D*n ,n= (0,1,2...)
-    //so current ota app sub type id is x , dest bin subtype is y,total ota app count is n
-    //seq will add (x + n*1 + 1 - seq)%n
-
     int active_otadata = bootloader_common_get_active_otadata(otadata);
+    int next_otadata;
+    uint32_t new_seq;
     if (active_otadata != -1) {
-        uint32_t seq = otadata[active_otadata].ota_seq;
-        uint32_t i = 0;
-        while (seq > (SUB_TYPE_ID(subtype) + 1) % ota_app_count + i * ota_app_count) {
-            i++;
+        uint32_t ota_slot = (otadata[active_otadata].ota_seq - 1) % ota_app_count;
+        if (ota_slot == OTA_SLOT(subtype)) {
+            // ota_data is already valid and points to the correct OTA slot.
+            // So after reboot the requested partition will be selected for boot.
+            // Only update the ota_state of the requested partition.
+            next_otadata = active_otadata;
+            new_seq = otadata[active_otadata].ota_seq;
+        } else {
+            next_otadata = (~active_otadata) & 1; // if 0 -> will be next 1. and if 1 -> will be next 0.
+            new_seq = compute_ota_seq_for_target_slot(otadata[active_otadata].ota_seq, OTA_SLOT(subtype), ota_app_count);
         }
-        int next_otadata = (~active_otadata)&1; // if 0 -> will be next 1. and if 1 -> will be next 0.
-        otadata[next_otadata].ota_state = set_new_state_otadata();
-        return rewrite_ota_seq(otadata, (SUB_TYPE_ID(subtype) + 1) % ota_app_count + i * ota_app_count, next_otadata, otadata_partition);
     } else {
         /* Both OTA slots are invalid, probably because unformatted... */
-        int next_otadata = 0;
-        otadata[next_otadata].ota_state = set_new_state_otadata();
-        return rewrite_ota_seq(otadata, SUB_TYPE_ID(subtype) + 1, next_otadata, otadata_partition);
+        next_otadata = 0;
+        new_seq = OTA_SLOT(subtype) + 1;
     }
+    otadata[next_otadata].ota_state = set_new_state_otadata();
+    return rewrite_ota_seq(otadata, new_seq, next_otadata, otadata_partition);
 }
 
 esp_err_t esp_ota_set_boot_partition(const esp_partition_t *partition)

components/app_update/include/esp_ota_ops.h

@@ -42,30 +42,6 @@ extern "C"
  */
 typedef uint32_t esp_ota_handle_t;
 
-/**
- * @brief   Return esp_app_desc structure. This structure includes app version.
- *
- * @note This API is present for backward compatibility reasons. Alternative function
- * with the same functionality is `esp_app_get_description`
- *
- * Return description for running app.
- * @return Pointer to esp_app_desc structure.
- */
-const esp_app_desc_t *esp_ota_get_app_description(void) __attribute__((deprecated("Please use esp_app_get_description instead")));
-
-/**
- * @brief   Fill the provided buffer with SHA256 of the ELF file, formatted as hexadecimal, null-terminated.
- * If the buffer size is not sufficient to fit the entire SHA256 in hex plus a null terminator,
- * the largest possible number of bytes will be written followed by a null.
- *
-* @note This API is present for backward compatibility reasons. Alternative function
- * with the same functionality is `esp_app_get_elf_sha256`
- *
- * @param dst   Destination buffer
- * @param size  Size of the buffer
- * @return      Number of bytes written to dst (including null terminator)
- */
-int esp_ota_get_app_elf_sha256(char* dst, size_t size) __attribute__((deprecated("Please use esp_app_get_elf_sha256 instead")));
 
 /**
  * @brief   Commence an OTA update writing to the specified partition.
@@ -113,6 +89,10 @@ esp_err_t esp_ota_begin(const esp_partition_t* partition, size_t image_size, esp
  * Unlike esp_ota_begin(), this function does not erase the partition which receives the OTA update, but rather expects that part of the image
  * has already been written correctly, and it resumes writing from the given offset.
  *
+ * @note When flash encryption is enabled, data writes must be 16-byte aligned.
+ *       Any leftover (non-aligned) data is temporarily cached and may be lost after reboot.
+ *       Therefore, during resumption, ensure that image offset is always 16-byte aligned.
+ *
  * @param partition Pointer to info for the partition which is receiving the OTA update. Required.
  * @param erase_size Specifies how much flash memory to erase before resuming OTA, depending on whether a sequential write or a bulk erase is being used.
  * @param image_offset Offset from where to resume the OTA process. Should be set to the number of bytes already written.

components/app_update/otatool.py

@@ -3,10 +3,8 @@
 # otatool is used to perform ota-level operations - flashing ota partition
 # erasing ota partition and switching ota partition
 #
-# SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2018-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-from __future__ import division, print_function
-
 import argparse
 import binascii
 import collections
@@ -16,12 +14,18 @@ import sys
 import tempfile
 
 try:
-    from parttool import PARTITION_TABLE_OFFSET, PartitionName, PartitionType, ParttoolTarget
+    from parttool import PARTITION_TABLE_OFFSET
+    from parttool import PartitionName
+    from parttool import PartitionType
+    from parttool import ParttoolTarget
 except ImportError:
     COMPONENTS_PATH = os.path.expandvars(os.path.join('$IDF_PATH', 'components'))
     PARTTOOL_DIR = os.path.join(COMPONENTS_PATH, 'partition_table')
     sys.path.append(PARTTOOL_DIR)
-    from parttool import PARTITION_TABLE_OFFSET, PartitionName, PartitionType, ParttoolTarget
+    from parttool import PARTITION_TABLE_OFFSET
+    from parttool import PartitionName
+    from parttool import PartitionType
+    from parttool import ParttoolTarget
 
 __version__ = '2.0'
 
@@ -35,15 +39,31 @@ def status(msg):
         print(msg)
 
 
-class OtatoolTarget():
-
+class OtatoolTarget:
     OTADATA_PARTITION = PartitionType('data', 'ota')
 
-    def __init__(self, port=None, baud=None, partition_table_offset=PARTITION_TABLE_OFFSET, partition_table_file=None,
-                 spi_flash_sec_size=SPI_FLASH_SEC_SIZE, esptool_args=[], esptool_write_args=[],
-                 esptool_read_args=[], esptool_erase_args=[]):
-        self.target = ParttoolTarget(port, baud, partition_table_offset, partition_table_file, esptool_args,
-                                     esptool_write_args, esptool_read_args, esptool_erase_args)
+    def __init__(
+        self,
+        port=None,
+        baud=None,
+        partition_table_offset=PARTITION_TABLE_OFFSET,
+        partition_table_file=None,
+        spi_flash_sec_size=SPI_FLASH_SEC_SIZE,
+        esptool_args=[],
+        esptool_write_args=[],
+        esptool_read_args=[],
+        esptool_erase_args=[],
+    ):
+        self.target = ParttoolTarget(
+            port,
+            baud,
+            partition_table_offset,
+            partition_table_file,
+            esptool_args,
+            esptool_write_args,
+            esptool_read_args,
+            esptool_erase_args,
+        )
         self.spi_flash_sec_size = spi_flash_sec_size
 
         temp_file = tempfile.NamedTemporaryFile(delete=False)
@@ -71,8 +91,8 @@ class OtatoolTarget():
         for i in range(2):
             start = i * (self.spi_flash_sec_size >> 1)
 
-            seq = bytearray(self.otadata[start:start + 4])
-            crc = bytearray(self.otadata[start + 28:start + 32])
+            seq = bytearray(self.otadata[start : start + 4])
+            crc = bytearray(self.otadata[start + 28 : start + 32])
 
             seq = struct.unpack('I', seq)
             crc = struct.unpack('I', crc)
@@ -118,7 +138,9 @@ class OtatoolTarget():
 
         try:
             if isinstance(ota_id, int):
-                ota_partition_next = filter(lambda p: p.subtype - gen.MIN_PARTITION_SUBTYPE_APP_OTA  == ota_id, ota_partitions)
+                ota_partition_next = filter(
+                    lambda p: p.subtype - gen.MIN_PARTITION_SUBTYPE_APP_OTA == ota_id, ota_partitions
+                )
             else:
                 ota_partition_next = filter(lambda p: p.name == ota_id, ota_partitions)
 
@@ -192,8 +214,8 @@ class OtatoolTarget():
     def read_ota_partition(self, ota_id, output):
         self.target.read_partition(self._get_partition_id_from_ota_id(ota_id), output)
 
-    def write_ota_partition(self, ota_id, input):
-        self.target.write_partition(self._get_partition_id_from_ota_id(ota_id), input)
+    def write_ota_partition(self, ota_id, input_file):
+        self.target.write_partition(self._get_partition_id_from_ota_id(ota_id), input_file)
 
     def erase_ota_partition(self, ota_id):
         self.target.erase_partition(self._get_partition_id_from_ota_id(ota_id))
@@ -205,8 +227,10 @@ def _read_otadata(target):
     otadata_info = target._get_otadata_info()
 
     print('             {:8s} \t  {:8s} | \t  {:8s} \t   {:8s}'.format('OTA_SEQ', 'CRC', 'OTA_SEQ', 'CRC'))
-    print('Firmware:  0x{:08x} \t0x{:08x} | \t0x{:08x} \t 0x{:08x}'.format(otadata_info[0].seq, otadata_info[0].crc,
-          otadata_info[1].seq, otadata_info[1].crc))
+    print(
+        f'Firmware:  {otadata_info[0].seq:#08x} \t{otadata_info[0].crc:#08x} | '
+        f'\t{otadata_info[1].seq:#08x} \t {otadata_info[1].crc:#08x}'
+    )
 
 
 def _erase_otadata(target):
@@ -220,12 +244,12 @@ def _switch_ota_partition(target, ota_id):
 
 def _read_ota_partition(target, ota_id, output):
     target.read_ota_partition(ota_id, output)
-    status('Read ota partition contents to file {}'.format(output))
+    status(f'Read ota partition contents to file {output}')
 
 
-def _write_ota_partition(target, ota_id, input):
-    target.write_ota_partition(ota_id, input)
-    status('Written contents of file {} to ota partition'.format(input))
+def _write_ota_partition(target, ota_id, input_file):
+    target.write_ota_partition(ota_id, input_file)
+    status(f'Written contents of file {input_file} to ota partition')
 
 
 def _erase_ota_partition(target, ota_id):
@@ -240,9 +264,13 @@ def main():
 
     parser.add_argument('--quiet', '-q', help='suppress stderr messages', action='store_true')
     parser.add_argument('--esptool-args', help='additional main arguments for esptool', nargs='+')
-    parser.add_argument('--esptool-write-args', help='additional subcommand arguments for esptool write_flash', nargs='+')
-    parser.add_argument('--esptool-read-args', help='additional subcommand arguments for esptool read_flash', nargs='+')
-    parser.add_argument('--esptool-erase-args', help='additional subcommand arguments for esptool erase_region', nargs='+')
+    parser.add_argument(
+        '--esptool-write-args', help='additional subcommand arguments for esptool write-flash', nargs='+'
+    )
+    parser.add_argument('--esptool-read-args', help='additional subcommand arguments for esptool read-flash', nargs='+')
+    parser.add_argument(
+        '--esptool-erase-args', help='additional subcommand arguments for esptool erase-region', nargs='+'
+    )
 
     # There are two possible sources for the partition table: a device attached to the host
     # or a partition table CSV/binary file. These sources are mutually exclusive.
@@ -250,10 +278,14 @@ def main():
 
     parser.add_argument('--baud', '-b', help='baudrate to use', type=int)
 
-    parser.add_argument('--partition-table-offset', '-o', help='offset to read the partition table from',  type=str)
+    parser.add_argument('--partition-table-offset', '-o', help='offset to read the partition table from', type=str)
 
-    parser.add_argument('--partition-table-file', '-f', help='file (CSV/binary) to read the partition table from; \
-                                                            overrides device attached to specified port as the partition table source when defined')
+    parser.add_argument(
+        '--partition-table-file',
+        '-f',
+        help='file (CSV/binary) to read the partition table from; '
+        'overrides device attached to specified port as the partition table source when defined',
+    )
 
     subparsers = parser.add_subparsers(dest='operation', help='run otatool -h for additional help')
 
@@ -269,15 +301,25 @@ def main():
     slot_or_name_parser_args.add_argument('--slot', help='slot number of the ota partition', type=int)
     slot_or_name_parser_args.add_argument('--name', help='name of the ota partition')
 
-    subparsers.add_parser('switch_ota_partition', help='switch otadata partition', parents=[slot_or_name_parser, spi_flash_sec_size])
+    subparsers.add_parser(
+        'switch_ota_partition', help='switch otadata partition', parents=[slot_or_name_parser, spi_flash_sec_size]
+    )
 
-    read_ota_partition_subparser = subparsers.add_parser('read_ota_partition', help='read contents of an ota partition', parents=[slot_or_name_parser])
-    read_ota_partition_subparser.add_argument('--output', help='file to write the contents of the ota partition to', required=True)
+    read_ota_partition_subparser = subparsers.add_parser(
+        'read_ota_partition', help='read contents of an ota partition', parents=[slot_or_name_parser]
+    )
+    read_ota_partition_subparser.add_argument(
+        '--output', help='file to write the contents of the ota partition to', required=True
+    )
 
-    write_ota_partition_subparser = subparsers.add_parser('write_ota_partition', help='write contents to an ota partition', parents=[slot_or_name_parser])
+    write_ota_partition_subparser = subparsers.add_parser(
+        'write_ota_partition', help='write contents to an ota partition', parents=[slot_or_name_parser]
+    )
     write_ota_partition_subparser.add_argument('--input', help='file whose contents to write to the ota partition')
 
-    subparsers.add_parser('erase_ota_partition', help='erase contents of an ota partition', parents=[slot_or_name_parser])
+    subparsers.add_parser(
+        'erase_ota_partition', help='erase contents of an ota partition', parents=[slot_or_name_parser]
+    )
 
     args = parser.parse_args()
 
@@ -324,7 +366,7 @@ def main():
     target = OtatoolTarget(**target_args)
 
     # Create the operation table and execute the operation
-    common_args = {'target':target}
+    common_args = {'target': target}
 
     ota_id = []
 
@@ -338,18 +380,18 @@ def main():
         pass
 
     otatool_ops = {
-        'read_otadata':(_read_otadata, []),
-        'erase_otadata':(_erase_otadata, []),
-        'switch_ota_partition':(_switch_ota_partition, ota_id),
-        'read_ota_partition':(_read_ota_partition, ['output'] + ota_id),
-        'write_ota_partition':(_write_ota_partition, ['input'] + ota_id),
-        'erase_ota_partition':(_erase_ota_partition, ota_id)
+        'read_otadata': (_read_otadata, []),
+        'erase_otadata': (_erase_otadata, []),
+        'switch_ota_partition': (_switch_ota_partition, ota_id),
+        'read_ota_partition': (_read_ota_partition, ['output'] + ota_id),
+        'write_ota_partition': (_write_ota_partition, ['input'] + ota_id),
+        'erase_ota_partition': (_erase_ota_partition, ota_id),
     }
 
     (op, op_args) = otatool_ops[args.operation]
 
     for op_arg in op_args:
-        common_args.update({op_arg:vars(args)[op_arg]})
+        common_args.update({op_arg: vars(args)[op_arg]})
 
     try:
         common_args['ota_id'] = common_args.pop('name')

components/app_update/test_apps/test_app_update/.build-test-rules.yml

@@ -7,6 +7,7 @@ components/app_update/test_apps:
     - if: CONFIG_NAME == "xip_psram" and SOC_SPIRAM_XIP_SUPPORTED == 1
     # S2 doesn't have ROM for flash
     - if: CONFIG_NAME == "xip_psram_with_rom_impl" and (SOC_SPIRAM_XIP_SUPPORTED == 1 and IDF_TARGET != "esp32s2")
+    - if: CONFIG_NAME == "recovery_bootloader" and SOC_RECOVERY_BOOTLOADER_SUPPORTED == 1
   disable:
     - if: IDF_TARGET in ["esp32h21", "esp32h4"]
       temporary: true
@@ -14,3 +15,7 @@ components/app_update/test_apps:
     - if: IDF_TARGET == "esp32c61" and CONFIG_NAME == "xip_psram_with_rom_impl"
       temporary: true
       reason: not supported yet  # TODO: [ESP32C61] IDF-12784
+  disable_test:
+    - if: CONFIG_NAME == "recovery_bootloader" and SOC_RECOVERY_BOOTLOADER_SUPPORTED == 1 and IDF_TARGET == "esp32c61"
+      temporary: true
+      reason: lack of runners  # TODO: [ESP32C61] IDF-13165

components/app_update/test_apps/test_app_update/CMakeLists.txt

@@ -1,7 +1,7 @@
 #This is the project CMakeLists.txt file for the test subproject
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
+set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
 set(COMPONENTS main)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

components/app_update/test_apps/test_app_update/main/CMakeLists.txt

@@ -1,4 +1,15 @@
-idf_component_register(SRC_DIRS "."
-                       PRIV_INCLUDE_DIRS "."
-                       PRIV_REQUIRES cmock test_utils app_update bootloader_support nvs_flash driver spi_flash esp_psram
-                      WHOLE_ARCHIVE)
+idf_component_register(
+    SRC_DIRS "."
+    PRIV_INCLUDE_DIRS "."
+    PRIV_REQUIRES
+        cmock
+        test_utils
+        app_update
+        bootloader_support
+        nvs_flash
+        esp_driver_gpio
+        spi_flash
+        esp_psram
+        efuse
+    WHOLE_ARCHIVE
+)

components/app_update/test_apps/test_app_update/main/test_bootloader_update.c

@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*
+ * Tests bootloader update.
+ */
+
+#include "unity.h"
+#include "esp_log.h"
+#include "esp_efuse.h"
+#include "esp_flash_internal.h"
+#include "esp_rom_sys.h"
+#include "utils_update.h"
+#include "sdkconfig.h"
+
+#define BOOT_COUNT_NAMESPACE "boot_count"
+
+static __attribute__((unused)) const char *TAG = "btldr_update";
+
+#if CONFIG_BOOTLOADER_RECOVERY_ENABLE
+
+/* @brief Checks and prepares the partition so that the factory app is launched after that.
+ */
+static void start_test(void)
+{
+    ESP_LOGI(TAG, "boot count 1 - reset");
+    set_boot_count_in_nvs(1);
+    erase_ota_data();
+    ESP_LOGI(TAG, "ota_data erased");
+    ESP_LOGI(TAG, "Bootloader offset: 0x%x", esp_rom_get_bootloader_offset());
+    reboot_as_deep_sleep();
+}
+
+static void test_flow1(void)
+{
+    uint8_t boot_count = get_boot_count_from_nvs();
+    boot_count++;
+    set_boot_count_in_nvs(boot_count);
+    ESP_LOGI(TAG, "boot count %d", boot_count);
+
+    ESP_LOGI(TAG, "Bootloader offset: 0x%x", esp_rom_get_bootloader_offset());
+
+    const esp_partition_t *primary_bootloader;
+    TEST_ESP_OK(esp_partition_register_external(NULL, ESP_PRIMARY_BOOTLOADER_OFFSET, ESP_BOOTLOADER_SIZE, "PrimaryBTLDR", ESP_PARTITION_TYPE_BOOTLOADER, ESP_PARTITION_SUBTYPE_BOOTLOADER_PRIMARY, &primary_bootloader));
+    const esp_partition_t *recovery_bootloader;
+    TEST_ESP_OK(esp_partition_register_external(NULL, CONFIG_BOOTLOADER_RECOVERY_OFFSET, ESP_BOOTLOADER_SIZE, "RecoveryBTLDR", ESP_PARTITION_TYPE_BOOTLOADER, ESP_PARTITION_SUBTYPE_BOOTLOADER_RECOVERY, &recovery_bootloader));
+    ESP_LOGI(TAG, "Bootloaders are registered");
+
+    // Remove write protection for the bootloader
+    esp_flash_set_dangerous_write_protection(esp_flash_default_chip, false);
+    switch (boot_count) {
+        case 2:
+            TEST_ASSERT_EQUAL_HEX32(ESP_PRIMARY_BOOTLOADER_OFFSET, esp_rom_get_bootloader_offset());
+
+            TEST_ESP_OK(esp_partition_erase_range(recovery_bootloader, 0, recovery_bootloader->size));
+            ESP_LOGI(TAG, "Erase recovery bootloader");
+
+            TEST_ESP_OK(esp_efuse_set_recovery_bootloader_offset(CONFIG_BOOTLOADER_RECOVERY_OFFSET));
+
+            ESP_LOGI(TAG, "Backup, copy <%s> -> <%s>", primary_bootloader->label, recovery_bootloader->label);
+            TEST_ESP_OK(esp_partition_copy(recovery_bootloader, 0, primary_bootloader, 0, primary_bootloader->size));
+
+            TEST_ESP_OK(esp_partition_erase_range(primary_bootloader, 0, primary_bootloader->size));
+            ESP_LOGI(TAG, "Erase primary bootloader");
+            reboot_as_deep_sleep();
+            break;
+        case 3:
+            TEST_ASSERT_EQUAL_HEX32(CONFIG_BOOTLOADER_RECOVERY_OFFSET, esp_rom_get_bootloader_offset());
+
+            ESP_LOGI(TAG, "Return to primary bootloader...");
+            ESP_LOGI(TAG, "Copy <%s> -> <%s>", recovery_bootloader->label, primary_bootloader->label);
+            TEST_ESP_OK(esp_partition_copy(primary_bootloader, 0, recovery_bootloader, 0, primary_bootloader->size));
+
+            TEST_ESP_OK(esp_partition_erase_range(recovery_bootloader, 0, recovery_bootloader->size));
+            ESP_LOGI(TAG, "Erase recovery bootloader");
+            break;
+        default:
+            TEST_FAIL_MESSAGE("Unexpected stage");
+            break;
+    }
+}
+
+TEST_CASE_MULTIPLE_STAGES("Recovery bootloader feature", "[recovery_bootloader][timeout=90][reset=DEEPSLEEP_RESET, DEEPSLEEP_RESET]", start_test, test_flow1, test_flow1);
+
+#endif // CONFIG_BOOTLOADER_RECOVERY_ENABLE

components/app_update/test_apps/test_app_update/main/test_ota_partitions.c

@@ -15,7 +15,7 @@
 #include "nvs_flash.h"
 #include "sdkconfig.h"
 
-static const char *TAG = "test";
+ESP_LOG_ATTR_TAG(TAG, "test");
 
 static uint8_t buffer[SPI_FLASH_SEC_SIZE];
 

components/app_update/test_apps/test_app_update/main/test_switch_ota.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,314 +7,16 @@
  * Tests for switching between partitions: factory, OTAx, test.
  */
 
-#include <esp_types.h>
-#include <stdio.h>
-#include "string.h"
-#include <inttypes.h>
-#include "sdkconfig.h"
-
-#include "esp_rom_spiflash.h"
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/semphr.h"
-#include "freertos/queue.h"
-#include "unity.h"
-
+#include "esp_system.h"
 #include "bootloader_common.h"
 #include "../bootloader_flash/include/bootloader_flash_priv.h"
-
-#include "esp_err.h"
 #include "esp_log.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-#include "esp_flash_partitions.h"
-#include "esp_image_format.h"
-#include "nvs_flash.h"
+#include "unity.h"
+#include "utils_update.h"
+#include "sdkconfig.h"
 
-#include "driver/gpio.h"
-#include "esp_sleep.h"
-#include "test_utils.h"
+ESP_LOG_ATTR_TAG(TAG, "ota_test");
 
-#define BOOT_COUNT_NAMESPACE "boot_count"
-
-static const char *TAG = "ota_test";
-
-static void set_boot_count_in_nvs(uint8_t boot_count)
-{
-    nvs_handle_t boot_count_handle;
-    esp_err_t err = nvs_open(BOOT_COUNT_NAMESPACE, NVS_READWRITE, &boot_count_handle);
-    if (err != ESP_OK) {
-        TEST_ESP_OK(nvs_flash_erase());
-        TEST_ESP_OK(nvs_flash_init());
-        TEST_ESP_OK(nvs_open(BOOT_COUNT_NAMESPACE, NVS_READWRITE, &boot_count_handle));
-    }
-    TEST_ESP_OK(nvs_set_u8(boot_count_handle, "boot_count", boot_count));
-    TEST_ESP_OK(nvs_commit(boot_count_handle));
-    nvs_close(boot_count_handle);
-}
-
-static uint8_t get_boot_count_from_nvs(void)
-{
-    nvs_handle_t boot_count_handle;
-    esp_err_t err = nvs_open(BOOT_COUNT_NAMESPACE, NVS_READONLY, &boot_count_handle);
-    if (err == ESP_ERR_NVS_NOT_FOUND) {
-        set_boot_count_in_nvs(0);
-    }
-    uint8_t boot_count;
-    TEST_ESP_OK(nvs_get_u8(boot_count_handle, "boot_count", &boot_count));
-    nvs_close(boot_count_handle);
-    return boot_count;
-}
-
-/* @brief Copies a current app to next partition using handle.
- *
- * @param[in] update_handle - Handle of API ota.
- * @param[in] cur_app - Current app.
- */
-static void copy_app_partition(esp_ota_handle_t update_handle, const esp_partition_t *curr_app)
-{
-    const void *partition_bin = NULL;
-    esp_partition_mmap_handle_t data_map;
-    ESP_LOGI(TAG, "start the copy process");
-    TEST_ESP_OK(esp_partition_mmap(curr_app, 0, curr_app->size, ESP_PARTITION_MMAP_DATA, &partition_bin, &data_map));
-    TEST_ESP_OK(esp_ota_write(update_handle, (const void *)partition_bin, curr_app->size));
-    esp_partition_munmap(data_map);
-    ESP_LOGI(TAG, "finish the copy process");
-}
-
-/* @brief Copies a current app to next partition using handle.
- *
- * @param[in] update_handle - Handle of API ota.
- * @param[in] cur_app - Current app.
- */
-static void copy_app_partition_with_offset(esp_ota_handle_t update_handle, const esp_partition_t *curr_app)
-{
-    const void *partition_bin = NULL;
-    esp_partition_mmap_handle_t  data_map;
-    ESP_LOGI(TAG, "start the copy process");
-    uint32_t offset = 0, bytes_to_write = curr_app->size;
-    uint32_t write_bytes;
-    while (bytes_to_write > 0) {
-        write_bytes = (bytes_to_write > (4 * 1024)) ? (4 * 1024) : bytes_to_write;
-        TEST_ESP_OK(esp_partition_mmap(curr_app, offset, write_bytes, ESP_PARTITION_MMAP_DATA, &partition_bin, &data_map));
-        TEST_ESP_OK(esp_ota_write_with_offset(update_handle, (const void *)partition_bin, write_bytes, offset));
-        esp_partition_munmap(data_map);
-        bytes_to_write -= write_bytes;
-        offset += write_bytes;
-    }
-    ESP_LOGI(TAG, "finish the copy process");
-}
-
-/* @brief Get the next partition of OTA for the update.
- *
- * @return The next partition of OTA(OTA0-15).
- */
-static const esp_partition_t * get_next_update_partition(void)
-{
-    const esp_partition_t *update_partition = esp_ota_get_next_update_partition(NULL);
-    TEST_ASSERT_NOT_EQUAL(NULL, update_partition);
-    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, update_partition->subtype, update_partition->address);
-    return update_partition;
-}
-
-/* @brief Copies a current app to next partition (OTA0-15) and then configure OTA data for a new boot partition.
- *
- * @param[in] cur_app_partition - Current app.
- * @param[in] next_app_partition - Next app for boot.
- */
-static void copy_current_app_to_next_part(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition)
-{
-    esp_ota_get_next_update_partition(NULL);
-    TEST_ASSERT_NOT_EQUAL(NULL, next_app_partition);
-    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, next_app_partition->subtype, next_app_partition->address);
-
-    esp_ota_handle_t update_handle = 0;
-    TEST_ESP_OK(esp_ota_begin(next_app_partition, OTA_SIZE_UNKNOWN, &update_handle));
-
-    copy_app_partition(update_handle, cur_app_partition);
-
-    TEST_ESP_OK(esp_ota_end(update_handle));
-    TEST_ESP_OK(esp_ota_set_boot_partition(next_app_partition));
-}
-
-/* @brief Copies a current app to next partition (OTA0-15) and then configure OTA data for a new boot partition.
- *
- * @param[in] cur_app_partition - Current app.
- * @param[in] next_app_partition - Next app for boot.
- */
-static void copy_current_app_to_next_part_with_offset(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition)
-{
-    esp_ota_get_next_update_partition(NULL);
-    TEST_ASSERT_NOT_EQUAL(NULL, next_app_partition);
-    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, next_app_partition->subtype, next_app_partition->address);
-
-    esp_ota_handle_t update_handle = 0;
-    TEST_ESP_OK(esp_ota_begin(next_app_partition, OTA_SIZE_UNKNOWN, &update_handle));
-
-    copy_app_partition_with_offset(update_handle, cur_app_partition);
-
-    TEST_ESP_OK(esp_ota_end(update_handle));
-    TEST_ESP_OK(esp_ota_set_boot_partition(next_app_partition));
-}
-
-/* @brief Erase otadata partition
- */
-static void erase_ota_data(void)
-{
-    const esp_partition_t *data_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, NULL);
-    TEST_ASSERT_NOT_EQUAL(NULL, data_partition);
-    TEST_ESP_OK(esp_partition_erase_range(data_partition, 0, 2 * data_partition->erase_size));
-}
-
-/* @brief Reboots ESP using mode deep sleep. This mode guaranty that RTC_DATA_ATTR variables is not reset.
- */
-static void reboot_as_deep_sleep(void)
-{
-    ESP_LOGI(TAG, "reboot as deep sleep");
-    esp_deep_sleep(20000);
-    TEST_FAIL_MESSAGE("Should never be reachable except when sleep is rejected, abort");
-}
-
-/* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx.
- */
-static void copy_current_app_to_next_part_and_reboot(void)
-{
-    const esp_partition_t *cur_app = esp_ota_get_running_partition();
-    ESP_LOGI(TAG, "copy current app to next part");
-    copy_current_app_to_next_part(cur_app, get_next_update_partition());
-    reboot_as_deep_sleep();
-}
-
-/* @brief Copies a current app to next partition (OTA0-15) using esp_ota_write_with_offest(), after that ESP is rebooting and run this (the next) OTAx.
- */
-static void copy_current_app_to_next_part_with_offset_and_reboot(void)
-{
-    const esp_partition_t *cur_app = esp_ota_get_running_partition();
-    ESP_LOGI(TAG, "copy current app to next part");
-    copy_current_app_to_next_part_with_offset(cur_app, get_next_update_partition());
-    reboot_as_deep_sleep();
-}
-
-/* @brief Get running app.
- *
- * @return The next partition of OTA(OTA0-15).
- */
-static const esp_partition_t* get_running_firmware(void)
-{
-    const esp_partition_t *configured = esp_ota_get_boot_partition();
-    const esp_partition_t *running = esp_ota_get_running_partition();
-    ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08"PRIx32")",
-            running->type, running->subtype, running->address);
-    ESP_LOGI(TAG, "Configured partition type %d subtype %d (offset 0x%08"PRIx32")",
-            configured->type, configured->subtype, configured->address);
-    TEST_ASSERT_NOT_EQUAL(NULL, configured);
-    TEST_ASSERT_NOT_EQUAL(NULL, running);
-    if (running->subtype != ESP_PARTITION_SUBTYPE_APP_TEST) {
-        TEST_ASSERT_EQUAL_PTR(running, configured);
-    }
-    return running;
-}
-
-// type of a corrupt ota_data
-typedef enum {
-    CORR_CRC_1_SECTOR_OTA_DATA       = (1 << 0),   /*!< Corrupt CRC only 1 sector of ota_data */
-    CORR_CRC_2_SECTOR_OTA_DATA       = (1 << 1),   /*!< Corrupt CRC only 2 sector of ota_data */
-} corrupt_ota_data_t;
-
-/* @brief Get two copies ota_data from otadata partition.
- *
- * @param[in] otadata_partition - otadata partition.
- * @param[out] ota_data_0 - First copy from otadata_partition.
- * @param[out] ota_data_1 - Second copy from otadata_partition.
- */
-static void get_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data_0, esp_ota_select_entry_t *ota_data_1)
-{
-    uint32_t offset = otadata_partition->address;
-    uint32_t size   = otadata_partition->size;
-    if (offset != 0) {
-        const esp_ota_select_entry_t *ota_select_map;
-        ota_select_map = bootloader_mmap(offset, size);
-        TEST_ASSERT_NOT_EQUAL(NULL, ota_select_map);
-
-        memcpy(ota_data_0, ota_select_map, sizeof(esp_ota_select_entry_t));
-        memcpy(ota_data_1, (uint8_t *)ota_select_map + otadata_partition->erase_size, sizeof(esp_ota_select_entry_t));
-        bootloader_munmap(ota_select_map);
-    }
-}
-
-/* @brief Writes a ota_data into required sector of otadata_partition.
- *
- * @param[in] otadata_partition - Partition information otadata.
- * @param[in] ota_data - otadata structure.
- * @param[in] sec_id - Sector number 0 or 1.
- */
-static void write_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data, int sec_id)
-{
-    esp_partition_write(otadata_partition, otadata_partition->erase_size * sec_id, &ota_data[sec_id], sizeof(esp_ota_select_entry_t));
-}
-
-/* @brief Makes a corrupt of ota_data.
- * @param[in] err - type error
- */
-static void corrupt_ota_data(corrupt_ota_data_t err)
-{
-    esp_ota_select_entry_t ota_data[2];
-
-    const esp_partition_t *otadata_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, NULL);
-    TEST_ASSERT_NOT_EQUAL(NULL, otadata_partition);
-    get_ota_data(otadata_partition, &ota_data[0], &ota_data[1]);
-
-    if (err & CORR_CRC_1_SECTOR_OTA_DATA) {
-        ota_data[0].crc = 0;
-    }
-    if (err & CORR_CRC_2_SECTOR_OTA_DATA) {
-        ota_data[1].crc = 0;
-    }
-    TEST_ESP_OK(esp_partition_erase_range(otadata_partition, 0, otadata_partition->size));
-    write_ota_data(otadata_partition, &ota_data[0], 0);
-    write_ota_data(otadata_partition, &ota_data[1], 1);
-}
-
-#if defined(CONFIG_BOOTLOADER_FACTORY_RESET) || defined(CONFIG_BOOTLOADER_APP_TEST)
-/* @brief Sets the pin number to output and sets output level as low. After reboot (deep sleep) this pin keep the same level.
- *
- * The output level of the pad will be force locked and can not be changed.
- * Power down or call gpio_hold_dis will disable this function.
- *
- * @param[in] num_pin - Pin number
- */
-static void set_output_pin(uint32_t num_pin)
-{
-    TEST_ESP_OK(gpio_hold_dis(num_pin));
-
-    gpio_config_t io_conf;
-    io_conf.intr_type = GPIO_INTR_DISABLE;
-    io_conf.mode = GPIO_MODE_OUTPUT;
-    io_conf.pin_bit_mask = (1ULL << num_pin);
-    io_conf.pull_down_en = 0;
-    io_conf.pull_up_en = 0;
-    TEST_ESP_OK(gpio_config(&io_conf));
-
-    TEST_ESP_OK(gpio_set_level(num_pin, 0));
-    TEST_ESP_OK(gpio_hold_en(num_pin));
-}
-
-/* @brief Unset the pin number hold function.
- */
-static void reset_output_pin(uint32_t num_pin)
-{
-    TEST_ESP_OK(gpio_hold_dis(num_pin));
-    TEST_ESP_OK(gpio_reset_pin(num_pin));
-}
-#endif
-
-static void mark_app_valid(void)
-{
-#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
-    TEST_ESP_OK(esp_ota_mark_app_valid_cancel_rollback());
-#endif
-}
 
 /* @brief Checks and prepares the partition so that the factory app is launched after that.
  */
@@ -546,20 +248,6 @@ static void test_flow5(void)
 TEST_CASE_MULTIPLE_STAGES("Switching between factory, test, factory", "[app_update][timeout=90][reset=SW_CPU_RESET, SW_CPU_RESET, DEEPSLEEP_RESET]", start_test, test_flow5, test_flow5, test_flow5);
 #endif
 
-static const esp_partition_t* app_update(void)
-{
-    const esp_partition_t *cur_app = get_running_firmware();
-    const esp_partition_t* update_partition = esp_ota_get_next_update_partition(NULL);
-    TEST_ASSERT_NOT_NULL(update_partition);
-    esp_ota_handle_t update_handle = 0;
-    TEST_ESP_OK(esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle));
-    copy_app_partition(update_handle, cur_app);
-    TEST_ESP_OK(esp_ota_end(update_handle));
-    TEST_ESP_OK(esp_ota_set_boot_partition(update_partition));
-    return update_partition;
-}
-
-
 static void test_rollback1(void)
 {
     uint8_t boot_count = get_boot_count_from_nvs();
@@ -930,3 +618,51 @@ static void test_rollback3_1(void)
 }
 
 TEST_CASE_MULTIPLE_STAGES("Test rollback. Updated partition invalidated after esp_ota_begin", "[app_update][timeout=90][reset=DEEPSLEEP_RESET, DEEPSLEEP_RESET, DEEPSLEEP_RESET, SW_CPU_RESET]", start_test, test_rollback3, test_rollback3, test_rollback3, test_rollback3_1);
+
+static void test_rollback4(void)
+{
+    uint8_t boot_count = get_boot_count_from_nvs();
+    boot_count++;
+    set_boot_count_in_nvs(boot_count);
+    ESP_LOGI(TAG, "boot count %d", boot_count);
+    const esp_partition_t *cur_app = get_running_firmware();
+    switch (boot_count) {
+        case 2:
+            ESP_LOGI(TAG, "Factory");
+            TEST_ASSERT_EQUAL(ESP_PARTITION_SUBTYPE_APP_FACTORY, cur_app->subtype);
+            app_update();
+            reboot_as_deep_sleep();
+            break;
+        case 3:
+            ESP_LOGI(TAG, "OTA0");
+            TEST_ASSERT_EQUAL(ESP_PARTITION_SUBTYPE_APP_OTA_0, cur_app->subtype);
+            TEST_ESP_OK(esp_ota_mark_app_valid_cancel_rollback());
+            app_update();
+
+            // Do not reboot and call app_update again.
+            // This will not change the running partition since we haven't rebooted.
+            // The esp_rewrite_otadata() will update the otadata for the non-running partition only.
+            app_update();
+#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
+            // The last call to esp_rewrite_otadata should have updated the otadata for the non-running partition only.
+            // Therefore, calling esp_ota_get_state_partition on the running partition should succeed and not return ESP_ERR_NOT_FOUND
+            const esp_partition_t* running_partition;
+            running_partition = esp_ota_get_running_partition();
+            esp_ota_img_states_t ota_state;
+            TEST_ESP_OK(esp_ota_get_state_partition(running_partition, &ota_state));
+#endif
+            reboot_as_deep_sleep();
+            break;
+        case 4:
+            ESP_LOGI(TAG, "OTA1");
+            TEST_ASSERT_EQUAL(ESP_PARTITION_SUBTYPE_APP_OTA_1, cur_app->subtype);
+            TEST_ESP_OK(esp_ota_mark_app_valid_cancel_rollback());
+            break;
+        default:
+            erase_ota_data();
+            TEST_FAIL_MESSAGE("Unexpected stage");
+            break;
+    }
+}
+
+TEST_CASE_MULTIPLE_STAGES("Test esp_rewrite_otadata. Updated sequence number for non-running partition always", "[app_update][timeout=90][reset=DEEPSLEEP_RESET, DEEPSLEEP_RESET, DEEPSLEEP_RESET, SW_CPU_RESET]", start_test, test_rollback4, test_rollback4, test_rollback4);

components/app_update/test_apps/test_app_update/main/utils_update.c

@@ -0,0 +1,307 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "esp_rom_spiflash.h"
+#include "driver/gpio.h"
+#include "nvs_flash.h"
+#include "esp_partition.h"
+#include "esp_flash_partitions.h"
+#include "esp_image_format.h"
+#include "../bootloader_flash/include/bootloader_flash_priv.h"
+#include "esp_sleep.h"
+#include "esp_ota_ops.h"
+#include "esp_err.h"
+#include "esp_log.h"
+#include "test_utils.h"
+#include "utils_update.h"
+#include "unity.h"
+#include "sdkconfig.h"
+
+#define BOOT_COUNT_NAMESPACE "boot_count"
+
+static const char *TAG = "ota_test";
+
+
+void set_boot_count_in_nvs(uint8_t boot_count)
+{
+    nvs_handle_t boot_count_handle;
+    esp_err_t err = nvs_open(BOOT_COUNT_NAMESPACE, NVS_READWRITE, &boot_count_handle);
+    if (err != ESP_OK) {
+        TEST_ESP_OK(nvs_flash_erase());
+        TEST_ESP_OK(nvs_flash_init());
+        TEST_ESP_OK(nvs_open(BOOT_COUNT_NAMESPACE, NVS_READWRITE, &boot_count_handle));
+    }
+    TEST_ESP_OK(nvs_set_u8(boot_count_handle, "boot_count", boot_count));
+    TEST_ESP_OK(nvs_commit(boot_count_handle));
+    nvs_close(boot_count_handle);
+}
+
+uint8_t get_boot_count_from_nvs(void)
+{
+    nvs_handle_t boot_count_handle;
+    esp_err_t err = nvs_open(BOOT_COUNT_NAMESPACE, NVS_READONLY, &boot_count_handle);
+    if (err == ESP_ERR_NVS_NOT_FOUND) {
+        set_boot_count_in_nvs(0);
+    }
+    uint8_t boot_count;
+    TEST_ESP_OK(nvs_get_u8(boot_count_handle, "boot_count", &boot_count));
+    nvs_close(boot_count_handle);
+    return boot_count;
+}
+
+/* @brief Copies a current app to next partition using handle.
+ *
+ * @param[in] update_handle - Handle of API ota.
+ * @param[in] cur_app - Current app.
+ */
+void copy_app_partition(esp_ota_handle_t update_handle, const esp_partition_t *curr_app)
+{
+    const void *partition_bin = NULL;
+    esp_partition_mmap_handle_t data_map;
+    ESP_LOGI(TAG, "start the copy process");
+    TEST_ESP_OK(esp_partition_mmap(curr_app, 0, curr_app->size, ESP_PARTITION_MMAP_DATA, &partition_bin, &data_map));
+    TEST_ESP_OK(esp_ota_write(update_handle, (const void *)partition_bin, curr_app->size));
+    esp_partition_munmap(data_map);
+    ESP_LOGI(TAG, "finish the copy process");
+}
+
+/* @brief Copies a current app to next partition using handle.
+ *
+ * @param[in] update_handle - Handle of API ota.
+ * @param[in] cur_app - Current app.
+ */
+void copy_app_partition_with_offset(esp_ota_handle_t update_handle, const esp_partition_t *curr_app)
+{
+    const void *partition_bin = NULL;
+    esp_partition_mmap_handle_t  data_map;
+    ESP_LOGI(TAG, "start the copy process");
+    uint32_t offset = 0, bytes_to_write = curr_app->size;
+    uint32_t write_bytes;
+    while (bytes_to_write > 0) {
+        write_bytes = (bytes_to_write > (4 * 1024)) ? (4 * 1024) : bytes_to_write;
+        TEST_ESP_OK(esp_partition_mmap(curr_app, offset, write_bytes, ESP_PARTITION_MMAP_DATA, &partition_bin, &data_map));
+        TEST_ESP_OK(esp_ota_write_with_offset(update_handle, (const void *)partition_bin, write_bytes, offset));
+        esp_partition_munmap(data_map);
+        bytes_to_write -= write_bytes;
+        offset += write_bytes;
+    }
+    ESP_LOGI(TAG, "finish the copy process");
+}
+
+/* @brief Get the next partition of OTA for the update.
+ *
+ * @return The next partition of OTA(OTA0-15).
+ */
+const esp_partition_t * get_next_update_partition(void)
+{
+    const esp_partition_t *update_partition = esp_ota_get_next_update_partition(NULL);
+    TEST_ASSERT_NOT_EQUAL(NULL, update_partition);
+    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, update_partition->subtype, update_partition->address);
+    return update_partition;
+}
+
+/* @brief Copies a current app to next partition (OTA0-15) and then configure OTA data for a new boot partition.
+ *
+ * @param[in] cur_app_partition - Current app.
+ * @param[in] next_app_partition - Next app for boot.
+ */
+void copy_current_app_to_next_part(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition)
+{
+    esp_ota_get_next_update_partition(NULL);
+    TEST_ASSERT_NOT_EQUAL(NULL, next_app_partition);
+    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, next_app_partition->subtype, next_app_partition->address);
+
+    esp_ota_handle_t update_handle = 0;
+    TEST_ESP_OK(esp_ota_begin(next_app_partition, OTA_SIZE_UNKNOWN, &update_handle));
+
+    copy_app_partition(update_handle, cur_app_partition);
+
+    TEST_ESP_OK(esp_ota_end(update_handle));
+    TEST_ESP_OK(esp_ota_set_boot_partition(next_app_partition));
+}
+
+/* @brief Copies a current app to next partition (OTA0-15) and then configure OTA data for a new boot partition.
+ *
+ * @param[in] cur_app_partition - Current app.
+ * @param[in] next_app_partition - Next app for boot.
+ */
+void copy_current_app_to_next_part_with_offset(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition)
+{
+    esp_ota_get_next_update_partition(NULL);
+    TEST_ASSERT_NOT_EQUAL(NULL, next_app_partition);
+    ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%"PRIx32, next_app_partition->subtype, next_app_partition->address);
+
+    esp_ota_handle_t update_handle = 0;
+    TEST_ESP_OK(esp_ota_begin(next_app_partition, OTA_SIZE_UNKNOWN, &update_handle));
+
+    copy_app_partition_with_offset(update_handle, cur_app_partition);
+
+    TEST_ESP_OK(esp_ota_end(update_handle));
+    TEST_ESP_OK(esp_ota_set_boot_partition(next_app_partition));
+}
+
+/* @brief Erase otadata partition
+ */
+void erase_ota_data(void)
+{
+    const esp_partition_t *data_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, NULL);
+    TEST_ASSERT_NOT_EQUAL(NULL, data_partition);
+    TEST_ESP_OK(esp_partition_erase_range(data_partition, 0, 2 * data_partition->erase_size));
+}
+
+/* @brief Reboots ESP using mode deep sleep. This mode guaranty that RTC_DATA_ATTR variables is not reset.
+ */
+void reboot_as_deep_sleep(void)
+{
+    ESP_LOGI(TAG, "reboot as deep sleep");
+    esp_deep_sleep(20000);
+    TEST_FAIL_MESSAGE("Should never be reachable except when sleep is rejected, abort");
+}
+
+/* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx.
+ */
+void copy_current_app_to_next_part_and_reboot(void)
+{
+    const esp_partition_t *cur_app = esp_ota_get_running_partition();
+    ESP_LOGI(TAG, "copy current app to next part");
+    copy_current_app_to_next_part(cur_app, get_next_update_partition());
+    reboot_as_deep_sleep();
+}
+
+/* @brief Copies a current app to next partition (OTA0-15) using esp_ota_write_with_offest(), after that ESP is rebooting and run this (the next) OTAx.
+ */
+void copy_current_app_to_next_part_with_offset_and_reboot(void)
+{
+    const esp_partition_t *cur_app = esp_ota_get_running_partition();
+    ESP_LOGI(TAG, "copy current app to next part");
+    copy_current_app_to_next_part_with_offset(cur_app, get_next_update_partition());
+    reboot_as_deep_sleep();
+}
+
+/* @brief Get running app.
+ *
+ * @return The next partition of OTA(OTA0-15).
+ */
+const esp_partition_t* get_running_firmware(void)
+{
+    const esp_partition_t *configured = esp_ota_get_boot_partition();
+    const esp_partition_t *running = esp_ota_get_running_partition();
+    // If a reboot hasn't occurred after app_update(), the configured and running partitions may differ
+    ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08"PRIx32")",
+            running->type, running->subtype, running->address);
+    ESP_LOGI(TAG, "Configured partition type %d subtype %d (offset 0x%08"PRIx32")",
+            configured->type, configured->subtype, configured->address);
+    TEST_ASSERT_NOT_EQUAL(NULL, configured);
+    TEST_ASSERT_NOT_EQUAL(NULL, running);
+    return running;
+}
+
+/* @brief Get two copies ota_data from otadata partition.
+ *
+ * @param[in] otadata_partition - otadata partition.
+ * @param[out] ota_data_0 - First copy from otadata_partition.
+ * @param[out] ota_data_1 - Second copy from otadata_partition.
+ */
+void get_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data_0, esp_ota_select_entry_t *ota_data_1)
+{
+    uint32_t offset = otadata_partition->address;
+    uint32_t size   = otadata_partition->size;
+    if (offset != 0) {
+        const esp_ota_select_entry_t *ota_select_map;
+        ota_select_map = bootloader_mmap(offset, size);
+        TEST_ASSERT_NOT_EQUAL(NULL, ota_select_map);
+
+        memcpy(ota_data_0, ota_select_map, sizeof(esp_ota_select_entry_t));
+        memcpy(ota_data_1, (uint8_t *)ota_select_map + otadata_partition->erase_size, sizeof(esp_ota_select_entry_t));
+        bootloader_munmap(ota_select_map);
+    }
+}
+
+/* @brief Writes a ota_data into required sector of otadata_partition.
+ *
+ * @param[in] otadata_partition - Partition information otadata.
+ * @param[in] ota_data - otadata structure.
+ * @param[in] sec_id - Sector number 0 or 1.
+ */
+void write_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data, int sec_id)
+{
+    esp_partition_write(otadata_partition, otadata_partition->erase_size * sec_id, &ota_data[sec_id], sizeof(esp_ota_select_entry_t));
+}
+
+/* @brief Makes a corrupt of ota_data.
+ * @param[in] err - type error
+ */
+void corrupt_ota_data(corrupt_ota_data_t err)
+{
+    esp_ota_select_entry_t ota_data[2];
+
+    const esp_partition_t *otadata_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, NULL);
+    TEST_ASSERT_NOT_EQUAL(NULL, otadata_partition);
+    get_ota_data(otadata_partition, &ota_data[0], &ota_data[1]);
+
+    if (err & CORR_CRC_1_SECTOR_OTA_DATA) {
+        ota_data[0].crc = 0;
+    }
+    if (err & CORR_CRC_2_SECTOR_OTA_DATA) {
+        ota_data[1].crc = 0;
+    }
+    TEST_ESP_OK(esp_partition_erase_range(otadata_partition, 0, otadata_partition->size));
+    write_ota_data(otadata_partition, &ota_data[0], 0);
+    write_ota_data(otadata_partition, &ota_data[1], 1);
+}
+
+#if defined(CONFIG_BOOTLOADER_FACTORY_RESET) || defined(CONFIG_BOOTLOADER_APP_TEST)
+/* @brief Sets the pin number to output and sets output level as low. After reboot (deep sleep) this pin keep the same level.
+ *
+ * The output level of the pad will be force locked and can not be changed.
+ * Power down or call gpio_hold_dis will disable this function.
+ *
+ * @param[in] num_pin - Pin number
+ */
+void set_output_pin(uint32_t num_pin)
+{
+    TEST_ESP_OK(gpio_hold_dis(num_pin));
+
+    gpio_config_t io_conf;
+    io_conf.intr_type = GPIO_INTR_DISABLE;
+    io_conf.mode = GPIO_MODE_OUTPUT;
+    io_conf.pin_bit_mask = (1ULL << num_pin);
+    io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
+    TEST_ESP_OK(gpio_config(&io_conf));
+
+    TEST_ESP_OK(gpio_set_level(num_pin, 0));
+    TEST_ESP_OK(gpio_hold_en(num_pin));
+}
+
+/* @brief Unset the pin number hold function.
+ */
+void reset_output_pin(uint32_t num_pin)
+{
+    TEST_ESP_OK(gpio_hold_dis(num_pin));
+    TEST_ESP_OK(gpio_reset_pin(num_pin));
+}
+#endif
+
+void mark_app_valid(void)
+{
+#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
+    TEST_ESP_OK(esp_ota_mark_app_valid_cancel_rollback());
+#endif
+}
+
+const esp_partition_t* app_update(void)
+{
+    const esp_partition_t *cur_app = get_running_firmware();
+    const esp_partition_t* update_partition = esp_ota_get_next_update_partition(NULL);
+    TEST_ASSERT_NOT_NULL(update_partition);
+    esp_ota_handle_t update_handle = 0;
+    TEST_ESP_OK(esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle));
+    copy_app_partition(update_handle, cur_app);
+    TEST_ESP_OK(esp_ota_end(update_handle));
+    TEST_ESP_OK(esp_ota_set_boot_partition(update_partition));
+    return update_partition;
+}

components/app_update/test_apps/test_app_update/main/utils_update.h

@@ -0,0 +1,148 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/**
+ * @brief Enumeration for specifying which OTA data sectors' CRCs to corrupt.
+ */
+typedef enum {
+    CORR_CRC_1_SECTOR_OTA_DATA       = (1 << 0),   /*!< Corrupt CRC only 1 sector of ota_data */
+    CORR_CRC_2_SECTOR_OTA_DATA       = (1 << 1),   /*!< Corrupt CRC only 2 sector of ota_data */
+} corrupt_ota_data_t;
+
+/**
+ * @brief Set boot count value in NVS.
+ * @param boot_count Value to set.
+ */
+void set_boot_count_in_nvs(uint8_t boot_count);
+
+/**
+ * @brief Get boot count value from NVS.
+ * @return Boot count value.
+ */
+uint8_t get_boot_count_from_nvs(void);
+
+/**
+ * @brief Copy current app to next partition using OTA handle.
+ * @param update_handle OTA update handle.
+ * @param curr_app Current app partition.
+ */
+void copy_app_partition(esp_ota_handle_t update_handle, const esp_partition_t *curr_app);
+
+/**
+ * @brief Copy current app to next partition using OTA handle with offset.
+ * @param update_handle OTA update handle.
+ * @param curr_app Current app partition.
+ */
+void copy_app_partition_with_offset(esp_ota_handle_t update_handle, const esp_partition_t *curr_app);
+
+/**
+ * @brief Get the next OTA update partition.
+ * @return Pointer to next OTA partition.
+ */
+const esp_partition_t * get_next_update_partition(void);
+
+/**
+ * @brief Copy current app to next partition and set boot partition.
+ * @param cur_app_partition Current app partition.
+ * @param next_app_partition Next app partition.
+ */
+void copy_current_app_to_next_part(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition);
+
+/**
+ * @brief Copy current app to next partition with offset and set boot partition.
+ * @param cur_app_partition Current app partition.
+ * @param next_app_partition Next app partition.
+ */
+void copy_current_app_to_next_part_with_offset(const esp_partition_t *cur_app_partition, const esp_partition_t *next_app_partition);
+
+/**
+ * @brief Erase OTA data partition.
+ */
+void erase_ota_data(void);
+
+/**
+ * @brief Reboot ESP using deep sleep mode.
+ */
+void reboot_as_deep_sleep(void);
+
+/**
+ * @brief Copy current app to next partition and reboot.
+ */
+void copy_current_app_to_next_part_and_reboot(void);
+
+/**
+ * @brief Copy current app to next partition with offset and reboot.
+ */
+void copy_current_app_to_next_part_with_offset_and_reboot(void);
+
+/**
+ * @brief Get running firmware partition.
+ * @return Pointer to running firmware partition.
+ */
+const esp_partition_t* get_running_firmware(void);
+
+/**
+ * @brief Get two OTA data copies from OTA data partition.
+ * @param otadata_partition OTA data partition.
+ * @param ota_data_0 First OTA data copy.
+ * @param ota_data_1 Second OTA data copy.
+ */
+void get_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data_0, esp_ota_select_entry_t *ota_data_1);
+
+/**
+ * @brief Write OTA data into required sector of OTA data partition.
+ * @param otadata_partition OTA data partition.
+ * @param ota_data OTA data structure.
+ * @param sec_id Sector number (0 or 1).
+ */
+void write_ota_data(const esp_partition_t *otadata_partition, esp_ota_select_entry_t *ota_data, int sec_id);
+
+/**
+ * @brief Corrupt OTA data for testing.
+ * @param err Type of corruption.
+ */
+void corrupt_ota_data(corrupt_ota_data_t err);
+
+#if defined(CONFIG_BOOTLOADER_FACTORY_RESET) || defined(CONFIG_BOOTLOADER_APP_TEST)
+/**
+ * @brief Set output pin to low and hold state.
+ * @param num_pin Pin number.
+ */
+void set_output_pin(uint32_t num_pin);
+
+/**
+ * @brief Reset output pin hold function.
+ * @param num_pin Pin number.
+ */
+void reset_output_pin(uint32_t num_pin);
+#endif
+
+/**
+ * @brief Mark app as valid and cancel rollback.
+ */
+void mark_app_valid(void);
+
+/**
+ * @brief Perform app update and set new boot partition.
+ * @return Pointer to updated partition.
+ */
+const esp_partition_t* app_update(void);
+
+#ifdef __cplusplus
+}
+#endif

components/app_update/test_apps/test_app_update/pytest_app_update_ut.py

@@ -20,7 +20,7 @@ TEST_SUBMENU_PATTERN_PYTEST = re.compile(rb'\s+\((\d+)\)\s+"([^"]+)"\r?\n')
 )
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
 def test_app_update(dut: Dut) -> None:
-    dut.run_all_single_board_cases(timeout=90)
+    dut.run_all_single_board_cases(timeout=180)
 
 
 @pytest.mark.generic
@@ -33,7 +33,7 @@ def test_app_update(dut: Dut) -> None:
 )
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
 def test_app_update_xip_psram(dut: Dut) -> None:
-    dut.run_all_single_board_cases(timeout=90)
+    dut.run_all_single_board_cases(timeout=180)
 
 
 @pytest.mark.generic
@@ -46,7 +46,7 @@ def test_app_update_xip_psram(dut: Dut) -> None:
 )
 @idf_parametrize('target', ['supported_targets'], indirect=['target'])
 def test_app_update_xip_psram_rom_impl(dut: Dut) -> None:
-    dut.run_all_single_board_cases(timeout=90)
+    dut.run_all_single_board_cases(timeout=180)
 
 
 @pytest.mark.generic
@@ -59,4 +59,19 @@ def test_app_update_xip_psram_rom_impl(dut: Dut) -> None:
 )
 @idf_parametrize('target', ['esp32', 'esp32c3', 'esp32s3', 'esp32p4'], indirect=['target'])
 def test_app_update_with_rollback(dut: Dut) -> None:
-    dut.run_all_single_board_cases(timeout=90)
+    dut.run_all_single_board_cases(timeout=180)
+
+
+@pytest.mark.recovery_bootloader
+@pytest.mark.parametrize(
+    'config',
+    ['recovery_bootloader'],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32c5'], indirect=['target'])
+def test_recovery_bootloader_update(dut: Dut) -> None:
+    try:
+        dut.run_all_single_board_cases(group='recovery_bootloader', timeout=90)
+    finally:
+        # Erase recovery bootloader after test because it may interfere with other tests using this runner
+        dut.serial.erase_flash()

components/app_update/test_apps/test_app_update/sdkconfig.ci.recovery_bootloader

@@ -0,0 +1,3 @@
+CONFIG_BOOTLOADER_RECOVERY_ENABLE=y
+CONFIG_BOOTLOADER_RECOVERY_OFFSET=0x3F0000
+CONFIG_PARTITION_TABLE_OFFSET=0x9000

components/app_update/test_apps/test_app_update/sdkconfig.ci.recovery_bootloader.esp32c5

@@ -0,0 +1,2 @@
+# ESP32C5 supports the Recovery bootloader feature in ROM starting from v1.0 (ECO2)
+CONFIG_IDF_TARGET="esp32c5"

components/app_update/test_apps/test_app_update/sdkconfig.ci.recovery_bootloader.esp32c61

@@ -0,0 +1,2 @@
+# ESP32C61 supports the Recovery bootloader feature in ROM starting from v1.0 (ECO3)
+CONFIG_IDF_TARGET="esp32c61"

components/bootloader/CMakeLists.txt

@@ -32,4 +32,7 @@ if(NOT CONFIG_SECURE_BOOT OR CONFIG_SECURE_BOOT_FLASH_BOOTLOADER_DEFAULT)
     esptool_py_flash_target_image(flash bootloader
         ${CONFIG_BOOTLOADER_OFFSET_IN_FLASH}
         "${BOOTLOADER_BUILD_DIR}/bootloader.bin")
+
+    # Add bootloader as a dependency to the flash target
+    add_dependencies(flash bootloader)
 endif()

components/bootloader/Kconfig.bootloader_rollback

@@ -1,8 +1,37 @@
-menu "Bootloader Rollback"
+menu "Recovery Bootloader and Rollback"
+
+    config BOOTLOADER_RECOVERY_ENABLE
+        bool "Enable Recovery Bootloader"
+        depends on SOC_RECOVERY_BOOTLOADER_SUPPORTED
+        default n
+        help
+            The recovery bootloader feature is implemented in the ROM bootloader. It is required for safe OTA
+            updates of the bootloader. The feature is activated when the eFuse field
+            (ESP_EFUSE_RECOVERY_BOOTLOADER_FLASH_SECTOR) is set, which defines the flash address of the
+            recovery bootloader. If activated and the primary bootloader fails to load, the ROM bootloader
+            will attempt to load the recovery bootloader from the address specified in eFuse.
+
+    config BOOTLOADER_RECOVERY_OFFSET
+        hex "Recovery Bootloader Flash Offset"
+        depends on BOOTLOADER_RECOVERY_ENABLE
+        default 0x3F0000
+        range 0x0 0xFFE000
+        help
+            Flash address where the recovery bootloader is stored.
+            This value must be written to the eFuse field (ESP_EFUSE_RECOVERY_BOOTLOADER_FLASH_SECTOR)
+            to activate the recovery bootloader in the ROM bootloader. The eFuse can be programmed
+            using espefuse or in the user application with the API esp_efuse_set_recovery_bootloader_offset().
+            Setting this value in the config allows parttool.py to verify that it does not overlap with existing
+            partitions in the partition table.
+
+            The address must be a multiple of the flash sector size (0x1000 bytes).
+            The eFuse field stores the offset in sectors.
+            If the feature is no longer needed or unused, you can burn the 0xFFF value to disable this feature in
+            the ROM bootloader.
 
     config BOOTLOADER_ANTI_ROLLBACK_ENABLE
         bool "Enable bootloader rollback support"
-        depends on SOC_RECOVERY_BOOTLOADER_SUPPORTED
+        depends on BOOTLOADER_RECOVERY_ENABLE
         default n
         help
             This option prevents rollback to previous bootloader image with lower security version.

components/bootloader/Kconfig.projbuild

@@ -34,14 +34,21 @@ menu "Bootloader config"
             bool "Debug (-Og)"
         config BOOTLOADER_COMPILER_OPTIMIZATION_PERF
             bool "Optimize for performance (-O2)"
-        config BOOTLOADER_COMPILER_OPTIMIZATION_NONE
-            bool "Debug without optimization (-O0) (Deprecated, will be removed in IDF v6.0)"
-            depends on IDF_TARGET_ARCH_XTENSA || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
 
     endchoice
 
     orsource "Kconfig.log"
 
+    config BOOTLOADER_CPU_CLK_FREQ_MHZ
+        int
+        default 64 if IDF_TARGET_ESP32H2
+        default 48 if IDF_TARGET_ESP32H21 || IDF_TARGET_ESP32H4
+        default 90 if IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V3
+        default 100 if IDF_TARGET_ESP32P4 && !ESP32P4_SELECTS_REV_LESS_V3
+        default 80
+        help
+            The CPU clock frequency to be at least raised to in 2nd bootloader. Invisible for users.
+
     menu "Serial Flash Configurations"
         config BOOTLOADER_SPI_CUSTOM_WP_PIN
             bool "Use custom SPI Flash WP Pin when flash pins set in eFuse (read help)"
@@ -553,12 +560,13 @@ menu "Security features"
         depends on SECURE_SIGNED_APPS_ECDSA_V2_SCHEME
         default SECURE_BOOT_ECDSA_KEY_LEN_256_BITS
         help
-            Select the ECDSA key size. Two key sizes are supported
+            Select the ECDSA key size. Three key sizes are supported depending upon on the target:
 
             - 192 bit key using NISTP192 curve
             - 256 bit key using NISTP256 curve (Recommended)
+            - 384 bit key using NISTP384 curve (Recommended)
 
-            The advantage of using 256 bit key is the extra randomness which makes it difficult to be
+            The advantage of using 384 and 256 bit keys is the extra randomness which makes it difficult to be
             bruteforced compared to 192 bit key.
             At present, both key sizes are practically implausible to bruteforce.
 
@@ -570,6 +578,10 @@ menu "Security features"
             bool "Using ECC curve NISTP256 (Recommended)"
             depends on SECURE_SIGNED_APPS_ECDSA_V2_SCHEME
 
+        config SECURE_BOOT_ECDSA_KEY_LEN_384_BITS
+            bool "Using ECC curve NISTP384 (Recommended)"
+            depends on SECURE_SIGNED_APPS_ECDSA_V2_SCHEME && SOC_ECDSA_SUPPORT_CURVE_P384
+
     endchoice
 
     config SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT
@@ -683,7 +695,7 @@ menu "Security features"
             If enabled (default), these binary files are signed as part of the build process. The file named in
             "Secure boot private signing key" will be used to sign the image.
 
-            If disabled, unsigned app/partition data will be built. They must be signed manually using espsecure.py.
+            If disabled, unsigned app/partition data will be built. They must be signed manually using espsecure.
             Version 1 to enable ECDSA Based Secure Boot and Version 2 to enable RSA based Secure Boot.
             (for example, on a remote signing server.)
 
@@ -700,7 +712,7 @@ menu "Security features"
             Path is evaluated relative to the project directory.
 
             You can generate a new signing key by running the following command:
-            espsecure.py generate_signing_key secure_boot_signing_key.pem
+            espsecure generate-signing-key secure_boot_signing_key.pem
 
             See the Secure Boot section of the ESP-IDF Programmer's Guide for this version for details.
 
@@ -714,8 +726,8 @@ menu "Security features"
             app, to verify app images.
 
             Key file is in raw binary format, and can be extracted from a
-            PEM formatted private key using the espsecure.py
-            extract_public_key command.
+            PEM formatted private key using the espsecure
+            extract-public-key command.
 
             Refer to the Secure Boot section of the ESP-IDF Programmer's Guide for this version before enabling.
 
@@ -757,7 +769,7 @@ menu "Security features"
 
             NOTE: If "UART ROM download mode (Permanently disabled (recommended))" or
             "UART ROM download mode (Permanently switch to Secure mode (recommended))" is set,
-            then it is __NOT__ possible to read/write efuses using espefuse.py utility.
+            then it is __NOT__ possible to read/write efuses using espefuse utility.
             However, efuse can be read/written from the application
 
             Please refer to the Secure Boot V2 documentation guide for more information.
@@ -786,7 +798,7 @@ menu "Security features"
         help
 
             In reflashable secure bootloader mode, a hardware key is derived from the signing key (with SHA-256) and
-            can be written to eFuse with espefuse.py.
+            can be written to eFuse with espefuse.
 
             Normally this is a 256-bit key, but if 3/4 Coding Scheme is used on the device then the eFuse key is
             truncated to 192 bits.
@@ -960,6 +972,24 @@ menu "Security features"
                 so that the bootloader would not need to enable secure boot and thus you could avoid its revocation
                 strategy.
 
+        config SECURE_BOOT_SKIP_WRITE_PROTECTION_SCA
+            bool "Skip write-protection of SECURE_FLASH_PSEUDO_ROUND_FUNC_STRENGTH"
+            default y if SECURE_FLASH_PSEUDO_ROUND_FUNC
+            default n
+            depends on SOC_ECDSA_SUPPORT_CURVE_P384 && SOC_FLASH_ENCRYPTION_XTS_AES_SUPPORT_PSEUDO_ROUND
+            help
+                If not set (default, recommended), on the first boot when Secure Boot is enabled for
+                targets that support Secure Boot using ECDSA-P384, the bootloader will burn the write-protection bit of
+                of SECURE_BOOT_SHA384_EN that could be shared by multiple other efuse bits like
+                SECURE_FLASH_PSEUDO_ROUND_FUNC_STRENGTH / XTS_DPA_PSEUDO_LEVEL.
+
+                Once this efuse bit is write-protected you cannot update the values of the shared efuses, for example,
+                the security strength value of XTS_DPA_PSEUDO_LEVEL or setting ECC_FORCE_CONST_TIME.
+
+                List of eFuses with the same write protection bit:
+
+                ESP32-C5: XTS_DPA_PSEUDO_LEVEL and ECC_FORCE_CONST_TIME
+
         config SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
             bool "Leave UART bootloader encryption enabled"
             depends on SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
@@ -1006,7 +1036,7 @@ menu "Security features"
                 If flash encryption is enabled in eFuses, this option does not change the bootloader behavior.
 
                 Only use this option in testing environments, to avoid accidentally enabling flash encryption on
-                the wrong device. The device needs to have flash encryption already enabled using espefuse.py.
+                the wrong device. The device needs to have flash encryption already enabled using espefuse.
 
         config SECURE_FLASH_SKIP_WRITE_PROTECTION_CACHE
             bool "Skip write-protection of DIS_CACHE (DIS_ICACHE, DIS_DCACHE)"
@@ -1043,10 +1073,11 @@ menu "Security features"
                 ESP32-S3: DIS_ICACHE, DIS_DCACHE, DIS_DOWNLOAD_ICACHE, DIS_DOWNLOAD_DCACHE,
                 DIS_FORCE_DOWNLOAD, DIS_USB_OTG, DIS_TWAI, DIS_APP_CPU, DIS_PAD_JTAG,
                 DIS_DOWNLOAD_MANUAL_ENCRYPT, DIS_USB_JTAG, DIS_USB_SERIAL_JTAG, STRAP_JTAG_SEL, USB_PHY_SEL.
+
     endmenu  # Potentially Insecure
 
     config SECURE_FLASH_ENCRYPT_ONLY_IMAGE_LEN_IN_APP_PART
-        bool "Encrypt only the app image that is present in the partition of type app"
+        bool "Encrypt contents upto app image length in app partition"
         depends on SECURE_FLASH_ENC_ENABLED && !SECURE_FLASH_REQUIRE_ALREADY_ENABLED
         default y
         help
@@ -1075,8 +1106,9 @@ menu "Security features"
 
     config SECURE_FLASH_PSEUDO_ROUND_FUNC
         bool "Permanently enable XTS-AES's pseudo rounds function"
-        default y
-        depends on SECURE_FLASH_ENCRYPTION_MODE_RELEASE && SOC_FLASH_ENCRYPTION_XTS_AES_SUPPORT_PSEUDO_ROUND
+        default y if SECURE_FLASH_ENCRYPTION_MODE_RELEASE
+        default n
+        depends on SECURE_FLASH_ENC_ENABLED && SOC_FLASH_ENCRYPTION_XTS_AES_SUPPORT_PSEUDO_ROUND
         help
             If set (default), the bootloader will permanently enable the XTS-AES peripheral's pseudo rounds function.
             Note: Enabling this config would burn an efuse.
@@ -1089,6 +1121,12 @@ menu "Security features"
             The strength of the pseudo rounds functions can be configured to low, medium and high,
             each denoting the values that would be stored in the efuses field.
             By default the value to set to low.
+
+            It is recommended that the required strength of the pseudo rounds function should be set during the
+            first boot itself. If your workflow needs to update the function's strength after the first boot,
+            you should enable CONFIG_SECURE_BOOT_SKIP_WRITE_PROTECTION_SCA to avoid write protecting this
+            bit during the boot up for targets that support Secure Boot using ECDSA-P384.
+
             You can configure the strength of the pseudo rounds functions according to your use cases,
             for example, increasing the strength would provide higher security but would slow down the
             flash encryption/decryption operations.
@@ -1126,7 +1164,7 @@ menu "Security features"
             bool "UART ROM download mode (Permanently disabled (recommended))"
             help
                 If set, during startup the app will burn an eFuse bit to permanently disable the UART ROM
-                Download Mode. This prevents any future use of esptool.py, espefuse.py and similar tools.
+                Download Mode. This prevents any future use of esptool, espefuse and similar tools.
 
                 Once disabled, if the SoC is booted with strapping pins set for ROM Download Mode
                 then an error is printed instead.
@@ -1148,10 +1186,10 @@ menu "Security features"
 
                 Secure Download mode limits the use of Download Mode functions to update SPI config,
                 changing baud rate, basic flash write and a command to return a summary of currently
-                enabled security features (`get_security_info`).
+                enabled security features (`get-security-info`).
 
-                Secure Download mode is not compatible with the esptool.py flasher stub feature,
-                espefuse.py, read/writing memory or registers, encrypted download, or any other
+                Secure Download mode is not compatible with the esptool flasher stub feature,
+                espefuse, read/writing memory or registers, encrypted download, or any other
                 features that interact with unsupported Download Mode commands.
 
                 Secure Download mode should be enabled in any application where Flash Encryption
@@ -1162,7 +1200,7 @@ menu "Security features"
                 It is also possible to enable secure download mode at runtime by calling
                 esp_efuse_enable_rom_secure_download_mode()
 
-                Note: Secure Download mode is not available for ESP32 (includes revisions till ECO3).
+                Note: Secure Download mode is not available for ESP32.
 
         config SECURE_INSECURE_ALLOW_DL_MODE
             bool "UART ROM download mode (Enabled (not recommended))"

components/bootloader/project_include.cmake

@@ -70,6 +70,8 @@ if(CONFIG_SECURE_SIGNED_APPS)
                     set(scheme "ecdsa192")
                 elseif(CONFIG_SECURE_BOOT_ECDSA_KEY_LEN_256_BITS)
                     set(scheme "ecdsa256")
+                elseif(CONFIG_SECURE_BOOT_ECDSA_KEY_LEN_384_BITS)
+                    set(scheme "ecdsa384")
                 endif()
                 fail_at_build_time(gen_secure_boot_signing_key
                     "Secure Boot Signing Key ${CONFIG_SECURE_BOOT_SIGNING_KEY} does not exist. Generate using:"

components/bootloader/sdkconfig.rename

@@ -27,3 +27,6 @@ CONFIG_SECURE_BOOT_ENABLED                                  CONFIG_SECURE_BOOT_V
 CONFIG_SPI_FLASH_32BIT_ADDR_ENABLE                          CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH
 CONFIG_SPI_FLASH_QUAD_32BIT_ADDR_ENABLE                     CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH
 CONFIG_SPI_FLASH_OCTAL_32BIT_ADDR_ENABLE                    CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_OCTAL_FLASH
+
+
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE                CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG

components/bootloader/subproject/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 
 if(NOT SDKCONFIG)
     message(FATAL_ERROR "Bootloader subproject expects the SDKCONFIG variable to be passed "
@@ -31,9 +31,9 @@ set(COMPONENTS
     micro-ecc
     main
     efuse
-    esp_system
-    newlib
-    esp_tee)
+    esp_libc
+    esp_tee
+    esp_stdio)
 
 # EXTRA_COMPONENT_DIRS can be populated with directories containing one or several components.
 # Make sure this variable contains `bootloader_components` directory of the project being compiled.
@@ -61,30 +61,58 @@ endforeach()
 set(BOOTLOADER_BUILD 1)
 set(NON_OS_BUILD 1)
 include("${IDF_PATH}/tools/cmake/project.cmake")
-set(common_req log esp_rom esp_common esp_hw_support newlib)
+set(common_req log esp_rom esp_common esp_hw_support esp_libc)
 idf_build_set_property(EXTRA_COMPONENT_EXCLUDE_DIRS "${EXTRA_COMPONENT_EXCLUDE_DIRS}")
 idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${common_req}")
 idf_build_set_property(__OUTPUT_SDKCONFIG 0)
 # Define a property for the default linker script
 set(LD_DEFAULT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/main/ld/${IDF_TARGET}")
-idf_build_set_property(BOOTLOADER_LINKER_SCRIPT "${LD_DEFAULT_PATH}/bootloader.ld" APPEND)
 idf_build_set_property(BOOTLOADER_LINKER_SCRIPT "${LD_DEFAULT_PATH}/bootloader.rom.ld" APPEND)
 project(bootloader)
+if(CONFIG_ESP32P4_REV_MIN_300)
+    target_linker_script("__idf_main" INTERFACE "${LD_DEFAULT_PATH}/bootloader.rev3.ld.in")
+else()
+    target_linker_script("__idf_main" INTERFACE "${LD_DEFAULT_PATH}/bootloader.ld.in")
+endif()
 
 idf_build_set_property(COMPILE_DEFINITIONS "BOOTLOADER_BUILD=1" APPEND)
 idf_build_set_property(COMPILE_DEFINITIONS "NON_OS_BUILD=1" APPEND)
 idf_build_set_property(COMPILE_OPTIONS "-fno-stack-protector" APPEND)
 
+# Set up the bootloader binary generation targets
+set(PROJECT_BIN "bootloader.bin")
+if(CONFIG_SECURE_BOOT_V2_ENABLED AND CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
+    set(bootloader_unsigned_bin "bootloader-unsigned.bin")
+else()
+    set(bootloader_unsigned_bin "${PROJECT_BIN}")
+endif()
+
+# Set the final binary name as a project property
+idf_build_set_property(PROJECT_BIN "${PROJECT_BIN}")
+
+# Generate the unsigned binary from the ELF file.
+if(CONFIG_APP_BUILD_GENERATE_BINARIES)
+    set(binary_target_name "gen_bootloader_binary")
+    __idf_build_binary("${bootloader_unsigned_bin}" "${binary_target_name}")
+else()
+    # If we are not building binaries, we don't need to create targets that depend on the
+    # bootloader binary.
+    return()
+endif()
+
 idf_component_get_property(main_args esptool_py FLASH_ARGS)
 idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS)
+idf_component_get_property(esptool_py_cmd esptool_py ESPTOOLPY_CMD)
+idf_component_get_property(espsecure_py_cmd esptool_py ESPSECUREPY_CMD)
+idf_component_get_property(espefuse_py_cmd esptool_py ESPEFUSEPY_CMD)
 
 # String for printing flash command
 string(REPLACE ";" " " esptoolpy_write_flash
-    "${ESPTOOLPY} --port=(PORT) --baud=(BAUD) ${main_args} "
-    "write_flash ${sub_args}")
+    "${esptool_py_cmd} --port=(PORT) --baud=(BAUD) ${main_args} "
+    "write-flash ${sub_args}")
 
-string(REPLACE ";" " " espsecurepy "${ESPSECUREPY}")
-string(REPLACE ";" " " espefusepy "${ESPEFUSEPY}")
+string(REPLACE ";" " " espsecurepy "${espsecure_py_cmd}")
+string(REPLACE ";" " " espefusepy "${espefuse_py_cmd}")
 
 # Suppress warning: "Manually-specified variables were not used by the project: SECURE_BOOT_SIGNING_KEY"
 set(ignore_signing_key "${SECURE_BOOT_SIGNING_KEY}")
@@ -105,7 +133,7 @@ if(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
         ABSOLUTE BASE_DIR "${CMAKE_BINARY_DIR}")
 
     add_custom_command(OUTPUT "${secure_bootloader_key}"
-        COMMAND ${ESPSECUREPY} digest_private_key
+        COMMAND ${espsecure_py_cmd} digest-private-key
             --keylen "${key_digest_len}"
             --keyfile "${SECURE_BOOT_SIGNING_KEY}"
             "${secure_bootloader_key}"
@@ -119,9 +147,9 @@ if(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
                 "No pre-generated key for a reflashable secure bootloader is available, "
                 "due to signing configuration."
                 "\nTo generate one, you can use this command:"
-                "\n\t${espsecurepy} generate_flash_encryption_key ${secure_bootloader_key}"
+                "\n\t${espsecurepy} generate-flash-encryption-key ${secure_bootloader_key}"
                 "\nIf a signing key is present, then instead use:"
-                "\n\t${espsecurepy} digest_private_key "
+                "\n\t${espsecurepy} digest-private-key "
                 "--keylen (192/256) --keyfile KEYFILE "
                 "${secure_bootloader_key}")
         endif()
@@ -130,7 +158,7 @@ if(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
 
     add_custom_command(OUTPUT "${bootloader_digest_bin}"
         COMMAND ${CMAKE_COMMAND} -E echo "DIGEST ${bootloader_digest_bin}"
-        COMMAND ${ESPSECUREPY} digest_secure_bootloader --keyfile "${secure_bootloader_key}"
+        COMMAND ${espsecure_py_cmd} digest-secure-bootloader --keyfile "${secure_bootloader_key}"
         -o "${bootloader_digest_bin}" "${CMAKE_BINARY_DIR}/bootloader.bin"
         MAIN_DEPENDENCY "${CMAKE_BINARY_DIR}/.bin_timestamp"
         DEPENDS gen_secure_bootloader_key gen_project_binary
@@ -139,43 +167,42 @@ if(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
     add_custom_target(gen_bootloader_digest_bin ALL DEPENDS "${bootloader_digest_bin}")
 endif()
 
+# If secure boot is enabled, generate the signed binary from the unsigned one.
 if(CONFIG_SECURE_BOOT_V2_ENABLED)
-    if(CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
-        get_filename_component(secure_boot_signing_key
-            "${SECURE_BOOT_SIGNING_KEY}" ABSOLUTE BASE_DIR "${project_dir}")
+    set(signed_target_name "gen_signed_bootloader")
 
-        if(NOT EXISTS "${secure_boot_signing_key}")
-        message(FATAL_ERROR
-            "Secure Boot Signing Key Not found."
-            "\nGenerate the Secure Boot V2 RSA-PSS 3072 Key."
-            "\nTo generate one, you can use this command:"
-            "\n\t${espsecurepy} generate_signing_key --version 2 ${SECURE_BOOT_SIGNING_KEY}")
+    if(CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
+        # The SECURE_BOOT_SIGNING_KEY is passed in from the parent build and
+        # is already an absolute path.
+        if(NOT EXISTS "${SECURE_BOOT_SIGNING_KEY}")
+            message(FATAL_ERROR
+                "Secure Boot Signing Key Not found."
+                "\nGenerate the Secure Boot V2 RSA-PSS 3072 Key."
+                "\nTo generate one, you can use this command:"
+                "\n\t${espsecurepy} generate-signing-key --version 2 your_key.pem"
+            )
         endif()
 
-        set(bootloader_unsigned_bin "bootloader-unsigned.bin")
-        add_custom_command(OUTPUT ".signed_bin_timestamp"
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
-            "${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
-            COMMAND ${ESPSECUREPY} sign_data --version 2 --keyfile "${secure_boot_signing_key}"
-            -o "${CMAKE_BINARY_DIR}/${PROJECT_BIN}" "${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
-            COMMAND ${CMAKE_COMMAND} -E echo "Generated signed binary image ${build_dir}/${PROJECT_BIN}"
-            "from ${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
-            COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
-            > "${CMAKE_BINARY_DIR}/.signed_bin_timestamp"
-            DEPENDS "${build_dir}/.bin_timestamp"
-            VERBATIM
-            COMMENT "Generated the signed Bootloader")
+        set(comment "Generated the signed Bootloader")
+        set(key_arg KEYFILE "${SECURE_BOOT_SIGNING_KEY}")
+        # Post-build commands should be attached to the signed binary target.
+        set(post_build_target ${signed_target_name})
     else()
-        add_custom_command(OUTPUT ".signed_bin_timestamp"
-        VERBATIM
-        COMMENT "Bootloader generated but not signed")
+        # If we are not building signed binaries, we don't pass a key.
+        set(comment "Bootloader generated but not signed")
+        set(key_arg "")
+        # Post-build commands should be attached to the unsigned binary target.
+        set(post_build_target ${binary_target_name})
     endif()
 
-    add_custom_target(gen_signed_bootloader ALL DEPENDS "${build_dir}/.signed_bin_timestamp")
+    __idf_build_secure_binary("${bootloader_unsigned_bin}" "${PROJECT_BIN}" "${signed_target_name}"
+        COMMENT "${comment}"
+        ${key_arg}
+    )
 endif()
 
 if(CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
-    add_custom_command(TARGET bootloader.elf POST_BUILD
+    add_custom_command(TARGET gen_project_binary POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E echo
             "=============================================================================="
         COMMAND ${CMAKE_COMMAND} -E echo
@@ -188,7 +215,7 @@ if(CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
             "* IMPORTANT: After first boot, BOOTLOADER CANNOT BE RE-FLASHED on same device"
         VERBATIM)
 elseif(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
-    add_custom_command(TARGET bootloader.elf POST_BUILD
+    add_custom_command(TARGET gen_bootloader_digest_bin POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E echo
             "=============================================================================="
         COMMAND ${CMAKE_COMMAND} -E echo
@@ -198,7 +225,7 @@ elseif(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
         COMMAND ${CMAKE_COMMAND} -E echo
             "Burn secure boot key to efuse using:"
         COMMAND ${CMAKE_COMMAND} -E echo
-            "\t${espefusepy} burn_key secure_boot_v1 ${secure_bootloader_key}"
+            "\t${espefusepy} burn-key secure_boot_v1 ${secure_bootloader_key}"
         COMMAND ${CMAKE_COMMAND} -E echo
             "First time flash command is:"
         COMMAND ${CMAKE_COMMAND} -E echo
@@ -215,14 +242,13 @@ elseif(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
             "* After first boot, only re-flashes of this kind (with same key) will be accepted."
         COMMAND ${CMAKE_COMMAND} -E echo
             "* Not recommended to reuse the same secure boot keyfile on multiple production devices."
-        DEPENDS gen_secure_bootloader_key gen_bootloader_digest_bin
         VERBATIM)
 elseif(
         CONFIG_SECURE_BOOT_V2_ENABLED AND
         (CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS GREATER 1) AND
         NOT CONFIG_SECURE_BOOT_FLASH_BOOTLOADER_DEFAULT
     )
-    add_custom_command(TARGET bootloader.elf POST_BUILD
+    add_custom_command(TARGET ${post_build_target} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E echo
         "=============================================================================="
     COMMAND ${CMAKE_COMMAND} -E echo
@@ -230,28 +256,40 @@ elseif(
     COMMAND ${CMAKE_COMMAND} -E echo
         "To sign the bootloader with additional private keys."
     COMMAND ${CMAKE_COMMAND} -E echo
-        "\t${espsecurepy} sign_data -k secure_boot_signing_key2.pem -v 2 \
---append_signatures -o signed_bootloader.bin build/bootloader/bootloader.bin"
+        "\t${espsecurepy} sign-data -k secure_boot_signing_key2.pem -v 2 \
+--append-signatures -o signed_bootloader.bin build/bootloader/bootloader.bin"
     COMMAND ${CMAKE_COMMAND} -E echo
         "Secure boot enabled, so bootloader not flashed automatically."
     COMMAND ${CMAKE_COMMAND} -E echo
         "\t${esptoolpy_write_flash} ${BOOTLOADER_OFFSET} ${CMAKE_BINARY_DIR}/bootloader.bin"
     COMMAND ${CMAKE_COMMAND} -E echo
         "=============================================================================="
-    DEPENDS gen_signed_bootloader
     VERBATIM)
 elseif(CONFIG_SECURE_BOOT_V2_ENABLED AND NOT CONFIG_SECURE_BOOT_FLASH_BOOTLOADER_DEFAULT)
-    add_custom_command(TARGET bootloader.elf POST_BUILD
+    add_custom_command(TARGET ${post_build_target} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E echo
         "=============================================================================="
     COMMAND ${CMAKE_COMMAND} -E echo
         "Bootloader built. Secure boot enabled, so bootloader not flashed automatically."
-    COMMAND ${CMAKE_COMMAND} -E echo
-        "Secure boot enabled, so bootloader not flashed automatically."
     COMMAND ${CMAKE_COMMAND} -E echo
         "\t${esptoolpy_write_flash} ${BOOTLOADER_OFFSET} ${CMAKE_BINARY_DIR}/bootloader.bin"
     COMMAND ${CMAKE_COMMAND} -E echo
         "=============================================================================="
-    DEPENDS gen_signed_bootloader
     VERBATIM)
 endif()
+
+# Generate bootloader post-build check of the bootloader size against the offset
+partition_table_add_check_bootloader_size_target(bootloader_check_size
+    DEPENDS gen_project_binary
+    BOOTLOADER_BINARY_PATH "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
+    RESULT bootloader_check_size_command)
+add_dependencies(app bootloader_check_size)
+
+if(CONFIG_SECURE_BOOT_V2_ENABLED AND CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
+    # Check the size of the bootloader + signature block.
+    partition_table_add_check_bootloader_size_target(bootloader_check_size_signed
+        DEPENDS gen_signed_bootloader
+        BOOTLOADER_BINARY_PATH "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
+        RESULT bootloader_check_size_signed_command)
+    add_dependencies(app bootloader_check_size_signed)
+endif()

components/bootloader/subproject/main/bootloader_start.c

@@ -11,7 +11,7 @@
 #include "bootloader_common.h"
 #include "bootloader_hooks.h"
 
-static const char *TAG = "boot";
+ESP_LOG_ATTR_TAG(TAG, "boot");
 
 static int select_partition_number(bootloader_state_t *bs);
 static int selected_boot_partition(const bootloader_state_t *bs);

components/bootloader/subproject/main/ld/esp32/bootloader.ld

@@ -1,275 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-/*
-Linker file used to link the bootloader.
-*/
-
-
-/* Simplified memory map for the bootloader
-
-   The main purpose is to make sure the bootloader can load into main memory
-   without overwriting itself.
-*/
-
-MEMORY
-{
-  /* IRAM POOL1, used for APP CPU cache. Bootloader runs from here during the final stage of loading the app because APP CPU is still held in reset, the main app enables APP CPU cache */
-  iram_loader_seg (RWX) :           org = 0x40078000, len = 0x8000  /* 32KB, APP CPU cache */
-  /* 63kB, IRAM. We skip the first 1k to prevent the entry point being
-     placed into the same range as exception vectors in the app.
-     This leads to idf_monitor decoding ROM bootloader "entry 0x40080xxx"
-     message as one of the exception vectors, which looks scary to users.
-  */
-  iram_seg (RWX) :                  org = 0x40080400, len = 0xfc00
-  /* 64k at the end of DRAM, after ROM bootloader stack */
-  dram_seg (RW) :                  	org = 0x3FFF0000, len = 0x6000
-}
-
-/*  Default entry point:  */
-ENTRY(call_start_cpu0);
-
-
-SECTIONS
-{
-
-  .iram_loader.text :
-  {
-    . = ALIGN (16);
-    _loader_text_start = ABSOLUTE(.);
-    *(.stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
-     *(.iram1 .iram1.*) /* catch stray IRAM_ATTR */
-    *liblog.a:(.literal .text .literal.* .text.*)
-    /* we use either libgcc or compiler-rt, so put similar entries for them here */
-    *libgcc.a:(.literal .text .literal.* .text.*)
-    *libclang_rt.builtins.a:(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_clock_loader.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_common_loader.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_flash.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_random.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_random*.*(.literal.bootloader_random_disable .text.bootloader_random_disable)
-    *libesp_common.a:fpga_overrides.*(.literal.bootloader_fill_random .text.bootloader_fill_random)
-    *libbootloader_support.a:bootloader_efuse.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_utility.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_sha.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_console_loader.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_panic.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:bootloader_soc.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:esp_image_format.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:flash_encrypt.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:flash_encryption_secure_features.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:flash_partitions.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:secure_boot.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:secure_boot_secure_features.*(.literal .text .literal.* .text.*)
-    *libbootloader_support.a:secure_boot_signatures_bootloader.*(.literal .text .literal.* .text.*)
-    *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*)
-    *libspi_flash.a:*.*(.literal .text .literal.* .text.*)
-    *libhal.a:wdt_hal_iram.*(.literal .text .literal.* .text.*)
-    *libhal.a:mmu_hal.*(.literal .text .literal.* .text.*)
-    *libhal.a:efuse_hal.*(.literal .text .literal.* .text.*)
-    *libesp_hw_support.a:rtc_clk.*(.literal .text .literal.* .text.*)
-    *libesp_hw_support.a:rtc_time.*(.literal .text .literal.* .text.*)
-    *libefuse.a:*.*(.literal .text .literal.* .text.*)
-    *libesp_rom.a:*.*(.literal .text .literal.* .text.*)
-    *(.fini.literal)
-    *(.fini)
-    *(.gnu.version)
-    _loader_text_end = ABSOLUTE(.);
-  } > iram_loader_seg
-
-  .iram.text :
-  {
-    . = ALIGN (16);
-    *(.entry.text)
-    *(.init.literal)
-    *(.init)
-  } > iram_seg
-
-
-  /* Shared RAM */
-  .dram0.bss (NOLOAD) :
-  {
-    . = ALIGN (8);
-    _dram_start = ABSOLUTE(.);
-    _bss_start = ABSOLUTE(.);
-    *(.dynsbss)
-    *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
-    *(.scommon)
-    *(.sbss2)
-    *(.sbss2.*)
-    *(.gnu.linkonce.sb2.*)
-    *(.dynbss)
-    *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN (8);
-    _bss_end = ABSOLUTE(.);
-  } >dram_seg
-
-  .dram0.bootdesc : ALIGN(0x10)
-  {
-    _data_start = ABSOLUTE(.);
-    *(.data_bootloader_desc .data_bootloader_desc.*)               /* Should be the first.  Bootloader version info.        DO NOT PUT ANYTHING BEFORE IT! */
-  } > dram_seg
-
-  .dram0.data : ALIGN(0x10)
-  {
-    *(.dram1 .dram1.*) /* catch stray DRAM_ATTR */
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    *(.data1)
-    *(.sdata)
-    *(.sdata.*)
-    *(.gnu.linkonce.s.*)
-    *(.gnu.linkonce.s2.*)
-    *(.jcr)
-    _data_end = ABSOLUTE(.);
-  } >dram_seg
-
-  .dram0.rodata :
-  {
-    _rodata_start = ABSOLUTE(.);
-    *(.rodata)
-    *(.rodata.*)
-    *(.gnu.linkonce.r.*)
-    *(.rodata1)
-    *(.sdata2 .sdata2.*)
-    __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
-    *(.xt_except_table)
-    *(.gcc_except_table)
-    *(.gnu.linkonce.e.*)
-    *(.gnu.version_r)
-    *(.eh_frame_hdr)
-    *(.eh_frame)
-    . = (. + 3) & ~ 3;
-    /*  C++ constructor and destructor tables, properly ordered:  */
-    __init_array_start = ABSOLUTE(.);
-    KEEP (*crtbegin.*(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend.*) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    __init_array_end = ABSOLUTE(.);
-    KEEP (*crtbegin.*(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.*) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-    /*  C++ exception handlers table:  */
-    __XT_EXCEPTION_DESCS_ = ABSOLUTE(.);
-    *(.xt_except_desc)
-    *(.gnu.linkonce.h.*)
-    __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.);
-    *(.xt_except_desc_end)
-    *(.dynamic)
-    *(.gnu.version_d)
-    _rodata_end = ABSOLUTE(.);
-	/* Literals are also RO data. */
-    _lit4_start = ABSOLUTE(.);
-    *(*.lit4)
-    *(.lit4.*)
-    *(.gnu.linkonce.lit4.*)
-    _lit4_end = ABSOLUTE(.);
-    . = ALIGN(4);
-    _dram_end = ABSOLUTE(.);
-  } >dram_seg
-
-  .iram.text :
-  {
-    _stext = .;
-    _text_start = ABSOLUTE(.);
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
-    *(.iram .iram.*) /* catch stray IRAM_ATTR */
-    *(.fini.literal)
-    *(.fini)
-    *(.gnu.version)
-
-    /** CPU will try to prefetch up to 16 bytes of
-      * of instructions. This means that any configuration (e.g. MMU, PMS) must allow
-      * safe access to up to 16 bytes after the last real instruction, add
-      * dummy bytes to ensure this
-      */
-    . += 16;
-
-    _text_end = ABSOLUTE(.);
-    _etext = .;
-  } > iram_seg
-
-  /** This section will be used by the debugger and disassembler to get more information
-   * about raw data present in the code.
-   * Indeed, it may be required to add some padding at some points in the code
-   * in order to align a branch/jump destination on a particular bound.
-   * Padding these instructions will generate null bytes that shall be
-   * interpreted as data, and not code by the debugger or disassembler.
-   * This section will only be present in the ELF file, not in the final binary
-   * For more details, check GCC-212
-   */
-  .xt.prop 0 :
-  {
-    KEEP (*(.xt.prop .xt.prop.* .gnu.linkonce.prop.*))
-  }
-
-  .xt.lit 0 :
-  {
-    KEEP (*(.xt.lit .xt.lit.* .gnu.linkonce.p.*))
-  }
-
-  .xtensa.info 0: { *(.xtensa.info) }
-
-  /* DWARF 1 */
-  .debug              0 : { *(.debug) }
-  .line               0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo      0 : { *(.debug_srcinfo) }
-  .debug_sfnames      0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges      0 : { *(.debug_aranges) }
-  .debug_pubnames     0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info         0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev       0 : { *(.debug_abbrev) }
-  .debug_line         0 : { *(.debug_line) }
-  .debug_frame        0 : { *(.debug_frame) }
-  .debug_str          0 : { *(.debug_str) }
-  .debug_loc          0 : { *(.debug_loc) }
-  .debug_macinfo      0 : { *(.debug_macinfo) }
-  .debug_pubtypes     0 : { *(.debug_pubtypes) }
-  /* DWARF 3 */
-  .debug_ranges       0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames    0 : { *(.debug_weaknames) }
-  .debug_funcnames    0 : { *(.debug_funcnames) }
-  .debug_typenames    0 : { *(.debug_typenames) }
-  .debug_varnames     0 : { *(.debug_varnames) }
-  /* GNU DWARF 2 extensions */
-  .debug_gnu_pubnames 0 : { *(.debug_gnu_pubnames) }
-  .debug_gnu_pubtypes 0 : { *(.debug_gnu_pubtypes) }
-  /* DWARF 4 */
-  .debug_types        0 : { *(.debug_types) }
-  /* DWARF 5 */
-  .debug_addr         0 : { *(.debug_addr) }
-  .debug_line_str     0 : { *(.debug_line_str) }
-  .debug_loclists     0 : { *(.debug_loclists) }
-  .debug_macro        0 : { *(.debug_macro) }
-  .debug_names        0 : { *(.debug_names) }
-  .debug_rnglists     0 : { *(.debug_rnglists) }
-  .debug_str_offsets  0 : { *(.debug_str_offsets) }
-
-  .comment 0 : { *(.comment) }
-  .note.GNU-stack 0: { *(.note.GNU-stack) }
-
-  /**
-   * This section is not included in the binary image; it is only present in the ELF file.
-   * It is used to keep certain symbols in the ELF file.
-   */
-  .noload 0 (INFO) :
-  {
-    _noload_keep_in_elf_start = ABSOLUTE(.);
-    KEEP(*(.noload_keep_in_elf .noload_keep_in_elf.*))
-    _noload_keep_in_elf_end = ABSOLUTE(.);
-  }
-}