diff --git a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_singlecore.conf b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_singlecore.conf index 8ab3c74f5e55..0020358d0f78 100644 --- a/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_singlecore.conf +++ b/applications/machine_learning/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_singlecore.conf @@ -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 diff --git a/applications/machine_learning/sample.yaml b/applications/machine_learning/sample.yaml index 4545dc28d3bc..28cf808e64e9 100644 --- a/applications/machine_learning/sample.yaml +++ b/applications/machine_learning/sample.yaml @@ -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 diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf index 91778514e85a..024bfe339d34 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf @@ -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 diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_dongle.conf index e529c617d6aa..a78d86f06697 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_dongle.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_dongle.conf @@ -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 diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf index 2ddd71129fb4..2e61f695d8f0 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf @@ -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 diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_dongle.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_dongle.conf index fb6e61e56bdf..9218103fe0af 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_dongle.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release_dongle.conf @@ -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 diff --git a/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst b/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst index 4788f24f1421..16fd0de2e703 100644 --- a/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst +++ b/doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst @@ -121,9 +121,7 @@ Recommended Kconfig configuration For the application running on the application core, setting the following Kconfig options is recommended: * :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`` diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.conf index e8ac7c8dfc0b..31cf97537166 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -6,5 +6,3 @@ # nRF54H-specific power management configuration CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y diff --git a/samples/caf_sensor_manager/sample.yaml b/samples/caf_sensor_manager/sample.yaml index 569f26751493..af3abd8a8d05 100644 --- a/samples/caf_sensor_manager/sample.yaml +++ b/samples/caf_sensor_manager/sample.yaml @@ -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 @@ -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 diff --git a/samples/zephyr/boards/nordic/spis_wakeup/prj.conf b/samples/zephyr/boards/nordic/spis_wakeup/prj.conf index 6a81b41b2bde..2b51b5ee16a3 100644 --- a/samples/zephyr/boards/nordic/spis_wakeup/prj.conf +++ b/samples/zephyr/boards/nordic/spis_wakeup/prj.conf @@ -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 diff --git a/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf b/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf index adc760c451c2..4a6b711ba725 100644 --- a/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf +++ b/samples/zephyr/boards/nordic/spis_wakeup/wakeup_trigger/prj.conf @@ -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 diff --git a/tests/benchmarks/current_consumption/beacon_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/beacon_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf index a77037d57569..cc10b7737d12 100644 --- a/tests/benchmarks/current_consumption/beacon_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/current_consumption/beacon_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -5,6 +5,3 @@ # CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y - -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y diff --git a/tests/benchmarks/current_consumption/lfrc_idle/prj.conf b/tests/benchmarks/current_consumption/lfrc_idle/prj.conf index 99862bdf449d..7873bf6d3aee 100644 --- a/tests/benchmarks/current_consumption/lfrc_idle/prj.conf +++ b/tests/benchmarks/current_consumption/lfrc_idle/prj.conf @@ -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 diff --git a/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf index f951e5204461..bf1946936c9e 100644 --- a/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,4 +1,2 @@ CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y diff --git a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf index ce8b8c85d91b..cc10b7737d12 100644 --- a/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/current_consumption/twim_suspend/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -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 diff --git a/tests/benchmarks/current_consumption/twim_suspend/sysbuild/vpr_launcher/prj.conf b/tests/benchmarks/current_consumption/twim_suspend/sysbuild/vpr_launcher/prj.conf index b622e6bbd6ff..1a589ef8b495 100644 --- a/tests/benchmarks/current_consumption/twim_suspend/sysbuild/vpr_launcher/prj.conf +++ b/tests/benchmarks/current_consumption/twim_suspend/sysbuild/vpr_launcher/prj.conf @@ -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 diff --git a/tests/benchmarks/current_consumption/uart_console/prj.conf b/tests/benchmarks/current_consumption/uart_console/prj.conf index 2423a7092a7b..e42907eb4941 100644 --- a/tests/benchmarks/current_consumption/uart_console/prj.conf +++ b/tests/benchmarks/current_consumption/uart_console/prj.conf @@ -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 diff --git a/tests/benchmarks/current_consumption/uarte_suspend/prj.conf b/tests/benchmarks/current_consumption/uarte_suspend/prj.conf index 5f4a94fd3223..0f2c90a63201 100644 --- a/tests/benchmarks/current_consumption/uarte_suspend/prj.conf +++ b/tests/benchmarks/current_consumption/uarte_suspend/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index cf35804ae230..6ce9e5abbf76 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tests/benchmarks/multicore/idle_adc/coverage.conf b/tests/benchmarks/multicore/idle_adc/coverage.conf index 6858cb25fc30..991cab3d1a22 100644 --- a/tests/benchmarks/multicore/idle_adc/coverage.conf +++ b/tests/benchmarks/multicore/idle_adc/coverage.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_adc/prj.conf b/tests/benchmarks/multicore/idle_adc/prj.conf index d5af993369fe..619739f4c2c9 100644 --- a/tests/benchmarks/multicore/idle_adc/prj.conf +++ b/tests/benchmarks/multicore/idle_adc/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_adc/testcase.yaml b/tests/benchmarks/multicore/idle_adc/testcase.yaml index 2020cb0bbba1..d295ce9955de 100644 --- a/tests/benchmarks/multicore/idle_adc/testcase.yaml +++ b/tests/benchmarks/multicore/idle_adc/testcase.yaml @@ -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: diff --git a/tests/benchmarks/multicore/idle_clock_control/coverage.conf b/tests/benchmarks/multicore/idle_clock_control/coverage.conf index feedf2f2aaf2..a4aa556f8c0e 100644 --- a/tests/benchmarks/multicore/idle_clock_control/coverage.conf +++ b/tests/benchmarks/multicore/idle_clock_control/coverage.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_clock_control/prj.conf b/tests/benchmarks/multicore/idle_clock_control/prj.conf index 8ed5f3a79475..d2eb694330ac 100644 --- a/tests/benchmarks/multicore/idle_clock_control/prj.conf +++ b/tests/benchmarks/multicore/idle_clock_control/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_clock_control/testcase.yaml b/tests/benchmarks/multicore/idle_clock_control/testcase.yaml index 2b3a06b6f724..979a33e9a8a6 100644 --- a/tests/benchmarks/multicore/idle_clock_control/testcase.yaml +++ b/tests/benchmarks/multicore/idle_clock_control/testcase.yaml @@ -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 @@ -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 diff --git a/tests/benchmarks/multicore/idle_comp/coverage.conf b/tests/benchmarks/multicore/idle_comp/coverage.conf index ab22cc9cbea7..a9300b05cf08 100644 --- a/tests/benchmarks/multicore/idle_comp/coverage.conf +++ b/tests/benchmarks/multicore/idle_comp/coverage.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_comp/prj.conf b/tests/benchmarks/multicore/idle_comp/prj.conf index 4545d7eb42ac..c85b8a7880a4 100644 --- a/tests/benchmarks/multicore/idle_comp/prj.conf +++ b/tests/benchmarks/multicore/idle_comp/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_comp/testcase.yaml b/tests/benchmarks/multicore/idle_comp/testcase.yaml index f07460e6ffba..7d83f11dbec0 100644 --- a/tests/benchmarks/multicore/idle_comp/testcase.yaml +++ b/tests/benchmarks/multicore/idle_comp/testcase.yaml @@ -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 diff --git a/tests/benchmarks/multicore/idle_counter/prj.conf b/tests/benchmarks/multicore/idle_counter/prj.conf index f359829e97fd..7ace0da29fe8 100644 --- a/tests/benchmarks/multicore/idle_counter/prj.conf +++ b/tests/benchmarks/multicore/idle_counter/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_exmif/coverage.conf b/tests/benchmarks/multicore/idle_exmif/coverage.conf index ebc7b1b52258..69ed83e3cf59 100644 --- a/tests/benchmarks/multicore/idle_exmif/coverage.conf +++ b/tests/benchmarks/multicore/idle_exmif/coverage.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_exmif/prj.conf b/tests/benchmarks/multicore/idle_exmif/prj.conf index 57ae6e6c1480..b3c705462fed 100644 --- a/tests/benchmarks/multicore/idle_exmif/prj.conf +++ b/tests/benchmarks/multicore/idle_exmif/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_exmif/testcase.yaml b/tests/benchmarks/multicore/idle_exmif/testcase.yaml index 7de9ed6f0ea4..5fc6a86522ed 100644 --- a/tests/benchmarks/multicore/idle_exmif/testcase.yaml +++ b/tests/benchmarks/multicore/idle_exmif/testcase.yaml @@ -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: diff --git a/tests/benchmarks/multicore/idle_flpr/prj_s2ram.conf b/tests/benchmarks/multicore/idle_flpr/prj_s2ram.conf index 7dd7a80ee5fe..b5ccd4f222c2 100644 --- a/tests/benchmarks/multicore/idle_flpr/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_flpr/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf b/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf index 4b472e7b6b94..f6b9a2213bde 100644 --- a/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_grtc/vpr_launcher.conf b/tests/benchmarks/multicore/idle_grtc/vpr_launcher.conf index ec3d5419d0c6..5349cbd91d15 100644 --- a/tests/benchmarks/multicore/idle_grtc/vpr_launcher.conf +++ b/tests/benchmarks/multicore/idle_grtc/vpr_launcher.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf index a23f66a85c2c..ba73e768a5fa 100644 --- a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_ipc/coverage.conf b/tests/benchmarks/multicore/idle_ipc/coverage.conf index df749bf2f829..cacbdbaa3991 100644 --- a/tests/benchmarks/multicore/idle_ipc/coverage.conf +++ b/tests/benchmarks/multicore/idle_ipc/coverage.conf @@ -3,8 +3,6 @@ CONFIG_MBOX=y CONFIG_IPC_SERVICE=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 diff --git a/tests/benchmarks/multicore/idle_ipc/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_ipc/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_ipc/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_ipc/prj.conf b/tests/benchmarks/multicore/idle_ipc/prj.conf index ec8272724d9f..0678b2c8de01 100644 --- a/tests/benchmarks/multicore/idle_ipc/prj.conf +++ b/tests/benchmarks/multicore/idle_ipc/prj.conf @@ -12,8 +12,6 @@ CONFIG_IPC_SERVICE=y CONFIG_IPC_SERVICE_LOG_LEVEL_INF=y CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_PM_DEVICE=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_ipc/testcase.yaml b/tests/benchmarks/multicore/idle_ipc/testcase.yaml index 70b4f4e985f6..d7f3a4c4bc26 100644 --- a/tests/benchmarks/multicore/idle_ipc/testcase.yaml +++ b/tests/benchmarks/multicore/idle_ipc/testcase.yaml @@ -72,6 +72,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: diff --git a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf index faa8eb88a186..9b437f5ca8f7 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf +++ b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n diff --git a/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf b/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf index 7dd7a80ee5fe..b5ccd4f222c2 100644 --- a/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/coverage.conf b/tests/benchmarks/multicore/idle_pwm_led/coverage.conf index 67d5547792e8..d69d5dafd580 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/coverage.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/coverage.conf @@ -2,8 +2,6 @@ CONFIG_PWM=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 diff --git a/tests/benchmarks/multicore/idle_pwm_led/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_pwm_led/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_pwm_led/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf index bf3876da9e78..d42810ca9892 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf @@ -1,7 +1,5 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml index b93d0c684422..480668d86f32 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml +++ b/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml @@ -127,6 +127,7 @@ tests: filter: CONFIG_COVERAGE extra_args: - idle_pwm_led_CONF_FILE=coverage.conf + - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay" - SHIELD=coverage_support harness: console harness_config: diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf b/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf index 67d5547792e8..d69d5dafd580 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf +++ b/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf @@ -2,8 +2,6 @@ CONFIG_PWM=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 diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_pwm_loopback/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_pwm_loopback/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf index f72a62563369..7aab1da0aee6 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml index e30192d14fbc..fdc5735120a0 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml +++ b/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml @@ -141,6 +141,7 @@ tests: filter: CONFIG_COVERAGE extra_args: - idle_pwm_loopback_CONF_FILE=coverage.conf + - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay" - SHIELD=coverage_support harness: console harness_config: diff --git a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.conf index ce8b8c85d91b..cc10b7737d12 100644 --- a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_spim/coverage.conf b/tests/benchmarks/multicore/idle_spim/coverage.conf index 6f07906e4b20..fb26630d0f95 100644 --- a/tests/benchmarks/multicore/idle_spim/coverage.conf +++ b/tests/benchmarks/multicore/idle_spim/coverage.conf @@ -2,8 +2,6 @@ CONFIG_SPI=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 diff --git a/tests/benchmarks/multicore/idle_spim/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_spim/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_spim/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_spim/sysbuild/vpr_launcher/prj.conf b/tests/benchmarks/multicore/idle_spim/sysbuild/vpr_launcher/prj.conf index b622e6bbd6ff..1a589ef8b495 100644 --- a/tests/benchmarks/multicore/idle_spim/sysbuild/vpr_launcher/prj.conf +++ b/tests/benchmarks/multicore/idle_spim/sysbuild/vpr_launcher/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_spim/testcase.yaml b/tests/benchmarks/multicore/idle_spim/testcase.yaml index 46a67b386923..8c702dab64cb 100644 --- a/tests/benchmarks/multicore/idle_spim/testcase.yaml +++ b/tests/benchmarks/multicore/idle_spim/testcase.yaml @@ -84,6 +84,7 @@ tests: extra_args: - SHIELD=pca63566;coverage_support - CONF_FILE=coverage.conf + - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay" harness: console harness_config: fixture: pca63566 diff --git a/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf b/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf index 6f07906e4b20..fb26630d0f95 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf +++ b/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf @@ -2,8 +2,6 @@ CONFIG_SPI=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 diff --git a/tests/benchmarks/multicore/idle_spim_loopback/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_spim_loopback/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_spim_loopback/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf index 6e11f732196f..9ce01ea1c40f 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml index 0bd44f12ec81..72e9024b8fd3 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml +++ b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml @@ -499,6 +499,7 @@ tests: extra_args: - SHIELD=coverage_support - CONF_FILE=coverage.conf + - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay" harness: console harness_config: fixture: spi_loopback diff --git a/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf b/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf index 9fe9584c0cc5..9f1e3581dc07 100644 --- a/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/multicore/idle_twim/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/multicore/idle_twim/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 6de13b44fdde..a6fa5758d9ae 100644 --- a/tests/benchmarks/multicore/idle_twim/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/multicore/idle_twim/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,4 +1 @@ -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/multicore/idle_twim/coverage.conf b/tests/benchmarks/multicore/idle_twim/coverage.conf index dd4d98614ff9..fc75c4005dc1 100644 --- a/tests/benchmarks/multicore/idle_twim/coverage.conf +++ b/tests/benchmarks/multicore/idle_twim/coverage.conf @@ -2,8 +2,6 @@ CONFIG_I2C=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 diff --git a/tests/benchmarks/multicore/idle_twim/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_twim/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_twim/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_twim/sysbuild/vpr_launcher/prj.conf b/tests/benchmarks/multicore/idle_twim/sysbuild/vpr_launcher/prj.conf index b622e6bbd6ff..1a589ef8b495 100644 --- a/tests/benchmarks/multicore/idle_twim/sysbuild/vpr_launcher/prj.conf +++ b/tests/benchmarks/multicore/idle_twim/sysbuild/vpr_launcher/prj.conf @@ -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 diff --git a/tests/benchmarks/multicore/idle_twim/testcase.yaml b/tests/benchmarks/multicore/idle_twim/testcase.yaml index 58be4ecdbcdb..02bd5ef40e47 100644 --- a/tests/benchmarks/multicore/idle_twim/testcase.yaml +++ b/tests/benchmarks/multicore/idle_twim/testcase.yaml @@ -61,6 +61,7 @@ tests: extra_args: - SHIELD=pca63566;coverage_support - CONF_FILE=coverage.conf + - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay" harness: console harness_config: fixture: pca63566 diff --git a/tests/benchmarks/multicore/idle_uarte/coverage.conf b/tests/benchmarks/multicore/idle_uarte/coverage.conf index b95d0bdb7a18..1f6585f96109 100644 --- a/tests/benchmarks/multicore/idle_uarte/coverage.conf +++ b/tests/benchmarks/multicore/idle_uarte/coverage.conf @@ -4,8 +4,6 @@ CONFIG_UART_ASYNC_API=y CONFIG_UART_USE_RUNTIME_CONFIGURE=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 diff --git a/tests/benchmarks/multicore/idle_uarte/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_uarte/disable_s2ram.overlay new file mode 100644 index 000000000000..288b0ac84a89 --- /dev/null +++ b/tests/benchmarks/multicore/idle_uarte/disable_s2ram.overlay @@ -0,0 +1,3 @@ +&s2ram { + status = "disabled"; +}; diff --git a/tests/benchmarks/multicore/idle_uarte/prj.conf b/tests/benchmarks/multicore/idle_uarte/prj.conf index 90ddeda28a34..be6d5188c79f 100644 --- a/tests/benchmarks/multicore/idle_uarte/prj.conf +++ b/tests/benchmarks/multicore/idle_uarte/prj.conf @@ -4,8 +4,6 @@ CONFIG_UART_ASYNC_API=y CONFIG_UART_USE_RUNTIME_CONFIGURE=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 diff --git a/tests/benchmarks/multicore/idle_uarte/testcase.yaml b/tests/benchmarks/multicore/idle_uarte/testcase.yaml index ecd964a6bdb2..aa0abe3e4ab7 100644 --- a/tests/benchmarks/multicore/idle_uarte/testcase.yaml +++ b/tests/benchmarks/multicore/idle_uarte/testcase.yaml @@ -116,7 +116,7 @@ tests: integration_platforms: - nrf54h20dk/nrf54h20/cpuapp extra_args: - - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay" + - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay;disable_s2ram.overlay" - CONF_FILE=coverage.conf - SHIELD=coverage_support harness: console diff --git a/tests/benchmarks/multicore/idle_usb/prj.conf b/tests/benchmarks/multicore/idle_usb/prj.conf index f67beb9f05b6..3de866efcab4 100644 --- a/tests/benchmarks/multicore/idle_usb/prj.conf +++ b/tests/benchmarks/multicore/idle_usb/prj.conf @@ -6,8 +6,6 @@ CONFIG_SAMPLE_USBD_PRODUCT="USBD CDC ACM sample" CONFIG_SAMPLE_USBD_REMOTE_WAKEUP=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 diff --git a/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf index 582a3141e35c..acdff9696441 100644 --- a/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y CONFIG_PM_DEVICE=y diff --git a/tests/benchmarks/peripheral_load/power_management.conf b/tests/benchmarks/peripheral_load/power_management.conf index 35224932ffaf..b2f6a1124775 100644 --- a/tests/benchmarks/peripheral_load/power_management.conf +++ b/tests/benchmarks/peripheral_load/power_management.conf @@ -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 diff --git a/tests/benchmarks/power_consumption/adc/prj.conf b/tests/benchmarks/power_consumption/adc/prj.conf index 74762f6f5cdf..b36dc03c6e87 100644 --- a/tests/benchmarks/power_consumption/adc/prj.conf +++ b/tests/benchmarks/power_consumption/adc/prj.conf @@ -5,9 +5,7 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y 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 diff --git a/tests/benchmarks/power_consumption/flash/prj.conf b/tests/benchmarks/power_consumption/flash/prj.conf index 13c5700866c8..71ab2b974985 100644 --- a/tests/benchmarks/power_consumption/flash/prj.conf +++ b/tests/benchmarks/power_consumption/flash/prj.conf @@ -5,9 +5,7 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y 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 diff --git a/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.conf index a8745a6831a0..54ac0626a9dc 100644 --- a/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -3,7 +3,5 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y CONFIG_PM=y -CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 6de13b44fdde..a6fa5758d9ae 100644 --- a/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,4 +1 @@ -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/i2c/sysbuild/vpr_launcher/prj.conf b/tests/benchmarks/power_consumption/i2c/sysbuild/vpr_launcher/prj.conf index 462619da692d..b92c3ef3459b 100644 --- a/tests/benchmarks/power_consumption/i2c/sysbuild/vpr_launcher/prj.conf +++ b/tests/benchmarks/power_consumption/i2c/sysbuild/vpr_launcher/prj.conf @@ -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 diff --git a/tests/benchmarks/power_consumption/lpcomp/prj.conf b/tests/benchmarks/power_consumption/lpcomp/prj.conf index f34a6b4d38b7..5b1cbf3b09cd 100644 --- a/tests/benchmarks/power_consumption/lpcomp/prj.conf +++ b/tests/benchmarks/power_consumption/lpcomp/prj.conf @@ -6,9 +6,7 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y 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 diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 35723fe87a95..7356cb5262d5 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,6 +1,4 @@ CONFIG_PM=y -CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf index dbfd500785c1..cc10b7737d12 100644 --- a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -3,7 +3,5 @@ # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf index ed3294088ce2..10265408ff80 100644 --- a/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -1,6 +1,3 @@ -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_NRFS=y CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y diff --git a/tests/benchmarks/power_consumption/timer_waiting/prj.conf b/tests/benchmarks/power_consumption/timer_waiting/prj.conf index 018fcd12bbe6..7c7392964c97 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/prj.conf +++ b/tests/benchmarks/power_consumption/timer_waiting/prj.conf @@ -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 diff --git a/tests/benchmarks/power_consumption/uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/benchmarks/power_consumption/uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf index a6dec362af06..cc10b7737d12 100644 --- a/tests/benchmarks/power_consumption/uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -5,5 +5,3 @@ # CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y -CONFIG_PM_S2RAM=y -CONFIG_PM_S2RAM_CUSTOM_MARKING=y diff --git a/tests/drivers/flash/multicore_soc_flash/prj.conf b/tests/drivers/flash/multicore_soc_flash/prj.conf index c2408fd018d0..acbc82abc6cf 100644 --- a/tests/drivers/flash/multicore_soc_flash/prj.conf +++ b/tests/drivers/flash/multicore_soc_flash/prj.conf @@ -9,8 +9,6 @@ CONFIG_SETTINGS_FCB=y CONFIG_ASSERT=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 diff --git a/tests/drivers/flash/multicore_soc_flash/remote/prj.conf b/tests/drivers/flash/multicore_soc_flash/remote/prj.conf index c2408fd018d0..acbc82abc6cf 100644 --- a/tests/drivers/flash/multicore_soc_flash/remote/prj.conf +++ b/tests/drivers/flash/multicore_soc_flash/remote/prj.conf @@ -9,8 +9,6 @@ CONFIG_SETTINGS_FCB=y CONFIG_ASSERT=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 diff --git a/tests/subsys/ipc/ipc_latency/testcase.yaml b/tests/subsys/ipc/ipc_latency/testcase.yaml index bb892ade726a..099d9f3efbda 100644 --- a/tests/subsys/ipc/ipc_latency/testcase.yaml +++ b/tests/subsys/ipc/ipc_latency/testcase.yaml @@ -38,8 +38,6 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_configs: - 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 diff --git a/west.yml b/west.yml index 5d85cc88a878..eaeafc0ae215 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 25f7b905665e488a00e66ed1335f1b46d87b53ef + revision: cb89816c0dd67b9833d78bd55a04ff24a8edcc67 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above