Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tfm: Move TF-M attestation data to provisioned OTP region #17522

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

tfm: Move TF-M attestation data to provisioned OTP region #17522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f7cd3e
tfm: Include bl_storage.c
MarkusLassila Nov 13, 2024
80f74a9
tfm: Move TF-M attestation data to provisioned OTP region
MarkusLassila Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions cmake/sysbuild/provision_hex.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ function(provision application prefix_name)
set(PROVISION_HEX_NAME ${prefix_name}provision.hex)
set(PROVISION_HEX ${CMAKE_BINARY_DIR}/${PROVISION_HEX_NAME})

# This calculation is based on the LCS cycle state datacycle state data struct in bl_storage.h
if(CONFIG_SOC_SERIES_NRF54LX)
set(lcs_state_struct_size 0x10) # 4 * 4 bytes
set(otp_write_width 4) # OTP writes are in words (4 bytes)
else()
set(lcs_state_struct_size 0x8) # 4 * 2 bytes
set(otp_write_width 2) # OTP writes are in half-words (2 bytes)
endif()

if(CONFIG_SECURE_BOOT)
Expand Down Expand Up @@ -87,6 +86,10 @@ function(provision application prefix_name)
set(mcuboot_counters_slots --mcuboot-counters-slots ${SB_CONFIG_MCUBOOT_HW_DOWNGRADE_PREVENTION_COUNTER_SLOTS})
endif()

if(SB_CONFIG_TFM_OTP_PSA_CERTIFICATE_REFERENCE AND SB_CONFIG_TFM_PSA_CERTIFICATE_REFERENCE_VALUE)
set(psa_certificate_reference --psa-certificate-reference ${SB_CONFIG_TFM_PSA_CERTIFICATE_REFERENCE_VALUE})
endif()

if(CONFIG_SECURE_BOOT)
add_custom_command(
OUTPUT
Expand All @@ -103,7 +106,8 @@ function(provision application prefix_name)
${monotonic_counter_arg}
${no_verify_hashes_arg}
${mcuboot_counters_slots}
--lcs-state-size ${lcs_state_struct_size}
--otp-write-width ${otp_write_width}
${psa_certificate_reference}
DEPENDS
${PROVISION_KEY_DEPENDS}
${PROVISION_DEPENDS}
Expand All @@ -126,7 +130,8 @@ function(provision application prefix_name)
--max-size ${CONFIG_PM_PARTITION_SIZE_PROVISION}
${mcuboot_counters_num}
${mcuboot_counters_slots}
--lcs-state-size ${lcs_state_struct_size}
--otp-write-width ${otp_write_width}
${psa_certificate_reference}
DEPENDS
${PROVISION_KEY_DEPENDS}
WORKING_DIRECTORY
Expand Down
7 changes: 6 additions & 1 deletion doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,13 @@ SUIT samples
Trusted Firmware-M (TF-M) samples
---------------------------------

|no_changes_yet_note|
* :ref:`tfm_psa_template` sample:

* Added support for the following attestation token fields:

* Profile definition
* PSA certificate reference (optional), configured using the :kconfig:option:`SB_CONFIG_TFM_OTP_PSA_CERTIFICATE_REFERENCE` sysbuild Kconfig option
* Verification service URL (optional), configured using the :kconfig:option:`CONFIG_TFM_ATTEST_VERIFICATION_SERVICE_URL` Kconfig option

Thread samples
--------------
Expand Down
Loading
Loading