Skip to content

[nrf noup] soc/nordic/nrf54h20/pm_s2ram: extend mcuboot_resume_s #3334

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

Merged
merged 1 commit into from
Oct 7, 2025
+7 −6
Merged

[nrf noup] soc/nordic/nrf54h20/pm_s2ram: extend mcuboot_resume_s #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,23 +345,23 @@ zephyr_udc0: &usbhs {

/* Trim this RAM block for making room on all run-time common S2RAM cpu context. */
&cpuapp_ram0 {
reg = <0x22000000 (DT_SIZE_K(32) - 52)>;
ranges = <0x0 0x22000000 (0x8000 - 0x34)>;
reg = <0x22000000 (DT_SIZE_K(32) - 56)>;
ranges = <0x0 0x22000000 (0x8000 - 0x38)>;
};

/ {
soc {
/* temporary stack for S2RAM resume logic */
pm_s2ram_stack: cpuapp_s2ram_stack@22007fcc {
pm_s2ram_stack: cpuapp_s2ram_stack@22007fc8 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x22007fcc 16>;
reg = <0x22007fc8 16>;
zephyr,memory-region = "pm_s2ram_stack";
};

/* run-time common mcuboot S2RAM support section */
mcuboot_s2ram: cpuapp_s2ram@22007fdc {
mcuboot_s2ram: cpuapp_s2ram@22007fd8 {
compatible = "zephyr,memory-region", "mmio-sram";
reg = <0x22007fdc 4>;
reg = <0x22007fd8 8>;
zephyr,memory-region = "mcuboot_s2ram_context";
};

Expand Down
1 change: 1 addition & 0 deletions soc/nordic/nrf54h/pm_s2ram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

struct mcuboot_resume_s {
uint32_t magic; /* magic value to identify valid structure */
uint32_t slot_info;
};

/**
Expand Down