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.

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

west.yml: MCUboot synchronization from upstream #66221

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Dec 6, 2023

Update Zephyr fork of MCUboot to revision:
212997395ed34ff1721f5f4461b800e81abeb68d

Brings following Zephyr relevant fixes:

  • 21299739 zephyr: firmware/single_loader: Fix compile warning
  • a88e2293 zephyr: sysflash: Fix if condition for zephyr applications
  • 2a74a2b5 zephyr: io: add 'io_led_set()'
  • 8c6c6701 zephyr: io: include 'bootutil_log.h' and declare log module membership
  • d99154f4 zephyr: rename 'led_init()' to 'io_led_init()'
  • c43a20fd boot: zephyr: add support for mimxrt1040_evk

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.

Fixes #66248

@nordicjm nordicjm requested review from butok and de-nordic December 6, 2023 11:23
@zephyrbot
Copy link
Collaborator

zephyrbot commented Dec 6, 2023

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@05d1194 zephyrproject-rtos/mcuboot@2129973 (upstream-sync) zephyrproject-rtos/[email protected]

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

butok
butok previously approved these changes Dec 6, 2023
de-nordic
de-nordic previously approved these changes Dec 6, 2023
@de-nordic de-nordic requested a review from cfriedt December 6, 2023 12:18
@nordicjm nordicjm added the DNM This PR should not be merged (Do Not Merge) label Dec 7, 2023
Update Zephyr fork of MCUboot to revision:
  212997395ed34ff1721f5f4461b800e81abeb68d

Brings following Zephyr relevant fixes:
 - 21299739 zephyr: firmware/single_loader: Fix compile warning
 - a88e2293 zephyr: sysflash: Fix if condition for zephyr
   applications
 - 2a74a2b5 zephyr: io: add 'io_led_set()'
 - 8c6c6701 zephyr: io: include 'bootutil_log.h' and declare log
   module membership
 - d99154f4 zephyr: rename 'led_init()' to 'io_led_init()'
 - c43a20fd boot: zephyr: add support for mimxrt1040_evk

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm dismissed stale reviews from de-nordic and butok via d39f536 December 7, 2023 10:45
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Dec 7, 2023
@nordicjm nordicjm requested review from de-nordic and butok December 7, 2023 10:47
@nordicjm
Copy link
Collaborator Author

nordicjm commented Dec 7, 2023

@andysan this should resolve your issue

Copy link
Collaborator

@andysan andysan left a comment

Choose a reason for hiding this comment

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

I can confirm that this fixes #66248 for me, including setting boot loader information in the retention area (in single-slot mode) which I was about to file as a separate bug report.

@fabiobaltieri fabiobaltieri merged commit 22ef2be into zephyrproject-rtos:main Dec 8, 2023
21 of 22 checks passed
@nordicjm nordicjm deleted the somemcubootupdates branch December 12, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Application fails to build with MCUboot support in single-slot mode with blinfo enabled
6 participants