Skip to content

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Jul 17, 2025

Update Zephyr fork of MCUboot to revision:
461e060e8687c9a75074effcc61d7f68c5112cfd

Brings following Zephyr relevant fixes:

  • 461e060e zephyr: Improve SHA support selectors
  • b9ba2573 boot: zephyr: kconfig: Default to swap using offset
  • cc8f6aff boot: zephyr: Set prefer swap using move for aligned boards
  • 37bc4aa4 zephyr: boards: nrf54h20dk: disable power domains
  • 5a728be9 boot: zephyr: Add support for Cortex-R cleanup before final jump
  • 83e2f934 boot: zephyr: Add Cortex-R support
  • c136f4a8 boot: zephyr: Remove references to tinycrypt
  • 3bf79cbc boot: zephyr: Remove support for deprecated LED dts
  • 3e02536f boot: bootutil: declare fih_panic_loop() as noreturn
  • 5eaf190a boot: zephyr: RAM cleanup debug loop
  • ecf01da3 zephyr: Add zephyr samples folder to list of samples
  • 724a7514 boot: zephyr: boards: Reformat DTS files
  • f9db0194 bootutil: Unify app_max_size() implementations
  • 6ea7add6 zephyr: Remove legacy flash_area_get_sectors
  • 7271062e boot: zephyr: boards: Remove outdated nrf54l15pdk board config
  • 5ce11a3b zephyr: boards: nrf - remove redundant multithreading configuration
  • fa4ca87a mbedtls: Move local mbedtls to v3.6.0
  • a736efa7 boot: zephyr: add support for revert mode with ramload
  • 61c5547b boot: zephyr: add ram_load overlays for nrf52840dk and mimxrt1050_evk boards

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.

@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Jul 17, 2025
Copy link

github-actions bot commented Jul 17, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@4eba808 zephyrproject-rtos/mcuboot@461e060 (main,upstream-sync) zephyrproject-rtos/[email protected]

Additional metadata changed:

Name URL Submodules West cmds module.yml Blobs
mcuboot

DNM label due to: 1 project with metadata changes

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

@github-actions github-actions bot added manifest manifest-mcuboot DNM (manifest) This PR should not be merged (controlled by action-manifest) labels Jul 17, 2025
@nordicjm nordicjm requested review from de-nordic and nashif July 17, 2025 09:37
de-nordic
de-nordic previously approved these changes Jul 17, 2025
Update Zephyr fork of MCUboot to revision:
  461e060e8687c9a75074effcc61d7f68c5112cfd

Brings following Zephyr relevant fixes:

  - 461e060e zephyr: Improve SHA support selectors
  - b9ba2573 boot: zephyr: kconfig: Default to swap using offset
  - cc8f6aff boot: zephyr: Set prefer swap using move for aligned
    boards
  - 37bc4aa4 zephyr: boards: nrf54h20dk: disable power domains
  - 5a728be9 boot: zephyr: Add support for Cortex-R cleanup before
    final jump
  - 83e2f934 boot: zephyr: Add Cortex-R support
  - c136f4a8 boot: zephyr: Remove references to tinycrypt
  - 3bf79cbc boot: zephyr: Remove support for deprecated LED dts
  - 3e02536f boot: bootutil: declare fih_panic_loop() as noreturn
  - 5eaf190a boot: zephyr: RAM cleanup debug loop
  - ecf01da3 zephyr: Add zephyr samples folder to list of samples
  - 724a7514 boot: zephyr: boards: Reformat DTS files
  - f9db0194 bootutil: Unify app_max_size() implementations
  - 6ea7add6 zephyr: Remove legacy flash_area_get_sectors
  - 7271062e boot: zephyr: boards: Remove outdated nrf54l15pdk
    board config
  - 5ce11a3b zephyr: boards: nrf - remove redundant multithreading
    configuration
  - fa4ca87a mbedtls: Move local mbedtls to v3.6.0
  - a736efa7 boot: zephyr: add support for revert mode with ramload
  - 61c5547b boot: zephyr: add ram_load overlays for nrf52840dk and
    mimxrt1050_evk boards

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm force-pushed the newmcubootupdrepo branch from dc78bcc to db69dbf Compare July 18, 2025 08:21
Copy link

@nordicjm nordicjm requested review from de-nordic and butok July 18, 2025 08:40
Copy link
Contributor

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

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

Looks good.

@nashif nashif removed the DNM (manifest) This PR should not be merged (controlled by action-manifest) label Jul 21, 2025
@cfriedt cfriedt merged commit 8640355 into zephyrproject-rtos:main Jul 22, 2025
28 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
manifest manifest-mcuboot size: XS A PR changing only a single line of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants