Skip to content

manifest: sdk-zephyr: [Backport v3.7.99-ncs1-branch] boards: nrf54h20: refactor MRAM board level code #18806

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

Merged
merged 3 commits into from
Nov 12, 2024
Merged

manifest: sdk-zephyr: [Backport v3.7.99-ncs1-branch] boards: nrf54h20: refactor MRAM board level code #18806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b116db
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Nov 12, 2024
4bc3e74
tests: replace option to disable MRAM latency control
gmarull Nov 4, 2024
682e95c
samples: suit: flash_companion: disable MRAM latency service
gmarull Nov 5, 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: 2 additions & 1 deletion samples/suit/flash_companion/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ CONFIG_FLASH=y
# Disable power management
CONFIG_PM=n

# Disable GPD service and NRFS
# Disable GPD service, MRAM latency service and NRFS
CONFIG_SOC_NRF54H20_GPD=n
CONFIG_SOC_NRF54H20_NO_MRAM_LATENCY=n
CONFIG_NRFS=n

# Disable unneeded interrupt features
Expand Down
12 changes: 6 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,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
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 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,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
Expand Down
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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

Expand Down
2 changes: 1 addition & 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,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
Expand Down
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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

Expand Down
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
Expand Down
2 changes: 1 addition & 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,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

Expand Down
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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 @@ -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
Expand Down
2 changes: 1 addition & 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,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
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmarks/multicore/idle_with_pwm/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/benchmarks/multicore/idle_with_pwm/remote/prj_s2ram.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
2 changes: 1 addition & 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,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
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: 76309674f1e4c6094b5f1557f58f45c0f7b3ce95
revision: f3186c3093dc714881a1f5dbba8257a18b303cb8
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading