Skip to content

manifest: zephyr & mcuboot update #24636

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

manifest: zephyr & mcuboot update #24636

wants to merge 2 commits into from
+20 −22

Conversation

nvlsianpu
Copy link
Contributor

@nvlsianpu nvlsianpu commented Sep 19, 2025 •
edited
Loading

To version which uses dedicated method for S2RAM
resume operation.

  • doc (awaiting on zephyr patch acceptance)

@nvlsianpu nvlsianpu requested review from a team as code owners September 19, 2025 15:36
@NordicBuilder NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 19, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 19, 2025 •
edited
Loading

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@754f958 (main) nrfconnect/sdk-mcuboot#536 nrfconnect/sdk-mcuboot#536/files
zephyr nrfconnect/sdk-zephyr@afb7e74 (main) nrfconnect/sdk-zephyr#3285 nrfconnect/sdk-zephyr#3285/files

⛔ DNM label due to: 2 projects with PR revision

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 19, 2025 •
edited
Loading

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 5ea0c69ecac1a015fbd9cedc7669aa3a1d7e9f0e
mcuboot: PR head: 1c0e163eefbe50df236f5f94685259cca987bb86
zephyr: PR head: daf2e151adaf0c050959dcdbdc36d0d02c55cabf

more details

sdk-nrf:

PR head: 5ea0c69ecac1a015fbd9cedc7669aa3a1d7e9f0e
merge base: 325c1a7f2e8abea334ff1aa0ace4849fe2de651e
target head (main): 325c1a7f2e8abea334ff1aa0ace4849fe2de651e
Diff

mcuboot:

PR head: 1c0e163eefbe50df236f5f94685259cca987bb86
merge base: 754f9586875dd72de367704e42c2121eb60696c3
target head (main): 754f9586875dd72de367704e42c2121eb60696c3
Diff

zephyr:

PR head: daf2e151adaf0c050959dcdbdc36d0d02c55cabf
merge base: 6ce781c9e668a42fb768fbb2b6f5ce573ca81ddc
target head (main): afb7e743a05fb3147a253e3bbd44ee6e10663369
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
│  │  │  │  ├── src
│  │  │  │  │  │ loader.c
│  │  │  ├── zephyr
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── nrf54h20_custom_s2ram.S
│  │  │  │  ├── nrf54h20_custom_s2ram.c
│  │  │  │  ├── socs
│  │  │  │  │  │ nrf54h20_cpuapp.conf
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf54h
│  │  │  │  │  │ ug_nrf54h20_pm_optimization.rst
west.yml
zephyr
│  ├── arch
│  │  ├── arm
│  │  │  ├── core
│  │  │  │  ├── cortex_m
│  │  │  │  │  │ reset.S
│  ├── include
│  │  ├── zephyr
│  │  │  ├── platform
│  │  │  │  │ hooks.h
│  ├── kernel
│  │  │ Kconfig.init
│  ├── subsys
│  │  ├── pm
│  │  │  │ Kconfig

Outputs:

Toolchain

Version: f66cf421f3
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:f66cf421f3_bba2ea5f2e

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 6
    • sdk-zephyr test count: 1305
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-low-level
    • ✅ test-sdk-mcuboot
    • ✅ test-sdk-dfu
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_mosh
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • 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_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • 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-sdk-audio
    • 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

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 19, 2025 •
edited
Loading

You can find the documentation preview for this PR here.

Preview links for modified nRF Connect SDK documents:

https://ncsdoc.z6.web.core.windows.net/PR-24636/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.html

@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch 2 times, most recently from 31bb9fa to 9b010fb Compare October 3, 2025 12:05
@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch 2 times, most recently from b2e570b to fcc7c33 Compare October 6, 2025 15:56
@nvlsianpu
Copy link
Contributor Author

test-sdk-dfu issue is unrelated to this patch.

@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch 2 times, most recently from bcdbe3a to 801c25f Compare October 8, 2025 10:10
@NordicBuilder NordicBuilder added the doc-required PR must not be merged without tech writer approval. label Oct 8, 2025
@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch 2 times, most recently from 3dbed6d to 88f3091 Compare October 8, 2025 10:33
nvlsianpu
nvlsianpu commented Oct 8, 2025
View reviewed changes
doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst Outdated
};
/* temporary stack for S2RAM resume logic */
pm_s2ram_stack: cpuapp_s2ram_stack@22007fd0 {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this node was lost by 3.2.0-previev doc alignment.

tomchy
tomchy reviewed Oct 8, 2025
View reviewed changes
@nvlsianpu
manifest: zephyr & mcuboot update
2270da9 
To version which uses dedicated method for S2RAM
resume operation.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nvlsianpu
doc/..device_guides/nrf54h: update on s2ram Along wit MCUboot
5ea0c69 
Update the doc to reflect improvement made in S2RAM resume
via MCUboot.
Also include DTS `mcuboot_s2ram` memory node rise for
supporting Direct-XIP.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch from 88f3091 to 5ea0c69 Compare October 8, 2025 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomchy tomchy tomchy approved these changes

@FrancescoSer FrancescoSer Awaiting requested review from FrancescoSer FrancescoSer is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM doc-required PR must not be merged without tech writer approval. manifest manifest-mcuboot manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nvlsianpu @NordicBuilder @tomchy