From 8744c7355c61955489af66fde71b0511e5e831d2 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 11 Apr 2025 18:50:44 +0530 Subject: [PATCH 1/2] manifest: sdk-zehyr: Pull fixes for Wi-Fi runtime certs Pull fixes for Wi-Fi enterprise security runtime certificates. Signed-off-by: Chaitanya Tata --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 0bbd6d76cd91..dd565928285a 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: 1d7723ad7b3e70b9b5ab1fb85d955c527cc0fa33 + revision: 3ecc854864da976a1b1cbf2968059de1b4319144 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 8ff3dba082de520a31906e276cd3c7b7909bb1c9 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Tue, 8 Apr 2025 20:07:39 +0530 Subject: [PATCH 2/2] treewide: Fix the scheduler name Zephyr has renamed from dumb->simple. Signed-off-by: Chaitanya Tata --- samples/suit/flash_companion/prj.conf | 4 ++-- scripts/quarantine_zephyr.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index 0ca362bcf78b..40e15d438a28 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 CONFIG_TICKLESS_KERNEL=n CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=n diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 4cd39cc1f62d..3213f74dd045 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -365,8 +365,8 @@ - kernel.threads.dynamic_thread.stack.pool.no_alloc.no_user - kernel.threads.dynamic_thread.stack.no_pool.no_alloc.user - kernel.scheduler.no_timeslicing - - kernel.scheduler.dumb_no_timeslicing - - kernel.scheduler.dumb_timeslicing + - kernel.scheduler.simple_no_timeslicing + - kernel.scheduler.simple_timeslicing - kernel.scheduler.multiq_no_timeslicing - kernel.scheduler.multiq - message_bus.zbus.hlp_priority_boost