Skip to content

Commit e267d1a

Browse files
tomchytomchy
committed
samples: dfu: Enable S2RAM
Enable S2RAM in the two, selected configurations for nRF54h20dk. Ref: NCSIDB-1870 Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
1 parent 61d5ca2 commit e267d1a

11 files changed

Lines changed: 63 additions & 5 deletions

File tree

‎samples/dfu/ab/sample.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ tests:
1717
- nrf54h20dk/nrf54h20/cpuapp
1818
- nrf54l15dk/nrf54l15/cpuapp
1919

20+
sample.dfu.ab.s2ram:
21+
extra_args:
22+
- mcuboot_CONFIG_SOC_EARLY_RESET_HOOK=y
23+
- CONFIG_PM=y
24+
- CONFIG_PM_DEVICE=y
25+
- CONFIG_PM_DEVICE_RUNTIME=y
26+
- CONFIG_POWEROFF=y
27+
platform_allow:
28+
- nrf54h20dk/nrf54h20/cpuapp
29+
integration_platforms:
30+
- nrf54h20dk/nrf54h20/cpuapp
31+
2032
sample.dfu.ab.ironside_se_conf:
2133
platform_allow:
2234
- nrf54h20dk/nrf54h20/cpuapp

‎samples/dfu/ab_split/prj.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,9 @@ CONFIG_RETAINED_MEM=y
101101
CONFIG_RETENTION=y
102102
CONFIG_RETENTION_BOOTLOADER_INFO=y
103103
CONFIG_RETENTION_BOOTLOADER_INFO_TYPE_MCUBOOT=y
104+
105+
# Enable S2RAM
106+
CONFIG_PM=y
107+
CONFIG_PM_DEVICE=y
108+
CONFIG_PM_DEVICE_RUNTIME=y
109+
CONFIG_POWEROFF=y

‎samples/dfu/ab_split/prj_ironside_se_conf.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,9 @@ CONFIG_RETAINED_MEM=y
101101
CONFIG_RETENTION=y
102102
CONFIG_RETENTION_BOOTLOADER_INFO=y
103103
CONFIG_RETENTION_BOOTLOADER_INFO_TYPE_MCUBOOT=y
104+
105+
# Enable S2RAM
106+
CONFIG_PM=y
107+
CONFIG_PM_DEVICE=y
108+
CONFIG_PM_DEVICE_RUNTIME=y
109+
CONFIG_POWEROFF=y

‎samples/dfu/ab_split/sysbuild/mcuboot/prj.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ CONFIG_BOOT_SHARE_BACKEND_RETENTION=y
4141
CONFIG_IRONSIDE_SE_CALL=y
4242
# Enable MCUboot counter implementation that uses IronSide counters
4343
CONFIG_NRF_MCUBOOT_IRONSIDE_COUNTERS=y
44+
45+
# Enable early reset hook, requied for the S2RAM
46+
CONFIG_SOC_EARLY_RESET_HOOK=y

‎samples/dfu/ab_split/sysbuild/mcuboot/prj_ironside_se_conf.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ CONFIG_BOOT_SHARE_BACKEND_RETENTION=y
4444
CONFIG_IRONSIDE_SE_CALL=y
4545
# Enable MCUboot counter implementation that uses IronSide counters
4646
CONFIG_NRF_MCUBOOT_IRONSIDE_COUNTERS=y
47+
48+
# Enable early reset hook, requied for the S2RAM
49+
CONFIG_SOC_EARLY_RESET_HOOK=y

‎samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
};
2525
};
2626

27-
/ {
28-
sram@22007fc0 {
27+
&cpuapp_ram0 {
28+
cpuapp_retained_region: cpuapp_ram0@7ec0 {
2929
compatible = "zephyr,memory-region", "mmio-sram";
30-
reg = <0x22007fc0 0x40>;
30+
reg = <0x7ec0 0x40>;
3131
zephyr,memory-region = "RetainedMem";
3232
status = "okay";
3333

@@ -46,6 +46,6 @@
4646
};
4747
};
4848

49-
&cpuapp_ram0 {
50-
reg = <0x22000000 0x7fc0>;
49+
&cpuapp_tcm_region {
50+
reg = <0x0 0x7ec0>;
5151
};

‎samples/dfu/smp_svr/sample.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,11 @@ tests:
387387
- EXTRA_CONF_FILE="overlay-bt.conf"
388388
- mcuboot_CONFIG_MULTITHREADING=y
389389
- CONFIG_MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_IMAGE_ANY=y
390+
- mcuboot_CONFIG_SOC_EARLY_RESET_HOOK=y
391+
- CONFIG_PM=y
392+
- CONFIG_PM_DEVICE=y
393+
- CONFIG_PM_DEVICE_RUNTIME=y
394+
- CONFIG_POWEROFF=y
390395
platform_allow:
391396
- nrf54h20dk/nrf54h20/cpuapp
392397
integration_platforms:

‎samples/nrf54h20/idle_relocated_tcm/prj.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@ CONFIG_LOG=y
88

99
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
1010

11+
# Enable S2RAM
12+
CONFIG_PM=y
13+
CONFIG_PM_DEVICE=y
14+
CONFIG_PM_DEVICE_RUNTIME=y
15+
CONFIG_POWEROFF=y
16+
1117
# Set the version number for the firmware to verify dfu process
1218
#CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="0.0.1+0"

‎samples/nrf54h20/idle_relocated_tcm/remote/prj.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@
77
CONFIG_LOG=y
88

99
CONFIG_XIP=n
10+
11+
# Enable S2RAM
12+
CONFIG_PM=y
13+
CONFIG_PM_DEVICE=y
14+
CONFIG_PM_DEVICE_RUNTIME=y
15+
CONFIG_POWEROFF=y

‎samples/nrf54h20/idle_relocated_tcm/sysbuild/mcuboot.conf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#
2+
# Copyright (c) 2026 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
# Enable early reset hook, required for the S2RAM
8+
CONFIG_SOC_EARLY_RESET_HOOK=y

0 commit comments

Comments
 (0)