cmake: add new ${RIMAGE_TOP} constant

In preparation for changing it, see
https://github.com/thesofproject/sof/issues/8178

No functional change yet.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2023-10-04 16:42:11 -07:00 committed by Kai Vehmanen
parent 51159d80e4
commit 2e7296f17f
3 changed files with 8 additions and 6 deletions

View File

@ -43,6 +43,8 @@ project(SOF C ASM)
set(SOF_ROOT_SOURCE_DIRECTORY "${PROJECT_SOURCE_DIR}")
set(SOF_ROOT_BINARY_DIRECTORY "${PROJECT_BINARY_DIR}")
set(RIMAGE_TOP "${PROJECT_SOURCE_DIR}/rimage")
# check git hooks
include(scripts/cmake/git-hooks.cmake)
@ -159,8 +161,8 @@ install(
${PROJECT_SOURCE_DIR}/src/include/ipc
${PROJECT_SOURCE_DIR}/src/include/kernel
${PROJECT_SOURCE_DIR}/src/include/user
${PROJECT_SOURCE_DIR}/rimage/src/include/sof/kernel
${PROJECT_SOURCE_DIR}/rimage/src/include/sof/user
${RIMAGE_TOP}/src/include/sof/kernel
${RIMAGE_TOP}/src/include/sof/user
DESTINATION include/sof
PATTERN "*.h"
)

View File

@ -330,7 +330,7 @@ add_custom_target(
ExternalProject_Add(rimage_ep
DEPENDS check_version_h
SOURCE_DIR "${PROJECT_SOURCE_DIR}/rimage"
SOURCE_DIR "${RIMAGE_TOP}"
PREFIX "${PROJECT_BINARY_DIR}/rimage_ep"
BINARY_DIR "${PROJECT_BINARY_DIR}/rimage_ep/build"
EXCLUDE_FROM_ALL TRUE
@ -386,7 +386,7 @@ if(MEU_PATH OR DEFINED MEU_NO_SIGN) # Don't sign with rimage
run_rimage
COMMAND ${PROJECT_BINARY_DIR}/rimage_ep/build/rimage
-o sof-${fw_name}.ri
-c "${PROJECT_SOURCE_DIR}/rimage/config/${fw_name}.toml"
-c "${RIMAGE_TOP}/config/${fw_name}.toml"
-s ${MEU_OFFSET}
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
@ -427,7 +427,7 @@ else() # sign with rimage
run_rimage
COMMAND ${PROJECT_BINARY_DIR}/rimage_ep/build/rimage
-o sof-${fw_name}.ri
-c "${PROJECT_SOURCE_DIR}/rimage/config/${fw_name}.toml"
-c "${RIMAGE_TOP}/config/${fw_name}.toml"
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
-f ${SOF_MAJOR}.${SOF_MINOR}.${SOF_MICRO}

View File

@ -9,4 +9,4 @@ add_local_sources(sof
ams_helpers.c
)
target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/rimage/src/include)
target_include_directories(sof_options INTERFACE ${RIMAGE_TOP}/src/include)