diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index 02c6f19412f3..13c86a637e00 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -9,8 +9,8 @@ CONFIG_NUM_PREEMPT_PRIORITIES=0 CONFIG_MULTITHREADING=y CONFIG_NUM_COOP_PRIORITIES=16 CONFIG_NUM_METAIRQ_PRIORITIES=0 -CONFIG_SCHED_DUMB=y -CONFIG_WAITQ_DUMB=y +CONFIG_SCHED_SIMPLE=y +CONFIG_WAITQ_SIMPLE=y # Enable peripherals needed by the flash companion firmware CONFIG_GPIO=y diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 4cd39cc1f62d..d752d231ca4a 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -439,6 +439,8 @@ - drivers.gpio.build - sample.perf - .*secure_storage.* + - kernel.scheduler.simple_timeslicing + - kernel.scheduler.simple_no_timeslicing platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuppr comment: "region RAM/FLASH overflowed" diff --git a/west.yml b/west.yml index 4ea9ae020834..6dd3e6c389c4 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: eb778e882c293b37176a316361e87c08b8386d93 + revision: cb2537e877c693f40d9a24e800f1a5e6da133ca7 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above