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 revision #19185

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Dec 2, 2024

Adds support for configuring the number of KMU slot numbers and changes the default to 1

@nordicjm nordicjm requested a review from a team as a code owner December 2, 2024 10:58
@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 Dec 2, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 2, 2024

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@36788a6 nrfconnect/sdk-mcuboot@ed0fc24 (main) nrfconnect/[email protected]

All manifest checks OK

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 2, 2024

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 32b9750244127b4772ae4bff43a4e75937ab6f73
mcuboot: PR head: ed0fc24030f3765cfb04a8fdd8771bd5078107a7

more details

sdk-nrf:

PR head: 32b9750244127b4772ae4bff43a4e75937ab6f73
merge base: 90ac4ed82133568e784a93dcbc85a82a48354e49
target head (main): 90ac4ed82133568e784a93dcbc85a82a48354e49
Diff

mcuboot:

PR head: ed0fc24030f3765cfb04a8fdd8771bd5078107a7
merge base: 36788a6584c0815976f5463efef2c796ebf80c2c
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 (6)
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── src
│  │  │  │  │  │ ed25519_psa.c
│  │  │  ├── zephyr
│  │  │  │  ├── Kconfig
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l10_cpuapp.conf
tests
│  ├── subsys
│  │  ├── kmu
│  │  │  ├── hello_for_kmu
│  │  │  │  ├── sysbuild
│  │  │  │  │  │ mcuboot.conf
west.yml

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 527
  • ✅ 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_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • 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-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

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

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

@nvlsianpu nvlsianpu added this to the 2.9.0 milestone Dec 2, 2024
@gchwier
Copy link
Contributor

gchwier commented Dec 3, 2024

To fix tests number of KMU slots should be configured here:
https://github.com/nrfconnect/sdk-nrf/blob/main/tests/subsys/kmu/hello_for_kmu/sysbuild/mcuboot.conf
just add
CONFIG_BOOT_SIGNATURE_KMU_SLOTS=3

@gchwier
Copy link
Contributor

gchwier commented Dec 3, 2024

In logs from CI tests I see, that west ncs-provision command receives success (configured 1 KMU slot and uploading 3 keys):

12:49:52.73:INFO:common: CMD: west ncs-provision upload --soc nrf54l15 --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/bootloader/mcuboot/root-ed25519.pem --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/nrf/tests/subsys/kmu/keys/root-ed25519-1.pem --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/nrf/tests/subsys/kmu/keys/root-ed25519-2.pem --dev-id 001057783514
12:49:57.279:INFO:common: Keys provisioned successfully

(only the first key works). Is it ok? Should not this command receive any warning?
FYI @michalek-no

@nvlsianpu
Copy link
Contributor

In logs from CI tests I see, that west ncs-provision command receives success (configured 1 KMU slot and uploading 3 keys):

12:49:52.73:INFO:common: CMD: west ncs-provision upload --soc nrf54l15 --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/bootloader/mcuboot/root-ed25519.pem --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/nrf/tests/subsys/kmu/keys/root-ed25519-1.pem --key /jenkins_workspace/workspace/latest_sub_test-sdk-mcuboot_main/nrf/tests/subsys/kmu/keys/root-ed25519-2.pem --dev-id 001057783514
12:49:57.279:INFO:common: Keys provisioned successfully

(only the first key works). Is it ok? Should not this command receive any warning? FYI @michalek-no

Yes, that's fine. All KMU slot are available to be populated as this is independent thing. Only 1st one will be used.

@nvlsianpu
Copy link
Contributor

To fix tests number of KMU slots should be configured here: https://github.com/nrfconnect/sdk-nrf/blob/main/tests/subsys/kmu/hello_for_kmu/sysbuild/mcuboot.conf just add CONFIG_BOOT_SIGNATURE_KMU_SLOTS=3

@nordicjm Can you apply?

@nordicjm nordicjm requested a review from a team as a code owner December 3, 2024 14:09
@nordicjm
Copy link
Contributor Author

nordicjm commented Dec 3, 2024

To fix tests number of KMU slots should be configured here: https://github.com/nrfconnect/sdk-nrf/blob/main/tests/subsys/kmu/hello_for_kmu/sysbuild/mcuboot.conf just add CONFIG_BOOT_SIGNATURE_KMU_SLOTS=3

@nordicjm Can you apply?

Applied

@nvlsianpu
Copy link
Contributor

CI failure, for instance:

nrf54l15dk/nrf54l15/cpuapp mcuboot.kmu.west.provision.wrong_key ERROR Build failure (build)

Adds support for configuring the number of KMU slot numbers and
changes the default to 1

Signed-off-by: Jamie McCrae <[email protected]>
Updates MCUboot configuration to set the number of KMU slots to
the amount that the test requires

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm merged commit cf777d1 into nrfconnect:main Dec 4, 2024
13 of 14 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.

7 participants