From d9b9870561b4feeebc41a91e8a690b38a1bb3076 Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Tue, 30 May 2023 09:43:08 +0300 Subject: [PATCH 1/2] platform: make ace and cavs use same platform code Move ace platform.c to zephyr/lib and make cavs also use it. At this point we should have all platform dependent differences moved to zephyr side thus platform code can be the same for all platforms and differentiation is done in device tree and code in zephyr side. Signed-off-by: Jaska Uimonen --- zephyr/CMakeLists.txt | 5 ++--- {src/platform/intel/ace => zephyr/lib}/platform.c | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename {src/platform/intel/ace => zephyr/lib}/platform.c (100%) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index d6aff8b0f547..f0c8e36c7948 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -185,9 +185,8 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25) set_source_files_properties(${SOF_PLATFORM_PATH}/intel/cavs/lib/power_down.S PROPERTIES COMPILE_FLAGS -DASSEMBLY) else() zephyr_library_sources( - ${SOF_PLATFORM_PATH}/intel/cavs/platform.c - ${SOF_PLATFORM_PATH}/intel/cavs/lib/mem_window.c ${SOF_PLATFORM_PATH}/tigerlake/lib/clk.c + lib/platform.c lib/pm_runtime.c lib/clk.c lib/dma.c @@ -217,7 +216,7 @@ if (CONFIG_SOC_SERIES_INTEL_ACE) # Platform sources zephyr_library_sources( - ${SOF_PLATFORM_PATH}/intel/ace/platform.c + lib/platform.c lib/pm_runtime.c lib/clk.c lib/dma.c diff --git a/src/platform/intel/ace/platform.c b/zephyr/lib/platform.c similarity index 100% rename from src/platform/intel/ace/platform.c rename to zephyr/lib/platform.c From 8bb0516978973f9f6f57390a3aee9879077dcab5 Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Tue, 30 May 2023 10:01:01 +0300 Subject: [PATCH 2/2] west.yaml: use zephyr version from test pr Use zephyr pull request that moves alh dma powering into driver code. Signed-off-by: Jaska Uimonen --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 2eb2994bf226..e295ede3f3e8 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 7d54586751cfe405d2cdcfd850f8100bc9844f63 + revision: pull/58774/head remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision