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: MCUboot synchronization from upstream #64703

Merged
merged 1 commit into from
Nov 3, 2023
Merged

west.yml: MCUboot synchronization from upstream #64703

merged 1 commit into from
Nov 3, 2023

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Nov 1, 2023

Update Zephyr fork of MCUboot to revision:
4a1effbc301fc302ecbaf40d4eb2be520b53010d

Brings following Zephyr relevant fixes:

  • 4a1effbc zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE option
  • 2b924da4 samples: zephyr: Use the default MCUBoot PEM key file
  • 25b7c7a8 imgtool: make "align" command line parameter optional
  • 301d5655 readme: update for next dev release
  • e0bdcdec Update version files for 2.0.0
  • 9b92ee91 boot: zephyr: add support for LPC55Sxx

Notes on process:

  1. The MCUboot update from mcu-tools/mcuboot/main with the SHA used in west.yaml is already synchronized to zephyrproject-rtos/mcuboot/upstream-sync branch, and is available in the Zephyr fork of MCUboot.
  2. The [DNM] on this PR should be kept until the PR passes all tests and is accepted.
  3. Once the PR passes all tests and gets accepted, the upstream-sync branch should be fast-forward merged to zephyrproject-rtos/mcuboot/main branch and [DNM] should be removed.
  4. After the main branch gets updated, this PR does not require further changes and should be merged as is.

@nordicjm
west.yml: MCUboot synchronization from upstream
9a94d1f 
Update Zephyr fork of MCUboot to revision:
  4a1effbc301fc302ecbaf40d4eb2be520b53010d

Brings following Zephyr relevant fixes:
 - 4a1effbc zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE option
 - 2b924da4 samples: zephyr: Use the default MCUBoot PEM key file
 - 25b7c7a8 imgtool: make "align" command line parameter optional
 - 301d5655 readme: update for next dev release
 - e0bdcdec Update version files for 2.0.0
 - 9b92ee91 boot: zephyr: add support for LPC55Sxx

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm requested review from butok and de-nordic November 1, 2023 15:59
@zephyrbot zephyrbot added the Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. label Nov 1, 2023
@zephyrbot
Copy link
Collaborator

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@13767d0 (main) zephyrproject-rtos/mcuboot@4a1effb (upstream-sync) zephyrproject-rtos/[email protected]

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

@zephyrbot zephyrbot added manifest manifest-mcuboot DNM This PR should not be merged (Do Not Merge) labels Nov 1, 2023
@nordicjm nordicjm removed the DNM This PR should not be merged (Do Not Merge) label Nov 2, 2023
@carlescufi carlescufi merged commit dd4472c into zephyrproject-rtos:main Nov 3, 2023
29 of 30 checks passed
@nordicjm nordicjm deleted the mcuupd200 branch December 12, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@de-nordic de-nordic de-nordic approved these changes

@butok butok butok approved these changes

Assignees
No one assigned
Labels
manifest manifest-mcuboot Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nordicjm @zephyrbot @butok @de-nordic @carlescufi