Skip to content

Commit 222e164

Browse files
nvlsianpuadamkondraciuk
authored andcommitted
[nrf noup] soc/nordic/nrf54h20/pm_s2ram: extend mcuboot_resume_s
nrf_squash! [nrf noup] soc/nordic/nf54h/pm_s2ram: S2RAM resume hardening Extended mcuboot_resume_s suture by slot_info field intended to be used by MCUboot for recognize proper boot slot in direct-xp mode. Signed-off-by: Andrzej Puzdrowski <[email protected]>
1 parent 4b02ccc commit 222e164

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,16 +359,16 @@ zephyr_udc0: &usbhs {
359359
};
360360

361361
/* temporary stack for S2RAM resume logic */
362-
pm_s2ram_stack: cpuapp_s2ram_stack@22007fcc {
362+
pm_s2ram_stack: cpuapp_s2ram_stack@22007fc8 {
363363
compatible = "zephyr,memory-region", "mmio-sram";
364-
reg = <0x22007fcc 16>;
364+
reg = <0x22007fc8 16>;
365365
zephyr,memory-region = "pm_s2ram_stack";
366366
};
367367

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

soc/nordic/nrf54h/pm_s2ram.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
struct mcuboot_resume_s {
1616
uint32_t magic; /* magic value to identify valid structure */
17+
uint32_t slot_info;
1718
};
1819

1920
/**

0 commit comments

Comments
 (0)