Repository navigation
Conversation
Both are left from the XTOS firmware build, which has been removed: - arch/sof.h can only be included from the XTOS rtos/sof.h (it errors unless __XTOS_RTOS_SOF_H__ is defined), which no longer exists, and nothing includes it; - lib/ams.c is not built (arch/host/lib only builds notifier.c), and it includes xtos-structs.h, which no longer exists. No functional change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
The platform IDC headers of i.MX and AMD accept being included from the XTOS rtos/idc.h (__XTOS_RTOS_IDC_H__) or the Zephyr one. The XTOS firmware build has been removed, so only the Zephyr check is left. Several #error messages still name the XTOS headers. The library platform and host arch headers are included from the host (posix) rtos/idc.h and rtos/task.h, so name those, and fix the "Zepyhr" typo in the i.MX8 header. No functional change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
The posix headers are the RTOS headers of the host builds (the host library, testbench and unit tests), and the XTOS firmware build that also used some of them has been removed. Most of them have __POSIX_* include guards already; rename the two __XTOS_* ones, and make the messages that reject Zephyr builds say these are host headers. No functional change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
zephyr/CMakeLists.txt sets PLATFORM_HEADERS to "posix" or "xtos", but nothing reads it. Remove it. No functional change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
The XTOS firmware build has been removed: Zephyr is the only supported RTOS, and the other non-Zephyr builds are the host builds (the host library, testbench and unit tests). Update the comments and docs that still describe XTOS as a current build: - CMake comments about files shared with XTOS: they are shared with the host builds; - the UUID, cache stub, DMA, trace and IPC worker comments; - the ZEPHYR_NATIVE_DRIVERS help, zephyr/README, ARCHITECTURE.md and the src/include README; - set_xtensa_params.sh, which only the testbench build uses. The comments on the legacy interrupt API said it was for i.MX, which has "no IRQ driver in Zephyr". It is only used by the AMD platforms without native drivers; i.MX uses the Zephyr interrupt API. Correct them. Comments that only say where something came from (the deprecated XTOS heap header and memory flag, the old XTOS build script) are kept. No functional change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
lgirdwood
marked this pull request as ready for review
November 21, 2026 19:44
lgirdwood
requested review from
a team,
abonislawski,
bardliao,
bhiregoudar,
dbaluta,
iuliana-prodan,
kv2019i,
lbetlej,
lyakh,
mmaka1,
pblaszko,
plbossart,
sunilkumardommati and
tmleman
as code owners
November 21, 2026 19:44
PR 11516: test resultsRun date: 2026-11-21 20:42 UTC Tested commit: e7b069aac9ec27e80f00c5567066ad38c9682ba9 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Clean up the XTOS leftovers. The XTOS firmware build has been removed: Zephyr is the only supported RTOS, and the other non-Zephyr builds are the host builds (the host library, testbench and unit tests). Follow-up to the review of #11513, which removes the last XTOS scheduler.
Patches
arch: host: remove two dead files.arch/sof.herrors unless the XTOSrtos/sof.hincluded it, and nothing includes it.lib/ams.cis not built, and it includesxtos-structs.h, which no longer exists.platform, arch: host: the i.MX and AMD platform IDC headers accept being included from the XTOS or the Zephyrrtos/idc.h. Only the Zephyr check is left. The#errormessages of the IDC and task headers name the headers that include them now (Zephyr's, or the host ones).posix: rename the two__XTOS_*include guards to__POSIX_*, like the other posix headers, and make the messages that reject Zephyr builds say these are host headers.zephyr: removePLATFORM_HEADERS, which is set to "posix" or "xtos" but never read.tree-wide: update the comments and docs that still describe XTOS as a current build: CMake comments, the UUID, cache stub, DMA, trace and IPC worker comments, theZEPHYR_NATIVE_DRIVERShelp,zephyr/README,ARCHITECTURE.md, thesrc/includeREADME andset_xtensa_params.sh.Not in this part
Kconfig.xtos, the legacy interrupt API (_xtos_*calls) anddai-legacy.h: used by the platforms that still use the legacy drivers (AMD and MediaTek), so they go with those drivers.idma.h: a vendor header.version.cmake(changing that code would change the source hash). Also the error message for the removed XTOS build.Functional change
None.
Testing
CONFIG_SOF_USERSPACE_PROXY=n;os_linux_overlay.conf;llext_relocatable.conf;app/debug_stream_overlay.conf, and PTL with that overlay and user-space LL.SYS_INIT()order), and the per-function disassembly. No object changes at any commit. The only image difference issof_init()on imx8m_cm7, imx93 and imx95, which embeds the git hash.--strict, for the builds (same 16 baseline sources) and for the sources;All of the above was run on d9b1a78 (current main).
🤖 Generated with Claude Code