versions: Update version to 4.3.5

esp_psram: Use efuse_ll instead of efuse API (v4.3)

See merge request espressif/esp-idf!22643

.codespellrc

@@ -1,4 +0,0 @@
-[codespell]
-skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,components/newlib/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

.editorconfig

@@ -19,6 +19,14 @@ trim_trailing_whitespace = false
 indent_style = tab
 indent_size = 2
 
+[*/freertos/**]
+indent_style = tab
+indent_size = 4
+
+[{*/freertos/**.S,**/FreeRTOSConfig.h}]
+indent_style = space
+indent_size = 4
+
 [*.pem]
 insert_final_newline = false
 
@@ -30,8 +38,6 @@ indent_style = space
 indent_size = 4
 max_line_length = 120
 
-[{*.sh,*.yml,*.yaml}]
-indent_size = 2
-
-[*.ini]
+[{*.sh,*.yml}]
+indent_style = space
 indent_size = 2

.flake8

@@ -0,0 +1,165 @@
+[flake8]
+
+select =
+    # Full lists are given in order to suppress all errors from other plugins
+    # Full list of pyflakes error codes:
+    F401,           # module imported but unused
+    F402,           # import module from line N shadowed by loop variable
+    F403,           # 'from module import *' used; unable to detect undefined names
+    F404,           # future import(s) name after other statements
+    F405,           # name may be undefined, or defined from star imports: module
+    F406,           # 'from module import *' only allowed at module level
+    F407,           # an undefined __future__ feature name was imported
+    F601,           # dictionary key name repeated with different values
+    F602,           # dictionary key variable name repeated with different values
+    F621,           # too many expressions in an assignment with star-unpacking
+    F622,           # two or more starred expressions in an assignment (a, *b, *c = d)
+    F631,           # assertion test is a tuple, which are always True
+    F701,           # a break statement outside of a while or for loop
+    F702,           # a continue statement outside of a while or for loop
+    F703,           # a continue statement in a finally block in a loop
+    F704,           # a yield or yield from statement outside of a function
+    F705,           # a return statement with arguments inside a generator
+    F706,           # a return statement outside of a function/method
+    F707,           # an except: block as not the last exception handler
+    F721, F722,     #    doctest syntax error syntax error in forward type annotation
+    F811,           # redefinition of unused name from line N
+    F812,           # list comprehension redefines name from line N
+    F821,           # undefined name name
+    F822,           # undefined name name in __all__
+    F823,           # local variable name referenced before assignment
+    F831,           # duplicate argument name in function definition
+    F841,           # local variable name is assigned to but never used
+    F901,           # raise NotImplemented should be raise NotImplementedError
+
+    # Full list of pycodestyle violations:
+    E101,           # indentation contains mixed spaces and tabs
+    E111,           # indentation is not a multiple of four
+    E112,           # expected an indented block
+    E113,           # unexpected indentation
+    E114,           # indentation is not a multiple of four (comment)
+    E115,           # expected an indented block (comment)
+    E116,           # unexpected indentation (comment)
+    E121,           # continuation line under-indented for hanging indent
+    E122,           # continuation line missing indentation or outdented
+    E123,           # closing bracket does not match indentation of opening bracket's line
+    E124,           # closing bracket does not match visual indentation
+    E125,           # continuation line with same indent as next logical line
+    E126,           # continuation line over-indented for hanging indent
+    E127,           # continuation line over-indented for visual indent
+    E128,           # continuation line under-indented for visual indent
+    E129,           # visually indented line with same indent as next logical line
+    E131,           # continuation line unaligned for hanging indent
+    E133,           # closing bracket is missing indentation
+    E201,           # whitespace after '('
+    E202,           # whitespace before ')'
+    E203,           # whitespace before ':'
+    E211,           # whitespace before '('
+    E221,           # multiple spaces before operator
+    E222,           # multiple spaces after operator
+    E223,           # tab before operator
+    E224,           # tab after operator
+    E225,           # missing whitespace around operator
+    E226,           # missing whitespace around arithmetic operator
+    E227,           # missing whitespace around bitwise or shift operator
+    E228,           # missing whitespace around modulo operator
+    E231,           # missing whitespace after ',', ';', or ':'
+    E241,           # multiple spaces after ','
+    E242,           # tab after ','
+    E251,           # unexpected spaces around keyword / parameter equals
+    E261,           # at least two spaces before inline comment
+    E262,           # inline comment should start with '# '
+    E265,           # block comment should start with '# '
+    E266,           # too many leading '#' for block comment
+    E271,           # multiple spaces after keyword
+    E272,           # multiple spaces before keyword
+    E273,           # tab after keyword
+    E274,           # tab before keyword
+    E275,           # missing whitespace after keyword
+    E301,           # expected 1 blank line, found 0
+    E302,           # expected 2 blank lines, found 0
+    E303,           # too many blank lines
+    E304,           # blank lines found after function decorator
+    E305,           # expected 2 blank lines after end of function or class
+    E306,           # expected 1 blank line before a nested definition
+    E401,           # multiple imports on one line
+    E402,           # module level import not at top of file
+    E501,           # line too long (82 > 79 characters)
+    E502,           # the backslash is redundant between brackets
+    E701,           # multiple statements on one line (colon)
+    E702,           # multiple statements on one line (semicolon)
+    E703,           # statement ends with a semicolon
+    E704,           # multiple statements on one line (def)
+    E711,           # comparison to None should be 'if cond is None:'
+    E712,           # comparison to True should be 'if cond is True:' or 'if cond:'
+    E713,           # test for membership should be 'not in'
+    E714,           # test for object identity should be 'is not'
+    E721,           # do not compare types, use 'isinstance()'
+    E722,           # do not use bare except, specify exception instead
+    E731,           # do not assign a lambda expression, use a def
+    E741,           # do not use variables named 'l', 'O', or 'I'
+    E742,           # do not define classes named 'l', 'O', or 'I'
+    E743,           # do not define functions named 'l', 'O', or 'I'
+    E901,           # SyntaxError or IndentationError
+    E902,           # IOError
+    W191,           # indentation contains tabs
+    W291,           # trailing whitespace
+    W292,           # no newline at end of file
+    W293,           # blank line contains whitespace
+    W391,           # blank line at end of file
+    W503,           # line break before binary operator
+    W504,           # line break after binary operator
+    W505,           # doc line too long (82 > 79 characters)
+    W601,           # .has_key() is deprecated, use 'in'
+    W602,           # deprecated form of raising exception
+    W603,           # '<>' is deprecated, use '!='
+    W604,           # backticks are deprecated, use 'repr()'
+    W605,           # invalid escape sequence 'x'
+    W606,           # 'async' and 'await' are reserved keywords starting with Python 3.7
+
+    # Full list of flake8 violations
+    E999,           # failed to compile a file into an Abstract Syntax Tree for the plugins that require it
+
+    # Full list of mccabe violations
+    C901            # complexity value provided by the user
+
+ignore =
+    E221,           # multiple spaces before operator
+    E231,           # missing whitespace after ',', ';', or ':'
+    E241,           # multiple spaces after ','
+    W503,           # line break before binary operator
+    W504            # line break after binary operator
+
+max-line-length = 160
+
+show_source = True
+
+statistics = True
+
+exclude =
+    .git,
+    __pycache__,
+    # submodules
+        components/bootloader/subproject/components/micro-ecc/micro-ecc,
+        components/bt/host/nimble/nimble,
+        components/cmock/CMock,
+        components/esptool_py/esptool,
+        components/expat/expat,
+        components/json/cJSON,
+        components/libsodium/libsodium,
+        components/mbedtls/mbedtls,
+        components/nghttp/nghttp2,
+        components/tinyusb,
+        components/unity/unity,
+        examples/build_system/cmake/import_lib/main/lib/tinyxml2,
+        examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib,
+    # autogenerated scripts
+        components/protocomm/python/constants_pb2.py,
+        components/protocomm/python/sec0_pb2.py,
+        components/protocomm/python/sec1_pb2.py,
+        components/protocomm/python/session_pb2.py,
+        components/wifi_provisioning/python/wifi_scan_pb2.py,
+        components/wifi_provisioning/python/wifi_config_pb2.py,
+        components/wifi_provisioning/python/wifi_constants_pb2.py,
+        components/esp_local_ctrl/python/esp_local_ctrl_pb2.py,
+        examples/provisioning/legacy/custom_config/components/custom_provisioning/python/custom_config_pb2.py,

.github/ISSUE_TEMPLATE/01_build_install_bug.yml

@@ -1,125 +0,0 @@
-name: Installation or build bug report
-description: Report installation or build bugs
-labels: ['Type: Bug']
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: input
-    id: idf_version
-    attributes:
-      label: IDF version.
-      description: On which IDF version does this issue occur on? Run `git describe --tags` to find it.
-      placeholder: ex. v3.2-dev-1148-g96cd3b75c
-    validations:
-      required: true
-  - type: dropdown
-    id: operating_system
-    attributes:
-      label: Operating System used.
-      multiple: false
-      options:
-        - Windows
-        - Linux
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: build
-    attributes:
-      label: How did you build your project?
-      multiple: false
-      options:
-        - Command line with Make
-        - Command line with CMake
-        - Command line with idf.py
-        - Eclipse IDE
-        - CLion IDE
-        - VS Code IDE
-        - Other (please specify in More Information)
-    validations:
-      required: true
-  - type: dropdown
-    id: windows_comand_line
-    attributes:
-      label: If you are using Windows, please specify command line type.
-      multiple: false
-      options:
-        - PowerShell
-        - CMD
-    validations:
-      required: false
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: Please provide a clear and concise description of the expected behavior.
-      placeholder: I expected it to...
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: What is the actual behavior?
-      description: Please describe actual behavior.
-      placeholder: Instead it...
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce.
-      description: 'How do you trigger this bug? Please walk us through it step by step. If this is build bug, please attach sdkconfig file (from your project folder). Please attach your code here.'
-      value: |
-        1. Step
-        2. Step
-        3. Step
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: debug_logs
-    attributes:
-      label: Build or installation Logs.
-      description: Build or installation log goes here, should contain the backtrace, as well as the reset source if it is a crash.
-      placeholder: Your log goes here.
-      render: plain
-    validations:
-      required: false
-  - type: textarea
-    id: diag
-    attributes:
-      label: Diagnostic report archive.
-      description: |
-        Diagnostic report for ESP-IDF created using [idf.py diag](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-diag.html) or [esp-idf-diag](https://github.com/espressif/esp-idf-diag). The `idf.py diag` command is available beginning with ESP-IDF version 5.5. For older versions, you may want to consider using the `esp-idf-diag` command.
-
-        In your project directory, execute the following command:
-
-        Using `idf.py diag`
-           1. idf.py diag
-
-        Using `esp-idf-diag`
-           1. pip install esp-idf-diag
-           2. esp-idf-diag create
-
-        Once the report is generated, the tool will guide you with the next steps.
-      placeholder: Please attach the diagnostic report zip file here.
-    validations:
-      required: false
-  - type: textarea
-    id: more-info
-    attributes:
-      label: More Information.
-      description: Do you have any other information from investigating this?
-      placeholder: ex. I tried on my friend's Windows 10 PC and the command works there.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/02_runtime_bug.yml

@@ -1,153 +0,0 @@
-name: Runtime bug report
-description: Report runtime bugs
-labels: ['Type: Bug']
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: input
-    id: idf_version
-    attributes:
-      label: IDF version.
-      description: On which IDF version does this issue occur on? Run `git describe --tags` to find it.
-      placeholder: ex. v3.2-dev-1148-g96cd3b75c
-    validations:
-      required: true
-  - type: input
-    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.
-      placeholder: ex. ESP32-C3 (QFN32) (revision v0.3)
-    validations:
-      required: true
-  - type: dropdown
-    id: operating_system
-    attributes:
-      label: Operating System used.
-      multiple: false
-      options:
-        - Windows
-        - Linux
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: build
-    attributes:
-      label: How did you build your project?
-      multiple: false
-      options:
-        - Command line with Make
-        - Command line with CMake
-        - Command line with idf.py
-        - Eclipse IDE
-        - CLion IDE
-        - VS Code IDE
-        - Other (please specify in More Information)
-    validations:
-      required: true
-  - type: dropdown
-    id: windows_comand_line
-    attributes:
-      label: If you are using Windows, please specify command line type.
-      multiple: false
-      options:
-        - PowerShell
-        - CMD
-    validations:
-      required: false
-  - type: input
-    id: devkit
-    attributes:
-      label: Development Kit.
-      description: On which Development Kit does this issue occur on?
-      placeholder: ex. ESP32-Wrover-Kit v2 | Custom Board | QEMU
-    validations:
-      required: true
-  - type: dropdown
-    id: power_supply
-    attributes:
-      label: Power Supply used.
-      multiple: false
-      options:
-        - USB
-        - External 5V
-        - External 3.3V
-        - Battery
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: Please provide a clear and concise description of the expected behavior.
-      placeholder: I expected it to...
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: What is the actual behavior?
-      description: Please describe actual behavior.
-      placeholder: Instead it...
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce.
-      description: 'How do you trigger this bug? Please walk us through it step by step. Please attach your code here.'
-      value: |
-        1. Step
-        2. Step
-        3. Step
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: debug_logs
-    attributes:
-      label: Debug Logs.
-      description: Debug log goes here, should contain the backtrace, as well as the reset source if it is a crash.
-      placeholder: Your log goes here.
-      render: plain
-    validations:
-      required: false
-  - type: textarea
-    id: diag
-    attributes:
-      label: Diagnostic report archive.
-      description: |
-        Diagnostic report for ESP-IDF created using [idf.py diag](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-diag.html) or [esp-idf-diag](https://github.com/espressif/esp-idf-diag). The `idf.py diag` command is available beginning with ESP-IDF version 5.5. For older versions, you may want to consider using the `esp-idf-diag` command.
-
-        In your project directory, execute the following command:
-
-        Using `idf.py diag`
-           1. idf.py diag
-
-        Using `esp-idf-diag`
-           1. pip install esp-idf-diag
-           2. esp-idf-diag create
-
-        Once the report is generated, the tool will guide you with the next steps.
-      placeholder: Please attach the diagnostic report zip file here.
-    validations:
-      required: false
-  - type: textarea
-    id: more-info
-    attributes:
-      label: More Information.
-      description: Do you have any other information from investigating this?
-      placeholder: ex. I tried on my friend's Windows 10 PC and the command works there.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/03_feature_request.yml

@@ -1,34 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project.
-labels: ['Type: Feature Request']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        * We welcome any ideas or feature requests! It’s helpful if you can explain exactly why the feature would be useful.
-        * There are usually some outstanding feature requests in the [existing issues list](https://github.com/espressif/esp-idf/labels/Type%3A%20Feature%20Request), feel free to add comments to them.
-        * If you would like to contribute, please read the [contributions guide](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/contribute/index.html).
-  - type: textarea
-    id: problem-related
-    attributes:
-      label: Is your feature request related to a problem?
-      description: Please provide a clear and concise description of what the problem is.
-      placeholder: ex. I'm always frustrated when ...
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like.
-      description: Please provide a clear and concise description of what you want to happen.
-      placeholder: ex. When connecting to an Espressif chip ...
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered.
-      description: Please provide a clear and concise description of any alternative solutions or features you've considered.
-      placeholder: ex. Choosing other approach wouldn't work, because ...
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context.
-      description: Please add any other context or screenshots about the feature request here.
-      placeholder: ex. This would work only when ...

.github/ISSUE_TEMPLATE/04_other_issue.yml

@@ -1,23 +0,0 @@
-name: General issue report
-description: File an issue report
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: textarea
-    id: issue
-    attributes:
-      label: General issue report
-      description: Your issue report goes here.
-      placeholder: ex. How do I run...
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,92 @@
+---
+name: Bug report
+about: ESP-IDF crashes, produces incorrect output, or has incorrect behavior
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+----------------------------- Delete below -----------------------------
+
+**Reminder: If your issue is a general question, starts similar to "How do I..", or is related to 3rd party development kits/libs, please discuss this on our community forum at https://esp32.com instead.**
+
+INSTRUCTIONS
+============
+
+Before submitting a new issue, please follow the checklist and try to find the answer.
+
+- [ ] I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
+- [ ] I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
+- [ ] I have searched the issue tracker for a similar issue and not found a similar issue.
+
+If the issue cannot be solved after the steps before, please follow these instructions so we can get the needed information to help you in a quick and effective fashion.
+
+1. Fill in all the fields under **Environment** marked with [ ] by picking the correct option for you in each case and deleting the others.
+2. Describe your problem.
+3. Include [debug logs from the "monitor" tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html#automatically-decoding-addresses), or [coredumps](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/core_dump.html).
+4. Providing as much information as possible under **Other items if possible** will help us locate and fix the problem.
+5. Use [Markdown](https://guides.github.com/features/mastering-markdown/) (see formatting buttons above) and the Preview tab to check what the issue will look like.
+6. Delete these instructions from the above to the below marker lines before submitting this issue.
+
+**IMPORTANT: If you do not follow these instructions and provide the necessary details, your issue may not be resolved.**
+
+----------------------------- Delete above -----------------------------
+
+## Environment
+
+- Development Kit:      [ESP32-Wrover-Kit|ESP32-DevKitC|ESP32-PICO-Kit|ESP32-LyraT|ESP32-LyraTD-MSC|none]
+- Kit version (for WroverKit/PicoKit/DevKitC): [v1|v2|v3|v4]
+- Module or chip used:  [ESP32-WROOM-32|ESP32-WROOM-32D|ESP32-WROOM-32U|ESP32-WROVER|ESP32-WROVER-I|ESP32-WROVER-B|ESP32-WROVER-IB|ESP32-SOLO-1|ESP32-PICO-D4|ESP32]
+- IDF version (run ``git describe --tags`` to find it):
+    // v3.2-dev-1148-g96cd3b75c
+- Build System:         [Make|CMake|idf.py]
+- Compiler version (run ``xtensa-esp32-elf-gcc --version`` to find it):
+    // 1.22.0-80-g6c4433a
+- Operating System:     [Windows|Linux|macOS]
+- (Windows only) environment type: [MSYS2 mingw32|ESP Command Prompt|Plain Command Prompt|PowerShell].
+- Using an IDE?: [No|Yes (please give details)]
+- Power Supply:         [USB|external 5V|external 3.3V|Battery]
+
+## Problem Description
+
+//Detailed problem description goes here.
+
+### Expected Behavior
+
+### Actual Behavior
+
+### Steps to reproduce
+
+1. step1
+2. ...
+
+// If possible, attach a picture of your setup/wiring here.
+
+
+### Code to reproduce this issue
+
+```cpp
+// the code should be wrapped in the ```cpp tag so that it will be displayed better.
+#include "esp_log.h"
+
+void app_main()
+{
+
+}
+
+```
+// If your code is longer than 30 lines, [GIST](https://gist.github.com) is preferred.
+
+## Debug Logs
+
+```
+Debug log goes here, should contain the backtrace, as well as the reset source if it is a crash.
+Please copy the plain text here for us to search the error log. Or attach the complete logs but leave the main part here if the log is *too* long.
+```
+
+## Other items if possible
+
+- [ ] sdkconfig file (attach the sdkconfig file from your project folder)
+- [ ] elf file in the ``build`` folder (**note this may contain all the code details and symbols of your project.**)
+- [ ] coredump (This provides stacks of tasks.)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: ESP-IDF Programming Guide
     url: https://docs.espressif.com/projects/esp-idf/en/latest/

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for ESP-IDF
+title: ''
+labels: 'Type: Feature Request'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+Please give as many details as you can. Include suggestions for useful APIs or interfaces if relevant.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.

.github/workflows/dangerjs.yml

@@ -1,27 +0,0 @@
-name: DangerJS Pull Request review
-
-on:
-  pull_request_target:
-    types: [opened, edited, reopened, synchronize]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  pull-request-style-linter:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out PR head
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - name: DangerJS pull request linter
-      uses: espressif/shared-github-dangerjs@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        instructions-gitlab-mirror: 'true'
-        instructions-contributions-file: 'CONTRIBUTING.md'
-        instructions-cla-link: 'https://cla-assistant.io/espressif/esp-idf'

.github/workflows/docker.yml

@@ -6,14 +6,14 @@ concurrency:
 on:
   push:
     branches:
-      - 'master'
-      - 'release/*'
+      - "master"
+      - "release/*"
     tags:
-      - 'v*.*'
+      - "v*.*"
 
 env:
   # Platforms to build the image for
-  BUILD_PLATFORMS: linux/amd64,linux/arm64
+  BUILD_PLATFORMS: linux/amd64
   DOCKERHUB_REPO: ${{ github.repository_owner }}/idf
 
 jobs:
@@ -73,15 +73,3 @@ jobs:
           build-args: |
             IDF_CLONE_URL=${{ github.server_url }}/${{ github.repository }}.git
             IDF_CLONE_BRANCH_OR_TAG=${{ env.CLONE_BRANCH_OR_TAG }}
-
-      - name: Update Docker Hub repository description (master branch)
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }}
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          # Token based authentication is not supported here:
-          # https://github.com/peter-evans/dockerhub-description/issues/10
-          # https://github.com/docker/roadmap/issues/115#issuecomment-891694974
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ env.DOCKERHUB_REPO }}
-          readme-filepath: ./tools/docker/README.md

.github/workflows/issue_comment.yml

@@ -3,16 +3,12 @@ name: Sync issue comments to JIRA
 # This workflow will be triggered when new issue comment is created (including PR comments)
 on: issue_comment
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in new_issues.yml
-concurrency: jira_issues
-
 jobs:
   sync_issue_comments_to_jira:
     name: Sync Issue Comments to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@master
       - name: Sync issue comments to JIRA
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

.github/workflows/new_issues.yml

@@ -3,16 +3,12 @@ name: Sync issues to Jira
 # This workflow will be triggered when a new issue is opened
 on: issues
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in issue_comment.yml
-concurrency: jira_issues
-
 jobs:
   sync_issues_to_jira:
     name: Sync issues to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@master
       - name: Sync GitHub issues to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

.github/workflows/new_prs.yml

@@ -6,16 +6,12 @@ on:
   schedule:
     - cron: "0 * * * *"
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in issue_comment.yml
-concurrency: jira_issues
-
 jobs:
   sync_prs_to_jira:
     name: Sync PRs to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@master
       - name: Sync PRs to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         with:

.github/workflows/pr_approved.yml

@@ -1,23 +0,0 @@
-name: Sync approved PRs to internal codebase
-on:
-  pull_request_target:
-    types: [labeled]
-
-jobs:
-  sync_prs_to_internal_codebase:
-    name: GitHub PR to Internal Codebase Sync
-    runs-on: ubuntu-latest
-    if: (github.event.label.name == 'PR-Sync-Merge')   ||
-        (github.event.label.name == 'PR-Sync-Rebase')  ||
-        (github.event.label.name == 'PR-Sync-Update')
-    steps:
-      - uses: actions/checkout@v3
-      - name: Sync approved PRs to internal codebase
-        uses: espressif/github-actions/github_pr_to_internal_pr@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITLAB_URL: ${{ secrets.GITLAB_URL }}
-          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
-          GIT_CONFIG_NAME: ${{ secrets.GIT_CONFIG_NAME }}
-          GIT_CONFIG_EMAIL: ${{ secrets.GIT_CONFIG_EMAIL }}
-          JIRA_PROJECT: IDFGH

.github/workflows/pre_commit_check.yml

@@ -1,44 +0,0 @@
-name: Check pre-commit rules
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  pre_commit_check:
-    runs-on: ubuntu-latest
-    env:
-      SKIP: "cleanup-ignore-lists"  # Comma-separated string of ignored pre-commit check IDs
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Fetch head and base refs
-        # This is necessary for pre-commit to check the changes in the PR branch
-        run: |
-          git fetch origin ${{ github.base_ref }}:base_ref
-          git fetch origin pull/${{ github.event.pull_request.number }}/head:pr_ref
-      - name: Set up Python environment
-        uses: actions/setup-python@master
-        with:
-          python-version: v3.8
-      - name: Install python packages
-        run: |
-          pip install pre-commit
-          pre-commit install-hooks
-      - name: Run pre-commit and check for any changes
-        run: |
-          echo "Commits being checked:"
-          git log --oneline --no-decorate base_ref..pr_ref
-          echo ""
-          if ! pre-commit run --from-ref base_ref --to-ref pr_ref --show-diff-on-failure ; then
-            echo ""
-            echo "::notice::It looks like the commits in this PR have been made without having pre-commit hooks installed."
-            echo "::notice::Please see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/install-pre-commit-hook.html for instructions."
-            echo ""
-            exit 1
-          fi
-          # Run pre-commit for PowerShell scripts check
-          pre-commit run --hook-stage manual check-powershell-scripts --from-ref base_ref --to-ref pr_ref --show-diff-on-failure

.github/workflows/python_lint.yml

@@ -0,0 +1,33 @@
+name: Python CI
+
+# This workflow will be triggered when a PR modifies some python relevant files
+on:
+  pull_request:
+    paths:
+      - "**.py"
+      - "requirements.txt"
+
+jobs:
+  python_lint:
+    name: python lint
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Set up Python environment
+        uses: actions/setup-python@master
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          export IDF_PATH=${GITHUB_WORKSPACE}
+          pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Lint with flake8
+        run: |
+          pip install flake8
+          flake8 . --config=.flake8 --benchmark

.github/workflows/release_zips.yml

@@ -11,8 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Create a recursive clone source zip
-        uses: espressif/release-zips-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          release_project_name: ESP-IDF
-          git_extra_args: --shallow-since="1 year ago"
+        uses: espressif/github-actions/release_zips@master
+        env:
+            RELEASE_PROJECT_NAME: ESP-IDF
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vulnerability_scan.yml

@@ -1,35 +0,0 @@
-name: Vulnerability scan
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  vulnerability-scan:
-    strategy:
-      # We don't want to run all jobs in parallel, because this would
-      # overload NVD and we would get 503
-      max-parallel: 1
-      matrix:
-        # References/branches which should be scanned for vulnerabilities are
-        # defined in the VULNERABILITY_SCAN_REFS variable as json list.
-        # For example: ['master', 'release/v5.2', 'release/v5.1', 'release/v5.0', 'release/v4.4']
-        ref: ${{ fromJSON(vars.VULNERABILITY_SCAN_REFS) }}
-    name: Vulnerability scan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          ref: ${{ matrix.ref }}
-
-      - name: Vulnerability scan
-        env:
-          SBOM_CHECK_LOCAL_DB: ${{ vars.SBOM_CHECK_LOCAL_DB }}
-          SBOM_MATTERMOST_WEBHOOK: ${{ secrets.SBOM_MATTERMOST_WEBHOOK }}
-          NVDAPIKEY: ${{ secrets.NVDAPIKEY }}
-        uses: espressif/esp-idf-sbom-action@master
-        with:
-          ref: ${{ matrix.ref }}

.gitignore

@@ -21,8 +21,15 @@ GPATH
 # MacOS directory files
 .DS_Store
 
-# cache dir
-.cache/
+# Components Unit Test Apps files
+components/**/build
+components/**/sdkconfig
+components/**/sdkconfig.old
+
+# Example project files
+examples/**/sdkconfig
+examples/**/sdkconfig.old
+examples/**/build
 
 # Doc build artifacts
 docs/_build/
@@ -32,33 +39,26 @@ docs/doxygen_sqlite3.db
 docs/_static/DejaVuSans.ttf
 docs/_static/NotoSansSC-Regular.otf
 
-# Components Unit Test Apps files
-components/**/build/
-components/**/build_*_*/
-components/**/sdkconfig
-components/**/sdkconfig.old
-components/**/test_apps/wifi_nvs_config/nvs_data_suffix.csv
-
-# Example project files
-examples/**/build/
-examples/**/build_*_*/
-examples/**/sdkconfig
-examples/**/sdkconfig.old
-
 # Unit test app files
-tools/unit-test-app/build
-tools/unit-test-app/build_*_*/
 tools/unit-test-app/sdkconfig
 tools/unit-test-app/sdkconfig.old
+tools/unit-test-app/build
+tools/unit-test-app/builds
+tools/unit-test-app/output
+tools/unit-test-app/test_configs
+
+# Unit Test CMake compile log folder
+log_ut_cmake
 
 # test application build files
-tools/test_apps/**/build/
-tools/test_apps/**/build_*_*/
+tools/test_apps/**/build
 tools/test_apps/**/sdkconfig
 tools/test_apps/**/sdkconfig.old
 
-TEST_LOGS/
-build_summary_*.xml
+# IDF monitor test
+tools/test_idf_monitor/outputs
+
+TEST_LOGS
 
 # gcov coverage reports
 *.gcda
@@ -75,10 +75,6 @@ test_multi_heap_host
 *.swp
 *.swo
 
-# Sublime Text files
-*.sublime-project
-*.sublime-workspace
-
 # Clion IDE CMake build & config
 .idea/
 cmake-build-*/
@@ -95,18 +91,3 @@ dependencies.lock
 
 # managed_components for examples
 managed_components
-
-# pytest log
-pytest-embedded/
-# legacy one
-pytest_embedded_log/
-list_job*.txt
-size_info*.txt
-XUNIT_RESULT*.xml
-.manifest_sha
-
-# clang config (for LSP)
-.clangd
-
-# Vale
-.vale/styles/*

.gitlab-ci.yml

@@ -1,35 +1,158 @@
+stages:
+  - pre_check
+  - build
+  - assign_test
+  - host_test
+  - target_test
+  - test_deploy
+  - post_check
+  - deploy
+  - post_deploy
+
+# pipelines will not be created in such two cases:
+# 1. MR push
+# 2. push not on "master/release" branches, and not tagged
+# This behavior could be changed after the `rules: changes` feature is implemented
 workflow:
   rules:
-    # 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"'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $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
-      variables:
-        PIPELINE_COMMIT_SHA: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA
-        IS_MR_PIPELINE: 1
-    - if: $CI_OPEN_MERGE_REQUESTS == null
-      variables:
-        PIPELINE_COMMIT_SHA: $CI_COMMIT_SHA
-        IS_MR_PIPELINE: 0
     - when: always
 
-# Place the default settings in `.gitlab/ci/common.yml` instead
+variables:
+# System environment
+
+  # Common parameters for the 'make' during CI tests
+  MAKEFLAGS: "-j5 --no-keep-going"
+
+# GitLab-CI environment
+
+  # XXX_ATTEMPTS variables (https://docs.gitlab.com/ce/ci/yaml/README.html#job-stages-attempts) are not defined here.
+  # Use values from  "CI / CD Settings" - "Variables".
+
+  # GIT_STRATEGY is not defined here.
+  # Use an option from  "CI / CD Settings" - "General pipelines".
+
+  # 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
+  SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
+  # by default we will fetch all submodules
+  # jobs can overwrite this variable to only fetch submodules they required
+  # set to "none" if don't need to fetch submodules
+  SUBMODULES_TO_FETCH: "all"
+  # tell build system do not check submodule update as we download archive instead of clone
+  IDF_SKIP_CHECK_SUBMODULES: 1
+
+  IDF_PATH: "$CI_PROJECT_DIR"
+  BATCH_BUILD: "1"
+  V: "0"
+  CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
+
+  # Docker images
+  BOT_DOCKER_IMAGE_TAG: ":latest"
+
+  # target test config file, used by assign test job
+  CI_TARGET_TEST_CONFIG_FILE: "$CI_PROJECT_DIR/tools/ci/config/target-test.yml"
+
+  # target test repo parameters
+  TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git"
+
+  # Versioned esp-idf-doc env image to use for all document building jobs
+  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v10"
+
+.setup_tools_unless_target_test: &setup_tools_unless_target_test |
+  if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then
+  export IDF_MIRROR_PREFIX_MAP=
+  fi
+  if [[ "$SETUP_TOOLS" == "1" || "$CI_JOB_STAGE" != "target_test" ]]; then
+    tools/idf_tools.py --non-interactive install ${SETUP_TOOLS_LIST:-} && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
+  fi
+
+before_script:
+  - source tools/ci/utils.sh
+  - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+  - source tools/ci/setup_python.sh
+  - apply_bot_filter
+  - add_gitlab_ssh_keys
+  - source tools/ci/configure_ci_environment.sh
+  - *setup_tools_unless_target_test
+  - fetch_submodules
+
+# used for check scripts which we want to run unconditionally
+.before_script_lesser_nofilter:
+  before_script:
+    - echo "Not setting up GitLab key, not fetching submodules, not applying bot filter"
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+    - source tools/ci/setup_python.sh
+    - source tools/ci/configure_ci_environment.sh
+
+# used for everything else where we want to do no prep, except for bot filter
+.before_script_lesser:
+  before_script:
+    - echo "Not setting up GitLab key, not fetching submodules"
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+    - source tools/ci/setup_python.sh
+    - apply_bot_filter
+    - source tools/ci/configure_ci_environment.sh
+
+.before_script_slim:
+  before_script:
+    - echo "Only load utils.sh inside"
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+
+.before_script_macos:
+  before_script:
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+    - apply_bot_filter
+    - export IDF_TOOLS_PATH="${HOME}/.espressif_runner_${CI_RUNNER_ID}_${CI_CONCURRENT_ID}"
+    # Clean up idf-env.json which might not be compatible with one produced by newer ESP-IDF versions
+    - rm -f ${IDF_TOOLS_PATH}/idf-env.json
+    - $IDF_PATH/tools/idf_tools.py install-python-env
+    # On macOS, these tools need to be installed
+    - $IDF_PATH/tools/idf_tools.py --non-interactive install cmake ninja
+    # This adds tools (compilers) and the version-specific Python environment to PATH
+    - *setup_tools_unless_target_test
+    # Install packages required by CI scripts into IDF Python environment
+    - pip install -r $IDF_PATH/tools/ci/python_packages/ttfw_idf/requirements.txt
+    - source tools/ci/configure_ci_environment.sh
+    # Part of tools/ci/setup_python.sh; we don't use pyenv on macOS, so can't run the rest of the script.
+    - export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
+    - fetch_submodules
+
+# this is a workaround since CI on 4.3 is using python 3.4 and the real support version is 3.6
+# Can't find package versions that match both of them at the same time.
+# install the idf-component-manager here instead of in the dockerfile with a fixed version
+.before_script_build_cmake:
+  before_script:
+    - source tools/ci/utils.sh
+    - source tools/ci/setup_python.sh
+    - apply_bot_filter
+    - add_gitlab_ssh_keys
+    - source tools/ci/configure_ci_environment.sh
+    - *setup_tools_unless_target_test
+    - fetch_submodules
+    - pip install "idf-component-manager~=1.1"
+
+default:
+  retry:
+    max: 2
+    # In case of a runner failure we could hop to another one, or a network error could go away.
+    when: runner_system_failure
 
 include:
-  - '.gitlab/ci/danger.yml'
-  - '.gitlab/ci/common.yml'
-  - '.gitlab/ci/rules.yml'
-  - '.gitlab/ci/upload_cache.yml'
-  - '.gitlab/ci/docs.yml'
-  - '.gitlab/ci/static-code-analysis.yml'
-  - '.gitlab/ci/pre_commit.yml'
-  - '.gitlab/ci/pre_check.yml'
-  - '.gitlab/ci/build.yml'
-  - '.gitlab/ci/integration_test.yml'
-  - '.gitlab/ci/host-test.yml'
-  - '.gitlab/ci/deploy.yml'
-  - '.gitlab/ci/post_deploy.yml'
-  - '.gitlab/ci/retry_failed_jobs.yml'
-  - '.gitlab/ci/test-win.yml'
+  - '/tools/ci/config/rules.yml'
+  - '/tools/ci/config/pre_check.yml'
+  - '/tools/ci/config/build.yml'
+  - '/tools/ci/config/assign-test.yml'
+  - '/tools/ci/config/host-test.yml'
+  - '/tools/ci/config/target-test.yml'
+  - '/tools/ci/config/post_check.yml'
+  - '/tools/ci/config/deploy.yml'
+  - '/tools/ci/config/post_deploy.yml'

.gitlab/CODEOWNERS

@@ -2,253 +2,5 @@
 #
 #    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/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
-/.pre-commit-config.yaml              @esp-idf-codeowners/ci
-/.readthedocs.yml                     @esp-idf-codeowners/docs
-/.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_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_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_lcd/                  @esp-idf-codeowners/peripherals
-/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_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_vfs_*/                @esp-idf-codeowners/storage
-/components/esp_vfs_console/          @esp-idf-codeowners/storage @esp-idf-codeowners/system
-/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/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/json/                     @esp-idf-codeowners/app-utilities
-/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/newlib/                   @esp-idf-codeowners/system @esp-idf-codeowners/toolchain
-/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/touch_element/            @esp-idf-codeowners/peripherals
-/components/ulp/                      @esp-idf-codeowners/system
-/components/unity/                    @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
-/components/usb/                      @esp-idf-codeowners/peripherals/usb
-/components/vfs/                      @esp-idf-codeowners/storage
-/components/wear_levelling/           @esp-idf-codeowners/storage
-/components/wifi_provisioning/        @esp-idf-codeowners/app-utilities/provisioning
-/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/provisioning/       @esp-idf-codeowners/app-utilities/provisioning
-/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/catch/                 @esp-idf-codeowners/ci
-/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/esp_prov/              @esp-idf-codeowners/app-utilities
-/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/configs/            @esp-idf-codeowners/system
-/tools/test_apps/linux_compatible/   @esp-idf-codeowners/system
-/tools/test_apps/peripherals/        @esp-idf-codeowners/peripherals
-/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
-
-/tools/unit-test-app/         @esp-idf-codeowners/system @esp-idf-codeowners/tools
-
-# 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
+* @esp-idf-codeowners/all-maintainers

.gitlab/ci/README.md

@@ -1,325 +0,0 @@
-# IDF CI
-
-- [IDF CI](#idf-ci)
-  - [General Workflow](#general-workflow)
-  - [What if Expected Jobs ARE NOT Created?](#what-if-expected-jobs-are-not-created)
-  - [MR labels for additional jobs](#mr-labels-for-additional-jobs)
-    - [Supported MR Labels](#supported-mr-labels)
-    - [How to trigger a `detached` pipeline without pushing new commits?](#how-to-trigger-a-detached-pipeline-without-pushing-new-commits)
-  - [How to Develop With `rules.yml`?](#how-to-develop-with-rulesyml)
-    - [General Concepts](#general-concepts)
-    - [How to Add a New `Job`?](#how-to-add-a-new-job)
-    - [How to Add a New `Rules` Template?](#how-to-add-a-new-rules-template)
-    - [How to Add a New `if` Anchor?](#how-to-add-a-new-if-anchor)
-    - [Naming Rules](#naming-rules)
-      - [Common Naming Rules](#common-naming-rules)
-      - [`if` Anchors Naming Rules](#if-anchors-naming-rules)
-      - [`rules` Template Naming Rules](#rules-template-naming-rules)
-  - [Reusable Shell Script `tools/ci/utils.sh`](#reusable-shell-script-toolsciutilssh)
-    - [Functions](#functions)
-      - [CI Job Related](#ci-job-related)
-      - [Shell Script Related](#shell-script-related)
-  - [Manifest File to Control the Build/Test apps](#manifest-file-to-control-the-buildtest-apps)
-    - [Grammar](#grammar)
-    - [Special Rules](#special-rules)
-  - [Upload/Download Artifacts to Internal Minio Server](#uploaddownload-artifacts-to-internal-minio-server)
-    - [Users Without Access to Minio](#users-without-access-to-minio)
-    - [Users With Access to Minio](#users-with-access-to-minio)
-      - [Env Vars for Minio](#env-vars-for-minio)
-      - [Artifacts Types and File Patterns](#artifacts-types-and-file-patterns)
-      - [Upload](#upload)
-      - [Download](#download)
-
-## General Workflow
-
-1. Push to a remote branch
-2. Create an MR, choose related labels (not required)
-3. A `detached` pipeline will be created.
-4. if you push a new commit, a new pipeline will be created automatically.
-
-## What if Expected Jobs ARE NOT Created?
-
-1. check the file patterns
-
-   If you found a job that is not running as expected with some file changes, a git commit to improve the `pattern` will be appreciated.
-
-2. please add MR labels to run additional tests, currently we have to do this only for `target-test` jobs, please use it as few as possible. Our final goal is to remove all the labels and let the file changes decide everything!
-
-## MR labels for additional jobs
-
-### Supported MR Labels
-
-- `build`
-- `build_docs`
-- `component_ut[_esp32/esp32s2/...]`
-- `custom_test[_esp32/esp32s2/...]`
-- `docker`
-- `docs`
-- `docs_full`, triggers a full docs build, regardless of files changed
-- `example_test[_esp32/esp32s2/...]`
-- `fuzzer_test`
-- `host_test`
-- `integration_test`
-- `iperf_stress_test`
-- `macos`
-- `macos_test`
-- `nvs_coverage`
-- `submodule`
-- `windows`
-
-There are two general labels (not recommended since these two labels will trigger a lot of jobs)
-
-- `target_test`: includes all target for `example_test`, `custom_test`, `component_ut`, `integration_test`
-- `all_test`: includes all test labels
-
-### How to trigger a `detached` pipeline without pushing new commits?
-
-Go to MR web page -> `Pipelines` tab -> click `Run pipeline` button.
-
-In very rare case, this tab will not show up because no merge_request pipeline is created before. Please use web API then.
-
-```shell
-curl -X POST --header "PRIVATE-TOKEN: [YOUR PERSONAL ACCESS TOKEN]" [GITLAB_SERVER]/api/v4/projects/103/merge_requests/[MERGE_REQUEST_IID]/pipelines
-```
-
-## How to Develop With `rules.yml`?
-
-### General Concepts
-
-- `pattern`: Defined in an array. A GitLab job will be created if the changed files in this MR matched one of the patterns. For example:
-
-    ```yaml
-    .patterns-python-files: &patterns-python-files
-      - "**/*.py"
-    ```
-
-- `label`: Defined in an if clause, similar as the previous bot command. A GitLab job will be created if the pipeline variables contains variables in `BOT_LABEL_xxx` format (DEPRECATED) or included in the MR labels. For example:
-
-    ```yaml
-    .if-label-build_docs: &if-label-build_docs
-      if: '$BOT_LABEL_BUILD_DOCS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build_docs(?:,[^,\n\r]+)*$/i'
-    ```
-
-- `rule`: A combination of various patterns, and labels. It will be used by GitLab YAML `extends` keyword to tell GitLab in what conditions will this job be created. For example:
-
-    ```yaml
-    .rules:build:docs:
-      rules:
-        - <<: *if-protected
-        - <<: *if-label-build_docs
-        - <<: *if-label-docs
-        - <<: *if-dev-push
-          changes: *patterns-docs
-    ```
-
-  An example for GitLab job on how to use extends:
-
-    ```yaml
-    check_docs_lang_sync:
-      extends:
-        - .pre_check_template
-        - .rules:build:docs
-      script:
-        - cd docs
-        - ./check_lang_folder_sync.sh
-    ```
-
-### How to Add a New `Job`?
-
-check if there's a suitable `.rules:<rules-you-need>` template
-
-1. if there is, put this in the job `extends`. All done, now you can close this window. (`extends` could be array or string)
-2. if there isn't
-    1. check [How to Add a New `Rules` Template?](#how-to-add-a-new-rules-template), create a suitable one
-    2. follow step 1
-
-### How to Add a New `Rules` Template?
-
-check if this rule is related to `labels`, `patterns`
-
-1. if it is, please refer to [dependencies/README.md](./dependencies/README.md) and add new rules by auto-generating
-2. if it isn't, please continue reading
-
-check if there's a suitable `.if-<if-anchor-you-need>` anchor
-
-1. if there is, create a rule following [`rules` Template Naming Rules](#rules-template-naming-rules).For detail information, please refer to [GitLab Documentation `rules-if`](https://docs.gitlab.com/ee/ci/yaml/README.html#rulesif). Here's an example.
-
-    ```yaml
-    .rules:patterns:clang_tidy:
-      rules:
-        - <<: *if-protected
-        - <<: *if-dev-push
-          changes: *patterns-c-files
-    ```
-
-2. if there isn't
-
-    1. check [How to Add a New `if` Anchor?](#how-to-add-a-new-if-anchor), create a suitable one
-    2. follow step 1
-
-### How to Add a New `if` Anchor?
-
-Create an `if` anchor following [`if` Anchors Naming Rules](#if-anchors-naming-rules). For detailed information about how to write the condition clause, please refer to [GitLab Documentation `only/except (advanced)](https://docs.gitlab.com/ee/ci/yaml/README.html#onlyexcept-advanced). Here's an example.
-
-```yaml
-.if-schedule: &if-schedule:
-  if: '$CI_PIPELINE_SOURCE == "schedule"'
-```
-
-### Naming Rules
-
-#### Common Naming Rules
-
-if a phrase has multi words, use `_` to concatenate them.
-
-> e.g. `regular_test`
-
-if a name has multi phrases, use `-` to concatenate them.
-
-> e.g. `regular_test-example_test`
-
-#### `if` Anchors Naming Rules
-
-- if it's a label: `.if-label-<label_name>`
-- if it's a ref: `.if-ref-<ref_name>`
-- if it's a branch: `.if-branch-<branch_name>`
-- if it's a tag: `.if-tag-<tag_name>`
-- if it's multi-type combination: `.if-ref-<release_name>-branch-<branch_name>`
-
-  **Common Phrases/Abbreviations**
-
-    - `no_label`
-
-      `$BOT_TRIGGER_WITH_LABEL == null`
-
-    - `protected`
-
-      `($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/)`
-
-    - `target_test`
-
-      a combination of `example_test`, `custom_test`, `component_ut`, `integration_test` and all targets
-
-#### `rules` Template Naming Rules
-
-- if it's tag related: `.rules:tag:<tag_1>-<tag_2>`
-- if it's label related: `.rules:labels:<label_1>-<label_2>`
-- if it's test related: `.rules:test:<test_type>`
-- if it's build related: `.rules:build:<build_type>`
-- if it's pattern related: `.rules:patterns:<patterns>`
-
-## Reusable Shell Script `tools/ci/utils.sh`
-
-It is used to put all the reusable shell scripts as small functions. If you want to set `before_script: []` for you job, now you can set `extends: .before_script_slim` instead. it will only run `source tools/ci/utils.sh`
-
-If you're developing CI shell scripts, you can use these functions without `source` them. They're already included in all `before_script`
-
-To run these commands in shell script locally, place `source tools/ci/utils.sh` at the very beginning.
-
-### Functions
-
-#### CI Job Related
-
-- `add_gitlab_ssh_keys`
-- `add_github_ssh_keys`
-- `add_doc_server_ssh_keys`
-- `fetch_submodules`
-- `get_all_submodules`
-
-#### Shell Script Related
-
-- `error`: log in red color
-- `warning`: log in orange color
-- `info`: log in green color
-- `run_cmd`: run the command with duration seconds info
-- `retry_failed`: run the command with duration seconds info, retry when failed
-
-## Manifest File to Control the Build/Test apps
-
-`.build-test-rules.yml` file is a manifest file to control if the CI is running the build and test job or not. The Supported Targets table in `README.md` for apps would be auto-generated by `pre-commit` from the app's `.build-test-rules.yml`.
-
-### Grammar
-
-We're using the latest version of [idf-build-apps][idf-build-apps]. Please refer to their [documentation][manifest-doc]
-
-[idf-build-apps]: https://github.com/espressif/idf-build-apps
-[manifest-doc]: https://docs.espressif.com/projects/idf-build-apps/en/latest/manifest.html
-
-### Special Rules
-
-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`
-- 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`

.gitlab/ci/build.yml

@@ -1,329 +0,0 @@
-.build_template:
-  stage: build
-  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
-  variables:
-    # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
-    IDF_CCACHE_ENABLE: "1"
-  dependencies: []
-
-.build_cmake_clang_template:
-  extends:
-    - .build_template
-    - .before_script:build
-    - .after_script:build:ccache-show-stats
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-    - pipeline_variables
-  artifacts:
-    paths:
-      # The other artifacts patterns are defined under tools/ci/artifacts_handler.py
-      # Now we're uploading/downloading the binary files from our internal storage server
-      #
-      # keep the log file to help debug
-      - "**/build*/build_log.txt"
-      # keep the size info to help track the binary size
-      - size_info.txt
-      - "**/build*/size.json"
-    expire_in: 1 week
-    when: always
-  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
-      -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 #
-######################
-.build_template_app_template:
-  extends:
-    - .build_template
-    - .before_script:build
-  variables:
-    LOG_PATH: "${CI_PROJECT_DIR}/log_template_app"
-    BUILD_PATH: "${CI_PROJECT_DIR}/build_template_app"
-    BUILD_DIR: "${BUILD_PATH}/@t/@w"
-    BUILD_LOG_CMAKE: "${LOG_PATH}/cmake_@t_@w.txt"
-    BUILD_COMMAND_ARGS: ""
-  artifacts:
-    paths:
-      - log_template_app/*
-      - size_info.txt
-      - build_template_app/**/size.json
-    expire_in: 1 week
-    when: always
-  script:
-    # Set the variable for 'esp-idf-template' testing
-    - ESP_IDF_TEMPLATE_GIT=${ESP_IDF_TEMPLATE_GIT:-"https://github.com/espressif/esp-idf-template.git"}
-    - retry_failed git clone ${ESP_IDF_TEMPLATE_GIT}
-    # Try to use the same branch name for esp-idf-template that we're
-    # using on esp-idf. If it doesn't exist then just stick to the default branch
-    - python $CHECKOUT_REF_SCRIPT esp-idf-template esp-idf-template
-    - export PATH="$IDF_PATH/tools:$PATH"
-    # Only do the default cmake build for each target, remaining part are done in the build_template_app job
-    - tools/ci/build_template_app.sh ${BUILD_COMMAND_ARGS}
-
-# build-related-pre-check-jobs ------------------------------------------------
-# Build at least one project for each target at earliest stage to reduce build cost for obvious failing commits
-fast_template_app:
-  extends:
-    - .build_template_app_template
-    - .rules:build:target_test
-  stage: pre_check
-  tags: [fast_run, shiny]
-  variables:
-    BUILD_COMMAND_ARGS: "-p"
-#------------------------------------------------------------------------------
-
-#######################
-# gnu_static_analyzer #
-#######################
-gcc_static_analyzer:
-  extends:
-    - .build_template_app_template
-    - .rules:build:target_test
-  stage: pre_check
-  tags: [build, shiny]
-  variables:
-    CI_CCACHE_DISABLE: 1
-    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
-
-########################################
-# Clang Build Apps Without Tests Cases #
-########################################
-build_clang_test_apps_esp32:
-  extends:
-    - .build_cmake_clang_template
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32
-
-build_clang_test_apps_esp32s2:
-  extends:
-    - .build_cmake_clang_template
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32s2
-
-build_clang_test_apps_esp32s3:
-  extends:
-    - .build_cmake_clang_template
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32s3
-
-.build_clang_test_apps_riscv:
-  extends:
-    - .build_cmake_clang_template
-  variables:
-    # https://reviews.llvm.org/D90108.
-    # GNU 'as' lets .weak override .globl since binutils-gdb
-    # https://github.com/bminor/binutils-gdb/commit/5ca547dc2399a0a5d9f20626d4bf5547c3ccfddd (1996)
-    # while MC lets the last directive win (PR38921).
-    # For RISCV chips we use integrated assembler by default, so suppress this warning to pass CI pipeline.
-    TEST_BUILD_OPTS_EXTRA: "--ignore-warning-str 'changed binding to STB_WEAK'"
-
-build_clang_test_apps_esp32c3:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c3
-
-build_clang_test_apps_esp32c2:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c2
-
-build_clang_test_apps_esp32c6:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c6
-
-build_clang_test_apps_esp32c5:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c5
-
-build_clang_test_apps_esp32h2:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32h2
-
-build_clang_test_apps_esp32p4:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32p4
-
-######################
-# Build System Tests #
-######################
-.test_build_system_template:
-  stage: host_test
-  extends:
-    - .build_template
-    - .rules:build:check
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-      optional: true
-  artifacts:
-    reports:
-      junit: XUNIT_RESULT.xml
-    paths:
-      - XUNIT_RESULT.xml
-      - test_build_system
-    expire_in: 1 week
-    when: always
-  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
-    - pytest
-      --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
-
-pytest_build_system_macos:
-  extends:
-    - .test_build_system_template
-    - .before_script:build:macos
-    - .after_script:build:macos:upload-failed-job-logs:ccache-show-stats
-    - .rules:build:macos
-  tags:
-    - macos
-  parallel: 3
-  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.
-    # 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"
-
-build_docker:
-  extends:
-    - .before_script:minimal
-    - .rules:build:docker
-  stage: host_test
-  needs: []
-  image: espressif/docker-builder:1
-  tags:
-    - build_docker_amd64_brno
-  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
-    - 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.
-    # Therefore, build a copy of the example located inside the container.
-    - docker run --rm --workdir /opt/esp/idf/examples/get-started/blink ${DOCKER_TMP_IMAGE_NAME} idf.py build
-
-# This job builds template app with permutations of targets and optimization levels
-build_template_app:
-  extends:
-    - .build_template_app_template
-    - .rules:build
-  stage: host_test
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-
-####################
-# Dynamic Pipeline #
-####################
-generate_build_child_pipeline:
-  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:
-      - build_child_pipeline.yml
-      - test_related_apps.txt
-      - 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:
-  stage: build
-  needs:
-    - job: fast_template_app
-      optional: true
-      artifacts: false
-    - 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
-  trigger:
-    include:
-      - artifact: build_child_pipeline.yml
-        job: generate_build_child_pipeline
-    strategy: depend

.gitlab/ci/common.yml

@@ -1,418 +0,0 @@
-#####################
-# Default Variables #
-#####################
-stages:
-  - upload_cache
-  - pre_check
-  - build
-  - assign_test
-  - build_doc
-  - target_test
-  - host_test
-  - test_deploy
-  - deploy
-  - post_deploy
-  - retry_failed_jobs
-
-variables:
-# System environment
-
-  # Common parameters for the 'make' during CI tests
-  MAKEFLAGS: "-j5 --no-keep-going"
-
-# GitLab-CI environment
-  # Thanks to pack-objects cache, clone strategy should behave faster than fetch
-  #   so we pick "clone" as default git strategy
-  # Shiny runners by default remove the CI_PROJECT_DIR every time at the beginning of one job
-  #   and clone with a --depth=1
-  # Brew runners will fetch from locally mirror first, and cache the local CI_PROJECT_DIR
-  # In conclusion
-  # - 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
-  # --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: v6.0-dev
-
-  SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
-  # by default we will fetch all submodules
-  # jobs can overwrite this variable to only fetch submodules they required
-  # set to "none" if don't need to fetch submodules
-  SUBMODULES_TO_FETCH: "all"
-  # tell build system do not check submodule update as we download archive instead of clone
-  IDF_SKIP_CHECK_SUBMODULES: 1
-
-  IDF_PATH: "$CI_PROJECT_DIR"
-  V: "0"
-  CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
-
-  # Docker images
-  ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v6.0:1"
-  ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v6.0:1-1"
-  TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v6.0: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"
-
-  # Set this variable to the branch of idf-constraints repo in order to test a custom Python constraint file. The
-  # branch name must be without the remote part ("origin/"). Keep the variable empty in order to use the constraint
-  # file from https://dl.espressif.com/dl/esp-idf.
-  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.v6.0.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.
-  CI_PYTHON_TOOL_REPO: ""
-
-  # Set this variable to the branch of a Python tool repo specified in CI_PYTHON_TOOL_REPO. The
-  # branch name must be without the remote part ("origin/"). Keep the variable empty when not used.
-  # This is used only if CI_PYTHON_TOOL_REPO is not empty.
-  CI_PYTHON_TOOL_BRANCH: ""
-
-  # Set this variable to Clang toolchain distro URL to be used.
-  # NOTE: We have separate toolchains for Xtensa and RISCV, therefore jobs for one arch will fail.
-  # This is OK as far as we use CI_CLANG_DISTRO_URL for pre-release tests purposes only.
-  # Keep the variable empty when not used.
-  CI_CLANG_DISTRO_URL: ""
-
-  # Set this variable to specify the file name for the known failure cases.
-  KNOWN_FAILURE_CASES_FILE_NAME: "master.txt"
-
-  IDF_CI_BUILD: 1
-
-  # ccache settings
-  # some settings need to set in .gitlab-ci.yml as it takes effect while start-up the job
-  # https://ccache.dev/manual/latest.html#_configuring_ccache
-
-  # host mapping volume to share ccache between runner concurrent jobs
-  CCACHE_DIR: "/cache/idf_ccache"
-  CCACHE_MAXSIZE: "50G"
-
-  FF_USE_NEW_BASH_EVAL_STRATEGY: "true"
-
-################################################
-# `before_script` and `after_script` Templates #
-################################################
-.common_before_scripts: &common-before_scripts |
-  source tools/ci/utils.sh
-
-  is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
-
-  if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then
-    export IDF_MIRROR_PREFIX_MAP=
-  fi
-
-  if echo "$CI_MERGE_REQUEST_LABELS" | egrep "(^|,)include_nightly_run(,|$)"; then
-    export INCLUDE_NIGHTLY_RUN="1"
-    export NIGHTLY_RUN="1"
-  fi
-
-  # configure cmake related flags
-  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"
-
-.setup_tools_and_idf_python_venv: &setup_tools_and_idf_python_venv |
-  # must use after setup_tools_except_target_test
-  # otherwise the export.sh won't work properly
-
-  # download constraint file for dev
-  if [[ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]]; then
-    wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" ${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}
-    mkdir -p ~/.espressif
-    mv /tmp/constraint.txt ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
-  fi
-
-  # Mirror
-  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
-
-  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
-    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_end "install_python_env"
-  fi
-
-  if [[ ! -z "$INSTALL_EXTRA_TOOLS" ]]; then
-    section_start "installing_optional_tools" "Install optional tools ${INSTALL_EXTRA_TOOLS}"
-    $IDF_PATH/tools/idf_tools.py --non-interactive install $INSTALL_EXTRA_TOOLS
-    section_end "installing_optional_tools"
-  fi
-
-  # Install esp-clang if necessary (esp-clang is separately installed)
-  if [[ "$IDF_TOOLCHAIN" == "clang" && -z "$CI_CLANG_DISTRO_URL" ]]; then
-    $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"
-
-  # Custom clang toolchain
-  if [[ "$IDF_TOOLCHAIN" == "clang" && ! -z "$CI_CLANG_DISTRO_URL" ]]; then
-    echo "Using custom clang from ${CI_CLANG_DISTRO_URL}"
-    wget $CI_CLANG_DISTRO_URL
-    ARCH_NAME=$(basename $CI_CLANG_DISTRO_URL)
-    tar -x -f $ARCH_NAME
-    export PATH=$PWD/esp-clang/bin:$PATH
-  fi
-
-  # Custom OpenOCD
-  if [[ "$CI_JOB_STAGE" == "target_test" ]]; then
-    machine="$(uname -m)"
-    if [[ "$machine" == "armv7l" ]] ; then
-      OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARMHF"
-    elif [[ "$machine" == "aarch64" ]] ; then
-      OOCD_DISTRO_URL="$OOCD_DISTRO_URL_ARM64"
-    fi
-    if [[ ! -z "$OOCD_DISTRO_URL" ]]; then
-      echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
-      wget $OOCD_DISTRO_URL
-      ARCH_NAME=$(basename $OOCD_DISTRO_URL)
-      tar -x -f $ARCH_NAME
-      export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
-      export PATH=$PWD/openocd-esp32/bin:$PATH
-    fi
-  fi
-
-  if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then
-    git clone --quiet --depth=1 -b ${CI_PYTHON_TOOL_BRANCH} https://gitlab-ci-token:${ESPCI_TOKEN}@${GITLAB_HTTPS_HOST}/espressif/${CI_PYTHON_TOOL_REPO}.git
-    pip install ./${CI_PYTHON_TOOL_REPO}
-    rm -rf ${CI_PYTHON_TOOL_REPO}
-  fi
-
-  info "setup tools and python venv done"
-
-.show_ccache_statistics: &show_ccache_statistics |
-  # Show ccache statistics if enabled globally
-  test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats -vv || true
-
-.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
-  fi
-
-.before_script:minimal:
-  before_script:
-    - *common-before_scripts
-
-.before_script:build:macos:
-  before_script:
-    # macos is running shell executor, which means it would use
-    # the system installed /usr/local/bin/python3 by default.
-    # Ensure pyenv and PYENV_VERSION installed
-    - eval "$(pyenv init -)"
-    - *common-before_scripts
-    # 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
-    - *setup_tools_and_idf_python_venv
-    - fetch_submodules
-  variables:
-    INSTALL_EXTRA_TOOLS: cmake ninja
-
-.after_script:build:macos:upload-failed-job-logs:ccache-show-stats:
-  after_script:
-    # macos is running shell executor, which means it would use
-    # the system installed /usr/local/bin/python3 by default.
-    # Ensure pyenv and PYENV_VERSION installed
-    - eval "$(pyenv init -)"
-    - *upload_failed_job_log_artifacts
-    - *show_ccache_statistics
-
-.before_script:build:
-  before_script:
-    - *common-before_scripts
-    - *setup_tools_and_idf_python_venv
-    - add_gitlab_ssh_keys
-    - fetch_submodules
-    - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
-    - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
-
-.after_script:build:ccache-show-stats:
-  after_script:
-    - *show_ccache_statistics
-
-.after_script:build:ccache-show-stats:upload-failed-job-logs:
-  after_script:
-    - *show_ccache_statistics
-    - *upload_failed_job_log_artifacts
-
-##############################
-# Git Strategy Job Templates #
-##############################
-.git_init: &git_init |
-  mkdir -p "${CI_PROJECT_DIR}"
-  cd "${CI_PROJECT_DIR}"
-  git init
-
-.git_fetch_from_mirror_url_if_exists: &git_fetch_from_mirror_url_if_exists |
-  # check if set mirror
-  if [ -n "${LOCAL_GITLAB_HTTPS_HOST:-}" ] && [ -n "${ESPCI_TOKEN:-}" ]; then
-    MIRROR_REPO_URL="https://bot:${ESPCI_TOKEN}@${LOCAL_GITLAB_HTTPS_HOST}/${CI_PROJECT_PATH}"
-  elif [ -n "${LOCAL_GIT_MIRROR:-}" ]; then
-    MIRROR_REPO_URL="${LOCAL_GIT_MIRROR}/${CI_PROJECT_PATH}"
-  fi
-
-  # fetch from mirror first if set
-  if [ -n "${MIRROR_REPO_URL:-}" ]; then
-    if git remote -v | grep origin; then
-      git remote set-url origin "${MIRROR_REPO_URL}"
-    else
-      git remote add origin "${MIRROR_REPO_URL}"
-    fi
-    # mirror url may fail with authentication issue
-    git fetch origin --no-recurse-submodules || true
-  fi
-
-  # set remote url to CI_REPOSITORY_URL
-  if git remote -v | grep origin; then
-    git remote set-url origin "${CI_REPOSITORY_URL}"
-  else
-    git remote add origin "${CI_REPOSITORY_URL}"
-  fi
-
-.git_checkout_ci_commit_sha: &git_checkout_ci_commit_sha |
-  git checkout $CI_COMMIT_SHA
-  git clean ${GIT_CLEAN_FLAGS}
-
-# git diff requires two commits, with different CI env var
-#
-# By default, we use git strategy "clone" with depth 1 to speed up the clone process.
-# But for jobs requires running `git diff`, we need to fetch more commits to get the correct diffs.
-#
-# Since there's no way to get the correct git_depth before the job starts,
-# we can't set `GIT_DEPTH` in the job definition.
-#
-# Set git strategy to "none" and fetch manually instead.
-.before_script:fetch:git_diff:
-  variables:
-    GIT_STRATEGY: none
-  before_script:
-    - *git_init
-    - *git_fetch_from_mirror_url_if_exists
-    - |
-      # Store the diff output in a temporary file
-      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_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
-      elif [[ -n $CI_MERGE_REQUEST_DIFF_BASE_SHA ]]; then
-        git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git fetch origin $CI_COMMIT_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_COMMIT_SHA > "$TEMP_FILE"
-        GIT_DIFF_OUTPUT=$(cat "$TEMP_FILE")
-      # other pipelines, like the protected branches pipelines
-      elif [[ "$CI_COMMIT_BEFORE_SHA" != "0000000000000000000000000000000000000000" ]]; then
-        git fetch origin $CI_COMMIT_BEFORE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git fetch origin $CI_COMMIT_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-        git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA > "$TEMP_FILE"
-        GIT_DIFF_OUTPUT=$(cat "$TEMP_FILE")
-      else
-        # pipeline source could be web, scheduler, etc.
-        git fetch origin $CI_COMMIT_SHA --depth=2 ${GIT_FETCH_EXTRA_FLAGS}
-        git diff --name-only $CI_COMMIT_SHA~1 $CI_COMMIT_SHA > "$TEMP_FILE"
-        GIT_DIFF_OUTPUT=$(cat "$TEMP_FILE")
-      fi
-    - *git_checkout_ci_commit_sha
-    - *common-before_scripts
-    - *setup_tools_and_idf_python_venv
-    - add_gitlab_ssh_keys
-
-# target test runners may locate in different places
-# for runners set git mirror, we fetch from the mirror first, then fetch the HEAD commit
-.before_script:fetch:target_test:
-  variables:
-    GIT_STRATEGY: none
-  before_script:
-    - *git_init
-    - *git_fetch_from_mirror_url_if_exists
-    - git fetch origin "${CI_COMMIT_SHA}" --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
-    - *git_checkout_ci_commit_sha
-    - *common-before_scripts
-    - *setup_tools_and_idf_python_venv
-    - add_gitlab_ssh_keys
-    # no submodules
-
-#############
-# `default` #
-#############
-default:
-  cache:
-    # pull only for most of the use cases since it's cache dir.
-    # Only set "push" policy for "upload_cache" stage jobs
-    - key: pip-cache-${LATEST_GIT_TAG}
-      fallback_keys:
-        - pip-cache
-      paths:
-        - .cache/pip
-      policy: pull
-    - key: submodule-cache-${LATEST_GIT_TAG}
-      fallback_keys:
-        - submodule-cache
-      paths:
-        - .cache/submodule_archives
-      policy: pull
-  before_script:
-    - *common-before_scripts
-    - *setup_tools_and_idf_python_venv
-    - add_gitlab_ssh_keys
-    - fetch_submodules
-# gitlab bug, setting them here doesn't work
-# - expire_in: https://gitlab.com/gitlab-org/gitlab/-/issues/404563
-# - when: https://gitlab.com/gitlab-org/gitlab/-/issues/440672
-#  artifacts:
-#    expire_in: 1 week
-#    when: always
-  retry:
-    max: 2
-    when:
-      # In case of a runner failure we could hop to another one, or a network error could go away.
-      - runner_system_failure
-      # Job execution timeout may be caused by a network issue.
-      - job_execution_timeout

.gitlab/ci/danger.yml

@@ -1,17 +0,0 @@
-# External DangerJS
-include:
-  - project: espressif/shared-ci-dangerjs
-    ref: master
-    file: danger.yaml
-
-run-danger-mr-linter:
-  stage: pre_check
-  variables:
-    GIT_STRATEGY: none # no repo checkout
-    ENABLE_CHECK_AREA_LABELS: 'true'
-    ENABLE_CHECK_DOCS_TRANSLATION: 'true'
-    ENABLE_CHECK_UPDATED_CHANGELOG: 'false'
-  before_script: []
-  cache: []
-  tags:
-    - dangerjs

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

@@ -1,25 +0,0 @@
-# this file support two keywords:
-# - extra_default_build_targets:
-#     besides of the SUPPORTED_TARGETS in IDF,
-#     enable build for the specified targets by default as well.
-# - 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
-  - esp32h4
-  - esp32c5
-  - esp32c61
-
-#
-# These lines would
-# - enable the README.md check for esp32c6. Don't forget to add the build jobs in .gitlab/ci/build.yml
-# - disable the test script check with the manifest file.
-#

.gitlab/ci/dependencies/README.md

@@ -1,100 +0,0 @@
-# How the `generate_rules.py` works
-
-## Functionalities
-
-This script can do only two things:
-
-1. Auto-generate some labels/rules we need and update them in `rules.yml`
-2. Generate a dependency tree graph
-
-## Schema
-
-This file only used basic YAML grammar and has nothing to do with the GitLab version YAML file.
-
-It has five custom keywords:
-
-- `matrix`: An array of sub-arrays, used to replicate rules by formatting strings. You can use the format string everywhere, it will be formatted recursively
-- `labels`: An array of `labels`.
-- `patterns`: An array of `patterns`. Patterns that not included
-- `included_in`: An array of other `rule` names. It indicates the `labels` and `patterns` will be included in all specified `rules` as well
-- `deploy`: An array of strings, used to replicate rules by adding postfix `-<item in deploy array>`. It indicates the extra `label` used in `rules`, which will explain later.
-
-## How to use this file to generate `rules.yml`
-
-Let's take a complicated example to help understand the process
-
-```yaml
-"test-{0}-{1}":
-    matrix:
-        - [a, b]
-        - [c, d]
-    labels:
-        - "{0}-{1}"
-    patterns:
-        - "{0}"
-        - pattern-not-exist
-    included_in:
-        - build-{0}
-```
-
-1. expand the mapping dicts defined by `matrix`
-
-   After this step, it will turn into 4 dicts:
-
-   | key      | labels | patterns | included_in |
-   | -------- | ------ | -------- | ----------- |
-   | test-a-c | a-c    | a        | build-a     |
-   | test-a-d | a-d    | a        | build-a     |
-   | test-b-c | b-c    | b        | build-b     |
-   | test-b-d | b-d    | b        | build-b     |
-
-   **Advanced Usage: You can overwrite a mapping by declaring it again later**, For example:
-
-   If we concatenate this part to the previous example,
-
-    ```yaml
-    # ... The same as the previous example
-    
-    test-a-c:
-        labels:
-            - overwrite
-    ```
-
-   `rule` `test-a-c` will be turned into:
-
-   | key      | labels    |
-   | -------- | --------- |
-   | test-a-c | overwrite |
-
-   **Mappings with the keyword `deploy` will also replicate by adding a postfix `-<item in deploy array>` to the mapping key**
-
-2. create rules by `included_in`
-
-   After this step, it will turn into 6 mapping dicts:
-
-   | key      | labels   | patterns |
-   | -------- | -------- | -------- |
-   | test-a-c | a-c      | a        |
-   | test-a-d | a-d      | a        |
-   | test-b-c | b-c      | b        |
-   | test-b-d | b-d      | b        |
-   | build-a  | a-c, a-d | a        |
-   | build-b  | b-c, b-d | b        |
-
-3. replace the auto-generated region in `rules.yml` with `labels`, and `rules`. Each mapping will generate a `rule` and all the required labels. `patterns` are pre-defined in `rules.yml` and could not be generated automatically. If a mapping is using a `pattern` undefined, the `pattern` will be ignored.
-
-    - If a mapping key has postfix `-preview`, no `if-protected-xxx` clause will be added
-    - else if a mapping key has postfix `-production`, an `if-protected-no_label` clause will be added
-    - else, an `if-protected` clause will be added
-
-## Graph
-
-All `label` nodes are in green, `pattern` nodes are in cyan, `rule` nodes are in blue
-
-### Requirements
-
-There are a few extra dependencies while generating the dependency tree graph, please refer to [pygraphviz](https://github.com/pygraphviz/pygraphviz/blob/master/INSTALL.txt) documentation to install both `graphviz` and `pygraphviz`
-
-### CLI usage
-
-`python $IDF_PATH/tools/ci/generate_rules.py --graph OUTPUT_PATH`

.gitlab/ci/dependencies/dependencies.yml

@@ -1,94 +0,0 @@
-.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 #
-##############
-"build":
-  labels:
-    - build
-  patterns:
-    - build_components
-    - build_system
-    - downloadable-tools
-  included_in:
-    - build:target_test
-    - build:check
-
-# -------------------
-# Specific Build Jobs
-# -------------------
-"build:docker":
-  labels:
-    - build
-    - docker
-  patterns:
-    - docker
-    - submodule
-    - build_system
-    - downloadable-tools
-
-"build:macos":
-  labels:
-    - build
-    - macos
-    - macos_test  # for backward compatibility
-  patterns:
-    - build_system
-    - build_macos
-    - downloadable-tools
-
-# ---------------------------
-# Add patterns to build rules
-# ---------------------------
-"patterns:template-app":
-  patterns:
-    - build_template-app
-  included_in:
-    - build:target_test
-
-"patterns:build-check":
-  patterns:
-    - build_check
-  included_in:
-    - build:check
-
-"test:host_test":
-  labels:
-    - host_test
-  patterns:
-    - host_test
-
-"test:submodule":
-  labels:
-    - submodule
-  patterns:
-    - submodule
-
-#################################
-# Triggered Only By Labels Jobs #
-#################################
-"labels:nvs_coverage": # host_test
-  labels:
-    - nvs_coverage
-
-"labels:windows_pytest_build_system":
-  labels:
-    - windows
-  specific_rules:
-    - if-schedule-test-build-system-windows
-  patterns:
-    - build_system_win

.gitlab/ci/deploy.yml

@@ -1,68 +0,0 @@
-.deploy_job_template:
-  stage: deploy
-  image: $ESP_ENV_IMAGE
-  tags: [ deploy ]
-
-check_submodule_sync:
-  extends:
-    - .deploy_job_template
-    - .rules:test:submodule
-  stage: test_deploy
-  tags: [ brew, github_sync ]
-  retry: 2
-  variables:
-    # for brew runners, we always set GIT_STRATEGY to fetch
-    GIT_STRATEGY: fetch
-    SUBMODULES_TO_FETCH: "none"
-    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
-  dependencies: []
-  script:
-    - git submodule deinit --force .
-    # 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
-    - git submodule init
-    - git config --get-regexp '^submodule\..*\.url$' || true
-    - git submodule update --recursive
-    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"
-
-push_to_github:
-  extends:
-    - .deploy_job_template
-    - .before_script:minimal
-    - .rules:protected:deploy
-  needs:
-    # submodule must be synced before pushing to github
-    - check_submodule_sync
-  tags: [ brew, github_sync ]
-  variables:
-    # for brew runners, we always set GIT_STRATEGY to fetch
-    GIT_STRATEGY: fetch
-    # github also need full record of commits
-    GIT_DEPTH: 0
-  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:deploy
-  dependencies: []
-  variables:
-    GIT_DEPTH: 2
-  tags: [ shiny, build ]
-  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: eploy_update_SHA_in_esp-dockerfiles_production
-    deployment_tier: production

.gitlab/ci/docs.yml

@@ -1,230 +0,0 @@
-.patterns-docs-full: &patterns-docs-full
-  - ".gitlab/ci/docs.yml"
-  - "docs/**/*"
-  - "**/*.rst"
-  - "CONTRIBUTING.rst"
-  - "**/soc_caps.h"
-  - "**/Kconfig*"
-
-.patterns-docs-partial: &patterns-docs-partial
-  - "components/**/*.h"
-  - "components/**/CMakeList.txt"
-  - "components/**/sdkconfig*"
-  - "tools/tools.json"
-  - "tools/idf_tools.py"
-
-.patterns-example-readme: &patterns-example-readme
-  - "examples/**/*.md"
-
-.patterns-docs-preview: &patterns-docs-preview
-  - "docs/**/*"
-
-.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-qa-test-tag: &if-qa-test-tag
-  if: '$CI_COMMIT_TAG =~ /^qa-test/'
-
-.if-label-build_docs: &if-label-build_docs
-  if: '$BOT_LABEL_BUILD_DOCS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build_docs(?:,[^,\n\r]+)*$/i'
-
-.if-label-docs_full: &if-label-docs_full
-  if: '$BOT_LABEL_DOCS_FULL || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docs_full(?:,[^,\n\r]+)*$/i'
-
-.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")'
-
-.doc-rules:build:docs-full:
-  rules:
-    - <<: *if-qa-test-tag
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build_docs
-    - <<: *if-label-docs_full
-    - <<: *if-dev-push
-      changes: *patterns-docs-full
-
-.doc-rules:build:docs-partial:
-  rules:
-    - <<: *if-qa-test-tag
-      when: never
-    - <<: *if-dev-push
-      changes: *patterns-docs-full
-      when: never
-    - <<: *if-dev-push
-      changes: *patterns-docs-partial
-
-# stage: pre_check
-check_readme_links:
-  extends:
-    - .pre_check_template
-  tags: ["build", "amd64", "internet"]
-  allow_failure: true
-  rules:
-    - <<: *if-protected-check
-    - <<: *if-dev-push
-      changes: *patterns-example-readme
-  script:
-    - python ${IDF_PATH}/tools/ci/check_readme_links.py
-
-check_docs_lang_sync:
-  extends:
-    - .pre_check_template
-    - .doc-rules:build:docs-full
-  script:
-    - cd docs
-    - ./check_lang_folder_sync.sh
-
-.build_docs_template:
-  image: $ESP_IDF_DOC_ENV_IMAGE
-  stage: build_doc
-  tags:
-    - build_docs
-  needs:
-    - job: fast_template_app
-      artifacts: false
-      optional: true
-  script:
-    - if [ -n "${BREATHE_ALT_INSTALL_URL_PY39}" ]; then
-        pip uninstall -y breathe && pip install -U ${BREATHE_ALT_INSTALL_URL_PY39};
-      fi
-    - cd docs
-    - build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build
-  parallel:
-    matrix:
-      - DOCLANG: ["en", "zh_CN"]
-        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2", "esp32c6", "esp32c61", "esp32c5", "esp32h2", "esp32h4", "esp32h21", "esp32p4"]
-
-check_docs_gh_links:
-  image: $ESP_IDF_DOC_ENV_IMAGE
-  extends:
-    - .pre_check_template
-    - .doc-rules:build:docs-full
-  script:
-    - cd docs
-    - build-docs gh-linkcheck
-
-# Doc jobs have a lot of special cases, we specify rules here directly instead
-# in dependencies.yml to simplify things
-build_docs_html_full:
-  extends:
-    - .build_docs_template
-    - .doc-rules:build:docs-full
-  artifacts:
-    when: always
-    paths:
-      - docs/_build/*/*/*.txt
-      - docs/_build/*/*/html/*
-    expire_in: 4 days
-  variables:
-    DOC_BUILDERS: "html"
-
-build_docs_html_partial:
-  extends:
-    - .build_docs_template
-    - .doc-rules:build:docs-partial
-  artifacts:
-    when: always
-    paths:
-      - docs/_build/*/*/*.txt
-      - docs/_build/*/*/html/*
-    expire_in: 4 days
-  variables:
-    DOC_BUILDERS: "html"
-  parallel:
-    matrix:
-      - DOCLANG: "en"
-        DOCTGT: "esp32"
-      - DOCLANG: "zh_CN"
-        DOCTGT: "esp32p4"
-
-.deploy_docs_template:
-  image: $ESP_IDF_DOC_ENV_IMAGE
-  variables:
-    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
-    PYTHONUNBUFFERED: 1
-    # ensure all tags are fetched, need to know the latest/stable tag for the docs
-    GIT_STRATEGY: clone
-    GIT_DEPTH: 0
-  stage: test_deploy
-  tags:
-    - deploy
-    - shiny
-  script:
-    # ensure all tags are fetched, need to know the latest/stable tag for the docs
-    - git fetch --tags --prune
-    - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
-    - export GIT_VER=$(git describe --always ${PIPELINE_COMMIT_SHA} --)
-    - deploy-docs
-
-# stage: test_deploy
-deploy_docs_preview:
-  extends:
-    - .deploy_docs_template
-  rules:
-    - <<: *if-label-build_docs
-    - <<: *if-label-docs_full
-    - <<: *if-dev-push
-      changes: *patterns-docs-preview
-  needs:
-    - job: build_docs_html_partial
-      optional: true
-    - job: build_docs_html_full
-      optional: true
-  variables:
-    TYPE: "preview"
-    # older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
-    DOCS_DEPLOY_PRIVATEKEY: "$DOCS_DEPLOY_KEY"
-    DOCS_DEPLOY_SERVER: "$DOCS_SERVER"
-    DOCS_DEPLOY_SERVER_USER: "$DOCS_SERVER_USER"
-    DOCS_DEPLOY_PATH: "$DOCS_PATH"
-    DOCS_DEPLOY_URL_BASE: "https://$DOCS_PREVIEW_SERVER_URL/docs/esp-idf"
-  environment:
-    name: deploy_docs_preview
-    deployment_tier: staging
-    url: "https://$DOCS_PREVIEW_SERVER_URL/docs/esp-idf"
-
-# stage: post_deploy
-deploy_docs_production:
-  # The DOCS_PROD_* variables used by this job are "Protected" so these branches must all be marked "Protected" in Gitlab settings
-  extends:
-    - .deploy_docs_template
-    - .rules:protected:deploy
-  stage: post_deploy
-  dependencies:  # set dependencies to null to avoid missing artifacts issue
-  needs: # ensure runs after push_to_github succeeded
-    - build_docs_html_full
-    - job: push_to_github
-      artifacts: false
-  variables:
-    TYPE: "preview"
-    DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY"
-    DOCS_DEPLOY_SERVER: "$DOCS_PROD_SERVER"
-    DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER"
-    DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH"
-    DOCS_DEPLOY_URL_BASE: "https://docs.espressif.com/projects/esp-idf"
-    DEPLOY_STABLE: 1
-  environment:
-    name: deploy_docs_production
-    deployment_tier: production
-    url: "https://docs.espressif.com/projects/esp-idf"
-
-check_doc_links:
-  extends:
-    - .build_docs_template
-    - .rules:protected:deploy
-  stage: post_deploy
-  needs:
-    - job: deploy_docs_production
-      artifacts: false
-  tags: ["build", "amd64", "internet"]
-  artifacts:
-    when: always
-    paths:
-      - docs/_build/*/*/*.txt
-      - docs/_build/*/*/linkcheck/*.txt
-    expire_in: 1 week
-  allow_failure: true
-  script:
-    - cd docs
-    - build-docs -t $DOCTGT -l $DOCLANG linkcheck

.gitlab/ci/host-test.yml

@@ -1,444 +0,0 @@
-.host_test_template:
-  extends: .rules:test:host_test
-  stage: host_test
-  image: $ESP_ENV_IMAGE
-  tags:
-    - host_test
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  # run host_test jobs immediately, only after upload cache
-  needs:
-    - job: upload-pip-cache
-      optional: true
-      artifacts: false
-    - job: upload-submodules-cache
-      optional: true
-      artifacts: false
-    - pipeline_variables
-  artifacts:
-    expire_in: 1 week
-    when: always
-
-check_public_headers:
-  extends:
-    - .host_test_template
-    - .rules:build:check
-  script:
-    - IDF_TARGET=esp32 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
-    - IDF_TARGET=esp32s2 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s2-elf-
-    - IDF_TARGET=esp32s3 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s3-elf-
-    - IDF_TARGET=esp32c3 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c2 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c6 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c5 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32h2 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32p4 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c61 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32h21 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32h4 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-
-test_nvs_coverage:
-  extends:
-    - .host_test_template
-    - .rules:labels:nvs_coverage
-  artifacts:
-    paths:
-      - components/nvs_flash/host_test/nvs_host_test/coverage_report
-  script:
-    - cd components/nvs_flash/host_test/nvs_host_test
-    - idf.py build coverage
-  # the 'long' host tests take approx 11 hours on our current runners. Adding some margin here for possible CPU contention
-  timeout: 18 hours
-
-test_partition_table_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/partition_table/test_gen_esp32part_host
-    - ./gen_esp32part_tests.py
-
-test_ldgen_on_host:
-  extends: .host_test_template
-  script:
-    - cd tools/ldgen/test
-    - export PYTHONPATH=$PYTHONPATH:..
-    - python -m unittest
-  variables:
-    LC_ALL: C.UTF-8
-
-test_spiffs_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/spiffs/test_spiffsgen/
-    - ./test_spiffsgen.py
-
-test_fatfsgen_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/fatfs/test_fatfsgen/
-    - ./test_fatfsgen.py
-    - ./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:
-  extends:
-    - .host_test_template
-    - .before_script:minimal
-  artifacts:
-    when: on_failure
-    paths:
-      - tools/tools.new.json
-      - tools/test_idf_tools/test_python_env_logs.txt
-  image:
-    name: $ESP_ENV_IMAGE
-    entrypoint: [""]  # use system python3. no extra pip package installed
-  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
-    #                                                                      cmake@version that is supported
-    - python3 ${IDF_PATH}/tools/idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.16.3
-    - cd ${IDF_PATH}/tools/test_idf_tools
-    - python3 -m pip install jsonschema
-    - python3 ./test_idf_tools.py -v
-    - python3 ./test_idf_tools_python_env.py
-    # It runs at the end because it modifies dependencies
-    - IDF_TEST_MAY_BREAK_DEPENDENCIES=1 python3 ./test_idf_tools.py -v TestSystemDependencies.test_commands_when_nodeps
-
-.test_efuse_table_on_host_template:
-  extends: .host_test_template
-  variables:
-    IDF_TARGET: "esp32"
-  artifacts:
-    when: on_failure
-    paths:
-      - components/efuse/${IDF_TARGET}/esp_efuse_table.c
-  script:
-    - cd ${IDF_PATH}/components/efuse/
-    - ./efuse_table_gen.py -t "${IDF_TARGET}" ${IDF_PATH}/components/efuse/${IDF_TARGET}/esp_efuse_table.csv
-    - git diff --exit-code -- ${IDF_TARGET}/esp_efuse_table.c || { echo 'Differences found for ${IDF_TARGET} target. Please run idf.py efuse-common-table and commit the changes.'; exit 1; }
-    - cd ${IDF_PATH}/components/efuse/test_efuse_host
-    - ./efuse_tests.py
-
-test_efuse_table_on_host_esp32:
-  extends: .test_efuse_table_on_host_template
-
-test_efuse_table_on_host_esp32s2:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32s2
-
-test_efuse_table_on_host_esp32s3:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32s3
-
-test_efuse_table_on_host_esp32c3:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32c3
-
-test_efuse_table_on_host_esp32h2:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32h2
-
-test_efuse_table_on_host_esp32c6:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32c6
-
-test_logtrace_proc:
-  extends: .host_test_template
-  artifacts:
-    when: on_failure
-    paths:
-      - tools/esp_app_trace/test/logtrace/output
-      - tools/esp_app_trace/test/logtrace/.coverage
-  script:
-    - cd ${IDF_PATH}/tools/esp_app_trace/test/logtrace
-    - ./test.sh
-
-test_sysviewtrace_proc:
-  extends: .host_test_template
-  artifacts:
-    when: on_failure
-    paths:
-      - tools/esp_app_trace/test/sysview/output
-      - tools/esp_app_trace/test/sysview/.coverage
-  script:
-    - cd ${IDF_PATH}/tools/esp_app_trace/test/sysview
-    - ./test.sh
-
-test_tools:
-  extends:
-    - .host_test_template
-  artifacts:
-    paths:
-      - ${IDF_PATH}/*.out
-      - ${IDF_PATH}/XUNIT_*.xml
-    reports:
-      junit: ${IDF_PATH}/XUNIT_*.xml
-  variables:
-    LC_ALL: C.UTF-8
-    INSTALL_EXTRA_TOOLS: "qemu-xtensa qemu-riscv32"  # for test_idf_qemu.py
-  script:
-    - stat=0
-    - cd ${IDF_PATH}/tools/ci/test_autocomplete
-    - pytest --noconftest test_autocomplete.py --junitxml=${IDF_PATH}/XUNIT_AUTOCOMP.xml                  || 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
-    - cd ${IDF_PATH}/tools/test_bsasm
-    - pytest --noconftest test_bsasm.py        --junitxml=${IDF_PATH}/XUNIT_BSASM.xml                     || stat=1
-    - cd ${IDF_PATH}/tools/test_mkdfu
-    - pytest --noconftest test_mkdfu.py        --junitxml=${IDF_PATH}/XUNIT_MKDFU.xml                     || stat=1
-    - cd ${IDF_PATH}/tools/test_idf_size
-    - pytest --noconftest test_idf_size.py     --junitxml=${IDF_PATH}/XUNIT_IDF_SIZE.xml                  || stat=1
-    - cd ${IDF_PATH}/tools/test_idf_diag
-    - pytest --noconftest test_idf_diag.py     --junitxml=${IDF_PATH}/XUNIT_IDF_DIAG.xml                  || stat=1
-    - cd ${IDF_PATH}
-    - shellcheck -s sh tools/detect_python.sh                                                             || stat=1
-    - shellcheck -s bash tools/detect_python.sh                                                           || stat=1
-    - shellcheck -s dash tools/detect_python.sh                                                           || stat=1
-    - "bash -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
-    - "dash -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
-    - "zsh -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
-    - "fish -c 'source tools/detect_python.fish && echo Our Python: $ESP_PYTHON'"
-    - exit "$stat"
-
-test_split_path_by_spaces:
-  extends: .host_test_template
-  script:
-    - 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
-  script:
-    - cd ${IDF_PATH}/components/tcp_transport/host_test
-    - idf.py build
-    - LSAN_OPTIONS=verbosity=1:log_threads=1 build/host_tcp_transport_test.elf
-
-test_sockets_on_host:
-  extends: .host_test_template
-  script:
-    # test the tcp-client example with system sockets
-    - cd ${IDF_PATH}/examples/protocols/sockets/tcp_client
-    - echo 'CONFIG_EXAMPLE_IPV4_ADDR="127.0.0.1"' >> sdkconfig.defaults
-    - idf.py --preview set-target linux
-    - idf.py build
-    - timeout 5 ./build/tcp_client.elf >test.log || true
-    - grep "Socket unable to connect" test.log
-    # test the udp-client example with lwip sockets
-    - cd ${IDF_PATH}/examples/protocols/sockets/udp_client
-    - idf.py --preview set-target linux
-    - cat sdkconfig.ci.linux > sdkconfig
-    - idf.py build
-    - timeout 5 ./build/udp_client.elf >test.log || true
-    - grep "Message sent" test.log
-
-test_eh_frame_parser:
-  extends: .host_test_template
-  script:
-    - cd ${IDF_PATH}/components/esp_system/test_eh_frame_parser
-    - make
-    - ./eh_frame_test
-
-test_gen_soc_caps_kconfig:
-  extends: .host_test_template
-  script:
-    - cd ${IDF_PATH}/tools/gen_soc_caps_kconfig/
-    - ./test/test_gen_soc_caps_kconfig.py
-
-test_pytest_qemu:
-  extends:
-    - .host_test_template
-    - .before_script:build
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - pytest-embedded/
-      - "**/build*/*.bin"
-    reports:
-      junit: XUNIT_RESULT.xml
-  parallel:
-    matrix:
-      - IDF_TARGET: "esp32"
-        INSTALL_EXTRA_TOOLS: "qemu-xtensa"
-        # Skip Clang + Xtensa tests due to bootloader size issue
-        IDF_TOOLCHAIN: [gcc]
-      - IDF_TARGET: "esp32c3"
-        INSTALL_EXTRA_TOOLS: "qemu-riscv32"
-        IDF_TOOLCHAIN: [gcc, clang]
-  script:
-    - run_cmd python tools/ci/ci_build_apps.py . -v
-      --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 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:
-  extends:
-    - .host_test_template
-    - .before_script:build
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - pytest-embedded/
-      - "**/build*/build_log.txt"
-    reports:
-      junit: XUNIT_RESULT.xml
-  script:
-    - run_cmd python tools/ci/ci_build_apps.py components examples tools/test_apps -v
-      --target linux
-      --pytest-apps
-      -m host_test
-      --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 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
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - pytest-embedded/
-      - "**/build*/build_log.txt"
-    reports:
-      junit: XUNIT_RESULT.xml
-  variables:
-    PYENV_VERSION: "3.9"
-    PYTEST_IGNORE_COLLECT_IMPORT_ERROR: "1"
-    # 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
-      --target linux
-      --pytest-apps
-      -m \"host_test and macos\"
-      --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 pytest
-      --target linux
-      -m \"host_test and 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
-  script:
-    - python tools/ci/check_soc_headers_load_in_idf_build_apps.py
-
-test_nvs_gen_check:
-  extends: .host_test_template
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - components/nvs_flash/nvs_partition_tool
-    reports:
-      junit: XUNIT_RESULT.xml
-  variables:
-    LC_ALL: C.UTF-8
-  script:
-    - cd ${IDF_PATH}/components/nvs_flash/nvs_partition_tool
-    - pytest --noconftest test_nvs_gen_check.py --junitxml=XUNIT_RESULT.xml
-
-test_esp_rom:
-  extends: .host_test_template
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-    reports:
-      junit: XUNIT_RESULT.xml
-  script:
-    - cd ${IDF_PATH}/components/esp_rom/
-    - pytest --noconftest test_esp_rom.py --junitxml=XUNIT_RESULT.xml
-
-make_sure_soc_caps_compatible_in_idf_build_apps:
-    extends:
-      - .host_test_template
-      - .rules:dev-push
-    artifacts:
-      paths:
-        - new.json
-        - base.json
-      when: always
-    when: manual
-    script:
-      - python tools/ci/idf_build_apps_dump_soc_caps.py new.json
-      - git fetch --depth=1 origin $CI_MERGE_REQUEST_DIFF_BASE_SHA
-      - git checkout -f $CI_MERGE_REQUEST_DIFF_BASE_SHA
-      - git checkout $CI_COMMIT_SHA -- tools/ci/idf_build_apps_dump_soc_caps.py
-      - python tools/ci/idf_build_apps_dump_soc_caps.py base.json
-      - diff new.json base.json

.gitlab/ci/integration_test.yml

@@ -1,69 +0,0 @@
-# generate dynamic integration pipeline by `idf-integration-ci` project
-
-.patterns-integration_test: &patterns-integration_test
-  # add all possible patterns to make sure `gen_integration_pipeline` can be triggered.
-  # fine-grained control will be done while generating the pipeline
-  # find `patterns` in `idf-integration-ci` project
-  - "components/**/*"
-  - "tools/**/*"
-  - ".gitlab-ci.yml"
-  - ".gitlab/ci/common.yml"
-  - ".gitlab/ci/integration_test.yml"
-  - ".gitmodules"
-  - "CMakeLists.txt"
-  - "install.sh"
-  - "export.sh"
-  - "Kconfig"
-  - "sdkconfig.rename"
-
-# Simplify the rules
-.integration_test_rules:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: *patterns-integration_test
-    # support trigger by ci labels
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*target_test(?:,[^,\n\r]+)*$/i'
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test(?:,[^,\n\r]+)*$/i'
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build(?:,[^,\n\r]+)*$/i'
-
-gen_integration_pipeline:
-  extends:
-    - .before_script:minimal
-    - .integration_test_rules
-  image: ${CI_INTEGRATION_ASSIGN_ENV}
-  stage: assign_test
-  cache: []
-  tags: [fast_run, shiny]
-  variables:
-    SUBMODULES_TO_FETCH: "none"
-    GIT_LFS_SKIP_SMUDGE: 1
-  needs:
-    - job: fast_template_app
-      artifacts: false
-      optional: true
-  artifacts:
-    paths:
-      - idf-integration-ci/child_pipeline/
-    expire_in: 2 weeks
-    when: always
-  script:
-    - add_gitlab_ssh_keys
-    - retry_failed git clone ${CI_GEN_INTEGRATION_PIPELINE_REPO} idf-integration-ci
-    - python $CHECKOUT_REF_SCRIPT idf-integration-ci idf-integration-ci
-    - cd idf-integration-ci
-    - python tools/generate_child_pipeline.py -o child_pipeline/
-
-child_integration_test_pipeline:
-  extends:
-    - .integration_test_rules
-  stage: assign_test
-  needs:
-    - gen_integration_pipeline
-  trigger:
-    include:
-      - artifact: idf-integration-ci/child_pipeline/pipeline.yml
-        job: gen_integration_pipeline
-    forward:
-      yaml_variables: false
-    strategy: depend

.gitlab/ci/post_deploy.yml

@@ -1,32 +0,0 @@
-.post_deploy_template:
-  stage: post_deploy
-  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: 2 week
-    when: always
-    paths:
-      - job_report.html
-  script:
-    - python tools/ci/dynamic_pipelines/scripts/generate_report.py --report-type job
-
-sync_support_status:
-  extends:
-    - .post_deploy_template
-    - .rules:master:push
-  tags: [ brew, github_sync ]
-  needs:
-    - push_to_github
-  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,223 +0,0 @@
-.pre_check_template:
-  stage: pre_check
-  image: $ESP_ENV_IMAGE
-  tags:
-    - host_test
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-
-check_version:
-  # Don't run this for feature/bugfix branches, so that it is possible to modify
-  # esp_idf_version.h in a branch before tagging the next version.
-  extends:
-    - .pre_check_template
-    - .rules:protected:check
-  tags: [ brew, github_sync ]
-  variables:
-    # need a full clone to get the latest tag
-    # the --shallow-since=$(git log -1 --format=%as $LATEST_GIT_TAG) option is not accurate
-    GIT_STRATEGY: fetch
-    SUBMODULES_TO_FETCH: "none"
-    GIT_DEPTH: 0
-  script:
-    - export IDF_PATH=$PWD
-    - tools/ci/check_idf_version.sh
-
-check_api_usage:
-  extends: .pre_check_template
-  script:
-    - python -m pip install ast-grep-cli # use ast-grep to describe customized lint rules
-    - ast-grep scan
-    - tools/ci/check_api_violation.sh
-    - tools/ci/check_examples_extra_component_dirs.sh
-
-check_blobs:
-  extends:
-    - .pre_check_template
-    - .rules:build:check
-  variables:
-    SUBMODULES_TO_FETCH: "components/esp_wifi/lib;components/esp_phy/lib;components/esp_coex/lib"
-  script:
-    # Check if Wi-Fi library header files match between IDF and the version used when compiling the libraries
-    - IDF_TARGET=esp32 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s2 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s3 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c2 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c3 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c6 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c5 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c61 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32_host $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    # Check if Coexistence library header files match between IDF and the version used when compiling the libraries
-    - IDF_TARGET=esp32 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s3 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c3 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c6 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32h2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c5 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c61 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    # Check if Wi-Fi, PHY, BT blobs contain references to specific symbols
-    - bash $IDF_PATH/tools/ci/check_blobs.sh
-
-check_chip_support_components:
-  extends:
-    - .pre_check_template
-    - .rules:build:check
-  artifacts:
-    when: on_failure
-    paths:
-      - esp_hw_support_part.h
-      - bootloader_support_part.h
-    expire_in: 1 week
-  script:
-    - python tools/ci/check_soc_headers_leak.py
-    - find ${IDF_PATH}/components/soc/**/include/soc/ ${IDF_PATH}/components/soc/**/register/soc/ -name "*_struct.h" -print0 | xargs -0 -n1 ./tools/ci/check_soc_struct_headers.py
-    - tools/ci/check_esp_memory_utils_headers.sh
-
-check_esp_err_to_name:
-  extends:
-    - .pre_check_template
-    - .rules:build:check
-  artifacts:
-    when: on_failure
-    paths:
-      - components/esp_common/esp_err_to_name.c
-    expire_in: 1 week
-  script:
-    - cd ${IDF_PATH}/tools/
-    - ./gen_esp_err_to_name.py
-    - git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
-
-check_esp_system:
-  extends:
-    - .pre_check_template
-    - .rules:build
-  script:
-    - python components/esp_system/check_system_init_priorities.py
-
-# For release tag pipelines only, make sure the tag was created with 'git tag -a' so it will update
-# the version returned by 'git describe'
-# Don't forget to update the env var `LATEST_GIT_TAG` in .gitlab/ci/common.yml
-check_version_tag:
-  extends:
-    - .pre_check_template
-    - .rules:tag:release
-  tags: [ brew, github_sync ]
-  variables:
-    # need a full clone to get the latest tag
-    # the --shallow-since=$(git log -1 --format=%as $LATEST_GIT_TAG) option is not accurate
-    GIT_STRATEGY: fetch
-    SUBMODULES_TO_FETCH: "none"
-    GIT_DEPTH: 0
-  script:
-    - (git cat-file -t $CI_COMMIT_REF_NAME | grep tag) || (echo "ESP-IDF versions must be annotated tags." && exit 1)
-
-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
-    - .before_script:fetch:git_diff
-  tags: [fast_run, shiny]
-  script:
-    # 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
-        echo "MR_MODIFIED_FILES=\"\"" >> pipeline.env
-        echo "MR_MODIFIED_COMPONENTS=\"\"" >> pipeline.env
-      else
-        MR_MODIFIED_FILES=$(echo "$GIT_DIFF_OUTPUT" | tr '\n' ';')
-        echo "MR_MODIFIED_FILES=\"$MR_MODIFIED_FILES\"" >> pipeline.env
-
-        MR_MODIFIED_COMPONENTS=$(run_cmd python tools/ci/ci_get_mr_info.py components --modified-files $MODIFIED_FILES | tr '\n' ';')
-        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
-      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
-    - cat pipeline.env
-    - python tools/ci/artifacts_handler.py upload --type modified_files_and_components_report
-  artifacts:
-    reports:
-      dotenv: pipeline.env
-    paths:
-      - pipeline.env
-    expire_in: 1 week
-    when: always
-
-baseline_manifest_sha:
-  extends:
-    - .pre_check_template
-    - .rules:dev-push
-  tags: [fast_run, shiny]
-  script:
-    - |
-      # merged results pipelines, by default
-      # diff between target-branch-head and merged-result-head
-      if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
-        git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_SHA --depth=1
-        git checkout FETCH_HEAD
-        idf-build-apps dump-manifest-sha \
-          --manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
-          --output .manifest_sha
-      # merge request pipelines, when the mr got conflicts
-      # diff between diff-base-sha and merge-request-head
-      elif [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
-        git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1
-        git checkout FETCH_HEAD
-        idf-build-apps dump-manifest-sha \
-          --manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
-          --output .manifest_sha
-      # other pipelines, like the protected branches pipelines
-      # not triggered in this job
-      fi
-  artifacts:
-    paths:
-      - .manifest_sha
-    expire_in: 1 week
-    when: always
-
-redundant_pass_job:
-  stage: pre_check
-  tags: [shiny, fast_run]
-  image: $ESP_ENV_IMAGE
-  dependencies: null
-  before_script: []
-  cache: []
-  extends: []
-  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

@@ -1,80 +0,0 @@
-.check_pre_commit_template:
-  extends:
-    - .before_script:minimal
-  stage: pre_check
-  image: $PRE_COMMIT_IMAGE
-  tags: [cache, shiny]
-  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
-  rules:
-    - if: '($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_BRANCH =~ /^release\/v/) && $CI_PIPELINE_SOURCE == "push"'
-      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
-      policy: pull
-
-check_powershell:
-  extends:
-    - .before_script:minimal
-  stage: pre_check
-  image: docker:latest
-  services:
-    - docker:dind
-  tags:
-    - dind
-    - amd64
-  needs:
-    - pipeline_variables
-  variables:
-    # cache pre_commit
-    PRE_COMMIT_HOME: "$CI_PROJECT_DIR/.cache/pre-commit"
-  rules:
-    - changes:
-        - "*.ps1"
-  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/retry_failed_jobs.yml

@@ -1,15 +0,0 @@
-retry_failed_jobs:
-  stage: retry_failed_jobs
-  tags: [shiny, fast_run]
-  allow_failure: true
-  image: $ESP_ENV_IMAGE
-  dependencies: null
-  before_script: []
-  cache: []
-  extends: []
-  script:
-    - echo "Retrieving and retrying all failed jobs for the pipeline..."
-    - python tools/ci/python_packages/gitlab_api.py retry_failed_jobs $CI_MERGE_REQUEST_PROJECT_ID --pipeline_id $CI_PIPELINE_ID
-  when: manual
-  needs:
-    - redundant_pass_job

.gitlab/ci/rules.yml

@@ -1,420 +0,0 @@
-############
-# Patterns #
-############
-.patterns-c-files: &patterns-c-files
-  - ".gitlab/ci/static-code-analysis.yml"
-
-  - "tools/ci/static-analysis-rules.yml"
-  - "tools/ci/clang_tidy_dirs.txt"
-
-  - "**/*.{c,C,cpp}"
-  - "**/*.{h,H,hpp}"
-  - "components/**/Kconfig"
-  - "components/**/CMakeList.txt"
-
-.patterns-python-cache: &patterns-python-cache
-  - "tools/requirements.json"
-  - "tools/requirements/requirements.*.txt"
-
-.patterns-python-files: &patterns-python-files
-  - ".gitlab/ci/static-code-analysis.yml"
-  - "**/*.py"
-
-.patterns-sonarqube-files: &patterns-sonarqube-files
-  - "tools/ci/sonar_exclude_list.txt"
-
-.patterns-build_components: &patterns-build_components
-  # components files except "test*/" "host*/" folders
-  # ?? to include folders less than 4 characters
-  - "components/*/???[!t]*/**/*"
-  - "components/*/??[!s]?*/**/*"
-  - "components/*/???/**/*"
-  - "components/*/??/**/*"
-  - "components/*/*"
-  - "components/*"
-  # Add folders excluded by "???[!t]" and "??[!s]?"
-  # pre-commit: tools/ci/check_rules_components_patterns.py
-  - "components/bt/host/**/*"
-  - "components/esp_psram/system_layer/*"
-
-.patterns-downloadable-tools: &patterns-downloadable-tools
-  - "tools/idf_tools.py"
-  - "tools/tools.json"
-
-.patterns-build_template-app: &patterns-build_template-app
-  - "tools/ci/build_template_app.sh"
-
-.patterns-build_system: &patterns-build_system
-  - "tools/cmake/**/*"
-  - "tools/kconfig_new/**/*"
-  - "tools/idf.py"
-  - "tools/idf_py_actions/**/*"
-  - "tools/requirements.json"
-  - "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
-  - "tools/ci/test_configure_ci_environment.sh"
-
-.patterns-build_check: &patterns-build_check
-  - "tools/test_build_system/**/*"
-  - "tools/ci/test_configure_ci_environment.sh"
-  - "tools/gen_esp_err_to_name.py"
-  - "tools/ci/check_soc_headers_leak.py"
-  - "tools/ci/check_esp_memory_utils_headers.sh"
-  - "tools/ci/check_blobs.sh"
-  - "tools/ci/check_public_headers.py"
-  - "tools/ci/check_register_rw_half_word.cmake"
-  - "tools/ci/check_register_rw_half_word.py"
-  - "examples/build_system/**/*"
-
-.patterns-host_test: &patterns-host_test
-  - ".gitlab/ci/host-test.yml"
-
-  - "components/**/*"
-
-  - "tools/ci/test_autocomplete/*"
-
-  - "tools/mass_mfg/**/*"
-
-  - "tools/esp_app_trace/**/*"
-  - "tools/ldgen/**/*"
-
-  - "tools/idf_monitor.py"
-
-  - "tools/activate.py"
-
-  - "tools/idf.py"
-  - "tools/idf_py_actions/**/*"
-  - "tools/test_idf_py/**/*"
-
-  - "tools/idf_size.py"
-  - "tools/test_idf_size/**/*"
-
-  - "tools/test_idf_diag/**/*"
-
-  - "tools/tools.json"
-  - "tools/tools_schema.json"
-  - "tools/idf_tools.py"
-  - "tools/test_idf_tools/**/*"
-  - "tools/install_util.py"
-
-  - "tools/export_utils/utils.py"
-  - "tools/export_utils/shell_types.py"
-  - "tools/export_utils/console_output.py"
-  - "tools/export_utils/activate_venv.py"
-
-  - "tools/requirements/*"
-  - "tools/requirements.json"
-  - "tools/requirements_schema.json"
-
-  - "tools/mkdfu.py"
-  - "tools/test_mkdfu/**/*"
-
-  - "tools/kconfig_new/**/*"
-
-  - "tools/detect_python.sh"
-  - "tools/detect_python.fish"
-
-  - "tools/gen_soc_caps_kconfig/*"
-  - "tools/gen_soc_caps_kconfig/test/test_gen_soc_caps_kconfig.py"
-
-  - "tools/mkuf2.py"
-
-  - "tools/split_paths_by_spaces.py"
-
-  - "tools/check_python_dependencies.py"
-
-  - "tools/bsasm.py"
-  - "tools/test_bsasm/**/*"
-
-.patterns-docker: &patterns-docker
-  - "tools/docker/**/*"
-
-.patterns-submodule: &patterns-submodule
-  - "components/bootloader/subproject/components/micro-ecc/micro-ecc"
-  - "components/bt/controller/lib_esp32"
-  - "components/bt/controller/lib_esp32c2/esp32c2-bt-lib"
-  - "components/bt/controller/lib_esp32c3_family"
-  - "components/bt/controller/lib_esp32h2/esp32h2-bt-lib"
-  - "components/bt/host/nimble/nimble"
-  - "components/cmock/CMock"
-  - "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"
-  - "components/openthread/lib"
-  - "components/openthread/openthread"
-  - "components/protobuf-c/protobuf-c"
-  - "components/spiffs/spiffs"
-  - "components/unity/unity"
-  - "components/heap/tlsf"
-  - "components/bt/controller/lib_esp32c6/esp32c6-bt-lib"
-  - "components/bt/controller/lib_esp32c5/esp32c5-bt-lib"
-  - "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-master-push: &if-master-push
-  if: '$CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "push"'
-
-.if-release-tag: &if-release-tag
-  if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+(\.\d+)?($|-)/'
-
-.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-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-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"'
-
-.if-qa-test-tag: &if-qa-test-tag
-  if: '$CI_COMMIT_TAG =~ /^qa-test/'
-
-.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-nightly: &if-schedule-nightly
-  if: '$CI_PIPELINE_SOURCE == "schedule" && $INCLUDE_NIGHTLY_RUN == "1"'
-
-.if-schedule-test-build-system-windows: &if-schedule-test-build-system-windows
-  if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_BUILD_SYSTEM_TEST_WIN == "true"'
-
-.if-label-build-only: &if-label-build-only
-  if: '$CI_JOB_STAGE == "target_test" && $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*For Maintainers: Only Build Tests(?:,[^,\n\r]+)*$/i'
-
-.if-label-upload_cache: &if-label-upload_cache
-  if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*upload_cache(?:,[^,\n\r]+)*$/i'
-
-.if-revert-branch: &if-revert-branch
-  if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^revert-/'
-
-#########
-# Rules #
-#########
-### Branches ###
-.rules:protected:check:
-  rules:
-    - <<: *if-protected-check
-
-.rules:protected:deploy:
-  rules:
-    - <<: *if-qa-test-tag
-      when: never
-    - <<: *if-protected-deploy
-
-.rules:master:push:
-  rules:
-    - <<: *if-master-push
-
-.rules:tag:release:
-  rules:
-    - <<: *if-release-tag
-
-.rules:dev-push:
-  rules:
-    - <<: *if-dev-push
-
-.rules:upload-python-cache:
-  rules:
-    - <<: *if-release-tag
-    - <<: *if-schedule-nightly
-    - <<: *if-protected-branch-push
-      changes: *patterns-python-cache
-    - <<: *if-label-upload_cache
-      when: manual
-
-.rules:upload-submodule-cache:
-  rules:
-    - <<: *if-release-tag
-    - <<: *if-protected-branch-push
-      changes: *patterns-submodule
-    - <<: *if-label-upload_cache
-      when: manual
-
-### Patterns ###
-.rules:patterns:clang_tidy:
-  rules:
-    - <<: *if-protected-check
-    - <<: *if-dev-push
-      changes: *patterns-c-files
-
-#.rules:patterns:static-code-analysis-preview:
-#  rules:
-#    - <<: *if-dev-push
-#      changes: *patterns-c-files
-#    - <<: *if-dev-push
-#      changes: *patterns-python-files
-#    - <<: *if-dev-push
-#      changes: *patterns-sonarqube-files
-
-.rules:patterns:idf-pytest-plugin:
-  rules:
-    - <<: *if-protected-check
-    - <<: *if-dev-push
-      changes: *patterns-idf-pytest-plugin
-
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# DO NOT place comments or maintain any code from this line
-#
-# Use dependencies.yml and generate_rules.py under .gitlab/ci/dependencies dir
-# to generate labels and rules
-# Could also use pre-commit hook to finish this if detected changes on
-# these two files
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-##################
-# Auto Generated #
-##################
-.if-label-build: &if-label-build
-  if: '$BOT_LABEL_BUILD || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build(?:,[^,\n\r]+)*$/i'
-
-.if-label-docker: &if-label-docker
-  if: '$BOT_LABEL_DOCKER || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docker(?:,[^,\n\r]+)*$/i'
-
-.if-label-host_test: &if-label-host_test
-  if: '$BOT_LABEL_HOST_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*host_test(?:,[^,\n\r]+)*$/i'
-
-.if-label-macos: &if-label-macos
-  if: '$BOT_LABEL_MACOS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*macos(?:,[^,\n\r]+)*$/i'
-
-.if-label-macos_test: &if-label-macos_test
-  if: '$BOT_LABEL_MACOS_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*macos_test(?:,[^,\n\r]+)*$/i'
-
-.if-label-nvs_coverage: &if-label-nvs_coverage
-  if: '$BOT_LABEL_NVS_COVERAGE || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*nvs_coverage(?:,[^,\n\r]+)*$/i'
-
-.if-label-submodule: &if-label-submodule
-  if: '$BOT_LABEL_SUBMODULE || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*submodule(?:,[^,\n\r]+)*$/i'
-
-.if-label-windows: &if-label-windows
-  if: '$BOT_LABEL_WINDOWS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*windows(?:,[^,\n\r]+)*$/i'
-
-.rules:build:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *if-dev-push
-      changes: *patterns-build_components
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-
-.rules:build:check:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *if-dev-push
-      changes: *patterns-build_check
-    - <<: *if-dev-push
-      changes: *patterns-build_components
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-
-.rules:build:docker:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *if-label-docker
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-docker
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-    - <<: *if-dev-push
-      changes: *patterns-submodule
-
-.rules:build:macos:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *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-check
-    - <<: *if-label-build
-    - <<: *if-dev-push
-      changes: *patterns-build_components
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-build_template-app
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-
-.rules:labels:nvs_coverage:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-label-nvs_coverage
-
-.rules:labels:windows_pytest_build_system:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-schedule-test-build-system-windows
-    - <<: *if-label-windows
-    - <<: *if-dev-push
-      changes: *patterns-build_system_win
-
-.rules:test:host_test:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-host_test
-    - <<: *if-dev-push
-      changes: *patterns-host_test
-
-.rules:test:submodule:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-submodule
-    - <<: *if-dev-push
-      changes: *patterns-submodule

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

@@ -1,99 +0,0 @@
-# pre_check stage
-clang_tidy_check:
-  extends:
-    - .pre_check_template
-    - .rules:patterns:clang_tidy
-  artifacts:
-    paths:
-      - clang_tidy_reports/
-    expire_in: 1 week
-    when: always
-  variables:
-    IDF_TOOLCHAIN: clang
-  script:
-    - run_cmd idf_clang_tidy $(cat tools/ci/clang_tidy_dirs.txt | xargs)
-      --output-path clang_tidy_reports
-      --limit-file tools/ci/static-analysis-rules.yml
-      --xtensa-include-dir
-
-#
-## build stage
-## Sonarqube related jobs put here for this reason:
-## Here we have two jobs. code_quality_check and code_quality_report.
-##
-## code_quality_check will analyze the code changes between your MR and
-## code repo stored in sonarqube server. The analysis result is only shown in
-## the comments under this MR and won't be transferred to the server.
-##
-## code_quality_report will analyze and transfer both of the newly added code
-## and the analysis result to the server.
-##
-## Put in the front to ensure that the newly merged code can be stored in
-## sonarqube server ASAP, in order to avoid reporting unrelated code issues
-#.sonar_scan_template:
-#  stage: build
-#  extends: .pre_check_template
-#  # full clone since this image does not support fetch --shallow-since-cutoff
-#  # shiny runners are used for full clone
-#  tags: [build, shiny]
-#  image: $SONARQUBE_SCANNER_IMAGE
-#  before_script:
-#    - source tools/ci/utils.sh
-#    - export PYTHONPATH="$CI_PROJECT_DIR/tools:$CI_PROJECT_DIR/tools/ci/python_packages:$PYTHONPATH"
-#    - fetch_submodules
-#    # Exclude the submodules, all paths ends with /**
-#    - submodules=$(get_all_submodules)
-#    # get all exclude paths specified in tools/ci/sonar_exclude_list.txt | ignore lines start with # | xargs | replace all <space> to <comma>
-#    - custom_excludes=$(cat $CI_PROJECT_DIR/tools/ci/sonar_exclude_list.txt | grep -v '^#' | xargs | sed -e 's/ /,/g')
-#    # Exclude the report dir as well
-#    - export EXCLUSIONS="$custom_excludes,$submodules"
-#    - export SONAR_SCANNER_OPTS="-Xmx2048m"
-#  variables:
-#    GIT_DEPTH: 0
-#    REPORT_PATTERN: clang_tidy_reports/**/*.txt
-#  artifacts:
-#    paths:
-#      - $REPORT_PATTERN
-#    expire_in: 1 week
-#    when: always
-#  dependencies:  # Here is not a hard dependency relationship, could be skipped when only python files changed. so we do not use "needs" here.
-#    - clang_tidy_check
-#
-#code_quality_check:
-#  extends:
-#    - .sonar_scan_template
-#    - .rules:patterns:static-code-analysis-preview
-#  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:
-#    - export CI_MERGE_REQUEST_COMMITS=$(python ${CI_PROJECT_DIR}/tools/ci/ci_get_mr_info.py commits --src-branch ${CI_COMMIT_REF_NAME} | tr '\n' ',')
-#    # test if this branch have merge request, if not, exit 0
-#    - test -n "$CI_MERGE_REQUEST_IID" || exit 0
-#    - test -n "$CI_MERGE_REQUEST_COMMITS" || exit 0
-#    - sonar-scanner
-#      -Dsonar.analysis.mode=preview
-#      -Dsonar.branch.name=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-#      -Dsonar.cxx.clangtidy.reportPath=$REPORT_PATTERN
-#      -Dsonar.exclusions=$EXCLUSIONS
-#      -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
-#      -Dsonar.gitlab.commit_sha=$CI_MERGE_REQUEST_COMMITS
-#      -Dsonar.gitlab.merge_request_discussion=true
-#      -Dsonar.gitlab.ref_name=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-#      -Dsonar.host.url=$SONAR_HOST_URL
-#      -Dsonar.login=$SONAR_LOGIN
-#
-#code_quality_report:
-#  extends:
-#    - .sonar_scan_template
-#    - .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:
-#    - sonar-scanner
-#      -Dsonar.branch.name=$CI_COMMIT_REF_NAME
-#      -Dsonar.cxx.clangtidy.reportPath=$REPORT_PATTERN
-#      -Dsonar.exclusions=$EXCLUSIONS
-#      -Dsonar.gitlab.commit_sha=$PIPELINE_COMMIT_SHA
-#      -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
-#      -Dsonar.host.url=$SONAR_HOST_URL
-#      -Dsonar.login=$SONAR_LOGIN

.gitlab/ci/test-win.yml

@@ -1,101 +0,0 @@
-# Host tests
-.host_test_win_template:
-  extends: .rules:test:host_test
-  stage: host_test
-  image: $ESP_ENV_IMAGE
-  tags:
-    - windows-build
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  # run host_test jobs immediately, only after upload cache
-  needs:
-    - job: upload-pip-cache
-      optional: true
-      artifacts: false
-    - job: upload-submodules-cache
-      optional: true
-      artifacts: false
-  before_script: []
-  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:
-      - tools/tools.new.json
-      - tools/test_idf_tools/test_python_env_logs.txt
-    expire_in: 1 week
-  variables:
-    IDF_PATH: "$CI_PROJECT_DIR"
-  timeout: 3h
-  script:
-    # Tools must be downloaded for testing
-    #                                                                     cmake@version that is supported
-    - python ${IDF_PATH}\tools\idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.16.3
-    - cd ${IDF_PATH}\tools\test_idf_tools
-    - python -m pip install jsonschema
-    - python .\test_idf_tools.py
-    - python .\test_idf_tools_python_env.py
-
-test_tools_win:
-  extends:
-    - .host_test_win_template
-    - .rules:labels:windows_pytest_build_system
-  artifacts:
-    paths:
-      - ${IDF_PATH}/*.out
-      - ${IDF_PATH}/XUNIT_*.xml
-    reports:
-      junit: ${IDF_PATH}/XUNIT_*.xml
-    expire_in: 1 week
-    when: always
-  variables:
-    LC_ALL: C.UTF-8
-    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
-    - .\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
-
-# Build tests
-.test_build_system_template_win:
-  stage: host_test
-  variables:
-  # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
-    IDF_CCACHE_ENABLE: "1"
-    PYTHONPATH: "$PYTHONPATH;$IDF_PATH\\tools;$IDF_PATH\\tools\\esp_app_trace;$IDF_PATH\\components\\partition_table;$IDF_PATH\\tools\\ci\\python_packages"
-  before_script: []
-  after_script: []
-  timeout: 4 hours
-  script:
-    - .\install.ps1 --enable-ci --enable-pytest
-    - . .\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
-
-pytest_build_system_win:
-  extends:
-    - .test_build_system_template_win
-    - .rules:labels:windows_pytest_build_system
-  parallel: 2
-  needs: []
-  tags:
-    - windows-build
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - test_build_system
-    expire_in: 2 days
-    reports:
-      junit: XUNIT_RESULT.xml
-    when: always

.gitlab/ci/upload_cache.yml

@@ -1,50 +0,0 @@
-# pull only for most of the use cases for cache
-# only set "push" policy for the jobs under this file.
-# The cache would be updated when files matched specified patterns changes.
-
-.upload_cache_template:
-  stage: upload_cache
-  image: $ESP_ENV_IMAGE
-
-upload-pip-cache:
-  extends:
-    - .upload_cache_template
-    - .before_script:minimal
-    - .rules:upload-python-cache
-  tags:
-    - $GEO
-    - cache
-  cache:
-    key: pip-cache-${LATEST_GIT_TAG}
-    paths:
-      - .cache/pip
-    policy: push
-  script:
-    - rm -rf .cache/pip  # clear old packages
-    - bash install.sh --enable-ci --enable-pytest
-  parallel:
-    matrix:
-      - GEO: [ 'shiny',  'brew' ]
-
-upload-submodules-cache:
-  extends:
-    - .upload_cache_template
-    - .before_script:minimal
-    - .rules:upload-submodule-cache
-  tags:
-    - $GEO
-    - cache
-  cache:
-    key: submodule-cache-${LATEST_GIT_TAG}
-    paths:
-      - .cache/submodule_archives
-    policy: push
-  script:
-    # use the default gitlab server
-    - unset LOCAL_GITLAB_HTTPS_HOST
-    - rm -rf .cache/submodule_archives  # clear old submodule archives
-    - add_gitlab_ssh_keys
-    - fetch_submodules
-  parallel:
-    matrix:
-      - GEO: [ 'shiny',  'brew' ]

.gitlab/merge_request_templates/Minimal_Template.md

@@ -1,32 +0,0 @@
-<!-- This Template states the absolute minimum for an MR.
-    If you want to have a more elaborate template or know why we have this structure,
-    please use the "Mixed Template" or consult the Wiki. -->
-<!-- Add the CI labels to trigger the appropriate tests (e.g. "unit_test_esp32") --><!-- Mandatory -->
-<!-- Make sure the commit message follows the Wiki about "Commit Messages" --><!-- Mandatory -->
-
-<!-- Add description of the change here --><!-- Mandatory -->
-
-## 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:
-    # Only run tests that match the given substring expression (modified files/components will be ignored):
-    # Please use a list of strings. 
-    # This will run the test cases filtered like `pytest -k "(<list_item_1>) or (<list_item_2>) or ...`
-    # The fast pipeline will fail at the final stage.
-    # For example:
-      - test_sdm and not sdmmc
-      - test_hello_world
-    # This example will include all tests containing 'test_hello_world' in the name,
-    # and include all tests containing 'test_sdm' but not 'sdmmc' in the name.
-``` --><!-- Optional -->
-
-<!-- Don't remove the next line - assigns the MR author as the assignee -->
-/assign me

.gitlab/merge_request_templates/Mixed Template.md

@@ -10,12 +10,14 @@ _This entire section can be deleted if all items are checked._
 * [ ] All related links, including JIRA, backport, submodule MR, are mentioned in the `Related` subsection.
 * [ ] Any GitHub issues are linked inside the git commit message and corresponding release notes
 * [ ] Add label for the area this MR is part of
-* [ ] For documentation updates, check if label `needs translation:CN` or `needs translation:EN` have been added when the other language version still needs the update. Don't add such labels if the document updated has never been translated before and requires translation from scratch.
+* [ ] For documentation updates, check if label `Docs` and `needs translation:CN` or `needs translation:EN`  have been added when the other language version still needs the update. Skip adding the label if the document is not yet translated.
+* [ ] Check if documents requiring translation fall under get-started section. If yes, add the labels mentioned above. Then the documentation team will assign a translator for you. Please inform the translator to prepare translation once your MR is ready to merge. The translation should be included in your MR to get it merged. For more information, see documentation workflow in Wiki.
 * [ ] Any necessary "needs backport" labels are added
 * [ ] Check if this is a breaking change. If it is, add notes to the `Breaking change notes` subsection below
 * [ ] Release note entry if this is a new public feature, or a fix for an issue introduced in the previous release.
 * [ ] The commit log is clean and ready to merge.
 * [ ] All relevant CI jobs have been run, i.e. jobs which cover the code changed by the MR.
+* [ ] Pipeline with Python 3 has been successfully run, i.e. `@bot ...; with Python3`, if the MR adds or changes Python code.
 
 ---
 
@@ -41,7 +43,7 @@ _For other small/non-public changes, which are not expected to be in the release
 
 _Don't touch the subsection titles below, they will be parsed by scripts._
 
-## Release notes <!-- Mandatory -->
+## 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._
 
@@ -60,6 +62,3 @@ _If there are any breaking changes, please mention it here. Talking about (1) wh
 _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

@@ -2,26 +2,10 @@
 # All the relative URL paths are intended to be GitHub ones
 # For Espressif's public projects please use '../../espressif/proj', not a '../proj'
 #
-# Submodules SBOM information
-# ---------------------------
-# Submodules, which are used directly and not forked into espressif namespace should
-# contain SBOM information here. Other submodules should have the SBOM manifest file
-# included in the root of their project's repository.
-#
-# The sbom-hash entry records the submodule's checkout SHA as presented in git-tree
-# commit object. For example spiffs submodule
-#
-# $ git ls-tree HEAD components/spiffs/spiffs
-# 160000 commit 0dbb3f71c5f6fae3747a9d935372773762baf852	components/spiffs/spiffs
-#
-# The hash can be also obtained with git submodule command
-#
-# $ git submodule status components/spiffs/spiffs
-# 0dbb3f71c5f6fae3747a9d935372773762baf852 components/spiffs/spiffs (0.2-255-g0dbb3f71c5f6)
-#
-# The submodule SHA recorded here has to match with SHA, which is presented in git-tree.
-# This is checked by CI. Also please don't forget to update the submodule version
-# if you are changing the sbom-hash. This is important for SBOM generation.
+
+[submodule "components/esptool_py/esptool"]
+	path = components/esptool_py/esptool
+	url = ../../espressif/esptool.git
 
 [submodule "components/bt/controller/lib_esp32"]
 	path = components/bt/controller/lib_esp32
@@ -30,39 +14,39 @@
 [submodule "components/bootloader/subproject/components/micro-ecc/micro-ecc"]
 	path = components/bootloader/subproject/components/micro-ecc/micro-ecc
 	url = ../../kmackay/micro-ecc.git
-	sbom-version = 1.1
-	sbom-cpe = cpe:2.3:a:micro-ecc_project:micro-ecc:{}:*:*:*:*:*:*:*
-	sbom-supplier = Person: Ken MacKay
-	sbom-url = https://github.com/kmackay/micro-ecc
-	sbom-description = A small and fast ECDH and ECDSA implementation for 8-bit, 32-bit, and 64-bit processors
-	sbom-hash = 24c60e243580c7868f4334a1ba3123481fe1aa48
+
+[submodule "components/coap/libcoap"]
+	path = components/coap/libcoap
+	url = ../../obgm/libcoap.git
+
+[submodule "components/nghttp/nghttp2"]
+	path = components/nghttp/nghttp2
+	url = ../../nghttp2/nghttp2.git
+
+[submodule "components/libsodium/libsodium"]
+	path = components/libsodium/libsodium
+	url = ../../jedisct1/libsodium.git
 
 [submodule "components/spiffs/spiffs"]
 	path = components/spiffs/spiffs
 	url = ../../pellepl/spiffs.git
-	sbom-version = 0.2-255-g0dbb3f71c5f6
-	sbom-supplier = Person: Peter Andersson
-	sbom-url = https://github.com/pellepl/spiffs
-	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
 
+[submodule "components/asio/asio"]
+	path = components/asio/asio
+	url = ../../espressif/asio.git
+
+[submodule "components/expat/expat"]
+	path = components/expat/expat
+	url = ../../libexpat/libexpat.git
+
 [submodule "components/lwip/lwip"]
 	path = components/lwip/lwip
 	url = ../../espressif/esp-lwip.git
@@ -74,79 +58,39 @@
 [submodule "components/protobuf-c/protobuf-c"]
 	path = components/protobuf-c/protobuf-c
 	url = ../../protobuf-c/protobuf-c.git
-	sbom-version = 1.4.1
-	sbom-cpe = cpe:2.3:a:protobuf-c_project:protobuf-c:{}:*:*:*:*:*:*:*
-	sbom-supplier = Organization: protobuf-c community <https://groups.google.com/g/protobuf-c>
-	sbom-url = https://github.com/protobuf-c/protobuf-c
-	sbom-description = Protocol Buffers implementation in C
-	sbom-hash = abc67a11c6db271bedbb9f58be85d6f4e2ea8389
 
 [submodule "components/unity/unity"]
 	path = components/unity/unity
 	url = ../../ThrowTheSwitch/Unity.git
-	sbom-version = v2.6.0-RC1
-	sbom-supplier = Organization: ThrowTheSwitch community <http://www.throwtheswitch.org>
-	sbom-url = https://github.com/ThrowTheSwitch/Unity
-	sbom-description = Simple Unit Testing for C
-	sbom-hash = bf560290f6020737eafaa8b5cbd2177c3956c03f
+
+[submodule "examples/build_system/cmake/import_lib/main/lib/tinyxml2"]
+	path = examples/build_system/cmake/import_lib/main/lib/tinyxml2
+	url = ../../leethomason/tinyxml2.git
 
 [submodule "components/bt/host/nimble/nimble"]
 	path = components/bt/host/nimble/nimble
 	url = ../../espressif/esp-nimble.git
 
+[submodule "components/cbor/tinycbor"]
+	path = components/cbor/tinycbor
+	url = ../../intel/tinycbor.git
+
 [submodule "components/esp_wifi/lib"]
 	path = components/esp_wifi/lib
 	url = ../../espressif/esp32-wifi-lib.git
 
+[submodule "components/tinyusb/tinyusb"]
+	path = components/tinyusb/tinyusb
+	url = ../../espressif/tinyusb.git
+
+[submodule "examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib"]
+	path = examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib
+	url = ../../espressif/esp-cryptoauthlib.git
+
 [submodule "components/cmock/CMock"]
 	path = components/cmock/CMock
 	url = ../../ThrowTheSwitch/CMock.git
-	sbom-version = v2.5.2-2-geeecc49ce8af
-	sbom-supplier = Organization: ThrowTheSwitch community <http://www.throwtheswitch.org>
-	sbom-url = https://github.com/ThrowTheSwitch/CMock
-	sbom-description = CMock - Mock/stub generator for C
-	sbom-hash = eeecc49ce8af123cf8ad40efdb9673e37b56230f
-
-[submodule "components/openthread/openthread"]
-	path = components/openthread/openthread
-	url = ../../espressif/openthread.git
 
 [submodule "components/bt/controller/lib_esp32c3_family"]
 	path = components/bt/controller/lib_esp32c3_family
 	url = ../../espressif/esp32c3-bt-lib.git
-
-[submodule "components/esp_phy/lib"]
-	path = components/esp_phy/lib
-	url = ../../espressif/esp-phy-lib.git
-
-[submodule "components/openthread/lib"]
-	path = components/openthread/lib
-	url = ../../espressif/esp-thread-lib.git
-
-[submodule "components/bt/controller/lib_esp32h2/esp32h2-bt-lib"]
-	path = components/bt/controller/lib_esp32h2/esp32h2-bt-lib
-	url = ../../espressif/esp32h2-bt-lib.git
-
-[submodule "components/bt/controller/lib_esp32c2/esp32c2-bt-lib"]
-	path = components/bt/controller/lib_esp32c2/esp32c2-bt-lib
-	url = ../../espressif/esp32c2-bt-lib.git
-
-[submodule "components/bt/controller/lib_esp32c6/esp32c6-bt-lib"]
-	path = components/bt/controller/lib_esp32c6/esp32c6-bt-lib
-	url = ../../espressif/esp32c6-bt-lib.git
-
-[submodule "components/bt/controller/lib_esp32c5/esp32c5-bt-lib"]
-	path = components/bt/controller/lib_esp32c5/esp32c5-bt-lib
-	url = ../../espressif/esp32c5-bt-lib.git
-
-[submodule "components/heap/tlsf"]
-	path = components/heap/tlsf
-	url = ../../espressif/tlsf.git
-
-[submodule "components/esp_coex/lib"]
-	path = components/esp_coex/lib
-	url = ../../espressif/esp-coex-lib.git
-
-[submodule "components/bt/esp_ble_mesh/lib/lib"]
-	path = components/bt/esp_ble_mesh/lib/lib
-	url = ../../espressif/esp-ble-mesh-lib.git

.mypy.ini

@@ -1,26 +0,0 @@
-[mypy]
-
-# Specifies the Python version used to parse and check the target program
-python_version = 3.9
-
-# Disallows defining functions without type annotations or with incomplete type annotations
-# True => enforce type annotation in all function definitions
-disallow_untyped_defs = True
-
-# Shows a warning when returning a value with type Any from a function declared with a non- Any return type
-warn_return_any = True
-
-# Shows errors for missing return statements on some execution paths
-warn_no_return = True
-
-# Suppress error messages about imports that cannot be resolved
-# True => ignore all import errors
-ignore_missing_imports = True
-
-# Disallows defining functions with incomplete type annotations
-disallow_incomplete_defs = False
-
-# Directs what to do with imports when the imported module is found as a .py file and not part of the files,
-# modules and packages provided on the command line.
-# SKIP -> mypy checks only single file, not included imports
-follow_imports = skip

.pre-commit-config.yaml

@@ -1,37 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
-default_stages: [pre-commit]
-
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.7"
-    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
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
         # note: whitespace exclusions use multiline regex, see https://pre-commit.com/#regular-expressions
@@ -39,37 +11,30 @@ repos:
         # 1 - some file extensions
         # 2 - any file matching *test*/*expected* (for host tests, if possible use this naming pattern always)
         # 3 - any directory named 'testdata'
-        # 4 - protobuf auto-generated files
-        # 5 - COPYING files
+        # 4 - IDF monitor test data
         exclude: &whitespace_excludes |
-          (?x)^(
-            .+\.(md|rst|map|bin)|
-            .+test.*\/.*expected.*|
-            .+\/testdata\/.+|
-            .*_pb2.py|
-            .*.pb-c.h|
-            .*.pb-c.c|
-            .*.yuv|
-            .*.rgb|
-            .*COPYING.*|
-            docs/sphinx-known-warnings\.txt
-          )$
+            (?x)^(
+                .+\.(md|rst|map|bin)|
+                .+test.*\/.*expected.*|
+                .+\/testdata\/.+|
+                .+test_idf_monitor\/tests\/.+
+            )$
       - id: end-of-file-fixer
         exclude: *whitespace_excludes
       - id: check-executables-have-shebangs
       - id: mixed-line-ending
         args: ['-f=lf']
       - id: double-quote-string-fixer
-      - id: no-commit-to-branch
-        name: Do not use more than one slash in the branch name
-        args: ['--pattern', '^[^/]*/[^/]*/']
-      - id: no-commit-to-branch
-        name: Do not use uppercase letters in the branch name
-        args: ['--pattern', '^[^A-Z]*[A-Z]']
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+  - repo: https://github.com/PyCQA/flake8
+    rev: 3.8.4
     hooks:
-      - id: codespell
+      - id: flake8
+        args: ['--config=.flake8', '--tee', '--benchmark']
+  - repo: https://github.com/pycqa/isort
+    rev: 5.11.5  # python 3.7 compatible
+    hooks:
+      - id: isort
+        name: isort (python)
   - repo: local
     hooks:
       - id: check-executables
@@ -84,6 +49,16 @@ repos:
         language: python
         pass_filenames: false
         always_run: true
+      - id: check-kconfigs
+        name: Validate Kconfig files
+        entry: tools/ci/check_kconfigs.py
+        language: python
+        files: '^Kconfig$|Kconfig.*$'
+      - id: check-deprecated-kconfigs-options
+        name: Check if any Kconfig Options Deprecated
+        entry: tools/ci/check_deprecated_kconfigs.py
+        language: python
+        files: 'sdkconfig\.ci$|sdkconfig\.rename$|sdkconfig.*$'
       - id: cmake-lint
         name: Check CMake Files Format
         entry: cmakelint --linelength=120 --spaces=4 --filter=-whitespace/indent
@@ -96,161 +71,10 @@ repos:
         name: Validate Codeowner File
         entry: tools/ci/check_codeowners.py ci-check
         language: python
-        always_run: true
         files: '\.gitlab/CODEOWNERS'
         pass_filenames: false
-      - id: check-generated-rules
-        name: Check rules are generated (based on .gitlab/ci/dependencies/dependencies.yml)
-        entry: tools/ci/generate_rules.py
-        language: python
-        files: '\.gitlab/ci/dependencies/.+|\.gitlab/ci/.*\.yml|.gitlab-ci.yml'
-        pass_filenames: false
-        require_serial: true
-        additional_dependencies:
-          - PyYAML == 5.3.1
-      - id: mypy-check
-        name: Check type annotations in python files
-        entry: tools/ci/check_type_comments.py
-        additional_dependencies:
-          - 'mypy'
-          - 'mypy-extensions'
-          - 'types-setuptools'
-          - 'types-PyYAML'
-          - 'types-requests'
-        exclude: >
-          (?x)^(
-              .*_pb2.py
-          )$
-        language: python
-        types: [python]
-      - id: check-requirement-files
-        name: Check requirement files
-        entry: tools/ci/check_requirement_files.py
-        additional_dependencies:
-          - 'jsonschema'
-        language: python
-        files: 'tools/requirements.+|tools/requirements/.+'
-        pass_filenames: false
-      - id: check-tools-files-patterns
-        name: Check tools dir files patterns
-        entry: tools/ci/check_tools_files_patterns.py
-        language: python
-        files: '^tools/.+'
-        additional_dependencies:
-          - PyYAML == 5.3.1
-        pass_filenames: false
-      - id: check-rules-components-patterns
-        name: check patterns-build_components in rules.yml
-        entry: tools/ci/check_rules_components_patterns.py
-        language: python
-        files: 'components/.+|.gitlab/ci/rules.yml'
-        additional_dependencies:
-          - PyYAML == 5.3.1
-        pass_filenames: false
-      - id: check-generated-soc-caps-kconfig
-        name: Check soc caps kconfig files are generated (based on components/soc/IDF_TARGET/include/soc/soc_caps.h)
-        entry: tools/gen_soc_caps_kconfig/gen_soc_caps_kconfig.py -d 'components/soc/*/include/soc/' 'components/esp_rom/*/' 'components/spi_flash/*/'
-        language: python
-        files: 'components/soc/.+/include/soc/.+_caps\.h|components/esp_rom/.+/.+_caps\.h|kconfig\.soc_caps.in|components/spi_flash/.+/.+_caps\.h'
-        pass_filenames: false
-        additional_dependencies:
-          - pyparsing
-      - id: check-all-apps-readmes
-        name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables
-        entry: tools/ci/check_build_test_rules.py check-readmes
-        language: python
-        files: 'tools/test_apps/.+|examples/.+|components/.+|tools/idf_py_actions/constants.py|tools/ci/check_build_test_rules.py'
-        require_serial: true
-        additional_dependencies:
-          - PyYAML == 5.3.1
-          - idf-build-apps>=2.8,<3
-      - id: sort-yaml-files
-        name: sort yaml files
-        entry: tools/ci/sort_yaml.py
-        language: python
-        files: '\.build-test-rules\.yml$|known_generate_test_child_pipeline_warnings\.yml$'
-        additional_dependencies:
-          - ruamel.yaml
-      - id: sort-yaml-test
-        name: sort yaml test
-        entry: python -m unittest tools/ci/sort_yaml.py
-        language: python
-        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
-        language: python
-        always_run: true
-        require_serial: true
-      - id: gitlab-yaml-linter
-        name: Check gitlab yaml files
-        entry: tools/ci/gitlab_yaml_linter.py
-        language: python
-        files: '\.gitlab-ci\.yml|\.gitlab/ci/.+\.yml|\.gitmodules'
-        pass_filenames: false
-        additional_dependencies:
-          - PyYAML == 5.3.1
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v3.4.0
     hooks:
       - id: file-contents-sorter
-        files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt|check_copyright_ignore\.txt)'
-  - repo: https://github.com/espressif/check-copyright/
-    rev: v1.1.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.10.0
-    hooks:
-      - id: conventional-precommit-linter
-        stages: [commit-msg]
-  - repo: https://github.com/espressif/astyle_py.git
-    rev: v1.0.5
-    hooks:
-      - id: astyle_py
-        # If you are modifying astyle version, update tools/format.sh as well
-        args: ['--astyle-version=3.4.7', '--rules=tools/ci/astyle-rules.yml']
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.5
-    hooks:
-    - id: shellcheck
-      name: shellcheck bash
-      args: ['--shell', 'bash', '-x']
-      files: 'install.sh|export.sh'
-    - id: shellcheck
-      name: shellcheck dash (export.sh)
-      args: ['--shell', 'dash', '-x']
-      files: 'export.sh'
-  - repo: https://github.com/espressif/esp-pwsh-check
-    rev: v1.0.1
-    hooks:
-    - id: check-powershell-scripts
-      stages: [manual]
-  - repo: https://github.com/espressif/esp-idf-sbom.git
-    rev: v0.13.0
-    hooks:
-      - id: validate-sbom-manifest
-        stages: [post-commit]
-  - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v0.9.1
-    hooks:
-      - id: 'sphinx-lint'
-        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
-    hooks:
-      - id: check-kconfig-files
-      - id: check-deprecated-kconfig-options
+        files: 'tools/ci/executable-list.txt'

.pylintrc

@@ -0,0 +1,603 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-whitelist=
+
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=print-statement,
+        parameter-unpacking,
+        unpacking-in-except,
+        old-raise-syntax,
+        backtick,
+        long-suffix,
+        old-ne-operator,
+        old-octal-literal,
+        import-star-module-level,
+        non-ascii-bytes-literal,
+        raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead,
+        apply-builtin,
+        basestring-builtin,
+        buffer-builtin,
+        cmp-builtin,
+        coerce-builtin,
+        execfile-builtin,
+        file-builtin,
+        long-builtin,
+        raw_input-builtin,
+        reduce-builtin,
+        standarderror-builtin,
+        unicode-builtin,
+        xrange-builtin,
+        coerce-method,
+        delslice-method,
+        getslice-method,
+        setslice-method,
+        no-absolute-import,
+        old-division,
+        dict-iter-method,
+        dict-view-method,
+        next-method-called,
+        metaclass-assignment,
+        indexing-exception,
+        raising-string,
+        reload-builtin,
+        oct-method,
+        hex-method,
+        nonzero-method,
+        cmp-method,
+        input-builtin,
+        round-builtin,
+        intern-builtin,
+        unichr-builtin,
+        map-builtin-not-iterating,
+        zip-builtin-not-iterating,
+        range-builtin-not-iterating,
+        filter-builtin-not-iterating,
+        using-cmp-argument,
+        eq-without-hash,
+        div-method,
+        idiv-method,
+        rdiv-method,
+        exception-message-attribute,
+        invalid-str-codec,
+        sys-max-int,
+        bad-python3-import,
+        deprecated-string-function,
+        deprecated-str-translate-call,
+        deprecated-itertools-function,
+        deprecated-types-field,
+        next-method-defined,
+        dict-items-not-iterating,
+        dict-keys-not-iterating,
+        dict-values-not-iterating,
+        deprecated-operator-function,
+        deprecated-urllib-function,
+        xreadlines-attribute,
+        deprecated-sys-function,
+        exception-escape,
+        comprehension-escape,
+        missing-function-docstring, # Modified since here, include this line
+        missing-class-docstring,
+        missing-module-docstring,
+        wrong-import-order,
+        invalid-name,
+        too-few-public-methods,
+        too-many-locals,
+        bad-super-call,  # since we still haven't drop python2 support
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'error', 'warning', 'refactor', and 'convention'
+# which contain the number of messages in each category, as well as 'statement'
+# which is the total number of statements analyzed. This score is used by the
+# global evaluation report (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: none. To make it work,
+# install the python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=160
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,
+               dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+# Regular expression of note tags to take in consideration.
+#notes-rgx=
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx=
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=12
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+                  _fields,
+                  _replace,
+                  _source,
+                  _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled).
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled).
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+                       Exception

.readthedocs.yml

@@ -15,7 +15,7 @@ python:
   install:
     - requirements: docs/requirements.txt
 
-# We need to list all the submodules included in documentation build by Doxygen
+# We need to list all the submodules included in documenation build by DOxygen
 submodules:
   include:
     - components/mqtt/esp-mqtt

.shellcheckrc

@@ -1,5 +0,0 @@
-# This is shellcheck config file
-# Files that are checked: install.sh, export.sh
-
-# Do not complain about variables determined at runtime (IDF_PATH)
-disable=SC1090

.vale.ini

@@ -1,119 +0,0 @@
-###################
-### Vale Config ###
-###################
-
-# This is a Vale linter configuration file.
-# - Repo: esp-idf
-# - Based on Default config: v0-1-1
-# It lists all necessary parameters to configure Vale for your project.
-# For official documentation on all config settings, see
-# https://vale.sh/docs/topics/config
-
-
-##############
-### Global ###
-##############
-
-# This section lists core settings applying to Vale itself.
-
-
-# Specify path to external resources (e.g., styles and vocab files).
-# The path value may be absolute or relative to this configuration file.
-StylesPath = .vale/styles
-
-
-# Specify the minimum alert severity that Vale will report.
-MinAlertLevel = suggestion # "suggestion", "warning", or "error"
-
-
-# Specify vocabulary for special treatment.
-# Create a folder in <StylesPath>/Vocab/<name>/and add its name here
-# The folder should contain two files:
-# - accept.txt -- lists words with accepted case-sensitive spelling
-# - reject.txt -- lists words whose occurrences throw an error
-# Vocab = Espressif
-
-
-# Specify the packages to import into your project.
-# A package is a zip file containing a number of rules (style) written in YAML.
-# For a list of official packages, see Package Hub at https://vale.sh/hub/
-# For official documentation on packages, see
-# https://vale.sh/docs/topics/packages/
-# Before linting, navigate to your project and run `vale sync` to download
-# the official packages specified below.
-# Packages = Package1, Package2, \
-# https://example.com/path/to/package/Package.zip
-Packages = Google, Microsoft, RedHat, \
-https://dl.espressif.com/dl/esp-vale-config/Espressif-latest.zip
-
-
-###############
-### Formats ###
-###############
-
-# This section enables association of "unknown" formats with the ones
-# supported by Vale. For official documentation on supported formats, see
-# https://vale.sh/docs/topics/scoping/
-[formats]
-
-# For example, treat MDX files as Markdown files.
-# mdx = md
-
-
-################################
-### Format-specific settings ###
-################################
-
-# This section lists the settings that apply to specific file formats
-# based on their glob pattern.
-# Settings provided under a more specific glob pattern,
-# such as [*.{md,txt}] will override those in [*].
-[*.{md,rst}]
-
-
-# Enable styles to activate all rules included in them.
-# BasedOnStyles = Style1, Style2
-BasedOnStyles = Vale, Espressif-latest
-
-
-### Deactivate individual rules ###
-### in enabled styles.
-# Style1.Rule1 = NO
-Vale.Repetition = NO
-Vale.Spelling = NO
-Espressif-latest.Admonitions = NO
-Espressif-latest.Contractions = NO
-Espressif-latest.Monospace = NO
-Espressif-latest.PascalCamelCase = NO
-
-
-### Change default severity level ###
-### of an activated rule.
-# Choose between "suggestion", "warning", or "error".
-# Style1.Rule2 = error
-
-
-### Activate individual rules ###
-### in non-enabled styles stored in <StylesPath>.
-# Style1.Rule = YES
-Google.Gender = YES
-Google.GenderBias = YES
-Google.Slang = YES
-Google.Spacing = YES
-Microsoft.DateNumbers = YES
-Microsoft.Ellipses = YES
-Microsoft.FirstPerson = YES
-Microsoft.Hyphens = YES
-Microsoft.Ordinal = YES
-Microsoft.OxfordComma = YES
-Microsoft.Percentages = YES
-Microsoft.RangeTime = YES
-Microsoft.Semicolon = YES
-Microsoft.SentenceLength = YES
-Microsoft.Suspended = YES
-Microsoft.Units = YES
-Microsoft.URLFormat = YES
-Microsoft.We = YES
-Microsoft.Wordiness = YES
-RedHat.Contractions = YES
-RedHat.RepeatedWords = YES

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 project(esp-idf C CXX ASM)
 
 if(CMAKE_CURRENT_LIST_DIR STREQUAL CMAKE_SOURCE_DIR)
@@ -7,65 +7,41 @@ if(CMAKE_CURRENT_LIST_DIR STREQUAL CMAKE_SOURCE_DIR)
     "again.")
 endif()
 
-# 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.
+unset(compile_options)
+unset(c_compile_options)
+unset(cxx_compile_options)
+unset(compile_definitions)
+unset(link_options)
 
 # Add the following build specifications here, since these seem to be dependent
 # on config values on the root Kconfig.
 
-if(BOOTLOADER_BUILD)
-
-    if(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE)
-        if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-            list(APPEND compile_options "-Oz")
-        else()
-            list(APPEND compile_options "-Os")
-        endif()
-        if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-            list(APPEND compile_options "-freorder-blocks")
-        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()
-
-elseif(ESP_TEE_BUILD)
-
-    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-        list(APPEND compile_options "-Oz")
-    else()
-        list(APPEND compile_options "-Os")
-        list(APPEND compile_options "-freorder-blocks")
-    endif()
-
-else()
+if(NOT BOOTLOADER_BUILD)
 
     if(CONFIG_COMPILER_OPTIMIZATION_SIZE)
-        if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-            list(APPEND compile_options "-Oz")
-        else()
-            list(APPEND compile_options "-Os")
-        endif()
-        if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-            list(APPEND compile_options "-freorder-blocks")
-        endif()
-    elseif(CONFIG_COMPILER_OPTIMIZATION_DEBUG)
+        list(APPEND compile_options "-Os")
+        list(APPEND compile_options "-freorder-blocks")
+    elseif(CONFIG_COMPILER_OPTIMIZATION_DEFAULT)
         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_COMPILER_OPTIMIZATION_NONE)
         list(APPEND compile_options "-O0")
     elseif(CONFIG_COMPILER_OPTIMIZATION_PERF)
         list(APPEND compile_options "-O2")
     endif()
 
+else()  # BOOTLOADER_BUILD
+
+    if(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE)
+        list(APPEND compile_options "-Os")
+        list(APPEND compile_options "-freorder-blocks")
+    elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG)
+        list(APPEND compile_options "-Og")
+    elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE)
+        list(APPEND compile_options "-O0")
+    elseif(CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF)
+        list(APPEND compile_options "-O2")
+    endif()
+
 endif()
 
 if(CONFIG_COMPILER_CXX_EXCEPTIONS)
@@ -81,70 +57,23 @@ else()
     list(APPEND link_options "-fno-rtti")           # used to invoke correct multilib variant (no-rtti) during linking
 endif()
 
-if(CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS)
-    list(APPEND compile_options "-msave-restore")
-endif()
+if(CONFIG_COMPILER_DISABLE_GCC8_WARNINGS)
+    list(APPEND compile_options "-Wno-parentheses"
+                                "-Wno-sizeof-pointer-memaccess"
+                                "-Wno-clobbered")
 
-if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    list(APPEND c_compile_options "-Wno-old-style-declaration")
+    list(APPEND compile_options "-Wno-format-overflow"
+                                "-Wno-stringop-truncation"
+                                "-Wno-misleading-indentation"
+                                "-Wno-cast-function-type"
+                                "-Wno-implicit-fallthrough"
+                                "-Wno-unused-const-variable"
+                                "-Wno-switch-unreachable"
+                                "-Wno-format-truncation"
+                                "-Wno-memset-elt-size"
+                                "-Wno-int-in-bool-context")
 endif()
 
-# Clang finds some warnings in IDF code which GCC doesn't.
-# All these warnings should be fixed before Clang is presented
-# as a toolchain choice for users.
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-    # Clang checks Doxygen comments for being in sync with function prototype.
-    # There are some inconsistencies, especially in ROM headers.
-    list(APPEND compile_options "-Wno-documentation")
-    # GCC allows repeated typedefs when the source and target types are the same.
-    # Clang doesn't allow this. This occurs in many components due to forward
-    # declarations.
-    list(APPEND compile_options "-Wno-typedef-redefinition")
-    # This issue is seemingly related to newlib's char type functions.
-    # Fix is not clear yet.
-    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
-    list(APPEND compile_options "-Wno-pointer-bool-conversion")
-    # mbedTLS md5.c triggers this warning in md5_test_buf (false positive)
-    list(APPEND compile_options "-Wno-string-concatenation")
-    # multiple cases of implicit conversions between unrelated enum types
-    list(APPEND compile_options "-Wno-enum-conversion")
-    # When IRAM_ATTR is specified both in function declaration and definition,
-    # it produces different section names, since section names include __COUNTER__.
-    # Occurs in multiple places.
-    list(APPEND compile_options "-Wno-section")
-    # Multiple cases of attributes unknown to clang, for example
-    # __attribute__((optimize("-O3")))
-    list(APPEND compile_options "-Wno-unknown-attributes")
-    # Disable Clang warnings for atomic operations with access size
-    # more then 4 bytes
-    list(APPEND compile_options "-Wno-atomic-alignment")
-    # several warnings in wpa_supplicant component
-    list(APPEND compile_options "-Wno-unused-but-set-variable")
-    # Clang also produces many -Wunused-function warnings which GCC doesn't.
-    list(APPEND compile_options "-Wno-unused-function")
-    # many warnings in bluedroid code
-    # warning: field 'hdr' with variable sized type 'BT_HDR' not at the end of a struct or class is a GNU extension
-    list(APPEND compile_options "-Wno-gnu-variable-sized-type-not-at-end")
-    # several warnings in bluedroid code
-    list(APPEND compile_options "-Wno-constant-logical-operand")
-    # warning: '_Static_assert' with no message is a C2x extension
-    list(APPEND compile_options "-Wno-c2x-extensions")
-    # warning on xMPU_SETTINGS for esp32s2 has size 0 for C and 1 for C++
-    list(APPEND compile_options "-Wno-extern-c-compat")
-    if(NOT (CONFIG_IDF_TARGET_LINUX AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"))
-        # warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1
-        list(APPEND compile_options "-Wno-single-bit-bitfield-constant-conversion")
-    endif()
-endif()
-# More warnings may exist in unit tests and example projects.
-
 if(CONFIG_COMPILER_WARN_WRITE_STRINGS)
     list(APPEND compile_options "-Wwrite-strings")
 endif()
@@ -153,10 +82,6 @@ if(CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
     list(APPEND compile_definitions "-DNDEBUG")
 endif()
 
-if(CONFIG_COMPILER_NO_MERGE_CONSTANTS)
-    list(APPEND compile_options "-fno-merge-constants")
-endif()
-
 if(CONFIG_COMPILER_STACK_CHECK_MODE_NORM)
     list(APPEND compile_options "-fstack-protector")
 elseif(CONFIG_COMPILER_STACK_CHECK_MODE_STRONG)
@@ -169,118 +94,25 @@ if(CONFIG_COMPILER_DUMP_RTL_FILES)
     list(APPEND compile_options "-fdump-rtl-expand")
 endif()
 
-__generate_prefix_map(prefix_map_compile_options)
-list(APPEND compile_options ${prefix_map_compile_options})
-
-if(CONFIG_COMPILER_DISABLE_GCC12_WARNINGS)
-    list(APPEND compile_options "-Wno-address"
-                                "-Wno-use-after-free")
-endif()
-
-if(CONFIG_COMPILER_DISABLE_GCC13_WARNINGS)
-    list(APPEND compile_options "-Wno-xor-used-as-pow")
-    list(APPEND c_compile_options "-Wno-enum-int-mismatch")
-    list(APPEND cxx_compile_options "-Wno-self-move"
-                                    "-Wno-dangling-reference")
-endif()
-
-if(CONFIG_COMPILER_DISABLE_GCC14_WARNINGS)
-    list(APPEND compile_options "-Wno-calloc-transposed-args")
-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")
+if(NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS 8.0.0)
+    if(CONFIG_COMPILER_HIDE_PATHS_MACROS)
+        list(APPEND compile_options "-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=.")
+        list(APPEND compile_options "-fmacro-prefix-map=${IDF_PATH}=IDF")
     endif()
 endif()
 
 # GCC-specific options
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    list(APPEND compile_options "-fstrict-volatile-bitfields")
-    if(CONFIG_COMPILER_STATIC_ANALYZER)
-        list(APPEND compile_options "-fanalyzer")
-    endif()
-endif()
-
-if(CONFIG_ESP_SYSTEM_USE_EH_FRAME)
-  list(APPEND compile_options "-fasynchronous-unwind-tables")
-  list(APPEND link_options "-Wl,--eh-frame-hdr")
-endif()
-
-if(CONFIG_ESP_SYSTEM_USE_FRAME_POINTER)
-    list(APPEND compile_options "-fno-omit-frame-pointer")
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-        list(APPEND compile_options "-mno-omit-leaf-frame-pointer")
-    endif()
+    list(APPEND compile_options "-fstrict-volatile-bitfields"
+                                "-Wno-error=unused-but-set-variable"
+                                )
 endif()
 
 list(APPEND link_options "-fno-lto")
 
-if(CONFIG_IDF_TARGET_LINUX AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-    # Not all versions of the MacOS linker support the -warn_commons flag.
-    # ld version 1053.12 (and above) have been tested to support it.
-    # Hence, we extract the version string from the linker output
-    # before including the flag.
-
-    # Get the ld version, capturing both stdout and stderr
-    execute_process(
-        COMMAND ${CMAKE_LINKER} -v
-        OUTPUT_VARIABLE LD_VERSION_OUTPUT
-        ERROR_VARIABLE LD_VERSION_ERROR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_STRIP_TRAILING_WHITESPACE
-    )
-
-    # Combine stdout and stderr
-    set(LD_VERSION_OUTPUT "${LD_VERSION_OUTPUT}\n${LD_VERSION_ERROR}")
-
-    # Extract the version string
-    string(REGEX MATCH "PROJECT:(ld|dyld)-([0-9]+)\\.([0-9]+)" LD_VERSION_MATCH "${LD_VERSION_OUTPUT}")
-    set(LD_VERSION_MAJOR_MINOR "${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
-
-    message(STATUS "Linker Version: ${LD_VERSION_MAJOR_MINOR}")
-
-    # Compare the version with 1053.12
-    if(LD_VERSION_MAJOR_MINOR VERSION_GREATER_EQUAL "1053.12")
-        list(APPEND link_options "-Wl,-warn_commons")
-    endif()
-
-    list(APPEND link_options "-Wl,-dead_strip")
-else()
-    list(APPEND link_options "-Wl,--gc-sections")
-    list(APPEND link_options "-Wl,--warn-common")
-endif()
-
-# SMP FreeRTOS user provided minimal idle hook. This allows the user to provide
-# their own copy of vApplicationPassiveIdleHook()
-if(CONFIG_FREERTOS_USE_PASSIVE_IDLE_HOOK)
-    list(APPEND link_options "-Wl,--wrap=vApplicationPassiveIdleHook")
-endif()
-
-# Placing jump tables in flash would cause issues with code that required
-# to be placed in IRAM
-list(APPEND compile_options "-fno-jump-tables")
-if(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    # This flag is GCC-specific.
-    # Not clear yet if some other flag should be used for Clang.
-    list(APPEND compile_options "-fno-tree-switch-conversion")
-endif()
-
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-    list(APPEND compile_options "-fno-use-cxa-atexit")  # TODO IDF-10934
-else()
-    list(APPEND cxx_compile_options "-fuse-cxa-atexit")
-endif()
-
-if(COMPILER_RT_LIB_NAME)
-    list(APPEND link_options "-rtlib=${CONFIG_COMPILER_RT_LIB_NAME}")
-endif()
-
-
 idf_build_set_property(COMPILE_OPTIONS "${compile_options}" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "${c_compile_options}" APPEND)
 idf_build_set_property(CXX_COMPILE_OPTIONS "${cxx_compile_options}" APPEND)
-idf_build_set_property(ASM_COMPILE_OPTIONS "${asm_compile_options}" APPEND)
 idf_build_set_property(COMPILE_DEFINITIONS "${compile_definitions}" APPEND)
 idf_build_set_property(LINK_OPTIONS "${link_options}" APPEND)
 

COMPATIBILITY.md

@@ -1,147 +0,0 @@
-# Compatibility Between ESP-IDF Releases and Revisions of Espressif SoCs
-
-* [中文版](./COMPATIBILITY_CN.md)
-
-Espressif keeps improving the performance of its SoCs by providing new chip revisions. However, some of the improvements require special software support. Some of the software supports are even mandatory for the chip revisions to run normally.
-
-This document describes the compatibility between ESP-IDF releases and Espressif SoC revisions.
-
-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/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/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
-
-The sections below show the requirements to ESP-IDF version of chip revisions. Each chip revision corresponds to specific `Recommended` and `Required` versions of ESP-IDF:
-
-- `Recommended`: shows from which version of ESP-IDF you can make use of all the improvements of the chip revision. Running binary compiled with ESP-IDF below the `Recommended` version of a chip revision, software may not benefit from the bugfix/features provided by the chip revision. The chip will have almost the same behavior as its previous revision.
-
-- `Required`: shows the minimum version required to run the chip revision normally. Running binary compiled below the `Required` version, the binary may have unpredictable behavior.
-
-Though the software can make use of all the features of a chip revision, if its version is higher than the `Recommended` version of the chip, it is still recommended to use the latest bugfix version of the release branch. The latest bugfix version fixes a number of issues and helps improve product stability.
-
-For example, if we have a chip, whose `Required`/`Recommended` version of `release/v5.1` branch is `v5.1.2`/`v5.1.4`, and the latest release on that branch is `v5.1.6`. Then the chip will not boot up with ESP-IDF `v5.1`-`v5.1.1` or will have unpredictable behavior, and application may not make use of all benefits of the chip, when running with ESP-IDF `v5.1.2` or `v5.1.3`. Though `v5.1.4` well supports the chip revision, it is still recommended to upgrade ESP-IDF to `v5.1.6`.
-
-### ESP32
-
-#### v0.0, v1.0, v3.0
-
-Supported since initial version of ESP-IDF.
-
-#### v1.1
-
-To be added.
-
-#### v2.0
-
-To be added.
-
-#### v3.1
-
-To be added.
-
-### ESP32-S2
-
-#### v0.0
-
-Supported since ESP-IDF v4.2.
-
-#### v1.0
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v4.2           | v4.2.3+     | v4.2     |
-| release/v4.3           | v4.3.3+     | v4.3     |
-| release/v4.4           | v4.4.6+     | v4.4     |
-| release/v5.0           | v5.0.4+     | v5.0     |
-| release/v5.1           | v5.1.2+     | v5.1     |
-| release/v5.2 and above | v5.2+       | v5.2     |
-
-### ESP32-C3
-
-#### v0.2 - v0.4
-
-Supported since ESP-IDF v4.3.
-
-#### v1.1
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v4.2           | EOL         | EOL      |
-| release/v4.3           | v4.3.7+     | v4.3.7   |
-| release/v4.4           | v4.4.7+     | v4.4.7   |
-| release/v5.0           | v5.0.5+     | v5.0.5   |
-| release/v5.1           | v5.1.3+     | v5.1.3   |
-| release/v5.2 and above | v5.2+       | v5.2     |
-
-### ESP32-S3
-
-#### v0.1, v0.2
-
-Supported since ESP-IDF v4.4.
-
-### ESP32-C2 & ESP8684
-
-#### v1.0, v1.1
-
-Supported since ESP-IDF v5.0.
-
-#### v1.2
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v5.0           | v5.0.7+     | v5.0     |
-| release/v5.1           | v5.1.4+     | v5.1     |
-| release/v5.2           | v5.2.2+     | v5.2     |
-| release/v5.3 and above | v5.3+       | v5.3     |
-
-#### v2.0
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v5.0           | v5.0.8+     | v5.0.8   |
-| release/v5.1           | v5.1.5+     | v5.1.5*  |
-| release/v5.2           | v5.2.4+     | v5.2.4   |
-| release/v5.3           | v5.3.2+     | v5.3.2*  |
-| release/v5.4 and above | v5.4+       | v5.4     |
-
-Note: IDF v5.1.5 and v5.3.2 are compatible with C2 v2.0. However the chip revision check hasn't been updated on these releases. Enable `ESP32C2_REV2_DEVELOPMENT` config to bypass the outdated check.
-
-### ESP32-C6
-
-#### v0.0, v0.1
-
-Supported since ESP-IDF v5.1.
-
-#### v0.2
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v5.1           | v5.1.5+     | v5.1     |
-| release/v5.2           | v5.2.4+     | v5.2     |
-| release/v5.3           | v5.3.2+     | v5.3     |
-| release/v5.4 and above | v5.4+       | v5.4     |
-
-### ESP32-H2
-
-#### v0.1, v0.2
-
-Supported since ESP-IDF v5.1.
-
-#### v1.2
-
-| Release branch         | Recommended | Required |
-|------------------------|-------------|----------|
-| release/v5.1           | v5.1.6+     | v5.1.6   |
-| release/v5.2           | v5.2.5+     | v5.2.5   |
-| release/v5.3           | v5.3.3+     | v5.3.3   |
-| release/v5.4           | v5.4.1+     | v5.4.1   |
-| release/v5.5 and above | v5.5+       | v5.5     |
-
-## What If the ESP-IDF Version Is Lower than the `Required` Version?
-
-Latest ESP-IDF versions can prevent from downloading to, or even execute binaries on unsupported chips. ESP-IDF of versions v4.4.5+, v5.0.1+, v5.1 and above have both esptool download check and bootloader loading check against the chip revision. While ESP-IDF v4.3.5 has only esptool downloading check.
-
-For earlier ESP-IDF versions without such checking, which is incompatible with the given chip revision, the chips running such versions will have unpredictable behavior.

COMPATIBILITY_CN.md

@@ -1,148 +0,0 @@
-# ESP-IDF 版本与乐鑫芯片版本兼容性
-
-* [English Version](./COMPATIBILITY.md)
-
-为不断提高芯片性能，乐鑫会为其芯片发布新版本。但新芯片版本中的某些性能提升依赖特殊的软件支持，有时候新芯片版本必须在一定的软件版本下才能正常运行。
-
-本文档介绍了具体 ESP-IDF 版本与乐鑫芯片版本之间的兼容性情况。
-
-注意：各分支上的兼容性文档可能不是最新版本，请参考 [master 分支上的兼容性文件](https://github.com/espressif/esp-idf/blob/master/COMPATIBILITY_CN.md) 以获取最新信息。
-
-有关乐鑫芯片版本的编码方式，请参考 [关于芯片版本 (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 版本。
-
-## ESP-IDF 对各芯片版本的支持
-
-下文介绍了 ESP-IDF 对各芯片版本的支持情况，每个芯片版本都有对应的 ESP-IDF `推荐版本` 和 `需求版本`：
-
-- `推荐版本`：表示从该版本的 ESP-IDF 开始，软件可以利用芯片版本提升的性能。如果在该芯片版本上运行低于 `推荐版本` 的 ESP-IDF 来编译二进制文件，软件可能无法利用该芯片版本修复的错误或新增的功能，芯片行为将与其上一版本几乎相同。
-
-- `需求版本`：表示该芯片版本正常运行所需的最低 ESP-IDF 版本。如果在该芯片版本上运行低于 `需求版本` 的 ESP-IDF 来编译二进制文件，可能会出现不可预测的芯片行为。
-
-即便使用的软件版本已高于该芯片版本的对应 `推荐版本`，软件已经能够利用该芯片版本的所有功能，我们仍建议用户升级到该发布分支的最新 bugfix 版本。新的 bugfix 版本修复了一些问题，有助于提升产品稳定性。
-
-例如，对于某一芯片版本，其 `release/v5.1` 分支的 `需求版本` 和 `推荐版本` 分别是 `v5.1.2` 和 `v5.1.4`，而该分支的最新版本是 `v5.1.6`。那么，在使用 ESP-IDF `v5.1` - `v5.1.1` 时，芯片将无法启动，或会出现不可预测的行为，而在使用 ESP-IDF `v5.1.2` 或 `v5.1.3` 时，应用程序可能无法使用芯片的部分性能。此外，虽然 `v5.1.4` 已支持该芯片版本，但仍建议将 ESP-IDF 升级到 `v5.1.6`。
-
-### ESP32
-
-#### v0.0、v1.0 和 v3.0
-
-从最初版本的 ESP-IDF 开始支持。
-
-#### v1.1
-
-待更新。
-
-#### v2.0
-
-待更新。
-
-#### v3.1
-
-待更新。
-
-### ESP32-S2
-
-#### v0.0
-
-从 ESP-IDF v4.2 开始支持。
-
-#### v1.0
-
-| 发布分支                | 推荐版本     | 需求版本 |
-|------------------------|-------------|----------|
-| release/v4.2           | v4.2.3+     | v4.2     |
-| release/v4.3           | v4.3.3+     | v4.3     |
-| release/v4.4           | v4.4.6+     | v4.4     |
-| release/v5.0           | v5.0.4+     | v5.0     |
-| release/v5.1           | v5.1.2+     | v5.1     |
-| release/v5.2 及以上     | v5.2+       | v5.2     |
-
-### ESP32-C3
-
-#### v0.2 - v0.4
-
-从 ESP-IDF v4.3 开始支持。
-
-#### v1.1
-
-| 发布分支                | 推荐版本      | 需求版本  |
-|------------------------|-------------|----------|
-| release/v4.2           | EOL         | EOL      |
-| release/v4.3           | v4.3.7+     | v4.3.7   |
-| release/v4.4           | v4.4.7+     | v4.4.7   |
-| release/v5.0           | v5.0.5+     | v5.0.5   |
-| release/v5.1           | v5.1.3+     | v5.1.3   |
-| release/v5.2 及以上     | v5.2+       | v5.2     |
-
-### ESP32-S3
-
-#### v0.1, v0.2
-
-从 ESP-IDF v4.4 开始支持。
-
-### ESP32-C2 & ESP8684
-
-#### v1.0, v1.1
-
-从 ESP-IDF v5.0 开始支持。
-
-#### v1.2
-
-| 发布分支                | 推荐版本      | 需求版本  |
-|------------------------|-------------|----------|
-| release/v5.0           | v5.0.7+     | v5.0     |
-| release/v5.1           | v5.1.4+     | v5.1     |
-| release/v5.2           | v5.2.2+     | v5.1     |
-| release/v5.3 及以上     | v5.3+       | v5.3     |
-
-#### v2.0
-
-| 发布分支                | 推荐版本      | 需求版本  |
-|------------------------|-------------|----------|
-| release/v5.0           | v5.0.8+     | v5.0.8   |
-| release/v5.1           | v5.1.5+     | v5.1.5*  |
-| release/v5.2           | v5.2.4+     | v5.2.4   |
-| release/v5.3           | v5.3.2+     | v5.3.2*  |
-| release/v5.4 及以上     | v5.4+       | v5.4     |
-
-提示: IDF v5.1.5 及 v5.3.2 与 C2 v2.0 兼容，但芯片版本检查尚未在这些发布版本更新。使能 `ESP32C2_REV2_DEVELOPMENT` 选项来跳过这些过时的检查。
-
-### ESP32-C6
-
-#### v0.0, v0.1
-
-从 ESP-IDF v5.1 开始支持。
-
-#### v0.2
-
-| 发布分支                | 推荐版本      | 需求版本  |
-|------------------------|-------------|----------|
-| release/v5.1           | v5.1.5+     | v5.1     |
-| release/v5.2           | v5.2.4+     | v5.2     |
-| release/v5.3           | v5.3.2+     | v5.3     |
-| release/v5.4 及以上     | v5.4+       | v5.4     |
-
-### ESP32-H2
-
-#### v0.1, v0.2
-
-从 ESP-IDF v5.1 开始支持。
-
-#### v1.2
-
-| 发布分支                | 推荐版本      | 需求版本  |
-|------------------------|-------------|----------|
-| release/v5.1           | v5.1.6+     | v5.1.6   |
-| release/v5.2           | v5.2.5+     | v5.2.5   |
-| release/v5.3           | v5.3.3+     | v5.3.3   |
-| release/v5.4           | v5.4.1+     | v5.4.1   |
-| release/v5.5 及以上     | v5.5+       | v5.5     |
-
-
-## 如果 ESP-IDF 版本低于 `需求版本` 会出现什么情况？
-
-使用最新的 ESP-IDF 版本时，软件会阻止下载二进制文件到不支持的芯片版本上，甚至可以防止二进制文件在不支持的芯片版本上被执行。v4.4.5+、v5.0.1+、v5.1 及以上版本的 ESP-IDF 都支持针对芯片版本的 esptool 下载检查和引导加载器加载检查，但 ESP-IDF v4.3.5 只支持 esptool 下载检查。
-
-更早的 ESP-IDF 版本没有此类检查，若与芯片版本不兼容，芯片运行软件时可能会出现不可预测的行为。

CONTRIBUTING.md

@@ -1,6 +0,0 @@
-# Contributing to ESP-IDF
-
-Contributions to ESP-IDF - fixing bugs, adding features, adding documentation - are welcome! We accept contributions via Github Pull Requests.
-
-Please see the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/index.html) for more information.
-

CONTRIBUTING.rst

@@ -0,0 +1,62 @@
+Contributions Guide
+===================
+
+We welcome contributions to the esp-idf project!
+
+How to Contribute
+-----------------
+
+Contributions to esp-idf - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests>`_.
+
+Before Contributing
+-------------------
+
+Before sending us a Pull Request, please consider this list of points:
+
+* Is the contribution entirely your own work, or already licensed under an Apache License 2.0 compatible Open Source License? If not then we unfortunately cannot accept it.
+
+* Does any new code conform to the esp-idf :doc:`Style Guide <style-guide>`?
+
+* Have you installed the :doc:`pre-commit hook <install-pre-commit-hook>` for esp-idf project?
+
+* Does the code documentation follow requirements in :doc:`documenting-code`?
+
+* Is the code adequately commented for people to understand how it is structured?
+
+* Is there documentation or examples that go with code contributions? There are additional suggestions for writing good examples in :idf:`examples` readme.
+
+* Are comments and documentation written in clear English, with no spelling or grammar errors?
+
+* Example contributions are also welcome. Please check the :doc:`creating-examples` guide for these.
+
+* If the contribution contains multiple commits, are they grouped together into logical changes (one major change per pull request)? Are any commits with names like "fixed typo" `squashed into previous commits <https://eli.thegreenplace.net/2014/02/19/squashing-github-pull-requests-into-a-single-commit/>`_?
+
+* If you're unsure about any of these points, please open the Pull Request anyhow and then ask us for feedback.
+
+Pull Request Process
+--------------------
+
+After you open the Pull Request, there will probably be some discussion in the comments field of the request itself.
+
+Once the Pull Request is ready to merge, it will first be merged into our internal git system for in-house automated testing.
+
+If this process passes, it will be merged onto the public github repository.
+
+Legal Part
+----------
+
+Before a contribution can be accepted, you will need to sign our :doc:`contributor-agreement`. You will be prompted for this automatically as part of the Pull Request process.
+
+Related Documents
+-----------------
+
+.. toctree::
+    :maxdepth: 1
+
+    style-guide
+    install-pre-commit-hook
+    documenting-code
+    add-ons-reference
+    creating-examples
+    ../api-reference/template
+    contributor-agreement

Kconfig

@@ -1,56 +1,17 @@
 #
-# Please run the following command for opening a page with more information about this configuration file:
-# idf.py docs -sp api-reference/kconfig.html
+# For a description of the syntax of this configuration file,
+# see kconfig/kconfig-language.txt.
 #
 mainmenu "Espressif IoT Development Framework Configuration"
 
-    orsource "./components/soc/$IDF_TARGET/include/soc/Kconfig.soc_caps.in"
-
     config IDF_CMAKE
         bool
-        default "y"
+        option env="IDF_CMAKE"
 
     config IDF_ENV_FPGA
+        # This option is for internal use only
         bool
         option env="IDF_ENV_FPGA"
-        help
-            - This option is for internal use only.
-            - Enabling this option will help enable all FPGA support so as to
-              run ESP-IDF on an FPGA. This can help reproduce some issues that
-              only happens on FPGA condition, or when you have to burn some
-              efuses multiple times.
-
-    config IDF_ENV_BRINGUP
-        bool
-        help
-            - This option is ONLY used when doing new chip bringup.
-            - This option will only enable necessary hw / sw settings for running
-              a hello_world application.
-
-
-    config IDF_CI_BUILD
-        bool
-        default y if "$(IDF_CI_BUILD)" = "y" || "$(IDF_CI_BUILD)" = 1
-
-    config IDF_DOC_BUILD
-        bool
-        default y if "$(IDF_DOC_BUILD)" = "y" || "$(IDF_DOC_BUILD)" = 1
-
-    config IDF_TOOLCHAIN
-        # This option records the IDF target when sdkconfig is generated the first time.
-        # It is not updated if environment variable $IDF_TOOLCHAIN changes later, and
-        # the build system is responsible for detecting the mismatch between
-        # CONFIG_IDF_TOOLCHAIN and $IDF_TOOLCHAIN.
-        string
-        default "$IDF_TOOLCHAIN"
-
-    config IDF_TOOLCHAIN_CLANG
-        bool
-        default "y" if IDF_TOOLCHAIN="clang"
-
-    config IDF_TOOLCHAIN_GCC
-        bool
-        default "y" if IDF_TOOLCHAIN="gcc"
 
     config IDF_TARGET_ARCH_RISCV
         bool
@@ -60,11 +21,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         bool
         default "n"
 
-    config IDF_TARGET_ARCH
-        string
-        default "riscv" if IDF_TARGET_ARCH_RISCV
-        default "xtensa" if IDF_TARGET_ARCH_XTENSA
-
     config IDF_TARGET
         # This option records the IDF target when sdkconfig is generated the first time.
         # It is not updated if environment variable $IDF_TARGET changes later, and
@@ -73,12 +29,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         string
         default "$IDF_TARGET"
 
-    config IDF_INIT_VERSION
-        # This option records the IDF version when sdkconfig is generated the first time.
-        # It is not updated if environment variable $IDF_VERSION changes later
-        string
-        default "$IDF_INIT_VERSION"
-
     config IDF_TARGET_ESP32
         bool
         default "y" if IDF_TARGET="esp32"
@@ -95,81 +45,85 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default "y" if IDF_TARGET="esp32s3"
         select IDF_TARGET_ARCH_XTENSA
 
+    choice IDF_TARGET_ESP32S3_BETA_VERSION
+        prompt "ESP32-S3 beta version"
+        depends on IDF_TARGET_ESP32S3
+        default IDF_TARGET_ESP32S3_BETA_VERSION_2
+        help
+            Currently ESP32-S3 has several beta versions for internal use only.
+            Select the one that matches your chip model.
+
+        config IDF_TARGET_ESP32S3_BETA_VERSION_2
+            bool
+            prompt "ESP32-S3 beta2"
+    endchoice
+
     config IDF_TARGET_ESP32C3
         bool
         default "y" if IDF_TARGET="esp32c3"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
 
-    config IDF_TARGET_ESP32C2
-        bool
-        default "y" if IDF_TARGET="esp32c2"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32C6
-        bool
-        default "y" if IDF_TARGET="esp32c6"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32C5
-        bool
-        default "y" if IDF_TARGET="esp32c5"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32P4
-        bool
-        default "y" if IDF_TARGET="esp32p4"
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32H2
-        bool
-        default "y" if IDF_TARGET="esp32h2"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32C61
-        bool
-        default "y" if IDF_TARGET="esp32c61"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32H21
-        bool
-        default "y" if IDF_TARGET="esp32h21"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-        select IDF_ENV_BRINGUP
-
-    config IDF_TARGET_ESP32H4
-        bool
-        default "y" if IDF_TARGET="esp32h4"
-        select IDF_TARGET_ARCH_RISCV
-        select IDF_ENV_FPGA
-        select IDF_ENV_BRINGUP
-
-    config IDF_TARGET_LINUX
-        bool
-        default "y" if IDF_TARGET="linux"
-
     config IDF_FIRMWARE_CHIP_ID
         hex
         default 0x0000 if IDF_TARGET_ESP32
         default 0x0002 if IDF_TARGET_ESP32S2
+        default 0x0004 if IDF_TARGET_ESP32S3
         default 0x0005 if IDF_TARGET_ESP32C3
-        default 0x0009 if IDF_TARGET_ESP32S3
-        default 0x000C if IDF_TARGET_ESP32C2
-        default 0x000D if IDF_TARGET_ESP32C6
-        default 0x0010 if IDF_TARGET_ESP32H2
-        default 0x0012 if IDF_TARGET_ESP32P4
-        default 0x0017 if IDF_TARGET_ESP32C5
-        default 0x0014 if IDF_TARGET_ESP32C61
-        default 0x0019 if IDF_TARGET_ESP32H21
-        default 0x001C if IDF_TARGET_ESP32H4
         default 0xFFFF
 
+    menu "SDK tool configuration"
+        config SDK_TOOLPREFIX
+            string "Compiler toolchain path/prefix"
+            default "xtensa-esp32-elf-" if IDF_TARGET_ESP32
+            default "xtensa-esp32s2-elf-" if IDF_TARGET_ESP32S2
+            default "xtensa-esp32s3-elf-" if IDF_TARGET_ESP32S3
+            default "riscv32-esp-elf-" if IDF_TARGET_ESP32C3
+
+            help
+                The prefix/path that is used to call the toolchain. The default setting assumes
+                a crosstool-ng gcc setup that is in your PATH.
+
+        config SDK_PYTHON
+            string "Python interpreter"
+            depends on !IDF_CMAKE
+            default "python"
+            help
+                The executable name/path that is used to run python.
+
+                (Note: This option is used with the legacy GNU Make build system only.)
+
+        config SDK_MAKE_WARN_UNDEFINED_VARIABLES
+            bool "'make' warns on undefined variables"
+            depends on !IDF_CMAKE
+            default "y"
+            help
+                Adds --warn-undefined-variables to MAKEFLAGS. This causes make to
+                print a warning any time an undefined variable is referenced.
+
+                This option helps find places where a variable reference is misspelled
+                or otherwise missing, but it can be unwanted if you have Makefiles which
+                depend on undefined variables expanding to an empty string.
+
+                (Note: this option is used with the legacy GNU Make build system only.)
+
+        config SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
+            bool "Toolchain supports time_t wide 64-bits"
+            default n
+            help
+                Enable this option in case you have a custom toolchain which supports time_t wide 64-bits.
+                This option checks time_t is 64-bits and disables ROM time functions
+                to use the time functions from the toolchain instead.
+                This option allows resolving the Y2K38 problem.
+                See "Setup Linux Toolchain from Scratch" to build
+                a custom toolchain which supports 64-bits time_t.
+
+                Note: ESP-IDF does not currently come with any pre-compiled toolchain
+                that supports 64-bit wide time_t.
+                This will change in a future major release,
+                but currently 64-bit time_t requires a custom built toolchain.
+
+    endmenu  # SDK tool configuration
 
     menu "Build type"
 
@@ -186,15 +140,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 Another option, useful for only very small and limited applications, is to only link
                 the .elf file of the application, such that it can be loaded directly into RAM over
-                JTAG or UART. Note that since IRAM and DRAM sizes are very limited, it is not possible
-                to build any complex application this way. However for some kinds of testing and debugging,
+                JTAG. Note that since IRAM and DRAM sizes are very limited, it is not possible to
+                build any complex application this way. However for kinds of testing and debugging,
                 this option may provide faster iterations, since the application does not need to be
                 written into flash.
-
-                Note: when APP_BUILD_TYPE_RAM is selected and loaded with JTAG, ESP-IDF does not contain
-                all the startup code required to initialize the CPUs and ROM memory (data/bss).
-                Therefore it is necessary to execute a bit of ROM code prior to executing the application.
-                A gdbinit file may look as follows (for ESP32):
+                Note that at the moment, ESP-IDF does not contain all the startup code required to
+                initialize the CPUs and ROM memory (data/bss). Therefore it is necessary to execute
+                a bit of ROM code prior to executing the application. A gdbinit file may look as follows (for ESP32):
 
                     # Connect to a running instance of OpenOCD
                     target remote :3333
@@ -216,18 +168,11 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 Example gdbinit files for other targets can be found in tools/test_apps/system/gdb_loadable_elf/
 
-                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.
-
-                Example:
-                    esptool.py --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
+                CONFIG_APP_BUILD_TYPE_ELF_RAM is required, other options help reduce application
                 memory footprint.
 
-                    CONFIG_APP_BUILD_TYPE_RAM=y
+                    CONFIG_APP_BUILD_TYPE_ELF_RAM=y
                     CONFIG_VFS_SUPPORT_TERMIOS=
                     CONFIG_NEWLIB_NANO_FORMAT=y
                     CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
@@ -238,16 +183,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
             config APP_BUILD_TYPE_APP_2NDBOOT
                 bool
                 prompt "Default (binary application + 2nd stage bootloader)"
-                depends on !IDF_TARGET_LINUX
                 select APP_BUILD_GENERATE_BINARIES
                 select APP_BUILD_BOOTLOADER
                 select APP_BUILD_USE_FLASH_SECTIONS
 
-            config APP_BUILD_TYPE_RAM
+            config APP_BUILD_TYPE_ELF_RAM
                 bool
-                prompt "Build app runs entirely in RAM (EXPERIMENTAL)"
-                select APP_BUILD_GENERATE_BINARIES
-
+                prompt "ELF file, loadable into RAM (EXPERIMENTAL))"
         endchoice # APP_BUILD_TYPE
 
         # Hidden options, set according to the choice above
@@ -257,76 +199,9 @@ mainmenu "Espressif IoT Development Framework Configuration"
         config APP_BUILD_BOOTLOADER
             bool # Whether to build the bootloader
 
-        config APP_BUILD_TYPE_PURE_RAM_APP
-            bool
-            prompt "Build app without SPI_FLASH/PSRAM support (saves ram)"
-            depends on APP_BUILD_TYPE_RAM
-            help
-                If this option is enabled, external memory and related peripherals, such as Cache, MMU,
-                Flash and PSRAM, won't be initialized. Corresponding drivers won't be introduced either.
-                Components that depend on the spi_flash component will also be unavailable, such as
-                app_update, etc. When this option is enabled, about 26KB of RAM space can be saved.
-
         config APP_BUILD_USE_FLASH_SECTIONS
             bool # Whether to place code/data into memory-mapped flash sections
 
-        config APP_REPRODUCIBLE_BUILD
-            bool "Enable reproducible build"
-            default n
-            select COMPILER_HIDE_PATHS_MACROS
-            help
-                If enabled, all date, time, and path information would be eliminated. A .gdbinit file would be create
-                automatically. (or will be append if you have one already)
-
-        config APP_NO_BLOBS
-            bool "No Binary Blobs"
-            default n
-            help
-                If enabled, this disables the linking of binary libraries in the application build. Note
-                that after enabling this Wi-Fi/Bluetooth will not work.
-
-        config APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS
-            bool "App compatible with bootloaders before ESP-IDF v2.1"
-            select APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS
-            depends on IDF_TARGET_ESP32
-            default n
-            help
-                Bootloaders before ESP-IDF v2.1 did less initialisation of the
-                system clock. This setting needs to be enabled to build an app
-                which can be booted by these older bootloaders.
-
-                If this setting is enabled, the app can be booted by any bootloader
-                from IDF v1.0 up to the current version.
-
-                If this setting is disabled, the app can only be booted by bootloaders
-                from IDF v2.1 or newer.
-
-                Enabling this setting adds approximately 1KB to the app's IRAM usage.
-
-        config APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS
-            bool "App compatible with bootloader and partition table before ESP-IDF v3.1"
-            depends on IDF_TARGET_ESP32
-            default n
-            help
-                Partition tables before ESP-IDF V3.1 do not contain an MD5 checksum
-                field, and the bootloader before ESP-IDF v3.1 cannot read a partition
-                table that contains an MD5 checksum field.
-
-                Enable this option only if your app needs to boot on a bootloader and/or
-                partition table that was generated from a version *before* ESP-IDF v3.1.
-
-                If this option and Flash Encryption are enabled at the same time, and any
-                data partitions in the partition table are marked Encrypted, then the
-                partition encrypted flag should be manually verified in the app before accessing
-                the partition (see CVE-2021-27926).
-
-        config APP_INIT_CLK
-            bool
-            depends on IDF_TARGET_ESP32
-            default y if APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS
-            default y if APP_BUILD_TYPE_RAM
-
-
     endmenu # Build type
 
     source "$COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE"
@@ -335,12 +210,12 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         choice COMPILER_OPTIMIZATION
             prompt "Optimization Level"
-            default COMPILER_OPTIMIZATION_DEBUG
+            default COMPILER_OPTIMIZATION_DEFAULT
             help
                 This option sets compiler optimization level (gcc -O argument) for the app.
 
-                - The "Debug" setting will add the -Og flag to CFLAGS.
-                - The "Size" setting will add the -Os flag to CFLAGS (-Oz with Clang).
+                - The "Default" setting will add the -0g flag to CFLAGS.
+                - The "Size" setting will add the -0s flag to CFLAGS.
                 - The "Performance" setting will add the -O2 flag to CFLAGS.
                 - The "None" setting will add the -O0 flag to CFLAGS.
 
@@ -358,10 +233,10 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 Compiler optimization for the IDF bootloader is set separately,
                 see the BOOTLOADER_COMPILER_OPTIMIZATION setting.
 
-            config COMPILER_OPTIMIZATION_DEBUG
+            config COMPILER_OPTIMIZATION_DEFAULT
                 bool "Debug (-Og)"
             config COMPILER_OPTIMIZATION_SIZE
-                bool "Optimize for size (-Os with GCC, -Oz with Clang)"
+                bool "Optimize for size (-Os)"
             config COMPILER_OPTIMIZATION_PERF
                 bool "Optimize for performance (-O2)"
             config COMPILER_OPTIMIZATION_NONE
@@ -404,72 +279,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         endchoice # assertions
 
-        config COMPILER_ASSERT_NDEBUG_EVALUATE
-            bool "Enable the evaluation of the expression inside assert(X) when NDEBUG is set"
-            default y
-            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
-                the result will never cause an assertion. This means that if X is a function
-                then the function will be called.
-
-                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
-            default COMPILER_FLOAT_LIB_FROM_GCCLIB
-            help
-                In the soft-fp part of libgcc, riscv version is written in C,
-                and handles all edge cases in IEEE754, which makes it larger
-                and performance is slow.
-
-                RVfplib is an optimized RISC-V library for FP arithmetic on 32-bit
-                integer processors, for single and double-precision FP.
-                RVfplib is "fast", but it has a few exceptions from IEEE 754 compliance.
-
-            config COMPILER_FLOAT_LIB_FROM_GCCLIB
-                bool "libgcc"
-            config COMPILER_FLOAT_LIB_FROM_RVFPLIB
-                depends on ESP_ROM_HAS_RVFPLIB
-                bool "librvfp"
-        endchoice # COMPILER_FLOAT_LIB_FROM
-
-        config COMPILER_OPTIMIZATION_ASSERTION_LEVEL
-            int
-            default 0 if COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE
-            default 1 if COMPILER_OPTIMIZATION_ASSERTIONS_SILENT
-            default 2 if COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE
-
-        config COMPILER_OPTIMIZATION_CHECKS_SILENT
-            bool "Disable messages in ESP_RETURN_ON_* and ESP_EXIT_ON_* macros"
-            default n
-            help
-                If enabled, the error messages will be discarded in following check macros:
-                - ESP_RETURN_ON_ERROR
-                - ESP_EXIT_ON_ERROR
-                - ESP_RETURN_ON_FALSE
-                - ESP_EXIT_ON_FALSE
-
-        menuconfig COMPILER_HIDE_PATHS_MACROS
-            bool "Replace ESP-IDF and project paths in binaries"
-            default y
-            help
-                When expanding the __FILE__ and __BASE_FILE__ macros, replace paths inside ESP-IDF
-                with paths relative to the placeholder string "IDF", and convert paths inside the
-                project directory to relative paths.
-
-                This allows building the project with assertions or other code that embeds file paths,
-                without the binary containing the exact path to the IDF or project directories.
-
-                This option passes -fmacro-prefix-map options to the GCC command line. To replace additional
-                paths in your binaries, modify the project CMakeLists.txt file to pass custom -fmacro-prefix-map or
-                -ffile-prefix-map arguments.
-
         menuconfig COMPILER_CXX_EXCEPTIONS
             bool "Enable C++ exceptions"
             default n
@@ -522,7 +331,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 - coverage: NORMAL < STRONG < OVERALL
 
-                The performance impact includes increasing the amount of stack memory required for each task.
 
             config COMPILER_STACK_CHECK_MODE_NONE
                 bool "None"
@@ -540,15 +348,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
             help
                 Stack smashing protection.
 
-        config COMPILER_NO_MERGE_CONSTANTS
-            bool "Disable merging const sections"
-            depends on IDF_TOOLCHAIN_GCC
-            help
-                Disable merging identical constants (string/floating-point) across compilation units.
-                This helps in better size analysis of the application binary as the rodata section
-                distribution is more uniform across libraries. On downside, it may increase
-                the binary size and hence should be used during development phase only.
-
         config COMPILER_WARN_WRITE_STRINGS
             bool "Enable -Wwrite-strings warning flag"
             default "n"
@@ -563,52 +362,12 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 For C++, this warns about the deprecated conversion from string
                 literals to ``char *``.
 
-        config COMPILER_SAVE_RESTORE_LIBCALLS
-            bool "Enable -msave-restore flag to reduce code size"
-            depends on IDF_TARGET_ARCH_RISCV
-            help
-                Adds -msave-restore to C/C++ compilation flags.
-
-                When this flag is enabled, compiler will call library functions to
-                save/restore registers in function prologues/epilogues. This results
-                in lower overall code size, at the expense of slightly reduced performance.
-
-                This option can be enabled for RISC-V targets only.
-
-        config COMPILER_DISABLE_DEFAULT_ERRORS
-            bool "Disable errors for default warnings"
-            default "y"
-            help
-                Enable this option if you do not want default warnings to be considered as errors,
-                especially when updating IDF.
-
-                This is a temporary flag that could help to allow upgrade while having
-                some time to address the warnings raised by those default warnings.
-                Alternatives are:
-                1) fix code (preferred),
-                2) remove specific warnings,
-                3) do not consider specific warnings as error.
-
-        config COMPILER_DISABLE_GCC12_WARNINGS
-            bool "Disable new warnings introduced in GCC 12"
+        config COMPILER_DISABLE_GCC8_WARNINGS
+            bool "Disable new warnings introduced in GCC 6 - 8"
             default "n"
             help
-                Enable this option if use GCC 12 or newer, and want to disable warnings which don't appear with
-                GCC 11.
-
-        config COMPILER_DISABLE_GCC13_WARNINGS
-            bool "Disable new warnings introduced in GCC 13"
-            default "n"
-            help
-                Enable this option if use GCC 13 or newer, and want to disable warnings which don't appear with
-                GCC 12.
-
-        config COMPILER_DISABLE_GCC14_WARNINGS
-            bool "Disable new warnings introduced in GCC 14"
-            default "n"
-            help
-                Enable this option if use GCC 14 or newer, and want to disable warnings which don't appear with
-                GCC 13.
+                Enable this option if using GCC 6 or newer, and wanting to disable warnings which don't appear with
+                GCC 5.
 
         config COMPILER_DUMP_RTL_FILES
             bool "Dump RTL files during compilation"
@@ -616,96 +375,28 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 If enabled, RTL files will be produced during compilation. These files
                 can be used by other tools, for example to calculate call graphs.
 
-        choice COMPILER_RT_LIB
-            prompt "Compiler runtime library"
-            default COMPILER_RT_LIB_CLANGRT if IDF_TOOLCHAIN_CLANG
-            default COMPILER_RT_LIB_HOST if IDF_TARGET_LINUX
-            default COMPILER_RT_LIB_GCCLIB
-            help
-                Select runtime library to be used by compiler.
-                - GCC toolchain supports libgcc only.
-                - Clang allows to choose between libgcc or libclang_rt.
-                - For host builds ("linux" target), uses the default library.
-
-            config COMPILER_RT_LIB_GCCLIB
-                depends on !IDF_TARGET_LINUX
-                bool "libgcc"
-            config COMPILER_RT_LIB_CLANGRT
-                depends on IDF_TOOLCHAIN_CLANG && !IDF_TARGET_LINUX
-                bool "libclang_rt"
-            config COMPILER_RT_LIB_HOST
-                depends on IDF_TARGET_LINUX
-                bool "Host"
-        endchoice
-
-        config COMPILER_RT_LIB_NAME
-            string
-            default "clang_rt.builtins" if COMPILER_RT_LIB_CLANGRT
-            default "gcc" if COMPILER_RT_LIB_GCCLIB
-            default "" if COMPILER_RT_LIB_HOST
-
-        choice COMPILER_ORPHAN_SECTIONS
-            prompt "Orphan sections handling"
-            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
-                attribute such as code vs data, loadable vs non-loadable, etc.
-                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
-                    Places orphan sections with a warning message.
-
-            config COMPILER_ORPHAN_SECTIONS_PLACE
-                bool "Place silently"
-                help
-                    Places orphan sections without a warning/error message.
-        endchoice
-
-        config COMPILER_STATIC_ANALYZER
-            bool "Enable compiler static analyzer"
-            default "n"
-            depends on IDF_TOOLCHAIN_GCC
-            help
-                Enable compiler static analyzer. This may produce false-positive results and increases compile time.
 
     endmenu # Compiler Options
 
     menu "Component config"
-        comment "!!! MINIMAL_BUILD is enabled !!!"
-        depends on "${IDF_MINIMAL_BUILD}"
-        comment "Only common components and those transitively required by the main component are listed"
-        depends on "${IDF_MINIMAL_BUILD}"
-        comment "If a component configuration is missing, please add it to the main component's requirements"
-        depends on "${IDF_MINIMAL_BUILD}"
-
         source "$COMPONENT_KCONFIGS_SOURCE_FILE"
     endmenu
 
-    config IDF_EXPERIMENTAL_FEATURES
-        bool "Make experimental features visible"
-        default "n"
-        help
-            By enabling this option, ESP-IDF experimental feature options will be visible.
+    menu "Compatibility options"
+        config LEGACY_INCLUDE_COMMON_HEADERS
+            bool "Include headers across components as before IDF v4.0"
+            default n
+            help
+                Soc, esp32, and driver components, the most common
+                components. Some header of these components are included
+                implicitly by headers of other components before IDF v4.0.
+                It's not required for high-level components, but still
+                included through long header chain everywhere.
 
-            Note you should still enable a certain experimental feature option to use it, and you
-            should read the corresponding risk warning and known issue list carefully.
+                This is harmful to the modularity. So it's changed in IDF
+                v4.0.
 
-            Current experimental feature list:
+                You can still include these headers in a legacy way until it
+                is totally deprecated by enable this option.
 
-            - CONFIG_ESPTOOLPY_FLASHFREQ_120M && CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_DTR
-            - CONFIG_SPIRAM_SPEED_120M && CONFIG_SPIRAM_MODE_OCT
-            - CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH
-            - CONFIG_ESP_WIFI_EAP_TLS1_3
-            - CONFIG_ESP_WIFI_ENABLE_ROAMING_APP
-            - CONFIG_USB_HOST_EXT_PORT_RESET_ATTEMPTS
-            - CONFIG_LIBC_PICOLIBC
-            - CONFIG_GDMA_ENABLE_WEIGHTED_ARBITRATION
+    endmenu #Compatibility options

README.md

@@ -2,38 +2,7 @@
 
 * [中文版](./README_CN.md)
 
-ESP-IDF is the development framework for Espressif SoCs supported on Windows, Linux and macOS.
-
-# ESP-IDF Release Support Schedule
-
-![Support Schedule](https://dl.espressif.com/dl/esp-idf/support-periods.svg?v=1)
-
-- Please read [the support policy](SUPPORT_POLICY.md) and [the documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) for more information about ESP-IDF versions.
-- Please see the [End-of-Life Advisories](https://www.espressif.com/en/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817) for information about ESP-IDF releases with discontinued support.
-
-# ESP-IDF Release and SoC Compatibility
-
-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.0          |         v5.1           |         v5.2           |         v5.3           |          v5.4           |                                                                     |
-|:----------- | :---------------------:| :--------------------: | :--------------------: | :--------------------: |  :--------------------: |:------------------------------------------------------------------- |
-|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] |[Announcement](https://www.espressif.com/en/news/ESP32_C6)           |
-|ESP32-H2     |                        | ![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] |[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) |
-
-[supported]: https://img.shields.io/badge/-supported-green "supported"
-[preview]: https://img.shields.io/badge/-preview-orange "preview"
-
-There are variants of revisions for a series of chips. See [Compatibility Between ESP-IDF Releases and Revisions of Espressif SoCs](https://github.com/espressif/esp-idf/blob/master/COMPATIBILITY.md) for the details of the compatibility between ESP-IDF and chip revisions.
-
-Espressif SoCs released before 2016 (ESP8266 and ESP8285) are supported by [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK) instead.
+ESP-IDF is the development framework for Espressif SoCs (released after 2016<sup>[1](#fn1)</sup>) provided for Windows, Linux and macOS.
 
 # Developing With ESP-IDF
 
@@ -45,9 +14,11 @@ See https://idf.espressif.com/ for links to detailed instructions on how to set
 
 ### Non-GitHub forks
 
-ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub. If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
-
-The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete. If cloning ESP-IDF from GitHub, this step is not needed.
+ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub.
+If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script
+[tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
+The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete.
+If cloning ESP-IDF from GitHub, this step is not needed.
 
 ## Finding a Project
 
@@ -94,7 +65,7 @@ You don't need to run `idf.py build` before running `idf.py flash`, `idf.py flas
 
 ## Viewing Serial Output
 
-The `idf.py monitor` target uses the [esp-idf-monitor tool](https://github.com/espressif/esp-idf-monitor) to display serial output from Espressif SoCs. esp-idf-monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
+The `idf.py monitor` target uses the [idf_monitor tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html) to display serial output from Espressif SoCs. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
 
 Exit the monitor by typing Ctrl-].
 
@@ -115,18 +86,21 @@ After the initial flash, you may just want to build and flash just your app, not
 
 ## Erasing Flash
 
-The `idf.py flash` target does not erase the entire flash contents. However it is sometimes useful to set the device back to a totally erased state, particularly when making partition table changes or OTA app updates. To erase the entire flash, run `idf.py erase-flash`.
+The `idf.py flash` target does not erase the entire flash contents. However it is sometimes useful to set the device back to a totally erased state, particularly when making partition table changes or OTA app updates. To erase the entire flash, run `idf.py erase_flash`.
 
-This can be combined with other targets, ie `idf.py -p PORT erase-flash flash` will erase everything and then re-flash the new app, bootloader and partition table.
+This can be combined with other targets, ie `idf.py -p PORT erase_flash flash` will erase everything and then re-flash the new app, bootloader and partition table.
 
 # Resources
 
 * Documentation for the latest version: https://docs.espressif.com/projects/esp-idf/. This documentation is built from the [docs directory](docs) of this repository.
 
-* [Beginner's Guide to Key Concepts and Resources of ESP-IDF](https://youtu.be/J8zc8mMNKtc?feature=shared)
-
 * The [esp32.com forum](https://esp32.com/) is a place to ask questions and find community resources.
 
 * [Check the Issues section on github](https://github.com/espressif/esp-idf/issues) if you find a bug or have a feature request. Please check existing Issues before opening a new one.
 
 * If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/contribute/index.html).
+
+
+________
+
+<a name="fn1">1</a>: ESP8266 and ESP8285 are not supported in ESP-IDF. See [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK) instead.

README_CN.md

@@ -2,52 +2,23 @@
 
 * [English Version](./README.md)
 
-ESP-IDF 是乐鑫官方推出的物联网开发框架，支持 Windows、Linux 和 macOS 操作系统。
-
-# ESP-IDF 版本支持期限
-
-![支持期限](https://dl.espressif.com/dl/esp-idf/support-periods.svg?v=1)
-
-- 请参考 [ESP-IDF 支持政策](SUPPORT_POLICY_CN.md) 以及 [相关文档](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html) 了解更多关于 ESP-IDF 版本的信息。
-- 请参考 [ESP-IDF 版本停止维护 (EOL) 公告](https://www.espressif.com/zh-hans/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817)。
-
-# ESP-IDF 与乐鑫芯片
-
-下表总结了乐鑫芯片在 ESP-IDF 各版本中的支持状态，其中 ![alt text][supported] 代表已支持，![alt text][preview] 代表目前处于预览支持状态。预览支持状态通常有时间限制，而且仅适用于测试版芯片。请确保使用与芯片相匹配的 ESP-IDF 版本。
-
-|芯片         |          v5.0          |          v5.1          |          v5.2          |          v5.3          |          v5.4          |                                                                           |
-|:----------- | :---------------------:| :--------------------: | :--------------------: | :--------------------: | :--------------------: | :------------------------------------------------------------------------ |
-|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] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_C6)           |
-|ESP32-H2     |                        | ![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] | [芯片发布公告](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) |
-
-[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"
-
-每款乐鑫芯片都可能有不同版本。建议参考 [ESP-IDF 版本与乐鑫芯片版本兼容性](https://github.com/espressif/esp-idf/blob/master/COMPATIBILITY_CN.md)，了解 ESP-IDF 版本与各芯片版本之间的兼容性。
-
-对于 2016 年之前发布的乐鑫芯片（包括 ESP8266 和 ESP8285），请参考 [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK)。
+ESP-IDF 是由乐鑫官方针对乐鑫各系列芯片产品（发布于 2016 年后<sup>[1](#fn1)</sup>）推出的开发框架，支持 Windows、Linux 和 macOS 操作系统。
 
 # 使用 ESP-IDF 进行开发
 
 ## 搭建 ESP-IDF 开发环境
 
-关于不同芯片如何搭建 ESP-IDF 的开发环境，请参考 https://idf.espressif.com/ 。
+关于不同芯片如何搭建 ESP-IDF 的开发环境，请参考 https://idf.espressif.com/。
 
 **注意：** 不同系列芯片和不同 ESP-IDF 版本都有其对应的文档。请参阅[版本](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html)部分，获得关于如何查找文档以及如何检出 ESP-IDF 的特定发行版的详细信息。
 
 ### 非 GitHub 分叉的 ESP-IDF 项目
 
-ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodules)），所以它们会指向 GitHub。 如果 ESP-IDF 被分叉到的仓库不在 GitHub 上，那么你需要在克隆结束后运行该脚本 [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh)。
+ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodules)），所以它们会指向 GitHub。
+如果 ESP-IDF 被分叉到的仓库不在 GitHub 上，那么你需要在克隆结束后运行该脚本 [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh)。
 
-这个脚本会为所有的子模块设置绝对路径，接着可以通过 `git submodule update --init --recursive` 完成子模块的更新。如果 ESP-IDF 是从 GitHub 上克隆得到，则不需要此步骤。
+这个脚本会为所有的子模块设置绝对路径，接着可以通过 `git submodule update --init --recursive` 完成子模块的更新。
+如果 ESP-IDF 是从 GitHub 上克隆得到，则不需要此步骤。
 
 ## 寻找项目
 
@@ -68,7 +39,7 @@ ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodu
 * 在主机中安装入门指南中提到的构建所依赖的工具。
 * 运行安装脚本来设置构建环境。可为 Windows shell 选择 `install.bat` 或 `install.ps1`，为 Unix shell 选择 `install.sh` 和 `install.fish`。
 * 在使用 ESP-IDF 之前，需要在 shell 中运行导出脚本。Windows 下可运行 `export.bat`，Unix 下可运行 `source export.sh`。
-
+  
 ## 配置项目
 
 * `idf.py set-target <chip_name>` 可将项目的目标芯片设置为 `<chip_name>`。运行 `idf.py set-target`，不用带任何参数，可查看所有支持的目标芯片列表。
@@ -94,7 +65,7 @@ ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodu
 
 ## 观察串口输入
 
-`idf.py monitor` 会调用 [esp-idf-monitor 工具](https://github.com/espressif/esp-idf-monitor)来显示乐鑫芯片的串口输出。esp-idf-monitor 还包含一系列的功能来解析程序崩溃后的输出结果并与设备进行交互。更多详细内容，请参阅[文档](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
+`idf.py monitor` 会调用 [idf_monitor 工具](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html)来显示乐鑫芯片的串口输出。`idf_monitor` 还包含一系列的功能来解析程序崩溃后的输出结果并与设备进行交互。更多详细内容，请参阅[文档](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
 
 输入 `Ctrl-]` 可退出监视器。
 
@@ -115,18 +86,21 @@ ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodu
 
 ## 擦除 Flash
 
-`idf.py flash` 并不会擦除 flash 上所有的内容，但是有时候我们需要设备恢复到完全擦除的状态，尤其是分区表发生了变化或者 OTA 应用升级时。要擦除整块 flash 请运行 `idf.py erase-flash`。
+`idf.py flash` 并不会擦除 flash 上所有的内容，但是有时候我们需要设备恢复到完全擦除的状态，尤其是分区表发生了变化或者 OTA 应用升级时。要擦除整块 flash 请运行 `idf.py erase_flash`。
 
-这条命令还可以和其余命令整合在一起，`idf.py -p PORT erase-flash flash` 会擦除一切然后重新烧写新的应用程序、引导程序和分区表。
+这条命令还可以和其余命令整合在一起，`idf.py -p PORT erase_flash flash` 会擦除一切然后重新烧写新的应用程序、引导程序和分区表。
 
 # 其它参考资源
 
-* 最新版的文档：https://docs.espressif.com/projects/esp-idf/ ，该文档是由本仓库 [docs 目录](docs) 构建得到。
-
-* [初学者指南：主要概念和资源](https://www.bilibili.com/video/BV1114y1r7du/)
+* 最新版的文档：https://docs.espressif.com/projects/esp-idf/，该文档是由本仓库 [docs 目录](docs) 构建得到。
 
 * 可以前往 [esp32.com 论坛](https://esp32.com/) 提问，挖掘社区资源。
 
 * 如果你在使用中发现了错误或者需要新的功能，请先[查看 GitHub Issues](https://github.com/espressif/esp-idf/issues)，确保该问题没有重复提交。
 
 * 如果你有兴趣为 ESP-IDF 作贡献，请先阅读[贡献指南](https://docs.espressif.com/projects/esp-idf/en/latest/contribute/index.html)。
+
+
+__________
+
+<a name="fn1">1</a>: ESP-IDF 不支持 ESP8266 和 ESP8285。如有需要，请参考 [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK)。

ROADMAP.md

@@ -1,130 +0,0 @@
-# ESP-IDF Project Roadmap 2025 
-
-* [中文版](./ROADMAP_CN.md)
-
-This document outlines the goals of ESP-IDF project and is shared for the convenience of our customers. It is important to clarify that this document is not a binding commitment to our customers. Instead, its primary purpose is to offer a clear roadmap and direction for the project's development. By openly sharing this information, we aim to enhance our customers' understanding, promote transparency and ensure alignment with the overarching objectives of the ESP-IDF project.
-
-## Project Overview
-
-### Project Goals
-
-In both minor and major releases, we integrate new chip support to enhance our product range. By expanding the chip matrix, we broaden the scope of our offerings, catering to a wider audience with diverse needs. This proactive approach ensures that our products remain at the forefront of technological advancements, consistently meeting and exceeding customer expectations.
-
-Furthermore, we prioritize bugfix releases for active branches, focusing on improving the stability and performance of products already in production. By addressing bugs promptly, we aim to enhance the overall user experience and provide tangible benefits to customers relying on our solutions. This proactive maintenance strategy reflects our commitment to delivering reliable, high-quality products to our valued customer base.
-
-Below are the main objectives that ESP-IDF project/teams would like to implement in 2025.
-
--   New Chip Support
-
-    -   Add support for ESP32-C5
-    -   Add support for ESP32-C61
-
--   More Minor/Major Releases
-
-    -   Release IDF v5.5 in the middle of 2025
-    -   Release IDF v6.0 at the end of 2025
-
--   More Bugfix Releases
-
-    -   Release v5.0.8 and v5.0.9 before ESP-IDF v5.0 goes End of Life in May 2025
-    -   Release v5.1.6 and v5.1.7 before ESP-IDF v5.1 goes End of Life in December 2025
-    -   Do more bugfix releases for IDF v5.2 and IDF v5.3 before release/5.2 and release/5.3 enter maintenance period
-    -   Do more bug fixes releases for release/5.4 and release/5.5, and push the two releases to be more stable and production-ready
-
--   Major Changes
-
-    -   We plan to upgrade MbedTLS to v4.x series in IDF v6.0. In addition, we will also be migrating to newer PSA crypto API as part of this upgrade. Please note that this may involve some breaking changes on the application side for the crypto API usage.
-
-Please note that support status of previous silicones could be found on [ESP-IDF Release and SoC Compatibility](https://github.com/espressif/esp-idf#esp-idf-release-and-soc-compatibility).
-
-### Roadmap Details
-
-The ESP-IDF project prioritizes consistent maintenance and updates to ensure our customers remain at the forefront of technological advancements. Our commitment to ongoing development ensures that customers continuously benefit from the latest innovations in the field.
-
-Moreover, we are dedicated to empowering our customers to leverage newly implemented features and enhanced functionalities through iterative improvements. Our steadfast commitment to pushing boundaries ensures that clients not only keep pace with evolving technology but also extract optimal value from the cutting-edge capabilities of our products.
-
-Below are the main roadmap details for functional areas inside ESP-IDF.
-
--   New Chip Support
-
-    -   Add the initial support for the mass production version of ESP32-C5 in ESP-IDF v5.5, refer to [ESP32-C5 Support Status](https://github.com/espressif/esp-idf/issues/14021)
-    -   Add the initial support for the mass production version of ESP32-C61 in ESP-IDF v5.5, refer to [ESP32-C61 Support Status](https://developer.espressif.com/pages/chip-support-status/esp32c61/#esp-idf)
-
--   Bugfix releases
-
-    -   Do bugfix releases v5.0.8 and v5.0.9 and stop maintaining ESP-IDF v5.0 in May 2025
-    -   Do bugfix releases v5.1.6 and v5.1.7 and stop maintaining ESP-IDF v5.1 in December 2025
-    -   Release bugfix IDF v5.2.4, IDF v5.2.5 and IDF v5.2.6 in 2025, and push release/5.2 to maintenance period from February 2025
-    -   Release bugfix IDF v5.3.3 and IDF v5.3.4 in 2025, and push release/5.3 to maintenance period from July 2025
-    -   Do more bug fixes releases for release/5.4 (IDF v5.4.1, IDF v5.4.2, IDF v5.4.3) and release/5.5 (IDF v5.5.1, IDF v5.5.2), and push releases to be more stable and more production-ready
-
-## ESP-IDF Planning information
-
-For the full list of ESP-IDF releases, please visit https://github.com/espressif/esp-idf/releases
-
-All the information provided here is subject to change without notice, due to business reasons and other factors.
-
-### ESP-IDF Major Releases
-
-```mermaid
-timeline
-
-        title ESP-IDF Major Releases
-        section 2025 Q1 <br> Major Release Planning
-          No version planned : N/A             
-        section 2025 Q2 <br> Major Release Planning
-          No version planned : N/A   
-        section 2025 Q3 <br> Major Release Planning
-          No version planned : N/A    
-        section 2025 Q4 <br> Major Release Planning
-          v6.0-beta1 : 2025/11/13
-          v6.0-beta2 : 2025/12/05
-          v6.0-RC1 : 2026/01/14   
-          v6.0-RC2 : 2026/02/06  
-          v6.0 : 2026/02/13   
-```
-  
-### ESP-IDF Minor Releases
-
-```mermaid
-timeline
-
-        title ESP-IDF Minor Releases
-        section 2025 Q1 <br> Minor Release Planning
-          No version planned : N/A               
-        section 2025 Q2 <br> Minor Release Planning
-          v5.5-beta1 : 2025/05/14
-          v5.5-beta2 : 2025/06/04    
-        section 2025 Q3 <br> Minor Release Planning
-          v5.5-RC1 : 2025/07/07  
-          v5.5-RC2 : 2025/07/28  
-          v5.5 : 2025/08/04       
-        section 2025 Q4 <br> Minor Release Planning
-          No version planned : N/A    
-```
-
-### ESP-IDF Bugfix Releases
-
-```mermaid
-timeline
-
-        title ESP-IDF Bugfix Releases
-        section 2025 Q1 <br> Bugfix Release Planning
-          v5.0.8 : 2025/01/14
-          v5.1.6 : 2025/02/18
-          v5.2.4 : 2025/02/23
-          v5.2.5 : 2025/02/28     
-          v5.4.1 : 2025/03/27
-          v5.3.3 : 2025/04/04                
-        section 2025 Q2 <br> Bugfix Release Planning
-          v5.0.9 : 2025/05/16
-          v5.4.2 : 2025/06/30 
-        section 2025 Q3 <br> Bugfix Release Planning
-          v5.3.4 : 2025/08/03
-          v5.2.6 : 2025/09/04
-          v5.5.1 : 2025/09/11   
-          v5.4.3 : 2025/10/08
-        section 2025 Q4 <br> Bugfix Release Planning
-          v5.5.2 : 2025/11/12
-          v5.1.7 : 2026/01/06   
-```

ROADMAP_CN.md

@@ -1,130 +0,0 @@
-# ESP-IDF 项目路线图 2025
-
-* [English Version](./ROADMAP.md)
-
-本文档概述了 ESP-IDF 项目的年度计划，方便客户据此规划自己的项目周期。需要说明的是该文档并不是我们对客户的约束性承诺。相反，其主要目的是为客户提供 ESP-IDF 项目开发的路线图和方向。通过公开这些信息，我们希望增进客户对 ESP-IDF 项目的理解，提高透明度，并确保与 ESP-IDF 项目的总体目标保持一致。
-
-## 项目总览
-
-### 项目目标
-
-在 ESP-IDF 的主要版本和次要版本中，我们一般会增加对新芯片的支持，以扩展我们的产品线。通过扩展芯片矩阵，拓宽我们的产品范围，并满足广泛受众的各种需求。这样便能保证我们的产品始终处于技术进步的前沿，不断满足客户的需求并超越客户的期望。
-
-此外，ESP-IDF 各活跃分支的 Bugfix 版本发布也是我们项目的重中之重，着力提升已量产产品的稳定性和性能。通过及时解决问题，我们期待提升用户的整体体验，切实惠及使用乐鑫解决方案的客户。通过积极维护 ESP-IDF 的各活跃分支，我们践行了对宝贵的客户群提供可靠、高质量产品的承诺。
-
-以下是 ESP-IDF 项目在 2025 年计划实现的主要目标。
-
-* 新芯片支持
-
-	* 增加对 ESP32-C5 芯片的支持
-	* 增加对 ESP32-C61 芯片的支持
-
-* 发布更多的次要和主要版本
-
-	* 在 2025 年中发布 IDF v5.5 
-	* 在 2025 年底发布 IDF v6.0
-
-* 发布更多 bugfix 版本
-
-	* 在 2025 年 5 月底 IDF v5.0 停止维护之前，发布 IDF v5.0.8 和 IDF v5.0.9
-	* 在 2025 年 12 月底 IDF v5.1 停止维护之前，发布 IDF v5.1.6 和 IDF v5.1.7
-	* 在 release/5.2 分支和 release/5.3 分支进入维护周期之前，发布更多 bugfix 版本
-	* release/5.4 分支和 release/5.5 分支发布更多 bugfix 版本，使这两个分支更加稳定和产品化
-
-* 重大变更
-
-	* 我们计划在 IDF v6.0 中将 MbedTLS 版本升级到 v4.x。另外，我们还会在升级中迁移到更新版的 PSA 加密 API，但请注意，这可能会导致应用程序端在使用加密 API 时出现一些非兼容性更新。
-
-请注意，获取之前芯片的支持状态，请参阅 [ESP-IDF 发布和 SoC 兼容性](https://github.com/espressif/esp-idf/blob/master/README_CN.md#esp-idf-与乐鑫芯片)。
-
-### 路线图细节
-
-ESP-IDF 项目重视持续维护和更新，确保我们的客户始终处于技术进步的前沿。我们承诺持续进行开发，并将该领域的最新创新成果呈现给客户。
-
-此外，我们也在给客户赋能，客户通过迭代改进便能接触到新开发的功能和更高的性能。我们在突破技术界限方面的坚定承诺，使客户不仅能接触到最新的技术，还能从我们产品的尖端功能中获取最大价值。
-
-以下是 ESP-IDF 路线图的主要信息。
-
-* 新芯片支持
-
-	* 在 ESP-IDF v5.4 中为 ESP32-C5 提供预览支持，并在 ESP-IDF v5.5 中为 ESP32-C5 提供完整支持，参考 [ESP32-C5 支持状态](https://github.com/espressif/esp-idf/issues/14021)
-	* 在 ESP-IDF v5.4 中增加对 ESP32-C61 早期样品的预览支持，并在 IDF v5.5 中增加对 ESP32-C61 量产版本的完整支持，参考 [ESP32-C61 支持状态](https://developer.espressif.com/pages/chip-support-status/esp32c61/#esp-idf)
-
-* Bugfix 版本发布
-
-	* 发布 Bugfix 版本 IDF v5.0.8 和 IDF v5.0.9，并在 2025 年 5 月底停止维护 ESP-IDF v5.0
-	* 发布 Bugfix 版本 IDF v5.1.6 和 IDF v5.1.7，并在 2025 年 12 月底停止维护 ESP-IDF v5.1
-	* 发布 Bugfix 版本 IDF v5.2.4，IDF v5.2.5 和 IDF v5.2.6，release/5.2 分支自 2025 年 2 月进入维护周期
-	* 发布 Bugfix 版本 IDF v5.3.3 和 IDF v5.3.4，release/5.3 分支自 2025 年 7 月进入维护周期
-	* release/5.4 分支发布更多 bugfix 版本，包括 IDF v5.4.1、IDF v5.4.2、IDF v5.4.3；release/5.5 分支发布更多 bugfix 版本，包括 IDF v5.5.1、IDF v5.5.2。通过发布这些 Bugfix 版本，使 release/5.4 分支和 release/5.5 分支更加稳定和产品化。
-
-## ESP-IDF 发布计划
-
-获取 ESP-IDF 的完整发布列表，请访问 https://github.com/espressif/esp-idf/releases
-
-此处提供的所有信息均可因业务原因及其他因素而在没有通知的情况下进行更改。
-
-### ESP-IDF 主要版本发布
-
-```mermaid
-timeline
-
-        title ESP-IDF Major Releases
-        section 2025 Q1 <br> Major Release Planning
-          No version planned : N/A             
-        section 2025 Q2 <br> Major Release Planning
-          No version planned : N/A     
-        section 2025 Q3 <br> Major Release Planning
-          No version planned : N/A   
-        section 2025 Q4 <br> Major Release Planning
-          v6.0-beta1 : 2025/11/13
-          v6.0-beta2 : 2025/12/05
-          v6.0-RC1 : 2026/01/14   
-          v6.0-RC2 : 2026/02/06  
-          v6.0 : 2026/02/13   
-```
-  
-### ESP-IDF 次要版本发布
-
-```mermaid
-timeline
-
-        title ESP-IDF Minor Releases
-        section 2025 Q1 <br> Minor Release Planning
-          No version planned : N/A                
-        section 2025 Q2 <br> Minor Release Planning
-          v5.5-beta1 : 2025/05/14
-          v5.5-beta2 : 2025/06/04    
-        section 2025 Q3 <br> Minor Release Planning
-          v5.5-RC1 : 2025/07/07  
-          v5.5-RC2 : 2025/07/28  
-          v5.5 : 2025/08/04       
-        section 2025 Q4 <br> Minor Release Planning
-          No version planned : N/A   
-```
-
-### ESP-IDF Bugfix 版本发布
-
-```mermaid
-timeline
-
-        title ESP-IDF Bugfix Releases
-        section 2025 Q1 <br> Bugfix Release Planning
-          v5.0.8 : 2025/01/14
-          v5.1.6 : 2025/02/18
-          v5.2.4 : 2025/02/23
-          v5.2.5 : 2025/02/28         
-          v5.4.1 : 2025/03/27
-          v5.3.3 : 2025/04/04                
-        section 2025 Q2 <br> Bugfix Release Planning
-          v5.0.9 : 2025/05/16
-          v5.4.2 : 2025/06/30 
-        section 2025 Q3 <br> Bugfix Release Planning
-          v5.3.4 : 2025/08/03
-          v5.2.6 : 2025/09/04
-          v5.5.1 : 2025/09/11   
-          v5.4.3 : 2025/10/08
-        section 2025 Q4 <br> Bugfix Release Planning
-          v5.5.2 : 2025/11/12
-          v5.1.7 : 2026/01/06   
-```

SECURITY.md

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please refer to https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html#support-periods for more details on ESP-IDF supported versions and support period policy.
-
-## Reporting a Vulnerability
-
-Please refer to [Espressif Security Incident Response Process](https://www.espressif.com/sites/default/files/Espressif%20Security%20Incident%20Response%20Process%20v1.0_EN.pdf) on the guidelines to report a security vulnerability. Please do **NOT** create a public GitHub issue.

SUPPORT_POLICY.md

@@ -5,9 +5,12 @@ Support Period Policy
 
 * [中文版](./SUPPORT_POLICY_CN.md)
 
-Each ESP-IDF major and minor release (V4.1, V4.2, etc) is supported for 30 months after the initial stable release date.
+Each ESP-IDF major and minor release (V4.1, V4.2, etc) is supported for
+30 months after the initial stable release date.
 
-Supported means that the ESP-IDF team will continue to apply bug fixes, security fixes, etc to the release branch on GitHub, and periodically make new bugfix releases as needed.
+Supported means that the ESP-IDF team will continue to apply bug fixes,
+security fixes, etc to the release branch on GitHub, and periodically
+make new bugfix releases as needed.
 
 Support period is divided into "Service" and "Maintenance" period:
 
@@ -16,43 +19,65 @@ Support period is divided into "Service" and "Maintenance" period:
 | Service     | 12 months    | Yes                                   |
 | Maintenance | 18 months    | No                                    |
 
-During the Service period, bugfixes releases are more frequent. In some cases, support for new features may be added during the Service period (this is reserved for features which are needed to meet particular regulatory requirements or standards for new products, and which carry a very low risk of introducing regressions.)
+During the Service period, bugfixes releases are more frequent. In some cases,
+support for new features may be added during the Service period (this is
+reserved for features which are needed to meet particular regulatory
+requirements or standards for new products, and which carry a very low risk of
+introducing regressions.)
 
-During the Maintenance period, the version is still supported but only bugfixes for high severity issues or security issues will be applied.
+During the Maintenance period, the version is still supported but only bugfixes
+for high severity issues or security issues will be applied.
 
 Using an “In Service” version is recommended when starting a new project.
 
-Users are encouraged to upgrade all projects to a newer ESP-IDF release before the support period finishes and the release becomes End of Life (EOL). It is our policy to not continue fixing bugs in End of Life releases.
+Users are encouraged to upgrade all projects to a newer ESP-IDF release before
+the support period finishes and the release becomes End of Life (EOL). It is our
+policy to not continue fixing bugs in End of Life releases.
 
-Pre-release versions (betas, previews, `-rc` and `-dev` versions, etc) are not covered by any support period. Sometimes a particular feature is marked as "Preview" in a release, which means it is also not covered by the support period.
+Pre-release versions (betas, previews, `-rc` and `-dev` versions, etc)
+are not covered by any support period. Sometimes a particular feature is
+marked as "Preview" in a release, which means it is also not covered
+by the support period.
 
-ESP-IDF should be used in an up-to-date software environment. The operating system and other third-party tools should be supported by their maintainers. ESP-IDF cannot keep compatibility with unsupported third-party tools.
-
-The ESP-IDF Programming Guide has information about the [different versions of ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html) (major, minor, bugfix, etc).
+The ESP-IDF Programming Guide has information about the
+[different versions of ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html)
+(major, minor, bugfix, etc).
 
 Example
 -------
 
-ESP-IDF V3.3 was released in September 2019. It was supported for 30 months until February 2022.
+ESP-IDF V3.3 was released in September 2019. It will be supported for 30 months
+until February 2022.
 
 - The first V3.3 release was `v3.3` in September 2019.
-- The ESP-IDF team continues to backport bug fixes, security fixes, etc to the release branch `release/v3.3`.
-- Periodically stable bugfix releases are created from the release branch. For example `v3.3.1`, `v3.3.2`, etc. Users are encouraged to always update to the latest bugfix release.
-- V3.3 bugfix releases continue until February 2022, when all V3.3.x releases become End of Life.
+- The ESP-IDF team continues to backport bug fixes, security fixes,
+  etc to the release branch `release/v3.3`.
+- Periodically stable bugfix releases are created from the release
+  branch. For example `v3.3.1`, `v3.3.2`, etc. Users are encouraged to
+  always update to the latest bugfix release.
+- V3.3 bugfix releases continue until February 2022, when all V3.3.x
+  releases become End of Life.
 
 Existing Releases
 -----------------
 
-ESP-IDF release V4.1 and all newer releases will follow this support period policy. The support period for each release will be announced when the release is made.
+ESP-IDF release V4.1 and all newer releases will follow this support period
+policy. The support period for each release will be announced when the release
+is made.
 
-For releases made before the current support period policy was announced, the original support periods apply:
+For releases made before the current support period policy was announced, the
+original support periods apply:
 
 * ESP-IDF V4.0.x will be supported until October 2021
 * ESP-IDF V3.3.x will be supported until February 2022
-* ESP-IDF versions before V3.3 are already End of Life.
+* ESP-IDF V3.1.x and V3.2.x will both be supported until October 2020.
+* ESP-IDF versions before V3.1 are already End of Life.
 
 Policy History
 --------------
 
-* September 2019. This policy splits ESP-IDF releases into Standard and Long Term Support.
-* July 2020. All releases from now will have the same support period, which is equal to the previous Long Term Support period. Added “In Service” period, during which versions will receive more updates.
+* September 2019. This policy split ESP-IDF releases into Standard and Long Term
+  Support.
+* July 2020. All releases from now will have the same support period, which is
+  equal to the previous Long Term Support period. Added “In Service” period,
+  during which versions will receive more updates.

SUPPORT_POLICY_CN.md

@@ -3,8 +3,6 @@
 支持期限政策
 =====================
 
-* [英文版](./SUPPORT_POLICY.md)
-
 ESP-IDF 的每个主要版本和次要版本（如 V4.1、V4.2 等）自其首次稳定版本发布之日起将支持 30 个月。
 
 支持意味着 ESP-IDF 团队将会对 GitHub 上的发布分支继续进行 bug 修复、安全修补等，并根据需求定期发布新的 bugfix 版本。
@@ -20,14 +18,12 @@ ESP-IDF 的每个主要版本和次要版本（如 V4.1、V4.2 等）自其首
 
 在版本的维护周期内，版本仍然会继续支持，但仅会对严重问题或安全问题进行 bug 修复。
 
-建议在开始新项目的时候使用处于服务周期的版本。
+建议在开始新项目的时候使用处于服务周期的版本。 
 
 在某一版本支持期限结束，停止更新维护 (EOL) 前，建议用户升级所有项目至较新的 ESP-IDF 版本。根据《支持期限政策》，我们将停止对 EOL 版本进行 bug 修复。
 
 《支持期限政策》不适用于预发布版本（包括 beta、preview、-rc 和 -dev 版本等）。有时，在发布的版本中存在被标记为 "Preview" 的特定功能，则该功能也不在支持期限内。
 
-请确保在最新的软件环境中使用 ESP-IDF。操作系统和其他第三方工具应得到其维护者的支持。ESP-IDF 无法兼容不受支持的第三方工具。
-
 有关 [ESP-IDF 不同版本](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html)（主要版本、次要版本、bugfix 版本等）信息，可参阅《ESP-IDF 编程指南》。
 
 示例
@@ -49,10 +45,11 @@ ESP-IDF V4.1 及所有后续更新版本都将遵守该《支持期限政策》
 
 * ESP-IDF V4.0.x 将支持至 2021 年 10 月。
 * ESP-IDF V3.3.x 将支持至 2022 年 2 月。
-* ESP-IDF v3.3 之前的版本已经停止支持。
-
+* ESP-IDF V3.1.x 和 V3.2.x 都将在 2020 年 10 月停止支持。
+* ESP-IDF v3.1.x 之前的版本已经停止支持。
+  
 政策历史
 --------------
 
-* 2019 年 9 月。该政策将 ESP-IDF 版本发布分为标准支持版本和长期支持版本。
-* 2020 年 7 月。从现在开始，所有发布的版本都将有相同的支持周期，即之前的长期支持周期。新增了”服务周期“，期间版本的更新将较为频繁。
+* 2019 年 9 月。该政策将 ESP-IDF 版本发布分为标准支持版本和长期支持版本。 
+* 2020 年 7 月。从现在开始，所有发布的版本都将有相同的支持周期，等同于之前的长期支持周期。新增了”服务周期“，期间版本的更新将较为频繁。

components/README.md

@@ -1,164 +0,0 @@
-# Core Components
-
-## Overview
-
-This document contains details about what the core components are, what they contain, and how they are organized.
-
-## Organization
-
-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.
-
-## Descriptions
-
-The following is a short description of the components mentioned above.
-
-### `G0` Components
-
-#### `hal`
-
-Contains the hardware abstraction layer and low-level operation implementations for the various peripherals. The low-level functions assign meaningful names to register-level manipulations; the hardware abstraction provide operations one level above this, grouping these low-level functions
-into routines that achieve a meaningful action or state of the peripheral.
-
-Example:
-
--   `spi_flash_ll_set_address` is a low-level function part of the hardware abstraction `spi_flash_hal_read_block`
-
-#### `arch`
-
-Contains low-level architecture operations and definitions, including those for customizations (can be thought of on the same level as the low-level functions of `hal`).
-This can also contain files provided by the architecture vendor.
-
-Example:
-
--   `xt_set_exception_handler`
--   `rv_utils_intr_enable`
--   `ERI_PERFMON_MAX`
-
-#### `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).
-
-Example:
-
--   `BIT(nr)` and other bit manipulation utilities in the future
--   `IDF_DEPRECATED(REASON)`
--   `ESP_IDF_VERSION_MAJOR`
-
-#### `soc`
-
-Contains description of the underlying hardware: register structure, addresses, pins, capabilities, etc.
-
-Example:
-
--   `DR_REG_DPORT_BASE`
--   `SOC_MCPWM_SUPPORTED`
--   `uart_dev_s`
-
-#### `esp_rom`
-
-Contains headers, linker scripts, abstraction layer, patches, and other related files to ROM functions.
-
-Example:
-
--   `esp32.rom.eco3.ld`
--   `rom/aes.h`
-
-### `G1` Components
-
-#### `spi_flash`
-
-SPI flash device access implementation.
-
-#### `freertos`
-
-FreeRTOS port to targets supported by ESP-IDF.
-
-#### `log`
-
-Logging library.
-
-#### `heap`
-
-Heap implementation.
-
-#### `newlib`
-
-Some functions n the standard library are implemented here, especially those needing other `G1` components.
-
-Example:
-
--   `malloc` is implemented in terms of the component `heap`'s functions
--   `gettimeofday` is implemented in terms of system time in `esp_system`
-
-#### `esp_mm`
-
-Memory management. Currently, this encompasses:
-
--   Memory mapping for MMU supported memories
--   Memory synchronisation via Cache
--   Utils such as APIs to convert between virtual address and physical address
-
-#### `esp_psram`
-
-Contains implementation of PSRAM services
-
-#### `esp_system`
-
-Contains implementation of system services and controls system behavior. The implementations
-here may take hardware resources and/or decide on a hardware state needed for support of a system service/feature/mechanism.
-Currently, this encompasses the following, but not limited to:
-
--   Startup and initialization
--   Panic and debug
--   Reset and reset reason
--   Task and interrupt watchdogs
-
-#### `esp_hw_support`
-
-Contains implementations that provide hardware operations, arbitration, or resource sharing, especially those that
-is used in the system. Unlike `esp_system`, implementations here do not decide on a hardware state or takes hardware resource, acting
-merely as facilitator to hardware access. Currently, this encompasses the following, but not limited to:
-
--   Interrupt allocation
--   Sleep functions
--   Memory functions (external SPIRAM, async memory, etc.)
--   Clock and clock control
--   Random generation
--   CPU utilities
--   MAC settings
-
-### `esp_hw_support` vs `esp_system`
-
-This section details list some implementations and the reason for placing it in either `esp_hw_support` or `esp_system`.
-
-#### `task_wdt.c` (`esp_system`) vs `intr_alloc.c` (`esp_hw_support`)
-
-The task watchdog fits the definition of taking and configuring hardware resources (wdt, interrupt) for implementation of a system service/mechanism.
-
-This is in contrast with interrupt allocation that merely facilitates access to the underlying hardware for other implementations -
-drivers, user code, and even the task watchdog mentioned previously!
-
-#### `crosscore_int.c` (`esp_system`)
-
-The current implementation of crosscore interrupts is tightly coupled with a number of interrupt reasons
-associated with system services/mechanisms: REASON_YIELD (scheduler), REASON_FREQ_SWITCH (power management)
-REASON_PRINT_BACKTRACE (panic and debug).
-
-However, if an implementation exists that makes it possible to register an arbitrary interrupt reason - a
-lower level inter-processor call if you will, then this implementation is a good candidate for `esp_hw_support`.
-The current implementation in `esp_system` can then just register the interrupt reasons mentioned above.
-
-#### `esp_mac.h`, `esp_chip_info.h`, `esp_random.h` (`esp_hw_support`)
-
-The functions in these headers used to be in `esp_system.h`, but have been split-off.
-
-The remaining functions in `esp_system.h` are those that deal with system behavior, such
-as `esp_register_shutdown_handler`, or are proxy for other system components's APIs such as
-`esp_get_free_heap_size`.
-
-The functions split-off from `esp_system.h` are much more hardware manipulation oriented such as:
-`esp_read_mac`, `esp_random` and `esp_chip_info`.

components/app_trace/CMakeLists.txt

@@ -1,27 +1,8 @@
-idf_build_get_property(target IDF_TARGET)
-
-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_ESP_DEBUG_STUBS_ENABLE)
-    list(APPEND srcs
-        "debug_stubs.c")
-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()
-endif()
+    "host_file_io.c"
+    "gcov/gcov_rtio.c")
 
 set(include_dirs "include")
 
@@ -40,19 +21,17 @@ if(CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE)
             "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
         sys_view/SEGGER
-        sys_view/Sample/FreeRTOSV10.4)
+        sys_view/Sample/OS)
 
     list(APPEND srcs
         "sys_view/SEGGER/SEGGER_SYSVIEW.c"
-        "sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c"
-        "sys_view/Sample/FreeRTOSV10.4/SEGGER_SYSVIEW_FreeRTOS.c"
+        "sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
+        "sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c"
         "sys_view/esp/SEGGER_RTT_esp.c"
         "sys_view/ext/heap_trace_module.c"
         "sys_view/ext/logging.c")
@@ -60,64 +39,25 @@ endif()
 
 if(CONFIG_HEAP_TRACING_TOHOST)
     list(APPEND srcs "heap_trace_tohost.c")
-    if(CONFIG_IDF_TARGET_ARCH_XTENSA)
-        set_source_files_properties(heap_trace_tohost.c PROPERTIES COMPILE_FLAGS -Wno-frame-address)
-    endif()
+    set_source_files_properties(heap_trace_tohost.c
+        PROPERTIES COMPILE_FLAGS
+        -Wno-frame-address)
 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 soc
                        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
+    # 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)
+    # Force app_trace to also appear later than gcov in link line
+    idf_component_get_property(app_trace app_trace COMPONENT_LIB)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE
+        "-Wl,--undefined=gcov_rtio_atexit" $<TARGET_FILE:${app_trace}> gcov $<TARGET_FILE:${app_trace}> c)
 endif()

components/app_trace/Kconfig

@@ -1,7 +1,7 @@
 menu "Application Level Tracing"
 
-    choice APPTRACE_DESTINATION1
-        prompt "Data Destination 1"
+    choice APPTRACE_DESTINATION
+        prompt "Data Destination"
         default APPTRACE_DEST_NONE
         help
             Select destination for application trace: JTAG or none (to disable).
@@ -14,136 +14,15 @@ menu "Application Level Tracing"
 
         config APPTRACE_DEST_NONE
             bool "None"
-
     endchoice
 
-    config APPTRACE_DEST_UART
-        bool
-
-    config APPTRACE_DEST_UART_NOUSB
-        bool
-
-    choice APPTRACE_DESTINATION2
-        prompt "Data Destination 2"
-        default APPTRACE_DEST_UART_NONE
-        help
-            Select destination for application trace: UART(XX) or none (to disable).
-
-        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_UART_TX_GPIO
-        int "UART TX on GPIO<num>"
-        depends on APPTRACE_DEST_UART_NOUSB
-        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
-        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.
-
-    config APPTRACE_UART_BAUDRATE
-        int
-        prompt "UART baud rate" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 1000000
-        range 1200 8000000
-        range 1200 1000000
-        help
-            This baud rate is used for UART.
-
-            The app's maximum baud rate depends on the UART clock source. If Power Management is disabled,
-            the UART clock source is the APB clock and all baud rates in the available range will be sufficiently
-            accurate. If Power Management is enabled, REF_TICK clock source is used so the baud rate is divided
-            from 1MHz. Baud rates above 1Mbps are not possible and values between 500Kbps and 1Mbps may not be
-            accurate.
-
-    config APPTRACE_UART_RX_BUFF_SIZE
-        int
-        prompt "UART RX ring buffer size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 128
-        range 64 32768
-        help
-            Size of the UART input ring buffer.
-            This size related to the baudrate, system tick frequency and amount of data to transfer.
-            The data placed to this buffer before sent out to the interface.
-
-    config APPTRACE_UART_TX_BUFF_SIZE
-        int
-        prompt "UART TX ring buffer size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 4096
-        range 2048 32768
-        help
-            Size of the UART output ring buffer.
-            This size related to the baudrate, system tick frequency and amount of data to transfer.
-
-    config APPTRACE_UART_TX_MSG_SIZE
-        int
-        prompt "UART TX message size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 128
-        range 64 32768
-        help
-            Maximum size of the single message to transfer.
-
-    config APPTRACE_UART_TASK_PRIO
-        int
-        prompt "UART Task Priority" if 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
         bool
-        depends on IDF_TARGET_ARCH_XTENSA && !ESP32_TRAX && !ESP32S2_TRAX && !ESP32S3_TRAX
+        depends on IDF_TARGET_ARCH_XTENSA && !ESP32_TRAX && !ESP32S2_TRAX
         select ESP32_MEMMAP_TRACEMEM
         select ESP32S2_MEMMAP_TRACEMEM
-        select ESP32S3_MEMMAP_TRACEMEM
         select ESP32_MEMMAP_TRACEMEM_TWOBANKS
         select ESP32S2_MEMMAP_TRACEMEM_TWOBANKS
-        select ESP32S3_MEMMAP_TRACEMEM_TWOBANKS
         default n
         help
             Enables/disable TRAX tracing HW.
@@ -207,54 +86,13 @@ menu "Application Level Tracing"
             depends on APPTRACE_ENABLE
             default n
             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
-            default APPTRACE_SV_DEST_CPU_0
-            help
-                Define the CPU to trace by SystemView.
-
-            config APPTRACE_SV_DEST_CPU_0
-                bool "CPU0"
-                help
-                    Send SEGGER SystemView events for Pro CPU.
-
-            config APPTRACE_SV_DEST_CPU_1
-                bool "CPU1"
-                help
-                    Send SEGGER SystemView events for App CPU.
-
-        endchoice
-
+                Enables supporrt for SEGGER SystemView tracing functionality.
 
         choice APPTRACE_SV_TS_SOURCE
             prompt "Timer to use as timestamp source"
             depends on APPTRACE_SV_ENABLE
-            default APPTRACE_SV_TS_SOURCE_CCOUNT if ESP_SYSTEM_SINGLE_CORE_MODE && !PM_ENABLE && !IDF_TARGET_ESP32C3
-            default APPTRACE_SV_TS_SOURCE_GPTIMER if !ESP_SYSTEM_SINGLE_CORE_MODE && !PM_ENABLE && !IDF_TARGET_ESP32C3
+            default APPTRACE_SV_TS_SOURCE_CCOUNT if FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
+            default APPTRACE_SV_TS_SOURCE_TIMER_00 if !FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
             default APPTRACE_SV_TS_SOURCE_ESP_TIMER if PM_ENABLE || IDF_TARGET_ESP32C3
             help
                 SystemView needs to use a hardware timer as the source of timestamps
@@ -262,10 +100,22 @@ menu "Application Level Tracing"
 
             config APPTRACE_SV_TS_SOURCE_CCOUNT
                 bool "CPU cycle counter (CCOUNT)"
-                depends on ESP_SYSTEM_SINGLE_CORE_MODE && !PM_ENABLE && !IDF_TARGET_ESP32C3
+                depends on FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
 
-            config APPTRACE_SV_TS_SOURCE_GPTIMER
-                bool "General Purpose Timer (Timer Group)"
+            config APPTRACE_SV_TS_SOURCE_TIMER_00
+                bool "Timer 0, Group 0"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_01
+                bool "Timer 1, Group 0"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_10
+                bool "Timer 0, Group 1"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_11
+                bool "Timer 1, Group 1"
                 depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
 
             config APPTRACE_SV_TS_SOURCE_ESP_TIMER
@@ -390,11 +240,4 @@ menu "Application Level Tracing"
         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,40 +1,28 @@
 /*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <string.h>
-#include "esp_cpu.h"
 #include "esp_log.h"
 #include "esp_app_trace.h"
 #include "esp_app_trace_port.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
-#endif
+#define ESP_APPTRACE_MAX_VPRINTF_ARGS           256
+#define ESP_APPTRACE_HOST_BUF_SIZE              256
 
-#define ESP_APPTRACE_MAX_VPRINTF_ARGS 256
-#define ESP_APPTRACE_HOST_BUF_SIZE 256
+#define ESP_APPTRACE_PRINT_LOCK                 0
 
 const static char *TAG = "esp_apptrace";
 
 /** tracing module internal data */
 typedef struct {
-    esp_apptrace_hw_t *hw;
-    void               *hw_data;
+    esp_apptrace_hw_t * hw;
+    void *              hw_data;
 } esp_apptrace_channel_t;
 
-static esp_apptrace_channel_t   s_trace_channels[ESP_APPTRACE_DEST_MAX];
+static esp_apptrace_channel_t   s_trace_channels[ESP_APPTRACE_DEST_NUM];
 static bool s_inited;
 
 esp_err_t esp_apptrace_init(void)
@@ -44,7 +32,7 @@ esp_err_t esp_apptrace_init(void)
     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) {
+    if (cpu_hal_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);
@@ -52,16 +40,16 @@ esp_err_t esp_apptrace_init(void)
             s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw = hw;
             s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw_data = hw_data;
         }
-        hw = esp_apptrace_uart_hw_get(ESP_APPTRACE_DEST_UART_NUM, &hw_data);
+        hw = esp_apptrace_uart_hw_get(0, &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;
+            s_trace_channels[ESP_APPTRACE_DEST_UART0].hw = hw;
+            s_trace_channels[ESP_APPTRACE_DEST_UART0].hw_data = hw_data;
         }
         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++) {
+    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);
@@ -75,11 +63,6 @@ esp_err_t esp_apptrace_init(void)
     return ESP_OK;
 }
 
-ESP_SYSTEM_INIT_FN(esp_apptrace_init, SECONDARY, ESP_SYSTEM_INIT_ALL_CORES, 115)
-{
-    return esp_apptrace_init();
-}
-
 void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
 {
     esp_apptrace_channel_t *ch;
@@ -88,23 +71,17 @@ void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
         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
+    // TODO: one more argument should be added to this function to specify HW inteface: 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!");
+    if (ch->hw == NULL) {
+        ESP_APPTRACE_LOGE("Trace destination not supported!");
+        return;
     }
-    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!");
+    if (ch->hw->down_buffer_config == NULL) {
+        return;
     }
+
+    ch->hw->down_buffer_config(ch->hw_data, buf, size);
 }
 
 uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, uint32_t *size, uint32_t user_tmo)
@@ -192,9 +169,9 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *buf, uint32_t *size,
     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 = ch->hw->get_down_buffer(ch->hw_data, &act_sz, &tmo);
     if (ptr && act_sz > 0) {
-        ESP_APPTRACE_LOGD("Read %" PRIu32 " bytes from host", act_sz);
+        ESP_APPTRACE_LOGD("Read %d bytes from host", act_sz);
         memcpy(buf, ptr, act_sz);
         res = ch->hw->put_down_buffer(ch->hw_data, ptr, &tmo);
         *size = act_sz;
@@ -327,7 +304,7 @@ int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const c
     }
 
     esp_apptrace_tmo_init(&tmo, user_tmo);
-    ESP_APPTRACE_LOGD("fmt %p", fmt);
+    ESP_APPTRACE_LOGD("fmt %x", fmt);
     while ((p = (uint8_t *)strchr((char *)p, '%')) && nargs < ESP_APPTRACE_MAX_VPRINTF_ARGS) {
         p++;
         if (*p != '%' && *p != 0) {
@@ -353,7 +330,7 @@ int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t user_tmo, const c
         uint32_t arg = va_arg(ap, uint32_t);
         *(uint32_t *)pout = arg;
         pout += sizeof(uint32_t);
-        ESP_APPTRACE_LOGD("arg %" PRIx32, arg);
+        ESP_APPTRACE_LOGD("arg %x", arg);
     }
 
     int ret = ch->hw->put_up_buffer(ch->hw_data, p, &tmo);
@@ -442,10 +419,3 @@ bool esp_apptrace_host_is_connected(esp_apptrace_dest_t dest)
 
     return ch->hw->host_is_connected(ch->hw_data);
 }
-
-#if !CONFIG_APPTRACE_DEST_JTAG
-esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
-{
-    return NULL;
-}
-#endif

components/app_trace/app_trace_membufs_proto.c

@@ -1,14 +1,7 @@
-/*
- * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
-
 #include <sys/param.h>
 #include <string.h>
 #include "sdkconfig.h"
 #include "esp_log.h"
-#include "esp_cpu.h"
 #include "esp_app_trace_membufs_proto.h"
 
 /** Trace data header. Every user data chunk is prepended with this header.
@@ -92,7 +85,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->state.markers[prev_block_num]);
+    proto->hw->swap(new_block_num);
 
     // handle data from host
     esp_hostdata_hdr_t *hdr = (esp_hostdata_hdr_t *)proto->blocks[new_block_num].start;
@@ -100,8 +93,7 @@ static esp_err_t esp_apptrace_membufs_swap(esp_apptrace_membufs_proto_data_t *pr
     if (proto->hw->host_data_pending() && hdr->block_sz > 0) {
         // 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,
+        ESP_APPTRACE_LOGD("Recvd %d bytes from host [%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+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),
@@ -109,7 +101,7 @@ static esp_err_t esp_apptrace_membufs_swap(esp_apptrace_membufs_proto_data_t *pr
             *(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 %d bytes to down buffer (%d %d)!", hdr->block_sz - sz, hdr->block_sz, sz);
         }
         hdr->block_sz = 0;
     }
@@ -148,18 +140,6 @@ static esp_err_t esp_apptrace_membufs_swap_waitus(esp_apptrace_membufs_proto_dat
         if (res != ESP_OK) {
             break;
         }
-#if CONFIG_IDF_TARGET_ESP32S3
-        /*
-        * ESP32S3 has a serious data corruption issue with the transferred data to host.
-        * This delay helps reduce the failure rate by temporarily reducing heavy memory writes
-        * from RTOS-level tracing and giving OpenOCD more time to read trace memory before
-        * the current thread continues execution. While this doesn't completely prevent
-        * memory access from other threads/cores/ISRs, it has shown to significantly improve
-        * reliability when combined with CRC checks in OpenOCD. In practice, this reduces the
-        * number of retries needed to read an entire block without corruption.
-        */
-        esp_rom_delay_us(100);
-#endif
     }
     return res;
 }
@@ -208,7 +188,7 @@ static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membu
     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,
+        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock WRS %d-%d-%d %d", proto->rb_down.wr, proto->rb_down.rd,
             proto->rb_down.cur_size, size);
         uint32_t wr_sz = esp_apptrace_rb_write_size_get(&proto->rb_down);
         if (wr_sz == 0) {
@@ -218,15 +198,15 @@ static uint32_t esp_apptrace_membufs_down_buffer_write_nolock(esp_apptrace_membu
         if (wr_sz > size - total_sz) {
             wr_sz = size - total_sz;
         }
-        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %" PRIu32, wr_sz);
+        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %d", wr_sz);
         uint8_t *ptr = esp_apptrace_rb_produce(&proto->rb_down, wr_sz);
         if (!ptr) {
             assert(false && "Failed to produce bytes to down buffer!");
         }
-        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %" PRIu32 " to %p from %p", wr_sz, ptr, data + total_sz + wr_sz);
+        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %d to 0x%x from 0x%x", wr_sz, ptr, data + total_sz + wr_sz);
         memcpy(ptr, data + total_sz, wr_sz);
         total_sz += wr_sz;
-        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %" PRIu32 "/%" PRIu32 "", wr_sz, total_sz);
+        ESP_APPTRACE_LOGD("esp_apptrace_trax_down_buffer_write_nolock wr %d/%d", wr_sz, total_sz);
     }
     return total_sz;
 }
@@ -272,8 +252,8 @@ static inline uint8_t *esp_apptrace_membufs_wait4buf(esp_apptrace_membufs_proto_
 
 static inline uint8_t *esp_apptrace_membufs_pkt_start(uint8_t *ptr, uint16_t size)
 {
-    // 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;
+    // it is safe to use cpu_hal_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(cpu_hal_get_core_id()) | size;
     ((esp_tracedata_hdr_t *)ptr)->wr_sz = 0;
     return ptr + sizeof(esp_tracedata_hdr_t);
 }
@@ -290,7 +270,7 @@ uint8_t *esp_apptrace_membufs_up_buffer_get(esp_apptrace_membufs_proto_data_t *p
     uint8_t *buf_ptr = NULL;
 
     if (size > ESP_APPTRACE_USR_DATA_LEN_MAX(proto)) {
-        ESP_APPTRACE_LOGE("Too large user data size %" PRIu32 "!", size);
+        ESP_APPTRACE_LOGE("Too large user data size %d!", size);
         return NULL;
     }
 
@@ -320,21 +300,21 @@ uint8_t *esp_apptrace_membufs_up_buffer_get(esp_apptrace_membufs_proto_data_t *p
 #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);
+            ESP_APPTRACE_LOGD("Block full. Get %d 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);
+                ESP_APPTRACE_LOGD(" full. Get %d 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);
+                    ESP_APPTRACE_LOGD("Got %d 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);
+            ESP_APPTRACE_LOGD("Get %d bytes from  buffer", size);
             // fit to curr  nlock
             buf_ptr = ESP_APPTRACE_INBLOCK(proto)->start + ESP_APPTRACE_INBLOCK_MARKER(proto);
             // update cur block marker
@@ -351,7 +331,7 @@ uint8_t *esp_apptrace_membufs_up_buffer_get(esp_apptrace_membufs_proto_data_t *p
 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);
-    // TODO: mark block as busy in order not to reuse it for other tracing calls until it is completely written
+    // TODO: mark block as busy in order not to re-use 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
     // this is abnormal situation can be detected on host which will receive only uncompleted buffers
@@ -364,12 +344,12 @@ esp_err_t esp_apptrace_membufs_flush_nolock(esp_apptrace_membufs_proto_data_t *p
     int res = ESP_OK;
 
     if (ESP_APPTRACE_INBLOCK_MARKER(proto) < min_sz) {
-        ESP_APPTRACE_LOGI("Ignore flush request for min %" PRIu32 " bytes. Bytes in  block: %" PRIu32, min_sz, ESP_APPTRACE_INBLOCK_MARKER(proto));
+        ESP_APPTRACE_LOGI("Ignore flush request for min %d bytes. Bytes in  block: %d.", 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
     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 %d bytes. Wait until block switch for %lld us", ESP_APPTRACE_INBLOCK_MARKER(proto), tmo->tmo);
         res = esp_apptrace_membufs_swap_waitus(proto, tmo);
         if (res != ESP_OK) {
             if (tmo->tmo != ESP_APPTRACE_TMO_INFINITE)

components/app_trace/app_trace_util.c

@@ -1,22 +1,28 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_app_trace_util.h"
 #include "sdkconfig.h"
 
-#define ESP_APPTRACE_PRINT_LOCK 0
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////// Locks /////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 #if ESP_APPTRACE_PRINT_LOCK
-static esp_apptrace_lock_t s_log_lock = { .mux = portMUX_INITIALIZER_UNLOCKED };
+static esp_apptrace_lock_t s_log_lock = {.irq_stat = 0, .portmux = portMUX_INITIALIZER_UNLOCKED};
 #endif
 
 int esp_apptrace_log_lock(void)
@@ -33,7 +39,7 @@ int esp_apptrace_log_lock(void)
 
 void esp_apptrace_log_unlock(void)
 {
-#if ESP_APPTRACE_PRINT_LOCK
+ #if ESP_APPTRACE_PRINT_LOCK
     esp_apptrace_lock_give(&s_log_lock);
 #endif
 }
@@ -59,26 +65,45 @@ esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo)
 
 esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *tmo)
 {
-    esp_err_t ret;
+    int res;
 
     while (1) {
-        // Try enter a critical section (i.e., take the spinlock) with 0 timeout
-        if (portTRY_ENTER_CRITICAL(&(lock->mux), 0) == pdTRUE) {
+        // do not overwrite lock->int_state before we actually acquired the mux
+        unsigned int_state = portENTER_CRITICAL_NESTED();
+        // FIXME: if mux is busy it is not good idea to loop during the whole tmo with disabled IRQs.
+        // So we check mux state using zero tmo, restore IRQs and let others tasks/IRQs to run on this CPU
+        // while we are doing our own tmo check.
+#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
+        bool success = vPortCPUAcquireMutexTimeout(&lock->mux, 0, __FUNCTION__, __LINE__);
+#else
+        bool success = vPortCPUAcquireMutexTimeout(&lock->mux, 0);
+#endif
+        if (success) {
+            lock->int_state = int_state;
             return ESP_OK;
         }
-        // Failed to enter the critical section, so interrupts are still enabled. Check if we have timed out.
-        ret = esp_apptrace_tmo_check(tmo);
-        if (ret != ESP_OK) {
-            break;  // Timed out, exit now
+        portEXIT_CRITICAL_NESTED(int_state);
+        // we can be preempted from this place till the next call (above) to portENTER_CRITICAL_NESTED()
+        res = esp_apptrace_tmo_check(tmo);
+        if (res != ESP_OK) {
+            break;
         }
-        // Haven't timed out, try again
     }
-    return ret;
+    return res;
 }
 
 esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock)
 {
-    portEXIT_CRITICAL(&(lock->mux));
+    // save lock's irq state value for this CPU
+    unsigned int_state = lock->int_state;
+    // after call to the following func we can not be sure that lock->int_state
+    // is not overwritten by other CPU who has acquired the mux just after we released it. See esp_apptrace_lock_take().
+#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
+    vPortCPUReleaseMutex(&lock->mux, __FUNCTION__, __LINE__);
+#else
+    vPortCPUReleaseMutex(&lock->mux);
+#endif
+    portEXIT_CRITICAL_NESTED(int_state);
     return ESP_OK;
 }
 
@@ -89,7 +114,7 @@ esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock)
 uint8_t *esp_apptrace_rb_produce(esp_apptrace_rb_t *rb, uint32_t size)
 {
     uint8_t *ptr = rb->data + rb->wr;
-    // check for available space
+    // check for avalable space
     if (rb->rd <= rb->wr) {
         // |?R......W??|
         if (rb->wr + size >= rb->size) {

components/app_trace/component.mk

@@ -0,0 +1,41 @@
+#
+# Component Makefile
+#
+
+COMPONENT_SRCDIRS := .
+
+ifdef CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
+COMPONENT_SRCDIRS += port/xtensa
+endif
+
+COMPONENT_ADD_INCLUDEDIRS = include
+
+COMPONENT_PRIV_INCLUDEDIRS = private_include \
+	port/include
+
+COMPONENT_ADD_LDFLAGS = -lapp_trace
+
+ifdef CONFIG_APPTRACE_SV_ENABLE
+
+COMPONENT_ADD_INCLUDEDIRS += \
+	sys_view/Config \
+	sys_view/SEGGER \
+	sys_view/Sample/OS
+
+COMPONENT_SRCDIRS += \
+	gcov \
+	sys_view/SEGGER \
+	sys_view/Sample/OS \
+	sys_view/Sample/Config \
+	sys_view/esp \
+	sys_view/ext
+else
+ifdef CONFIG_APPTRACE_GCOV_ENABLE
+# do not produce gcov info for this module, it is used as transport for gcov
+CFLAGS := $(subst --coverage,,$(CFLAGS))
+COMPONENT_ADD_LDFLAGS += -Wl,--undefined=gcov_rtio_atexit
+COMPONENT_SRCDIRS += gcov
+endif
+endif
+
+COMPONENT_ADD_LDFRAGMENTS += linker.lf

components/app_trace/debug_stubs.c

@@ -1,101 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// This module implements debug/trace stubs. The stub is a piece of special code which can invoked by OpenOCD
-// Currently one stub is used for GCOV functionality
-//
-
-#include "esp_private/startup_internal.h"
-#include "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.
-    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.
-        - data_alloc, 4 bytes; Address of function to allocate memory on target.
-        - data_free, 4 bytes; Address of function to free target memory.
-    This entry is used by OpenOCD code to invoke other stub entries and allocate memory for them.
- */
-
-#include "esp_log.h"
-const static char *TAG = "esp_dbg_stubs";
-
-#define ESP_DBG_STUBS_CODE_BUF_SIZE         32
-#define ESP_DBG_STUBS_STACK_MIN_SIZE        2048
-
-#define DBG_STUB_TRAMP_ATTR                 IRAM_ATTR
-
-static struct {
-    uint32_t    tramp_addr;
-    uint32_t    min_stack_addr; // minimal stack addr
-    uint32_t    data_alloc;
-    uint32_t    data_free;
-} s_dbg_stubs_ctl_data;
-
-static uint32_t s_stub_entry[ESP_DBG_STUB_ENTRY_MAX];
-static uint8_t s_stub_min_stack[ESP_DBG_STUBS_STACK_MIN_SIZE];
-static DBG_STUB_TRAMP_ATTR uint8_t s_stub_code_buf[ESP_DBG_STUBS_CODE_BUF_SIZE];
-
-extern void esp_dbg_stubs_ll_init(void *stub_table_addr);
-
-// TODO: all called funcs should be in IRAM to work with disabled flash cache
-static void * esp_dbg_stubs_data_alloc(uint32_t size)
-{
-    ESP_LOGV(TAG, "%s %"PRIu32, __func__, size);
-    void *p = malloc(size);
-    ESP_LOGV(TAG, "%s EXIT %p", __func__, p);
-    return p;
-}
-
-static void esp_dbg_stubs_data_free(void *addr)
-{
-    ESP_LOGV(TAG, "%s %p", __func__, addr);
-    free(addr);
-}
-
-void esp_dbg_stubs_init(void)
-{
-    s_dbg_stubs_ctl_data.tramp_addr     = (uint32_t)s_stub_code_buf;
-    s_dbg_stubs_ctl_data.min_stack_addr = (uint32_t)s_stub_min_stack;
-    s_dbg_stubs_ctl_data.data_alloc     = (uint32_t)esp_dbg_stubs_data_alloc;
-    s_dbg_stubs_ctl_data.data_free      = (uint32_t)esp_dbg_stubs_data_free;
-
-    s_stub_entry[ESP_DBG_STUB_MAGIC_NUM] = ESP_DBG_STUB_MAGIC_NUM_VAL;
-    s_stub_entry[ESP_DBG_STUB_TABLE_SIZE] = ESP_DBG_STUB_ENTRY_MAX;
-    s_stub_entry[ESP_DBG_STUB_CONTROL_DATA] = (uint32_t)&s_dbg_stubs_ctl_data;
-    esp_dbg_stubs_ll_init(s_stub_entry);
-}
-
-// TODO: add lock mechanism. Not now but in the future ESP_DBG_STUB_ENTRY_CAPABILITIES can be set from different places.
-esp_err_t esp_dbg_stub_entry_set(esp_dbg_stub_id_t id, uint32_t entry)
-{
-    if (id < ESP_DBG_STUB_ENTRY_FIRST || id >= ESP_DBG_STUB_ENTRY_MAX) {
-        ESP_LOGE(TAG, "Invalid stub id %d!", id);
-        return ESP_ERR_INVALID_ARG;
-    }
-    s_stub_entry[id] = entry;
-
-    return ESP_OK;
-}
-
-esp_err_t esp_dbg_stub_entry_get(esp_dbg_stub_id_t id, uint32_t *entry)
-{
-    if (id < ESP_DBG_STUB_ENTRY_FIRST || id >= ESP_DBG_STUB_ENTRY_MAX) {
-        ESP_LOGE(TAG, "Invalid stub id %d!", id);
-        return ESP_ERR_INVALID_ARG;
-    }
-    *entry = s_stub_entry[id];
-
-    return ESP_OK;
-}
-
-ESP_SYSTEM_INIT_FN(init_dbg_stubs, SECONDARY, BIT(0), 140)
-{
-    esp_dbg_stubs_init();
-    return ESP_OK;
-}

components/app_trace/gcov/gcov_rtio.c

@@ -1,8 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // This module implements runtime file I/O API for GCOV.
 
@@ -11,18 +19,24 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
+#include "soc/cpu.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 "esp_private/dbg_stubs.h"
+#include "esp_ipc.h"
 #include "hal/wdt_hal.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/libc_stubs.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/libc_stubs.h"
+#endif
 
 #if CONFIG_APPTRACE_GCOV_ENABLE
 
 #define ESP_GCOV_DOWN_BUF_SIZE  4200
 
+#define LOG_LOCAL_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include "esp_log.h"
 const static char *TAG = "esp_gcov_rtio";
 static volatile bool s_create_gcov_task = false;
@@ -47,11 +61,18 @@ void gcov_dump_task(void *pvParameter)
     }
     ESP_EARLY_LOGV(TAG, "Config apptrace down buf");
     esp_apptrace_down_buffer_config(down_buf, ESP_GCOV_DOWN_BUF_SIZE);
+    /* we are directing the std outputs to the fake ones in order to reduce stack usage */
+    FILE *old_stderr = stderr;
+    FILE *old_stdout = stdout;
+    stderr = (FILE *) &__sf_fake_stderr;
+    stdout = (FILE *) &__sf_fake_stdout;
     ESP_EARLY_LOGV(TAG, "Dump data...");
     __gcov_dump();
     // reset dump status to allow incremental data accumulation
     __gcov_reset();
     free(down_buf);
+    stderr = old_stderr;
+    stdout = old_stdout;
     ESP_EARLY_LOGV(TAG, "Finish file transfer session");
     dump_result = esp_apptrace_fstop(ESP_APPTRACE_DEST_TRAX);
     if (dump_result != ESP_OK) {
@@ -72,15 +93,14 @@ gcov_exit:
 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);
+    xTaskCreatePinnedToCore(&gcov_dump_task, "gcov_dump_task", 2048, (void *)&s_gcov_task_running, configMAX_PRIORITIES - 1, NULL, 0);
 }
 
-static IRAM_ATTR
 void gcov_create_task_tick_hook(void)
 {
+    extern esp_err_t esp_ipc_start_gcov_from_isr(uint32_t cpu_id, esp_ipc_func_t func, void* arg);
     if (s_create_gcov_task) {
-        if (esp_ipc_call_nonblocking(xPortGetCoreID(), &gcov_create_task, NULL) == ESP_OK) {
+        if (esp_ipc_start_gcov_from_isr(xPortGetCoreID(), &gcov_create_task, NULL) == ESP_OK) {
             s_create_gcov_task = false;
         }
     }
@@ -100,19 +120,16 @@ static int esp_dbg_stub_gcov_entry(void)
     return ESP_OK;
 }
 
-void gcov_rtio_init(void)
+int gcov_rtio_atexit(void (*function)(void) __attribute__ ((unused)))
 {
-    uint32_t stub_entry = 0;
+    uint32_t capabilities = 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);
+    if (esp_dbg_stub_entry_get(ESP_DBG_STUB_ENTRY_CAPABILITIES, &capabilities) == ESP_OK) {
+        esp_dbg_stub_entry_set(ESP_DBG_STUB_ENTRY_CAPABILITIES, capabilities | ESP_DBG_STUB_CAP_GCOV_TASK);
+    }
     esp_register_freertos_tick_hook(gcov_create_task_tick_hook);
+    return ESP_OK;
 }
 
 void esp_gcov_dump(void)
@@ -172,26 +189,4 @@ long gcov_rtio_ftell(void *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

@@ -1,12 +1,22 @@
-/*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "sdkconfig.h"
+// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
 
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#include <sdkconfig.h>
+
+#define HEAP_TRACE_SRCFILE /* don't warn on inclusion here */
 #include "esp_heap_trace.h"
-#include "esp_heap_caps.h"
+#undef HEAP_TRACE_SRCFILE
+
 #if CONFIG_APPTRACE_SV_ENABLE
 #include "esp_app_trace.h"
 #include "esp_sysview_trace.h"
@@ -14,7 +24,7 @@
 
 #define STACK_DEPTH CONFIG_HEAP_TRACING_STACK_DEPTH
 
-#if CONFIG_HEAP_TRACING_TOHOST
+#ifdef CONFIG_HEAP_TRACING_TOHOST
 
 #if !CONFIG_APPTRACE_SV_ENABLE
 #error None of the heap tracing backends is enabled! You must enable SystemView compatible tracing to use this feature.
@@ -67,23 +77,13 @@ esp_err_t heap_trace_get(size_t index, heap_trace_record_t *record)
     return ESP_ERR_NOT_SUPPORTED;
 }
 
-esp_err_t heap_trace_summary(heap_trace_summary_t *summary)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
 void heap_trace_dump(void)
 {
     return;
 }
 
-void heap_trace_dump_caps(__attribute__((unused)) const uint32_t caps)
-{
-    return;
-}
-
 /* Add a new allocation to the heap trace records */
-static HEAP_IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
+static IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
 {
     if (!s_tracing) {
         return;
@@ -98,7 +98,7 @@ static HEAP_IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
    For HEAP_TRACE_ALL, this means filling in the freed_by pointer.
    For HEAP_TRACE_LEAKS, this means removing the record from the log.
 */
-static HEAP_IRAM_ATTR void record_free(void *p, void **callers)
+static IRAM_ATTR void record_free(void *p, void **callers)
 {
     if (!s_tracing) {
         return;

components/app_trace/host_file_io.c

@@ -1,8 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 // Hot It Works
 // ************
@@ -19,6 +27,7 @@
 
 #if CONFIG_APPTRACE_ENABLE
 
+#define LOG_LOCAL_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include "esp_log.h"
 const static char *TAG = "esp_host_file_io";
 
@@ -29,7 +38,6 @@ const static char *TAG = "esp_host_file_io";
 #define ESP_APPTRACE_FILE_CMD_FSEEK     0x4
 #define ESP_APPTRACE_FILE_CMD_FTELL     0x5
 #define ESP_APPTRACE_FILE_CMD_STOP      0x6 // indicates that there is no files to transfer
-#define ESP_APPTRACE_FILE_CMD_FEOF      0x7
 
 /** File operation header */
 typedef struct {
@@ -69,11 +77,6 @@ typedef struct {
     void *  file;
 } esp_apptrace_fseek_args_t;
 
-/** Helper structure for feof */
-typedef struct {
-    void *file;
-} esp_apptrace_feof_args_t;
-
 /** Helper structure for ftell */
 typedef struct {
     void *file;
@@ -122,7 +125,7 @@ static esp_err_t esp_apptrace_file_rsp_recv(esp_apptrace_dest_t dest, uint8_t *b
             ESP_EARLY_LOGE(TAG, "Failed to read (%d)!", ret);
             return ret;
         }
-        ESP_EARLY_LOGV(TAG, "%s read %" PRIu32 " bytes", __FUNCTION__, rd_size);
+        ESP_EARLY_LOGV(TAG, "%s read %d bytes", __FUNCTION__, rd_size);
         tot_rd += rd_size;
     }
 
@@ -234,11 +237,8 @@ size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t siz
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return 0;
     }
-    /* OpenOCD writes it like that:
-     *      fwrite(buf, size, 1, file);
-     * So, if 1 was returned that means fwrite succeed
-     */
-    return resp == 1 ? nmemb : 0;
+
+    return resp;
 }
 
 static void esp_apptrace_fread_args_prepare(uint8_t *buf, void *priv)
@@ -275,20 +275,14 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return 0;
     }
-    if (resp == 0) {
-        return 0;
+    if (resp > 0) {
+        ret = esp_apptrace_file_rsp_recv(dest, ptr, resp);
+        if (ret != ESP_OK) {
+            ESP_EARLY_LOGE(TAG, "Failed to read file data (%d)!", ret);
+            return 0;
+        }
     }
-
-    ret = esp_apptrace_file_rsp_recv(dest, ptr, resp);
-    if (ret != ESP_OK) {
-        ESP_EARLY_LOGE(TAG, "Failed to read file data (%d)!", ret);
-        return 0;
-    }
-    /* OpenOCD reads it like that:
-     *      fread(buf, 1 ,size, file);
-     * So, total read bytes count returns
-     */
-    return resp/size; // return the number of items read
+    return resp;
 }
 
 static void esp_apptrace_fseek_args_prepare(uint8_t *buf, void *priv)
@@ -367,34 +361,4 @@ int esp_apptrace_fstop(esp_apptrace_dest_t dest)
     return ret;
 }
 
-static void esp_apptrace_feof_args_prepare(uint8_t *buf, void *priv)
-{
-    esp_apptrace_feof_args_t *args = priv;
-
-    memcpy(buf, &args->file, sizeof(args->file));
-}
-
-int esp_apptrace_feof(esp_apptrace_dest_t dest, 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));
-    if (ret != ESP_OK) {
-        ESP_EARLY_LOGE(TAG, "Failed to send file cmd (%d)!", ret);
-        return EOF;
-    }
-
-    // now read the answer
-    int resp;
-    ret = esp_apptrace_file_rsp_recv(dest, (uint8_t *)&resp, sizeof(resp));
-    if (ret != ESP_OK) {
-        ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
-        return EOF;
-    }
-
-    return resp;
-}
-
 #endif

components/app_trace/include/esp_app_trace.h

@@ -1,8 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_H_
 #define ESP_APP_TRACE_H_
 
@@ -20,8 +28,8 @@ extern "C" {
 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_UART0,	                        ///< UART0 destination
+    ESP_APPTRACE_DEST_MAX = ESP_APPTRACE_DEST_UART0,
     ESP_APPTRACE_DEST_NUM
 } esp_apptrace_dest_t;
 
@@ -36,7 +44,7 @@ esp_err_t esp_apptrace_init(void);
 
 /**
  * @brief Configures down buffer.
- *        @note Needs to be called before attempting to receive any data using esp_apptrace_down_buffer_get and esp_apptrace_read.
+ *        @note Needs to be called before initiating any data transfer using esp_apptrace_buffer_get and esp_apptrace_write.
  *              This function does not protect internal data by lock.
  *
  * @param buf Address of buffer to use for down channel (host to target) data.
@@ -46,7 +54,7 @@ void 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.
+ *        After data in buffer are ready to be sent off 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.
@@ -57,8 +65,8 @@ void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size);
 uint8_t *esp_apptrace_buffer_get(esp_apptrace_dest_t dest, 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.
+ * @brief Indicates that the data in buffer are ready to be sent off.
+ *        This function is a counterpart of and must be preceeded 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.
@@ -81,7 +89,7 @@ esp_err_t esp_apptrace_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32
 esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_t size, uint32_t tmo);
 
 /**
- * @brief vprintf-like function to send log messages to host via specified HW interface.
+ * @brief vprintf-like function to sent 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.
@@ -93,7 +101,7 @@ esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_
 int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t tmo, const char *fmt, va_list ap);
 
 /**
- * @brief vprintf-like function to send log messages to host.
+ * @brief vprintf-like function to sent log messages to host.
  *
  * @param fmt  Address of format string.
  * @param ap   List of arguments.
@@ -114,7 +122,7 @@ esp_err_t esp_apptrace_flush(esp_apptrace_dest_t dest, 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.
+ *        This is 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.
@@ -138,7 +146,7 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *data, uint32_t *size
 
 /**
  * @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.
+ *        After data in buffer are 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.
@@ -149,8 +157,8 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *data, uint32_t *size
 uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, 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.
+ * @brief Indicates that the data in down buffer are processed.
+ *        This function is a counterpart of and must be preceeded 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.
@@ -245,7 +253,7 @@ int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int
 int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream);
 
 /**
- * @brief Indicates to the host that all file operations are complete.
+ * @brief Indicates to the host that all file operations are completed.
  *		  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.).
  *
@@ -255,17 +263,6 @@ int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream);
  */
 int esp_apptrace_fstop(esp_apptrace_dest_t dest);
 
-/**
- * @brief Test end-of-file indicator on a stream.
- *		  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);
-
 /**
  * @brief Triggers gcov info dump.
  *		  This function waits for the host to connect to target before dumping data.

components/app_trace/include/esp_app_trace_util.h

@@ -1,8 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_UTIL_H_
 #define ESP_APP_TRACE_UTIL_H_
 
@@ -57,7 +65,7 @@ static inline uint32_t esp_apptrace_tmo_remaining_us(esp_apptrace_tmo_t *tmo)
 
 /** Tracing module synchronization lock */
 typedef struct {
-    spinlock_t mux;
+    portMUX_TYPE mux;
     unsigned int_state;
 } esp_apptrace_lock_t;
 
@@ -68,7 +76,7 @@ typedef struct {
  */
 static inline void esp_apptrace_lock_init(esp_apptrace_lock_t *lock)
 {
-    portMUX_INITIALIZE(&lock->mux);
+    vPortCPUInitializeMutex(&lock->mux);
     lock->int_state = 0;
 }
 

components/app_trace/include/esp_sysview_trace.h

@@ -1,8 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_SYSVIEW_TRACE_H_
 #define ESP_SYSVIEW_TRACE_H_
 

components/app_trace/linker.lf

@@ -2,7 +2,6 @@
 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)
@@ -15,9 +14,10 @@ entries:
       SEGGER_SYSVIEW_FreeRTOS (noflash)
 
 [mapping:app_trace_driver]
-archive: libesp_driver_gptimer.a
+archive: libdriver.a
 entries:
-    if APPTRACE_SV_TS_SOURCE_GPTIMER = y:
-      gptimer: gptimer_get_raw_count (noflash)
+    if APPTRACE_SV_TS_SOURCE_TIMER_00 = y || APPTRACE_SV_TS_SOURCE_TIMER_01 = y
+       || APPTRACE_SV_TS_SOURCE_TIMER_10 = y || APPTRACE_SV_TS_SOURCE_TIMER_11 = y:
+      timer (noflash)
     else:
       * (default)

components/app_trace/port/include/esp_app_trace_port.h

@@ -1,9 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_PORT_H_
 #define ESP_APP_TRACE_PORT_H_
 

components/app_trace/port/port_uart.c

@@ -1,355 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "soc/soc.h"
-#include "esp_log.h"
-#include "esp_cpu.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 {
-    uint8_t                             inited;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_apptrace_lock_t                 lock;   // sync lock
-#endif
-    uart_port_t port_num;
-// TX data ring buffer
-    uint8_t *tx_data_buff;
-    int32_t tx_data_buff_in;
-    int32_t tx_data_buff_out;
-// TX message buffer
-    uint8_t *tx_msg_buff;
-    uint32_t tx_msg_buff_size;
-
-// RX message buffer
-    uint8_t *down_buffer;
-    uint32_t down_buffer_size;
-// 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)
-{
-#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_uart_unlock(esp_apptrace_uart_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_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)
-{
-    esp_err_t res = esp_apptrace_uart_lock(hw_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;
-
-    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 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;
-        } 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);
-        }
-        if (hw_data->tx_data_buff_in >= APP_TRACE_MAX_TX_BUFF_UART) {
-            hw_data->tx_data_buff_in = 0;
-        }
-    } else {
-        hw_data->circular_buff_overflow = true;
-    }
-
-    if (esp_apptrace_uart_unlock(hw_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)
-{
-    if (hw_data->tx_data_buff_in == hw_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;
-    } 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;
-        }
-    }
-}
-
-#define APP_TRACE_UART_STOP_WAIT_TMO    1000000 //us
-
-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_tmo_t tmo;
-    esp_apptrace_tmo_init(&tmo, APP_TRACE_UART_STOP_WAIT_TMO);
-
-    vTaskDelay(10);
-    while (1) {
-        send_buff_data(hw_data, &tmo);
-        vTaskDelay(10);
-        if (hw_data->circular_buff_overflow == true)
-        {
-            hw_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;
-            ESP_LOGE(TAG, "Message size more then message buffer!");
-        }
-    }
-}
-
-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)
-{
-    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){
-            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)
-        {
-            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;
-
-        assert((hw_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)
-            source_clk = LP_UART_SCLK_DEFAULT;
-#endif
-
-        const uart_config_t uart_config = {
-            .baud_rate = CONFIG_APPTRACE_UART_BAUDRATE,
-            .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);
-        // 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!");
-
-        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);
-        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);
-#endif
-    }
-    // init UART on this CPU
-    esp_apptrace_uart_hw_init();
-    hw_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)
-{
-    uint8_t *ptr;
-    if (size > APP_TRACE_MAX_TX_MSG_UART) {
-        hw_data->message_buff_overflow = true;
-        return NULL;
-    }
-    if (hw_data->tx_msg_buff_size != 0)
-    {
-        // A previous message was not sent.
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-    ptr = hw_data->tx_msg_buff;
-    hw_data->tx_msg_buff_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) {
-        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)
-{
-    esp_err_t res = esp_apptrace_send_uart_data(hw_data, (const char *)ptr, hw_data->tx_msg_buff_size, tmo);
-    // Clear size to indicate that we've sent data
-    hw_data->tx_msg_buff_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)
-{
-    hw_data->down_buffer = (uint8_t *)malloc(size);
-    if (hw_data->down_buffer == NULL){
-        assert(false && "Failed to allocate apptrace uart down buffer!");
-    }
-    hw_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)
-{
-    uint8_t *ptr = NULL;
-
-    if (*size > hw_data->down_buffer_size) {
-        return NULL;
-    }
-
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    size_t uart_fifolen = 0;
-    uart_get_buffered_data_len(hw_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);
-    }
-
-    if (esp_apptrace_uart_unlock(hw_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)
-{
-    return ESP_OK;
-}
-
-static bool esp_apptrace_uart_host_is_connected(esp_apptrace_uart_data_t *hw_data)
-{
-    return hw_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)
-{
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_uart_flush(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-    return ESP_OK;
-}
-
-#endif // APPTRACE_DEST_UART

components/app_trace/port/riscv/port.c

@@ -1,15 +1,6 @@
-/*
- * 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 {
@@ -29,6 +20,8 @@ typedef struct {
     esp_apptrace_mem_block_t *  mem_blocks;
 } esp_apptrace_riscv_ctrl_block_t;
 
+#define RISCV_APPTRACE_SYSNR    0x64
+
 #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)
@@ -38,7 +31,7 @@ typedef struct {
 #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()*/))
+#define ESP_APPTRACE_RISCV_INITED(_hw_)          ((_hw_)->inited & (1 << 0/*cpu_hal_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);
@@ -50,20 +43,19 @@ static uint8_t *esp_apptrace_riscv_down_buffer_get(esp_apptrace_riscv_data_t *hw
 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, uint32_t prev_block_len);
+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 esp_apptrace_riscv_ctrl_block_t s_tracing_ctrl[portNUM_PROCESSORS];
 
-static APPTRACE_DRAM_ATTR esp_apptrace_riscv_ctrl_block_t s_tracing_ctrl[CONFIG_FREERTOS_NUMBER_OF_CORES];
+esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
+{
+    return NULL;
+}
 
 esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
 {
@@ -98,18 +90,33 @@ esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
 }
 
 /* Advertises apptrace control block address to host.
-   This function can be overridden with custom implementation,
+   This function can be overriden 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()) {
+    register int sys_nr = RISCV_APPTRACE_SYSNR;
+    register int host_ret = 0;
+
+    if (!esp_cpu_in_ocd_debug_mode()) {
         return 0;
     }
-    return (int) semihosting_call_noerrno(ESP_SEMIHOSTING_SYS_APPTRACE_INIT, (long*)ctrl_block_addr);
+    __asm__ volatile ( \
+        ".option push\n" \
+        ".option norvc\n" \
+        "mv a0, %[sys_nr]\n" \
+        "mv a1, %[arg1]\n" \
+        "slli    zero,zero,0x1f\n" \
+        "ebreak\n" \
+        "srai    zero,zero,0x7\n" \
+        "mv %[host_ret], a0\n" \
+    	".option pop\n" \
+        :[host_ret]"=r"(host_ret)
+        :[sys_nr]"r"(sys_nr),[arg1]"r"(ctrl_block_addr):"a0","a1");
+    return host_ret;
 }
 
 /* Returns up buffers config.
-   This function can be overridden with custom implementation,
+   This function can be overriden 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])
 {
@@ -147,7 +154,7 @@ static esp_err_t esp_apptrace_riscv_unlock(esp_apptrace_riscv_data_t *hw_data)
 
 static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data)
 {
-    int core_id = esp_cpu_get_core_id();
+    int core_id = cpu_hal_get_core_id();
 
     if (hw_data->inited == 0) {
         esp_apptrace_mem_block_t mem_blocks_cfg[2];
@@ -165,13 +172,13 @@ static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data)
     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,
+        ESP_APPTRACE_LOGD("Mem buf[%d] %d 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!");
+    assert(res == 0 && "Falied to send config to host!");
 
     return ESP_OK;
 }
@@ -261,7 +268,7 @@ static bool esp_apptrace_riscv_host_is_connected(esp_apptrace_riscv_data_t *hw_d
     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;
+    return s_tracing_ctrl[cpu_hal_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)
@@ -305,13 +312,13 @@ static inline void esp_apptrace_riscv_buffer_swap_lock(void)
     // 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;
+    s_tracing_ctrl[cpu_hal_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;
+    s_tracing_ctrl[cpu_hal_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 (
@@ -325,13 +332,13 @@ static esp_err_t esp_apptrace_riscv_buffer_swap_start(uint32_t curr_block_id)
 
     esp_apptrace_riscv_buffer_swap_lock();
 
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t ctrl_reg = s_tracing_ctrl[cpu_hal_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,
+            ESP_APPTRACE_LOGD("[%d]: Can not switch %x %d %x %x/%lx", cpu_hal_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;
@@ -345,15 +352,15 @@ _on_err:
 
 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 ctrl_reg = s_tracing_ctrl[cpu_hal_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) |
+    s_tracing_ctrl[cpu_hal_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)
+static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id)
 {
     /* do nothing */
     return ESP_OK;
@@ -361,7 +368,7 @@ static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id, uint32_t
 
 static bool esp_apptrace_riscv_host_data_pending(void)
 {
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t ctrl_reg = s_tracing_ctrl[cpu_hal_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/xtensa/port.c

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- */
-
 //
 // How It Works
 // ************
@@ -12,7 +6,7 @@
 // ======================
 
 // 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
+// Exectution 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
@@ -47,7 +41,7 @@
 // 2. TRAX Registers layout
 // ========================
 
-// This module uses two TRAX HW registers and one Performance Monitor register to communicate with host SW (OpenOCD).
+// This module uses two TRAX HW registers 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.
@@ -55,15 +49,9 @@
 //    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.
+// - 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' setion for details.
 
 // 3. Modes of operation
 // =====================
@@ -133,7 +121,7 @@
 
 // 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
+// ISRs running on both cores. Also custom mutex allows specifying timeout for locking operation. Locking routine checks underlaying 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.
@@ -148,32 +136,40 @@
 
 // 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.
+// - Trace data are locked by another task/ISR. When wating 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
+// When wating 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_access.h"
+#if CONFIG_IDF_TARGET_ESP32
 #include "soc/dport_reg.h"
-#include "soc/tracemem_config.h"
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#elif CONFIG_IDF_TARGET_ESP32S2
 #include "soc/sensitive_reg.h"
 #endif
 #include "eri.h"
-#include "esp_private/trax.h"
-#include "esp_cpu.h"
+#include "trax.h"
 #include "esp_log.h"
 #include "esp_app_trace_membufs_proto.h"
 #include "esp_app_trace_port.h"
-#include "esp_rom_crc.h"
+
+// TODO: move these (and same definitions in trax.c to dport_reg.h)
+#if CONFIG_IDF_TARGET_ESP32
+#define TRACEMEM_MUX_PROBLK0_APPBLK1            0
+#define TRACEMEM_MUX_BLK0_ONLY                  1
+#define TRACEMEM_MUX_BLK1_ONLY                  2
+#define TRACEMEM_MUX_PROBLK1_APPBLK0            3
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define TRACEMEM_MUX_BLK0_NUM                   19
+#define TRACEMEM_MUX_BLK1_NUM                   20
+#define TRACEMEM_BLK_NUM2ADDR(_n_)              (0x3FFB8000UL + 0x4000UL*((_n_)-4))
+#endif
 
 // 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)
@@ -184,7 +180,19 @@
 #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_INITED(_hw_)          ((_hw_)->inited & (1 << cpu_hal_get_core_id()))
+
+#if CONFIG_IDF_TARGET_ESP32
+static uint8_t * const s_trax_blocks[] = {
+    (uint8_t *) 0x3FFFC000,
+    (uint8_t *) 0x3FFF8000
+};
+#elif CONFIG_IDF_TARGET_ESP32S2
+static uint8_t * const s_trax_blocks[] = {
+    (uint8_t *)TRACEMEM_BLK_NUM2ADDR(TRACEMEM_MUX_BLK0_NUM),
+    (uint8_t *)TRACEMEM_BLK_NUM2ADDR(TRACEMEM_MUX_BLK1_NUM)
+};
+#endif
 
 #define ESP_APPTRACE_TRAX_BLOCK_SIZE            (0x4000UL)
 
@@ -208,17 +216,17 @@ static uint8_t *esp_apptrace_trax_down_buffer_get(esp_apptrace_trax_data_t *hw_d
 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, uint32_t prev_block_len);
+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_uart_hw_get(int num, void **data)
+{
+    return NULL;
+}
 
 esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
 {
@@ -282,7 +290,7 @@ static inline void esp_apptrace_trax_hw_init(void)
     // 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());
+    ESP_APPTRACE_LOGI("Initialized TRAX on CPU%d", cpu_hal_get_core_id());
 }
 
 static inline void esp_apptrace_trax_select_memory_block(int block_num)
@@ -292,14 +300,6 @@ static inline void esp_apptrace_trax_select_memory_block(int block_num)
     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
 }
 
@@ -308,7 +308,7 @@ 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
+#if CONFIG_FREERTOS_UNICORE == 0
         /* Enable trace memory on APP CPU */
         DPORT_WRITE_PERI_REG(DPORT_APP_TRACEMEM_ENA_REG, DPORT_APP_TRACEMEM_ENA_M);
 #endif
@@ -321,7 +321,7 @@ static inline void esp_apptrace_trax_memory_enable(void)
 
 static esp_err_t esp_apptrace_trax_init(esp_apptrace_trax_data_t *hw_data)
 {
-    int core_id = esp_cpu_get_core_id();
+    int core_id = cpu_hal_get_core_id();
 
     // 'esp_apptrace_trax_init()' is called on every core, so ensure to do main initialization only once
     if (core_id == 0) {
@@ -508,8 +508,7 @@ static esp_err_t esp_apptrace_trax_buffer_swap_start(uint32_t curr_block_id)
         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,
+            ESP_APPTRACE_LOGD("HC[%d]: Can not switch %x %d %x %x/%lx", cpu_hal_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;
@@ -525,22 +524,14 @@ static esp_err_t esp_apptrace_trax_buffer_swap_end(uint32_t new_block_id, uint32
 {
     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)
+static esp_err_t esp_apptrace_trax_buffer_swap(uint32_t new_block_id)
 {
-    /* 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;
 }

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,9 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_MEMBUFS_PROTO_H_
 #define ESP_APP_TRACE_MEMBUFS_PROTO_H_
 
@@ -29,7 +36,7 @@ typedef struct {
 
 typedef struct {
     esp_err_t (*swap_start)(uint32_t curr_block_id);
-    esp_err_t (*swap)(uint32_t new_block_id, uint32_t prev_block_len);
+    esp_err_t (*swap)(uint32_t new_block_id);
     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;

components/app_trace/project_include.cmake

@@ -2,28 +2,24 @@
 #
 # Create coverage report.
 function(idf_create_coverage_report report_dir)
-    set(gcov_tool ${_CMAKE_TOOLCHAIN_PREFIX}gcov)
+    set(gcov_tool ${CONFIG_SDK_TOOLPREFIX}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}"
+        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
+        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
+        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}
+        COMMAND gcovr -r ${project_dir} --gcov-executable ${gcov_tool} -s --html-details ${report_dir}/html/index.html
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS pre-cov-report
         )
@@ -33,9 +29,7 @@ endfunction()
 #
 # 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})
+        COMMENT "Clean coverage report in: ${report_dir}"
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${report_dir})
 endfunction()

components/app_trace/sdkconfig.rename

@@ -14,6 +14,10 @@ CONFIG_ESP32_GCOV_ENABLE								CONFIG_APPTRACE_GCOV_ENABLE
 CONFIG_SYSVIEW_ENABLE							        CONFIG_APPTRACE_SV_ENABLE
 CONFIG_SYSVIEW_TS_SOURCE							    CONFIG_APPTRACE_SV_TS_SOURCE
 CONFIG_SYSVIEW_TS_SOURCE_CCOUNT							CONFIG_APPTRACE_SV_TS_SOURCE_CCOUNT
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_00						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_01						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_01
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_10						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_10
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_11						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_11
 CONFIG_SYSVIEW_TS_SOURCE_ESP_TIMER						CONFIG_APPTRACE_SV_TS_SOURCE_ESP_TIMER
 CONFIG_SYSVIEW_MAX_TASKS							    CONFIG_APPTRACE_SV_MAX_TASKS
 CONFIG_SYSVIEW_BUF_WAIT_TMO							    CONFIG_APPTRACE_SV_BUF_WAIT_TMO

components/app_trace/sys_view/Config/Global.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ----------------------------------------------------------------------
@@ -57,7 +62,6 @@ Purpose : Global types
           merge the files. In order to use Segger code, the types
           U8, U16, U32, I8, I16, I32 need to be defined in Global.h;
           additional definitions do not hurt.
-Revision: $Rev: 12501 $
 ---------------------------END-OF-HEADER------------------------------
 */
 
@@ -65,26 +69,13 @@ Revision: $Rev: 12501 $
 #define GLOBAL_H
 
 #define U8    unsigned char
-#define I8    signed char
 #define U16   unsigned short
-#define I16   signed short
-#ifdef __x86_64__
-#define U32   unsigned
-#define I32   int
-#else
 #define U32   unsigned long
+#define I8    signed char
+#define I16   signed short
 #define I32   signed long
-#endif
 
-//
-// CC_NO_LONG_SUPPORT can be defined to compile test
-// without long support for compilers that do not
-// support C99 and its long type.
-//
-#ifdef CC_NO_LONG_SUPPORT
-  #define PTR_ADDR  U32
-#else  // Supports long type.
-#if defined(_WIN32) && !defined(__clang__) && !defined(__MINGW32__)
+#ifdef _WIN32
   //
   // Microsoft VC6 compiler related
   //
@@ -106,13 +97,6 @@ Revision: $Rev: 12501 $
   #define U64_C(x) x##ULL
 #endif
 
-#if (defined(_WIN64) || defined(__LP64__))  // 64-bit symbols used by Visual Studio and GCC, maybe others as well.
-  #define PTR_ADDR  U64
-#else
-  #define PTR_ADDR  U32
-#endif
-#endif  // Supports long type.
-
 #endif                      // Avoid multiple inclusion
 
 /*************************** End of file ****************************/

components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ---------------------------END-OF-HEADER------------------------------
@@ -55,7 +60,7 @@ File    : SEGGER_RTT_Conf.h
 Purpose : Implementation of SEGGER real-time transfer (RTT) which
           allows real-time communication on targets which support
           debugger memory accesses while the CPU is running.
-Revision: $Rev: 24316 $
+Revision: $Rev: 5626 $
 
 */
 
@@ -73,65 +78,15 @@ Revision: $Rev: 24316 $
 **********************************************************************
 */
 
-//
-// Take in and set to correct values for Cortex-A systems with CPU cache
-//
-//#define SEGGER_RTT_CPU_CACHE_LINE_SIZE            (32)          // Largest cache line size (in bytes) in the current system
-//#define SEGGER_RTT_UNCACHED_OFF                   (0xFB000000)  // Address alias where RTT CB and buffers can be accessed uncached
-//
-// Most common case:
-// Up-channel 0: RTT
-// Up-channel 1: SystemView
-//
-#ifndef   SEGGER_RTT_MAX_NUM_UP_BUFFERS
-  #define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (3)     // Max. number of up-buffers (T->H) available on this target    (Default: 3)
-#endif
-//
-// Most common case:
-// Down-channel 0: RTT
-// Down-channel 1: SystemView
-//
-#ifndef   SEGGER_RTT_MAX_NUM_DOWN_BUFFERS
-  #define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (3)     // Max. number of down-buffers (H->T) available on this target  (Default: 3)
-#endif
+#define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (3)     // Max. number of up-buffers (T->H) available on this target    (Default: 3)
+#define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (3)     // Max. number of down-buffers (H->T) available on this target  (Default: 3)
 
-#ifndef   BUFFER_SIZE_UP
-  #define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
-#endif
+#define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
+#define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
 
-#ifndef   BUFFER_SIZE_DOWN
-  #define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
-#endif
+#define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
 
-#ifndef   SEGGER_RTT_PRINTF_BUFFER_SIZE
-  #define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
-#endif
-
-#ifndef   SEGGER_RTT_MODE_DEFAULT
-  #define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
-#endif
-
-/*********************************************************************
-*
-*       RTT memcpy configuration
-*
-*       memcpy() is good for large amounts of data,
-*       but the overhead is big for small amounts, which are usually stored via RTT.
-*       With SEGGER_RTT_MEMCPY_USE_BYTELOOP a simple byte loop can be used instead.
-*
-*       SEGGER_RTT_MEMCPY() can be used to replace standard memcpy() in RTT functions.
-*       This is may be required with memory access restrictions,
-*       such as on Cortex-A devices with MMU.
-*/
-#ifndef   SEGGER_RTT_MEMCPY_USE_BYTELOOP
-  #define SEGGER_RTT_MEMCPY_USE_BYTELOOP              0 // 0: Use memcpy/SEGGER_RTT_MEMCPY, 1: Use a simple byte-loop
-#endif
-//
-// Example definition of SEGGER_RTT_MEMCPY to external memcpy with GCC toolchains and Cortex-A targets
-//
-//#if ((defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)) && (defined (__ARM_ARCH_7A__))
-//  #define SEGGER_RTT_MEMCPY(pDest, pSrc, NumBytes)      SEGGER_memcpy((pDest), (pSrc), (NumBytes))
-//#endif
+#define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
 
 //
 // Target is not allowed to perform other RTT operations while string still has not been stored completely.
@@ -147,64 +102,64 @@ Revision: $Rev: 24316 $
 // In case of doubt mask all interrupts: 1 << (8 - BASEPRI_PRIO_BITS) i.e. 1 << 5 when 3 bits are implemented in NVIC
 // or define SEGGER_RTT_LOCK() to completely disable interrupts.
 //
-#ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
-  #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY         (0x20)   // Interrupt priority to lock on SEGGER_RTT_LOCK on Cortex-M3/4 (Default: 0x20)
-#endif
+
+#define SEGGER_RTT_MAX_INTERRUPT_PRIORITY         (0x20)   // Interrupt priority to lock on SEGGER_RTT_LOCK on Cortex-M3/4 (Default: 0x20)
 
 /*********************************************************************
 *
 *       RTT lock configuration for SEGGER Embedded Studio,
 *       Rowley CrossStudio and GCC
 */
-#if ((defined(__SES_ARM) || defined(__SES_RISCV) || defined(__CROSSWORKS_ARM) || defined(__GNUC__) || defined(__clang__)) && !defined (__CC_ARM) && !defined(WIN32))
-  #if (defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_8M_BASE__))
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                    unsigned int _SEGGER_RTT__LockState;                                         \
+                                    unsigned int LockState;                                         \
                                   __asm volatile ("mrs   %0, primask  \n\t"                         \
-                                                  "movs  r1, #1       \n\t"                         \
+                                                  "mov   r1, $1     \n\t"                           \
                                                   "msr   primask, r1  \n\t"                         \
-                                                  : "=r" (_SEGGER_RTT__LockState)                                \
+                                                  : "=r" (LockState)                                \
                                                   :                                                 \
-                                                  : "r1", "cc"                                      \
+                                                  : "r1"                                            \
                                                   );
 
     #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   primask, %0  \n\t"                         \
                                                   :                                                 \
-                                                  : "r" (_SEGGER_RTT__LockState)                                 \
+                                                  : "r" (LockState)                                 \
                                                   :                                                 \
                                                   );                                                \
                                 }
-  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
+
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                    unsigned int _SEGGER_RTT__LockState;                                         \
+                                    unsigned int LockState;                                         \
                                   __asm volatile ("mrs   %0, basepri  \n\t"                         \
                                                   "mov   r1, %1       \n\t"                         \
                                                   "msr   basepri, r1  \n\t"                         \
-                                                  : "=r" (_SEGGER_RTT__LockState)                                \
+                                                  : "=r" (LockState)                                \
                                                   : "i"(SEGGER_RTT_MAX_INTERRUPT_PRIORITY)          \
-                                                  : "r1", "cc"                                      \
+                                                  : "r1"                                            \
                                                   );
 
     #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   basepri, %0  \n\t"                         \
                                                   :                                                 \
-                                                  : "r" (_SEGGER_RTT__LockState)                                 \
+                                                  : "r" (LockState)                                 \
                                                   :                                                 \
                                                   );                                                \
                                 }
 
-  #elif (defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__))
+  #elif defined(__ARM_ARCH_7A__)
     #define SEGGER_RTT_LOCK() {                                                \
-                                 unsigned int _SEGGER_RTT__LockState;                       \
+                                 unsigned int LockState;                       \
                                  __asm volatile ("mrs r1, CPSR \n\t"           \
                                                  "mov %0, r1 \n\t"             \
                                                  "orr r1, r1, #0xC0 \n\t"      \
                                                  "msr CPSR_c, r1 \n\t"         \
-                                                 : "=r" (_SEGGER_RTT__LockState)            \
+                                                 : "=r" (LockState)            \
                                                  :                             \
-                                                 : "r1", "cc"                  \
+                                                 : "r1"                        \
                                                  );
 
     #define SEGGER_RTT_UNLOCK() __asm volatile ("mov r0, %0 \n\t"              \
@@ -214,30 +169,11 @@ Revision: $Rev: 24316 $
                                                 "orr r1, r1, r0 \n\t"          \
                                                 "msr CPSR_c, r1 \n\t"          \
                                                 :                              \
-                                                : "r" (_SEGGER_RTT__LockState)              \
-                                                : "r0", "r1", "cc"             \
+                                                : "r" (LockState)              \
+                                                : "r0", "r1"                   \
                                                 );                             \
                             }
-  #elif defined(__riscv) || defined(__riscv_xlen)
-    #define SEGGER_RTT_LOCK()  {                                               \
-                                 unsigned int _SEGGER_RTT__LockState;                       \
-                                 __asm volatile ("csrr  %0, mstatus  \n\t"     \
-                                                 "csrci mstatus, 8   \n\t"     \
-                                                 "andi  %0, %0,  8   \n\t"     \
-                                                 : "=r" (_SEGGER_RTT__LockState)            \
-                                                 :                             \
-                                                 :                             \
-                                                );
-
-  #define SEGGER_RTT_UNLOCK()    __asm volatile ("csrr  a1, mstatus  \n\t"     \
-                                                 "or    %0, %0, a1   \n\t"     \
-                                                 "csrs  mstatus, %0  \n\t"     \
-                                                 :                             \
-                                                 : "r"  (_SEGGER_RTT__LockState)            \
-                                                 : "a1"                        \
-                                                );                             \
-                               }
-  #else
+#else
     #define SEGGER_RTT_LOCK()
     #define SEGGER_RTT_UNLOCK()
   #endif
@@ -248,53 +184,25 @@ Revision: $Rev: 24316 $
 *       RTT lock configuration for IAR EWARM
 */
 #ifdef __ICCARM__
-  #if (defined (__ARM6M__)          && (__CORE__ == __ARM6M__))             ||                      \
-      (defined (__ARM8M_BASELINE__) && (__CORE__ == __ARM8M_BASELINE__))
+  #if (defined (__ARM6M__) && (__CORE__ == __ARM6M__))
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_PRIMASK();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_PRIMASK();                                      \
                                   __set_PRIMASK(1);
 
-    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(LockState);                                         \
                                 }
-  #elif (defined (__ARM7EM__)         && (__CORE__ == __ARM7EM__))          ||                      \
-        (defined (__ARM7M__)          && (__CORE__ == __ARM7M__))           ||                      \
-        (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))  ||                      \
-        (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))
+  #elif ((defined (__ARM7EM__) && (__CORE__ == __ARM7EM__)) || (defined (__ARM7M__) && (__CORE__ == __ARM7M__)))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_BASEPRI();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_BASEPRI();                                      \
                                   __set_BASEPRI(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
 
-    #define SEGGER_RTT_UNLOCK()   __set_BASEPRI(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_BASEPRI(LockState);                                         \
                                 }
-  #elif (defined (__ARM7A__) && (__CORE__ == __ARM7A__))                    ||                      \
-        (defined (__ARM7R__) && (__CORE__ == __ARM7R__))
-    #define SEGGER_RTT_LOCK() {                                                                     \
-                                 unsigned int _SEGGER_RTT__LockState;                                            \
-                                 __asm volatile ("mrs r1, CPSR \n\t"                                \
-                                                 "mov %0, r1 \n\t"                                  \
-                                                 "orr r1, r1, #0xC0 \n\t"                           \
-                                                 "msr CPSR_c, r1 \n\t"                              \
-                                                 : "=r" (_SEGGER_RTT__LockState)                                 \
-                                                 :                                                  \
-                                                 : "r1", "cc"                                       \
-                                                 );
-
-    #define SEGGER_RTT_UNLOCK() __asm volatile ("mov r0, %0 \n\t"                                   \
-                                                "mrs r1, CPSR \n\t"                                 \
-                                                "bic r1, r1, #0xC0 \n\t"                            \
-                                                "and r0, r0, #0xC0 \n\t"                            \
-                                                "orr r1, r1, r0 \n\t"                               \
-                                                "msr CPSR_c, r1 \n\t"                               \
-                                                :                                                   \
-                                                : "r" (_SEGGER_RTT__LockState)                                   \
-                                                : "r0", "r1", "cc"                                  \
-                                                );                                                  \
-                            }
   #endif
 #endif
 
@@ -304,25 +212,11 @@ Revision: $Rev: 24316 $
 */
 #ifdef __ICCRX__
   #define SEGGER_RTT_LOCK()   {                                                                     \
-                                unsigned long _SEGGER_RTT__LockState;                                            \
-                                _SEGGER_RTT__LockState = __get_interrupt_state();                                \
+                                unsigned long LockState;                                            \
+                                LockState = __get_interrupt_state();                                \
                                 __disable_interrupt();
 
-  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(_SEGGER_RTT__LockState);                                   \
-                              }
-#endif
-
-/*********************************************************************
-*
-*       RTT lock configuration for IAR RL78
-*/
-#ifdef __ICCRL78__
-  #define SEGGER_RTT_LOCK()   {                                                                     \
-                                __istate_t _SEGGER_RTT__LockState;                                               \
-                                _SEGGER_RTT__LockState = __get_interrupt_state();                                \
-                                __disable_interrupt();
-
-  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(_SEGGER_RTT__LockState);                                   \
+  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(LockState);                                   \
                               }
 #endif
 
@@ -333,13 +227,13 @@ Revision: $Rev: 24316 $
 #ifdef __CC_ARM
   #if (defined __TARGET_ARCH_6S_M)
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  register unsigned char _SEGGER_RTT__PRIMASK __asm( "primask");                 \
-                                  _SEGGER_RTT__LockState = _SEGGER_RTT__PRIMASK;                                              \
-                                  _SEGGER_RTT__PRIMASK = 1u;                                                     \
+                                  unsigned int LockState;                                           \
+                                  register unsigned char PRIMASK __asm( "primask");                 \
+                                  LockState = PRIMASK;                                              \
+                                  PRIMASK = 1u;                                                     \
                                   __schedule_barrier();
 
-    #define SEGGER_RTT_UNLOCK()   _SEGGER_RTT__PRIMASK = _SEGGER_RTT__LockState;                                              \
+    #define SEGGER_RTT_UNLOCK()   PRIMASK = LockState;                                              \
                                   __schedule_barrier();                                             \
                                 }
   #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
@@ -347,13 +241,13 @@ Revision: $Rev: 24316 $
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
+                                  unsigned int LockState;                                           \
                                   register unsigned char BASEPRI __asm( "basepri");                 \
-                                  _SEGGER_RTT__LockState = BASEPRI;                                              \
+                                  LockState = BASEPRI;                                              \
                                   BASEPRI = SEGGER_RTT_MAX_INTERRUPT_PRIORITY;                      \
                                   __schedule_barrier();
 
-    #define SEGGER_RTT_UNLOCK()   BASEPRI = _SEGGER_RTT__LockState;                                              \
+    #define SEGGER_RTT_UNLOCK()   BASEPRI = LockState;                                              \
                                   __schedule_barrier();                                             \
                                 }
   #endif
@@ -366,67 +260,38 @@ Revision: $Rev: 24316 $
 #ifdef __TI_ARM__
   #if defined (__TI_ARM_V6M0__)
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_PRIMASK();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_PRIMASK();                                      \
                                   __set_PRIMASK(1);
 
-    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(LockState);                                         \
                                 }
   #elif (defined (__TI_ARM_V7M3__) || defined (__TI_ARM_V7M4__))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = _set_interrupt_priority(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
+                                  unsigned int LockState;                                           \
+                                  LockState = OS_GetBASEPRI();                                      \
+                                  OS_SetBASEPRI(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
 
-    #define SEGGER_RTT_UNLOCK()   _set_interrupt_priority(_SEGGER_RTT__LockState);                               \
+    #define SEGGER_RTT_UNLOCK()   OS_SetBASEPRI(LockState);                                         \
                                 }
   #endif
 #endif
 
-/*********************************************************************
-*
-*       RTT lock configuration for CCRX
-*/
-#ifdef __RX
-  #include <machine.h>
-  #define SEGGER_RTT_LOCK()   {                                                                     \
-                                unsigned long _SEGGER_RTT__LockState;                                            \
-                                _SEGGER_RTT__LockState = get_psw() & 0x010000;                                   \
-                                clrpsw_i();
-
-  #define SEGGER_RTT_UNLOCK()   set_psw(get_psw() | _SEGGER_RTT__LockState);                                     \
-                              }
-#endif
-
-/*********************************************************************
-*
-*       RTT lock configuration for embOS Simulation on Windows
-*       (Can also be used for generic RTT locking with embOS)
-*/
-#if defined(WIN32) || defined(SEGGER_RTT_LOCK_EMBOS)
-
-void OS_SIM_EnterCriticalSection(void);
-void OS_SIM_LeaveCriticalSection(void);
-
-#define SEGGER_RTT_LOCK()       {                                                                   \
-                                  OS_SIM_EnterCriticalSection();
-
-#define SEGGER_RTT_UNLOCK()       OS_SIM_LeaveCriticalSection();                                    \
-                                }
-#endif
-
 /*********************************************************************
 *
 *       RTT lock configuration fallback
 */
 #ifndef   SEGGER_RTT_LOCK
-  #define SEGGER_RTT_LOCK()                // Lock RTT (nestable)   (i.e. disable interrupts)
+  void SEGGER_SYSVIEW_X_RTT_Lock(void);
+  #define SEGGER_RTT_LOCK()                SEGGER_SYSVIEW_X_RTT_Lock() // Lock RTT (nestable)   (i.e. disable interrupts)
 #endif
 
 #ifndef   SEGGER_RTT_UNLOCK
-  #define SEGGER_RTT_UNLOCK()              // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
+  void SEGGER_SYSVIEW_X_RTT_Unlock(void);
+  #define SEGGER_RTT_UNLOCK()              SEGGER_SYSVIEW_X_RTT_Unlock() // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
 #endif
 
 #endif

components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -47,43 +52,127 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 
 File    : SEGGER_SYSVIEW_Conf.h
-Purpose : SEGGER SystemView configuration file.
-          Set defines which deviate from the defaults (see SEGGER_SYSVIEW_ConfDefaults.h) here.
-Revision: $Rev: 21292 $
-
-Additional information:
-  Required defines which must be set are:
-    SEGGER_SYSVIEW_GET_TIMESTAMP
-    SEGGER_SYSVIEW_GET_INTERRUPT_ID
-  For known compilers and cores, these might be set to good defaults
-  in SEGGER_SYSVIEW_ConfDefaults.h.
-
-  SystemView needs a (nestable) locking mechanism.
-  If not defined, the RTT locking mechanism is used,
-  which then needs to be properly configured.
+Purpose : SEGGER SystemView configuration.
+Revision: $Rev: 5927 $
 */
 
 #ifndef SEGGER_SYSVIEW_CONF_H
 #define SEGGER_SYSVIEW_CONF_H
 
+#include "soc/soc.h"
+
+/*********************************************************************
+*
+*       Defines, fixed
+*
+**********************************************************************
+*/
+//
+// Constants for known core configuration
+//
+#define SEGGER_SYSVIEW_CORE_OTHER   0
+#define SEGGER_SYSVIEW_CORE_CM0     1 // Cortex-M0/M0+/M1
+#define SEGGER_SYSVIEW_CORE_CM3     2 // Cortex-M3/M4/M7
+#define SEGGER_SYSVIEW_CORE_RX      3 // Renesas RX
+
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__ICCARM__)
+  #if (defined (__ARM6M__) && (__CORE__ == __ARM6M__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif ((defined (__ARM7M__) && (__CORE__ == __ARM7M__)) || (defined (__ARM7EM__) && (__CORE__ == __ARM7EM__)))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__CC_ARM)
+  #if (defined(__TARGET_ARCH_6S_M))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__TI_ARM__)
+  #ifdef __TI_ARM_V6M0__
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__TI_ARM_V7M3__) || defined(__TI_ARM_V7M4__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__ICCRX__)
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
+#elif defined(__RX)
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
+#endif
+
+#ifndef   SEGGER_SYSVIEW_CORE
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_OTHER
+#endif
+
 /*********************************************************************
 *
 *       Defines, configurable
 *
 **********************************************************************
 */
+/*********************************************************************
+*
+*       SystemView buffer configuration
+*/
+#define SEGGER_SYSVIEW_RTT_BUFFER_SIZE      1024                                // Number of bytes that SystemView uses for the buffer.
+#define SEGGER_SYSVIEW_RTT_CHANNEL          1                                   // The RTT channel that SystemView will use. 0: Auto selection
+
+#define SEGGER_SYSVIEW_USE_STATIC_BUFFER    1                                   // Use a static buffer to generate events instead of a buffer on the stack
+
+#define SEGGER_SYSVIEW_POST_MORTEM_MODE     0                                   // 1: Enable post mortem analysis mode
 
 /*********************************************************************
-* TODO: Add your defines here.                                       *
-**********************************************************************
+*
+*       SystemView timestamp configuration
 */
+#if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
+  #define SEGGER_SYSVIEW_GET_TIMESTAMP()      (*(U32 *)(0xE0001004))            // Retrieve a system timestamp. Cortex-M cycle counter.
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS       32                                // Define number of valid bits low-order delivered by clock source
+#else
+  #define SEGGER_SYSVIEW_GET_TIMESTAMP()      SEGGER_SYSVIEW_X_GetTimestamp()   // Retrieve a system timestamp via user-defined function
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS       32                                // Define number of valid bits low-order delivered by SEGGER_SYSVIEW_X_GetTimestamp()
+#endif
 
+/*********************************************************************
+*
+*       SystemView Id configuration
+*/
+//TODO: optimise it
+#define SEGGER_SYSVIEW_ID_BASE         SOC_DROM_LOW                             // Default value for the lowest Id reported by the application. Can be overridden by the application via SEGGER_SYSVIEW_SetRAMBase(). (i.e. 0x20000000 when all Ids are an address in this RAM)
+#define SEGGER_SYSVIEW_ID_SHIFT        0                                        // Number of bits to shift the Id to save bandwidth. (i.e. 2 when Ids are 4 byte aligned)
+
+/*********************************************************************
+*
+*       SystemView interrupt configuration
+*/
+#if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
+  #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32 *)(0xE000ED04)) & 0x1FF)  // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[8:0] = active vector)
+#elif SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM0
+  #if defined(__ICCARM__)
+    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   (__get_IPSR())                  // Workaround for IAR, which might do a byte-access to 0xE000ED04. Read IPSR instead.
+  #else
+    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32 *)(0xE000ED04)) & 0x3F) // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[5:0] = active vector)
+  #endif
+#else
+  #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   SEGGER_SYSVIEW_X_GetInterruptId() // Get the currently active interrupt Id from the user-provided function.
+#endif
+
+unsigned SEGGER_SYSVIEW_X_SysView_Lock(void);
+void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state);
+// to be recursive save IRQ status on the stack of the caller
+#define SEGGER_SYSVIEW_LOCK()   unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock()
+#define SEGGER_SYSVIEW_UNLOCK() SEGGER_SYSVIEW_X_SysView_Unlock(_SYSVIEW_int_state)
 
 #endif  // SEGGER_SYSVIEW_CONF_H
 

components/app_trace/sys_view/SEGGER/SEGGER.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -49,20 +52,18 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.56                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ----------------------------------------------------------------------
 File    : SEGGER.h
 Purpose : Global types etc & general purpose utility functions
-Revision: $Rev: 18102 $
 ---------------------------END-OF-HEADER------------------------------
 */
 
 #ifndef SEGGER_H            // Guard against multiple inclusion
 #define SEGGER_H
 
-#include <stdarg.h>         // For va_list.
 #include "Global.h"         // Type definitions: U8, U16, U32, I8, I16, I32
 
 #if defined(__cplusplus)
@@ -77,28 +78,18 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 */
 
 #ifndef INLINE
-  #if (defined(__ICCARM__) || defined(__RX) || defined(__ICCRX__))
+  #ifdef _WIN32
     //
-    // Other known compilers.
+    // Microsoft VC6 and newer.
+    // Force inlining without cost checking.
     //
-    #define INLINE  inline
+    #define INLINE  __forceinline
   #else
-    #if (defined(_WIN32) && !defined(__clang__))
+    #if (defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__) || defined(__RX) || defined(__ICCRX__))
       //
-      // Microsoft VC6 and newer.
-      // Force inlining without cost checking.
+      // Other known compilers.
       //
-      #define INLINE  __forceinline
-    #elif defined(__GNUC__) || defined(__clang__)
-      //
-      // Force inlining with GCC + clang
-      //
-      #define INLINE inline __attribute__((always_inline))
-    #elif (defined(__CC_ARM))
-      //
-      // Force inlining with ARMCC (Keil)
-      //
-      #define INLINE  __inline
+      #define INLINE  inline
     #else
       //
       // Unknown compilers.
@@ -119,29 +110,6 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 #define SEGGER_MIN(a,b)            (((a) < (b)) ? (a) : (b))
 #define SEGGER_MAX(a,b)            (((a) > (b)) ? (a) : (b))
 
-#ifndef   SEGGER_USE_PARA                   // Some compiler complain about unused parameters.
-  #define SEGGER_USE_PARA(Para) (void)Para  // This works for most compilers.
-#endif
-
-#define SEGGER_ADDR2PTR(Type, Addr)  (/*lint -e(923) -e(9078)*/((Type*)((PTR_ADDR)(Addr))))    // Allow cast from address to pointer.
-#define SEGGER_PTR2ADDR(p)           (/*lint -e(923) -e(9078)*/((PTR_ADDR)(p)))                // Allow cast from pointer to address.
-#define SEGGER_PTR2PTR(Type, p)      (/*lint -e(740) -e(826) -e(9079) -e(9087)*/((Type*)(p)))  // Allow cast from one pointer type to another (ignore different size).
-#define SEGGER_PTR_DISTANCE(p0, p1)  (SEGGER_PTR2ADDR(p0) - SEGGER_PTR2ADDR(p1))
-
-/*********************************************************************
-*
-*       Defines
-*
-**********************************************************************
-*/
-
-#define SEGGER_PRINTF_FLAG_ADJLEFT    (1 << 0)
-#define SEGGER_PRINTF_FLAG_SIGNFORCE  (1 << 1)
-#define SEGGER_PRINTF_FLAG_SIGNSPACE  (1 << 2)
-#define SEGGER_PRINTF_FLAG_PRECEED    (1 << 3)
-#define SEGGER_PRINTF_FLAG_ZEROPAD    (1 << 4)
-#define SEGGER_PRINTF_FLAG_NEGATIVE   (1 << 5)
-
 /*********************************************************************
 *
 *       Types
@@ -150,45 +118,18 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 */
 
 typedef struct {
-  char* pBuffer;
+  char *pBuffer;
   int   BufferSize;
   int   Cnt;
 } SEGGER_BUFFER_DESC;
 
 typedef struct {
-  unsigned int CacheLineSize;                             // 0: No Cache. Most Systems such as ARM9 use a 32 bytes cache line size.
-  void (*pfDMB)       (void);                             // Optional DMB function for Data Memory Barrier to make sure all memory operations are completed.
-  void (*pfClean)     (void *p, unsigned long NumBytes);  // Optional clean function for cached memory.
-  void (*pfInvalidate)(void *p, unsigned long NumBytes);  // Optional invalidate function for cached memory.
+  int  CacheLineSize;                                // 0: No Cache. Most Systems such as ARM9 use a 32 bytes cache line size.
+  void (*pfDMB)       (void);                        // Optional DMB function for Data Memory Barrier to make sure all memory operations are completed.
+  void (*pfClean)     (void *p, unsigned NumBytes);  // Optional clean function for cached memory.
+  void (*pfInvalidate)(void *p, unsigned NumBytes);  // Optional invalidate function for cached memory.
 } SEGGER_CACHE_CONFIG;
 
-typedef struct SEGGER_SNPRINTF_CONTEXT_struct SEGGER_SNPRINTF_CONTEXT;
-
-struct SEGGER_SNPRINTF_CONTEXT_struct {
-  void*               pContext;                       // Application specific context.
-  SEGGER_BUFFER_DESC* pBufferDesc;                    // Buffer descriptor to use for output.
-  void (*pfFlush)(SEGGER_SNPRINTF_CONTEXT* pContext); // Callback executed once the buffer is full. Callback decides if the buffer gets cleared to store more or not.
-};
-
-typedef struct {
-  void (*pfStoreChar)       (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, char c);
-  int  (*pfPrintUnsigned)   (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, U32 v, unsigned Base, char Flags, int Width, int Precision);
-  int  (*pfPrintInt)        (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, I32 v, unsigned Base, char Flags, int Width, int Precision);
-} SEGGER_PRINTF_API;
-
-typedef void (*SEGGER_pFormatter)(SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, const SEGGER_PRINTF_API* pApi, va_list* pParamList, char Lead, int Width, int Precision);
-
-typedef struct SEGGER_PRINTF_FORMATTER {
-  struct SEGGER_PRINTF_FORMATTER* pNext;              // Pointer to next formatter.
-  SEGGER_pFormatter               pfFormatter;        // Formatter function.
-  char                            Specifier;          // Format specifier.
-} SEGGER_PRINTF_FORMATTER;
-
-typedef struct {
-  U32 (*pfGetHPTimestamp)(void);          // Mandatory, pfGetHPTimestamp
-  int (*pfGetUID)        (U8 abUID[16]);  // Optional,  pfGetUID
-} SEGGER_BSP_API;
-
 /*********************************************************************
 *
 *       Utility functions
@@ -196,55 +137,14 @@ typedef struct {
 **********************************************************************
 */
 
-//
-// Memory operations.
-//
-void SEGGER_ARM_memcpy(void* pDest, const void* pSrc, int NumBytes);
-void SEGGER_memcpy    (void* pDest, const void* pSrc, unsigned NumBytes);
-void SEGGER_memxor    (void* pDest, const void* pSrc, unsigned NumBytes);
+void SEGGER_ARM_memcpy   (void *pDest, const void *pSrc, int NumBytes);
+void SEGGER_memcpy       (void *pDest, const void *pSrc, int NumBytes);
+void SEGGER_memxor       (void *pDest, const void *pSrc, unsigned NumBytes);
+void SEGGER_StoreChar    (SEGGER_BUFFER_DESC *p, char c);
+void SEGGER_PrintUnsigned(SEGGER_BUFFER_DESC *pBufferDesc, U32 v, unsigned Base, int NumDigits);
+void SEGGER_PrintInt     (SEGGER_BUFFER_DESC *pBufferDesc, I32 v, unsigned Base, unsigned NumDigits);
+int  SEGGER_snprintf     (char *pBuffer, int BufferSize, const char *sFormat, ...);
 
-//
-// String functions.
-//
-int      SEGGER_atoi       (const char* s);
-int      SEGGER_isalnum    (int c);
-int      SEGGER_isalpha    (int c);
-unsigned SEGGER_strlen     (const char* s);
-int      SEGGER_tolower    (int c);
-int      SEGGER_strcasecmp (const char* sText1, const char* sText2);
-int      SEGGER_strncasecmp(const char *sText1, const char *sText2, unsigned Count);
-
-//
-// Buffer/printf related.
-//
-void SEGGER_StoreChar    (SEGGER_BUFFER_DESC* pBufferDesc, char c);
-void SEGGER_PrintUnsigned(SEGGER_BUFFER_DESC* pBufferDesc, U32 v, unsigned Base, int Precision);
-void SEGGER_PrintInt     (SEGGER_BUFFER_DESC* pBufferDesc, I32 v, unsigned Base, int Precision);
-int  SEGGER_snprintf     (char* pBuffer, int BufferSize, const char* sFormat, ...);
-int  SEGGER_vsnprintf    (char* pBuffer, int BufferSize, const char* sFormat, va_list ParamList);
-int  SEGGER_vsnprintfEx  (SEGGER_SNPRINTF_CONTEXT* pContext, const char* sFormat, va_list ParamList);
-
-int  SEGGER_PRINTF_AddFormatter       (SEGGER_PRINTF_FORMATTER* pFormatter, SEGGER_pFormatter pfFormatter, char c);
-void SEGGER_PRINTF_AddDoubleFormatter (void);
-void SEGGER_PRINTF_AddIPFormatter     (void);
-void SEGGER_PRINTF_AddBLUEFormatter   (void);
-void SEGGER_PRINTF_AddCONNECTFormatter(void);
-void SEGGER_PRINTF_AddSSLFormatter    (void);
-void SEGGER_PRINTF_AddSSHFormatter    (void);
-void SEGGER_PRINTF_AddHTMLFormatter   (void);
-
-//
-// BSP abstraction API.
-//
-int  SEGGER_BSP_GetUID  (U8 abUID[16]);
-int  SEGGER_BSP_GetUID32(U32* pUID);
-void SEGGER_BSP_SetAPI  (const SEGGER_BSP_API* pAPI);
-void SEGGER_BSP_SeedUID (void);
-
-//
-// Other API.
-//
-void SEGGER_VERSION_GetString(char acText[8], unsigned Version);
 
 #if defined(__cplusplus)
 }                /* Make sure we have C-declarations in C++ programs */

components/app_trace/sys_view/SEGGER/SEGGER_RTT.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.56                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ---------------------------END-OF-HEADER------------------------------
@@ -55,235 +60,14 @@ File    : SEGGER_RTT.h
 Purpose : Implementation of SEGGER real-time transfer which allows
           real-time communication on targets which support debugger
           memory accesses while the CPU is running.
-Revision: $Rev: 25842 $
+Revision: $Rev: 5626 $
 ----------------------------------------------------------------------
 */
 
 #ifndef SEGGER_RTT_H
 #define SEGGER_RTT_H
 
-#include "../Config/SEGGER_RTT_Conf.h"
-
-/*********************************************************************
-*
-*       Defines, defaults
-*
-**********************************************************************
-*/
-
-#ifndef RTT_USE_ASM
-  //
-  // Some cores support out-of-order memory accesses (reordering of memory accesses in the core)
-  // For such cores, we need to define a memory barrier to guarantee the order of certain accesses to the RTT ring buffers.
-  // Needed for:
-  //   Cortex-M7 (ARMv7-M)
-  //   Cortex-M23 (ARM-v8M)
-  //   Cortex-M33 (ARM-v8M)
-  //   Cortex-A/R (ARM-v7A/R)
-  //
-  // We do not explicitly check for "Embedded Studio" as the compiler in use determines what we support.
-  // You can use an external toolchain like IAR inside ES. So there is no point in checking for "Embedded Studio"
-  //
-  #if (defined __CROSSWORKS_ARM)                  // Rowley Crossworks
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #if (defined __ARM_ARCH_7M__)                 // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined(__ARM_ARCH_8_1M_MAIN__))       // Cortex-M85
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif (defined __ARMCC_VERSION)
-    //
-    // ARM compiler
-    // ARM compiler V6.0 and later is clang based.
-    // Our ASM part is compatible to clang.
-    //
-    #if (__ARMCC_VERSION >= 6000000)
-      #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #else
-      #define _CC_HAS_RTT_ASM_SUPPORT 0
-    #endif
-    #if (defined __ARM_ARCH_6M__)                 // Cortex-M0 / M1
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0         // No ASM support for this architecture
-    #elif (defined __ARM_ARCH_7M__)               // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8_1M_MAIN__)        // Cortex-M85
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif ((defined __ARM_ARCH_7A__) || (defined __ARM_ARCH_7R__))  // Cortex-A/R 32-bit ARMv7-A/R
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif ((defined __GNUC__) || (defined __clang__))
-    //
-    // GCC / Clang
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    // ARM 7/9: __ARM_ARCH_5__ / __ARM_ARCH_5E__ / __ARM_ARCH_5T__ / __ARM_ARCH_5T__ / __ARM_ARCH_5TE__
-    #if (defined __ARM_ARCH_7M__)                 // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1         // Only Cortex-M7 needs a DMB but we cannot distinguish M4 and M7 here...
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8_1M_MAIN__)        // Cortex-M85
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif ((defined __ARM_ARCH_7A__) || (defined __ARM_ARCH_7R__))  // Cortex-A/R 32-bit ARMv7-A/R
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif ((defined __IASMARM__) || (defined __ICCARM__))
-    //
-    // IAR assembler/compiler
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #if (__VER__ < 6300000)
-      #define VOLATILE
-    #else
-      #define VOLATILE volatile
-    #endif
-    #if (defined __ARM7M__)                            // Needed for old versions that do not know the define yet
-      #if (__CORE__ == __ARM7M__)                      // Cortex-M3
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #endif
-    #endif
-    #if (defined __ARM7EM__)
-      #if (__CORE__ == __ARM7EM__)                     // Cortex-M4/M7
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8M_BASELINE__)
-      #if (__CORE__ == __ARM8M_BASELINE__)             // Cortex-M23
-        #define _CORE_HAS_RTT_ASM_SUPPORT 0
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8M_MAINLINE__)
-      #if (__CORE__ == __ARM8M_MAINLINE__)             // Cortex-M33
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8EM_MAINLINE__)
-      #if (__CORE__ == __ARM8EM_MAINLINE__)            // Cortex-???
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM7A__)
-      #if (__CORE__ == __ARM7A__)                      // Cortex-A 32-bit ARMv7-A
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM7R__)
-      #if (__CORE__ == __ARM7R__)                      // Cortex-R 32-bit ARMv7-R
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-// TBD: __ARM8A__ => Cortex-A 64-bit ARMv8-A
-// TBD: __ARM8R__ => Cortex-R 64-bit ARMv8-R
-  #else
-    //
-    // Other compilers
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT   0
-    #define _CORE_HAS_RTT_ASM_SUPPORT 0
-  #endif
-  //
-  // If IDE and core support the ASM version, enable ASM version by default
-  //
-  #ifndef _CORE_HAS_RTT_ASM_SUPPORT
-    #define _CORE_HAS_RTT_ASM_SUPPORT 0              // Default for unknown cores
-  #endif
-  #if (_CC_HAS_RTT_ASM_SUPPORT && _CORE_HAS_RTT_ASM_SUPPORT)
-    #define RTT_USE_ASM                           (1)
-  #else
-    #define RTT_USE_ASM                           (0)
-  #endif
-#endif
-
-#ifndef _CORE_NEEDS_DMB
-  #define _CORE_NEEDS_DMB 0
-#endif
-
-#ifndef RTT__DMB
-  #if _CORE_NEEDS_DMB
-    #error "Don't know how to place inline assembly for DMB"
-  #else
-    #define RTT__DMB()
-  #endif
-#endif
-
-#ifndef SEGGER_RTT_CPU_CACHE_LINE_SIZE
-  #define SEGGER_RTT_CPU_CACHE_LINE_SIZE (0)   // On most target systems where RTT is used, we do not have a CPU cache, therefore 0 is a good default here
-#endif
-
-#ifndef SEGGER_RTT_UNCACHED_OFF
-  #if SEGGER_RTT_CPU_CACHE_LINE_SIZE
-    #error "SEGGER_RTT_UNCACHED_OFF must be defined when setting SEGGER_RTT_CPU_CACHE_LINE_SIZE != 0"
-  #else
-    #define SEGGER_RTT_UNCACHED_OFF (0)
-  #endif
-#endif
-#if RTT_USE_ASM
-  #if SEGGER_RTT_CPU_CACHE_LINE_SIZE
-    #error "RTT_USE_ASM is not available if SEGGER_RTT_CPU_CACHE_LINE_SIZE != 0"
-  #endif
-#endif
-
-#ifndef SEGGER_RTT_ASM  // defined when SEGGER_RTT.h is included from assembly file
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdint.h>
+#include "SEGGER_RTT_Conf.h"
 
 /*********************************************************************
 *
@@ -292,21 +76,6 @@ Revision: $Rev: 25842 $
 **********************************************************************
 */
 
-//
-// Determine how much we must pad the control block to make it a multiple of a cache line in size
-// Assuming: U8 = 1B
-//           U16 = 2B
-//           U32 = 4B
-//           U8/U16/U32* = 4B
-//
-#if SEGGER_RTT_CPU_CACHE_LINE_SIZE    // Avoid division by zero in case we do not have any cache
-  #define SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(NumBytes) (((NumBytes + SEGGER_RTT_CPU_CACHE_LINE_SIZE - 1) / SEGGER_RTT_CPU_CACHE_LINE_SIZE) * SEGGER_RTT_CPU_CACHE_LINE_SIZE)
-#else
-  #define SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(NumBytes) (NumBytes)
-#endif
-#define SEGGER_RTT__CB_SIZE                              (16 + 4 + 4 + (SEGGER_RTT_MAX_NUM_UP_BUFFERS * 24) + (SEGGER_RTT_MAX_NUM_DOWN_BUFFERS * 24))
-#define SEGGER_RTT__CB_PADDING                           (SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(SEGGER_RTT__CB_SIZE) - SEGGER_RTT__CB_SIZE)
-
 /*********************************************************************
 *
 *       Types
@@ -324,7 +93,7 @@ typedef struct {
             unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
             unsigned WrOff;         // Position of next item to be written by either target.
   volatile  unsigned RdOff;         // Position of next item to be read by host. Must be volatile since it may be modified by host.
-            unsigned Flags;         // Contains configuration flags. Flags[31:24] are used for validity check and must be zero. Flags[23:2] are reserved for future use. Flags[1:0] = RTT operating mode.
+            unsigned Flags;         // Contains configuration flags
 } SEGGER_RTT_BUFFER_UP;
 
 //
@@ -337,7 +106,7 @@ typedef struct {
             unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
   volatile  unsigned WrOff;         // Position of next item to be written by host. Must be volatile since it may be modified by host.
             unsigned RdOff;         // Position of next item to be read by target (down-buffer).
-            unsigned Flags;         // Contains configuration flags. Flags[31:24] are used for validity check and must be zero. Flags[23:2] are reserved for future use. Flags[1:0] = RTT operating mode.
+            unsigned Flags;         // Contains configuration flags
 } SEGGER_RTT_BUFFER_DOWN;
 
 //
@@ -351,9 +120,6 @@ typedef struct {
   int                     MaxNumDownBuffers;                        // Initialized to SEGGER_RTT_MAX_NUM_DOWN_BUFFERS (type. 2)
   SEGGER_RTT_BUFFER_UP    aUp[SEGGER_RTT_MAX_NUM_UP_BUFFERS];       // Up buffers, transferring information up from target via debug probe to host
   SEGGER_RTT_BUFFER_DOWN  aDown[SEGGER_RTT_MAX_NUM_DOWN_BUFFERS];   // Down buffers, transferring information down from host via debug probe to target
-#if SEGGER_RTT__CB_PADDING
-  unsigned char           aDummy[SEGGER_RTT__CB_PADDING];
-#endif
 } SEGGER_RTT_CB;
 
 /*********************************************************************
@@ -380,7 +146,6 @@ int          SEGGER_RTT_ConfigDownBuffer        (unsigned BufferIndex, const cha
 int          SEGGER_RTT_GetKey                  (void);
 unsigned     SEGGER_RTT_HasData                 (unsigned BufferIndex);
 int          SEGGER_RTT_HasKey                  (void);
-unsigned     SEGGER_RTT_HasDataUp               (unsigned BufferIndex);
 void         SEGGER_RTT_Init                    (void);
 unsigned     SEGGER_RTT_Read                    (unsigned BufferIndex,       void* pBuffer, unsigned BufferSize);
 unsigned     SEGGER_RTT_ReadNoLock              (unsigned BufferIndex,       void* pData,   unsigned BufferSize);
@@ -392,17 +157,10 @@ int          SEGGER_RTT_WaitKey                 (void);
 unsigned     SEGGER_RTT_Write                   (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteNoLock             (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteSkipNoLock         (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_ASM_WriteSkipNoLock     (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteString             (unsigned BufferIndex, const char* s);
 void         SEGGER_RTT_WriteWithOverwriteNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_PutChar                 (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_PutCharSkip             (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_PutCharSkipNoLock       (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_GetAvailWriteSpace      (unsigned BufferIndex);
-unsigned     SEGGER_RTT_GetBytesInBuffer        (unsigned BufferIndex);
-
-void         SEGGER_RTT_ESP_FlushNoLock         (unsigned long min_sz, unsigned long tmo);
-void         SEGGER_RTT_ESP_Flush               (unsigned long min_sz, unsigned long tmo);
+void         SEGGER_RTT_ESP_FlushNoLock       (unsigned long min_sz, unsigned long tmo);
+void         SEGGER_RTT_ESP_Flush             (unsigned long min_sz, unsigned long tmo);
 //
 // Function macro for performance optimization
 //
@@ -410,31 +168,14 @@ void         SEGGER_RTT_ESP_Flush               (unsigned long min_sz, unsigned
 // For ESP32 we use our own implementation of RTT, so this macro should not check SEGGER's RTT buffer state.
 #define      SEGGER_RTT_HASDATA(n)       (1)
 
-#if RTT_USE_ASM
-  #define SEGGER_RTT_WriteSkipNoLock  SEGGER_RTT_ASM_WriteSkipNoLock
-#endif
-
-/*********************************************************************
-*
-*       RTT transfer functions to send RTT data via other channels.
-*
-**********************************************************************
-*/
-unsigned     SEGGER_RTT_ReadUpBuffer            (unsigned BufferIndex, void* pBuffer, unsigned BufferSize);
-unsigned     SEGGER_RTT_ReadUpBufferNoLock      (unsigned BufferIndex, void* pData, unsigned BufferSize);
-unsigned     SEGGER_RTT_WriteDownBuffer         (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_WriteDownBufferNoLock   (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-
-#define      SEGGER_RTT_HASDATA_UP(n)    (((SEGGER_RTT_BUFFER_UP*)((uintptr_t)&_SEGGER_RTT.aUp[n] + SEGGER_RTT_UNCACHED_OFF))->WrOff - ((SEGGER_RTT_BUFFER_UP*)((uintptr_t)&_SEGGER_RTT.aUp[n] + SEGGER_RTT_UNCACHED_OFF))->RdOff)   // Access uncached to make sure we see changes made by the J-Link side and all of our changes go into HW directly
-
 /*********************************************************************
 *
 *       RTT "Terminal" API functions
 *
 **********************************************************************
 */
-int     SEGGER_RTT_SetTerminal        (unsigned char TerminalId);
-int     SEGGER_RTT_TerminalOut        (unsigned char TerminalId, const char* s);
+int     SEGGER_RTT_SetTerminal        (char TerminalId);
+int     SEGGER_RTT_TerminalOut        (char TerminalId, const char* s);
 
 /*********************************************************************
 *
@@ -443,14 +184,10 @@ int     SEGGER_RTT_TerminalOut        (unsigned char TerminalId, const char* s);
 **********************************************************************
 */
 int SEGGER_RTT_printf(unsigned BufferIndex, const char * sFormat, ...);
-int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList);
-
 #ifdef __cplusplus
   }
 #endif
 
-#endif // ifndef(SEGGER_RTT_ASM)
-
 /*********************************************************************
 *
 *       Defines
@@ -461,53 +198,53 @@ int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pPa
 //
 // Operating modes. Define behavior if buffer is full (not enough space for entire message)
 //
-#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0)     // Skip. Do not block, output nothing. (Default)
-#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1)     // Trim: Do not block, output as much as fits.
-#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2)     // Block: Wait until there is space in the buffer.
-#define SEGGER_RTT_MODE_MASK                  (3)
+#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0U)     // Skip. Do not block, output nothing. (Default)
+#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1U)     // Trim: Do not block, output as much as fits.
+#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2U)     // Block: Wait until there is space in the buffer.
+#define SEGGER_RTT_MODE_MASK                  (3U)
 
 //
 // Control sequences, based on ANSI.
 // Can be used to control color, and clear the screen
 //
-#define RTT_CTRL_RESET                "\x1B[0m"         // Reset to default colors
-#define RTT_CTRL_CLEAR                "\x1B[2J"         // Clear screen, reposition cursor to top left
+#define RTT_CTRL_RESET                ""         // Reset to default colors
+#define RTT_CTRL_CLEAR                ""         // Clear screen, reposition cursor to top left
 
-#define RTT_CTRL_TEXT_BLACK           "\x1B[2;30m"
-#define RTT_CTRL_TEXT_RED             "\x1B[2;31m"
-#define RTT_CTRL_TEXT_GREEN           "\x1B[2;32m"
-#define RTT_CTRL_TEXT_YELLOW          "\x1B[2;33m"
-#define RTT_CTRL_TEXT_BLUE            "\x1B[2;34m"
-#define RTT_CTRL_TEXT_MAGENTA         "\x1B[2;35m"
-#define RTT_CTRL_TEXT_CYAN            "\x1B[2;36m"
-#define RTT_CTRL_TEXT_WHITE           "\x1B[2;37m"
+#define RTT_CTRL_TEXT_BLACK           ""
+#define RTT_CTRL_TEXT_RED             ""
+#define RTT_CTRL_TEXT_GREEN           ""
+#define RTT_CTRL_TEXT_YELLOW          ""
+#define RTT_CTRL_TEXT_BLUE            ""
+#define RTT_CTRL_TEXT_MAGENTA         ""
+#define RTT_CTRL_TEXT_CYAN            ""
+#define RTT_CTRL_TEXT_WHITE           ""
 
-#define RTT_CTRL_TEXT_BRIGHT_BLACK    "\x1B[1;30m"
-#define RTT_CTRL_TEXT_BRIGHT_RED      "\x1B[1;31m"
-#define RTT_CTRL_TEXT_BRIGHT_GREEN    "\x1B[1;32m"
-#define RTT_CTRL_TEXT_BRIGHT_YELLOW   "\x1B[1;33m"
-#define RTT_CTRL_TEXT_BRIGHT_BLUE     "\x1B[1;34m"
-#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  "\x1B[1;35m"
-#define RTT_CTRL_TEXT_BRIGHT_CYAN     "\x1B[1;36m"
-#define RTT_CTRL_TEXT_BRIGHT_WHITE    "\x1B[1;37m"
+#define RTT_CTRL_TEXT_BRIGHT_BLACK    ""
+#define RTT_CTRL_TEXT_BRIGHT_RED      ""
+#define RTT_CTRL_TEXT_BRIGHT_GREEN    ""
+#define RTT_CTRL_TEXT_BRIGHT_YELLOW   ""
+#define RTT_CTRL_TEXT_BRIGHT_BLUE     ""
+#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  ""
+#define RTT_CTRL_TEXT_BRIGHT_CYAN     ""
+#define RTT_CTRL_TEXT_BRIGHT_WHITE    ""
 
-#define RTT_CTRL_BG_BLACK             "\x1B[24;40m"
-#define RTT_CTRL_BG_RED               "\x1B[24;41m"
-#define RTT_CTRL_BG_GREEN             "\x1B[24;42m"
-#define RTT_CTRL_BG_YELLOW            "\x1B[24;43m"
-#define RTT_CTRL_BG_BLUE              "\x1B[24;44m"
-#define RTT_CTRL_BG_MAGENTA           "\x1B[24;45m"
-#define RTT_CTRL_BG_CYAN              "\x1B[24;46m"
-#define RTT_CTRL_BG_WHITE             "\x1B[24;47m"
+#define RTT_CTRL_BG_BLACK             ""
+#define RTT_CTRL_BG_RED               ""
+#define RTT_CTRL_BG_GREEN             ""
+#define RTT_CTRL_BG_YELLOW            ""
+#define RTT_CTRL_BG_BLUE              ""
+#define RTT_CTRL_BG_MAGENTA           ""
+#define RTT_CTRL_BG_CYAN              ""
+#define RTT_CTRL_BG_WHITE             ""
 
-#define RTT_CTRL_BG_BRIGHT_BLACK      "\x1B[4;40m"
-#define RTT_CTRL_BG_BRIGHT_RED        "\x1B[4;41m"
-#define RTT_CTRL_BG_BRIGHT_GREEN      "\x1B[4;42m"
-#define RTT_CTRL_BG_BRIGHT_YELLOW     "\x1B[4;43m"
-#define RTT_CTRL_BG_BRIGHT_BLUE       "\x1B[4;44m"
-#define RTT_CTRL_BG_BRIGHT_MAGENTA    "\x1B[4;45m"
-#define RTT_CTRL_BG_BRIGHT_CYAN       "\x1B[4;46m"
-#define RTT_CTRL_BG_BRIGHT_WHITE      "\x1B[4;47m"
+#define RTT_CTRL_BG_BRIGHT_BLACK      ""
+#define RTT_CTRL_BG_BRIGHT_RED        ""
+#define RTT_CTRL_BG_BRIGHT_GREEN      ""
+#define RTT_CTRL_BG_BRIGHT_YELLOW     ""
+#define RTT_CTRL_BG_BRIGHT_BLUE       ""
+#define RTT_CTRL_BG_BRIGHT_MAGENTA    ""
+#define RTT_CTRL_BG_BRIGHT_CYAN       ""
+#define RTT_CTRL_BG_BRIGHT_WHITE      ""
 
 
 #endif

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023-2024 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -49,13 +52,13 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.56                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW.h
 Purpose : System visualization API.
-Revision: $Rev: 28768 $
+Revision: $Rev: 5626 $
 */
 
 #ifndef SEGGER_SYSVIEW_H
@@ -69,7 +72,6 @@ Revision: $Rev: 28768 $
 */
 
 #include "SEGGER.h"
-#include "SEGGER_SYSVIEW_ConfDefaults.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,10 +85,7 @@ extern "C" {
 **********************************************************************
 */
 
-#define SEGGER_SYSVIEW_MAJOR          3
-#define SEGGER_SYSVIEW_MINOR          32
-#define SEGGER_SYSVIEW_REV            0
-#define SEGGER_SYSVIEW_VERSION        ((SEGGER_SYSVIEW_MAJOR * 10000) + (SEGGER_SYSVIEW_MINOR * 100) + SEGGER_SYSVIEW_REV)
+#define SEGGER_SYSVIEW_VERSION        21000
 
 #define SEGGER_SYSVIEW_INFO_SIZE      9   // Minimum size, which has to be reserved for a packet. 1-2 byte of message type, 0-2  byte of payload length, 1-5 bytes of timestamp.
 #define SEGGER_SYSVIEW_QUANTA_U32     5   // Maximum number of bytes to encode a U32, should be reserved for each 32-bit value in a packet.
@@ -115,15 +114,15 @@ extern "C" {
 #define   SYSVIEW_EVTID_SYSTIME_CYCLES    12
 #define   SYSVIEW_EVTID_SYSTIME_US        13
 #define   SYSVIEW_EVTID_SYSDESC           14
-#define   SYSVIEW_EVTID_MARK_START        15
-#define   SYSVIEW_EVTID_MARK_STOP         16
+#define   SYSVIEW_EVTID_USER_START        15
+#define   SYSVIEW_EVTID_USER_STOP         16
 #define   SYSVIEW_EVTID_IDLE              17
 #define   SYSVIEW_EVTID_ISR_TO_SCHEDULER  18
 #define   SYSVIEW_EVTID_TIMER_ENTER       19
 #define   SYSVIEW_EVTID_TIMER_EXIT        20
 #define   SYSVIEW_EVTID_STACK_INFO        21
 #define   SYSVIEW_EVTID_MODULEDESC        22
-#define   SYSVIEW_EVTID_DATA_SAMPLE       23
+
 #define   SYSVIEW_EVTID_INIT              24
 #define   SYSVIEW_EVTID_NAME_RESOURCE     25
 #define   SYSVIEW_EVTID_PRINT_FORMATTED   26
@@ -133,16 +132,6 @@ extern "C" {
 
 #define   SYSVIEW_EVTID_EX                31
 //
-// SystemView extended events. Sent with ID 31.
-//
-#define   SYSVIEW_EVTID_EX_MARK           0
-#define   SYSVIEW_EVTID_EX_NAME_MARKER    1
-#define   SYSVIEW_EVTID_EX_HEAP_DEFINE    2
-#define   SYSVIEW_EVTID_EX_HEAP_ALLOC     3
-#define   SYSVIEW_EVTID_EX_HEAP_ALLOC_EX  4
-#define   SYSVIEW_EVTID_EX_HEAP_FREE      5
-#define   SYSVIEW_EVTID_EX_REGISTER_DATA  6
-//
 // Event masks to disable/enable events
 //
 #define   SYSVIEW_EVTMASK_NOP               (1 << SYSVIEW_EVTID_NOP)
@@ -168,7 +157,7 @@ extern "C" {
 #define   SYSVIEW_EVTMASK_TIMER_EXIT        (1 << SYSVIEW_EVTID_TIMER_EXIT)
 #define   SYSVIEW_EVTMASK_STACK_INFO        (1 << SYSVIEW_EVTID_STACK_INFO)
 #define   SYSVIEW_EVTMASK_MODULEDESC        (1 << SYSVIEW_EVTID_MODULEDESC)
-#define   SYSVIEW_EVTMASK_DATA_SAMPLE       (1 << SYSVIEW_EVTID_DATA_SAMPLE)
+
 #define   SYSVIEW_EVTMASK_INIT              (1 << SYSVIEW_EVTID_INIT)
 #define   SYSVIEW_EVTMASK_NAME_RESOURCE     (1 << SYSVIEW_EVTID_NAME_RESOURCE)
 #define   SYSVIEW_EVTMASK_PRINT_FORMATTED   (1 << SYSVIEW_EVTID_PRINT_FORMATTED)
@@ -203,42 +192,8 @@ typedef struct {
   U32          Prio;
   U32          StackBase;
   U32          StackSize;
-  U32          StackUsage;
 } SEGGER_SYSVIEW_TASKINFO;
 
-typedef struct {
-  U32          TaskID;
-  U32          StackBase;
-  U32          StackSize;
-  U32          StackUsage;
-} SEGGER_SYSVIEW_STACKINFO;
-
-typedef struct {
-  U32          ID;
-  union {
-    U32*   pU32_Value;
-    I32*   pI32_Value;
-    float* pFloat_Value;
-  };
-} SEGGER_SYSVIEW_DATA_SAMPLE;
-
-typedef enum {
-  SEGGER_SYSVIEW_TYPE_U32   = 0,
-  SEGGER_SYSVIEW_TYPE_I32   = 1,
-  SEGGER_SYSVIEW_TYPE_FLOAT = 2
-} SEGGER_SYSVIEW_DATA_TYPE;
-
-typedef struct {
-  U32                           ID;
-  SEGGER_SYSVIEW_DATA_TYPE      DataType;
-  I32                           Offset;
-  I32                           RangeMin;
-  I32                           RangeMax;
-  float                         ScalingFactor;
-  const char*                   sName;
-  const char*                   sUnit;
-}  SEGGER_SYSVIEW_DATA_REGISTER;
-
 typedef struct SEGGER_SYSVIEW_MODULE_STRUCT SEGGER_SYSVIEW_MODULE;
 
 struct SEGGER_SYSVIEW_MODULE_STRUCT {
@@ -251,29 +206,6 @@ struct SEGGER_SYSVIEW_MODULE_STRUCT {
 
 typedef void (SEGGER_SYSVIEW_SEND_SYS_DESC_FUNC)(void);
 
-
-/*********************************************************************
-*
-*       Global data
-*
-**********************************************************************
-*/
-
-#ifdef   EXTERN
-  #undef EXTERN
-#endif
-
-#ifndef SEGGER_SYSVIEW_C       // Defined in SEGGER_SYSVIEW.c which includes this header beside other C-files
-  #define EXTERN extern
-#else
-  #define EXTERN
-#endif
-
-EXTERN unsigned int SEGGER_SYSVIEW_TickCnt;
-EXTERN unsigned int SEGGER_SYSVIEW_InterruptId;
-
-#undef EXTERN
-
 /*********************************************************************
 *
 *       API functions
@@ -282,8 +214,8 @@ EXTERN unsigned int SEGGER_SYSVIEW_InterruptId;
 */
 
 typedef struct {
-  U64  (*pfGetTime)               (void);
-  void (*pfSendTaskList)          (void);
+  U64  (*pfGetTime)      (void);
+  void (*pfSendTaskList) (void);
 } SEGGER_SYSVIEW_OS_API;
 
 /*********************************************************************
@@ -297,13 +229,7 @@ void SEGGER_SYSVIEW_Stop                          (void);
 void SEGGER_SYSVIEW_GetSysDesc                    (void);
 void SEGGER_SYSVIEW_SendTaskList                  (void);
 void SEGGER_SYSVIEW_SendTaskInfo                  (const SEGGER_SYSVIEW_TASKINFO* pInfo);
-void SEGGER_SYSVIEW_SendStackInfo                 (const SEGGER_SYSVIEW_STACKINFO* pInfo);
 void SEGGER_SYSVIEW_SendSysDesc                   (const char* sSysDesc);
-int  SEGGER_SYSVIEW_IsStarted                     (void);
-int  SEGGER_SYSVIEW_GetChannelID                  (void);
-
-void  SEGGER_SYSVIEW_SampleData                   (const SEGGER_SYSVIEW_DATA_SAMPLE *pInfo);
-
 // Checks whether tracing has been started
 U8 SEGGER_SYSVIEW_Started(void);
 
@@ -339,18 +265,10 @@ void SEGGER_SYSVIEW_OnTaskStartExec               (U32 TaskId);
 void SEGGER_SYSVIEW_OnTaskStopExec                (void);
 void SEGGER_SYSVIEW_OnTaskStartReady              (U32 TaskId);
 void SEGGER_SYSVIEW_OnTaskStopReady               (U32 TaskId, unsigned int Cause);
-void SEGGER_SYSVIEW_MarkStart                     (unsigned int MarkerId);
-void SEGGER_SYSVIEW_MarkStop                      (unsigned int MarkerId);
-void SEGGER_SYSVIEW_Mark                          (unsigned int MarkerId);
-void SEGGER_SYSVIEW_NameMarker                    (unsigned int MarkerId, const char* sName);
-
-void SEGGER_SYSVIEW_HeapDefine                    (void* pHeap, void* pBase, unsigned int HeapSize, unsigned int MetadataSize);
-void SEGGER_SYSVIEW_HeapAlloc                     (void* pHeap, void* pUserData, unsigned int UserDataLen);
-void SEGGER_SYSVIEW_HeapAllocEx                   (void* pHeap, void* pUserData, unsigned int UserDataLen, unsigned int Tag);
-void SEGGER_SYSVIEW_HeapFree                      (void* pHeap, void* pUserData);
+void SEGGER_SYSVIEW_OnUserStart                   (unsigned int UserId);       // Start of user defined event (such as a subroutine to profile)
+void SEGGER_SYSVIEW_OnUserStop                    (unsigned int UserId);       // Start of user defined event
 
 void SEGGER_SYSVIEW_NameResource                  (U32 ResourceId, const char* sName);
-void SEGGER_SYSVIEW_RegisterData                  ( SEGGER_SYSVIEW_DATA_REGISTER* pInfo);
 
 int  SEGGER_SYSVIEW_SendPacket                    (U8* pPacket, U8* pPayloadEnd, unsigned int EventId);
 
@@ -381,21 +299,13 @@ void SEGGER_SYSVIEW_SendNumModules                (void);
 */
 #ifndef SEGGER_SYSVIEW_EXCLUDE_PRINTF // Define in project to avoid warnings about variable parameter list
 void SEGGER_SYSVIEW_PrintfHostEx                  (const char* s, U32 Options, ...);
-void SEGGER_SYSVIEW_VPrintfHostEx                 (const char* s, U32 Options, va_list* pParamList);
 void SEGGER_SYSVIEW_PrintfTargetEx                (const char* s, U32 Options, ...);
-void SEGGER_SYSVIEW_VPrintfTargetEx               (const char* s, U32 Options, va_list* pParamList);
 void SEGGER_SYSVIEW_PrintfHost                    (const char* s, ...);
-void SEGGER_SYSVIEW_VPrintfHost                   (const char* s, va_list* pParamList);
 void SEGGER_SYSVIEW_PrintfTarget                  (const char* s, ...);
-void SEGGER_SYSVIEW_VPrintfTarget                 (const char* s, va_list* pParamList);
 void SEGGER_SYSVIEW_WarnfHost                     (const char* s, ...);
-void SEGGER_SYSVIEW_VWarnfHost                    (const char* s, va_list* pParamList);
 void SEGGER_SYSVIEW_WarnfTarget                   (const char* s, ...);
-void SEGGER_SYSVIEW_VWarnfTarget                  (const char* s, va_list* pParamList);
 void SEGGER_SYSVIEW_ErrorfHost                    (const char* s, ...);
-void SEGGER_SYSVIEW_VErrorfHost                   (const char* s, va_list* pParamList);
 void SEGGER_SYSVIEW_ErrorfTarget                  (const char* s, ...);
-void SEGGER_SYSVIEW_VErrorfTarget                 (const char* s, va_list* pParamList);
 #endif
 
 void SEGGER_SYSVIEW_Print                         (const char* s);
@@ -417,20 +327,10 @@ void SEGGER_SYSVIEW_Conf                          (void);
 U32  SEGGER_SYSVIEW_X_GetTimestamp                (void);
 U32  SEGGER_SYSVIEW_X_GetInterruptId              (void);
 
-void SEGGER_SYSVIEW_X_StartComm                   (void);
-void SEGGER_SYSVIEW_X_OnEventRecorded             (unsigned NumBytes);
-
 #ifdef __cplusplus
 }
 #endif
 
-/*********************************************************************
-*
-*       Compatibility API defines
-*/
-#define SEGGER_SYSVIEW_OnUserStart      SEGGER_SYSVIEW_MarkStart
-#define SEGGER_SYSVIEW_OnUserStop       SEGGER_SYSVIEW_MarkStop
-
 #endif
 
 /*************************** End of file ****************************/

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023-2024 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -49,14 +52,14 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.56                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW_ConfDefaults.h
 Purpose : Defines defaults for configurable defines used in
           SEGGER SystemView.
-Revision: $Rev: 26230 $
+Revision: $Rev: 3734 $
 */
 
 #ifndef SEGGER_SYSVIEW_CONFDEFAULTS_H
@@ -72,190 +75,25 @@ Revision: $Rev: 26230 $
 #include "SEGGER_SYSVIEW_Conf.h"
 #include "SEGGER_RTT_Conf.h"
 
-#include "esp_assert.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*********************************************************************
 *
-*       Defines, fixed
+*       Configuration defaults
 *
 **********************************************************************
 */
-//
-// Use auto-detection for SEGGER_SYSVIEW_CORE define
-// based on compiler-/toolchain-specific defines
-// to define SEGGER_SYSVIEW_GET_INTERRUPT_ID and SEGGER_SYSVIEW_GET_TIMESTAMP
-//
-#define SEGGER_SYSVIEW_CORE_OTHER   0
-#define SEGGER_SYSVIEW_CORE_CM0     1 // Cortex-M0/M0+/M1
-#define SEGGER_SYSVIEW_CORE_CM3     2 // Cortex-M3/M4/M7
-#define SEGGER_SYSVIEW_CORE_RX      3 // Renesas RX
-#ifndef SEGGER_SYSVIEW_CORE
-  #if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __SEGGER_CC__) || (defined __GNUC__) || (defined __clang__)
-    #if (defined __ARM_ARCH_6M__) || (defined __ARM_ARCH_8M_BASE__)
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__ICCARM__)
-    #if (defined (__ARM6M__)          && (__CORE__ == __ARM6M__))          \
-     || (defined (__ARM8M_BASELINE__) && (__CORE__ == __ARM8M_BASELINE__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined (__ARM7EM__)         && (__CORE__ == __ARM7EM__))         \
-       || (defined (__ARM7M__)          && (__CORE__ == __ARM7M__))          \
-       || (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__)) \
-       || (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__CC_ARM)
-    #if (defined(__TARGET_ARCH_6S_M))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__TI_ARM__)
-    #ifdef __TI_ARM_V6M0__
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__TI_ARM_V7M3__) || defined(__TI_ARM_V7M4__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__ICCRX__)
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
-  #elif defined(__RX)
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
-  #endif
 
-  #ifndef   SEGGER_SYSVIEW_CORE
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_OTHER
-  #endif
+// Number of bytes that SystemView uses for a buffer.
+#ifndef   SEGGER_SYSVIEW_RTT_BUFFER_SIZE
+  #define SEGGER_SYSVIEW_RTT_BUFFER_SIZE    1024
 #endif
 
-
-/*********************************************************************
-*
-*       Defines, defaults
-*
-**********************************************************************
-*/
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_APP_NAME
-*
-*  Description
-*    The application name to be displayed in SystemView.
-*  Default
-*    "SystemView-enabled Application"
-*  Notes
-*    Convenience define to be used for SEGGER_SYSVIEW_SendSysDesc().
-*/
-#ifndef   SEGGER_SYSVIEW_APP_NAME
-  #define SEGGER_SYSVIEW_APP_NAME                 "SystemView-enabled Application"
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_DEVICE_NAME
-*
-*  Description
-*    The target device name to be displayed in SystemView.
-*  Default
-*    "undefined device"
-*  Notes
-*    Convenience define to be used for SEGGER_SYSVIEW_SendSysDesc().
-*/
-#ifndef   SEGGER_SYSVIEW_DEVICE_NAME
-  #define SEGGER_SYSVIEW_DEVICE_NAME              "undefined device"
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_GET_INTERRUPT_ID()
-*
-*  Description
-*    Function macro to retrieve the Id of the currently active
-*    interrupt.
-*  Default
-*    Call user-supplied function SEGGER_SYSVIEW_X_GetInterruptId().
-*  Notes
-*    For some known compilers and cores, a ready-to-use, core-specific
-*    default is set.
-*    ARMv7M: Read ICSR[8:0] (active vector)
-*    ARMv6M: Read ICSR[5:0] (active vector)
-*/
-#ifndef SEGGER_SYSVIEW_GET_INTERRUPT_ID
-  #if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
-    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()     ((*(U32*)(0xE000ED04)) & 0x1FF)         // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[8:0] = active vector)
-  #elif SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM0
-    #if defined(__ICCARM__)
-      #if (__VER__ > 6010000)
-        #define SEGGER_SYSVIEW_GET_INTERRUPT_ID() (__get_IPSR())                          // Workaround for IAR, which might do a byte-access to 0xE000ED04. Read IPSR instead.
-      #else
-        #define SEGGER_SYSVIEW_GET_INTERRUPT_ID() ((*(U32*)(0xE000ED04)) & 0x3F)          // Older versions of IAR do not include __get_IPSR, but might also not optimize to byte-access.
-      #endif
-    #else
-      #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32*)(0xE000ED04)) & 0x3F)          // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[5:0] = active vector)
-    #endif
-  #else
-    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()     SEGGER_SYSVIEW_X_GetInterruptId()       // Get the currently active interrupt Id from the user-provided function.
-  #endif
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_GET_TIMESTAMP()
-*
-*  Description
-*    Function macro to retrieve a system timestamp for SYSVIEW events.
-*  Default
-*    Call user-supplied function SEGGER_SYSVIEW_X_GetTimestamp().
-*  Notes
-*    For some known compilers and cores, a ready-to-use, core-specific
-*    default is set.
-*    ARMv7M: Read Cortex-M Cycle Count register.
-*
-*    The system timestamp clock frequency has to be passed in
-*    SEGGER_SYSVIEW_Init().
-*/
-#ifndef SEGGER_SYSVIEW_GET_TIMESTAMP
-  #if defined (SEGGER_SYSVIEW_CORE) && (SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3)
-    #define SEGGER_SYSVIEW_GET_TIMESTAMP()        (*(U32 *)(0xE0001004))                  // Retrieve a system timestamp. Cortex-M cycle counter.
-  #else
-    #define SEGGER_SYSVIEW_GET_TIMESTAMP()        SEGGER_SYSVIEW_X_GetTimestamp()         // Retrieve a system timestamp via user-defined function
-  #endif
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_TIMESTAMP_BITS
-*
-*  Description
-*    Number of valid (low-order) bits delivered in system timestamp.
-*  Default
-*    32
-*  Notes
-*    Value has to match system timestamp clock source.
-*/
-// Define number of valid bits low-order delivered by clock source.
-#ifndef   SEGGER_SYSVIEW_TIMESTAMP_BITS
-  #define SEGGER_SYSVIEW_TIMESTAMP_BITS           32
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_RTT_CHANNEL
-*
-*  Description
-*    The RTT channel that SystemView will use.
-*  Default
-*    0: Auto selection.
-*  Notes
-*    Value has to be lower than SEGGER_RTT_MAX_NUM_UP_BUFFERS.
-*/
+// The RTT channel that SystemView will use.
 #ifndef   SEGGER_SYSVIEW_RTT_CHANNEL
-  #define SEGGER_SYSVIEW_RTT_CHANNEL              1
+  #define SEGGER_SYSVIEW_RTT_CHANNEL        0
 #endif
 // Sanity check of RTT channel
 #if (SEGGER_SYSVIEW_RTT_CHANNEL == 0) && (SEGGER_RTT_MAX_NUM_UP_BUFFERS < 2)
@@ -264,323 +102,71 @@ extern "C" {
   #error "SEGGER_RTT_MAX_NUM_UP_BUFFERS  in SEGGER_RTT_Conf.h has to be > SEGGER_SYSVIEW_RTT_CHANNEL!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_RTT_BUFFER_SIZE
-*
-*  Description
-*    Number of bytes that SystemView uses for the RTT buffer.
-*  Default
-*    1024
-*/
-#ifndef   SEGGER_SYSVIEW_RTT_BUFFER_SIZE
-  #define SEGGER_SYSVIEW_RTT_BUFFER_SIZE          1024
+// Place the SystemView buffer into its own/the RTT section
+#if !(defined SEGGER_SYSVIEW_BUFFER_SECTION) && (defined SEGGER_RTT_SECTION)
+  #define SEGGER_SYSVIEW_BUFFER_SECTION            SEGGER_RTT_SECTION
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SECTION
-*
-*  Description
-*    Section to place the SystemView RTT Buffer into.
-*  Default
-*    undefined: Do not place into a specific section.
-*  Notes
-*    If SEGGER_RTT_SECTION is defined, the default changes to use
-*    this section for the SystemView RTT Buffer, too.
-*/
-#if !(defined SEGGER_SYSVIEW_SECTION) && (defined SEGGER_RTT_SECTION)
-  #define SEGGER_SYSVIEW_SECTION                  SEGGER_RTT_SECTION
+// Retrieve a system timestamp.  This gets the Cortex-M cycle counter.
+#ifndef   SEGGER_SYSVIEW_GET_TIMESTAMP
+  #error "SEGGER_SYSVIEW_GET_TIMESTAMP has to be defined in SEGGER_SYSVIEW_Conf.h!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE
-*
-*  Description
-*    Largest cache line size (in bytes) in the target system.
-*  Default
-*    0
-*  Notes
-*    Required in systems with caches to make sure that the SystemView
-*    RTT buffer can be aligned accordingly.
-*/
-#ifndef SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE
-  #define SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE      0
+// Define number of valid bits low-order delivered by clock source.
+#ifndef   SEGGER_SYSVIEW_TIMESTAMP_BITS
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS     32
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ID_BASE
-*
-*  Description
-*    Lowest Id reported by the application.
-*  Default
-*    0
-*  Notes
-*    Value is usually subtracted from mailboxes, semaphores, tasks,
-*    .... addresses, to compress event parameters.
-*    Should be the lowest RAM address of the system.
-*/
+// Lowest Id reported by the Application.
 #ifndef   SEGGER_SYSVIEW_ID_BASE
-  #define SEGGER_SYSVIEW_ID_BASE                  0
+  #define SEGGER_SYSVIEW_ID_BASE            0
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ID_SHIFT
-*
-*  Description
-*    Number of bits to shift Ids.
-*  Default
-*    0
-*  Notes
-*    Ids are shifted to compress event parameters.
-*    Should match the alignment of Ids (addresses),
-*    e.g. 2 when Ids are 4 byte aligned.
-*/
+// Number of bits to shift Ids to save bandwidth
 #ifndef   SEGGER_SYSVIEW_ID_SHIFT
-  #define SEGGER_SYSVIEW_ID_SHIFT                 0
+  #define SEGGER_SYSVIEW_ID_SHIFT           0
+#endif
+
+#ifndef   SEGGER_SYSVIEW_GET_INTERRUPT_ID
+  #error "SEGGER_SYSVIEW_GET_INTERRUPT_ID has to be defined in SEGGER_SYSVIEW_Conf.h!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_ARGUMENTS
-*
-*  Description
-*    Maximum number of arguments which are handled with SystemView
-*    print routines or may be encoded in one recording function.
-*    routines.
-*  Default
-*    16
-*/
 #ifndef   SEGGER_SYSVIEW_MAX_ARGUMENTS
-  #define SEGGER_SYSVIEW_MAX_ARGUMENTS            16
+  #define SEGGER_SYSVIEW_MAX_ARGUMENTS      16
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_STRING_LEN
-*
-*  Description
-*    Maximum string length which can be used in SystemView print and
-*    system description routines.
-*  Default
-*    128
-*/
 #ifndef   SEGGER_SYSVIEW_MAX_STRING_LEN
-  #define SEGGER_SYSVIEW_MAX_STRING_LEN           128
+  #define SEGGER_SYSVIEW_MAX_STRING_LEN     128
 #endif
 
-ESP_STATIC_ASSERT(SEGGER_SYSVIEW_MAX_STRING_LEN < 255, "SEGGER Sysview string length must be less than 255.");
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SUPPORT_LONG_ID
-*
-*  Description
-*    It set, support encoding Evend Ids longer than 14 bit.
-*  Default
-*    1
-*/
-#ifndef   SEGGER_SYSVIEW_SUPPORT_LONG_ID
-  #define SEGGER_SYSVIEW_SUPPORT_LONG_ID          1
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SUPPORT_LONG_DATA
-*
-*  Description
-*    It set, support encoding event data longer than 14 bit.
-*  Default
-*    0
-*/
-#ifndef   SEGGER_SYSVIEW_SUPPORT_LONG_DATA
-  #define SEGGER_SYSVIEW_SUPPORT_LONG_DATA        0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT
-*
-*  Description
-*    If enabled, on SEGGER_SYSVIEW_PrintHost, check the format string
-*    and if it includes unsupported formatters, use formatting on the
-*    target instead.
-*  Default
-*    0: Disabled.
-*/
-#ifndef   SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT
-  #define SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT   0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_USE_INTERNAL_RECORDER
-*
-*  Description
-*    If set, an internal recorder, such as UART or IP is used.
-*  Default
-*    0: Disabled.
-*  Notes
-*    Convenience define to be used by SEGGER_SYSVIEW_Conf(),
-*    such as in embOS configuration to enable Cortex-M cycle counter.
-*/
-#ifndef   SEGGER_SYSVIEW_USE_INTERNAL_RECORDER
-  #define SEGGER_SYSVIEW_USE_INTERNAL_RECORDER    0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_CAN_RESTART
-*
-*  Description
-*    If enabled, send the SystemView start sequence on every start
-*    command, not just on the first one.
-*    Enables restart when SystemView disconnected unexpectedly.
-*  Default
-*    1: Enabled
-*/
-#ifndef   SEGGER_SYSVIEW_CAN_RESTART
-  #define SEGGER_SYSVIEW_CAN_RESTART              1
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_START_ON_INIT
-*
-*  Description
-*    Enable calling SEGGER_SYSVIEW_Start() after initialization.
-*  Default
-*    0: Disabled.
-*  Notes
-*    Convenience define to be used by SEGGER_SYSVIEW_Conf(),
-*    such as in embOS configuration.
-*/
-#ifndef   SEGGER_SYSVIEW_START_ON_INIT
-  #define SEGGER_SYSVIEW_START_ON_INIT            0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_USE_STATIC_BUFFER
-*
-*  Description
-*    If enabled, use a static buffer instead of a buffer on the stack
-*    for SystemView event packets.
-*  Default
-*    1: Enabled.
-*  Notes
-*    If enabled, the static memory use by SystemView is increased by
-*    the maximum packet size. SystemView is locked on entry of a
-*    recording function.
-*    If disabled, the stack usage by SystemView recording functions
-*    might be increased by up to the maximum packet size. SystemView
-*    is locked when writing the packet to the RTT buffer.
-*/
+// Use a static buffer instead of a buffer on the stack for packets
 #ifndef   SEGGER_SYSVIEW_USE_STATIC_BUFFER
-  #define SEGGER_SYSVIEW_USE_STATIC_BUFFER        1
+  #define SEGGER_SYSVIEW_USE_STATIC_BUFFER  1
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_PACKET_SIZE
-*
-*  Description
-*    Maximum packet size for a SystemView event.
-*  Default
-*    Automatically calculated.
-*  Notes
-*    The maximum packet size is mainly defined by the maximum string
-*    length and the maximum number of arguments.
-*/
+// Maximum packet size used by SystemView for the static buffer
 #ifndef   SEGGER_SYSVIEW_MAX_PACKET_SIZE
-  #define SEGGER_SYSVIEW_MAX_PACKET_SIZE          (SEGGER_SYSVIEW_INFO_SIZE + SEGGER_SYSVIEW_MAX_STRING_LEN + 2 * SEGGER_SYSVIEW_QUANTA_U32 + SEGGER_SYSVIEW_MAX_ARGUMENTS * SEGGER_SYSVIEW_QUANTA_U32)
+  #define SEGGER_SYSVIEW_MAX_PACKET_SIZE   SEGGER_SYSVIEW_INFO_SIZE + SEGGER_SYSVIEW_MAX_STRING_LEN + 2 * SEGGER_SYSVIEW_QUANTA_U32 + SEGGER_SYSVIEW_MAX_ARGUMENTS * SEGGER_SYSVIEW_QUANTA_U32
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_POST_MORTEM_MODE
-*
-*  Description
-*    If enabled, SystemView records for post-mortem analysis instead
-*    of real-time analysis.
-*  Default
-*    0: Disabled.
-*  Notes
-*    For more information refer to
-*    https://www.segger.com/products/development-tools/systemview/technology/post-mortem-mode
-*/
+// Use post-mortem analysis instead of real-time analysis
 #ifndef   SEGGER_SYSVIEW_POST_MORTEM_MODE
-  #define SEGGER_SYSVIEW_POST_MORTEM_MODE         0
+  #define SEGGER_SYSVIEW_POST_MORTEM_MODE   0
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT
-*
-*  Description
-*    Configure how frequently synchronization is sent in post-mortem
-*    mode.
-*  Default
-*    8: (1 << 8) = Every 256 Events.
-*  Notes
-*    In post-mortem mode, at least one sync has to be in the RTT buffer.
-*    Recommended sync frequency: Buffer Size / 16
-*    For more information refer to
-*    https://www.segger.com/products/development-tools/systemview/technology/post-mortem-mode
-*/
+// Configure how frequently syncronization is sent
 #ifndef   SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT
-  #define SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT        8
+  #define SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT  8
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ON_EVENT_RECORDED()
-*
-*  Description
-*    Function macro to notify recorder about a new event in buffer.
-*  Default
-*    undefined: Do not notify recorder.
-*  Notes
-*    Used for non-J-Link recorder,
-*    such as to enable transmission via UART or notify IP task.
-*/
-#ifndef   SEGGER_SYSVIEW_ON_EVENT_RECORDED
-  #define SEGGER_SYSVIEW_ON_EVENT_RECORDED(NumBytes)
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_LOCK()
-*
-*  Description
-*    Function macro to (nestable) lock SystemView recording.
-*  Default
-*    Use RTT Locking mechanism (defined by SEGGER_RTT_LOCK()).
-*  Notes
-*    If SystemView recording is not locked, recording events from
-*    interrupts and tasks may lead to unpredictable, undefined, event
-*    data.
-*/
+// Lock SystemView (nestable)
 #ifndef   SEGGER_SYSVIEW_LOCK
-  unsigned SEGGER_SYSVIEW_X_SysView_Lock(void);
-  #define SEGGER_SYSVIEW_LOCK()                   unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock()
+  #define SEGGER_SYSVIEW_LOCK()             SEGGER_RTT_LOCK()
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_UNLOCK
-*
-*  Description
-*    Function macro to unlock SystemView recording.
-*  Default
-*    Use RTT Unlocking mechanism (defined by SEGGER_RTT_UNLOCK()).
-*/
+// Unlock SystemView (nestable)
 #ifndef   SEGGER_SYSVIEW_UNLOCK
-  void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state);
-  #define SEGGER_SYSVIEW_UNLOCK()                 SEGGER_SYSVIEW_X_SysView_Unlock(_SYSVIEW_int_state)
+  #define SEGGER_SYSVIEW_UNLOCK()           SEGGER_RTT_UNLOCK()
 #endif
 
 #ifdef __cplusplus

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2024 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -47,13 +52,13 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.56                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW_Int.h
 Purpose : SEGGER SystemView internal header.
-Revision: $Rev: 21281 $
+Revision: $Rev: 5626 $
 */
 
 #ifndef SEGGER_SYSVIEW_INT_H
@@ -67,6 +72,8 @@ Revision: $Rev: 21281 $
 */
 
 #include "SEGGER_SYSVIEW.h"
+#include "SEGGER_SYSVIEW_Conf.h"
+#include "SEGGER_SYSVIEW_ConfDefaults.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -90,7 +97,6 @@ typedef enum {
   SEGGER_SYSVIEW_COMMAND_ID_GET_SYSDESC,
   SEGGER_SYSVIEW_COMMAND_ID_GET_NUMMODULES,
   SEGGER_SYSVIEW_COMMAND_ID_GET_MODULEDESC,
-  SEGGER_SYSVIEW_COMMAND_ID_HEARTBEAT = 127,
   // Extended commands: Commands >= 128 have a second parameter
   SEGGER_SYSVIEW_COMMAND_ID_GET_MODULE = 128
 } SEGGER_SYSVIEW_COMMAND_ID;

components/app_trace/sys_view/SEGGER/sbom.yml

@@ -1,6 +0,0 @@
-name: 'SystemView'
-version: '3.56'
-cpe: cpe:2.3:a:segger:systemview:{}:*:*:*:*:*:*:*
-supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
-originator: 'Organization: SEGGER Microcontroller GmbH'
-description: Real-time recording and visualization tool for embedded systems.

components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2017-2024 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o Redistributions in binary form must reproduce the above          *
+*   copyright notice, this list of conditions and the following      *
+*   disclaimer in the documentation and/or other materials provided  *
+*   with the distribution.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   nor the names of its contributors may be used to endorse or      *
+*   promote products derived from this software without specific     *
+*   prior written permission.                                        *
 *                                                                    *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
 * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
@@ -49,26 +52,31 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 
 File    : SEGGER_SYSVIEW_Config_FreeRTOS.c
 Purpose : Sample setup configuration of SystemView with FreeRTOS.
-Revision: $Rev: 7745 $
+Revision: $Rev: 3734 $
 */
-#include <string.h>
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "SEGGER_SYSVIEW.h"
 #include "esp_app_trace.h"
 #include "esp_app_trace_util.h"
 #include "esp_intr_alloc.h"
-#include "esp_cpu.h"
 #include "soc/soc.h"
 #include "soc/interrupts.h"
-#include "esp_private/esp_clk.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/clk.h"
+#endif
+
 
 extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 
@@ -100,16 +108,26 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 #endif
 
 #if TS_USE_TIMERGROUP
-#include "driver/gptimer.h"
+#include "driver/timer.h"
 
 // Timer group timer divisor
 #define SYSVIEW_TIMER_DIV       2
 
-// Frequency of the timestamp, using APB as GPTimer source clock
+// Frequency of the timestamp.
 #define SYSVIEW_TIMESTAMP_FREQ  (esp_clk_apb_freq() / SYSVIEW_TIMER_DIV)
 
-// GPTimer handle
-gptimer_handle_t s_sv_gptimer;
+// Timer ID and group ID
+#if defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00) || defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_01)
+#define TS_TIMER_ID 0
+#else
+#define TS_TIMER_ID 1
+#endif // TIMER_00 || TIMER_01
+
+#if defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00) || defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_10)
+#define TS_TIMER_GROUP 0
+#else
+#define TS_TIMER_GROUP 1
+#endif // TIMER_00 || TIMER_10
 
 #endif // TS_USE_TIMERGROUP
 
@@ -120,7 +138,11 @@ gptimer_handle_t s_sv_gptimer;
 
 #if TS_USE_CCOUNT
 // CCOUNT is incremented at CPU frequency
-#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#if CONFIG_IDF_TARGET_ESP32
+#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#endif
 #endif // TS_USE_CCOUNT
 
 // System Frequency.
@@ -129,17 +151,16 @@ gptimer_handle_t s_sv_gptimer;
 // The lowest RAM address used for IDs (pointers)
 #define SYSVIEW_RAM_BASE        (SOC_DROM_LOW)
 
-#ifdef CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
 #if CONFIG_FREERTOS_CORETIMER_0
     #define SYSTICK_INTR_ID (ETS_INTERNAL_TIMER0_INTR_SOURCE+ETS_INTERNAL_INTR_SOURCE_OFF)
 #endif
 #if CONFIG_FREERTOS_CORETIMER_1
     #define SYSTICK_INTR_ID (ETS_INTERNAL_TIMER1_INTR_SOURCE+ETS_INTERNAL_INTR_SOURCE_OFF)
 #endif
-
-#elif CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER
-    #define SYSTICK_INTR_ID (ETS_SYSTIMER_TARGET0_INTR_SOURCE)
-#endif // CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER
+#elif CONFIG_IDF_TARGET_ESP32C3
+    #define SYSTICK_INTR_ID (ETS_SYSTIMER_TARGET0_EDGE_INTR_SOURCE+ETS_INTERNAL_INTR_SOURCE_OFF)
+#endif
 
 // SystemView is single core specific: it implies that SEGGER_SYSVIEW_LOCK()
 // disables IRQs (disables rescheduling globally). So we can not use finite timeouts for locks and return error
@@ -157,16 +178,15 @@ static esp_apptrace_lock_t s_sys_view_lock = {.mux = portMUX_INITIALIZER_UNLOCKE
 *    Sends SystemView description strings.
 */
 static void _cbSendSystemDesc(void) {
-    char irq_str[32] = "I#";
+    char irq_str[32];
     SEGGER_SYSVIEW_SendSysDesc("N="SYSVIEW_APP_NAME",D="SYSVIEW_DEVICE_NAME",C="SYSVIEW_CORE_NAME",O=FreeRTOS");
-    strcat(itoa(SYSTICK_INTR_ID, irq_str + 2, 10), "=SysTick");
+    snprintf(irq_str, sizeof(irq_str), "I#%d=SysTick", SYSTICK_INTR_ID);
     SEGGER_SYSVIEW_SendSysDesc(irq_str);
     size_t isr_count = sizeof(esp_isr_names)/sizeof(esp_isr_names[0]);
     for (size_t i = 0; i < isr_count; ++i) {
         if (esp_isr_names[i] == NULL || (ETS_INTERNAL_INTR_SOURCE_OFF + i) == SYSTICK_INTR_ID)
             continue;
-        strcat(itoa(ETS_INTERNAL_INTR_SOURCE_OFF + i, irq_str + 2, 10), "=");
-        strncat(irq_str, esp_isr_names[i], sizeof(irq_str) - strlen(irq_str) - 1);
+        snprintf(irq_str, sizeof(irq_str), "I#%d=%s", ETS_INTERNAL_INTR_SOURCE_OFF + i, esp_isr_names[i]);
         SEGGER_SYSVIEW_SendSysDesc(irq_str);
     }
 }
@@ -183,16 +203,19 @@ static void SEGGER_SYSVIEW_TS_Init(void)
      * esp_timer and ccount can be used as is.
      */
 #if TS_USE_TIMERGROUP
-    gptimer_config_t config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = SYSVIEW_TIMESTAMP_FREQ,
+    timer_config_t config = {
+        .alarm_en = 0,
+        .auto_reload = 0,
+        .counter_dir = TIMER_COUNT_UP,
+        .divider = SYSVIEW_TIMER_DIV,
+        .counter_en = 0
     };
-    // pick any free GPTimer instance
-    ESP_ERROR_CHECK(gptimer_new_timer(&config, &s_sv_gptimer));
+    /* Configure timer */
+    timer_init(TS_TIMER_GROUP, TS_TIMER_ID, &config);
+    /* Load counter value */
+    timer_set_counter_value(TS_TIMER_GROUP, TS_TIMER_ID, 0x00000000ULL);
     /* Start counting */
-    gptimer_enable(s_sv_gptimer);
-    gptimer_start(s_sv_gptimer);
+    timer_start(TS_TIMER_GROUP, TS_TIMER_ID);
 #endif // TS_USE_TIMERGROUP
 }
 
@@ -250,10 +273,10 @@ U32 SEGGER_SYSVIEW_X_GetTimestamp(void)
 {
 #if TS_USE_TIMERGROUP
     uint64_t ts = 0;
-    gptimer_get_raw_count(s_sv_gptimer, &ts);
+    timer_get_counter_value(TS_TIMER_GROUP, TS_TIMER_ID, &ts);
     return (U32) ts; // return lower part of counter value
 #elif TS_USE_CCOUNT
-    return esp_cpu_get_cycle_count();
+    return portGET_RUN_TIME_COUNTER_VALUE();
 #elif TS_USE_ESP_TIMER
     return (U32) esp_timer_get_time(); // return lower part of counter value
 #endif

components/app_trace/sys_view/Sample/FreeRTOSV10.4/SEGGER_SYSVIEW_FreeRTOS.c

@@ -1,270 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
-/*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SEGGER SystemView * Real-time application analysis           *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-* All rights reserved.                                               *
-*                                                                    *
-* SEGGER strongly recommends to not make any changes                 *
-* to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
-*                                                                    *
-* Redistribution and use in source and binary forms, with or         *
-* without modification, are permitted provided that the following    *
-* condition is met:                                                  *
-*                                                                    *
-* o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
-*                                                                    *
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
-* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
-* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF           *
-* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE           *
-* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
-* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF      *
-* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT          *
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE  *
-* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH   *
-* DAMAGE.                                                            *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SystemView version: 3.42                                    *
-*                                                                    *
-**********************************************************************
--------------------------- END-OF-HEADER -----------------------------
-
-File    : SEGGER_SYSVIEW_FreeRTOS.c
-Purpose : Interface between FreeRTOS and SystemView.
-Revision: $Rev: 7947 $
-*/
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "SEGGER_SYSVIEW.h"
-#include "SEGGER_SYSVIEW_FreeRTOS.h"
-#include "string.h" // Required for memset
-
-
-
-typedef struct SYSVIEW_FREERTOS_TASK_STATUS SYSVIEW_FREERTOS_TASK_STATUS;
-
-struct SYSVIEW_FREERTOS_TASK_STATUS {
-  U32         xHandle;
-  const char* pcTaskName;
-  unsigned    uxCurrentPriority;
-  U32         pxStack;
-  unsigned    uStackHighWaterMark;
-};
-
-static SYSVIEW_FREERTOS_TASK_STATUS _aTasks[SYSVIEW_FREERTOS_MAX_NOF_TASKS];
-static unsigned _NumTasks;
-
-/*********************************************************************
-*
-*       _cbSendTaskList()
-*
-*  Function description
-*    This function is part of the link between FreeRTOS and SYSVIEW.
-*    Called from SystemView when asked by the host, it uses SYSVIEW
-*    functions to send the entire task list to the host.
-*/
-static void _cbSendTaskList(void) {
-  unsigned n;
-
-  for (n = 0; n < _NumTasks; n++) {
-#if INCLUDE_uxTaskGetStackHighWaterMark // Report Task Stack High Watermark
-    _aTasks[n].uStackHighWaterMark = uxTaskGetStackHighWaterMark((TaskHandle_t)_aTasks[n].xHandle);
-#endif
-    SYSVIEW_SendTaskInfo((U32)_aTasks[n].xHandle, _aTasks[n].pcTaskName, (unsigned)_aTasks[n].uxCurrentPriority, (U32)_aTasks[n].pxStack, (unsigned)_aTasks[n].uStackHighWaterMark);
-  }
-}
-
-/*********************************************************************
-*
-*       _cbGetTime()
-*
-*  Function description
-*    This function is part of the link between FreeRTOS and SYSVIEW.
-*    Called from SystemView when asked by the host, returns the
-*    current system time in micro seconds.
-*/
-__attribute__((unused)) static U64 _cbGetTime(void) {
-  U64 Time;
-
-  Time = xTaskGetTickCountFromISR();
-  Time *= portTICK_PERIOD_MS;
-  Time *= 1000;
-  return Time;
-}
-
-/*********************************************************************
-*
-*       Global functions
-*
-**********************************************************************
-*/
-/*********************************************************************
-*
-*       SYSVIEW_AddTask()
-*
-*  Function description
-*    Add a task to the internal list and record its information.
-*/
-void SYSVIEW_AddTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32  pxStack, unsigned uStackHighWaterMark) {
-
-  /* On multi-core we have several idle tasks with 'IDLEx' names
-     Not best solution, because we can filter out user tasks starting with 'IDLE'.
-     But we can not use 'xTaskGetIdleTaskHandle' because at the moment when this
-     function is called array of idle tasks handles are not initialized yet. */
-  if (memcmp(pcTaskName, "IDLE", 4) == 0) {
-    return;
-  }
-
-  if (_NumTasks >= SYSVIEW_FREERTOS_MAX_NOF_TASKS) {
-    SEGGER_SYSVIEW_Warn("SYSTEMVIEW: Could not record task information. Maximum number of tasks reached.");
-    return;
-  }
-
-  _aTasks[_NumTasks].xHandle = xHandle;
-  _aTasks[_NumTasks].pcTaskName = pcTaskName;
-  _aTasks[_NumTasks].uxCurrentPriority = uxCurrentPriority;
-  _aTasks[_NumTasks].pxStack = pxStack;
-  _aTasks[_NumTasks].uStackHighWaterMark = uStackHighWaterMark;
-
-  _NumTasks++;
-
-  SYSVIEW_SendTaskInfo(xHandle, pcTaskName,uxCurrentPriority, pxStack, uStackHighWaterMark);
-
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_UpdateTask()
-*
-*  Function description
-*    Update a task in the internal list and record its information.
-*/
-void SYSVIEW_UpdateTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32 pxStack, unsigned uStackHighWaterMark) {
-  unsigned n;
-
-  /* On multi-core we have several idle tasks with 'IDLEx' names
-     Not best solution, because we can filter out user tasks starting with 'IDLE'.
-     But we can not use 'xTaskGetIdleTaskHandle' because at the moment when this
-     function is called array of idle tasks handles are not initialized yet. */
-  if (memcmp(pcTaskName, "IDLE", 4) == 0) {
-    return;
-  }
-
-  for (n = 0; n < _NumTasks; n++) {
-    if (_aTasks[n].xHandle == xHandle) {
-      break;
-    }
-  }
-  if (n < _NumTasks) {
-    _aTasks[n].pcTaskName = pcTaskName;
-    _aTasks[n].uxCurrentPriority = uxCurrentPriority;
-    _aTasks[n].pxStack = pxStack;
-    _aTasks[n].uStackHighWaterMark = uStackHighWaterMark;
-
-    SYSVIEW_SendTaskInfo(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
-  } else {
-    SYSVIEW_AddTask(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
-  }
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_DeleteTask()
-*
-*  Function description
-*    Delete a task from the internal list.
-*/
-void SYSVIEW_DeleteTask(U32 xHandle) {
-  unsigned n;
-
-  if (_NumTasks == 0) {
-    return; // Early out
-  }
-  for (n = 0; n < _NumTasks; n++) {
-    if (_aTasks[n].xHandle == xHandle) {
-      break;
-    }
-  }
-  if (n == (_NumTasks - 1)) {
-    //
-    // Task is last item in list.
-    // Simply zero the item and decrement number of tasks.
-    //
-    memset(&_aTasks[n], 0, sizeof(_aTasks[n]));
-    _NumTasks--;
-  } else if (n < _NumTasks) {
-    //
-    // Task is in the middle of the list.
-    // Move last item to current position and decrement number of tasks.
-    // Order of tasks does not really matter, so no need to move all following items.
-    //
-    _aTasks[n].xHandle             = _aTasks[_NumTasks - 1].xHandle;
-    _aTasks[n].pcTaskName          = _aTasks[_NumTasks - 1].pcTaskName;
-    _aTasks[n].uxCurrentPriority   = _aTasks[_NumTasks - 1].uxCurrentPriority;
-    _aTasks[n].pxStack             = _aTasks[_NumTasks - 1].pxStack;
-    _aTasks[n].uStackHighWaterMark = _aTasks[_NumTasks - 1].uStackHighWaterMark;
-    memset(&_aTasks[_NumTasks - 1], 0, sizeof(_aTasks[_NumTasks - 1]));
-    _NumTasks--;
-  }
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_SendTaskInfo()
-*
-*  Function description
-*    Record task information.
-*/
-void SYSVIEW_SendTaskInfo(U32 TaskID, const char* sName, unsigned Prio, U32 StackBase, unsigned StackSize) {
-  SEGGER_SYSVIEW_TASKINFO TaskInfo;
-
-  memset(&TaskInfo, 0, sizeof(TaskInfo)); // Fill all elements with 0 to allow extending the structure in future version without breaking the code
-  TaskInfo.TaskID     = TaskID;
-  TaskInfo.sName      = sName;
-  TaskInfo.Prio       = Prio;
-  TaskInfo.StackBase  = StackBase;
-  TaskInfo.StackSize  = StackSize;
-  SEGGER_SYSVIEW_SendTaskInfo(&TaskInfo);
-}
-
-/*********************************************************************
-*
-*       Public API structures
-*
-**********************************************************************
-*/
-// Callbacks provided to SYSTEMVIEW by FreeRTOS
-const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI = {
-  /* Callback _cbGetTime locks xKernelLock inside xTaskGetTickCountFromISR, this can cause deadlock on multi-core.
-     To prevent deadlock, always lock xKernelLock before s_sys_view_lock. Omitting the callback here results in sending
-     SYSVIEW_EVTID_SYSTIME_CYCLES events instead of SYSVIEW_EVTID_SYSTIME_US */
-  NULL,
-  _cbSendTaskList,
-};
-
-/*************************** End of file ****************************/