Skip to content

Conversation

@nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Jun 9, 2025

Update Zephyr fork of MCUboot to revision:
18d9df1f76f22bf538bdd7d2cd9e4198c91568c0

Brings following Zephyr relevant fixes:

  • 18d9df1f bootutil: Fix crash when bootutil_sha_init() is called in loop
  • c2f2f90d boot: bootutil: Only update the security counter for confirmed images
  • 5a7ee345 boot: bootutil: Fix max image size computation for swap-move/swap-offset
  • 116925f7 boot/zephyr/main: fix placement of pointer to arm vector
  • b4cff578 boot: bootutil: swap_scratch: Fix issue with bricking device
  • 480464d2 boot: bootutil: Refactor erase functionality to fix watchdog feeding
  • cc38cc27 boot: Use boot erase function instead of flash erase function
  • 33453828 boot: bootutil: Move erase function location
  • bb148939 boot: zephyr: flash_map: Fix missing include
  • 51620768 boot: boot_serial: Fix issue with CBOR and setting image state
  • a277cf03 zephyr: Fix trailer size computation for swap-scratch
  • ac0ac75e zephyr: Fix TLV area was included in trailer size when rounding up
  • 25922090 boot: bootutil: swap_move: Fix maximum application size
  • bf494562 boot: bootutil: loader: Add include for flash function

Fixes #91360

@nordicjm nordicjm added the DNM This PR should not be merged (Do Not Merge) label Jun 9, 2025
@github-actions
Copy link

github-actions bot commented Jun 9, 2025

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@58538dd zephyrproject-rtos/mcuboot@7a29b5a (v3.7-branch) zephyrproject-rtos/[email protected]
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@78854ff zephyrproject-rtos/trusted-firmware-m@cc9b6cc (v3.7-branch) zephyrproject-rtos/[email protected]

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

@github-actions github-actions bot added manifest manifest-mcuboot and removed DNM This PR should not be merged (Do Not Merge) labels Jun 9, 2025
@github-actions github-actions bot added manifest-trusted-firmware-m DNM This PR should not be merged (Do Not Merge) labels Jun 10, 2025
@nordicjm nordicjm linked an issue Jun 10, 2025 that may be closed by this pull request
1 task
@nordicjm nordicjm requested a review from de-nordic June 10, 2025 13:42
@nordicjm nordicjm marked this pull request as ready for review June 10, 2025 13:44
@nordicjm nordicjm force-pushed the mcubootupdates37 branch 2 times, most recently from 7430060 to 7bb6ffe Compare July 2, 2025 11:39
@nordicjm nordicjm requested review from aescolar and tomi-font July 2, 2025 11:44
aescolar
aescolar previously approved these changes Jul 2, 2025
tomi-font
tomi-font previously approved these changes Jul 2, 2025
Copy link
Contributor

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

inconsistent manifest:/west.yml:

@nordicjm nordicjm force-pushed the mcubootupdates37 branch from 7bb6ffe to 51c5069 Compare July 2, 2025 11:57
@nordicjm nordicjm dismissed stale reviews from tomi-font and aescolar via 41cfaf6 July 2, 2025 12:13
@nordicjm nordicjm force-pushed the mcubootupdates37 branch from 51c5069 to 41cfaf6 Compare July 2, 2025 12:13
nordicjm added 2 commits July 2, 2025 13:14
Updates TF-M to bring in flash function cherry pick

Signed-off-by: Jamie McCrae <[email protected]>
Update Zephyr fork of MCUboot to revision:
  7a29b5a6a10f9179cac3935645c2a1356dafb2b6

Brings following Zephyr relevant fixes:

  - 70ad2d44 boot: bootutil: Fix serial recovery issues
  - 4e659a94 boot: bootutil: Fix wrong define for single loader
    mode
  - 8f6f4b4b boot: bootutil: Fix single loader trailer size
  - 99cecb5a boot: boot_serial: Fix wrong slot ID for hook calls
  - 3519605c zephyr: cleanup removed
    CONFIG_BOOT_MGMT_CUSTOM_IMG_LIST
  - 86dc36ed boot_serial: Avoid re-initializing state in
    boot_image_validate_encrypted
  - 16472e08 boot_serial: Initialize a bootloader state for bs_list
    and bs_set
  - 5ee8ede0 zephyr: Fix pinreset trigger
  - f448629c bootutil: boot_decrypt_key: Only one
    bootutil_hmac_sha256_drop needed
  - 2f5d6bf9 imgtool: fix dependency on click version
  - 50c14ceb boot: bootutil: bootutil_misc: Fix max image size for
    single images
  - 18d9df1f bootutil: Fix crash when bootutil_sha_init() is called
    in loop
  - c2f2f90d boot: bootutil: Only update the security counter for
    confirmed images
  - 5a7ee345 boot: bootutil: Fix max image size computation for
    swap-move/swap-offset
  - 116925f7 boot/zephyr/main: fix placement of pointer to arm
    vector
  - b4cff578 boot: bootutil: swap_scratch: Fix issue with bricking
    device
  - 480464d2 boot: bootutil: Refactor erase functionality to fix
    watchdog feeding
  - cc38cc27 boot: Use boot erase function instead of flash erase
    function
  - bb148939 boot: zephyr: flash_map: Fix missing include
  - 51620768 boot: boot_serial: Fix issue with CBOR and setting
    image state
  - a277cf03 zephyr: Fix trailer size computation for swap-scratch
  - ac0ac75e zephyr: Fix TLV area was included in trailer size when
    rounding up
  - 25922090 boot: bootutil: swap_move: Fix maximum application
    size

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm force-pushed the mcubootupdates37 branch from 41cfaf6 to 5e63067 Compare July 2, 2025 12:15
@nordicjm nordicjm requested review from aescolar and tomi-font July 2, 2025 12:15
@github-actions github-actions bot removed the DNM This PR should not be merged (Do Not Merge) label Jul 2, 2025
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 2, 2025

@nordicjm
Copy link
Contributor Author

nordicjm commented Jul 2, 2025

the DNM failure doesn't make sense, there isn't a DNM label or architecture/dev review tag...

@tomi-font tomi-font added DNM This PR should not be merged (Do Not Merge) and removed DNM This PR should not be merged (Do Not Merge) labels Jul 2, 2025
@fabiobaltieri
Copy link
Member

the DNM failure doesn't make sense, there isn't a DNM label or architecture/dev review tag...

Since this is based on 3.7 it's still running the old check that uses the PR metadata at workflow definition, that one was prone to race condition and some weird eventual consistency problem, saw labels sticking for no good reasons in the past, that's why I've redone it in python recently. It's "skipped" now which is how it should be, @tomi-font relabel did it.

@aescolar aescolar merged commit 1ddf975 into zephyrproject-rtos:v3.7-branch Jul 4, 2025
40 of 54 checks passed
@nordicjm nordicjm deleted the mcubootupdates37 branch September 23, 2025 10:55
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.

[v3.7-branch] Update MCUboot with fixes from 2.2.0 release

6 participants