Skip to content

west.yml: MCUboot synchronization from v3.7-branch #80425

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

Merged
merged 3 commits into from
Nov 15, 2024
Merged

west.yml: MCUboot synchronization from v3.7-branch #80425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1105da7
manifest: Update TF-M
nordicjm Oct 31, 2024
3d0e566
west.yml: MCUboot synchronization from v3.7-branch
nordicjm Oct 25, 2024
32bd23a
doc: release: 3.7: Add MCUboot/TF-M updates for 3.7.1
nordicjm Nov 15, 2024
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
15 changes: 15 additions & 0 deletions doc/releases/release-notes-3.7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@ Mbed TLS was updated to version 3.6.2 (from 3.6.0). The release notes can be fou
Mbed TLS 3.6 is an LTS release that will be supported
with security and bug fixes until at least March 2027.

MCUboot
Copy link
Member

@nashif nashif Nov 15, 2024

Choose a reason for hiding this comment

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

this is too verbose of a release note in a module to be included in the zephyr release notes, dont you have something to link to similar to what we do tfm and mbedtls?

Copy link
Member

@nashif nashif Nov 15, 2024

Choose a reason for hiding this comment

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

the issue i see here is that all of those changes might be seen as changes to zephyr and not mcuboot itself, which might be confusing.

Copy link
Contributor Author

@nordicjm nordicjm Nov 15, 2024

Choose a reason for hiding this comment

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

MCUboot has release notes but they're only generated when a release is made, and these are cherry-picked commits so if a release was made, it wouldn't be correct as it's be for mcuboot's main not the zephyr-only branch with cherry picked commits

Copy link
Contributor Author

@nordicjm nordicjm Nov 15, 2024

Choose a reason for hiding this comment

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

Can just change to link to this PR instead?

Copy link
Member

@nashif nashif Nov 15, 2024

Choose a reason for hiding this comment

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

MCUboot has release notes but they're only generated when a release is made, and these are cherry-picked commits so if a release was made, it wouldn't be correct as it's be for mcuboot's main not the zephyr-only branch with cherry picked commits

You can still make bug fix releases on the branch, no?
Anyways, I'd rathe remove all of this and just leave a general note. Mcuboot release notes do not belong in the Zephyr release notes. Either remove them from this PR or I will drop them when I update the 3.7 notes later for the final 3.7.1 release.

Copy link
Contributor Author

@nordicjm nordicjm Nov 15, 2024

Choose a reason for hiding this comment

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

You can still make bug fix releases on the branch, no?

It's a zephyr branch of MCUboot, it does not exist upstream. https://github.com/zephyrproject-rtos/mcuboot/tree/v3.7-branch is where it gets cherry picked to

Either remove them from this PR

Will do

*******

MCUboot commit has been updated to ``ea2410697dd0262edec041a0ccb07fdbde7c1aff``.

Trusted Firmware-M
******************

TF-M was updated to version 2.1.1 (from 2.1.0). The release notes can be found at:

* https://trustedfirmware-m.readthedocs.io/en/tf-mv2.1.1/releases/2.1.1.html

TF-M 2.1 is an LTS release synchronized with Mbed TLS 3.6 that
will be supported with security and bug fixes until March 2027.

.. _zephyr_3.7.0:

Zephyr 3.7.0
Expand Down
2 changes: 1 addition & 1 deletion submanifests/optional.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ manifest:
groups:
- optional
- name: tf-m-tests
revision: d552e4f18b92032bd335d5e3aa312f6acd82a83b
revision: 502ea90105ee18f20c78f710e2ba2ded0fc0756e
path: modules/tee/tf-m/tf-m-tests
remote: upstream
groups:
Expand Down
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ manifest:
groups:
- crypto
- name: mcuboot
revision: fb2cf0ec3da3687b93f28e556ab682bdd4b85223
revision: ea2410697dd0262edec041a0ccb07fdbde7c1aff
path: bootloader/mcuboot
- name: mipi-sys-t
path: modules/debug/mipi-sys-t
Expand Down Expand Up @@ -327,7 +327,7 @@ manifest:
groups:
- crypto
- name: trusted-firmware-m
revision: 069455be098383bf96eab73e3ff8e0c66c60fa5a
revision: 60ebade5d3d381a210af90191e475d8870b8adbc
path: modules/tee/tf-m/trusted-firmware-m
groups:
- tee
Expand Down