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

manifest: Update sdk-mcuboot #20866

Merged
merged 3 commits into from
Mar 31, 2025
Merged

manifest: Update sdk-mcuboot #20866

merged 3 commits into from
Mar 31, 2025

Conversation

nordicjm
Copy link
Contributor

Upmerges to latest MCUboot

@nordicjm nordicjm requested review from a team as code owners March 11, 2025 16:45
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Mar 11, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 11, 2025

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@91c282e nrfconnect/sdk-mcuboot@14cbca4 (main) nrfconnect/[email protected]

Additional metadata changed:

Name URL Submodules West cmds module.yml
mcuboot

DNM label due to: 1 project with metadata changes

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 11, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 13

Inputs:

Sources:

sdk-nrf: PR head: c9fc41a3f79585542bdfbff8e36d01e619fc1d6a
mcuboot: PR head: 14cbca413937c36a1b417a2ac1888d2027720933

more details

sdk-nrf:

PR head: c9fc41a3f79585542bdfbff8e36d01e619fc1d6a
merge base: a77dcbe5dde8554966e3608c8ad609a7db5301af
target head (main): a77dcbe5dde8554966e3608c8ad609a7db5301af
Diff

mcuboot:

PR head: 14cbca413937c36a1b417a2ac1888d2027720933
merge base: 91c282e7afc83c666ad478fbe70ff3e48ac56a05
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (104)
bootloader
│  ├── mcuboot
│  │  ├── .github
│  │  │  ├── workflows
│  │  │  │  ├── sim.yaml
│  │  │  │  │ zephyr_build.yaml
│  │  ├── boot
│  │  │  ├── boot_serial
│  │  │  │  ├── include
│  │  │  │  │  ├── boot_serial
│  │  │  │  │  │  │ boot_serial_encryption.h
│  │  │  │  ├── src
│  │  │  │  │  ├── boot_serial.c
│  │  │  │  │  │ boot_serial_encryption.c
│  │  │  ├── bootutil
│  │  │  │  ├── include
│  │  │  │  │  ├── bootutil
│  │  │  │  │  │  ├── boot_hooks.h
│  │  │  │  │  │  ├── boot_status.h
│  │  │  │  │  │  ├── bootutil.h
│  │  │  │  │  │  ├── bootutil_public.h
│  │  │  │  │  │  ├── caps.h
│  │  │  │  │  │  ├── enc_key.h
│  │  │  │  │  │  │ image.h
│  │  │  │  ├── src
│  │  │  │  │  ├── boot_record.c
│  │  │  │  │  ├── bootutil_misc.c
│  │  │  │  │  ├── bootutil_priv.h
│  │  │  │  │  ├── bootutil_public.c
│  │  │  │  │  ├── caps.c
│  │  │  │  │  ├── encrypted.c
│  │  │  │  │  ├── image_validate.c
│  │  │  │  │  ├── loader.c
│  │  │  │  │  ├── ram_load.c
│  │  │  │  │  ├── swap_misc.c
│  │  │  │  │  ├── swap_move.c
│  │  │  │  │  ├── swap_offset.c
│  │  │  │  │  ├── swap_priv.h
│  │  │  │  │  ├── swap_scratch.c
│  │  │  │  │  │ tlv.c
│  │  │  ├── espressif
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── hal
│  │  │  │  │  ├── include
│  │  │  │  │  │  ├── esp32s3
│  │  │  │  │  │  │  │ sdkconfig.h
│  │  │  │  │  │  ├── esp_mcuboot_image.h
│  │  │  │  │  │  ├── mcuboot_config
│  │  │  │  │  │  │  │ mcuboot_config.h
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ flash_encrypt.c
│  │  │  │  ├── port
│  │  │  │  │  ├── esp32
│  │  │  │  │  │  ├── bootloader-multi.conf
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp32c2
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp32c3
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp32c6
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp32h2
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp32s2
│  │  │  │  │  │  ├── bootloader.conf
│  │  │  │  │  │  ├── ld
│  │  │  │  │  │  │  │ bootloader.ld
│  │  │  │  │  ├── esp32s3
│  │  │  │  │  │  ├── bootloader-multi.conf
│  │  │  │  │  │  │ bootloader.conf
│  │  │  │  │  ├── esp_loader.c
│  │  │  │  │  │ esp_mcuboot.c
│  │  │  │  ├── tools
│  │  │  │  │  │ utils.cmake
│  │  │  ├── mbed
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── include
│  │  │  │  │  ├── flash_map_backend
│  │  │  │  │  │  │ flash_map_backend.h
│  │  │  │  │  ├── mcuboot_config
│  │  │  │  │  │  │ mcuboot_logging.h
│  │  │  │  ├── mbed_lib.json
│  │  │  │  ├── mcuboot_imgtool.cmake
│  │  │  │  ├── mcuboot_main.cpp
│  │  │  │  ├── src
│  │  │  │  │  │ flash_map_backend.cpp
│  │  │  ├── mynewt
│  │  │  │  ├── flash_map_backend
│  │  │  │  │  ├── include
│  │  │  │  │  │  ├── flash_map_backend
│  │  │  │  │  │  │  │ flash_map_backend.h
│  │  │  │  ├── src
│  │  │  │  │  │ single_loader.c
│  │  │  ├── zephyr
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── boards
│  │  │  │  │  ├── m5stack_cores3_esp32s3_procpu.overlay
│  │  │  │  │  │ m5stack_cores3_esp32s3_procpu_se.overlay
│  │  │  │  ├── decompression.c
│  │  │  │  ├── firmware_loader.c
│  │  │  │  ├── flash_map_extended.c
│  │  │  │  ├── include
│  │  │  │  │  ├── compression
│  │  │  │  │  │  │ decompression.h
│  │  │  │  │  ├── mcuboot_config
│  │  │  │  │  │  │ mcuboot_config.h
│  │  │  │  │  ├── sysflash
│  │  │  │  │  │  │ sysflash.h
│  │  │  │  ├── main.c
│  │  │  │  ├── sample.yaml
│  │  │  │  ├── single_loader.c
│  │  │  │  │ swap_offset.conf
│  │  ├── ci
│  │  │  │ espressif_install.sh
│  │  ├── docs
│  │  │  ├── compression_format.md
│  │  │  ├── design.md
│  │  │  ├── images
│  │  │  │  │ decomp.png
│  │  │  ├── imgtool.md
│  │  │  ├── readme-espressif.md
│  │  │  ├── readme-zephyr.md
│  │  │  ├── release-notes.d
│  │  │  │  ├── espressif-idf-version-checking.md
│  │  │  │  ├── fix-stuck-revert.md
│  │  │  │  ├── serial-recovery-var.md
│  │  │  │  │ swap-using-offset.md
│  │  ├── samples
│  │  │  ├── compression_test
│  │  │  │  ├── README.txt
│  │  │  │  │ independent_cmp.c
│  │  │  ├── runtime-source
│  │  │  │  ├── zephyr
│  │  │  │  │  ├── README.md
│  │  │  │  │  ├── app
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  ├── boards
│  │  │  │  │  │  │  │ frdm_k64f.overlay
│  │  │  │  │  │  ├── prj.conf
│  │  │  │  │  │  ├── sample.yaml
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ main.c
│  │  │  │  │  ├── hooks
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  ├── hooks.c
│  │  │  │  │  │  ├── zephyr
│  │  │  │  │  │  │  │ module.yml
│  │  │  │  │  │ sample.conf
│  │  ├── sim
│  │  │  ├── Cargo.toml
│  │  │  ├── mcuboot-sys
│  │  │  │  ├── Cargo.toml
│  │  │  │  ├── build.rs
│  │  │  │  ├── csupport
│  │  │  │  │  │ run.c
│  │  │  │  ├── src
│  │  │  │  │  │ area.rs
│  │  │  ├── src
│  │  │  │  ├── caps.rs
│  │  │  │  ├── image.rs
│  │  │  │  │ lib.rs
│  │  ├── zephyr
│  │  │  ├── module.yml
│  │  │  │ requirements.txt
doc
│  ├── mcuboot
│  │  ├── conf.py
│  │  │ wrapper.rst
west.yml

Outputs:

Toolchain

Version: 4ffa2202d5
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:4ffa2202d5_8bf7ca4353

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 518
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-sdk-mcuboot
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@nordicjm nordicjm force-pushed the updmcub00t branch 2 times, most recently from 8f13f99 to 24433d4 Compare March 12, 2025 08:20
@nordicjm nordicjm force-pushed the updmcub00t branch 2 times, most recently from 1219a58 to 9d298e7 Compare March 26, 2025 11:30
@nordicjm nordicjm requested a review from a team as a code owner March 26, 2025 11:30
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Mar 26, 2025
@nordicjm nordicjm force-pushed the updmcub00t branch 3 times, most recently from c1efc53 to cc0c628 Compare March 27, 2025 07:31
Copy link

You can find the documentation preview for this PR here.

@nordicjm nordicjm removed the doc only label Mar 27, 2025
@nordicjm nordicjm requested a review from annwoj March 27, 2025 10:40
@b-gent
Copy link
Contributor

b-gent commented Mar 27, 2025

@nordicjm can you cherry-pick this commit and add to this PR? -> d6ce7e0

FYI @gmarull adding a Sphinx extension to MCUboot conf.py to properly handle markdown tables.

@nordicjm
Copy link
Contributor Author

@nordicjm can you cherry-pick this commit and add to this PR? -> d6ce7e0

FYI @gmarull adding a Sphinx extension to MCUboot conf.py to properly handle markdown tables.

Done, thanks

@nordicjm nordicjm removed the DNM label Mar 27, 2025
nordicjm and others added 3 commits March 28, 2025 10:30
Upmerges to latest MCUboot

Signed-off-by: Jamie McCrae <[email protected]>
Adds this new file so it is included in documentation generation

Signed-off-by: Jamie McCrae <[email protected]>
Update Sphinx build to handle markdown tables correctly.

Signed-off-by: Bartosz Gentkowski <[email protected]>
@nordicjm nordicjm removed the DNM label Mar 28, 2025
@nordicjm nordicjm merged commit 8ba93b7 into nrfconnect:main Mar 31, 2025
16 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval. manifest manifest-mcuboot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants