From 11f312e0c99a910e80d62724df56288f9e0214b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Tue, 26 Nov 2024 16:20:12 +0100 Subject: [PATCH] all: Remove CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Module has been removed and replaced with API for requesting no MRAM latency. By default MRAM latency is enabled and it needs to be explicitly enabled. When Bluetooth is enabled then no MRAM latency is enforced like it used to be. Signed-off-by: Krzysztof Chruściński --- samples/suit/flash_companion/prj.conf | 3 +-- subsys/bluetooth/controller/Kconfig | 3 ++- .../current_consumption/nfc_idle/testcase.yaml | 1 - tests/benchmarks/multicore/idle/testcase.yaml | 9 +++------ tests/benchmarks/multicore/idle_adc/prj.conf | 1 - tests/benchmarks/multicore/idle_adc/remote/prj.conf | 1 - tests/benchmarks/multicore/idle_clock_control/prj.conf | 1 - .../multicore/idle_clock_control/remote/prj.conf | 1 - tests/benchmarks/multicore/idle_comp/prj.conf | 1 - tests/benchmarks/multicore/idle_comp/remote/prj.conf | 1 - tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf | 1 - .../benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf | 1 - tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf | 1 - tests/benchmarks/multicore/idle_outside_of_main/prj.conf | 1 - .../multicore/idle_outside_of_main/remote/prj.conf | 1 - tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf | 1 - .../benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf | 1 - tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf | 1 - .../multicore/idle_pwm_led/remote/prj_s2ram.conf | 1 - .../multicore/idle_pwm_loopback/prj_s2ram.conf | 1 - .../multicore/idle_pwm_loopback/remote/prj_s2ram.conf | 1 - tests/benchmarks/multicore/idle_spim/prj.conf | 1 - tests/benchmarks/multicore/idle_spim/remote/prj.conf | 1 - .../multicore/idle_spim_loopback/prj_s2ram.conf | 1 - tests/benchmarks/multicore/idle_stm/prj_s2ram.conf | 1 - .../benchmarks/multicore/idle_stm/remote/prj_s2ram.conf | 1 - tests/benchmarks/multicore/idle_twim/prj.conf | 1 - tests/benchmarks/multicore/idle_twim/remote/prj.conf | 1 - tests/benchmarks/multicore/idle_uarte/prj.conf | 1 - tests/benchmarks/multicore/idle_usb/prj.conf | 1 - tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf | 1 - .../benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf | 1 - tests/benchmarks/power_consumption/adc/prj.conf | 1 - tests/benchmarks/power_consumption/adc_async/prj.conf | 1 - .../common/remote_sleep_forever/prj.conf | 1 - tests/benchmarks/power_consumption/flash/prj.conf | 1 - tests/benchmarks/power_consumption/gpio/prj.conf | 1 - tests/benchmarks/power_consumption/i2c/prj.conf | 1 - tests/benchmarks/power_consumption/lpcomp/prj.conf | 1 - .../qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 1 - tests/benchmarks/power_consumption/spi/prj.conf | 1 - .../power_consumption/temperature_sensor/prj.conf | 1 - .../benchmarks/power_consumption/timer_waiting/prj.conf | 1 - tests/benchmarks/power_consumption/uart_async/prj.conf | 1 - .../benchmarks/power_consumption/uart_interrupt/prj.conf | 1 - tests/benchmarks/power_consumption/uart_polling/prj.conf | 1 - west.yml | 2 +- 47 files changed, 7 insertions(+), 53 deletions(-) diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index c6398fc92a8f..96ae996bc4ae 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -20,9 +20,8 @@ CONFIG_FLASH=y # Disable power management CONFIG_PM=n -# Disable GPD service, MRAM latency service and NRFS +# Disable GPD service and NRFS CONFIG_SOC_NRF54H20_GPD=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_NRFS=n # Disable unneeded interrupt features diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index bffb5f12383e..b8533c613648 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -44,7 +44,8 @@ config BT_LL_SOFTDEVICE select BT_CTLR_LE_PATH_LOSS_MONITORING_SUPPORT select BT_CTLR_SUBRATING_SUPPORT select BT_LL_SOFTDEVICE_HEADERS_INCLUDE - select SOC_NRF54H20_NO_MRAM_LATENCY if SOC_NRF54H20_CPURAD + select MRAM_LATENCY if SOC_NRF54H20_CPURAD + select MRAM_LATENCY_AUTO_REQ if SOC_NRF54H20_CPURAD depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_COMPATIBLE_NRF5340_CPUNET ||\ SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX) depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED diff --git a/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml b/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml index 81d37c95fa68..89e68f276f35 100644 --- a/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml +++ b/tests/benchmarks/current_consumption/nfc_idle/testcase.yaml @@ -25,7 +25,6 @@ tests: - CONFIG_PM_S2RAM=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_BOOT_BANNER=n - - CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n harness: pytest harness_config: fixture: ppk_power_measure diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index 27e852b72cbe..f737d40b57eb 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -72,10 +72,9 @@ tests: CONFIG_FIRST_SLEEP_OFFSET=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 CONFIG_GPIO=n CONFIG_BOOT_BANNER=n - CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n - remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n + remote_CONFIG_BOOT_BANNER=n harness: pytest harness_config: fixture: ppk_power_measure @@ -93,10 +92,9 @@ tests: CONFIG_FIRST_SLEEP_OFFSET=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 CONFIG_GPIO=n CONFIG_BOOT_BANNER=n - CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n - remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n + remote_CONFIG_BOOT_BANNER=n DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay" harness: pytest harness_config: @@ -115,10 +113,9 @@ tests: CONFIG_FIRST_SLEEP_OFFSET=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 CONFIG_GPIO=n CONFIG_BOOT_BANNER=n - CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n - remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n + remote_CONFIG_BOOT_BANNER=n DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay" harness: pytest harness_config: diff --git a/tests/benchmarks/multicore/idle_adc/prj.conf b/tests/benchmarks/multicore/idle_adc/prj.conf index eb6ade852e46..d5af993369fe 100644 --- a/tests/benchmarks/multicore/idle_adc/prj.conf +++ b/tests/benchmarks/multicore/idle_adc/prj.conf @@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y # Enable for debugging purposes only diff --git a/tests/benchmarks/multicore/idle_adc/remote/prj.conf b/tests/benchmarks/multicore/idle_adc/remote/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/multicore/idle_adc/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_adc/remote/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_clock_control/prj.conf b/tests/benchmarks/multicore/idle_clock_control/prj.conf index c1f2770b6cbe..e7b093f5ca2d 100644 --- a/tests/benchmarks/multicore/idle_clock_control/prj.conf +++ b/tests/benchmarks/multicore/idle_clock_control/prj.conf @@ -7,7 +7,6 @@ CONFIG_POWEROFF=y CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_NRFS=y CONFIG_CLOCK_CONTROL=y diff --git a/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf b/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_clock_control/remote/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_comp/prj.conf b/tests/benchmarks/multicore/idle_comp/prj.conf index bc70dd8e6e4b..4545d7eb42ac 100644 --- a/tests/benchmarks/multicore/idle_comp/prj.conf +++ b/tests/benchmarks/multicore/idle_comp/prj.conf @@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y # Enable for debugging purposes only diff --git a/tests/benchmarks/multicore/idle_comp/remote/prj.conf b/tests/benchmarks/multicore/idle_comp/remote/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/multicore/idle_comp/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_comp/remote/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf b/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf index d9a59708632a..4b472e7b6b94 100644 --- a/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf @@ -7,4 +7,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf index 478a1860e113..f6b9a2213bde 100644 --- a/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf index 6ea23d186d86..1c65777685dc 100644 --- a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf @@ -7,7 +7,6 @@ CONFIG_POWEROFF=y CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y diff --git a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf index 6a6a7185c26d..d9e7894c6bf0 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf +++ b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf @@ -5,7 +5,6 @@ CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n CONFIG_NCS_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n # Enable for debugging purposes only CONFIG_SERIAL=n diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf index 95c48265f8c1..153d14f104ad 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf @@ -6,4 +6,3 @@ CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_NCS_BOOT_BANNER=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf b/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf index 0e45b47f3366..7dd7a80ee5fe 100644 --- a/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf @@ -2,7 +2,6 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf index 339ed3aff08f..8f55835c4150 100644 --- a/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf @@ -9,7 +9,6 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n CONFIG_NCS_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y CONFIG_GPIO=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf index ec52643d5c12..bf3876da9e78 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf @@ -10,6 +10,5 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PWM=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf index ed81d0698f63..0563d3ce33d5 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf @@ -5,6 +5,5 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PWM=y diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf index 2ea1fac5d8c5..f72a62563369 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf @@ -2,7 +2,6 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf index 2ecdaff82e4f..7aab1da0aee6 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf @@ -1,6 +1,5 @@ CONFIG_PM=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_spim/prj.conf b/tests/benchmarks/multicore/idle_spim/prj.conf index 88be384d8dcf..a87c9c9481f6 100644 --- a/tests/benchmarks/multicore/idle_spim/prj.conf +++ b/tests/benchmarks/multicore/idle_spim/prj.conf @@ -8,7 +8,6 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y diff --git a/tests/benchmarks/multicore/idle_spim/remote/prj.conf b/tests/benchmarks/multicore/idle_spim/remote/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/multicore/idle_spim/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_spim/remote/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf b/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf index 823e6e086266..6e11f732196f 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf @@ -2,7 +2,6 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf b/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf index 19094f468c83..9fe9584c0cc5 100644 --- a/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_stm/prj_s2ram.conf @@ -2,7 +2,6 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf index 6cdccd180476..b9471c18669b 100644 --- a/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf @@ -10,4 +10,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n CONFIG_NCS_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_twim/prj.conf b/tests/benchmarks/multicore/idle_twim/prj.conf index e9ed924a1973..8cd0b8887433 100644 --- a/tests/benchmarks/multicore/idle_twim/prj.conf +++ b/tests/benchmarks/multicore/idle_twim/prj.conf @@ -9,7 +9,6 @@ CONFIG_POWEROFF=y CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y diff --git a/tests/benchmarks/multicore/idle_twim/remote/prj.conf b/tests/benchmarks/multicore/idle_twim/remote/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/multicore/idle_twim/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_twim/remote/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/multicore/idle_uarte/prj.conf b/tests/benchmarks/multicore/idle_uarte/prj.conf index e0c0eaa58e9f..90ddeda28a34 100644 --- a/tests/benchmarks/multicore/idle_uarte/prj.conf +++ b/tests/benchmarks/multicore/idle_uarte/prj.conf @@ -12,7 +12,6 @@ CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n CONFIG_ASSERT=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n # Enable for debugging purposes only CONFIG_PRINTK=n diff --git a/tests/benchmarks/multicore/idle_usb/prj.conf b/tests/benchmarks/multicore/idle_usb/prj.conf index 123e46008612..6e29f391d38f 100644 --- a/tests/benchmarks/multicore/idle_usb/prj.conf +++ b/tests/benchmarks/multicore/idle_usb/prj.conf @@ -13,7 +13,6 @@ CONFIG_PM_DEVICE_RUNTIME=y CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n # Enable for debugging purposes only CONFIG_PRINTK=y diff --git a/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf index 90f12d00e301..582a3141e35c 100644 --- a/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf @@ -2,7 +2,6 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_POWEROFF=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y diff --git a/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf index f91b878f77f1..bf39c7275b5b 100644 --- a/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf @@ -5,6 +5,5 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_WATCHDOG=y diff --git a/tests/benchmarks/power_consumption/adc/prj.conf b/tests/benchmarks/power_consumption/adc/prj.conf index cfae34bfabb1..74762f6f5cdf 100644 --- a/tests/benchmarks/power_consumption/adc/prj.conf +++ b/tests/benchmarks/power_consumption/adc/prj.conf @@ -12,4 +12,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/adc_async/prj.conf b/tests/benchmarks/power_consumption/adc_async/prj.conf index a552426fb74d..87031172d9aa 100644 --- a/tests/benchmarks/power_consumption/adc_async/prj.conf +++ b/tests/benchmarks/power_consumption/adc_async/prj.conf @@ -14,4 +14,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf b/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf index e4da5b48a646..136c013a406a 100644 --- a/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf +++ b/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf @@ -5,4 +5,3 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/flash/prj.conf b/tests/benchmarks/power_consumption/flash/prj.conf index f4c6d3ad98bc..b8fa26e64844 100644 --- a/tests/benchmarks/power_consumption/flash/prj.conf +++ b/tests/benchmarks/power_consumption/flash/prj.conf @@ -12,4 +12,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/gpio/prj.conf b/tests/benchmarks/power_consumption/gpio/prj.conf index 6de5b9455885..913ac93a02e0 100644 --- a/tests/benchmarks/power_consumption/gpio/prj.conf +++ b/tests/benchmarks/power_consumption/gpio/prj.conf @@ -3,6 +3,5 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y diff --git a/tests/benchmarks/power_consumption/i2c/prj.conf b/tests/benchmarks/power_consumption/i2c/prj.conf index 4e884e149cf9..657eb780cc2b 100644 --- a/tests/benchmarks/power_consumption/i2c/prj.conf +++ b/tests/benchmarks/power_consumption/i2c/prj.conf @@ -13,4 +13,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/lpcomp/prj.conf b/tests/benchmarks/power_consumption/lpcomp/prj.conf index b696af547fd5..f34a6b4d38b7 100644 --- a/tests/benchmarks/power_consumption/lpcomp/prj.conf +++ b/tests/benchmarks/power_consumption/lpcomp/prj.conf @@ -14,5 +14,4 @@ CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_POWEROFF=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n CONFIG_ASSERT=y 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 cd445ca0ee8e..f70709b7c215 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -2,4 +2,3 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/spi/prj.conf b/tests/benchmarks/power_consumption/spi/prj.conf index 500e6a9ef54f..3f28e6315065 100644 --- a/tests/benchmarks/power_consumption/spi/prj.conf +++ b/tests/benchmarks/power_consumption/spi/prj.conf @@ -13,4 +13,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/temperature_sensor/prj.conf b/tests/benchmarks/power_consumption/temperature_sensor/prj.conf index fc7c56a79c6d..1fab15fb8b0e 100644 --- a/tests/benchmarks/power_consumption/temperature_sensor/prj.conf +++ b/tests/benchmarks/power_consumption/temperature_sensor/prj.conf @@ -13,4 +13,3 @@ CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/timer_waiting/prj.conf b/tests/benchmarks/power_consumption/timer_waiting/prj.conf index 998d13e0f67e..018fcd12bbe6 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/prj.conf +++ b/tests/benchmarks/power_consumption/timer_waiting/prj.conf @@ -13,4 +13,3 @@ CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/uart_async/prj.conf b/tests/benchmarks/power_consumption/uart_async/prj.conf index a334d1dc703d..2b56a5788430 100644 --- a/tests/benchmarks/power_consumption/uart_async/prj.conf +++ b/tests/benchmarks/power_consumption/uart_async/prj.conf @@ -10,4 +10,3 @@ CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/uart_interrupt/prj.conf b/tests/benchmarks/power_consumption/uart_interrupt/prj.conf index 2ba66b31c82e..b2b4b6589be1 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/prj.conf +++ b/tests/benchmarks/power_consumption/uart_interrupt/prj.conf @@ -10,4 +10,3 @@ CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/tests/benchmarks/power_consumption/uart_polling/prj.conf b/tests/benchmarks/power_consumption/uart_polling/prj.conf index ef4e38149e7f..f56e22190acf 100644 --- a/tests/benchmarks/power_consumption/uart_polling/prj.conf +++ b/tests/benchmarks/power_consumption/uart_polling/prj.conf @@ -7,4 +7,3 @@ CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y CONFIG_BOOT_BANNER=n -CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n diff --git a/west.yml b/west.yml index bf322471111c..44ab2e44346c 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2271/head + revision: a7fe5f7c4aab18312bd7f61afef55647e38f3db6 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above