Skip to content
Closed
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ manifest:
groups:
- tee
- name: trusted-firmware-m
revision: cc800268f79779fa674b7085ecf507eb95b83ff9
revision: pull/134/head
Copy link
Contributor

Choose a reason for hiding this comment

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

This is queued for merging but not yet upstream.

Does this mean that you have submitted the changes upstream? (if so please link to that in the TF-M PR commits)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just to the Zephyr repository (shown in the revision above). I suppose I should attempt to figure out how to submit upstream to tf-m.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, that looks extremely complicated. Can we get some review here first and see if this change is reasonable?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. I can also submit the changes upstream for you if needed.
Though I'm not qualified to review the changes in zephyrproject-rtos/trusted-firmware-m#134. I mentioned the PR to upstream maintainers so I hope they can also chime in to tell their opinions. (cc @Anton-TF @adeaarm)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you're willing to shepherd the change upstream, that would be helpful (especially given their email-based submission process).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, the trusted-firmware-m changes are actually passing tests with both Zephyr SDK version 0.17 (+ a few patches) and SDK version 0.18 (alpha4 + a few patches). I think they're ready for review.

Copy link
Contributor

Choose a reason for hiding this comment

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

I still find the commit message (This is queued for merging but not yet upstream.) a tad confusing, please update it when you make changes to the PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

tf-m isn't email based, but uses Gerrit, which admittedly will be kind of foreign to people not using it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the tf-m changes were split out to #94367 and are now passing all tests. I've updated the commit messages in the module to clarify what they do.

path: modules/tee/tf-m/trusted-firmware-m
groups:
- tee
Expand Down
Loading