Skip to content
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

west.yml: MCUboot synchronization from upstream #78219

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Sep 10, 2024

Update Zephyr fork of MCUboot to revision:
e890df7ab975da181a9f3fb3abc470bf935625ab

Brings following Zephyr relevant fixes:

  • e890df7a boot: zephyr: Add ESP32C2/ESP8684 support
  • 5d5f0492 bootutil: Fix AES and SHA-256 contexts not with mbedTLS
  • ca06b9fe boot: zephyr: Add fallback to USB DFU
  • 43a49a3b bootutil: Add better mode selection checks
  • 956311d2 boot: Make boot_enc_valid take slot instead of image index
  • 242db1a9 boot: zephyr: boards: Add nrf54l15dk configuration
  • 651775b5 boot: zephyr: board: Fix nrf54l15pdk Kconfig fragment
  • a3762626 boot: zephyr: MCXN947 currently only does not support swap mode

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.

@zephyrbot
Copy link
Collaborator

zephyrbot commented Sep 10, 2024

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

Name Old Revision New Revision Diff
mcuboot zephyrproject-rtos/mcuboot@52e2afc zephyrproject-rtos/mcuboot@e890df7 (upstream-sync) zephyrproject-rtos/[email protected]

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

@nordicjm nordicjm marked this pull request as ready for review September 11, 2024 08:45
@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Sep 11, 2024
@nordicjm nordicjm self-assigned this Sep 11, 2024
gchwier
gchwier previously approved these changes Sep 11, 2024
Update Zephyr fork of MCUboot to revision:
  e890df7ab975da181a9f3fb3abc470bf935625ab

Brings following Zephyr relevant fixes:
  - e890df7a boot: zephyr: Add ESP32C2/ESP8684 support
  - 5d5f0492 bootutil: Fix AES and SHA-256 contexts not zeroized
    with mbedTLS
  - ca06b9fe boot: zephyr: Add fallback to USB DFU
  - 43a49a3b bootutil: Add better mode selection checks
  - 956311d2 boot: Make boot_enc_valid take slot instead of image
    index
  - 242db1a9 boot: zephyr: boards: Add nrf54l15dk configuration
  - 651775b5 boot: zephyr: board: Fix nrf54l15pdk Kconfig fragment
  - a3762626 boot: zephyr: MCXN947 currently only does not support
    swap mode

Signed-off-by: Jamie McCrae <[email protected]>
@carlescufi carlescufi merged commit 7c3fe8f into zephyrproject-rtos:main Sep 13, 2024
26 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.

7 participants