From 5553d328efd831edea7ed973353018a496be2795 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 7 Nov 2026 15:04:51 +0000 Subject: [PATCH 1/3] arch: move src/arch to src/kernel/arch The architecture code (Xtensa cache and interrupt support, the host build's architecture layer and its library defconfig) is kernel-only. Move it to src/kernel/arch. Zephyr only uses it through include directories and the Xtensa cache attribute source listed in zephyr/CMakeLists.txt; update those paths. The host builds now add it from src/kernel. Update the configuration search paths in kconfig.cmake and defconfigs.cmake, the testbench, tplg_parser and app CMake, the MediaTek tools script and the docs. Its Kconfig is sourced from the same place in src/Kconfig as before, so the Kconfig definition order does not change. References to the removed XTOS build output (build__gcc/src/arch/xtensa) in old scripts and .gitignore are left as they are. No functional change. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Liam Girdwood --- AGENTS.md | 2 +- CMakeLists.txt | 2 +- app/CMakeLists.txt | 2 +- scripts/cmake/defconfigs.cmake | 2 +- scripts/cmake/kconfig.cmake | 6 +++--- scripts/rebuild-testbench.sh | 2 +- src/CMakeLists.txt | 1 - src/Kconfig | 2 +- src/include/sof/userspace/README.md | 2 +- src/kernel/CMakeLists.txt | 3 +++ src/{ => kernel}/arch/CMakeLists.txt | 0 src/{ => kernel}/arch/Kconfig | 0 src/{ => kernel}/arch/README.md | 4 ++-- src/{ => kernel}/arch/host/CMakeLists.txt | 2 +- src/{ => kernel}/arch/host/configs/library_defconfig | 0 src/{ => kernel}/arch/host/include/arch/atomic.h | 0 src/{ => kernel}/arch/host/include/arch/compiler_info.h | 0 src/{ => kernel}/arch/host/include/arch/debug/backtrace.h | 0 src/{ => kernel}/arch/host/include/arch/debug/panic.h | 0 src/{ => kernel}/arch/host/include/arch/drivers/idc.h | 0 src/{ => kernel}/arch/host/include/arch/drivers/interrupt.h | 0 src/{ => kernel}/arch/host/include/arch/drivers/timer.h | 0 src/{ => kernel}/arch/host/include/arch/lib/cache.h | 0 src/{ => kernel}/arch/host/include/arch/lib/cpu.h | 0 src/{ => kernel}/arch/host/include/arch/lib/wait.h | 0 src/{ => kernel}/arch/host/include/arch/schedule/task.h | 0 src/{ => kernel}/arch/host/include/arch/sof.h | 0 src/{ => kernel}/arch/host/include/arch/string.h | 0 src/{ => kernel}/arch/host/lib/CMakeLists.txt | 0 src/{ => kernel}/arch/host/lib/ams.c | 0 src/{ => kernel}/arch/host/lib/notifier.c | 0 src/{ => kernel}/arch/xtensa/Kconfig | 0 src/{ => kernel}/arch/xtensa/drivers/cache_attr.c | 0 .../arch/xtensa/include/arch/drivers/interrupt.h | 0 src/platform/mtk/tools/build.sh | 2 +- tools/testbench/CMakeLists.txt | 2 +- tools/testbench/README.md | 6 +++--- tools/tplg_parser/CMakeLists.txt | 2 +- zephyr/CMakeLists.txt | 4 ++-- 39 files changed, 24 insertions(+), 22 deletions(-) rename src/{ => kernel}/arch/CMakeLists.txt (100%) rename src/{ => kernel}/arch/Kconfig (100%) rename src/{ => kernel}/arch/README.md (72%) rename src/{ => kernel}/arch/host/CMakeLists.txt (95%) rename src/{ => kernel}/arch/host/configs/library_defconfig (100%) rename src/{ => kernel}/arch/host/include/arch/atomic.h (100%) rename src/{ => kernel}/arch/host/include/arch/compiler_info.h (100%) rename src/{ => kernel}/arch/host/include/arch/debug/backtrace.h (100%) rename src/{ => kernel}/arch/host/include/arch/debug/panic.h (100%) rename src/{ => kernel}/arch/host/include/arch/drivers/idc.h (100%) rename src/{ => kernel}/arch/host/include/arch/drivers/interrupt.h (100%) rename src/{ => kernel}/arch/host/include/arch/drivers/timer.h (100%) rename src/{ => kernel}/arch/host/include/arch/lib/cache.h (100%) rename src/{ => kernel}/arch/host/include/arch/lib/cpu.h (100%) rename src/{ => kernel}/arch/host/include/arch/lib/wait.h (100%) rename src/{ => kernel}/arch/host/include/arch/schedule/task.h (100%) rename src/{ => kernel}/arch/host/include/arch/sof.h (100%) rename src/{ => kernel}/arch/host/include/arch/string.h (100%) rename src/{ => kernel}/arch/host/lib/CMakeLists.txt (100%) rename src/{ => kernel}/arch/host/lib/ams.c (100%) rename src/{ => kernel}/arch/host/lib/notifier.c (100%) rename src/{ => kernel}/arch/xtensa/Kconfig (100%) rename src/{ => kernel}/arch/xtensa/drivers/cache_attr.c (100%) rename src/{ => kernel}/arch/xtensa/include/arch/drivers/interrupt.h (100%) diff --git a/AGENTS.md b/AGENTS.md index 6a2f4cdfee5b..2a807612c145 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -31,7 +31,7 @@ moving code, follow it: * **Place code in the right tier.** OS/HAL/boot/inter-core → a kernel-only directory (`kernel/`, which is built into the `sof_kernel` library, and the directories not yet - moved there: `arch/`, `platform/`, `trace/`); audio + moved there: `platform/`, `trace/`); audio application logic → `audio/`; reusable pure code → a shared-library directory (`lib/`, `math/`, `module/`) kept free of privileged operations. Each top-level directory's `README.md` states its tier in a "Runs in:" banner — keep it accurate. diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fe6aa02b614..1af14e4b4089 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,6 @@ endif() if(BUILD_UNIT_TESTS) enable_testing() - add_subdirectory(src/arch/${ARCH}) + add_subdirectory(src/kernel/arch/${ARCH}) add_subdirectory(test) endif() diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index fe9b208fe99f..5537caecda09 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -27,6 +27,6 @@ target_sources(app PRIVATE ) zephyr_library_include_directories(app PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../src/arch/xtensa/include + ${CMAKE_CURRENT_SOURCE_DIR}/../src/kernel/arch/xtensa/include ${CMAKE_CURRENT_SOURCE_DIR}/../src/include ) diff --git a/scripts/cmake/defconfigs.cmake b/scripts/cmake/defconfigs.cmake index 9bdbd23539a8..84d7eb0fe752 100644 --- a/scripts/cmake/defconfigs.cmake +++ b/scripts/cmake/defconfigs.cmake @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Looks for defconfig files in arch directories where kconfig.cmake looks too. -set(DEFCONFIGS_DIRECTORY "${PROJECT_SOURCE_DIR}/src/arch/${ARCH}/configs") +set(DEFCONFIGS_DIRECTORY "${PROJECT_SOURCE_DIR}/src/kernel/arch/${ARCH}/configs") file(GLOB DEFCONFIG_PATHS "${DEFCONFIGS_DIRECTORY}/*_defconfig") # Adds dependency on defconfigs directory diff --git a/scripts/cmake/kconfig.cmake b/scripts/cmake/kconfig.cmake index f885598387bf..7d3dd4481b18 100644 --- a/scripts/cmake/kconfig.cmake +++ b/scripts/cmake/kconfig.cmake @@ -13,14 +13,14 @@ if(NOT INIT_CONFIG_found) set(INIT_CONFIG "initial.config" CACHE STRING "Initial .config file") # - ".' is the top source directory. -# - "src/arch/host/configs" holds the library (testbench) configurations +# - "src/kernel/arch/host/configs" holds the library (testbench) configurations # and is also used by defconfigs.cmake. # - "test/cmocka/configs" holds the unit test configurations. # - First found wins. # - If two directories ever use the same defconfig name then a full # path must be used, e.g.: -DINIT_CONFIG=test/cmocka/configs/collision_defconfig -set(init_config_search_list "." "src/arch/host/configs" "test/cmocka/configs") +set(init_config_search_list "." "src/kernel/arch/host/configs" "test/cmocka/configs") find_file(INIT_CONFIG_found NAMES ${INIT_CONFIG} @@ -46,7 +46,7 @@ message(FATAL_ERROR "Initial configuration missing, no ${INIT_CONFIG} found. " "Provide a ${PROJECT_SOURCE_DIR}/initial.config file or specify some " "other -DINIT_CONFIG=location relative to '${PROJECT_SOURCE_DIR}/' or " - "'${PROJECT_SOURCE_DIR}/src/arch/*/configs/'" + "'${PROJECT_SOURCE_DIR}/src/kernel/arch/*/configs/'" ) endif() diff --git a/scripts/rebuild-testbench.sh b/scripts/rebuild-testbench.sh index 996d16f45a8c..578632dfa1cb 100755 --- a/scripts/rebuild-testbench.sh +++ b/scripts/rebuild-testbench.sh @@ -116,7 +116,7 @@ For temporary, interactive Kconfiguration use: $BUILD_BACKEND -C $TESTBENCH_DIR/$BUILD_DIR_NAME/sof_ep/build/ menuconfig -Permanent configuration is "src/arch/host/configs/library_defconfig". +Permanent configuration is "src/kernel/arch/host/configs/library_defconfig". For instant, incremental build: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4d31797de8f..d364361e9a0e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause add_subdirectory(platform) -add_subdirectory(arch) add_subdirectory(ipc) add_subdirectory(audio) add_subdirectory(lib) diff --git a/src/Kconfig b/src/Kconfig index 6dbd3c396c04..d72155332d4a 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause -rsource "arch/Kconfig" +rsource "kernel/arch/Kconfig" rsource "platform/Kconfig" diff --git a/src/include/sof/userspace/README.md b/src/include/sof/userspace/README.md index d8efa662aa2d..ed80b5a88aba 100644 --- a/src/include/sof/userspace/README.md +++ b/src/include/sof/userspace/README.md @@ -74,7 +74,7 @@ its subdirectories span all tiers. | Tier | Meaning | Directories | |------|---------|-------------| -| **Kernel-only** | OS integration, HAL, boot, inter-core. Never executes in a user thread. Must not be reached directly from user code — only via a syscall. | `kernel/` (see [its README](../../../kernel/README.md)), `arch/`, `platform/`, `trace/` * | +| **Kernel-only** | OS integration, HAL, boot, inter-core. Never executes in a user thread. Must not be reached directly from user code — only via a syscall. | `kernel/` (see [its README](../../../kernel/README.md)), `platform/`, `trace/` * | | **Boundary / bridge** | Owns the syscalls and the thread / memory-domain setup. Split internally: some translation units run kernel-side, some user-side (e.g. `handler-kernel.c` vs `handler-user.c`). | `schedule/`, `ipc/`, `debug/debug_stream/` *, and (in the Zephyr integration tree) `zephyr/syscall/` | | **Application** | Audio pipeline / component logic that runs in user threads under userspace configs. | `audio/` | | **Shared library** | Context-agnostic code linked into whichever context calls it. Must stay "user-safe": no privileged operations (no direct MMIO, no spinlocks held across syscalls, no raw kernel object access) so it is safe when pulled into a user build. | `math/`, `module/` | diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index b14881ad3b7a..8e9afe9e6293 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -21,6 +21,9 @@ if(zephyr) add_subdirectory(logging) add_subdirectory(probe) add_subdirectory(schedule) +else() + # Only built for the host + add_subdirectory(arch) endif() # Built for Zephyr and for the host diff --git a/src/arch/CMakeLists.txt b/src/kernel/arch/CMakeLists.txt similarity index 100% rename from src/arch/CMakeLists.txt rename to src/kernel/arch/CMakeLists.txt diff --git a/src/arch/Kconfig b/src/kernel/arch/Kconfig similarity index 100% rename from src/arch/Kconfig rename to src/kernel/arch/Kconfig diff --git a/src/arch/README.md b/src/kernel/arch/README.md similarity index 72% rename from src/arch/README.md rename to src/kernel/arch/README.md index df7999635033..c69391224118 100644 --- a/src/arch/README.md +++ b/src/kernel/arch/README.md @@ -1,8 +1,8 @@ -# Architecture Support (`src/arch`) +# Architecture Support (`src/kernel/arch`) > **Runs in:** Kernel-only — CPU-architecture primitives (Xtensa) execute in supervisor context > and are never linked into a user thread. See -> [User/kernel split](../include/sof/userspace/README.md). +> [User/kernel split](../../include/sof/userspace/README.md). This directory contains architecture-specific code. It sits below the RTOS and audio application and has no user-space entry points. diff --git a/src/arch/host/CMakeLists.txt b/src/kernel/arch/host/CMakeLists.txt similarity index 95% rename from src/arch/host/CMakeLists.txt rename to src/kernel/arch/host/CMakeLists.txt index 75314f00f556..bef4fdf9ec83 100644 --- a/src/arch/host/CMakeLists.txt +++ b/src/kernel/arch/host/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # includes -target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/arch/host/include) +target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/arch/host/include) target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/library/include) include(CheckCCompilerFlag) diff --git a/src/arch/host/configs/library_defconfig b/src/kernel/arch/host/configs/library_defconfig similarity index 100% rename from src/arch/host/configs/library_defconfig rename to src/kernel/arch/host/configs/library_defconfig diff --git a/src/arch/host/include/arch/atomic.h b/src/kernel/arch/host/include/arch/atomic.h similarity index 100% rename from src/arch/host/include/arch/atomic.h rename to src/kernel/arch/host/include/arch/atomic.h diff --git a/src/arch/host/include/arch/compiler_info.h b/src/kernel/arch/host/include/arch/compiler_info.h similarity index 100% rename from src/arch/host/include/arch/compiler_info.h rename to src/kernel/arch/host/include/arch/compiler_info.h diff --git a/src/arch/host/include/arch/debug/backtrace.h b/src/kernel/arch/host/include/arch/debug/backtrace.h similarity index 100% rename from src/arch/host/include/arch/debug/backtrace.h rename to src/kernel/arch/host/include/arch/debug/backtrace.h diff --git a/src/arch/host/include/arch/debug/panic.h b/src/kernel/arch/host/include/arch/debug/panic.h similarity index 100% rename from src/arch/host/include/arch/debug/panic.h rename to src/kernel/arch/host/include/arch/debug/panic.h diff --git a/src/arch/host/include/arch/drivers/idc.h b/src/kernel/arch/host/include/arch/drivers/idc.h similarity index 100% rename from src/arch/host/include/arch/drivers/idc.h rename to src/kernel/arch/host/include/arch/drivers/idc.h diff --git a/src/arch/host/include/arch/drivers/interrupt.h b/src/kernel/arch/host/include/arch/drivers/interrupt.h similarity index 100% rename from src/arch/host/include/arch/drivers/interrupt.h rename to src/kernel/arch/host/include/arch/drivers/interrupt.h diff --git a/src/arch/host/include/arch/drivers/timer.h b/src/kernel/arch/host/include/arch/drivers/timer.h similarity index 100% rename from src/arch/host/include/arch/drivers/timer.h rename to src/kernel/arch/host/include/arch/drivers/timer.h diff --git a/src/arch/host/include/arch/lib/cache.h b/src/kernel/arch/host/include/arch/lib/cache.h similarity index 100% rename from src/arch/host/include/arch/lib/cache.h rename to src/kernel/arch/host/include/arch/lib/cache.h diff --git a/src/arch/host/include/arch/lib/cpu.h b/src/kernel/arch/host/include/arch/lib/cpu.h similarity index 100% rename from src/arch/host/include/arch/lib/cpu.h rename to src/kernel/arch/host/include/arch/lib/cpu.h diff --git a/src/arch/host/include/arch/lib/wait.h b/src/kernel/arch/host/include/arch/lib/wait.h similarity index 100% rename from src/arch/host/include/arch/lib/wait.h rename to src/kernel/arch/host/include/arch/lib/wait.h diff --git a/src/arch/host/include/arch/schedule/task.h b/src/kernel/arch/host/include/arch/schedule/task.h similarity index 100% rename from src/arch/host/include/arch/schedule/task.h rename to src/kernel/arch/host/include/arch/schedule/task.h diff --git a/src/arch/host/include/arch/sof.h b/src/kernel/arch/host/include/arch/sof.h similarity index 100% rename from src/arch/host/include/arch/sof.h rename to src/kernel/arch/host/include/arch/sof.h diff --git a/src/arch/host/include/arch/string.h b/src/kernel/arch/host/include/arch/string.h similarity index 100% rename from src/arch/host/include/arch/string.h rename to src/kernel/arch/host/include/arch/string.h diff --git a/src/arch/host/lib/CMakeLists.txt b/src/kernel/arch/host/lib/CMakeLists.txt similarity index 100% rename from src/arch/host/lib/CMakeLists.txt rename to src/kernel/arch/host/lib/CMakeLists.txt diff --git a/src/arch/host/lib/ams.c b/src/kernel/arch/host/lib/ams.c similarity index 100% rename from src/arch/host/lib/ams.c rename to src/kernel/arch/host/lib/ams.c diff --git a/src/arch/host/lib/notifier.c b/src/kernel/arch/host/lib/notifier.c similarity index 100% rename from src/arch/host/lib/notifier.c rename to src/kernel/arch/host/lib/notifier.c diff --git a/src/arch/xtensa/Kconfig b/src/kernel/arch/xtensa/Kconfig similarity index 100% rename from src/arch/xtensa/Kconfig rename to src/kernel/arch/xtensa/Kconfig diff --git a/src/arch/xtensa/drivers/cache_attr.c b/src/kernel/arch/xtensa/drivers/cache_attr.c similarity index 100% rename from src/arch/xtensa/drivers/cache_attr.c rename to src/kernel/arch/xtensa/drivers/cache_attr.c diff --git a/src/arch/xtensa/include/arch/drivers/interrupt.h b/src/kernel/arch/xtensa/include/arch/drivers/interrupt.h similarity index 100% rename from src/arch/xtensa/include/arch/drivers/interrupt.h rename to src/kernel/arch/xtensa/include/arch/drivers/interrupt.h diff --git a/src/platform/mtk/tools/build.sh b/src/platform/mtk/tools/build.sh index 1b17c8e38cf8..8d7b30d855b3 100755 --- a/src/platform/mtk/tools/build.sh +++ b/src/platform/mtk/tools/build.sh @@ -16,7 +16,7 @@ for p in $PLATFORMS; do SRCS="$SOF/src/platform/$p/lib/dai.c $SOF/src/platform/$p/afe-platform.c" INCS="-I$SOF/src/include -I$SOF/src/platform/posix/include -I$SOF/posix/include" - INCS="$INCS -I$SOF/src/arch/host/include -I$SOF/src/platform/$p/include/platform" + INCS="$INCS -I$SOF/src/kernel/arch/host/include -I$SOF/src/platform/$p/include/platform" INCS="$INCS -I$SOF/src/platform/$p/include" DEFS="-DRELATIVE_FILE=\"mt-dai-gen.c\" -DCONFIG_CORE_COUNT=1 -DCONFIG_IPC_MAJOR_3=1" diff --git a/tools/testbench/CMakeLists.txt b/tools/testbench/CMakeLists.txt index d73d20ed2c5b..b07dc2be0e6a 100644 --- a/tools/testbench/CMakeLists.txt +++ b/tools/testbench/CMakeLists.txt @@ -9,7 +9,7 @@ include(CheckCCompilerFlag) set(default_asoc_h "/usr/include/alsa/sound/uapi/asoc.h") -file(READ "../../src/arch/host/configs/library_defconfig" library_defconfig) +file(READ "../../src/kernel/arch/host/configs/library_defconfig" library_defconfig) if(library_defconfig MATCHES "CONFIG_IPC_MAJOR_4=y") message("-- Selected IPC4 build for testbench") diff --git a/tools/testbench/README.md b/tools/testbench/README.md index 82e1630dc771..8fb56e906db4 100644 --- a/tools/testbench/README.md +++ b/tools/testbench/README.md @@ -253,10 +253,10 @@ The testbench build is by default IPC4. The IPC version can be changed by applyi patch: ``` -diff --git a/src/arch/host/configs/library_defconfig b/src/arch/host/configs/library_defconfig +diff --git a/src/kernel/arch/host/configs/library_defconfig b/src/kernel/arch/host/configs/library_defconfig index 1b9483ffe..5c944d292 100644 ---- a/src/arch/host/configs/library_defconfig -+++ b/src/arch/host/configs/library_defconfig +--- a/src/kernel/arch/host/configs/library_defconfig ++++ b/src/kernel/arch/host/configs/library_defconfig @@ -22,8 +22,8 @@ CONFIG_COMP_VOLUME=y CONFIG_COMP_VOLUME_LINEAR_RAMP=y CONFIG_COMP_VOLUME_WINDOWS_FADE=y diff --git a/tools/tplg_parser/CMakeLists.txt b/tools/tplg_parser/CMakeLists.txt index f7a447a6e6c2..716d921d45c6 100644 --- a/tools/tplg_parser/CMakeLists.txt +++ b/tools/tplg_parser/CMakeLists.txt @@ -42,7 +42,7 @@ sof_append_relative_path_definitions(sof_tplg_parser) target_include_directories(sof_tplg_parser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/audio) -target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/arch/host/include) +target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/kernel/arch/host/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/platform/library/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/posix/include) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 9101c662b382..0e2ac1f68f6e 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -170,7 +170,7 @@ set(RIMAGE_CONFIG_PATH ${RIMAGE_TOP}/config CACHE PATH # default SOF includes target_include_directories(SOF INTERFACE ${RIMAGE_TOP}/src/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include) -target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include) +target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/kernel/arch/${ARCH}/include) target_include_directories(SOF INTERFACE ${sof_top_dir}/third_party/include) target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include) @@ -577,7 +577,7 @@ endif() zephyr_library_sources( # SOF core infrastructure - runs on top of Zephyr - ${SOF_SRC_PATH}/arch/xtensa/drivers/cache_attr.c + ${SOF_SRC_PATH}/kernel/arch/xtensa/drivers/cache_attr.c # Bridge wrapper between SOF and Zephyr APIs - Will shrink over time. wrapper.c From abd587d133e42809ac394134b317711180e724ac Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 7 Nov 2026 15:06:01 +0000 Subject: [PATCH 2/3] platform: move src/platform to src/kernel/platform The platform code (memory maps, clocks, interrupts, platform init and the host library and posix platform layers) is kernel-only. Move it to src/kernel/platform. Point SOF_PLATFORM_PATH in zephyr/CMakeLists.txt to the new location; the two i.MX linker snippets now use it as well. The host builds now add it from src/kernel. Update the include directories of the cmocka and ztest unit tests, the testbench and tplg_parser, the platform header patterns in the include checker's manifest, CODEOWNERS, the MediaTek tools script and the docs. Its Kconfig is sourced from the same place in src/Kconfig as before, so the Kconfig definition order does not change. No functional change. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Liam Girdwood --- AGENTS.md | 2 +- CODEOWNERS | 6 +++--- scripts/kernel_user_partition.txt | 2 +- src/CMakeLists.txt | 1 - src/Kconfig | 2 +- src/audio/README.md | 2 +- src/include/sof/userspace/README.md | 2 +- src/ipc/README.md | 2 +- src/kernel/CMakeLists.txt | 1 + src/kernel/arch/host/CMakeLists.txt | 2 +- src/{ => kernel}/platform/CMakeLists.txt | 0 src/{ => kernel}/platform/Kconfig | 0 src/{ => kernel}/platform/README.md | 4 ++-- .../platform/ace30/include/platform/lib/clk.h | 0 .../platform/ace30/include/platform/lib/mailbox.h | 0 .../platform/ace30/include/platform/lib/memory.h | 0 .../platform/ace30/include/platform/platform.h | 0 .../platform/ace30/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/ace30/lib/clk.c | 0 src/{ => kernel}/platform/amd/acp_7_0/acp_7_0.x.in | 0 .../amd/acp_7_0/include/arch/xtensa/config/core-isa.h | 0 .../acp_7_0/include/arch/xtensa/config/core-matmap.h | 0 .../amd/acp_7_0/include/arch/xtensa/config/defs.h | 0 .../amd/acp_7_0/include/arch/xtensa/config/specreg.h | 0 .../amd/acp_7_0/include/arch/xtensa/config/system.h | 0 .../amd/acp_7_0/include/arch/xtensa/config/tie-asm.h | 0 .../amd/acp_7_0/include/arch/xtensa/config/tie.h | 0 .../platform/amd/acp_7_0/include/arch/xtensa/idma.h | 0 .../amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h | 0 .../include/arch/xtensa/tie/xt_externalregisters.h | 0 .../amd/acp_7_0/include/arch/xtensa/xtensa-types.h | 0 .../amd/acp_7_0/include/platform/drivers/interrupt.h | 0 .../amd/acp_7_0/include/platform/fw_scratch_mem.h | 0 .../platform/amd/acp_7_0/include/platform/lib/memory.h | 0 .../platform/amd/acp_7_0/include/platform/platform.h | 0 .../amd/acp_7_0/include/platform/platform_misc.h | 0 src/{ => kernel}/platform/amd/acp_7_0/lib/clk.c | 0 src/{ => kernel}/platform/amd/acp_7_0/platform.c | 0 .../amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h | 0 .../amd/acp_7_x/include/platform/fw_scratch_mem.h | 0 .../platform/amd/acp_7_x/include/platform/lib/memory.h | 0 .../platform/amd/acp_7_x/include/platform/platform.h | 0 .../amd/acp_7_x/include/platform/platform_misc.h | 0 src/{ => kernel}/platform/amd/acp_7_x/lib/clk.c | 0 src/{ => kernel}/platform/amd/acp_7_x/platform.c | 0 .../platform/amd/common/include/platform/acp_dma.h | 0 .../amd/common/include/platform/acp_dmic_dma.h | 0 .../platform/amd/common/include/platform/acp_sp_dma.h | 0 .../platform/amd/common/include/platform/drivers/idc.h | 0 .../platform/amd/common/include/platform/ipc.h | 0 .../platform/amd/common/include/platform/lib/clk.h | 0 .../platform/amd/common/include/platform/lib/cpu.h | 0 .../platform/amd/common/include/platform/lib/dai.h | 0 .../platform/amd/common/include/platform/lib/dma.h | 0 .../platform/amd/common/include/platform/lib/mailbox.h | 0 .../amd/common/include/platform/lib/pm_runtime.h | 0 .../platform/amd/common/include/platform/trace/trace.h | 0 .../rembrandt/include/arch/xtensa/config/core-isa.h | 0 .../rembrandt/include/arch/xtensa/config/core-matmap.h | 0 .../amd/rembrandt/include/arch/xtensa/config/defs.h | 0 .../amd/rembrandt/include/arch/xtensa/config/specreg.h | 0 .../amd/rembrandt/include/arch/xtensa/config/system.h | 0 .../amd/rembrandt/include/arch/xtensa/config/tie-asm.h | 0 .../amd/rembrandt/include/arch/xtensa/config/tie.h | 0 .../rembrandt/include/arch/xtensa/tie/xt_datacache.h | 0 .../amd/rembrandt/include/platform/chip_offset_byte.h | 0 .../amd/rembrandt/include/platform/chip_registers.h | 0 .../amd/rembrandt/include/platform/drivers/interrupt.h | 0 .../amd/rembrandt/include/platform/fw_scratch_mem.h | 0 .../amd/rembrandt/include/platform/lib/memory.h | 0 .../platform/amd/rembrandt/include/platform/platform.h | 0 src/{ => kernel}/platform/amd/rembrandt/lib/clk.c | 0 src/{ => kernel}/platform/amd/rembrandt/lib/dai.c | 0 src/{ => kernel}/platform/amd/rembrandt/lib/dma.c | 0 src/{ => kernel}/platform/amd/rembrandt/platform.c | 0 src/{ => kernel}/platform/amd/rembrandt/rembrandt.x.in | 0 src/{ => kernel}/platform/imx8/imx8.x.in | 0 .../imx8/include/arch/xtensa/config/core-isa.h | 0 .../imx8/include/arch/xtensa/config/core-matmap.h | 0 .../platform/imx8/include/arch/xtensa/config/defs.h | 0 .../platform/imx8/include/arch/xtensa/config/specreg.h | 0 .../platform/imx8/include/arch/xtensa/config/system.h | 0 .../platform/imx8/include/arch/xtensa/config/tie-asm.h | 0 .../platform/imx8/include/arch/xtensa/config/tie.h | 0 .../platform/imx8/include/platform/drivers/idc.h | 0 .../platform/imx8/include/platform/drivers/interrupt.h | 0 .../platform/imx8/include/platform/lib/clk.h | 0 .../platform/imx8/include/platform/lib/cpu.h | 0 .../platform/imx8/include/platform/lib/dai.h | 0 .../platform/imx8/include/platform/lib/dma.h | 0 .../platform/imx8/include/platform/lib/mailbox.h | 0 .../platform/imx8/include/platform/lib/memory.h | 0 .../platform/imx8/include/platform/platform.h | 0 .../platform/imx8/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx8/lib/clk.c | 0 src/{ => kernel}/platform/imx8/platform.c | 0 src/{ => kernel}/platform/imx8m/imx8m.x.in | 0 .../imx8m/include/arch/xtensa/config/core-isa.h | 0 .../imx8m/include/arch/xtensa/config/core-matmap.h | 0 .../platform/imx8m/include/arch/xtensa/config/defs.h | 0 .../imx8m/include/arch/xtensa/config/specreg.h | 0 .../platform/imx8m/include/arch/xtensa/config/system.h | 0 .../imx8m/include/arch/xtensa/config/tie-asm.h | 0 .../platform/imx8m/include/arch/xtensa/config/tie.h | 0 .../platform/imx8m/include/platform/drivers/idc.h | 0 .../imx8m/include/platform/drivers/interrupt.h | 0 .../platform/imx8m/include/platform/lib/clk.h | 0 .../platform/imx8m/include/platform/lib/cpu.h | 0 .../platform/imx8m/include/platform/lib/dai.h | 0 .../platform/imx8m/include/platform/lib/dma.h | 0 .../platform/imx8m/include/platform/lib/mailbox.h | 0 .../platform/imx8m/include/platform/lib/memory.h | 0 .../platform/imx8m/include/platform/lib/pm_runtime.h | 0 .../platform/imx8m/include/platform/platform.h | 0 .../platform/imx8m/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx8m/lib/clk.c | 0 src/{ => kernel}/platform/imx8m/platform.c | 0 .../platform/imx8m_cm7/include/platform/lib/clk.h | 0 .../platform/imx8m_cm7/include/platform/lib/dma.h | 0 .../platform/imx8m_cm7/include/platform/lib/mailbox.h | 0 .../platform/imx8m_cm7/include/platform/lib/memory.h | 0 .../platform/imx8m_cm7/include/platform/platform.h | 0 .../platform/imx8m_cm7/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx8m_cm7/lib/clk.c | 0 .../platform/imx8m_cm7/linker/data-sections.ld | 0 src/{ => kernel}/platform/imx8m_cm7/platform.c | 0 src/{ => kernel}/platform/imx8ulp/imx8ulp.x.in | 0 .../imx8ulp/include/arch/xtensa/config/core-isa.h | 0 .../imx8ulp/include/arch/xtensa/config/core-matmap.h | 0 .../platform/imx8ulp/include/arch/xtensa/config/defs.h | 0 .../imx8ulp/include/arch/xtensa/config/specreg.h | 0 .../imx8ulp/include/arch/xtensa/config/system.h | 0 .../imx8ulp/include/arch/xtensa/config/tie-asm.h | 0 .../platform/imx8ulp/include/arch/xtensa/config/tie.h | 0 .../platform/imx8ulp/include/platform/drivers/idc.h | 0 .../imx8ulp/include/platform/drivers/interrupt.h | 0 .../platform/imx8ulp/include/platform/lib/clk.h | 0 .../platform/imx8ulp/include/platform/lib/cpu.h | 0 .../platform/imx8ulp/include/platform/lib/dai.h | 0 .../platform/imx8ulp/include/platform/lib/dma.h | 0 .../platform/imx8ulp/include/platform/lib/mailbox.h | 0 .../platform/imx8ulp/include/platform/lib/memory.h | 0 .../platform/imx8ulp/include/platform/platform.h | 0 .../platform/imx8ulp/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx8ulp/lib/clk.c | 0 src/{ => kernel}/platform/imx8ulp/platform.c | 0 .../platform/imx93_a55/include/platform/drivers/idc.h | 0 .../platform/imx93_a55/include/platform/lib/clk.h | 0 .../platform/imx93_a55/include/platform/lib/dai.h | 0 .../platform/imx93_a55/include/platform/lib/dma.h | 0 .../platform/imx93_a55/include/platform/lib/mailbox.h | 0 .../platform/imx93_a55/include/platform/lib/memory.h | 0 .../platform/imx93_a55/include/platform/platform.h | 0 .../platform/imx93_a55/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx93_a55/lib/clk.c | 0 src/{ => kernel}/platform/imx93_a55/platform.c | 0 .../platform/imx95/include/platform/lib/clk.h | 0 .../platform/imx95/include/platform/lib/dma.h | 0 .../platform/imx95/include/platform/lib/mailbox.h | 0 .../platform/imx95/include/platform/lib/memory.h | 0 .../platform/imx95/include/platform/platform.h | 0 .../platform/imx95/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/imx95/lib/clk.c | 0 .../platform/imx95/linker/data-sections.ld | 0 src/{ => kernel}/platform/imx95/platform.c | 0 .../platform/intel/ace/include/ace/lib/clk.h | 0 .../platform/intel/ace/include/ace/lib/mailbox.h | 0 .../platform/intel/ace/include/ace/lib/memory.h | 0 .../platform/intel/ace/include/ace/version.h | 0 .../platform/intel/ace/include/auth/intel_auth_api.h | 0 .../intel/ace/include/auth/intel_status_logger_api.h | 0 .../intel/ace/include/auth/intel_status_logger_iface.h | 0 src/{ => kernel}/platform/intel/ace/lib/watchdog.c | 0 src/{ => kernel}/platform/intel/ace/platform.c | 0 .../platform/intel/cavs/include/cavs/drivers/mn.h | 0 .../intel/cavs/include/cavs/drivers/sideband-ipc.h | 0 .../intel/cavs/include/cavs/drivers/timestamp.h | 0 .../platform/intel/cavs/include/cavs/ext_manifest.h | 0 .../platform/intel/cavs/include/cavs/lib/mailbox.h | 0 .../platform/intel/cavs/include/cavs/lib/memory.h | 0 .../platform/intel/cavs/include/cavs/lib/power_down.h | 0 .../platform/intel/cavs/include/cavs/mem_window.h | 0 .../platform/intel/cavs/include/cavs/trace/trace.h | 0 .../platform/intel/cavs/include/cavs/version.h | 0 src/{ => kernel}/platform/intel/cavs/platform.c | 0 src/{ => kernel}/platform/library/CMakeLists.txt | 0 .../platform/library/include/platform/drivers/idc.h | 0 .../library/include/platform/drivers/interrupt.h | 0 .../platform/library/include/platform/drivers/pmc.h | 0 .../platform/library/include/platform/lib/clk.h | 0 .../platform/library/include/platform/lib/cpu.h | 0 .../platform/library/include/platform/lib/dai.h | 0 .../platform/library/include/platform/lib/dma.h | 0 .../library/include/platform/lib/ll_schedule.h | 0 .../platform/library/include/platform/lib/mailbox.h | 0 .../platform/library/include/platform/lib/memory.h | 0 .../platform/library/include/platform/lib/pm_runtime.h | 0 .../platform/library/include/platform/platform.h | 0 src/{ => kernel}/platform/library/init.c | 0 src/{ => kernel}/platform/library/lib/CMakeLists.txt | 0 src/{ => kernel}/platform/library/lib/alloc.c | 0 src/{ => kernel}/platform/library/lib/clk.c | 0 src/{ => kernel}/platform/library/lib/dai.c | 0 src/{ => kernel}/platform/library/lib/memory.c | 0 src/{ => kernel}/platform/library/lib/pm_runtime.c | 0 src/{ => kernel}/platform/library/lib/trace.c | 0 src/{ => kernel}/platform/library/panic.c | 0 src/{ => kernel}/platform/library/platform.c | 0 .../platform/library/schedule/CMakeLists.txt | 0 .../platform/library/schedule/edf_schedule.c | 0 .../platform/library/schedule/ll_schedule.c | 0 src/{ => kernel}/platform/library/schedule/schedule.c | 0 .../platform/lunarlake/include/platform/lib/clk.h | 0 .../platform/lunarlake/include/platform/lib/mailbox.h | 0 .../platform/lunarlake/include/platform/lib/memory.h | 0 .../platform/lunarlake/include/platform/platform.h | 0 .../platform/lunarlake/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/lunarlake/lib/clk.c | 0 .../platform/meteorlake/include/platform/lib/clk.h | 0 .../platform/meteorlake/include/platform/lib/mailbox.h | 0 .../platform/meteorlake/include/platform/lib/memory.h | 0 .../platform/meteorlake/include/platform/platform.h | 0 .../platform/meteorlake/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/meteorlake/lib/clk.c | 0 src/{ => kernel}/platform/mtk/dai.c | 0 .../platform/mtk/include/platform/lib/clk.h | 0 .../platform/mtk/include/platform/lib/cpu.h | 0 .../platform/mtk/include/platform/lib/dai.h | 0 .../platform/mtk/include/platform/lib/dma.h | 0 .../platform/mtk/include/platform/lib/mailbox.h | 0 .../platform/mtk/include/platform/lib/memory.h | 0 .../platform/mtk/include/platform/lib/pm_runtime.h | 0 .../platform/mtk/include/platform/platform.h | 0 .../platform/mtk/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/mtk/platform.c | 0 src/{ => kernel}/platform/mtk/tools/README.txt | 0 src/{ => kernel}/platform/mtk/tools/build.sh | 10 +++++----- src/{ => kernel}/platform/mtk/tools/mt-dai-gen.c | 0 .../platform/novalake/include/platform/lib/clk.h | 0 .../platform/novalake/include/platform/lib/mailbox.h | 0 .../platform/novalake/include/platform/lib/memory.h | 0 .../platform/novalake/include/platform/platform.h | 0 .../platform/novalake/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/novalake/lib/clk.c | 0 src/{ => kernel}/platform/posix/dai.c | 0 src/{ => kernel}/platform/posix/dma.c | 0 src/{ => kernel}/platform/posix/fuzz.c | 0 .../platform/posix/include/platform/drivers/idc.h | 0 .../posix/include/platform/drivers/interrupt.h | 0 .../platform/posix/include/platform/fuzz.h | 0 .../platform/posix/include/platform/lib/clk.h | 0 .../platform/posix/include/platform/lib/cpu.h | 0 .../platform/posix/include/platform/lib/dai.h | 0 .../platform/posix/include/platform/lib/dma.h | 0 .../platform/posix/include/platform/lib/mailbox.h | 0 .../platform/posix/include/platform/lib/memory.h | 0 .../platform/posix/include/platform/lib/pm_runtime.h | 0 .../platform/posix/include/platform/platform.h | 0 .../platform/posix/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/posix/ipc.c | 0 src/{ => kernel}/platform/posix/posix.c | 0 .../platform/qemu_xtensa/include/platform/lib/clk.h | 0 .../platform/qemu_xtensa/include/platform/lib/dai.h | 0 .../platform/qemu_xtensa/include/platform/lib/dma.h | 0 .../qemu_xtensa/include/platform/lib/mailbox.h | 0 .../platform/qemu_xtensa/include/platform/lib/memory.h | 0 .../platform/qemu_xtensa/include/platform/platform.h | 0 .../qemu_xtensa/include/platform/trace/trace.h | 0 src/{ => kernel}/platform/qemu_xtensa/platform.c | 0 .../platform/tigerlake/include/platform/lib/mailbox.h | 0 .../platform/tigerlake/include/platform/lib/memory.h | 0 .../platform/tigerlake/include/platform/platform.h | 0 .../platform/tigerlake/include/platform/trace/trace.h | 0 test/cmocka/CMakeLists.txt | 4 ++-- test/cmocka/src/lib/alloc/CMakeLists.txt | 4 ++-- test/cmocka/src/lib/fast-get/CMakeLists.txt | 2 +- test/ztest/unit/audio/crossover/CMakeLists.txt | 2 +- test/ztest/unit/audio/drc/CMakeLists.txt | 2 +- test/ztest/unit/dsrc/CMakeLists.txt | 2 +- test/ztest/unit/fast-get/CMakeLists.txt | 2 +- test/ztest/unit/math/advanced/functions/CMakeLists.txt | 2 +- test/ztest/unit/math/auditory/CMakeLists.txt | 2 +- test/ztest/unit/math/dct/CMakeLists.txt | 2 +- test/ztest/unit/math/fft/CMakeLists.txt | 2 +- test/ztest/unit/math/fft_multi/CMakeLists.txt | 2 +- test/ztest/unit/math/matrix/CMakeLists.txt | 2 +- test/ztest/unit/objpool/CMakeLists.txt | 2 +- tools/testbench/CMakeLists.txt | 2 +- tools/tplg_parser/CMakeLists.txt | 2 +- zephyr/CMakeLists.txt | 6 +++--- 290 files changed, 39 insertions(+), 39 deletions(-) rename src/{ => kernel}/platform/CMakeLists.txt (100%) rename src/{ => kernel}/platform/Kconfig (100%) rename src/{ => kernel}/platform/README.md (81%) rename src/{ => kernel}/platform/ace30/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/ace30/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/ace30/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/ace30/include/platform/platform.h (100%) rename src/{ => kernel}/platform/ace30/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/ace30/lib/clk.c (100%) rename src/{ => kernel}/platform/amd/acp_7_0/acp_7_0.x.in (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/core-isa.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/core-matmap.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/defs.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/specreg.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/system.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/tie-asm.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/config/tie.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/idma.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_externalregisters.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/arch/xtensa/xtensa-types.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/platform/fw_scratch_mem.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/platform/platform.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/include/platform/platform_misc.h (100%) rename src/{ => kernel}/platform/amd/acp_7_0/lib/clk.c (100%) rename src/{ => kernel}/platform/amd/acp_7_0/platform.c (100%) rename src/{ => kernel}/platform/amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h (100%) rename src/{ => kernel}/platform/amd/acp_7_x/include/platform/fw_scratch_mem.h (100%) rename src/{ => kernel}/platform/amd/acp_7_x/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/amd/acp_7_x/include/platform/platform.h (100%) rename src/{ => kernel}/platform/amd/acp_7_x/include/platform/platform_misc.h (100%) rename src/{ => kernel}/platform/amd/acp_7_x/lib/clk.c (100%) rename src/{ => kernel}/platform/amd/acp_7_x/platform.c (100%) rename src/{ => kernel}/platform/amd/common/include/platform/acp_dma.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/acp_dmic_dma.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/acp_sp_dma.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/ipc.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/lib/pm_runtime.h (100%) rename src/{ => kernel}/platform/amd/common/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/core-isa.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/core-matmap.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/defs.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/specreg.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/system.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/config/tie.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/arch/xtensa/tie/xt_datacache.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/chip_offset_byte.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/chip_registers.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/fw_scratch_mem.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/include/platform/platform.h (100%) rename src/{ => kernel}/platform/amd/rembrandt/lib/clk.c (100%) rename src/{ => kernel}/platform/amd/rembrandt/lib/dai.c (100%) rename src/{ => kernel}/platform/amd/rembrandt/lib/dma.c (100%) rename src/{ => kernel}/platform/amd/rembrandt/platform.c (100%) rename src/{ => kernel}/platform/amd/rembrandt/rembrandt.x.in (100%) rename src/{ => kernel}/platform/imx8/imx8.x.in (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/core-isa.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/core-matmap.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/defs.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/specreg.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/system.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/tie-asm.h (100%) rename src/{ => kernel}/platform/imx8/include/arch/xtensa/config/tie.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx8/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx8/lib/clk.c (100%) rename src/{ => kernel}/platform/imx8/platform.c (100%) rename src/{ => kernel}/platform/imx8m/imx8m.x.in (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/core-isa.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/core-matmap.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/defs.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/specreg.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/system.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/tie-asm.h (100%) rename src/{ => kernel}/platform/imx8m/include/arch/xtensa/config/tie.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/lib/pm_runtime.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx8m/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx8m/lib/clk.c (100%) rename src/{ => kernel}/platform/imx8m/platform.c (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx8m_cm7/lib/clk.c (100%) rename src/{ => kernel}/platform/imx8m_cm7/linker/data-sections.ld (100%) rename src/{ => kernel}/platform/imx8m_cm7/platform.c (100%) rename src/{ => kernel}/platform/imx8ulp/imx8ulp.x.in (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/core-isa.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/core-matmap.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/defs.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/specreg.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/system.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/tie-asm.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/arch/xtensa/config/tie.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx8ulp/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx8ulp/lib/clk.c (100%) rename src/{ => kernel}/platform/imx8ulp/platform.c (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx93_a55/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx93_a55/lib/clk.c (100%) rename src/{ => kernel}/platform/imx93_a55/platform.c (100%) rename src/{ => kernel}/platform/imx95/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/imx95/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/imx95/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/imx95/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/imx95/include/platform/platform.h (100%) rename src/{ => kernel}/platform/imx95/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/imx95/lib/clk.c (100%) rename src/{ => kernel}/platform/imx95/linker/data-sections.ld (100%) rename src/{ => kernel}/platform/imx95/platform.c (100%) rename src/{ => kernel}/platform/intel/ace/include/ace/lib/clk.h (100%) rename src/{ => kernel}/platform/intel/ace/include/ace/lib/mailbox.h (100%) rename src/{ => kernel}/platform/intel/ace/include/ace/lib/memory.h (100%) rename src/{ => kernel}/platform/intel/ace/include/ace/version.h (100%) rename src/{ => kernel}/platform/intel/ace/include/auth/intel_auth_api.h (100%) rename src/{ => kernel}/platform/intel/ace/include/auth/intel_status_logger_api.h (100%) rename src/{ => kernel}/platform/intel/ace/include/auth/intel_status_logger_iface.h (100%) rename src/{ => kernel}/platform/intel/ace/lib/watchdog.c (100%) rename src/{ => kernel}/platform/intel/ace/platform.c (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/drivers/mn.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/drivers/timestamp.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/ext_manifest.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/lib/mailbox.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/lib/memory.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/lib/power_down.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/mem_window.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/trace/trace.h (100%) rename src/{ => kernel}/platform/intel/cavs/include/cavs/version.h (100%) rename src/{ => kernel}/platform/intel/cavs/platform.c (100%) rename src/{ => kernel}/platform/library/CMakeLists.txt (100%) rename src/{ => kernel}/platform/library/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/library/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/library/include/platform/drivers/pmc.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/ll_schedule.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/library/include/platform/lib/pm_runtime.h (100%) rename src/{ => kernel}/platform/library/include/platform/platform.h (100%) rename src/{ => kernel}/platform/library/init.c (100%) rename src/{ => kernel}/platform/library/lib/CMakeLists.txt (100%) rename src/{ => kernel}/platform/library/lib/alloc.c (100%) rename src/{ => kernel}/platform/library/lib/clk.c (100%) rename src/{ => kernel}/platform/library/lib/dai.c (100%) rename src/{ => kernel}/platform/library/lib/memory.c (100%) rename src/{ => kernel}/platform/library/lib/pm_runtime.c (100%) rename src/{ => kernel}/platform/library/lib/trace.c (100%) rename src/{ => kernel}/platform/library/panic.c (100%) rename src/{ => kernel}/platform/library/platform.c (100%) rename src/{ => kernel}/platform/library/schedule/CMakeLists.txt (100%) rename src/{ => kernel}/platform/library/schedule/edf_schedule.c (100%) rename src/{ => kernel}/platform/library/schedule/ll_schedule.c (100%) rename src/{ => kernel}/platform/library/schedule/schedule.c (100%) rename src/{ => kernel}/platform/lunarlake/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/lunarlake/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/lunarlake/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/lunarlake/include/platform/platform.h (100%) rename src/{ => kernel}/platform/lunarlake/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/lunarlake/lib/clk.c (100%) rename src/{ => kernel}/platform/meteorlake/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/meteorlake/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/meteorlake/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/meteorlake/include/platform/platform.h (100%) rename src/{ => kernel}/platform/meteorlake/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/meteorlake/lib/clk.c (100%) rename src/{ => kernel}/platform/mtk/dai.c (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/lib/pm_runtime.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/platform.h (100%) rename src/{ => kernel}/platform/mtk/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/mtk/platform.c (100%) rename src/{ => kernel}/platform/mtk/tools/README.txt (100%) rename src/{ => kernel}/platform/mtk/tools/build.sh (58%) rename src/{ => kernel}/platform/mtk/tools/mt-dai-gen.c (100%) rename src/{ => kernel}/platform/novalake/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/novalake/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/novalake/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/novalake/include/platform/platform.h (100%) rename src/{ => kernel}/platform/novalake/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/novalake/lib/clk.c (100%) rename src/{ => kernel}/platform/posix/dai.c (100%) rename src/{ => kernel}/platform/posix/dma.c (100%) rename src/{ => kernel}/platform/posix/fuzz.c (100%) rename src/{ => kernel}/platform/posix/include/platform/drivers/idc.h (100%) rename src/{ => kernel}/platform/posix/include/platform/drivers/interrupt.h (100%) rename src/{ => kernel}/platform/posix/include/platform/fuzz.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/cpu.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/posix/include/platform/lib/pm_runtime.h (100%) rename src/{ => kernel}/platform/posix/include/platform/platform.h (100%) rename src/{ => kernel}/platform/posix/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/posix/ipc.c (100%) rename src/{ => kernel}/platform/posix/posix.c (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/lib/clk.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/lib/dai.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/lib/dma.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/platform.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/include/platform/trace/trace.h (100%) rename src/{ => kernel}/platform/qemu_xtensa/platform.c (100%) rename src/{ => kernel}/platform/tigerlake/include/platform/lib/mailbox.h (100%) rename src/{ => kernel}/platform/tigerlake/include/platform/lib/memory.h (100%) rename src/{ => kernel}/platform/tigerlake/include/platform/platform.h (100%) rename src/{ => kernel}/platform/tigerlake/include/platform/trace/trace.h (100%) diff --git a/AGENTS.md b/AGENTS.md index 2a807612c145..2c303eff1ec0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -31,7 +31,7 @@ moving code, follow it: * **Place code in the right tier.** OS/HAL/boot/inter-core → a kernel-only directory (`kernel/`, which is built into the `sof_kernel` library, and the directories not yet - moved there: `platform/`, `trace/`); audio + moved there: `trace/`); audio application logic → `audio/`; reusable pure code → a shared-library directory (`lib/`, `math/`, `module/`) kept free of privileged operations. Each top-level directory's `README.md` states its tier in a "Runs in:" banner — keep it accurate. diff --git a/CODEOWNERS b/CODEOWNERS index 543435d5f3c3..e06147afb8cb 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -47,9 +47,9 @@ src/audio/module_adapter/* @ranj063 @jxstelter src/audio/google/* @thesofproject/google # platforms -src/platform/imx8/** @dbaluta -src/platform/amd/** @bhiregoudar @sunilkumardommati -src/platform/mtk/** @yaochunhung @kuanhsuncheng +src/kernel/platform/imx8/** @dbaluta +src/kernel/platform/amd/** @bhiregoudar @sunilkumardommati +src/kernel/platform/mtk/** @yaochunhung @kuanhsuncheng # drivers src/drivers/intel/dmic.c @singalsu diff --git a/scripts/kernel_user_partition.txt b/scripts/kernel_user_partition.txt index b5d6cda1c33f..83bb935b082e 100644 --- a/scripts/kernel_user_partition.txt +++ b/scripts/kernel_user_partition.txt @@ -46,7 +46,7 @@ src/include/sof/lib/cpu-clk-manager.h src/include/sof/lib/mailbox.h src/include/sof/lib/perf_cnt.h src/include/sof/lib/watchdog.h -src/platform/* +src/kernel/platform/* zephyr/include/rtos/clk.h zephyr/include/rtos/idc.h zephyr/include/rtos/interrupt.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d364361e9a0e..f68fff8f434e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -add_subdirectory(platform) add_subdirectory(ipc) add_subdirectory(audio) add_subdirectory(lib) diff --git a/src/Kconfig b/src/Kconfig index d72155332d4a..92486532f4dd 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -2,7 +2,7 @@ rsource "kernel/arch/Kconfig" -rsource "platform/Kconfig" +rsource "kernel/platform/Kconfig" rsource "audio/Kconfig" diff --git a/src/audio/README.md b/src/audio/README.md index 73a48ec7520e..39cc910c4dfa 100644 --- a/src/audio/README.md +++ b/src/audio/README.md @@ -15,5 +15,5 @@ modules in user context. When adding a component here, keep it inside the application tier: allocate through the module allocation syscalls (`mod_*`), mark any globals shared with the kernel using the partition -markers, and never call kernel-only subsystems (`kernel/drivers/`, `platform/`, `kernel/idc/`) +markers, and never call kernel-only subsystems (`kernel/drivers/`, `kernel/platform/`, `kernel/idc/`) directly. diff --git a/src/include/sof/userspace/README.md b/src/include/sof/userspace/README.md index ed80b5a88aba..409ff9195546 100644 --- a/src/include/sof/userspace/README.md +++ b/src/include/sof/userspace/README.md @@ -74,7 +74,7 @@ its subdirectories span all tiers. | Tier | Meaning | Directories | |------|---------|-------------| -| **Kernel-only** | OS integration, HAL, boot, inter-core. Never executes in a user thread. Must not be reached directly from user code — only via a syscall. | `kernel/` (see [its README](../../../kernel/README.md)), `platform/`, `trace/` * | +| **Kernel-only** | OS integration, HAL, boot, inter-core. Never executes in a user thread. Must not be reached directly from user code — only via a syscall. | `kernel/` (see [its README](../../../kernel/README.md)), `trace/` * | | **Boundary / bridge** | Owns the syscalls and the thread / memory-domain setup. Split internally: some translation units run kernel-side, some user-side (e.g. `handler-kernel.c` vs `handler-user.c`). | `schedule/`, `ipc/`, `debug/debug_stream/` *, and (in the Zephyr integration tree) `zephyr/syscall/` | | **Application** | Audio pipeline / component logic that runs in user threads under userspace configs. | `audio/` | | **Shared library** | Context-agnostic code linked into whichever context calls it. Must stay "user-safe": no privileged operations (no direct MMIO, no spinlocks held across syscalls, no raw kernel object access) so it is safe when pulled into a user build. | `math/`, `module/` | diff --git a/src/ipc/README.md b/src/ipc/README.md index 844c13a84f1b..c240cc54a50e 100644 --- a/src/ipc/README.md +++ b/src/ipc/README.md @@ -45,7 +45,7 @@ graph TD ## Processing Flow -When the host writes a command to the IPC mailbox and triggers an interrupt, the hardware-specific driver (`src/platform/...`) catches the IRQ and eventually calls down into the IPC framework. +When the host writes a command to the IPC mailbox and triggers an interrupt, the hardware-specific driver (`src/kernel/platform/...`) catches the IRQ and eventually calls down into the IPC framework. Different RTOS environments (Zephyr vs. bare metal SOF native) handle the thread handoff differently. In Zephyr, this leverages the `k_work` queues heavily for `ipc_work_handler`. diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 8e9afe9e6293..633434c4a1fe 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -24,6 +24,7 @@ if(zephyr) else() # Only built for the host add_subdirectory(arch) + add_subdirectory(platform) endif() # Built for Zephyr and for the host diff --git a/src/kernel/arch/host/CMakeLists.txt b/src/kernel/arch/host/CMakeLists.txt index bef4fdf9ec83..bc700f509094 100644 --- a/src/kernel/arch/host/CMakeLists.txt +++ b/src/kernel/arch/host/CMakeLists.txt @@ -2,7 +2,7 @@ # includes target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/arch/host/include) -target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/library/include) +target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/platform/library/include) include(CheckCCompilerFlag) if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) diff --git a/src/platform/CMakeLists.txt b/src/kernel/platform/CMakeLists.txt similarity index 100% rename from src/platform/CMakeLists.txt rename to src/kernel/platform/CMakeLists.txt diff --git a/src/platform/Kconfig b/src/kernel/platform/Kconfig similarity index 100% rename from src/platform/Kconfig rename to src/kernel/platform/Kconfig diff --git a/src/platform/README.md b/src/kernel/platform/README.md similarity index 81% rename from src/platform/README.md rename to src/kernel/platform/README.md index da20eb6569d2..b3aa7014290a 100644 --- a/src/platform/README.md +++ b/src/kernel/platform/README.md @@ -1,8 +1,8 @@ -# Platform Support (`src/platform`) +# Platform Support (`src/kernel/platform`) > **Runs in:** Kernel-only — platform bring-up, memory maps, interrupt wiring and IPC mailbox > windows are supervisor-context concerns and never run in a user thread. See -> [User/kernel split](../include/sof/userspace/README.md). +> [User/kernel split](../../include/sof/userspace/README.md). This directory contains SoC/platform-specific integration (e.g. Intel ACE, MediaTek, i.MX), including the Kconfig that selects the build target such as `PANTHERLAKE` (PTL). It configures diff --git a/src/platform/ace30/include/platform/lib/clk.h b/src/kernel/platform/ace30/include/platform/lib/clk.h similarity index 100% rename from src/platform/ace30/include/platform/lib/clk.h rename to src/kernel/platform/ace30/include/platform/lib/clk.h diff --git a/src/platform/ace30/include/platform/lib/mailbox.h b/src/kernel/platform/ace30/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/ace30/include/platform/lib/mailbox.h rename to src/kernel/platform/ace30/include/platform/lib/mailbox.h diff --git a/src/platform/ace30/include/platform/lib/memory.h b/src/kernel/platform/ace30/include/platform/lib/memory.h similarity index 100% rename from src/platform/ace30/include/platform/lib/memory.h rename to src/kernel/platform/ace30/include/platform/lib/memory.h diff --git a/src/platform/ace30/include/platform/platform.h b/src/kernel/platform/ace30/include/platform/platform.h similarity index 100% rename from src/platform/ace30/include/platform/platform.h rename to src/kernel/platform/ace30/include/platform/platform.h diff --git a/src/platform/ace30/include/platform/trace/trace.h b/src/kernel/platform/ace30/include/platform/trace/trace.h similarity index 100% rename from src/platform/ace30/include/platform/trace/trace.h rename to src/kernel/platform/ace30/include/platform/trace/trace.h diff --git a/src/platform/ace30/lib/clk.c b/src/kernel/platform/ace30/lib/clk.c similarity index 100% rename from src/platform/ace30/lib/clk.c rename to src/kernel/platform/ace30/lib/clk.c diff --git a/src/platform/amd/acp_7_0/acp_7_0.x.in b/src/kernel/platform/amd/acp_7_0/acp_7_0.x.in similarity index 100% rename from src/platform/amd/acp_7_0/acp_7_0.x.in rename to src/kernel/platform/amd/acp_7_0/acp_7_0.x.in diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/core-isa.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/core-isa.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/core-isa.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/core-isa.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/core-matmap.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/core-matmap.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/core-matmap.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/core-matmap.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/defs.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/defs.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/defs.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/defs.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/specreg.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/specreg.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/specreg.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/specreg.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/system.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/system.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/system.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/system.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/tie-asm.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/tie-asm.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/tie-asm.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/tie-asm.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/config/tie.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/tie.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/config/tie.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/config/tie.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/idma.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/idma.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/idma.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/idma.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_datacache.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_externalregisters.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_externalregisters.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_externalregisters.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/tie/xt_externalregisters.h diff --git a/src/platform/amd/acp_7_0/include/arch/xtensa/xtensa-types.h b/src/kernel/platform/amd/acp_7_0/include/arch/xtensa/xtensa-types.h similarity index 100% rename from src/platform/amd/acp_7_0/include/arch/xtensa/xtensa-types.h rename to src/kernel/platform/amd/acp_7_0/include/arch/xtensa/xtensa-types.h diff --git a/src/platform/amd/acp_7_0/include/platform/drivers/interrupt.h b/src/kernel/platform/amd/acp_7_0/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/amd/acp_7_0/include/platform/drivers/interrupt.h rename to src/kernel/platform/amd/acp_7_0/include/platform/drivers/interrupt.h diff --git a/src/platform/amd/acp_7_0/include/platform/fw_scratch_mem.h b/src/kernel/platform/amd/acp_7_0/include/platform/fw_scratch_mem.h similarity index 100% rename from src/platform/amd/acp_7_0/include/platform/fw_scratch_mem.h rename to src/kernel/platform/amd/acp_7_0/include/platform/fw_scratch_mem.h diff --git a/src/platform/amd/acp_7_0/include/platform/lib/memory.h b/src/kernel/platform/amd/acp_7_0/include/platform/lib/memory.h similarity index 100% rename from src/platform/amd/acp_7_0/include/platform/lib/memory.h rename to src/kernel/platform/amd/acp_7_0/include/platform/lib/memory.h diff --git a/src/platform/amd/acp_7_0/include/platform/platform.h b/src/kernel/platform/amd/acp_7_0/include/platform/platform.h similarity index 100% rename from src/platform/amd/acp_7_0/include/platform/platform.h rename to src/kernel/platform/amd/acp_7_0/include/platform/platform.h diff --git a/src/platform/amd/acp_7_0/include/platform/platform_misc.h b/src/kernel/platform/amd/acp_7_0/include/platform/platform_misc.h similarity index 100% rename from src/platform/amd/acp_7_0/include/platform/platform_misc.h rename to src/kernel/platform/amd/acp_7_0/include/platform/platform_misc.h diff --git a/src/platform/amd/acp_7_0/lib/clk.c b/src/kernel/platform/amd/acp_7_0/lib/clk.c similarity index 100% rename from src/platform/amd/acp_7_0/lib/clk.c rename to src/kernel/platform/amd/acp_7_0/lib/clk.c diff --git a/src/platform/amd/acp_7_0/platform.c b/src/kernel/platform/amd/acp_7_0/platform.c similarity index 100% rename from src/platform/amd/acp_7_0/platform.c rename to src/kernel/platform/amd/acp_7_0/platform.c diff --git a/src/platform/amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h b/src/kernel/platform/amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h similarity index 100% rename from src/platform/amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h rename to src/kernel/platform/amd/acp_7_x/include/arch/xtensa/tie/xt_datacache.h diff --git a/src/platform/amd/acp_7_x/include/platform/fw_scratch_mem.h b/src/kernel/platform/amd/acp_7_x/include/platform/fw_scratch_mem.h similarity index 100% rename from src/platform/amd/acp_7_x/include/platform/fw_scratch_mem.h rename to src/kernel/platform/amd/acp_7_x/include/platform/fw_scratch_mem.h diff --git a/src/platform/amd/acp_7_x/include/platform/lib/memory.h b/src/kernel/platform/amd/acp_7_x/include/platform/lib/memory.h similarity index 100% rename from src/platform/amd/acp_7_x/include/platform/lib/memory.h rename to src/kernel/platform/amd/acp_7_x/include/platform/lib/memory.h diff --git a/src/platform/amd/acp_7_x/include/platform/platform.h b/src/kernel/platform/amd/acp_7_x/include/platform/platform.h similarity index 100% rename from src/platform/amd/acp_7_x/include/platform/platform.h rename to src/kernel/platform/amd/acp_7_x/include/platform/platform.h diff --git a/src/platform/amd/acp_7_x/include/platform/platform_misc.h b/src/kernel/platform/amd/acp_7_x/include/platform/platform_misc.h similarity index 100% rename from src/platform/amd/acp_7_x/include/platform/platform_misc.h rename to src/kernel/platform/amd/acp_7_x/include/platform/platform_misc.h diff --git a/src/platform/amd/acp_7_x/lib/clk.c b/src/kernel/platform/amd/acp_7_x/lib/clk.c similarity index 100% rename from src/platform/amd/acp_7_x/lib/clk.c rename to src/kernel/platform/amd/acp_7_x/lib/clk.c diff --git a/src/platform/amd/acp_7_x/platform.c b/src/kernel/platform/amd/acp_7_x/platform.c similarity index 100% rename from src/platform/amd/acp_7_x/platform.c rename to src/kernel/platform/amd/acp_7_x/platform.c diff --git a/src/platform/amd/common/include/platform/acp_dma.h b/src/kernel/platform/amd/common/include/platform/acp_dma.h similarity index 100% rename from src/platform/amd/common/include/platform/acp_dma.h rename to src/kernel/platform/amd/common/include/platform/acp_dma.h diff --git a/src/platform/amd/common/include/platform/acp_dmic_dma.h b/src/kernel/platform/amd/common/include/platform/acp_dmic_dma.h similarity index 100% rename from src/platform/amd/common/include/platform/acp_dmic_dma.h rename to src/kernel/platform/amd/common/include/platform/acp_dmic_dma.h diff --git a/src/platform/amd/common/include/platform/acp_sp_dma.h b/src/kernel/platform/amd/common/include/platform/acp_sp_dma.h similarity index 100% rename from src/platform/amd/common/include/platform/acp_sp_dma.h rename to src/kernel/platform/amd/common/include/platform/acp_sp_dma.h diff --git a/src/platform/amd/common/include/platform/drivers/idc.h b/src/kernel/platform/amd/common/include/platform/drivers/idc.h similarity index 100% rename from src/platform/amd/common/include/platform/drivers/idc.h rename to src/kernel/platform/amd/common/include/platform/drivers/idc.h diff --git a/src/platform/amd/common/include/platform/ipc.h b/src/kernel/platform/amd/common/include/platform/ipc.h similarity index 100% rename from src/platform/amd/common/include/platform/ipc.h rename to src/kernel/platform/amd/common/include/platform/ipc.h diff --git a/src/platform/amd/common/include/platform/lib/clk.h b/src/kernel/platform/amd/common/include/platform/lib/clk.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/clk.h rename to src/kernel/platform/amd/common/include/platform/lib/clk.h diff --git a/src/platform/amd/common/include/platform/lib/cpu.h b/src/kernel/platform/amd/common/include/platform/lib/cpu.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/cpu.h rename to src/kernel/platform/amd/common/include/platform/lib/cpu.h diff --git a/src/platform/amd/common/include/platform/lib/dai.h b/src/kernel/platform/amd/common/include/platform/lib/dai.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/dai.h rename to src/kernel/platform/amd/common/include/platform/lib/dai.h diff --git a/src/platform/amd/common/include/platform/lib/dma.h b/src/kernel/platform/amd/common/include/platform/lib/dma.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/dma.h rename to src/kernel/platform/amd/common/include/platform/lib/dma.h diff --git a/src/platform/amd/common/include/platform/lib/mailbox.h b/src/kernel/platform/amd/common/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/mailbox.h rename to src/kernel/platform/amd/common/include/platform/lib/mailbox.h diff --git a/src/platform/amd/common/include/platform/lib/pm_runtime.h b/src/kernel/platform/amd/common/include/platform/lib/pm_runtime.h similarity index 100% rename from src/platform/amd/common/include/platform/lib/pm_runtime.h rename to src/kernel/platform/amd/common/include/platform/lib/pm_runtime.h diff --git a/src/platform/amd/common/include/platform/trace/trace.h b/src/kernel/platform/amd/common/include/platform/trace/trace.h similarity index 100% rename from src/platform/amd/common/include/platform/trace/trace.h rename to src/kernel/platform/amd/common/include/platform/trace/trace.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/core-isa.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/core-isa.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/core-isa.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/core-isa.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/core-matmap.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/core-matmap.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/core-matmap.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/core-matmap.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/defs.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/defs.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/defs.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/defs.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/specreg.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/specreg.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/specreg.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/specreg.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/system.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/system.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/system.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/system.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/config/tie.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/tie.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/config/tie.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/config/tie.h diff --git a/src/platform/amd/rembrandt/include/arch/xtensa/tie/xt_datacache.h b/src/kernel/platform/amd/rembrandt/include/arch/xtensa/tie/xt_datacache.h similarity index 100% rename from src/platform/amd/rembrandt/include/arch/xtensa/tie/xt_datacache.h rename to src/kernel/platform/amd/rembrandt/include/arch/xtensa/tie/xt_datacache.h diff --git a/src/platform/amd/rembrandt/include/platform/chip_offset_byte.h b/src/kernel/platform/amd/rembrandt/include/platform/chip_offset_byte.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/chip_offset_byte.h rename to src/kernel/platform/amd/rembrandt/include/platform/chip_offset_byte.h diff --git a/src/platform/amd/rembrandt/include/platform/chip_registers.h b/src/kernel/platform/amd/rembrandt/include/platform/chip_registers.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/chip_registers.h rename to src/kernel/platform/amd/rembrandt/include/platform/chip_registers.h diff --git a/src/platform/amd/rembrandt/include/platform/drivers/interrupt.h b/src/kernel/platform/amd/rembrandt/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/drivers/interrupt.h rename to src/kernel/platform/amd/rembrandt/include/platform/drivers/interrupt.h diff --git a/src/platform/amd/rembrandt/include/platform/fw_scratch_mem.h b/src/kernel/platform/amd/rembrandt/include/platform/fw_scratch_mem.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/fw_scratch_mem.h rename to src/kernel/platform/amd/rembrandt/include/platform/fw_scratch_mem.h diff --git a/src/platform/amd/rembrandt/include/platform/lib/memory.h b/src/kernel/platform/amd/rembrandt/include/platform/lib/memory.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/lib/memory.h rename to src/kernel/platform/amd/rembrandt/include/platform/lib/memory.h diff --git a/src/platform/amd/rembrandt/include/platform/platform.h b/src/kernel/platform/amd/rembrandt/include/platform/platform.h similarity index 100% rename from src/platform/amd/rembrandt/include/platform/platform.h rename to src/kernel/platform/amd/rembrandt/include/platform/platform.h diff --git a/src/platform/amd/rembrandt/lib/clk.c b/src/kernel/platform/amd/rembrandt/lib/clk.c similarity index 100% rename from src/platform/amd/rembrandt/lib/clk.c rename to src/kernel/platform/amd/rembrandt/lib/clk.c diff --git a/src/platform/amd/rembrandt/lib/dai.c b/src/kernel/platform/amd/rembrandt/lib/dai.c similarity index 100% rename from src/platform/amd/rembrandt/lib/dai.c rename to src/kernel/platform/amd/rembrandt/lib/dai.c diff --git a/src/platform/amd/rembrandt/lib/dma.c b/src/kernel/platform/amd/rembrandt/lib/dma.c similarity index 100% rename from src/platform/amd/rembrandt/lib/dma.c rename to src/kernel/platform/amd/rembrandt/lib/dma.c diff --git a/src/platform/amd/rembrandt/platform.c b/src/kernel/platform/amd/rembrandt/platform.c similarity index 100% rename from src/platform/amd/rembrandt/platform.c rename to src/kernel/platform/amd/rembrandt/platform.c diff --git a/src/platform/amd/rembrandt/rembrandt.x.in b/src/kernel/platform/amd/rembrandt/rembrandt.x.in similarity index 100% rename from src/platform/amd/rembrandt/rembrandt.x.in rename to src/kernel/platform/amd/rembrandt/rembrandt.x.in diff --git a/src/platform/imx8/imx8.x.in b/src/kernel/platform/imx8/imx8.x.in similarity index 100% rename from src/platform/imx8/imx8.x.in rename to src/kernel/platform/imx8/imx8.x.in diff --git a/src/platform/imx8/include/arch/xtensa/config/core-isa.h b/src/kernel/platform/imx8/include/arch/xtensa/config/core-isa.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/core-isa.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/core-isa.h diff --git a/src/platform/imx8/include/arch/xtensa/config/core-matmap.h b/src/kernel/platform/imx8/include/arch/xtensa/config/core-matmap.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/core-matmap.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/core-matmap.h diff --git a/src/platform/imx8/include/arch/xtensa/config/defs.h b/src/kernel/platform/imx8/include/arch/xtensa/config/defs.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/defs.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/defs.h diff --git a/src/platform/imx8/include/arch/xtensa/config/specreg.h b/src/kernel/platform/imx8/include/arch/xtensa/config/specreg.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/specreg.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/specreg.h diff --git a/src/platform/imx8/include/arch/xtensa/config/system.h b/src/kernel/platform/imx8/include/arch/xtensa/config/system.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/system.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/system.h diff --git a/src/platform/imx8/include/arch/xtensa/config/tie-asm.h b/src/kernel/platform/imx8/include/arch/xtensa/config/tie-asm.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/tie-asm.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/tie-asm.h diff --git a/src/platform/imx8/include/arch/xtensa/config/tie.h b/src/kernel/platform/imx8/include/arch/xtensa/config/tie.h similarity index 100% rename from src/platform/imx8/include/arch/xtensa/config/tie.h rename to src/kernel/platform/imx8/include/arch/xtensa/config/tie.h diff --git a/src/platform/imx8/include/platform/drivers/idc.h b/src/kernel/platform/imx8/include/platform/drivers/idc.h similarity index 100% rename from src/platform/imx8/include/platform/drivers/idc.h rename to src/kernel/platform/imx8/include/platform/drivers/idc.h diff --git a/src/platform/imx8/include/platform/drivers/interrupt.h b/src/kernel/platform/imx8/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/imx8/include/platform/drivers/interrupt.h rename to src/kernel/platform/imx8/include/platform/drivers/interrupt.h diff --git a/src/platform/imx8/include/platform/lib/clk.h b/src/kernel/platform/imx8/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx8/include/platform/lib/clk.h rename to src/kernel/platform/imx8/include/platform/lib/clk.h diff --git a/src/platform/imx8/include/platform/lib/cpu.h b/src/kernel/platform/imx8/include/platform/lib/cpu.h similarity index 100% rename from src/platform/imx8/include/platform/lib/cpu.h rename to src/kernel/platform/imx8/include/platform/lib/cpu.h diff --git a/src/platform/imx8/include/platform/lib/dai.h b/src/kernel/platform/imx8/include/platform/lib/dai.h similarity index 100% rename from src/platform/imx8/include/platform/lib/dai.h rename to src/kernel/platform/imx8/include/platform/lib/dai.h diff --git a/src/platform/imx8/include/platform/lib/dma.h b/src/kernel/platform/imx8/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx8/include/platform/lib/dma.h rename to src/kernel/platform/imx8/include/platform/lib/dma.h diff --git a/src/platform/imx8/include/platform/lib/mailbox.h b/src/kernel/platform/imx8/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx8/include/platform/lib/mailbox.h rename to src/kernel/platform/imx8/include/platform/lib/mailbox.h diff --git a/src/platform/imx8/include/platform/lib/memory.h b/src/kernel/platform/imx8/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx8/include/platform/lib/memory.h rename to src/kernel/platform/imx8/include/platform/lib/memory.h diff --git a/src/platform/imx8/include/platform/platform.h b/src/kernel/platform/imx8/include/platform/platform.h similarity index 100% rename from src/platform/imx8/include/platform/platform.h rename to src/kernel/platform/imx8/include/platform/platform.h diff --git a/src/platform/imx8/include/platform/trace/trace.h b/src/kernel/platform/imx8/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx8/include/platform/trace/trace.h rename to src/kernel/platform/imx8/include/platform/trace/trace.h diff --git a/src/platform/imx8/lib/clk.c b/src/kernel/platform/imx8/lib/clk.c similarity index 100% rename from src/platform/imx8/lib/clk.c rename to src/kernel/platform/imx8/lib/clk.c diff --git a/src/platform/imx8/platform.c b/src/kernel/platform/imx8/platform.c similarity index 100% rename from src/platform/imx8/platform.c rename to src/kernel/platform/imx8/platform.c diff --git a/src/platform/imx8m/imx8m.x.in b/src/kernel/platform/imx8m/imx8m.x.in similarity index 100% rename from src/platform/imx8m/imx8m.x.in rename to src/kernel/platform/imx8m/imx8m.x.in diff --git a/src/platform/imx8m/include/arch/xtensa/config/core-isa.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/core-isa.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/core-isa.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/core-isa.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/core-matmap.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/core-matmap.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/core-matmap.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/core-matmap.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/defs.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/defs.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/defs.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/defs.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/specreg.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/specreg.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/specreg.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/specreg.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/system.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/system.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/system.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/system.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/tie-asm.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/tie-asm.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/tie-asm.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/tie-asm.h diff --git a/src/platform/imx8m/include/arch/xtensa/config/tie.h b/src/kernel/platform/imx8m/include/arch/xtensa/config/tie.h similarity index 100% rename from src/platform/imx8m/include/arch/xtensa/config/tie.h rename to src/kernel/platform/imx8m/include/arch/xtensa/config/tie.h diff --git a/src/platform/imx8m/include/platform/drivers/idc.h b/src/kernel/platform/imx8m/include/platform/drivers/idc.h similarity index 100% rename from src/platform/imx8m/include/platform/drivers/idc.h rename to src/kernel/platform/imx8m/include/platform/drivers/idc.h diff --git a/src/platform/imx8m/include/platform/drivers/interrupt.h b/src/kernel/platform/imx8m/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/imx8m/include/platform/drivers/interrupt.h rename to src/kernel/platform/imx8m/include/platform/drivers/interrupt.h diff --git a/src/platform/imx8m/include/platform/lib/clk.h b/src/kernel/platform/imx8m/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/clk.h rename to src/kernel/platform/imx8m/include/platform/lib/clk.h diff --git a/src/platform/imx8m/include/platform/lib/cpu.h b/src/kernel/platform/imx8m/include/platform/lib/cpu.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/cpu.h rename to src/kernel/platform/imx8m/include/platform/lib/cpu.h diff --git a/src/platform/imx8m/include/platform/lib/dai.h b/src/kernel/platform/imx8m/include/platform/lib/dai.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/dai.h rename to src/kernel/platform/imx8m/include/platform/lib/dai.h diff --git a/src/platform/imx8m/include/platform/lib/dma.h b/src/kernel/platform/imx8m/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/dma.h rename to src/kernel/platform/imx8m/include/platform/lib/dma.h diff --git a/src/platform/imx8m/include/platform/lib/mailbox.h b/src/kernel/platform/imx8m/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/mailbox.h rename to src/kernel/platform/imx8m/include/platform/lib/mailbox.h diff --git a/src/platform/imx8m/include/platform/lib/memory.h b/src/kernel/platform/imx8m/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/memory.h rename to src/kernel/platform/imx8m/include/platform/lib/memory.h diff --git a/src/platform/imx8m/include/platform/lib/pm_runtime.h b/src/kernel/platform/imx8m/include/platform/lib/pm_runtime.h similarity index 100% rename from src/platform/imx8m/include/platform/lib/pm_runtime.h rename to src/kernel/platform/imx8m/include/platform/lib/pm_runtime.h diff --git a/src/platform/imx8m/include/platform/platform.h b/src/kernel/platform/imx8m/include/platform/platform.h similarity index 100% rename from src/platform/imx8m/include/platform/platform.h rename to src/kernel/platform/imx8m/include/platform/platform.h diff --git a/src/platform/imx8m/include/platform/trace/trace.h b/src/kernel/platform/imx8m/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx8m/include/platform/trace/trace.h rename to src/kernel/platform/imx8m/include/platform/trace/trace.h diff --git a/src/platform/imx8m/lib/clk.c b/src/kernel/platform/imx8m/lib/clk.c similarity index 100% rename from src/platform/imx8m/lib/clk.c rename to src/kernel/platform/imx8m/lib/clk.c diff --git a/src/platform/imx8m/platform.c b/src/kernel/platform/imx8m/platform.c similarity index 100% rename from src/platform/imx8m/platform.c rename to src/kernel/platform/imx8m/platform.c diff --git a/src/platform/imx8m_cm7/include/platform/lib/clk.h b/src/kernel/platform/imx8m_cm7/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/lib/clk.h rename to src/kernel/platform/imx8m_cm7/include/platform/lib/clk.h diff --git a/src/platform/imx8m_cm7/include/platform/lib/dma.h b/src/kernel/platform/imx8m_cm7/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/lib/dma.h rename to src/kernel/platform/imx8m_cm7/include/platform/lib/dma.h diff --git a/src/platform/imx8m_cm7/include/platform/lib/mailbox.h b/src/kernel/platform/imx8m_cm7/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/lib/mailbox.h rename to src/kernel/platform/imx8m_cm7/include/platform/lib/mailbox.h diff --git a/src/platform/imx8m_cm7/include/platform/lib/memory.h b/src/kernel/platform/imx8m_cm7/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/lib/memory.h rename to src/kernel/platform/imx8m_cm7/include/platform/lib/memory.h diff --git a/src/platform/imx8m_cm7/include/platform/platform.h b/src/kernel/platform/imx8m_cm7/include/platform/platform.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/platform.h rename to src/kernel/platform/imx8m_cm7/include/platform/platform.h diff --git a/src/platform/imx8m_cm7/include/platform/trace/trace.h b/src/kernel/platform/imx8m_cm7/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx8m_cm7/include/platform/trace/trace.h rename to src/kernel/platform/imx8m_cm7/include/platform/trace/trace.h diff --git a/src/platform/imx8m_cm7/lib/clk.c b/src/kernel/platform/imx8m_cm7/lib/clk.c similarity index 100% rename from src/platform/imx8m_cm7/lib/clk.c rename to src/kernel/platform/imx8m_cm7/lib/clk.c diff --git a/src/platform/imx8m_cm7/linker/data-sections.ld b/src/kernel/platform/imx8m_cm7/linker/data-sections.ld similarity index 100% rename from src/platform/imx8m_cm7/linker/data-sections.ld rename to src/kernel/platform/imx8m_cm7/linker/data-sections.ld diff --git a/src/platform/imx8m_cm7/platform.c b/src/kernel/platform/imx8m_cm7/platform.c similarity index 100% rename from src/platform/imx8m_cm7/platform.c rename to src/kernel/platform/imx8m_cm7/platform.c diff --git a/src/platform/imx8ulp/imx8ulp.x.in b/src/kernel/platform/imx8ulp/imx8ulp.x.in similarity index 100% rename from src/platform/imx8ulp/imx8ulp.x.in rename to src/kernel/platform/imx8ulp/imx8ulp.x.in diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/core-isa.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/core-isa.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/core-isa.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/core-isa.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/core-matmap.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/core-matmap.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/core-matmap.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/core-matmap.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/defs.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/defs.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/defs.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/defs.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/specreg.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/specreg.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/specreg.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/specreg.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/system.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/system.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/system.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/system.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/tie-asm.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/tie-asm.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/tie-asm.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/tie-asm.h diff --git a/src/platform/imx8ulp/include/arch/xtensa/config/tie.h b/src/kernel/platform/imx8ulp/include/arch/xtensa/config/tie.h similarity index 100% rename from src/platform/imx8ulp/include/arch/xtensa/config/tie.h rename to src/kernel/platform/imx8ulp/include/arch/xtensa/config/tie.h diff --git a/src/platform/imx8ulp/include/platform/drivers/idc.h b/src/kernel/platform/imx8ulp/include/platform/drivers/idc.h similarity index 100% rename from src/platform/imx8ulp/include/platform/drivers/idc.h rename to src/kernel/platform/imx8ulp/include/platform/drivers/idc.h diff --git a/src/platform/imx8ulp/include/platform/drivers/interrupt.h b/src/kernel/platform/imx8ulp/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/imx8ulp/include/platform/drivers/interrupt.h rename to src/kernel/platform/imx8ulp/include/platform/drivers/interrupt.h diff --git a/src/platform/imx8ulp/include/platform/lib/clk.h b/src/kernel/platform/imx8ulp/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/clk.h rename to src/kernel/platform/imx8ulp/include/platform/lib/clk.h diff --git a/src/platform/imx8ulp/include/platform/lib/cpu.h b/src/kernel/platform/imx8ulp/include/platform/lib/cpu.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/cpu.h rename to src/kernel/platform/imx8ulp/include/platform/lib/cpu.h diff --git a/src/platform/imx8ulp/include/platform/lib/dai.h b/src/kernel/platform/imx8ulp/include/platform/lib/dai.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/dai.h rename to src/kernel/platform/imx8ulp/include/platform/lib/dai.h diff --git a/src/platform/imx8ulp/include/platform/lib/dma.h b/src/kernel/platform/imx8ulp/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/dma.h rename to src/kernel/platform/imx8ulp/include/platform/lib/dma.h diff --git a/src/platform/imx8ulp/include/platform/lib/mailbox.h b/src/kernel/platform/imx8ulp/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/mailbox.h rename to src/kernel/platform/imx8ulp/include/platform/lib/mailbox.h diff --git a/src/platform/imx8ulp/include/platform/lib/memory.h b/src/kernel/platform/imx8ulp/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx8ulp/include/platform/lib/memory.h rename to src/kernel/platform/imx8ulp/include/platform/lib/memory.h diff --git a/src/platform/imx8ulp/include/platform/platform.h b/src/kernel/platform/imx8ulp/include/platform/platform.h similarity index 100% rename from src/platform/imx8ulp/include/platform/platform.h rename to src/kernel/platform/imx8ulp/include/platform/platform.h diff --git a/src/platform/imx8ulp/include/platform/trace/trace.h b/src/kernel/platform/imx8ulp/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx8ulp/include/platform/trace/trace.h rename to src/kernel/platform/imx8ulp/include/platform/trace/trace.h diff --git a/src/platform/imx8ulp/lib/clk.c b/src/kernel/platform/imx8ulp/lib/clk.c similarity index 100% rename from src/platform/imx8ulp/lib/clk.c rename to src/kernel/platform/imx8ulp/lib/clk.c diff --git a/src/platform/imx8ulp/platform.c b/src/kernel/platform/imx8ulp/platform.c similarity index 100% rename from src/platform/imx8ulp/platform.c rename to src/kernel/platform/imx8ulp/platform.c diff --git a/src/platform/imx93_a55/include/platform/drivers/idc.h b/src/kernel/platform/imx93_a55/include/platform/drivers/idc.h similarity index 100% rename from src/platform/imx93_a55/include/platform/drivers/idc.h rename to src/kernel/platform/imx93_a55/include/platform/drivers/idc.h diff --git a/src/platform/imx93_a55/include/platform/lib/clk.h b/src/kernel/platform/imx93_a55/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx93_a55/include/platform/lib/clk.h rename to src/kernel/platform/imx93_a55/include/platform/lib/clk.h diff --git a/src/platform/imx93_a55/include/platform/lib/dai.h b/src/kernel/platform/imx93_a55/include/platform/lib/dai.h similarity index 100% rename from src/platform/imx93_a55/include/platform/lib/dai.h rename to src/kernel/platform/imx93_a55/include/platform/lib/dai.h diff --git a/src/platform/imx93_a55/include/platform/lib/dma.h b/src/kernel/platform/imx93_a55/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx93_a55/include/platform/lib/dma.h rename to src/kernel/platform/imx93_a55/include/platform/lib/dma.h diff --git a/src/platform/imx93_a55/include/platform/lib/mailbox.h b/src/kernel/platform/imx93_a55/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx93_a55/include/platform/lib/mailbox.h rename to src/kernel/platform/imx93_a55/include/platform/lib/mailbox.h diff --git a/src/platform/imx93_a55/include/platform/lib/memory.h b/src/kernel/platform/imx93_a55/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx93_a55/include/platform/lib/memory.h rename to src/kernel/platform/imx93_a55/include/platform/lib/memory.h diff --git a/src/platform/imx93_a55/include/platform/platform.h b/src/kernel/platform/imx93_a55/include/platform/platform.h similarity index 100% rename from src/platform/imx93_a55/include/platform/platform.h rename to src/kernel/platform/imx93_a55/include/platform/platform.h diff --git a/src/platform/imx93_a55/include/platform/trace/trace.h b/src/kernel/platform/imx93_a55/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx93_a55/include/platform/trace/trace.h rename to src/kernel/platform/imx93_a55/include/platform/trace/trace.h diff --git a/src/platform/imx93_a55/lib/clk.c b/src/kernel/platform/imx93_a55/lib/clk.c similarity index 100% rename from src/platform/imx93_a55/lib/clk.c rename to src/kernel/platform/imx93_a55/lib/clk.c diff --git a/src/platform/imx93_a55/platform.c b/src/kernel/platform/imx93_a55/platform.c similarity index 100% rename from src/platform/imx93_a55/platform.c rename to src/kernel/platform/imx93_a55/platform.c diff --git a/src/platform/imx95/include/platform/lib/clk.h b/src/kernel/platform/imx95/include/platform/lib/clk.h similarity index 100% rename from src/platform/imx95/include/platform/lib/clk.h rename to src/kernel/platform/imx95/include/platform/lib/clk.h diff --git a/src/platform/imx95/include/platform/lib/dma.h b/src/kernel/platform/imx95/include/platform/lib/dma.h similarity index 100% rename from src/platform/imx95/include/platform/lib/dma.h rename to src/kernel/platform/imx95/include/platform/lib/dma.h diff --git a/src/platform/imx95/include/platform/lib/mailbox.h b/src/kernel/platform/imx95/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/imx95/include/platform/lib/mailbox.h rename to src/kernel/platform/imx95/include/platform/lib/mailbox.h diff --git a/src/platform/imx95/include/platform/lib/memory.h b/src/kernel/platform/imx95/include/platform/lib/memory.h similarity index 100% rename from src/platform/imx95/include/platform/lib/memory.h rename to src/kernel/platform/imx95/include/platform/lib/memory.h diff --git a/src/platform/imx95/include/platform/platform.h b/src/kernel/platform/imx95/include/platform/platform.h similarity index 100% rename from src/platform/imx95/include/platform/platform.h rename to src/kernel/platform/imx95/include/platform/platform.h diff --git a/src/platform/imx95/include/platform/trace/trace.h b/src/kernel/platform/imx95/include/platform/trace/trace.h similarity index 100% rename from src/platform/imx95/include/platform/trace/trace.h rename to src/kernel/platform/imx95/include/platform/trace/trace.h diff --git a/src/platform/imx95/lib/clk.c b/src/kernel/platform/imx95/lib/clk.c similarity index 100% rename from src/platform/imx95/lib/clk.c rename to src/kernel/platform/imx95/lib/clk.c diff --git a/src/platform/imx95/linker/data-sections.ld b/src/kernel/platform/imx95/linker/data-sections.ld similarity index 100% rename from src/platform/imx95/linker/data-sections.ld rename to src/kernel/platform/imx95/linker/data-sections.ld diff --git a/src/platform/imx95/platform.c b/src/kernel/platform/imx95/platform.c similarity index 100% rename from src/platform/imx95/platform.c rename to src/kernel/platform/imx95/platform.c diff --git a/src/platform/intel/ace/include/ace/lib/clk.h b/src/kernel/platform/intel/ace/include/ace/lib/clk.h similarity index 100% rename from src/platform/intel/ace/include/ace/lib/clk.h rename to src/kernel/platform/intel/ace/include/ace/lib/clk.h diff --git a/src/platform/intel/ace/include/ace/lib/mailbox.h b/src/kernel/platform/intel/ace/include/ace/lib/mailbox.h similarity index 100% rename from src/platform/intel/ace/include/ace/lib/mailbox.h rename to src/kernel/platform/intel/ace/include/ace/lib/mailbox.h diff --git a/src/platform/intel/ace/include/ace/lib/memory.h b/src/kernel/platform/intel/ace/include/ace/lib/memory.h similarity index 100% rename from src/platform/intel/ace/include/ace/lib/memory.h rename to src/kernel/platform/intel/ace/include/ace/lib/memory.h diff --git a/src/platform/intel/ace/include/ace/version.h b/src/kernel/platform/intel/ace/include/ace/version.h similarity index 100% rename from src/platform/intel/ace/include/ace/version.h rename to src/kernel/platform/intel/ace/include/ace/version.h diff --git a/src/platform/intel/ace/include/auth/intel_auth_api.h b/src/kernel/platform/intel/ace/include/auth/intel_auth_api.h similarity index 100% rename from src/platform/intel/ace/include/auth/intel_auth_api.h rename to src/kernel/platform/intel/ace/include/auth/intel_auth_api.h diff --git a/src/platform/intel/ace/include/auth/intel_status_logger_api.h b/src/kernel/platform/intel/ace/include/auth/intel_status_logger_api.h similarity index 100% rename from src/platform/intel/ace/include/auth/intel_status_logger_api.h rename to src/kernel/platform/intel/ace/include/auth/intel_status_logger_api.h diff --git a/src/platform/intel/ace/include/auth/intel_status_logger_iface.h b/src/kernel/platform/intel/ace/include/auth/intel_status_logger_iface.h similarity index 100% rename from src/platform/intel/ace/include/auth/intel_status_logger_iface.h rename to src/kernel/platform/intel/ace/include/auth/intel_status_logger_iface.h diff --git a/src/platform/intel/ace/lib/watchdog.c b/src/kernel/platform/intel/ace/lib/watchdog.c similarity index 100% rename from src/platform/intel/ace/lib/watchdog.c rename to src/kernel/platform/intel/ace/lib/watchdog.c diff --git a/src/platform/intel/ace/platform.c b/src/kernel/platform/intel/ace/platform.c similarity index 100% rename from src/platform/intel/ace/platform.c rename to src/kernel/platform/intel/ace/platform.c diff --git a/src/platform/intel/cavs/include/cavs/drivers/mn.h b/src/kernel/platform/intel/cavs/include/cavs/drivers/mn.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/drivers/mn.h rename to src/kernel/platform/intel/cavs/include/cavs/drivers/mn.h diff --git a/src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h b/src/kernel/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h rename to src/kernel/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h diff --git a/src/platform/intel/cavs/include/cavs/drivers/timestamp.h b/src/kernel/platform/intel/cavs/include/cavs/drivers/timestamp.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/drivers/timestamp.h rename to src/kernel/platform/intel/cavs/include/cavs/drivers/timestamp.h diff --git a/src/platform/intel/cavs/include/cavs/ext_manifest.h b/src/kernel/platform/intel/cavs/include/cavs/ext_manifest.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/ext_manifest.h rename to src/kernel/platform/intel/cavs/include/cavs/ext_manifest.h diff --git a/src/platform/intel/cavs/include/cavs/lib/mailbox.h b/src/kernel/platform/intel/cavs/include/cavs/lib/mailbox.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/lib/mailbox.h rename to src/kernel/platform/intel/cavs/include/cavs/lib/mailbox.h diff --git a/src/platform/intel/cavs/include/cavs/lib/memory.h b/src/kernel/platform/intel/cavs/include/cavs/lib/memory.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/lib/memory.h rename to src/kernel/platform/intel/cavs/include/cavs/lib/memory.h diff --git a/src/platform/intel/cavs/include/cavs/lib/power_down.h b/src/kernel/platform/intel/cavs/include/cavs/lib/power_down.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/lib/power_down.h rename to src/kernel/platform/intel/cavs/include/cavs/lib/power_down.h diff --git a/src/platform/intel/cavs/include/cavs/mem_window.h b/src/kernel/platform/intel/cavs/include/cavs/mem_window.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/mem_window.h rename to src/kernel/platform/intel/cavs/include/cavs/mem_window.h diff --git a/src/platform/intel/cavs/include/cavs/trace/trace.h b/src/kernel/platform/intel/cavs/include/cavs/trace/trace.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/trace/trace.h rename to src/kernel/platform/intel/cavs/include/cavs/trace/trace.h diff --git a/src/platform/intel/cavs/include/cavs/version.h b/src/kernel/platform/intel/cavs/include/cavs/version.h similarity index 100% rename from src/platform/intel/cavs/include/cavs/version.h rename to src/kernel/platform/intel/cavs/include/cavs/version.h diff --git a/src/platform/intel/cavs/platform.c b/src/kernel/platform/intel/cavs/platform.c similarity index 100% rename from src/platform/intel/cavs/platform.c rename to src/kernel/platform/intel/cavs/platform.c diff --git a/src/platform/library/CMakeLists.txt b/src/kernel/platform/library/CMakeLists.txt similarity index 100% rename from src/platform/library/CMakeLists.txt rename to src/kernel/platform/library/CMakeLists.txt diff --git a/src/platform/library/include/platform/drivers/idc.h b/src/kernel/platform/library/include/platform/drivers/idc.h similarity index 100% rename from src/platform/library/include/platform/drivers/idc.h rename to src/kernel/platform/library/include/platform/drivers/idc.h diff --git a/src/platform/library/include/platform/drivers/interrupt.h b/src/kernel/platform/library/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/library/include/platform/drivers/interrupt.h rename to src/kernel/platform/library/include/platform/drivers/interrupt.h diff --git a/src/platform/library/include/platform/drivers/pmc.h b/src/kernel/platform/library/include/platform/drivers/pmc.h similarity index 100% rename from src/platform/library/include/platform/drivers/pmc.h rename to src/kernel/platform/library/include/platform/drivers/pmc.h diff --git a/src/platform/library/include/platform/lib/clk.h b/src/kernel/platform/library/include/platform/lib/clk.h similarity index 100% rename from src/platform/library/include/platform/lib/clk.h rename to src/kernel/platform/library/include/platform/lib/clk.h diff --git a/src/platform/library/include/platform/lib/cpu.h b/src/kernel/platform/library/include/platform/lib/cpu.h similarity index 100% rename from src/platform/library/include/platform/lib/cpu.h rename to src/kernel/platform/library/include/platform/lib/cpu.h diff --git a/src/platform/library/include/platform/lib/dai.h b/src/kernel/platform/library/include/platform/lib/dai.h similarity index 100% rename from src/platform/library/include/platform/lib/dai.h rename to src/kernel/platform/library/include/platform/lib/dai.h diff --git a/src/platform/library/include/platform/lib/dma.h b/src/kernel/platform/library/include/platform/lib/dma.h similarity index 100% rename from src/platform/library/include/platform/lib/dma.h rename to src/kernel/platform/library/include/platform/lib/dma.h diff --git a/src/platform/library/include/platform/lib/ll_schedule.h b/src/kernel/platform/library/include/platform/lib/ll_schedule.h similarity index 100% rename from src/platform/library/include/platform/lib/ll_schedule.h rename to src/kernel/platform/library/include/platform/lib/ll_schedule.h diff --git a/src/platform/library/include/platform/lib/mailbox.h b/src/kernel/platform/library/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/library/include/platform/lib/mailbox.h rename to src/kernel/platform/library/include/platform/lib/mailbox.h diff --git a/src/platform/library/include/platform/lib/memory.h b/src/kernel/platform/library/include/platform/lib/memory.h similarity index 100% rename from src/platform/library/include/platform/lib/memory.h rename to src/kernel/platform/library/include/platform/lib/memory.h diff --git a/src/platform/library/include/platform/lib/pm_runtime.h b/src/kernel/platform/library/include/platform/lib/pm_runtime.h similarity index 100% rename from src/platform/library/include/platform/lib/pm_runtime.h rename to src/kernel/platform/library/include/platform/lib/pm_runtime.h diff --git a/src/platform/library/include/platform/platform.h b/src/kernel/platform/library/include/platform/platform.h similarity index 100% rename from src/platform/library/include/platform/platform.h rename to src/kernel/platform/library/include/platform/platform.h diff --git a/src/platform/library/init.c b/src/kernel/platform/library/init.c similarity index 100% rename from src/platform/library/init.c rename to src/kernel/platform/library/init.c diff --git a/src/platform/library/lib/CMakeLists.txt b/src/kernel/platform/library/lib/CMakeLists.txt similarity index 100% rename from src/platform/library/lib/CMakeLists.txt rename to src/kernel/platform/library/lib/CMakeLists.txt diff --git a/src/platform/library/lib/alloc.c b/src/kernel/platform/library/lib/alloc.c similarity index 100% rename from src/platform/library/lib/alloc.c rename to src/kernel/platform/library/lib/alloc.c diff --git a/src/platform/library/lib/clk.c b/src/kernel/platform/library/lib/clk.c similarity index 100% rename from src/platform/library/lib/clk.c rename to src/kernel/platform/library/lib/clk.c diff --git a/src/platform/library/lib/dai.c b/src/kernel/platform/library/lib/dai.c similarity index 100% rename from src/platform/library/lib/dai.c rename to src/kernel/platform/library/lib/dai.c diff --git a/src/platform/library/lib/memory.c b/src/kernel/platform/library/lib/memory.c similarity index 100% rename from src/platform/library/lib/memory.c rename to src/kernel/platform/library/lib/memory.c diff --git a/src/platform/library/lib/pm_runtime.c b/src/kernel/platform/library/lib/pm_runtime.c similarity index 100% rename from src/platform/library/lib/pm_runtime.c rename to src/kernel/platform/library/lib/pm_runtime.c diff --git a/src/platform/library/lib/trace.c b/src/kernel/platform/library/lib/trace.c similarity index 100% rename from src/platform/library/lib/trace.c rename to src/kernel/platform/library/lib/trace.c diff --git a/src/platform/library/panic.c b/src/kernel/platform/library/panic.c similarity index 100% rename from src/platform/library/panic.c rename to src/kernel/platform/library/panic.c diff --git a/src/platform/library/platform.c b/src/kernel/platform/library/platform.c similarity index 100% rename from src/platform/library/platform.c rename to src/kernel/platform/library/platform.c diff --git a/src/platform/library/schedule/CMakeLists.txt b/src/kernel/platform/library/schedule/CMakeLists.txt similarity index 100% rename from src/platform/library/schedule/CMakeLists.txt rename to src/kernel/platform/library/schedule/CMakeLists.txt diff --git a/src/platform/library/schedule/edf_schedule.c b/src/kernel/platform/library/schedule/edf_schedule.c similarity index 100% rename from src/platform/library/schedule/edf_schedule.c rename to src/kernel/platform/library/schedule/edf_schedule.c diff --git a/src/platform/library/schedule/ll_schedule.c b/src/kernel/platform/library/schedule/ll_schedule.c similarity index 100% rename from src/platform/library/schedule/ll_schedule.c rename to src/kernel/platform/library/schedule/ll_schedule.c diff --git a/src/platform/library/schedule/schedule.c b/src/kernel/platform/library/schedule/schedule.c similarity index 100% rename from src/platform/library/schedule/schedule.c rename to src/kernel/platform/library/schedule/schedule.c diff --git a/src/platform/lunarlake/include/platform/lib/clk.h b/src/kernel/platform/lunarlake/include/platform/lib/clk.h similarity index 100% rename from src/platform/lunarlake/include/platform/lib/clk.h rename to src/kernel/platform/lunarlake/include/platform/lib/clk.h diff --git a/src/platform/lunarlake/include/platform/lib/mailbox.h b/src/kernel/platform/lunarlake/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/lunarlake/include/platform/lib/mailbox.h rename to src/kernel/platform/lunarlake/include/platform/lib/mailbox.h diff --git a/src/platform/lunarlake/include/platform/lib/memory.h b/src/kernel/platform/lunarlake/include/platform/lib/memory.h similarity index 100% rename from src/platform/lunarlake/include/platform/lib/memory.h rename to src/kernel/platform/lunarlake/include/platform/lib/memory.h diff --git a/src/platform/lunarlake/include/platform/platform.h b/src/kernel/platform/lunarlake/include/platform/platform.h similarity index 100% rename from src/platform/lunarlake/include/platform/platform.h rename to src/kernel/platform/lunarlake/include/platform/platform.h diff --git a/src/platform/lunarlake/include/platform/trace/trace.h b/src/kernel/platform/lunarlake/include/platform/trace/trace.h similarity index 100% rename from src/platform/lunarlake/include/platform/trace/trace.h rename to src/kernel/platform/lunarlake/include/platform/trace/trace.h diff --git a/src/platform/lunarlake/lib/clk.c b/src/kernel/platform/lunarlake/lib/clk.c similarity index 100% rename from src/platform/lunarlake/lib/clk.c rename to src/kernel/platform/lunarlake/lib/clk.c diff --git a/src/platform/meteorlake/include/platform/lib/clk.h b/src/kernel/platform/meteorlake/include/platform/lib/clk.h similarity index 100% rename from src/platform/meteorlake/include/platform/lib/clk.h rename to src/kernel/platform/meteorlake/include/platform/lib/clk.h diff --git a/src/platform/meteorlake/include/platform/lib/mailbox.h b/src/kernel/platform/meteorlake/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/meteorlake/include/platform/lib/mailbox.h rename to src/kernel/platform/meteorlake/include/platform/lib/mailbox.h diff --git a/src/platform/meteorlake/include/platform/lib/memory.h b/src/kernel/platform/meteorlake/include/platform/lib/memory.h similarity index 100% rename from src/platform/meteorlake/include/platform/lib/memory.h rename to src/kernel/platform/meteorlake/include/platform/lib/memory.h diff --git a/src/platform/meteorlake/include/platform/platform.h b/src/kernel/platform/meteorlake/include/platform/platform.h similarity index 100% rename from src/platform/meteorlake/include/platform/platform.h rename to src/kernel/platform/meteorlake/include/platform/platform.h diff --git a/src/platform/meteorlake/include/platform/trace/trace.h b/src/kernel/platform/meteorlake/include/platform/trace/trace.h similarity index 100% rename from src/platform/meteorlake/include/platform/trace/trace.h rename to src/kernel/platform/meteorlake/include/platform/trace/trace.h diff --git a/src/platform/meteorlake/lib/clk.c b/src/kernel/platform/meteorlake/lib/clk.c similarity index 100% rename from src/platform/meteorlake/lib/clk.c rename to src/kernel/platform/meteorlake/lib/clk.c diff --git a/src/platform/mtk/dai.c b/src/kernel/platform/mtk/dai.c similarity index 100% rename from src/platform/mtk/dai.c rename to src/kernel/platform/mtk/dai.c diff --git a/src/platform/mtk/include/platform/lib/clk.h b/src/kernel/platform/mtk/include/platform/lib/clk.h similarity index 100% rename from src/platform/mtk/include/platform/lib/clk.h rename to src/kernel/platform/mtk/include/platform/lib/clk.h diff --git a/src/platform/mtk/include/platform/lib/cpu.h b/src/kernel/platform/mtk/include/platform/lib/cpu.h similarity index 100% rename from src/platform/mtk/include/platform/lib/cpu.h rename to src/kernel/platform/mtk/include/platform/lib/cpu.h diff --git a/src/platform/mtk/include/platform/lib/dai.h b/src/kernel/platform/mtk/include/platform/lib/dai.h similarity index 100% rename from src/platform/mtk/include/platform/lib/dai.h rename to src/kernel/platform/mtk/include/platform/lib/dai.h diff --git a/src/platform/mtk/include/platform/lib/dma.h b/src/kernel/platform/mtk/include/platform/lib/dma.h similarity index 100% rename from src/platform/mtk/include/platform/lib/dma.h rename to src/kernel/platform/mtk/include/platform/lib/dma.h diff --git a/src/platform/mtk/include/platform/lib/mailbox.h b/src/kernel/platform/mtk/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/mtk/include/platform/lib/mailbox.h rename to src/kernel/platform/mtk/include/platform/lib/mailbox.h diff --git a/src/platform/mtk/include/platform/lib/memory.h b/src/kernel/platform/mtk/include/platform/lib/memory.h similarity index 100% rename from src/platform/mtk/include/platform/lib/memory.h rename to src/kernel/platform/mtk/include/platform/lib/memory.h diff --git a/src/platform/mtk/include/platform/lib/pm_runtime.h b/src/kernel/platform/mtk/include/platform/lib/pm_runtime.h similarity index 100% rename from src/platform/mtk/include/platform/lib/pm_runtime.h rename to src/kernel/platform/mtk/include/platform/lib/pm_runtime.h diff --git a/src/platform/mtk/include/platform/platform.h b/src/kernel/platform/mtk/include/platform/platform.h similarity index 100% rename from src/platform/mtk/include/platform/platform.h rename to src/kernel/platform/mtk/include/platform/platform.h diff --git a/src/platform/mtk/include/platform/trace/trace.h b/src/kernel/platform/mtk/include/platform/trace/trace.h similarity index 100% rename from src/platform/mtk/include/platform/trace/trace.h rename to src/kernel/platform/mtk/include/platform/trace/trace.h diff --git a/src/platform/mtk/platform.c b/src/kernel/platform/mtk/platform.c similarity index 100% rename from src/platform/mtk/platform.c rename to src/kernel/platform/mtk/platform.c diff --git a/src/platform/mtk/tools/README.txt b/src/kernel/platform/mtk/tools/README.txt similarity index 100% rename from src/platform/mtk/tools/README.txt rename to src/kernel/platform/mtk/tools/README.txt diff --git a/src/platform/mtk/tools/build.sh b/src/kernel/platform/mtk/tools/build.sh similarity index 58% rename from src/platform/mtk/tools/build.sh rename to src/kernel/platform/mtk/tools/build.sh index 8d7b30d855b3..9d161d9fc67a 100755 --- a/src/platform/mtk/tools/build.sh +++ b/src/kernel/platform/mtk/tools/build.sh @@ -9,15 +9,15 @@ if [ -z "$PLATFORMS" ]; then PLATFORMS="mt8195 mt8188 mt8186" fi -SOF=`cd ../../../..; /bin/pwd` +SOF=`cd ../../../../..; /bin/pwd` for p in $PLATFORMS; do - SRCS="$SOF/src/platform/$p/lib/dai.c $SOF/src/platform/$p/afe-platform.c" + SRCS="$SOF/src/kernel/platform/$p/lib/dai.c $SOF/src/kernel/platform/$p/afe-platform.c" - INCS="-I$SOF/src/include -I$SOF/src/platform/posix/include -I$SOF/posix/include" - INCS="$INCS -I$SOF/src/kernel/arch/host/include -I$SOF/src/platform/$p/include/platform" - INCS="$INCS -I$SOF/src/platform/$p/include" + INCS="-I$SOF/src/include -I$SOF/src/kernel/platform/posix/include -I$SOF/posix/include" + INCS="$INCS -I$SOF/src/kernel/arch/host/include -I$SOF/src/kernel/platform/$p/include/platform" + INCS="$INCS -I$SOF/src/kernel/platform/$p/include" DEFS="-DRELATIVE_FILE=\"mt-dai-gen.c\" -DCONFIG_CORE_COUNT=1 -DCONFIG_IPC_MAJOR_3=1" diff --git a/src/platform/mtk/tools/mt-dai-gen.c b/src/kernel/platform/mtk/tools/mt-dai-gen.c similarity index 100% rename from src/platform/mtk/tools/mt-dai-gen.c rename to src/kernel/platform/mtk/tools/mt-dai-gen.c diff --git a/src/platform/novalake/include/platform/lib/clk.h b/src/kernel/platform/novalake/include/platform/lib/clk.h similarity index 100% rename from src/platform/novalake/include/platform/lib/clk.h rename to src/kernel/platform/novalake/include/platform/lib/clk.h diff --git a/src/platform/novalake/include/platform/lib/mailbox.h b/src/kernel/platform/novalake/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/novalake/include/platform/lib/mailbox.h rename to src/kernel/platform/novalake/include/platform/lib/mailbox.h diff --git a/src/platform/novalake/include/platform/lib/memory.h b/src/kernel/platform/novalake/include/platform/lib/memory.h similarity index 100% rename from src/platform/novalake/include/platform/lib/memory.h rename to src/kernel/platform/novalake/include/platform/lib/memory.h diff --git a/src/platform/novalake/include/platform/platform.h b/src/kernel/platform/novalake/include/platform/platform.h similarity index 100% rename from src/platform/novalake/include/platform/platform.h rename to src/kernel/platform/novalake/include/platform/platform.h diff --git a/src/platform/novalake/include/platform/trace/trace.h b/src/kernel/platform/novalake/include/platform/trace/trace.h similarity index 100% rename from src/platform/novalake/include/platform/trace/trace.h rename to src/kernel/platform/novalake/include/platform/trace/trace.h diff --git a/src/platform/novalake/lib/clk.c b/src/kernel/platform/novalake/lib/clk.c similarity index 100% rename from src/platform/novalake/lib/clk.c rename to src/kernel/platform/novalake/lib/clk.c diff --git a/src/platform/posix/dai.c b/src/kernel/platform/posix/dai.c similarity index 100% rename from src/platform/posix/dai.c rename to src/kernel/platform/posix/dai.c diff --git a/src/platform/posix/dma.c b/src/kernel/platform/posix/dma.c similarity index 100% rename from src/platform/posix/dma.c rename to src/kernel/platform/posix/dma.c diff --git a/src/platform/posix/fuzz.c b/src/kernel/platform/posix/fuzz.c similarity index 100% rename from src/platform/posix/fuzz.c rename to src/kernel/platform/posix/fuzz.c diff --git a/src/platform/posix/include/platform/drivers/idc.h b/src/kernel/platform/posix/include/platform/drivers/idc.h similarity index 100% rename from src/platform/posix/include/platform/drivers/idc.h rename to src/kernel/platform/posix/include/platform/drivers/idc.h diff --git a/src/platform/posix/include/platform/drivers/interrupt.h b/src/kernel/platform/posix/include/platform/drivers/interrupt.h similarity index 100% rename from src/platform/posix/include/platform/drivers/interrupt.h rename to src/kernel/platform/posix/include/platform/drivers/interrupt.h diff --git a/src/platform/posix/include/platform/fuzz.h b/src/kernel/platform/posix/include/platform/fuzz.h similarity index 100% rename from src/platform/posix/include/platform/fuzz.h rename to src/kernel/platform/posix/include/platform/fuzz.h diff --git a/src/platform/posix/include/platform/lib/clk.h b/src/kernel/platform/posix/include/platform/lib/clk.h similarity index 100% rename from src/platform/posix/include/platform/lib/clk.h rename to src/kernel/platform/posix/include/platform/lib/clk.h diff --git a/src/platform/posix/include/platform/lib/cpu.h b/src/kernel/platform/posix/include/platform/lib/cpu.h similarity index 100% rename from src/platform/posix/include/platform/lib/cpu.h rename to src/kernel/platform/posix/include/platform/lib/cpu.h diff --git a/src/platform/posix/include/platform/lib/dai.h b/src/kernel/platform/posix/include/platform/lib/dai.h similarity index 100% rename from src/platform/posix/include/platform/lib/dai.h rename to src/kernel/platform/posix/include/platform/lib/dai.h diff --git a/src/platform/posix/include/platform/lib/dma.h b/src/kernel/platform/posix/include/platform/lib/dma.h similarity index 100% rename from src/platform/posix/include/platform/lib/dma.h rename to src/kernel/platform/posix/include/platform/lib/dma.h diff --git a/src/platform/posix/include/platform/lib/mailbox.h b/src/kernel/platform/posix/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/posix/include/platform/lib/mailbox.h rename to src/kernel/platform/posix/include/platform/lib/mailbox.h diff --git a/src/platform/posix/include/platform/lib/memory.h b/src/kernel/platform/posix/include/platform/lib/memory.h similarity index 100% rename from src/platform/posix/include/platform/lib/memory.h rename to src/kernel/platform/posix/include/platform/lib/memory.h diff --git a/src/platform/posix/include/platform/lib/pm_runtime.h b/src/kernel/platform/posix/include/platform/lib/pm_runtime.h similarity index 100% rename from src/platform/posix/include/platform/lib/pm_runtime.h rename to src/kernel/platform/posix/include/platform/lib/pm_runtime.h diff --git a/src/platform/posix/include/platform/platform.h b/src/kernel/platform/posix/include/platform/platform.h similarity index 100% rename from src/platform/posix/include/platform/platform.h rename to src/kernel/platform/posix/include/platform/platform.h diff --git a/src/platform/posix/include/platform/trace/trace.h b/src/kernel/platform/posix/include/platform/trace/trace.h similarity index 100% rename from src/platform/posix/include/platform/trace/trace.h rename to src/kernel/platform/posix/include/platform/trace/trace.h diff --git a/src/platform/posix/ipc.c b/src/kernel/platform/posix/ipc.c similarity index 100% rename from src/platform/posix/ipc.c rename to src/kernel/platform/posix/ipc.c diff --git a/src/platform/posix/posix.c b/src/kernel/platform/posix/posix.c similarity index 100% rename from src/platform/posix/posix.c rename to src/kernel/platform/posix/posix.c diff --git a/src/platform/qemu_xtensa/include/platform/lib/clk.h b/src/kernel/platform/qemu_xtensa/include/platform/lib/clk.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/lib/clk.h rename to src/kernel/platform/qemu_xtensa/include/platform/lib/clk.h diff --git a/src/platform/qemu_xtensa/include/platform/lib/dai.h b/src/kernel/platform/qemu_xtensa/include/platform/lib/dai.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/lib/dai.h rename to src/kernel/platform/qemu_xtensa/include/platform/lib/dai.h diff --git a/src/platform/qemu_xtensa/include/platform/lib/dma.h b/src/kernel/platform/qemu_xtensa/include/platform/lib/dma.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/lib/dma.h rename to src/kernel/platform/qemu_xtensa/include/platform/lib/dma.h diff --git a/src/platform/qemu_xtensa/include/platform/lib/mailbox.h b/src/kernel/platform/qemu_xtensa/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/lib/mailbox.h rename to src/kernel/platform/qemu_xtensa/include/platform/lib/mailbox.h diff --git a/src/platform/qemu_xtensa/include/platform/lib/memory.h b/src/kernel/platform/qemu_xtensa/include/platform/lib/memory.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/lib/memory.h rename to src/kernel/platform/qemu_xtensa/include/platform/lib/memory.h diff --git a/src/platform/qemu_xtensa/include/platform/platform.h b/src/kernel/platform/qemu_xtensa/include/platform/platform.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/platform.h rename to src/kernel/platform/qemu_xtensa/include/platform/platform.h diff --git a/src/platform/qemu_xtensa/include/platform/trace/trace.h b/src/kernel/platform/qemu_xtensa/include/platform/trace/trace.h similarity index 100% rename from src/platform/qemu_xtensa/include/platform/trace/trace.h rename to src/kernel/platform/qemu_xtensa/include/platform/trace/trace.h diff --git a/src/platform/qemu_xtensa/platform.c b/src/kernel/platform/qemu_xtensa/platform.c similarity index 100% rename from src/platform/qemu_xtensa/platform.c rename to src/kernel/platform/qemu_xtensa/platform.c diff --git a/src/platform/tigerlake/include/platform/lib/mailbox.h b/src/kernel/platform/tigerlake/include/platform/lib/mailbox.h similarity index 100% rename from src/platform/tigerlake/include/platform/lib/mailbox.h rename to src/kernel/platform/tigerlake/include/platform/lib/mailbox.h diff --git a/src/platform/tigerlake/include/platform/lib/memory.h b/src/kernel/platform/tigerlake/include/platform/lib/memory.h similarity index 100% rename from src/platform/tigerlake/include/platform/lib/memory.h rename to src/kernel/platform/tigerlake/include/platform/lib/memory.h diff --git a/src/platform/tigerlake/include/platform/platform.h b/src/kernel/platform/tigerlake/include/platform/platform.h similarity index 100% rename from src/platform/tigerlake/include/platform/platform.h rename to src/kernel/platform/tigerlake/include/platform/platform.h diff --git a/src/platform/tigerlake/include/platform/trace/trace.h b/src/kernel/platform/tigerlake/include/platform/trace/trace.h similarity index 100% rename from src/platform/tigerlake/include/platform/trace/trace.h rename to src/kernel/platform/tigerlake/include/platform/trace/trace.h diff --git a/test/cmocka/CMakeLists.txt b/test/cmocka/CMakeLists.txt index 288282d11457..98a64af7d584 100644 --- a/test/cmocka/CMakeLists.txt +++ b/test/cmocka/CMakeLists.txt @@ -42,9 +42,9 @@ else() endif() if(CONFIG_CAVS) - target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/intel/cavs/include) + target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/platform/intel/cavs/include) elseif(CONFIG_ACE) - target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/intel/ace/include) + target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/platform/intel/ace/include) endif() # linker script, just for log entries diff --git a/test/cmocka/src/lib/alloc/CMakeLists.txt b/test/cmocka/src/lib/alloc/CMakeLists.txt index 2ec7c8f606db..10bef8205b4b 100644 --- a/test/cmocka/src/lib/alloc/CMakeLists.txt +++ b/test/cmocka/src/lib/alloc/CMakeLists.txt @@ -3,7 +3,7 @@ cmocka_test(alloc alloc.c ${PROJECT_SOURCE_DIR}/src/lib/alloc.c - ${PROJECT_SOURCE_DIR}/src/platform/library/lib/memory.c + ${PROJECT_SOURCE_DIR}/src/kernel/platform/library/lib/memory.c ) -target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/intel/cavs/include) +target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/platform/intel/cavs/include) diff --git a/test/cmocka/src/lib/fast-get/CMakeLists.txt b/test/cmocka/src/lib/fast-get/CMakeLists.txt index 8449320f4e6b..cf542366bcce 100644 --- a/test/cmocka/src/lib/fast-get/CMakeLists.txt +++ b/test/cmocka/src/lib/fast-get/CMakeLists.txt @@ -5,7 +5,7 @@ cmocka_test(fast-get-tests ${PROJECT_SOURCE_DIR}/src/lib/objpool.c ${PROJECT_SOURCE_DIR}/zephyr/lib/fast-get.c ${PROJECT_SOURCE_DIR}/src/lib/alloc.c - ${PROJECT_SOURCE_DIR}/src/platform/library/lib/memory.c + ${PROJECT_SOURCE_DIR}/src/kernel/platform/library/lib/memory.c ) target_link_libraries(fast-get-tests PRIVATE "-Wl,--wrap=rzalloc,--wrap=rmalloc,--wrap=rfree") diff --git a/test/ztest/unit/audio/crossover/CMakeLists.txt b/test/ztest/unit/audio/crossover/CMakeLists.txt index 39fe53fccf8c..cc599bc4e512 100644 --- a/test/ztest/unit/audio/crossover/CMakeLists.txt +++ b/test/ztest/unit/audio/crossover/CMakeLists.txt @@ -12,7 +12,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/src/audio/crossover ${PROJECT_BINARY_DIR}/include/generated ) diff --git a/test/ztest/unit/audio/drc/CMakeLists.txt b/test/ztest/unit/audio/drc/CMakeLists.txt index 4c83db706257..2faef72b825c 100644 --- a/test/ztest/unit/audio/drc/CMakeLists.txt +++ b/test/ztest/unit/audio/drc/CMakeLists.txt @@ -17,7 +17,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/src/audio ${SOF_ROOT}/test/cmocka/include ${PROJECT_BINARY_DIR}/include/generated diff --git a/test/ztest/unit/dsrc/CMakeLists.txt b/test/ztest/unit/dsrc/CMakeLists.txt index a198ace9f231..db31f8a536d8 100644 --- a/test/ztest/unit/dsrc/CMakeLists.txt +++ b/test/ztest/unit/dsrc/CMakeLists.txt @@ -11,7 +11,7 @@ include(${SOF_ROOT}/scripts/cmake/misc.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ) # Define SOF-specific configurations for unit testing diff --git a/test/ztest/unit/fast-get/CMakeLists.txt b/test/ztest/unit/fast-get/CMakeLists.txt index 3fe6a87680f4..b58587e15794 100644 --- a/test/ztest/unit/fast-get/CMakeLists.txt +++ b/test/ztest/unit/fast-get/CMakeLists.txt @@ -15,7 +15,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${PROJECT_BINARY_DIR}/include/generated # For uuid-registry.h ) diff --git a/test/ztest/unit/math/advanced/functions/CMakeLists.txt b/test/ztest/unit/math/advanced/functions/CMakeLists.txt index 615fc86a7db6..0afee53408b7 100644 --- a/test/ztest/unit/math/advanced/functions/CMakeLists.txt +++ b/test/ztest/unit/math/advanced/functions/CMakeLists.txt @@ -15,7 +15,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/test/cmocka/include ${PROJECT_BINARY_DIR}/include/generated # For uuid-registry.h ) diff --git a/test/ztest/unit/math/auditory/CMakeLists.txt b/test/ztest/unit/math/auditory/CMakeLists.txt index 6126b05d3e3d..d09c724d80af 100644 --- a/test/ztest/unit/math/auditory/CMakeLists.txt +++ b/test/ztest/unit/math/auditory/CMakeLists.txt @@ -16,7 +16,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/test/ztest/unit/common # Reference test vectors are #included in place from the CMocka tree # rather than copied, so both frameworks share identical data. diff --git a/test/ztest/unit/math/dct/CMakeLists.txt b/test/ztest/unit/math/dct/CMakeLists.txt index 1bdf36a69247..3bddbf06e6ea 100644 --- a/test/ztest/unit/math/dct/CMakeLists.txt +++ b/test/ztest/unit/math/dct/CMakeLists.txt @@ -16,7 +16,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/test/ztest/unit/common # Reference test vectors are #included in place from the CMocka tree # rather than copied, so both frameworks share identical data. diff --git a/test/ztest/unit/math/fft/CMakeLists.txt b/test/ztest/unit/math/fft/CMakeLists.txt index 6c6432bc3efe..920f41bdb642 100644 --- a/test/ztest/unit/math/fft/CMakeLists.txt +++ b/test/ztest/unit/math/fft/CMakeLists.txt @@ -16,7 +16,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/src/audio ${SOF_ROOT}/test/ztest/unit/common ${SOF_ROOT}/test/cmocka/include diff --git a/test/ztest/unit/math/fft_multi/CMakeLists.txt b/test/ztest/unit/math/fft_multi/CMakeLists.txt index b08ee40c0884..3287559f3050 100644 --- a/test/ztest/unit/math/fft_multi/CMakeLists.txt +++ b/test/ztest/unit/math/fft_multi/CMakeLists.txt @@ -16,7 +16,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/test/ztest/unit/common ${SOF_ROOT}/test/cmocka/include # Reference test vectors are #included in place from the CMocka tree diff --git a/test/ztest/unit/math/matrix/CMakeLists.txt b/test/ztest/unit/math/matrix/CMakeLists.txt index 6399f3c8ce1f..1dbfea88a08a 100644 --- a/test/ztest/unit/math/matrix/CMakeLists.txt +++ b/test/ztest/unit/math/matrix/CMakeLists.txt @@ -16,7 +16,7 @@ include(${SOF_ROOT}/scripts/cmake/uuid-registry.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ${SOF_ROOT}/test/ztest/unit/common # Reference test vectors are #included in place from the CMocka tree # rather than copied, so both frameworks share identical data. diff --git a/test/ztest/unit/objpool/CMakeLists.txt b/test/ztest/unit/objpool/CMakeLists.txt index 2ce499607463..f19b8a3e926c 100644 --- a/test/ztest/unit/objpool/CMakeLists.txt +++ b/test/ztest/unit/objpool/CMakeLists.txt @@ -11,7 +11,7 @@ include(${SOF_ROOT}/scripts/cmake/misc.cmake) target_include_directories(app PRIVATE ${SOF_ROOT}/zephyr/include ${SOF_ROOT}/src/include - ${SOF_ROOT}/src/platform/posix/include + ${SOF_ROOT}/src/kernel/platform/posix/include ) # Define SOF-specific configurations for unit testing diff --git a/tools/testbench/CMakeLists.txt b/tools/testbench/CMakeLists.txt index b07dc2be0e6a..ec949fc6ed14 100644 --- a/tools/testbench/CMakeLists.txt +++ b/tools/testbench/CMakeLists.txt @@ -39,7 +39,7 @@ set(sof_binary_directory "${PROJECT_BINARY_DIR}/sof_ep/build") set(config_h ${sof_binary_directory}/library_autoconfig.h) -target_include_directories(${testbench} PRIVATE "${sof_source_directory}/src/platform/library/include") +target_include_directories(${testbench} PRIVATE "${sof_source_directory}/src/kernel/platform/library/include") target_include_directories(${testbench} PRIVATE "${sof_source_directory}/src/audio") # Configuration time, make copy diff --git a/tools/tplg_parser/CMakeLists.txt b/tools/tplg_parser/CMakeLists.txt index 716d921d45c6..353808a3ef15 100644 --- a/tools/tplg_parser/CMakeLists.txt +++ b/tools/tplg_parser/CMakeLists.txt @@ -43,7 +43,7 @@ target_include_directories(sof_tplg_parser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/i target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/audio) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/kernel/arch/host/include) -target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/platform/library/include) +target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/kernel/platform/library/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/posix/include) # Configuration time, make copy diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 0e2ac1f68f6e..c90649aa4a61 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -156,7 +156,7 @@ zephyr_interface_library_named(SOF) cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..") set(SOF_SRC_PATH "${sof_top_dir}/src") -set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform") +set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/kernel/platform") set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/kernel/drivers") set(SOF_TRACE_PATH "${SOF_SRC_PATH}/trace") @@ -364,7 +364,7 @@ if (CONFIG_SOC_MIMX8ML8_M7) ) # SOF-specific linker script additions - zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/platform/imx8m_cm7/linker/data-sections.ld) + zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/kernel/platform/imx8m_cm7/linker/data-sections.ld) set(PLATFORM "imx8m_cm7") @@ -428,7 +428,7 @@ if (CONFIG_SOC_MIMX9596_M7) ) # SOF-specific linker script additions - zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/platform/imx95/linker/data-sections.ld) + zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/kernel/platform/imx95/linker/data-sections.ld) set(PLATFORM "imx95") From b1fcde6e32eb44466a72ccce8639d066c7ba1b42 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sat, 7 Nov 2026 15:08:32 +0000 Subject: [PATCH 3/3] zephyr: build all of src/kernel into sof_kernel zephyr/CMakeLists.txt lists the platform, driver and Xtensa cache attribute sources itself, mixed with the Zephyr integration sources in zephyr/lib, so they are built into modules_sof although they now live under src/kernel. After all sources have been added, move every source under src/kernel from modules_sof to sof_kernel, so that sof_kernel holds exactly the code in src/kernel however it was added. Both libraries are created in the same directory and link the same SOF interface library, so the compile flags do not change. No functional change. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Liam Girdwood --- zephyr/CMakeLists.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index c90649aa4a61..26453e6627aa 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -667,6 +667,25 @@ include(../scripts/cmake/version.cmake) include(../scripts/cmake/uuid-registry.cmake) +# Everything under src/kernel belongs in sof_kernel, also the platform, driver +# and architecture sources that this file lists itself rather than adding +# them from src/kernel/CMakeLists.txt. Move them out of modules_sof. +get_target_property(modules_sof_sources modules_sof SOURCES) +cmake_path(SET sof_kernel_src_dir NORMALIZE "${SOF_SRC_PATH}/kernel/") +set(sof_kernel_listed_sources) +foreach(src ${modules_sof_sources}) + cmake_path(ABSOLUTE_PATH src NORMALIZE OUTPUT_VARIABLE abs_src) + string(FIND "${abs_src}" "${sof_kernel_src_dir}" pos) + if(pos EQUAL 0) + list(APPEND sof_kernel_listed_sources ${src}) + endif() +endforeach() +if(sof_kernel_listed_sources) + list(REMOVE_ITEM modules_sof_sources ${sof_kernel_listed_sources}) + set_property(TARGET modules_sof PROPERTY SOURCES ${modules_sof_sources}) + target_sources(sof_kernel PRIVATE ${sof_kernel_listed_sources}) +endif() + # Create Trace realtive file paths sof_append_relative_path_definitions(modules_sof) sof_append_relative_path_definitions(sof_kernel)