Skip to content

Tfm 20 ncs upmerge#13661

Closed
mswarowsky wants to merge 8 commits intonrfconnect:mainfrom
mswarowsky:tfm_20_ncs_upmerge
Closed

Tfm 20 ncs upmerge#13661
mswarowsky wants to merge 8 commits intonrfconnect:mainfrom
mswarowsky:tfm_20_ncs_upmerge

Conversation

@mswarowsky
Copy link
Contributor

No description provided.

Upmerge to update the TF-M version to 2.0.0
This comes with the mbed TLS version 3.5.0

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
The place where TF-M stores the non-secure API headers changed in 2.0.0
So changing them for all applications that need them

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Remove include of tfm_api.h as it got deleted

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
The target tfm_partition_defs got removed and  tfm_config gets used now so updating it

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
hash_info.c got removed in mbed TLS 3.5.0

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
The preload.cmake file was renamed to cpuarch.cmake in TF-M 2.0.0

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
With TF-M 2.0.0 and the included split build feature the ns target isn't build anymore therefore
removing the reference to it.

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
For some reason the mbed TLS path is set to the tfm folder of nrf_security, which causes
build problems since TF-M 2.0.0

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
@mswarowsky mswarowsky requested review from gregersrygg and jtguggedal and removed request for a team January 18, 2024 14:50
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Jan 18, 2024
@mswarowsky mswarowsky closed this Jan 18, 2024
@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mbedtls nrfconnect/sdk-mbedtls@v3.3.0-ncs2 nrfconnect/sdk-mbedtls#25 nrfconnect/sdk-mbedtls#25/files
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@4c908f4 nrfconnect/sdk-trusted-firmware-m#118 nrfconnect/sdk-trusted-firmware-m#118/files
zephyr nrfconnect/sdk-zephyr@e1a7167 nrfconnect/sdk-zephyr#1452 nrfconnect/sdk-zephyr#1452/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM manifest manifest-mbedtls manifest-trusted-firmware-m manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants