Skip to content

Commit 836c692

Browse files
tmlemankv2019i
authored andcommitted
west.yml: update zephyr to 3841a72452ec
Total of 2048 commits. Changes include: 940b0f0e7f54 soc: intel_adsp: fix xtensa gdbstub include guard check e7893844b769 xtensa: remove dead z_arch_irq_connect_dynamic c21da807a929 arch: replace SEMIHOST arch allowlist with capability 2fbba5e3e434 arch: replace IRQ_OFFLOAD_NESTED arch allowlist with capability ab77c8c5e520 soc intel ace: Add missing type in kconfig option 46c81149a9f8 drivers: dai: amd: tdm: add ACP 7.X TDM DAI support 22ed52d7b05d drivers: clock_control: mcxw7x: fix OSC32K load cap and coarse gain c5581fa077cf boards: nxp: imx9: sort supported list in alphabetical order 995e7184b438 dts: arm: nxp: imx952: Add #address-cells to IRQSTEER masters 8a7d57090d4b dts: nxp: imx952: add and enable SAR ADC node 266e2d074ce3 dts: nxp: fix TSTMR clock-frequency to 24 MHz on i.MX93/943/95/952 a6771bc5b1db boards: nxp: imx943_evk: disable tstmr1 on M33 5295cb345bd7 llext: support word granular access instr mem for xtensa 704582eaf665 boards: imx952_evk: add A55 and A55 SMP platform 9e5b1b7292e2 dts: arm64: imx952: add SoC dts for A55 2d3595e069ad soc: imx952: add A55 CPU Core support 3e8cfffcbc67 logging: Do not enable CONFIG_LOG_PRINTK_STATIC by default e9515593ac48 boards: imx91/imx93: change to use fixed cache line size 458f4942893b logging: Add option to process printk using static macros 2e12489176e3 dts: nxp: mcx: add EQDC and INPUTMUX nodes for MCXA 6e7ecd679171 soc: nxp: imxrt6xx: use zephyr/ prefix for autoconf.h include 0f25a5b270df boards: imx95_evk: m7: fix PTP clock using for ENETC 1cb78d368a1b drivers: timer: add NXP RTC (rtc_jdp) system timer 218392538cb1 soc: intel: Fix missing zephyr/ include path 255fe93214f5 soc: intel_adsp: include DATA_SECTIONS linker snippet 217e2913a1c0 lib: heap: kasan: lightweight heap write sanitizer for sys_heap aa014f60b5d3 lib: heap: use single evaluation min a4b895017c06 boards: nxp: frdm_mcxaxx6: add lpdac support ba8bb9a20f97 arch: xtensa: change backtrace to use EXCEPTION_DUMP 7037755650ea boards: mcx_nx4x_evk: enable lpcmp for mcx_n5xx_evk c0f0fed6eef1 boards: nxp: mimxrt1180_evk: fix cm7 dtcm/itcm region overlap a85e1787bfc1 logging: mtrace: add support for multi slot logging b0b25c35c945 drivers: use <> to include Zephyr headers instead of "" b9c925c8e6ee drivers: counter: native_sim: add capture emulator 6a68a214a9a9 logging: frontends: stmesp_demux: Increase robustness e3c6b5340d77 logging: frontend: stmesp: Add flag indicating presence of hexdump data bc594b461c28 arch: xtensa: extend syscall helper to invoke levels 0-3 5cba4b75e82d lib: heap: add ASAN poisoning backend for sys_heap f82e45c6d375 lib: heap: add sanitizer hook for sys_heap 1824b00efda5 lib: heap: use uppercase MIN macro in realloc paths 751e074ab9fe include: logging: backends: complete coverage and tidy titles 21958f13cf1a dts: amd: acp_7_x: add TDM DAI and DMA device tree nodes a445f3183076 soc: amd: acp_7_x: add TDM register definitions and context struct 96b0ba14d97d manifest: hal_nxp: update revision for FW blob update d33280510ab7 kernel: timeout: add bucketed delta-list backend e0244d279b47 kernel: timeout: add timer-wheel backend 5188d5009b02 kernel: timeout: add min-heap backend e4b928ef193c sys: min_heap: add reference (handle-based) min-heap variant b381345043fc kernel: timeout: factor delta-list queue into a pluggable backend b04eb25b7865 include: zephyr: toolchain: Rename header file guard macros fd451c283dde tracing: user: expose kernel-object hooks as weak callbacks cb01fb4245b8 boards: *: dmic: add dmic-dev alias 1e265cf77632 kernel: kheap: keep static heap init as a PRE_KERNEL_1 SYS_INIT 3a1d70f4509a kernel: kheap, mem_slab, mailbox: use kernel init hooks ec46c494a9e8 drivers: sdhc: imx_usdhc: revert Zephyr-side cache maintenance 662334aca482 west.yml: update hal_nxp for imx952 a55 fe025522fe64 manifest: hal_nxp: update revision for raw scan result support 11ebcf851a62 drivers: timer: simplify skip/inverted K_TICKS_FOREVER guards bbf9caf996d7 drivers: timer: drop dead K_TICKS_FOREVER tick clamps 4ee67656ba2f dts: xtensa: use diamond include for non-local header files 7fd275e80093 drivers: clock_control: mcux_syscon: fix I3C freq for MCXAXX7 b25b70cec710 drivers: counter: add NXP TSTMR counter driver 43140f1760f5 doc: security: Disclose CVE-2026-10635 5e1afeaad6d3 modules: hal_nxp: add RPMSG-Lite build integration b6fe144fb9f4 ipc: service: backends: add RPMSG-Lite backend a78111b4d85d manifest: hal_nxp: update revision to fix PM3 entry failure Additional changes: - version.h -> zephyr/version.h, because Zephyr update changed header include paths and CI failed with missing version.h. - k_work_q.thread -> k_work_queue_thread_get(), because direct access is deprecated in newer Zephyr. Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
1 parent 097907a commit 836c692

9 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/init/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <zephyr/logging/log_ctrl.h>
4242
#include <user/abi_dbg.h>
4343
#include <sof_versions.h>
44-
#include <version.h>
44+
#include <zephyr/version.h>
4545
#endif
4646
#include <sof/lib/ams.h>
4747

src/ipc/ipc-common.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,13 @@ __cold int ipc_init(struct sof *sof)
330330
#endif
331331

332332
#ifdef __ZEPHYR__
333-
struct k_thread *thread = &sof->ipc->ipc_send_wq.thread;
333+
k_tid_t thread;
334334

335335
k_work_queue_start(&sof->ipc->ipc_send_wq, ipc_send_wq_stack,
336336
K_THREAD_STACK_SIZEOF(ipc_send_wq_stack), 1, NULL);
337337

338+
thread = k_work_queue_thread_get(&sof->ipc->ipc_send_wq);
339+
338340
k_thread_suspend(thread);
339341

340342
#ifdef CONFIG_SCHED_CPU_MASK

src/ipc/ipc-zephyr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Andrey Borisovich <andrey.borisovich@intel.com>
1010
// Adrian Warecki <adrian.warecki@intel.com>
1111

12-
#include <autoconf.h>
12+
#include <zephyr/autoconf.h>
1313

1414
#include <zephyr/kernel.h>
1515
#include <zephyr/ipc/ipc_service.h>

src/trace/dma-trace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <sof_versions.h>
3131

3232
#ifdef __ZEPHYR__
33-
#include <version.h>
33+
#include <zephyr/version.h>
3434
#endif
3535

3636
#include <errno.h>

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46-
revision: ee13f80fd5ede26838d461914858b9cc8cdb652f
46+
revision: 3841a72452ec13ff7a0a5df14f514e7870b71817
4747
remote: zephyrproject
4848

4949
# Import some projects listed in zephyr/west.yml@revision

zephyr/edf_schedule.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static struct scheduler_ops schedule_edf_ops = {
102102

103103
__cold int scheduler_init_edf(void)
104104
{
105-
struct k_thread *thread = &edf_workq.thread;
105+
k_tid_t thread;
106106

107107
assert_can_be_cold();
108108

@@ -113,6 +113,7 @@ __cold int scheduler_init_edf(void)
113113
K_THREAD_STACK_SIZEOF(edf_workq_stack),
114114
CONFIG_EDF_THREAD_PRIORITY, NULL);
115115

116+
thread = k_work_queue_thread_get(&edf_workq);
116117
k_thread_suspend(thread);
117118

118119
k_thread_heap_assign(thread, sof_sys_heap_get());

zephyr/lib/alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct vmh_heap *virtual_buffers_heap;
3737
#include <zephyr/init.h>
3838
#include <zephyr/kernel.h>
3939
#include <zephyr/pm/policy.h>
40-
#include <version.h>
40+
#include <zephyr/version.h>
4141
#include <zephyr/sys/__assert.h>
4242
#include <zephyr/cache.h>
4343

zephyr/lib/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static uint32_t mic_disable_status;
2727
#include "../audio/copier/copier.h"
2828

2929
/* Zephyr includes */
30-
#include <version.h>
30+
#include <zephyr/version.h>
3131
#include <zephyr/kernel.h>
3232
#include <zephyr/kernel/smp.h>
3333
#include <zephyr/device.h>

zephyr/wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <zephyr/kernel_structs.h>
3434
#include <zephyr/kernel.h>
3535
#include <zephyr/pm/policy.h>
36-
#include <version.h>
36+
#include <zephyr/version.h>
3737
#include <zephyr/sys/__assert.h>
3838
#include <zephyr/logging/log_ctrl.h>
3939
#include <zephyr/logging/log.h>

0 commit comments

Comments
 (0)