Skip to content

Commit

Permalink
Add rimage as a git submodule
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dcpleung authored and lgirdwood committed May 13, 2020
1 parent 9495677 commit c00d39c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "rimage"]
path = rimage
url = https://github.com/thesofproject/rimage.git
branch = master
1 change: 1 addition & 0 deletions rimage
Submodule rimage added at f23b2c
8 changes: 5 additions & 3 deletions src/arch/xtensa/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit c00d39c

Please sign in to comment.