From f39ca062e9d77fbea7a64e60ae4792f31e82fcf9 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 4 Oct 2023 17:04:01 -0700 Subject: [PATCH] zephyr/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 --- zephyr/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 7e2b9c46055b..6994eaf0ff8a 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -58,11 +58,12 @@ set(SOF_IPC_PATH "${SOF_SRC_PATH}/ipc") set(SOF_DEBUG_PATH "${SOF_SRC_PATH}/debug") set(SOF_MATH_PATH "${SOF_SRC_PATH}/math") set(SOF_TRACE_PATH "${SOF_SRC_PATH}/trace") +set(RIMAGE_TOP ${sof_top_dir}/rimage) # Save path to rimage configuration files in cmake cache for later use by # rimage during the "west sign" stage -get_filename_component(RIMAGE_CONFIG "../rimage/config" ABSOLUTE) -set(RIMAGE_CONFIG_PATH ${RIMAGE_CONFIG} CACHE PATH +# get_filename_component(RIMAGE_CONFIG "../tools/rimage/config" ABSOLUTE) +set(RIMAGE_CONFIG_PATH ${RIMAGE_TOP}/config} CACHE PATH " Path to rimage board configuration files") include(ExternalProject) @@ -87,7 +88,7 @@ ExternalProject_Add(sof_logger_ep ) # default SOF includes -target_include_directories(SOF INTERFACE ${sof_top_dir}/rimage/src/include) +target_include_directories(SOF INTERFACE ${RIMAGE_TOP}/src/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include) target_include_directories(SOF INTERFACE ${sof_top_dir}/third_party/include)