Skip to content

[ncs-v3.4-branch] update to TF-M v2.3.1 - #277

Merged
tomi-font merged 0 commit into
nrfconnect:ncs-v3.4-branchfrom
tomi-font:ncs-v3.4_update_to_v2.3.1
Aug 26, 2026
Merged

tomi-font merged 0 commit into
nrfconnect:ncs-v3.4-branchfrom
tomi-font:ncs-v3.4_update_to_v2.3.1

Conversation

@tomi-font

Copy link
Copy Markdown
Collaborator

Started from upstream TF-Mv2.3.1 tag, reapplied all the zep and nrf patches on ncs-v3.4-branch (with some adjustments as needed).

manifest-pr-skip

@frkv frkv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (TF-M commits check out)

@Vge0rge

Vge0rge commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

Is there a reason that you kept the deleting of the cmake install lines here: 1032bd6

If not I would say just make the commit identical with the PR that goes to main.

@tomi-font

Copy link
Copy Markdown
Collaborator Author

Is there a reason that you kept the deleting of the cmake install lines here: 1032bd6

If not I would say just make the commit identical with the PR that goes to main.

I just did the minimal changes for the update to this branch. But in the v3.4 branch we also have -DTFM_INSTALL_TF_PSA_CRYPTO_HEADERS=OFF so I'll drop the part you mention.

@tomi-font
tomi-font force-pushed the ncs-v3.4_update_to_v2.3.1 branch from 3624cf5 to b0d724b Compare August 26, 2026 07:34
@tomi-font
tomi-font requested a review from Vge0rge August 26, 2026 07:34
@tomi-font
tomi-font merged commit b0d724b into nrfconnect:ncs-v3.4-branch Aug 26, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants