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
Merged
merged 1 commit into from
Oct 10, 2025
Merged

manifest: zephyr & mcuboot update #24636

merged 1 commit into from
Oct 10, 2025

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)

nrfconnect/sdk-mcuboot#536
nrfconnect/sdk-zephyr#3285

@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

✅ All manifest checks OK

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: 16

Inputs:

Sources:

sdk-nrf: PR head: a5af12176bf19880a27bf5a8d5b8fe074fc7fd73

more details

sdk-nrf:

PR head: a5af12176bf19880a27bf5a8d5b8fe074fc7fd73
merge base: b3e37571e5e077fa9d2ea8b99376a80160c6b0bf
target head (main): 4b2a6dbe1cf0f862f932568bf6e935b213ca2b72
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 (1) 
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf54h
│  │  │  │  │  │ ug_nrf54h20_pm_optimization.rst

Outputs:

Toolchain

Version:
Build docker image:

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

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests
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_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-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • 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

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

nvlsianpu commented Oct 7, 2025

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

@nvlsianpu nvlsianpu Oct 8, 2025

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 nvlsianpu force-pushed the s2ram_mcuboot_bridge branch from 88f3091 to 5ea0c69 Compare October 8, 2025 12:31
@rlubos
Copy link
Contributor

rlubos commented Oct 9, 2025

@FrancescoSer PTAL

@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch from 5ea0c69 to 2a6348a Compare October 9, 2025 09:07
@NordicBuilder NordicBuilder removed the DNM label Oct 9, 2025
FrancescoSer
FrancescoSer requested changes Oct 9, 2025
View reviewed changes
doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst Outdated
Comment on lines 153 to 155
To enable S2RAM support for your project, set the following MCUboot Kconfig option:

* :kconfig:option:`CONFIG_PM` - Power management support.
* :kconfig:option:`CONFIG_PM_S2RAM` - Suspend to RAM support.
* :kconfig:option:`CONFIG_PM_S2RAM_CUSTOM_MARKING` - Custom S2RAM marking support.
* :kconfig:option:`CONFIG_SOC_NRF54H20_PM_S2RAM_OVERRIDE` - Enables MCUboot to override the default Nordic S2RAM implementation.
* :kconfig:option:`CONFIG_SOC_EARLY_RESET_HOOK` - Enables MCUboot to integrate S2RAM resume bridge into start-up code.
Copy link
Contributor

@FrancescoSer FrancescoSer Oct 9, 2025

Choose a reason for hiding this comment

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

Suggested change
To enable S2RAM support for your project, set the following MCUboot Kconfig option:
* :kconfig:option:`CONFIG_PM` - Power management support.
* :kconfig:option:`CONFIG_PM_S2RAM` - Suspend to RAM support.
* :kconfig:option:`CONFIG_PM_S2RAM_CUSTOM_MARKING` - Custom S2RAM marking support.
* :kconfig:option:`CONFIG_SOC_NRF54H20_PM_S2RAM_OVERRIDE` - Enables MCUboot to override the default Nordic S2RAM implementation.
* :kconfig:option:`CONFIG_SOC_EARLY_RESET_HOOK` - Enables MCUboot to integrate S2RAM resume bridge into start-up code.
To enable S2RAM support for your project, set the :kconfig:option:`CONFIG_SOC_EARLY_RESET_HOOK` MCUboot Kconfig option.
This option integrates the S2RAM resume bridge into the start-up code.

doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst Outdated
Comment on lines 159 to 160
* a ``zephyr,memory-region`` compatible node with nodelabel ``mcuboot_s2ram`` of 8 B size for placing MCUboot's S2RAM magic variable.
* a ``zephyr,memory-region`` compatible node labeled ``pm_s2ram_stack``, with a size of 16 bytes.
Copy link
Contributor

@FrancescoSer FrancescoSer Oct 9, 2025

Choose a reason for hiding this comment

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

Suggested change
* a ``zephyr,memory-region`` compatible node with nodelabel ``mcuboot_s2ram`` of 8 B size for placing MCUboot's S2RAM magic variable.
* a ``zephyr,memory-region`` compatible node labeled ``pm_s2ram_stack``, with a size of 16 bytes.
* a ``zephyr,memory-region`` compatible node labeled ``mcuboot_s2ram``, with a size of 8 bytes, used for placing MCUboot's S2RAM magic variable.
* a ``zephyr,memory-region`` compatible node labeled ``pm_s2ram_stack``, with a size of 16 bytes.

doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst Outdated
* a ``zephyr,memory-region`` compatible node with nodelabel ``mcuboot_s2ram`` of 4 B size for placing MCUboot's S2RAM magic variable.
* a ``zephyr,memory-region`` compatible node with nodelabel ``mcuboot_s2ram`` of 8 B size for placing MCUboot's S2RAM magic variable.
* a ``zephyr,memory-region`` compatible node labeled ``pm_s2ram_stack``, with a size of 16 bytes.
This region is used as the program stack during S2RAM resume by MCUboot.
Copy link
Contributor

@FrancescoSer FrancescoSer Oct 9, 2025

Choose a reason for hiding this comment

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

Suggested change
This region is used as the program stack during S2RAM resume by MCUboot.
This region is used as the program stack by MCUboot during S2RAM resume.

@nvlsianpu nvlsianpu force-pushed the s2ram_mcuboot_bridge branch from 2a6348a to 802b1a7 Compare October 9, 2025 13:51
@nvlsianpu
doc/..device_guides/nrf54h: update on s2ram Along wit MCUboot
a5af121 
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 802b1a7 to a5af121 Compare October 9, 2025 14:11
@nvlsianpu nvlsianpu requested a review from FrancescoSer October 9, 2025 14:11
@nvlsianpu
Copy link
Contributor Author

nvlsianpu commented Oct 9, 2025

west.yaml get updated by #24948

@rlubos rlubos merged commit 873864e into nrfconnect:main Oct 10, 2025
15 checks passed
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

@rlubos rlubos rlubos approved these changes

@de-nordic de-nordic de-nordic approved these changes

@FrancescoSer FrancescoSer FrancescoSer approved these changes

Assignees

No one assigned

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nvlsianpu @NordicBuilder @rlubos @tomchy @de-nordic @FrancescoSer