sof: remove superfluous and duplicate code

1. SOF doesn't have to be built in .bin format 2. don't include soc.c and soc_mp.c twice in cmake 3. remove an unused mailbox.h header Signed-off-by: Guennadi Liakhovetski <[email protected]>
chrta · Jan 11, 2021 · daab673 · daab673
1 parent 3450aa3
commit daab673
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 66 deletions.
diff --git a/samples/audio/sof/prj.conf b/samples/audio/sof/prj.conf
@@ -2,6 +2,7 @@ CONFIG_SOF=y
 CONFIG_SMP=n
 CONFIG_LOG=y
 CONFIG_MP_NUM_CPUS=1
+CONFIG_BUILD_OUTPUT_BIN=n
 
 # Requires heap_info() be implemented, but no Zephyr wrapper
 CONFIG_DEBUG_MEMORY_USAGE_SCAN=n
diff --git a/soc/xtensa/intel_adsp/common/CMakeLists.txt b/soc/xtensa/intel_adsp/common/CMakeLists.txt
@@ -27,7 +27,5 @@ if(CONFIG_SOC_SERIES_INTEL_CAVS_V15 OR
    CONFIG_SOC_SERIES_INTEL_CAVS_V18 OR
    CONFIG_SOC_SERIES_INTEL_CAVS_V20 OR
    CONFIG_SOC_SERIES_INTEL_CAVS_V25)
-	zephyr_library_sources(soc.c)
-	zephyr_library_sources(soc_mp.c)
 	include(bootloader.cmake)
 endif()
diff --git a/soc/xtensa/intel_adsp/common/adsp.c b/soc/xtensa/intel_adsp/common/adsp.c
@@ -17,8 +17,6 @@ LOG_MODULE_REGISTER(sof);
 #include <soc/shim.h>
 #include <adsp/io.h>
 
-#include <cavs/mailbox.h>
-
 /*
  * Sets up the host windows so that the host can see the memory
  * content on the DSP SRAM.

diff --git a/soc/xtensa/intel_adsp/common/include/cavs/mailbox.h b/soc/xtensa/intel_adsp/common/include/cavs/mailbox.h