From fac42e0cbb6a420d31c759c5d1ae20fa5b52c9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20=C5=9Aleszy=C5=84ski?= Date: Thu, 5 Aug 2021 09:42:35 +0200 Subject: [PATCH] [CP-282] Compute MD5 of the correct boot.bin file The version file must store the checksum of the secured boot.bin file. --- cmake/modules/AddBootBin.cmake | 6 ++++++ cmake/modules/AddVersionJson.cmake | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/modules/AddBootBin.cmake b/cmake/modules/AddBootBin.cmake index 84e87eb22d7f1b992e0bc0ddd1ff2926f6efb745..d3008f2bf64b08a398bc8c3b5a4893ec1bb22524 100644 --- a/cmake/modules/AddBootBin.cmake +++ b/cmake/modules/AddBootBin.cmake @@ -1,6 +1,12 @@ function(add_boot_bin SOURCE_TARGET) set(BIN_FILE ${CMAKE_BINARY_DIR}/sysroot/sys/current/${SOURCE_TARGET}-boot.bin) + set_target_properties( + ${SOURCE_TARGET} + PROPERTIES + BIN_FILE ${BIN_FILE} + ) + if (ENABLE_SECURE_BOOT) set (SREC_FILE ${CMAKE_PROJECT_NAME}.srec) # .srec file required by elftosb diff --git a/cmake/modules/AddVersionJson.cmake b/cmake/modules/AddVersionJson.cmake index 57d1936037b9d0f45bfc6e9751de3cdf294745fb..e0127fdbcb986ff58481bbd2617052309b6d422a 100644 --- a/cmake/modules/AddVersionJson.cmake +++ b/cmake/modules/AddVersionJson.cmake @@ -8,7 +8,7 @@ function(add_version_json SOURCE_TARGET) -DBOOTLOADER_FILE=${CMAKE_BINARY_DIR}/ecoboot.bin -DBOOTLOADER_VERSION_FILE=${CMAKE_BINARY_DIR}/ecoboot.version -DBOOT_FILENAME=boot.bin - -DBOOT_FILE=$ + -DBOOT_FILE=$ -DBOOT_VERSION=${CMAKE_PROJECT_VERSION} -DUPDATER_FILENAME=updater.bin -DUPDATER_FILE=${CMAKE_BINARY_DIR}/updater.bin