From e9c23274afa2931f64d8ab0e6bd32221e3c81313 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Tue, 18 Jun 2024 16:32:06 -0700 Subject: [PATCH] Revert "soc: intel_adsp: only implement FW_STATUS boot protocol for cavs" This breaks SOF load on MTL devices. See SOF bug for details: https://github.com/thesofproject/sof/issues/9243 This reverts commit fa798ce2d5be6deb8a3b0cde307a0a1dc5e88dde. Signed-off-by: Andy Ross --- soc/intel/intel_adsp/cavs/CMakeLists.txt | 1 - soc/intel/intel_adsp/common/CMakeLists.txt | 1 + soc/intel/intel_adsp/{cavs => common}/boot_complete.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename soc/intel/intel_adsp/{cavs => common}/boot_complete.c (100%) diff --git a/soc/intel/intel_adsp/cavs/CMakeLists.txt b/soc/intel/intel_adsp/cavs/CMakeLists.txt index 3a7007f53ff..fdf8200fa6e 100644 --- a/soc/intel/intel_adsp/cavs/CMakeLists.txt +++ b/soc/intel/intel_adsp/cavs/CMakeLists.txt @@ -11,7 +11,6 @@ zephyr_library_sources( sram.c power.c power_down_cavs.S - boot_complete.c ) if(CONFIG_SMP OR CONFIG_MP_MAX_NUM_CPUS GREATER 1) diff --git a/soc/intel/intel_adsp/common/CMakeLists.txt b/soc/intel/intel_adsp/common/CMakeLists.txt index 03b206bf58f..11d8ca67c8b 100644 --- a/soc/intel/intel_adsp/common/CMakeLists.txt +++ b/soc/intel/intel_adsp/common/CMakeLists.txt @@ -16,6 +16,7 @@ zephyr_library_sources( boot.c soc.c mem_window.c + boot_complete.c ) zephyr_library_sources_ifdef(CONFIG_ADSP_CLOCK clk.c) diff --git a/soc/intel/intel_adsp/cavs/boot_complete.c b/soc/intel/intel_adsp/common/boot_complete.c similarity index 100% rename from soc/intel/intel_adsp/cavs/boot_complete.c rename to soc/intel/intel_adsp/common/boot_complete.c