Skip to content
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

manifest: sdk-zephyr: [nrf fromtree] soc: nordic: common: Add MRAM latency manager #18903

Merged
merged 2 commits into from
Dec 6, 2024
Merged

manifest: sdk-zephyr: [nrf fromtree] soc: nordic: common: Add MRAM latency manager #18903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd2938
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Nov 15, 2024
11f312e
all: Remove CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
nordic-krch Nov 26, 2024
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
3 changes: 1 addition & 2 deletions samples/suit/flash_companion/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/current_consumption/nfc_idle/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions tests/benchmarks/multicore/idle/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_adc/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_adc/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_clock_control/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_clock_control/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_comp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_comp/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_gpio/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_gpio/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ CONFIG_POWEROFF=y

CONFIG_GPIO=n
CONFIG_BOOT_BANNER=n
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

CONFIG_ASSERT=y

Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_outside_of_main/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_ppr/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_ppr/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_pwm_led/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_pwm_loopback/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_pwm_loopback/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_spim/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_spim/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_spim_loopback/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_stm/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_stm/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_twim/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ CONFIG_POWEROFF=y

CONFIG_GPIO=n
CONFIG_BOOT_BANNER=n
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n

CONFIG_ASSERT=y

Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_twim/remote/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_uarte/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_usb/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_wdt/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/adc/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/adc_async/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/flash/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/gpio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/i2c/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/lpcomp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/spi/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/temperature_sensor/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/timer_waiting/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/uart_async/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/uart_interrupt/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/benchmarks/power_consumption/uart_polling/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 4092e6df311e18779fe1bb28ca29fff9e7931891
revision: a7fe5f7c4aab18312bd7f61afef55647e38f3db6
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading