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

mcuboot: Fix monotomic counter issues #20787

Merged
merged 2 commits into from
Apr 3, 2025
Merged

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Mar 7, 2025

manifest: Update sdk-mcuboot

Updates MCUboot to pull in a fix for monotonic counter usage


sysbuild: mcuboot: Clarify monotonic counter usage

Clarifies that monotonic hardware counter will only be used on
the first image and disallow usage of this feature with QSPI XIP
split image updates as it is not compatible

@nordicjm nordicjm requested review from a team as code owners March 7, 2025 10:09
@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 7, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 7, 2025

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@72bcf38 nrfconnect/sdk-mcuboot@3bd1796 (main) nrfconnect/sdk-mcuboot@72bcf386..3bd17963

All manifest checks OK

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 7, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: de6b962c4a70439c03e8b96642b25fc836b674f7
mcuboot: PR head: 3bd17963688423aa7a1e139ce54572fa2c7c700f

more details

sdk-nrf:

PR head: de6b962c4a70439c03e8b96642b25fc836b674f7
merge base: 85744d444858ffa7f578caf76caf0f562073fde1
target head (main): e266c9d59a4781949aac07ef7958d191f5cc6f65
Diff

mcuboot:

PR head: 3bd17963688423aa7a1e139ce54572fa2c7c700f
merge base: 72bcf3861f526d4091e3c2bf44a52823da8e7a11
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 (11)
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── include
│  │  │  │  │  ├── bootutil
│  │  │  │  │  │  │ security_cnt.h
│  │  │  │  ├── src
│  │  │  │  │  ├── image_validate.c
│  │  │  │  │  │ loader.c
│  │  │  ├── zephyr
│  │  │  │  ├── Kconfig
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_iron.conf
│  │  │  │  ├── flash_map_extended.c
│  │  │  │  ├── include
│  │  │  │  │  ├── mcuboot_config
│  │  │  │  │  │  │ mcuboot_config.h
│  │  │  │  │  │ target.h
│  │  │  │  │ nrf_cleanup.c
sysbuild
│  │ Kconfig.mcuboot
west.yml

Outputs:

Toolchain

Version: 7dbe0e2658
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:7dbe0e2658_8bf7ca4353

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 7
  • ✅ Integration tests
    • ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ desktop52_verification - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-boot - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-apps - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_mesh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_cloud - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_libmodem-nrf - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ doc-internal - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_crypto - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-proprietary_esb - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rpc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-tfm - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-thread - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_mosh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_positioning - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-pmic-samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-mcuboot - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ps
    • ✅ test-secdom-samples-public - Skipped: Job was skipped as it succeeded in a previous run

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

Copy link

github-actions bot commented Mar 7, 2025

You can find the documentation preview for this PR here.

nordicjm added 2 commits April 2, 2025 14:43
Updates MCUboot to pull in a fix for monotonic counter usage

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Clarifies that monotonic hardware counter will only be used on
the first image and disallow usage of this feature with QSPI XIP
split image updates as it is not compatible

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@NordicBuilder
Copy link
Contributor

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug.uart[nrf54h20dk@0.9.0/nrf54h20/cpuapp]: ROM size increased by 544[B] in comparison to the main[50bf382] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf54h20dk@0.9.0/nrf54h20/cpuapp]: ROM size increased by 676[B] in comparison to the main[50bf382] branch. - link (cc: @MarekPieta)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-20787/7)

@nordicjm nordicjm merged commit e90b0a1 into nrfconnect:main Apr 3, 2025
14 of 15 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. manifest manifest-mcuboot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants