espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/esp_tee_soc_cap' into 'master'

Browse Source 
feat(esp_tee): Mark ESP32-H2 as a supported target for ESP-TEE

See merge request espressif/esp-idf!43434
This commit is contained in:
Mahavir Jain
2025-12-08 14:11:15 +05:30
parent 7f53bb4883 c88f9c3be1
commit 81c961a656
9 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_tee/test_apps/.build-test-rules.yml
+6 -6
View File
@@ -1,11 +1,11 @@
# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
components/esp_tee/test_apps/tee_cli_app:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32c5", "esp32c61"]
reason: only supported with c6, c5 and c61
enable:
- if: IDF_TARGET in ["esp32c6", "esp32c5", "esp32c61"]
reason: supported only the above targets
components/esp_tee/test_apps/tee_test_fw:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"]
reason: only supported with c6, h2, c5 and c61
enable:
- if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"]
reason: supported only the above targets
docs/conf_common.py
+7 -1
View File
@@ -317,7 +317,7 @@ ESP32C6_DOCS = [
'api-guides/phy.rst',
] + ESP_TEE_DOCS
ESP32H2_DOCS = ['api-guides/RF_calibration.rst', 'api-guides/phy.rst']
ESP32H2_DOCS = ['api-guides/RF_calibration.rst', 'api-guides/phy.rst'] + ESP_TEE_DOCS
ESP32H4_DOCS = [
'api-reference/system/ipc.rst',
@@ -492,6 +492,9 @@ idf_build_system = {
# Please update following list to enable Qemu doc guide (and cross references) for a new target
QEMU_TARGETS = ['esp32', 'esp32c3', 'esp32s3']
# Please update following list to enable ESP-TEE doc guide (and cross references) for a new target
ESP_TEE_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61']
# Callback function for user setup that needs be done after `config-init`-event
# config.idf_target is not available at the initial config stage
@@ -505,6 +508,9 @@ def conf_setup(app, config):
if config.idf_target in QEMU_TARGETS:
app.tags.add('TARGET_SUPPORT_QEMU')
if config.idf_target in ESP_TEE_TARGETS:
app.tags.add('TARGET_SUPPORT_ESP_TEE')
try:
with open(add_warnings_file) as warning_file:
config.add_warnings_pages = warning_file.read().splitlines()
docs/doxygen/Doxyfile_esp32h2
+4
View File
@@ -3,3 +3,7 @@ INPUT += \
$(PROJECT_PATH)/components/bt/include/$(IDF_TARGET)/include/esp_bt_vs.h \
$(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
$(PROJECT_PATH)/components/esp_phy/include/esp_phy_cert_test.h \
$(PROJECT_PATH)/components/esp_tee/include/esp_tee.h \
$(PROJECT_PATH)/components/esp_tee/subproject/components/tee_sec_storage/include/esp_tee_sec_storage.h \
$(PROJECT_PATH)/components/esp_tee/subproject/components/tee_attestation/esp_tee_attestation.h \
$(PROJECT_PATH)/components/esp_tee/subproject/components/tee_ota_ops/include/esp_tee_ota_ops.h \
docs/en/security/index.rst
+1 -1
View File
@@ -10,6 +10,6 @@ Security Guides
flash-encryption
:esp32: secure-boot-v1
secure-boot-v2
:esp32c6 or esp32c5 or esp32c61: tee/index
:TARGET_SUPPORT_ESP_TEE: tee/index
security-features-enablement-workflows
vulnerabilities
docs/zh_CN/security/index.rst
+1 -1
View File
@@ -10,6 +10,6 @@
flash-encryption
:esp32: secure-boot-v1
secure-boot-v2
:esp32c6 or esp32c5 or esp32c61: tee/index
:TARGET_SUPPORT_ESP_TEE: tee/index
security-features-enablement-workflows
vulnerabilities
examples/security/.build-test-rules.yml
+8 -8
View File
@@ -44,24 +44,24 @@ examples/security/security_features_app:
- bootloader_support
examples/security/tee/tee_attestation:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32c5", "esp32c61"]
enable:
- if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"]
depends_components:
- esp_tee
depends_filepatterns:
- examples/security/tee/tee_attestation/**/*
examples/security/tee/tee_basic:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32c5", "esp32c61"]
enable:
- if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"]
depends_components:
- esp_tee
depends_filepatterns:
- examples/security/tee/tee_basic/**/*
examples/security/tee/tee_secure_ota:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32c5", "esp32c61"]
enable:
- if: IDF_TARGET in ["esp32c6", "esp32c5", "esp32c61"]
depends_components:
- esp_tee
- protocol_examples_common
@@ -69,8 +69,8 @@ examples/security/tee/tee_secure_ota:
- examples/security/tee/tee_secure_ota/**/*
examples/security/tee/tee_secure_storage:
disable:
- if: IDF_TARGET not in ["esp32c6", "esp32c5", "esp32c61"]
enable:
- if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5", "esp32c61"]
depends_components:
- esp_tee
depends_filepatterns:
examples/security/tee/tee_attestation/README.md
+2 -2
View File
@@ -1,5 +1,5 @@
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 |
| ----------------- | -------- | -------- | --------- |
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 |
| ----------------- | -------- | -------- | --------- | -------- |
# TEE: Attestation example
examples/security/tee/tee_basic/README.md
+2 -2
View File
@@ -1,5 +1,5 @@
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 |
| ----------------- | -------- | -------- | --------- |
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 |
| ----------------- | -------- | -------- | --------- | -------- |
# Basic TEE example
examples/security/tee/tee_secure_storage/README.md
+2 -2
View File
@@ -1,5 +1,5 @@
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 |
| ----------------- | -------- | -------- | --------- |
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 |
| ----------------- | -------- | -------- | --------- | -------- |
# TEE: Secure Storage example