Add rimage as a git submodule

This adds rimage as a git submodule by running:
  git submodule add https://github.com/thesofproject/rimage.git rimage
  git submodule set-branch --branch master rimage

This also modifies the build script to build the tool.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2019-11-12 11:05:05 -08:00 committed by Liam Girdwood
parent 94956778b0
commit c00d39c71b
3 changed files with 10 additions and 3 deletions

4
.gitmodules vendored Normal file
View File

@ -0,0 +1,4 @@
[submodule "rimage"]
path = rimage
url = https://github.com/thesofproject/rimage.git
branch = master

1
rimage Submodule

@ -0,0 +1 @@
Subproject commit f23b2c2d07d13b60efe881203d754475b11fbfba

View File

@ -347,13 +347,11 @@ add_custom_target(
ExternalProject_Add(rimage_ep
DEPENDS check_version_h
DOWNLOAD_COMMAND ""
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"
BUILD_ALWAYS 1
CMAKE_ARGS -DVERSION_H_PATH=${VERSION_H_PATH}
-DPEM_KEY_PREFIX=${PROJECT_SOURCE_DIR}/rimage/keys
INSTALL_COMMAND ""
)
@ -392,6 +390,8 @@ if(MEU_PATH)
-s ${MEU_OFFSET}
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
-f ${SOF_MAJOR}.${SOF_MINOR}
-b ${SOF_BUILD}
${RIMAGE_MOD_OFFSET_FLAG}
${bootloader_binary_path}
sof-${fw_name}
@ -431,6 +431,8 @@ else()
-m ${fw_name}
-k ${RIMAGE_PRIVATE_KEY}
-i ${RIMAGE_IMR_TYPE}
-f ${SOF_MAJOR}.${SOF_MINOR}
-b ${SOF_BUILD}
${RIMAGE_MOD_OFFSET_FLAG}
${bootloader_binary_path}
sof-${fw_name}