Skip to content

Conversation

@nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Jan 27, 2025

Update Zephyr fork of MCUboot to revision:
58538ddfe21843edb39d7e7502812e61696e55c4

Brings following Zephyr relevant fixes:

  • 58538ddf swap_move: correct appsize calcs and warning
  • 5ce8b311 zephyr: flash map: fix comparison signedness
  • 7d4de010 boot: bootutil: Fix usage of flash_area object
  • 61e1264b boot: bootutil: Take into account scratch trailer when computing max image size
  • 1a50ec2f boot: bootutil: Ensure the whole trailer is erased when it is large
  • c81ba032 boot: bootutil: Fix scratch trailer overwritten if image trailer is large
  • 913e9162 boot: bootutil: Fix underflow in swap-scratch when trailer is large
  • 509834cd boot: bootutil: Fix invalid last sector computation for swap-scratch
  • 834a0afa mynewt: Add flash_sector_get_size
  • ad7a2dd9 doc: imgtool: importance of clear flag
  • 50b727e7 docs: release-notes: Add note on fix for revert issue
  • 014d436c boot: bootutil: loader: Fix issue with stuck revert
  • 0c3ecbef boot: bootutil: Refactor some functions to have state
  • 78bb9c09 zephyr: Fix image encryption configuration for mbedTLS.
  • d8647ed3 zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN and ASN1
  • 41c82413 bootutil: Add missing MBEDTLS_ASN1_PARSE_C
  • 6f61d4fc zephyr: Remove scratch from flash_area_id_from_multi_image_slot
  • f48f5c5a boot: boot_serial: Fix uninitialised variables for upload
  • f40c2430 added missing MCUBOOT_VERSION_TWEAK in Zephyr port
  • a49a0337 boot: bootutil: loader.c: Add check if has upgrade before pushing state change
  • 664093d0 bootutil: Fix device brick after power failure during swap-move revert
  • c50b332b bootutil: Fix the reading of image headers after partial swap completion
  • 172694ea boot: zephyr: Fix sample.bootloader.mcuboot.usb_cdc_acm_recovery
  • 226a9a70 Allow bootstrapping for multiple images

Fixes #84614

@nordicjm nordicjm requested a review from de-nordic January 27, 2025 15:03
@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Jan 27, 2025
@zephyrbot
Copy link

zephyrbot commented Jan 27, 2025

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

Name Old Revision New Revision Diff
mcuboot nordicjm/mcuboot@ea24106 nordicjm/mcuboot@58538dd (v3.7-branch) nordicjm/[email protected]

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

de-nordic
de-nordic previously approved these changes Feb 4, 2025
@github-actions
Copy link

github-actions bot commented Apr 6, 2025

This pull request has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 14 days. Note, that you can always re-open a closed pull request at any time.

Update Zephyr fork of MCUboot to revision:
  58538ddfe21843edb39d7e7502812e61696e55c4

Brings following Zephyr relevant fixes:

  - 58538ddf swap_move: correct appsize calcs and warning
  - 5ce8b311 zephyr: flash map: fix comparison signedness
  - 7d4de010 boot: bootutil: Fix usage of flash_area object
  - 61e1264b boot: bootutil: Take into account scratch trailer
    when computing max image size
  - 1a50ec2f boot: bootutil: Ensure the whole trailer is erased
    when it is large
  - c81ba032 boot: bootutil: Fix scratch trailer overwritten if
    image trailer is large
  - 913e9162 boot: bootutil: Fix underflow in swap-scratch when
    trailer is large
  - 509834cd boot: bootutil: Fix invalid last sector computation
    for swap-scratch
  - 834a0afa mynewt: Add flash_sector_get_size
  - ad7a2dd9 doc: imgtool: importance of clear flag
  - 50b727e7 docs: release-notes: Add note on fix for revert issue
  - 014d436c boot: bootutil: loader: Fix issue with stuck revert
  - 0c3ecbef boot: bootutil: Refactor some functions to have state
  - 78bb9c09 zephyr: Fix image encryption configuration for
    mbedTLS.
  - d8647ed3 zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN and ASN1
  - 41c82413 bootutil: Add missing MBEDTLS_ASN1_PARSE_C
  - 6f61d4fc zephyr: Remove scratch from
    flash_area_id_from_multi_image_slot
  - f48f5c5a boot: boot_serial: Fix uninitialised variables for
    upload
  - f40c2430 added missing MCUBOOT_VERSION_TWEAK in Zephyr port
  - a49a0337 boot: bootutil: loader.c: Add check if has upgrade
    before pushing state change
  - 664093d0 bootutil: Fix device brick after power failure during
    swap-move revert
  - c50b332b bootutil: Fix the reading of image headers after
    partial swap completion
  - 172694ea boot: zephyr: Fix
    sample.bootloader.mcuboot.usb_cdc_acm_recovery
  - 226a9a70 Allow bootstrapping for multiple images

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm force-pushed the v37mcubootupdate7 branch from 950fb5f to b7aa308 Compare April 14, 2025 10:18
@nashif nashif removed the Stale label Apr 14, 2025
@dkalowsk dkalowsk added this to the v3.7.2 milestone Apr 15, 2025
@nashif nashif merged commit 92e879b into zephyrproject-rtos:v3.7-branch Apr 15, 2025
28 checks passed
- name: babblesim
url-base: https://github.com/BabbleSim
- name: nordicjm
url-base: https://github.com/nordicjm

Choose a reason for hiding this comment

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

This is not right, I assume?

https://docs.zephyrproject.org/latest/develop/modules.html#module-repositories is stating that:

All modules included in the default manifest shall be hosted in repositories under the zephyrproject-rtos GitHub organization.

Is this accidental, or is there really reason to not to use https://github.com/zephyrproject-rtos/mcuboot repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops that is accidental, have submitted a fix #88700 thanks

@nordicjm nordicjm deleted the v37mcubootupdate7 branch April 30, 2025 06:25
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.

[v3.7-branch] Update MCUboot to include fixes

6 participants