Skip to content

Pull s2ram related commits #25230

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 4 commits into from
Nov 5, 2025
+41 −171
Merged

Pull s2ram related commits #25230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb798e4
applications: Remove use of PM_S2RAM_CUSTOM_MARKING
nordic-segl Oct 24, 2025
010728f
applications: Remove setting CONFIG_PM_S2RAM=y
nordic-segl Oct 24, 2025
821162a
tests: benchmarks: multicore: Disable S2RAM in coverage
nordic-segl Oct 27, 2025
79de629
manifest: update sdk-zephyr
nordic-segl Oct 24, 2025
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
2 changes: 0 additions & 2 deletions ...ons/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_singlecore.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,3 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
CONFIG_BT_DEVICE_NAME="Sensor HUB"

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
2 changes: 0 additions & 2 deletions applications/machine_learning/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,3 @@ tests:
- machine_learning_SHIELD=pca63566
- FILE_SUFFIX="singlecore"
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
2 changes: 0 additions & 2 deletions applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ CONFIG_MCUBOOT_IMG_MANAGER=y

# Configure Zephyr system power management
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

# Temporarily disable Link Time Optimization (LTO) to prevent linker warnings about the type
# mismatch (-Wlto-type-mismatch) that are caused by the device_deps.c file. The device_deps.c
Expand Down
2 changes: 0 additions & 2 deletions applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_dongle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ CONFIG_MCUBOOT_IMG_MANAGER=y

# Configure Zephyr system power management
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

# Temporarily disable Link Time Optimization (LTO) to prevent linker warnings about the type
# mismatch (-Wlto-type-mismatch) that are caused by the device_deps.c file. The device_deps.c
Expand Down
2 changes: 0 additions & 2 deletions applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ CONFIG_MCUBOOT_IMG_MANAGER=y

# Configure Zephyr system power management
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

# Temporarily disable Link Time Optimization (LTO) to prevent linker warnings about the type
# mismatch (-Wlto-type-mismatch) that are caused by the device_deps.c file. The device_deps.c
Expand Down
2 changes: 0 additions & 2 deletions applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_dongle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ CONFIG_MCUBOOT_IMG_MANAGER=y

# Configure Zephyr system power management
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

# Temporarily disable Link Time Optimization (LTO) to prevent linker warnings about the type
# mismatch (-Wlto-type-mismatch) that are caused by the device_deps.c file. The device_deps.c
Expand Down
2 changes: 0 additions & 2 deletions doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@ Recommended Kconfig configuration
For the application running on the application core, setting the following Kconfig options is recommended:

Copy link
Contributor

@FrancescoSer FrancescoSer Nov 3, 2025

Choose a reason for hiding this comment

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

Shouldnt this change also be mentioned in the changelog?

Copy link
Contributor Author

@nordic-segl nordic-segl Nov 3, 2025

Choose a reason for hiding this comment

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

@bjarki-andreasen : Could You help me answer this question?

Copy link
Contributor Author

@nordic-segl nordic-segl Nov 4, 2025

Choose a reason for hiding this comment

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

I discussed this offline with @bjarki-andreasen
Documentation is updated in #25218

Changelog and migration guide is still to be done.
@bjarki-andreasen agreed to take care of this.

Is it OK for You @FrancescoSer ?

Copy link
Contributor

@bjarki-andreasen bjarki-andreasen Nov 4, 2025

Choose a reason for hiding this comment

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

Changes now part of the nrf54h20 doc updates 4749f5a

* :kconfig:option:`CONFIG_PM` to ``y``
* :kconfig:option:`CONFIG_PM_S2RAM` to ``y``
* :kconfig:option:`CONFIG_POWEROFF` to ``y``
* :kconfig:option:`CONFIG_PM_S2RAM_CUSTOM_MARKING` to ``y``
* :kconfig:option:`CONFIG_PM_DEVICE` to ``y``
* :kconfig:option:`CONFIG_PM_DEVICE_RUNTIME` to ``y``

Expand Down
2 changes: 0 additions & 2 deletions samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@

# nRF54H-specific power management configuration
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
4 changes: 0 additions & 4 deletions samples/caf_sensor_manager/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ tests:
- caf_sensor_manager_SNIPPET=nordic-ppr
- SB_CONFIG_NETCORE_EMPTY=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
tags:
- sysbuild
- ci_samples_caf_sensor_manager
Expand All @@ -141,8 +139,6 @@ tests:
- FILE_SUFFIX=singlecore
- SB_CONFIG_NETCORE_EMPTY=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
tags:
- sysbuild
- ci_samples_caf_sensor_manager
2 changes: 0 additions & 2 deletions samples/zephyr/boards/nordic/spis_wakeup/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ CONFIG_SPI_SLAVE=y
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y

Expand Down
2 changes: 0 additions & 2 deletions samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ CONFIG_SPI_NRFX_WAKE_TIMEOUT_US=500
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y

Expand Down
3 changes: 0 additions & 3 deletions tests/benchmarks/current_consumption/beacon_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@
#

CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
2 changes: 0 additions & 2 deletions tests/benchmarks/current_consumption/lfrc_idle/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_GPIO=y
CONFIG_CLOCK_CONTROL=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y

Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
3 changes: 0 additions & 3 deletions tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
2 changes: 0 additions & 2 deletions tests/benchmarks/current_consumption/twim_suspend/sysbuild/vpr_launcher/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_PM=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

Expand Down
4 changes: 0 additions & 4 deletions tests/benchmarks/current_consumption/uart_console/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y

# For nrf54h only, will be ingored for other platforms
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

CONFIG_SERIAL=y
CONFIG_LOG=y
CONFIG_LOG_BACKEND_UART_ASYNC=y
Expand Down
4 changes: 0 additions & 4 deletions tests/benchmarks/current_consumption/uarte_suspend/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y

# For nrf54h only, will be ingored for other platforms
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y

CONFIG_BOOT_BANNER=n
CONFIG_ASSERT=y

Expand Down
14 changes: 0 additions & 14 deletions tests/benchmarks/multicore/idle/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -151,11 +149,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -188,11 +184,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -225,11 +219,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -262,11 +254,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -298,11 +288,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down Expand Up @@ -335,11 +323,9 @@ tests:
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
- CONFIG_FIRST_SLEEP_OFFSET=y
- CONFIG_PM=y
- CONFIG_PM_S2RAM=y
- CONFIG_PM_DEVICE=y
- CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
- CONFIG_POWEROFF=y
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- CONFIG_CONSOLE=n
- CONFIG_UART_CONSOLE=n
- CONFIG_SERIAL=n
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_adc/coverage.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_ADC=y
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=n
CONFIG_PM_S2RAM_CUSTOM_MARKING=n
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
3 changes: 3 additions & 0 deletions tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
&s2ram {
status = "disabled";
};
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_adc/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_ADC=y
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
1 change: 1 addition & 0 deletions tests/benchmarks/multicore/idle_adc/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ tests:
- nrf54h20dk/nrf54h20/cpuapp
extra_args:
- CONF_FILE=coverage.conf
- EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
- SHIELD=coverage_support
harness: console
harness_config:
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_clock_control/coverage.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CONFIG_PM=n
CONFIG_PM_S2RAM=n
CONFIG_PM_S2RAM_CUSTOM_MARKING=n
CONFIG_PM_DEVICE=n
CONFIG_PM_DEVICE_RUNTIME=n
CONFIG_POWEROFF=n
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_clock_control/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
8 changes: 0 additions & 8 deletions tests/benchmarks/multicore/idle_clock_control/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ tests:
integration_platforms:
- nrf54h20dk/nrf54h20/cpurad
extra_args:
- CONFIG_PM_S2RAM=n
- CONFIG_PM_S2RAM_CUSTOM_MARKING=n
- remote_CONFIG_PM_S2RAM=y
- remote_CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- remote_CONFIG_PM_DEVICE=y
- remote_CONFIG_PM_DEVICE_RUNTIME=y
- remote_CONFIG_BOOT_BANNER=n
Expand Down Expand Up @@ -79,11 +75,7 @@ tests:
integration_platforms:
- nrf54h20dk/nrf54h20/cpurad
extra_args:
- CONFIG_PM_S2RAM=n
- CONFIG_PM_S2RAM_CUSTOM_MARKING=n
- CONFIG_AT_LFRC=y
- remote_CONFIG_PM_S2RAM=y
- remote_CONFIG_PM_S2RAM_CUSTOM_MARKING=y
- remote_CONFIG_PM_DEVICE=y
- remote_CONFIG_PM_DEVICE_RUNTIME=y
- remote_CONFIG_BOOT_BANNER=n
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_comp/coverage.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_COMPARATOR=y
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=n
CONFIG_PM_S2RAM_CUSTOM_MARKING=n
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
3 changes: 3 additions & 0 deletions tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
&s2ram {
status = "disabled";
};
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_comp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ CONFIG_COMPARATOR=y
CONFIG_GPIO=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmarks/multicore/idle_comp/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tests:
integration_platforms:
- nrf54h20dk/nrf54h20/cpuapp
extra_args:
- EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay"
- EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay;disable_s2ram.overlay"
- CONF_FILE=coverage.conf
- SHIELD=coverage_support
harness: console
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_counter/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y

CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_POWEROFF=y
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_exmif/coverage.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
CONFIG_MSPI=y

CONFIG_PM=y
CONFIG_PM_S2RAM=n
CONFIG_PM_S2RAM_CUSTOM_MARKING=n
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
3 changes: 3 additions & 0 deletions tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
&s2ram {
status = "disabled";
};
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_exmif/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_RUNTIME=y
CONFIG_POWEROFF=y
Expand Down
1 change: 1 addition & 0 deletions tests/benchmarks/multicore/idle_exmif/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ tests:
- nrf54h20dk/nrf54h20/cpuapp
extra_args:
- CONF_FILE=coverage.conf
- EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
- SHIELD=coverage_support
harness: console
harness_config:
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_flpr/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_POWEROFF=y

CONFIG_PM_DEVICE=y
Expand Down
2 changes: 0 additions & 2 deletions tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
CONFIG_PM=y
CONFIG_PM_S2RAM=y
CONFIG_POWEROFF=y
CONFIG_PM_S2RAM_CUSTOM_MARKING=y
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
CONFIG_SERIAL=n
Expand Down
Loading