tests: replace option to disable MRAM latency control

This is now handled by a SoC level "service". Signed-off-by: Gerard Marull-Paretas <[email protected]>
nrfconnect · Nov 12, 2024 · 719af32 · 719af32
1 parent f86d620
commit 719af32
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 34 deletions.
diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml
@@ -72,10 +72,10 @@ 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_NRFS_MRAM_SERVICE_ENABLED=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_NRFS_MRAM_SERVICE_ENABLED=n
+      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -93,10 +93,10 @@ 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_NRFS_MRAM_SERVICE_ENABLED=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_NRFS_MRAM_SERVICE_ENABLED=n
+      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
       DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay"
     harness: pytest
     harness_config:
@@ -115,10 +115,10 @@ 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_NRFS_MRAM_SERVICE_ENABLED=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_NRFS_MRAM_SERVICE_ENABLED=n
+      remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=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
@@ -8,7 +8,7 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -7,4 +7,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -7,7 +7,7 @@ CONFIG_POWEROFF=y
 
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,7 +5,7 @@ CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -6,4 +6,4 @@ CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_NCS_BOOT_BANNER=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
diff --git a/tests/benchmarks/multicore/idle_spim/prj.conf b/tests/benchmarks/multicore/idle_spim/prj.conf
@@ -8,7 +8,7 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -2,7 +2,7 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y

diff --git a/tests/benchmarks/multicore/idle_twim/prj.conf b/tests/benchmarks/multicore/idle_twim/prj.conf
@@ -9,7 +9,7 @@ CONFIG_POWEROFF=y
 
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -11,8 +11,8 @@ CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -13,7 +13,7 @@ CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
 
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 # Enable for debugging purposes only
 CONFIG_PRINTK=y

diff --git a/tests/benchmarks/multicore/idle_with_pwm/prj_s2ram.conf b/tests/benchmarks/multicore/idle_with_pwm/prj_s2ram.conf
@@ -10,6 +10,6 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PWM=y
diff --git a/tests/benchmarks/multicore/idle_with_pwm/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_with_pwm/remote/prj_s2ram.conf
@@ -5,6 +5,6 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
 
 CONFIG_PWM=y
diff --git a/tests/benchmarks/power_consumption/adc/prj.conf b/tests/benchmarks/power_consumption/adc/prj.conf
@@ -12,4 +12,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -14,4 +14,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_GPIO=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -12,4 +12,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -3,6 +3,6 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -13,4 +13,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=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
@@ -2,4 +2,4 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+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
@@ -13,4 +13,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -13,4 +13,4 @@ CONFIG_PM=y
 CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+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
@@ -13,4 +13,4 @@ CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -10,4 +10,4 @@ CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=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
@@ -7,4 +7,4 @@ CONFIG_PM_S2RAM=y
 CONFIG_POWEROFF=y
 CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_BOOT_BANNER=n
-CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
+CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n