Skip to content

Commit 719af32

Browse files
gmarullrlubos
authored andcommitted
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]>
1 parent f86d620 commit 719af32

File tree

29 files changed

+34
-34
lines changed

29 files changed

+34
-34
lines changed

tests/benchmarks/multicore/idle/testcase.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ tests:
7272
CONFIG_FIRST_SLEEP_OFFSET=y
7373
CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
7474
CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
75-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
75+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
7676
remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
7777
remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
78-
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
78+
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
7979
harness: pytest
8080
harness_config:
8181
fixture: ppk_power_measure
@@ -93,10 +93,10 @@ tests:
9393
CONFIG_FIRST_SLEEP_OFFSET=y
9494
CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
9595
CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
96-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
96+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
9797
remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
9898
remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
99-
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
99+
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
100100
DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay"
101101
harness: pytest
102102
harness_config:
@@ -115,10 +115,10 @@ tests:
115115
CONFIG_FIRST_SLEEP_OFFSET=y
116116
CONFIG_PM=y CONFIG_PM_S2RAM=y CONFIG_POWEROFF=y CONFIG_PM_S2RAM_CUSTOM_MARKING=y
117117
CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n CONFIG_GPIO=n CONFIG_BOOT_BANNER=n
118-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
118+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
119119
remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
120120
remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
121-
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
121+
remote_CONFIG_BOOT_BANNER=n remote_CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
122122
DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay"
123123
harness: pytest
124124
harness_config:

tests/benchmarks/multicore/idle_adc/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CONFIG_PM_DEVICE=y
88
CONFIG_PM_DEVICE_RUNTIME=y
99
CONFIG_POWEROFF=y
1010
CONFIG_BOOT_BANNER=n
11-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
11+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
1212
CONFIG_ASSERT=y
1313

1414
# Enable for debugging purposes only

tests/benchmarks/multicore/idle_adc/remote/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
55
CONFIG_SERIAL=n
66
CONFIG_GPIO=n
77
CONFIG_BOOT_BANNER=n
8-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
8+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ CONFIG_UART_CONSOLE=n
77
CONFIG_SERIAL=n
88
CONFIG_GPIO=y
99
CONFIG_BOOT_BANNER=n
10-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
10+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
55
CONFIG_SERIAL=n
66
CONFIG_GPIO=y
77
CONFIG_BOOT_BANNER=n
8-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
8+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CONFIG_POWEROFF=y
77

88
CONFIG_GPIO=n
99
CONFIG_BOOT_BANNER=n
10-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
10+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
1111

1212
CONFIG_ASSERT=y
1313

tests/benchmarks/multicore/idle_outside_of_main/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_POWEROFF=y
55

66
CONFIG_BOOT_BANNER=n
77
CONFIG_NCS_BOOT_BANNER=n
8-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
8+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
99

1010
# Enable for debugging purposes only
1111
CONFIG_SERIAL=n

tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ CONFIG_SERIAL=n
66
CONFIG_GPIO=n
77
CONFIG_NCS_BOOT_BANNER=n
88
CONFIG_BOOT_BANNER=n
9-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
9+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

tests/benchmarks/multicore/idle_spim/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CONFIG_PM_DEVICE=y
88
CONFIG_PM_DEVICE_RUNTIME=y
99
CONFIG_POWEROFF=y
1010
CONFIG_BOOT_BANNER=n
11-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
11+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
1212

1313
CONFIG_ASSERT=y
1414

tests/benchmarks/multicore/idle_spim/remote/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ CONFIG_UART_CONSOLE=n
55
CONFIG_SERIAL=n
66
CONFIG_GPIO=n
77
CONFIG_BOOT_BANNER=n
8-
CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
8+
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

0 commit comments

Comments
 (0)