Phase 0: remove XTOS and ALSA plugin leftovers, add kernel/user include checker

.github/workflows/daily-tests.yml

@@ -35,9 +35,6 @@ jobs:
   main-PR-workflows:
     uses: ./.github/workflows/pull-request.yml
 
-  XTOS-reproducible:
-    uses: ./.github/workflows/repro-build.yml
-
   rimage:
     uses: ./.github/workflows/rimage.yml
 

.github/workflows/tools.yml

@@ -84,32 +84,3 @@ jobs:
         run: CMAKE_BUILD_TYPE=Release ./sof/scripts/build-tools.sh ||
              VERBOSE=1 NO_PROCESSORS=1 USE_XARGS=no
              CMAKE_BUILD_TYPE=Release ./sof/scripts/build-tools.sh
-
-
-  SOF-alsa-plugin:
-    # TODO: Update ubuntu to 26.04 when openvino situation is resolved
-    # It's not in the base ubuntu 26.04 OS and installation fails
-    # https://github.com/openvinotoolkit/openvino/issues/37509
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
-        with: {filter: 'tree:0'}
-
-      - name: apt install
-        run: sudo apt-get update;
-          sudo apt-get -y install ninja-build libasound2-dev
-
-      # One space character is enough to detect most quoting issues
-      - name: configure
-        run: cmake -GNinja -B 'build plugin' -S tools/plugin
-          -GNinja -Wdev -Werror=dev --warn-uninitialized
-
-      # Retry with -j1 in case of error because parallel builds drown error
-      # messages.
-      - name: build ExternalProjects first to avoid build race condition
-        run: cmake --build 'build plugin' -- sof_ep parser_ep ||
-             cmake --build 'build plugin' -- sof_ep parser_ep -j1
-
-      - name: Remaining build steps
-        run: cmake --build 'build plugin' ||
-             cmake --build 'build plugin' -j1

.github/workflows/zephyr.yml

@@ -235,6 +235,19 @@ jobs:
             --no-tarball \
             ${{ matrix.build_opts }} ${{ matrix.IPC_platforms }}
 
+      # Informational only for now, see scripts/check_kernel_includes.py
+      - name: kernel/user-space include report
+        if: always()
+        env:
+          PLATFORMS: ${{ matrix.IPC_platforms }}
+        run: |
+          for p in $PLATFORMS; do
+            test -f build-"$p"/build.ninja || continue
+            printf '\n==== %s ====\n' "$p"
+            ZEPHYR_BASE="$(pwd)"/zephyr \
+              python3 sof/scripts/check_kernel_includes.py --summary build-"$p" || true
+          done
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         if: always()

CMakeLists.txt

@@ -15,24 +15,21 @@ set(PYTHON3 "${Python3_EXECUTABLE}")
 
 option(BUILD_UNIT_TESTS "Build unit tests" OFF)
 option(BUILD_UNIT_TESTS_HOST "Build unit tests for host" OFF)
-option(BUILD_UNIT_TESTS_XTENSA_GCC "Build xtensa unit test using GCC" OFF)
-option(BUILD_CLANG_SCAN "Build for clang's scan-build" OFF)
 option(BUILD_COUNTERS "Enable build counter(s), timestamps and any other
 non-deterministic build features" OFF)
 
-if(CONFIG_LIBRARY OR BUILD_UNIT_TESTS_HOST OR CONFIG_ZEPHYR_POSIX)
-	set(ARCH host)
-else()
-	# firmware build supports only xtensa arch for now
-	set(ARCH xtensa)
+if(BUILD_UNIT_TESTS AND NOT BUILD_UNIT_TESTS_HOST)
+	message(FATAL_ERROR "Unit tests can only be built for the host, "
+		"use -DBUILD_UNIT_TESTS_HOST=ON")
 endif()
 
-# let user override built-in toolchains
-if(DEFINED CMAKE_TOOLCHAIN_FILE)
-	set(TOOLCHAIN "${CMAKE_TOOLCHAIN_FILE}")
-else()
-	include(scripts/cmake/${ARCH}-toolchain.cmake OPTIONAL)
+# The firmware is built with Zephyr (scripts/xtensa-build-zephyr.py), this
+# top-level project only builds the host library and the unit tests.
+if(NOT (CONFIG_LIBRARY OR BUILD_UNIT_TESTS_HOST OR CONFIG_ZEPHYR_POSIX))
+	message(FATAL_ERROR "The XTOS firmware build has been removed, "
+		"use scripts/xtensa-build-zephyr.py to build the firmware")
 endif()
+set(ARCH host)
 
 include(scripts/cmake/misc.cmake)
 
@@ -117,11 +114,7 @@ target_include_directories(sof_public_headers INTERFACE ${GENERATED_DIRECTORY}/i
 include(scripts/cmake/uuid-registry.cmake)
 
 if(CONFIG_LIBRARY)
-	if (CONFIG_LIBRARY_STATIC)
-		add_library(sof STATIC "")
-	else()
-		add_library(sof SHARED "")
-	endif()
+	add_library(sof STATIC "")
 	target_link_libraries(sof PRIVATE sof_options)
 	target_link_libraries(sof PRIVATE sof_static_libraries)
 	install(TARGETS sof DESTINATION lib)
@@ -153,39 +146,4 @@ if(BUILD_UNIT_TESTS)
 	enable_testing()
 	add_subdirectory(src/arch/${ARCH})
 	add_subdirectory(test)
-	# rest of this file is not needed for unit tests
-	return()
-endif()
-
-# for FW just install api folders
-install(
-	DIRECTORY
-		${PROJECT_SOURCE_DIR}/src/include/ipc
-		${PROJECT_SOURCE_DIR}/src/include/kernel
-		${PROJECT_SOURCE_DIR}/src/include/user
-		${RIMAGE_TOP}/src/include/sof/kernel
-		${RIMAGE_TOP}/src/include/sof/user
-	DESTINATION include/sof
-	PATTERN "*.h"
-)
-
-add_library(sof_ld_flags INTERFACE)
-add_library(sof_ld_scripts INTERFACE)
-
-target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/third_party_include)
-link_directories(${PROJECT_SOURCE_DIR}/third_party_libraries)
-
-# declare target with no sources to let cmake know about it
-add_executable(sof "")
-target_link_libraries(sof PRIVATE sof_options)
-target_link_libraries(sof PRIVATE sof_ld_scripts)
-target_link_libraries(sof PRIVATE sof_ld_flags)
-target_link_libraries(sof PRIVATE sof_static_libraries)
-
-if (BUILD_COUNTERS)
-sof_add_build_counter_rule()
 endif()
-
-add_subdirectory(src)
-
-sof_append_relative_path_definitions(sof)

CODEOWNERS

@@ -16,7 +16,6 @@ src/include/ipc/**			@randerwang @tmleman @pblaszko
 src/include/ipc4/**			@randerwang @tmleman @pblaszko
 src/include/kernel/**			@thesofproject/steering-committee
 src/include/user/**			@thesofproject/steering-committee
-src/include/sof/debug/gdb/*		@abonislawski
 src/include/sof/audio/aria/*		@abonislawski
 src/include/sof/audio/kpb.h		@fkwasowi @iganakov
 src/include/sof/audio/mux.h		@fkwasowi
@@ -48,23 +47,20 @@ src/audio/module_adapter/*		@ranj063 @jxstelter
 src/audio/google/*			@thesofproject/google
 
 # platforms
-src/arch/xtensa/debug/gdb/*		@abonislawski
 src/platform/imx8/**			@dbaluta
 src/platform/amd/**			@bhiregoudar @sunilkumardommati
-src/platform/mt8195/**		@yaochunhung @kuanhsuncheng
+src/platform/mtk/**			@yaochunhung @kuanhsuncheng
 
 # drivers
 src/drivers/intel/dmic.c		@singalsu
 src/drivers/imx/**			@dbaluta
-src/drivers/dw/*			@lyakh
 src/drivers/amd/*			@bhiregoudar @sunilkumardommati
-src/drivers/mediatek/mt8195/*		@yaochunhung @kuanhsuncheng
+src/drivers/mediatek/**		@yaochunhung @kuanhsuncheng
 
 # other libs
 src/math/*				@singalsu
 src/ipc/*				@bardliao @tmleman @pblaszko
 # src/lib/*				TODO
-src/debug/gdb/*				@abonislawski
 src/schedule				@pblaszko @marcinszkudlinski @dbaluta @LaurentiuM1234
 
 # samples
@@ -92,9 +88,6 @@ zephyr/lib/cpu.c			@tmleman
 zephyr/lib/alloc.c			@dabekjakub
 zephyr/lib/regions_mm.c			@dabekjakub
 
-# installer
-# installer/**				TODO
-
 # CMake
 
 # Include only "top-level" CMakeLists.txt files; the other ones are just

Kconfig.sof

@@ -72,12 +72,6 @@ config DEBUG
 	help
 	  Select for debug build
 
-config GDB_DEBUG
-	bool "GDB Stub"
-	default n
-	help
-	  Select for GDB debugging
-
 config DEBUG_MEMORY_USAGE_SCAN
 	bool "Memory usage scan"
 	default y

doc/sof.doxygen.in

@@ -17,7 +17,6 @@ INPUT            = @top_srcdir@/src/include/ipc \
                    @top_srcdir@/src/include/kernel \
                    @top_srcdir@/src/include/user \
                    @top_srcdir@/src/include/sof \
-                   @top_srcdir@/xtos/include \
                    @top_srcdir@/zephyr/include \
                    @top_srcdir@/doc/groups.dox \
                    @top_srcdir@/doc/mainpage.dox
@@ -62,7 +61,6 @@ PREDEFINED	 = "__attribute__(x)= " \
 		   "CONFIG_SOF_USERSPACE_USE_SHARED_HEAP=1" \
 		   "CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=1" \
 		   "CONFIG_INTEL_ADSP_DEBUG_SLOT_MANAGER=1" \
-		   "CONFIG_GDB_DEBUG=1" \
 		   "__DOXYGEN__=1" \
 		   "__coherent=" \
 		   "__syscall=" \