tfm: Bump tfm to 2.2.0

Bump TF-M to 2.2.0 (latest release at the moment)

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
tf-m-tests	https://github.com/zephyrproject-rtos/tf-m-tests/commit/c712761dd5391bf3f38033643d28a736cae89a19	https://github.com/zephyrproject-rtos/tf-m-tests/commit/a286347e6a5dd37a9a5e960450ffc0260d63fb27 (main)	zephyrproject-rtos/[email protected]
trusted-firmware-m	https://github.com/zephyrproject-rtos/trusted-firmware-m/commit/c150f48855f04d77451a39bfaa80d14eb61d918b (main,tf-m-2.1.2-branch)	https://github.com/zephyrproject-rtos/trusted-firmware-m/commit/65d8615521debd0c4c45153df37bbfe9934e9559 (tf-m-2.2.x-branch)	zephyrproject-rtos/[email protected]

✅ All manifest checks OK

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

@tomi-font I am having some problems with Nordic targets when updating TF-M. Some problems seem to be fixed in NRF connect (in https://github.com/nrfconnect/sdk-nrf/tree/main/modules/trusted-firmware-m), e.g tfm_platform_user_memory_ranges.h definition. Not sure if all these logic in this repo should be in Zephyr.

I have changed the included directory in the second commit to use the board dir and not the SoC. It fixes some issues but I am not sure if that is the right thing to do.

Can you (or someone from Nordic) help with it ?

@tomi-font I am having some problems with Nordic targets when updating TF-M. Some problems seem to be fixed in NRF connect (in https://github.com/nrfconnect/sdk-nrf/tree/main/modules/trusted-firmware-m), e.g tfm_platform_user_memory_ranges.h definition. Not sure if all these logic in this repo should be in Zephyr.

I have changed the included directory in the second commit to use the board dir and not the SoC. It fixes some issues but I am not sure if that is the right thing to do.

Can you (or someone from Nordic) help with it ?

@nordicjm ^

@tomi-font I am having some problems with Nordic targets when updating TF-M. Some problems seem to be fixed in NRF connect (in https://github.com/nrfconnect/sdk-nrf/tree/main/modules/trusted-firmware-m), e.g tfm_platform_user_memory_ranges.h definition. Not sure if all these logic in this repo should be in Zephyr.

I have changed the included directory in the second commit to use the board dir and not the SoC. It fixes some issues but I am not sure if that is the right thing to do.

Can you (or someone from Nordic) help with it ?

I am looking at it, I think that I will have to open a PR in upstream TF-M for this. I can do that later and then you can cherry pick the fix from my PR.

@ceolin You can revert your last commit and cherry pick this one cleanly: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/39198

@ceolin You can revert your last commit and cherry pick this one cleanly: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/39198

@Vge0rge thanks a lot ! I have remove that commit and cherry-picked the one you mentioned. Lets see how it goes :)

We have not enabled MAX32657 on the tf-m/v2.2.0 release due to this branch was not LTS. We thought tf-m/v2.3.0 which is LTS branch will be used for zephyr. If zephyr/tf-m will be updated with 2.2.0 than we need to push MAX32657 related updates on the v2.2.0 branch too.

We have not enabled MAX32657 on the tf-m/v2.2.0 release due to this branch was not LTS. We thought tf-m/v2.3.0 which is LTS branch will be used for zephyr. If zephyr/tf-m will be updated with 2.2.0 than we need to push MAX32657 related updates on the v2.2.0 branch too.

I think you should just contribute it to TF-M's main branch. It'll probably be possible to cherry pick it cleanly back into 2.2, and it will automatically land it for 2.3 and future versions.

We have not enabled MAX32657 on the tf-m/v2.2.0 release due to this branch was not LTS. We thought tf-m/v2.3.0 which is LTS branch will be used for zephyr. If zephyr/tf-m will be updated with 2.2.0 than we need to push MAX32657 related updates on the v2.2.0 branch too.

I think you should just contribute it to TF-M's main branch. It'll probably be possible to cherry pick it cleanly back into 2.2, and it will automatically land it for 2.3 and future versions.

Ok, it is already in main branch and v2.1.x but not in v2.2.x.

Hi @ceolin, just curious, do we plan to get this merged in this release before the code freeze?

Hi @ceolin, just curious, do we plan to get this merged in this release before the code freeze?

yes, it is a release blocker: https://github.com/zephyrproject-rtos/zephyr/issues/91089

just a reminder @ceolin this is a 4.2 release blocker. the 4.2 feature freeze is expected to start on Friday the 27th.

@ceolin CI is not passing. Can you double check?

@ceolin CI is not passing. Can you double check?

I think it is because of the DNM label. I have updated the pr with proper hashes now that dependencies were merged.

@dkalowsk

will look to merge after https://github.com/zephyrproject-rtos/zephyr/pull/92331 is merged to fix the CI builds

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud