Skip to content

Conversation

@tomchy
Copy link
Contributor

@tomchy tomchy commented Sep 29, 2025

Change bootloader request module, so it uses the new, dedicated type to point to the specific slot.

Ref: NCSDK-35199

@NordicBuilder NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 29, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 29, 2025

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@511e742 nrfconnect/sdk-mcuboot@8534953 (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 Sep 29, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 6312e94b4359f69e913627f6f6f179271d7ff970
mcuboot: PR head: 85349537b3bc4e8e9e7542abd0303adf28177dcb

more details

sdk-nrf:

PR head: 6312e94b4359f69e913627f6f6f179271d7ff970
merge base: 843ca7041912eac8bf054aebe46cbe964a340444
target head (main): 843ca7041912eac8bf054aebe46cbe964a340444
Diff

mcuboot:

PR head: 85349537b3bc4e8e9e7542abd0303adf28177dcb
merge base: 511e742327020ebe42df2e4b45a3ca8d0f3e6611
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 (9)
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── include
│  │  │  │  │  ├── bootutil
│  │  │  │  │  │  ├── boot_hooks.h
│  │  │  │  │  │  │ boot_request.h
│  │  │  │  ├── src
│  │  │  │  │  │ bootutil_public.c
│  │  │  │  ├── zephyr
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ boot_request_retention.c
│  │  │  ├── zephyr
│  │  │  │  ├── hooks_sample.c
│  │  │  │  │ main.c
modules
│  ├── mcuboot
│  │  ├── hooks
│  │  │  │ hooks_find_next_slot.c
samples
│  ├── dfu
│  │  ├── ab
│  │  │  ├── src
│  │  │  │  │ ab_utils.c
west.yml

Outputs:

Toolchain

Version: a7529a11f4
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:a7529a11f4_bba2ea5f2e

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 747
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-sdk-find-my
    • ✅ test-sdk-mcuboot
    • ✅ test-sdk-dfu
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_mosh
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • 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_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-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread-main
    • test-low-level
    • test-sdk-audio
    • test-sdk-pmic-samples
    • test-sdk-wifi
    • test-secdom-samples-public

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

@github-actions
Copy link

You can find the documentation preview for this PR here.

@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-35199_Remove_magic_numbers branch from bbe79a4 to 139f654 Compare September 29, 2025 14:15
@tomchy tomchy marked this pull request as ready for review September 29, 2025 14:15
@tomchy tomchy requested review from a team September 29, 2025 14:15
@tomchy tomchy requested review from a team as code owners September 29, 2025 14:15

if (active_slot == SLOT_A) {
LOG_INF("Temporarily switching slots (A -> B)");
new_slot = SLOT_B;
new_slot = BOOT_SLOT_SECONDARY;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I won't block it but can't we do a #define SLOT_A BOOT_SLOT_PRIMARY? Note that SLOT_A is used in the line above

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They use two, different types. One is 8-bit, one is 32-bit long. We can remove completely the enum ab_boot_slot, if that's your point though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No ok, we can leave it as is

@tomchy tomchy requested a review from ahasztag September 30, 2025 13:06
Change bootloader request module, so it uses the new, dedicated type to
point to the specific slot.

Ref: NCSDK-35199

Signed-off-by: Tomasz Chyrowicz <[email protected]>
@NordicBuilder
Copy link
Contributor

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug.uart[[email protected]/nrf54h20/cpuapp]: RAM size increased by 23661[B] in comparison to the main[6df6566] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.uart[[email protected]/nrf54h20/cpuapp]: ROM size increased by 13752[B] in comparison to the main[6df6566] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[[email protected]/nrf54h20/cpuapp]: RAM size increased by 23657[B] in comparison to the main[6df6566] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[[email protected]/nrf54h20/cpuapp]: ROM size increased by 12044[B] in comparison to the main[6df6566] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)

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

@tomchy tomchy merged commit aa7792c into nrfconnect:main Oct 1, 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.

6 participants