diff --git a/samples/suit/smp_transfer/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi b/samples/suit/smp_transfer/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi index 7ba9182685b8..9d7e527abba8 100644 --- a/samples/suit/smp_transfer/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi +++ b/samples/suit/smp_transfer/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi @@ -10,6 +10,7 @@ reg = <0xa5000 DT_SIZE_K(72)>; }; + /delete-node/ partition@94000; cpuapp_slot0_partition: partition@b7000 { reg = <0xb7000 DT_SIZE_K(256)>; }; @@ -32,6 +33,8 @@ nordic,access = ; #address-cells = < 0x1 >; #size-cells = < 0x1 >; + + /delete-node/ partition@54000; cpurad_slot0_partition: partition@66000 { reg = < 0x66000 DT_SIZE_K(160) >; }; diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 72f42fb0c1ed..d6a0ab97ebf4 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -203,12 +203,6 @@ - native_sim comment: "https://nordicsemi.atlassian.net/browse/NCSDK-30877" -- scenarios: - - drivers.spi.pm_runtime - platforms: - - nrf52840dk/nrf52840 - comment: "TBD" - # --------------------------------- Won't fix section ----------------------------------- - scenarios: @@ -451,3 +445,9 @@ - platforms: - native_posix comment: "native_posix will be removed soon - native_sim platform is the default simulator now" + +- scenarios: + - drivers.hwinfo.api + platforms: + - nrf54h20dk/nrf54h20/cpuppr + comment: Unsupported device diff --git a/west.yml b/west.yml index aae3dac6fc88..01cadbf023bf 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: b6535f5caeff11a44b2daf808b2ddaddcf5ba4d3 + revision: 36a1e64bc8414029324cb4e8a4828c13c170f3fc import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above