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

Jump to bottom

west.yml: Migrate to TF-M 1.8 #60226

Merged
merged 2 commits into from Jul 21, 2023
Merged

west.yml: Migrate to TF-M 1.8 #60226

merged 2 commits into from Jul 21, 2023

Conversation

d3zd3z
Copy link
Collaborator

@d3zd3z d3zd3z commented Jul 10, 2023

Move TF-M to 1.8 and mbed TLS to 3.4

Not currently working as mbed TLS will being worked on, but it is failing before that.

@d3zd3z d3zd3z added the DNM This PR should not be merged (Do Not Merge) label Jul 10, 2023
@zephyrbot
Copy link
Collaborator

zephyrbot commented Jul 10, 2023 •
edited

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

Name Old Revision New Revision Diff
mbedtls zephyrproject-rtos/mbedtls@6e7841e zephyrproject-rtos/mbedtls@c38dc78 (zephyr) zephyrproject-rtos/mbedtls@6e7841e5..c38dc78d
tf-m-tests zephyrproject-rtos/tf-m-tests@0f80a65 zephyrproject-rtos/tf-m-tests@a878426 (master) zephyrproject-rtos/tf-m-tests@0f80a651..a878426d
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@79a6115 zephyrproject-rtos/trusted-firmware-m@bad0696 (master) zephyrproject-rtos/trusted-firmware-m@79a6115d..bad0696f

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

@joerchan
Copy link
Contributor

Move TF-M to 1.8 and mbed TLS to 3.4

Not currently working as mbed TLS will being worked on, but it is failing before that.

Isn't CI green? That's highly suspicious

@d3zd3z
Copy link
Collaborator Author

d3zd3z commented Jul 10, 2023

I'll have to try to figure out what is going on here. This shouldn't be passing, as these tests don't even get through cmake.

@d3zd3z
Copy link
Collaborator Author

d3zd3z commented Jul 10, 2023

I mistyped the PR number and this was still testing tf-m 1.7. This should have tfm-1.7 as well as mbedtls 3.4. It doesn't build yet.

@zephyrbot zephyrbot added manifest-mbedtls area: TF-M ARM Trusted Firmware-M (TF-M) labels Jul 10, 2023
@d3zd3z d3zd3z force-pushed the tfm1.8 branch 2 times, most recently from c88d702 to dd215b2 Compare July 17, 2023 20:44
@microbuilder
Copy link
Member

@joerchan When you have time, can you please do a review of this and test on Nordic HW? Thanks.

microbuilder
microbuilder requested changes Jul 17, 2023
View reviewed changes
Copy link
Member

@microbuilder microbuilder left a comment

Choose a reason for hiding this comment

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

Please add another commit here, updating the 3.5 release notes doc to at least mention the update to TF-M version 1.8.0 in the appropriate section.

@d3zd3z d3zd3z requested a review from nashif as a code owner July 18, 2023 16:47
@zephyrbot zephyrbot added the Release Notes To be mentioned in the release notes label Jul 18, 2023
@zephyrbot zephyrbot requested a review from jgl-meta July 18, 2023 16:47
joerchan
joerchan requested changes Jul 20, 2023
View reviewed changes
Copy link
Contributor

@joerchan joerchan left a comment

Choose a reason for hiding this comment

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

In the interest of a bisectable history I think the 7 first commits (all except doc update) needs to be squashed to one commit.
Having 4 different updates for these repositories in the manifest, and also the other changes leaves the history with commits that will not build.

Apart from that, this looks good.

Ran the TF-M regression tests and the PSA architecture tests on nrf53 DK and it they all pass.

@d3zd3z
manifest: Upgrade to trusted-firmware-m 1.8.0
74a66b7 
Update trusted-firmware-m to 1.8.0, mbedtls to 3.4.0, and tf-m-tests to
1.8.0.  Includes minor cmake changes due to file renames and such, as well
as adjusting the return type of a callback function that has changed since
the previous version of trusted-firmware-m.

Signed-off-by: David Brown <david.brown@linaro.org>
@d3zd3z
doc: release-notes: Update tf-m and mbed TLS
9e6e826 
Describe the versions of TF-M and Mbed TLS being used.

Signed-off-by: David Brown <david.brown@linaro.org>
@zephyrbot zephyrbot requested a review from jhedberg July 21, 2023 14:09
@d3zd3z d3zd3z removed the DNM This PR should not be merged (Do Not Merge) label Jul 21, 2023
@microbuilder
Copy link
Member

@nashif Do you mind merging this in? I think Carles is on vacation. Thanks!

@fabiobaltieri fabiobaltieri merged commit a64f430 into zephyrproject-rtos:main Jul 21, 2023
19 of 20 checks passed
@nandojve nandojve mentioned this pull request Jul 27, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@microbuilder microbuilder microbuilder approved these changes

@ceolin ceolin ceolin approved these changes

@joerchan joerchan joerchan approved these changes

@SebastianBoe SebastianBoe Awaiting requested review from SebastianBoe

@nashif nashif Awaiting requested review from nashif

@jgl-meta jgl-meta Awaiting requested review from jgl-meta

@fabiobaltieri fabiobaltieri Awaiting requested review from fabiobaltieri

@jhedberg jhedberg Awaiting requested review from jhedberg

Assignees

@ceolin ceolin

Labels
area: TF-M ARM Trusted Firmware-M (TF-M) manifest manifest-mbedtls manifest-psa-arch-tests manifest-tf-m-tests manifest-trusted-firmware-m Release Notes To be mentioned in the release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@d3zd3z @zephyrbot @joerchan @microbuilder @ceolin @fabiobaltieri