From 696c8e42e27baf40bd0e60fc806e702f4dab703d Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 5 Nov 2024 21:03:32 +0100 Subject: [PATCH] samples: suit: flash_companion: disable MRAM latency service Otherwise NRFS can't be disabled. Signed-off-by: Gerard Marull-Paretas --- samples/suit/flash_companion/prj.conf | 3 ++- west.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index 96ae996bc4ae..c6398fc92a8f 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -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 diff --git a/west.yml b/west.yml index 08a0b822cae4..1e962ca94734 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/2254/head + revision: f3186c3093dc714881a1f5dbba8257a18b303cb8 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above