Skip to content

west.yml: MCUboot synchronization from upstream #88953

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
Apr 25, 2025

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Apr 23, 2025

Update Zephyr fork of MCUboot to revision:
81315483fcbdf1f1524c2b34a1fd4de6c77cd0f4

  • 81315483 Revert "zephyr: arm: Update reading the flash image reset vector"
  • 47d826e7 boot: bootutil: swap_offset: Fix maximum application size
  • d5d3359e zephyr: Fix trailer size computation for swap-scratch
  • f9e4e529 zephyr: Fix TLV area was included in trailer size when rounding up
  • 6cbea0a2 boot: boot_serial: Fix swap using offset
  • efa30399 boot: bootutil: swap_move: Fix maximum application size

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.

@github-actions github-actions bot added the size: XS A PR changing only a single line of code label Apr 23, 2025
Copy link

github-actions bot commented Apr 23, 2025

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@20f98e0 zephyrproject-rtos/mcuboot@8131548 (upstream-sync) zephyrproject-rtos/[email protected]

All manifest checks OK

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

butok
butok previously approved these changes Apr 23, 2025
@nashif
Copy link
Member

nashif commented Apr 23, 2025

This still has the build issue with tfm:

ash_area_get_sectors'? [-Wimplicit-function-declaration]
  152 |         ret = flash_area_get_sector(fa, flash_area_get_size(fa) - boot_trailer_sz(alignment),
      |               ^~~~~~~~~~~~~~~~~~~~~
      |               flash_area_get_sectors

@nordicjm
Copy link
Collaborator Author

This still has the build issue with tfm:

ash_area_get_sectors'? [-Wimplicit-function-declaration]
  152 |         ret = flash_area_get_sector(fa, flash_area_get_size(fa) - boot_trailer_sz(alignment),
      |               ^~~~~~~~~~~~~~~~~~~~~
      |               flash_area_get_sectors

That is a TF-M issue that needs fixing in TF-M, in TF-M they use parts of MCUboot code as "bl2" and do not define that function in a header file as they should, hence the warning

de-nordic
de-nordic previously approved these changes Apr 23, 2025
Update Zephyr fork of MCUboot to revision:
  81315483fcbdf1f1524c2b34a1fd4de6c77cd0f4

  - 81315483 Revert "zephyr: arm: Update reading the flash image
    reset vector"
  - 47d826e7 boot: bootutil: swap_offset: Fix maximum application
    size
  - d5d3359e zephyr: Fix trailer size computation for swap-scratch
  - f9e4e529 zephyr: Fix TLV area was included in trailer size when
    rounding up
  - 6cbea0a2 boot: boot_serial: Fix swap using offset
  - efa30399 boot: bootutil: swap_move: Fix maximum application
    size

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm dismissed stale reviews from de-nordic and butok via 6d6ebde April 24, 2025 13:43
@nordicjm nordicjm requested a review from de-nordic April 24, 2025 13:49
@kartben kartben merged commit a2ae38d into zephyrproject-rtos:main Apr 25, 2025
29 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.

5 participants