Skip to content

Commit 8e80fa9

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 bdccaf1 commit 8e80fa9

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
@@ -361,16 +361,16 @@ zephyr_udc0: &usbhs {
361361
};
362362

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

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

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)