cmake: use fw.h and manifest.h from rimage/

Since both fw.h and manifest.h are being used in the main SOF repo, and also the standalone rimage repo, to prevent them getting out of sync, use the ones coming from the rimage repo instead. Also, git submodule update is being executed when cmake is run so there is no need to update when building rimage. Signed-off-by: Daniel Leung <[email protected]>
thesofproject · May 13, 2020 · f6f748b · f6f748b
1 parent d53778f
commit f6f748b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 309 deletions.
diff --git a/smex/CMakeLists.txt b/smex/CMakeLists.txt
@@ -18,4 +18,5 @@ target_compile_options(smex PRIVATE
 
 target_include_directories(smex PRIVATE
 	"${SOF_ROOT_SOURCE_DIRECTORY}/src/include"
+	"${SOF_ROOT_SOURCE_DIRECTORY}/rimage/src/include/sof"
 )
diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
@@ -347,7 +347,6 @@ add_custom_target(
 
 ExternalProject_Add(rimage_ep
 	DEPENDS check_version_h
-	DOWNLOAD_COMMAND git submodule update --init
 	SOURCE_DIR "${PROJECT_SOURCE_DIR}/rimage"
 	PREFIX "${PROJECT_BINARY_DIR}/rimage_ep"
 	BINARY_DIR "${PROJECT_BINARY_DIR}/rimage_ep/build"

diff --git a/src/include/kernel/fw.h b/src/include/kernel/fw.h
diff --git a/src/include/user/manifest.h b/src/include/user/manifest.h
diff --git a/tools/logger/CMakeLists.txt b/tools/logger/CMakeLists.txt
@@ -11,6 +11,7 @@ target_compile_options(sof-logger PRIVATE
 
 target_include_directories(sof-logger PRIVATE
 	"${SOF_ROOT_SOURCE_DIRECTORY}/src/include"
+	"${SOF_ROOT_SOURCE_DIRECTORY}/rimage/src/include/sof"
 	"${SOF_ROOT_SOURCE_DIRECTORY}"
 )