Skip to content

west.yml: MCUboot synchronization from upstream #92161

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

Merged
merged 1 commit into from
Jun 27, 2025

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Jun 25, 2025

Update Zephyr fork of MCUboot to revision:
07222c1929e1d79d303baa8fde7f977a79e48e9a

Brings following Zephyr relevant fixes:

  • 07222c19 boot_serial: Avoid re-initializing state in boot_image_validate_encrypted
  • a18f635a boot: Remove now superfluous start_off parameters
  • c62c19db boot_serial: Use flash sectors from bootloader state when possible
  • 13edc5fb boot_serial: Use flash area from bootloader state when possible
  • f1aa499c boot_serial: Initialize a bootloader state for bs_list and bs_set
  • f1efd483 bootutil: loader: Expose routine to determine sector layout
  • 72166868 bootutil: loader: Expose routine to open/close all flash areas
  • 0319e91c boot: bootutil: Fix encryption/decryption size during copy
  • a36f9513 imgtool: Add support for HMAC/HKDF-SHA512 with ECIES-X25519
  • 37719169 zephyr: Support for HKDF/HMAC with SHA512
  • 1d83177c bootutil: Add support for HAMC-SHA512 with ECIES-X25519
  • 7de064ea boot: zephyr: add support for booting ARC processors
  • 72459ec0 boot: zephyr: stm32n6570_dk: define CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS
  • be8b3abc boot: Zephyr: Add a Kconfig for MULTIPLE_EXECUTABLE_RAM_REGIONS define
  • c5011f2b zephyr: Improve logging
  • 11f9c6f2 bootutil: Improve logging coverage
  • adbe1cfb boot: stm32n6: Define specific executable region
  • 93c2b50a boot: zephyr: boards: Add configuration for stm32n6570_dk
  • fca80b41 boot: zephyr: defines FLASH device for external NOR
  • 78d94cf4 imgtool: bump minimal required version to 2.2.0
  • af602f81 bootutil: Replace local identifiers with common definitions
  • e5756df5 bootutil: Remove redundant ALIGN definitions
  • e3a271c9 bootutil: Move all encryption TLV helper identifiers into one place
  • 68a4c962 boot: bootutil: avoid full erase on BOOT_MAGIC_BAD in boot_set_next
  • 1ed0218c scripts: imgtool: Add hash for ECDSA256P1Public
  • a90ddfc7 zephyr: Fix pinreset trigger
  • e56cecc4 bootutil: Small cleanup in image.h
  • 402d3f7f boot: zephyr: Refactor DFU entry logic
  • 687dc8c5 bootutil: boot_decrypt_key: Only one bootutil_hmac_sha256_drop needed
  • a0065f8f bootutil: Fix boot_scramble_region escaping flash area
  • bb644c7c bootutil: loader: overwrite-only mode fix for trailer erase

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 nordicjm added this to the v4.2.0 milestone Jun 25, 2025
@github-actions github-actions bot added the size: XS A PR changing only a single line of code label Jun 25, 2025
@nordicjm nordicjm mentioned this pull request Jun 25, 2025
29 tasks
Copy link

github-actions bot commented Jun 25, 2025

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@11982df zephyrproject-rtos/mcuboot@07222c1 (upstream-sync) zephyrproject-rtos/[email protected]

All manifest checks OK

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

de-nordic
de-nordic previously approved these changes Jun 25, 2025
carlescufi
carlescufi previously approved these changes Jun 25, 2025
de-nordic
de-nordic previously approved these changes Jun 25, 2025
@de-nordic de-nordic requested a review from erwango June 25, 2025 14:07
erwango
erwango previously approved these changes Jun 25, 2025
Update Zephyr fork of MCUboot to revision:
  07222c1929e1d79d303baa8fde7f977a79e48e9a

Brings following Zephyr relevant fixes:

  - 07222c19 boot_serial: Avoid re-initializing state in
    boot_image_validate_encrypted
  - a18f635a boot: Remove now superfluous start_off parameters
  - c62c19db boot_serial: Use flash sectors from bootloader state
    when possible
  - 13edc5fb boot_serial: Use flash area from bootloader state when
    possible
  - f1aa499c boot_serial: Initialize a bootloader state for bs_list
    and bs_set
  - f1efd483 bootutil: loader: Expose routine to determine sector
    layout
  - 72166868 bootutil: loader: Expose routine to open/close all
    flash areas
  - 0319e91c boot: bootutil: Fix encryption/decryption size
    during copy
  - a36f9513 imgtool: Add support for HMAC/HKDF-SHA512 with
    ECIES-X25519
  - 37719169 zephyr: Support for HKDF/HMAC with SHA512
  - 1d83177c bootutil: Add support for HAMC-SHA512 with ECIES-X25519
  - 7de064ea boot: zephyr: add support for booting ARC processors
  - 72459ec0 boot: zephyr: stm32n6570_dk: define
    CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS
  - be8b3abc boot: Zephyr: Add a Kconfig for
    MULTIPLE_EXECUTABLE_RAM_REGIONS define
  - c5011f2b zephyr: Improve logging
  - 11f9c6f2 bootutil: Improve logging coverage
  - adbe1cfb boot: stm32n6: Define specific executable region
  - 93c2b50a boot: zephyr: boards: Add configuration for
    stm32n6570_dk
  - fca80b41 boot: zephyr: defines FLASH device for external NOR
  - 78d94cf4 imgtool: bump minimal required version to 2.2.0
  - af602f81 bootutil: Replace local identifiers with common
    definitions
  - e5756df5 bootutil: Remove redundant ALIGN definitions
  - e3a271c9 bootutil: Move all encryption TLV helper identifiers
    into one place
  - 68a4c962 boot: bootutil: avoid full erase on BOOT_MAGIC_BAD
    in boot_set_next
  - 1ed0218c scripts: imgtool: Add hash for ECDSA256P1Public
  - a90ddfc7 zephyr: Fix pinreset trigger
  - e56cecc4 bootutil: Small cleanup in image.h
  - 402d3f7f boot: zephyr: Refactor DFU entry logic
  - 687dc8c5 bootutil: boot_decrypt_key: Only one
    bootutil_hmac_sha256_drop needed
  - a0065f8f bootutil: Fix boot_scramble_region escaping flash
    area
  - bb644c7c bootutil: loader: overwrite-only mode fix for
    trailer erase

Signed-off-by: Jamie McCrae <[email protected]>
Copy link

@dkalowsk dkalowsk added the Release Blocker Use this label for justified release blockers label Jun 26, 2025
@dkalowsk
Copy link
Contributor

Added release-blocker to ensure this gets merged. Currently pending on the merge-list.

@kartben kartben merged commit 801792b into zephyrproject-rtos:main Jun 27, 2025
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
manifest manifest-mcuboot Release Blocker Use this label for justified release blockers size: XS A PR changing only a single line of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants