Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions samples/suit/flash_companion/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions scripts/quarantine_zephyr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down