west.yml: MCUboot synchronization from v3.7-branch #80425
+3
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
|
@sylvioalves can you check failing CI here and let me know if there is a commit in MCUboot needed for this to build properly that has been misses? |
@nordicjm checking.. btw, there are multiple errors, not only with esp32c3. |
|
Ah indeed, seems some commits will need to be removed.... |
|
Edit: The error is the same for all targets as in below. /__w/zephyr/bootloader/mcuboot/boot/bootutil/src/bootutil_priv.h:68:2: error: #error "MCUBOOT_DIRECT_XIP_REVERT cannot be enabled unless MCUBOOT_DIRECT_XIP is used"
68 | #error "MCUBOOT_DIRECT_XIP_REVERT cannot be enabled unless MCUBOOT_DIRECT_XIP is used"Is that something you can work out or it is esp32 (and other socs) that require fixing? |
I'll fix that, the esp one is this: https://github.com/zephyrproject-rtos/zephyr/actions/runs/11515362961/job/32059151909?pr=80425 |
|
I've updated mcuboot with this locally. I can build without any issues. Still checking. @nordicjm I did test with build and twister locally. Not a single issue. The only difference is that CI is using sdk 0.16.8 and I am on 0.17.0. Any hints? |
nordicjm
force-pushed
the
37mcubootupdates
branch
3 times, most recently
from
0babe0f
to
557cb3d
Compare
nordicjm
changed the title
3 tasks
Have found the offending commit and removed it |
sylvioalves
previously approved these changes
Oct 28, 2024
butok
previously approved these changes
Oct 29, 2024
de-nordic
previously approved these changes
Oct 29, 2024
aescolar
previously approved these changes
Oct 30, 2024
nordicjm
force-pushed
the
37mcubootupdates
branch
from
557cb3d
to
8010cbc
Compare
nordicjm
force-pushed
the
37mcubootupdates
branch
from
8010cbc
to
0a38d40
Compare
nordicjm
force-pushed
the
37mcubootupdates
branch
from
0a38d40
to
390450e
Compare
tomi-font
requested changes
Oct 31, 2024
nordicjm
force-pushed
the
37mcubootupdates
branch
from
390450e
to
c1f734b
Compare
|
Adding the DNM to ensure nobody merges by mistake while we point to "yo" :). |
Updates TF-M to pull in fixes from 2.1.1, and updates the tests revision to work with this version Signed-off-by: Jamie McCrae <[email protected]>
Update Zephyr fork of MCUboot to revision:
1c47465cd111b855168d594782b5b17b154ea703
Brings following Zephyr relevant fixes:
- 1c47465c boot: zephyr: use EXTRA_CONF_FILE instead of
deprecated OVERLAY_CONFIG
- 8e8ecd91 boot: zephyr: Fix serial recovery for NXP IMX.RT
platforms
- 52c7231a boot: zephyr: Fix Warning 'boot_serial_enter defined
but not used'
- a58d9026 zephyr: hello_world: Fix the main() return type
warning
- 50b7b9ee bootutil: Fix AES and SHA-256 contexts not zeroized
with mbedTLS
- 9b1b95c1 ci: Fix zephyr workflow
- 809b0e42 bootutil: Add better mode selection checks
- 0fe7ffd8 ci: Fix FIH Docker image release usage
- a990c6b6 ci: Update FIH docker to Ubuntu Jammy (22.04)
- 03d1a443 boot: zephyr: board: Fix nrf54l15pdk Kconfig fragment
- 323eb8d1 boot: zephyr: MCXN947 currently only does not support
swap mode
- 0a88733d boot_serial: Fix `format` warning
- 157547c8 boot_serial: Fix `incompatible-pointer-types` warning
- 60ac682a bootutil: loader: Verify image header before checking
image
- 1cd53982 boot: main: avoid unused build warning
- 587289d6 bootutil: Fix missing include
- 610b8e2b bootutil: Fix swap move max app size calculation
- a4800ce0 imgtool: Add missing encodings to emitter tests
- 80397e0f imgtool: Fix getpub fails for ed25519 key
- e29a123d docs: release-notes: Add note on name clash fix
- a375a14d zephyr: Fix issue with sysbuild if something else is
named mcuboot
- 77b03c7f Fix style issues
- 35bf48c5 boot: Change boot_enc_load to take slot number instead
of image
- 9083649 docs: release-notes: Add note on fixed zephyr RAM load
address
- 24de0fbc boot: zephyr: Fix RAM load chain load address
- 197287ce imgtool: Bump cryptography library version
- 7566edaf boot: Move encryption context invalidation to
boot_enc_drop.
- 86b1ef19 boot: Rename boot_enc_decrypt to boot_decrypt_key
- 597a1996 boot: boot_serial: change logging to debug level
- 2fa42bfa doc: readme-zephyr: fix the scratch partition example
- f2971d20 boot: Add missing boot_enc_init
- 071b3b8e boot: Remove pointless slot identification
- 2cd6ce9f sim: Fix MCUBOOT_SWAP_USING_SCRATCH defined in
direct-xip and ram-load
- 3c2f8375 bootutil: Properly retrieve image headers after
interrupted swap-scratch
- fb2cf0ec docs: release-notes: Add note on fixed nordic boards
- 89807992 boot: zephyr: Fix build for nrf9160dk
- 2f5a7f47 boot: zephyr: Fix build for thingy53
- c9e4ab8b boot: zephyr: Fix build for thingy52
- c06f7bb3 Revert "boot: Add MCUBOOT_HW_KEY support for image
encryption"
- 1d79ef35 boot: Fix ASN.1 for mbedtls >= 3.1
- 86acda9e ext: fiat: Use user-defined assert macro
Signed-off-by: Jamie McCrae <[email protected]>
nordicjm
force-pushed
the
37mcubootupdates
branch
from
c1f734b
to
66f70a9
Compare
tomi-font
requested changes
Nov 4, 2024
Release notes are done by release team for LTS releases |
tomi-font
approved these changes
Nov 6, 2024
sylvioalves
approved these changes
Nov 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
west.yml: MCUboot synchronization from v3.7-branch
Update Zephyr fork of MCUboot to revision:
1c47465cd111b855168d594782b5b17b154ea703
Brings following Zephyr relevant fixes:
formatwarningincompatible-pointer-typeswarningFixes #80439