From c0d61cfb4298a32aaa314c1803017746ccbe400b Mon Sep 17 00:00:00 2001 From: Mengdong Lin Date: Fri, 29 Apr 2022 00:06:55 -0400 Subject: [PATCH] CMake: pass firmware file micro version to rimage SOF CMake defines SOF_MAJOR, SOF_MINOR and SOF_MICRO for 3 fields of firmware file version major.minor.micro. But CMake only passes the major and minor version to rimage. Now CMake will also pass the mirco version to rimage, so that rimage can write it to different firmware manifest headers for cAVS platforms and then sof_ri_info.py will be able to dump entire file version info from the firmware binary. Signed-off-by: Mengdong Lin --- src/arch/xtensa/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt index 4fed1c262d3a..7688ed19c5da 100644 --- a/src/arch/xtensa/CMakeLists.txt +++ b/src/arch/xtensa/CMakeLists.txt @@ -457,7 +457,7 @@ if(MEU_PATH OR DEFINED MEU_NO_SIGN) # Don't sign with rimage -s ${MEU_OFFSET} -k ${RIMAGE_PRIVATE_KEY} -i ${RIMAGE_IMR_TYPE} - -f ${SOF_MAJOR}.${SOF_MINOR} + -f ${SOF_MAJOR}.${SOF_MINOR}.${SOF_MICRO} -b ${SOF_BUILD} -e ${bootloader_binary_path} @@ -498,7 +498,7 @@ else() # sign with rimage -c "${PROJECT_SOURCE_DIR}/rimage/config/${fw_name}.toml" -k ${RIMAGE_PRIVATE_KEY} -i ${RIMAGE_IMR_TYPE} - -f ${SOF_MAJOR}.${SOF_MINOR} + -f ${SOF_MAJOR}.${SOF_MINOR}.${SOF_MICRO} -b ${SOF_BUILD} -e ${bootloader_binary_path}