Skip to content

Commit

Permalink
MCUboot: Update revision and update shared boot data API
Browse files Browse the repository at this point in the history
Updates to a newer version of MCUboot and updates the shared
data callback function to match the new definition

Change-Id: I2a1190dc25ffb7e5c2b7a46e7a7724af91cb65b1
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit eb8ff0d)
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
  • Loading branch information
nordicjm authored and carlescufi committed Sep 3, 2024
1 parent 6676619 commit a11cd27
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions bl2/src/shared_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,14 @@ static int collect_image_measurement_and_metadata(
* @param[in] hdr Pointer to the image header stored in RAM.
* @param[in] fap Pointer to the flash area where image is stored.
* @param[in] active_slot Which slot is active (to boot).
* @param[in] max_app_size Maximum allowed size of application for update
* slot.
* @param[in] max_app_sizes The maximum sizes of images that can be loaded.
*
* @return 0 on success; nonzero on failure.
*/
int boot_save_shared_data(const struct image_header *hdr,
const struct flash_area *fap,
const uint8_t active_slot,
const int max_app_size)
const struct image_max_size *max_app_sizes)
{
const struct flash_area *temp_fap;
uint8_t mcuboot_image_id = 0;
Expand All @@ -201,7 +200,7 @@ int boot_save_shared_data(const struct image_header *hdr,
#endif /* TFM_MEASURED_BOOT_API */

(void)active_slot;
(void)max_app_size;
(void)max_app_sizes;

if (hdr == NULL || fap == NULL) {
return -1;
Expand Down
2 changes: 1 addition & 1 deletion config/config_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set(MBEDCRYPTO_VERSION "mbedtls-3.6.0" CACHE STRING "The versio
set(MBEDCRYPTO_GIT_REMOTE "https://github.com/Mbed-TLS/mbedtls.git" CACHE STRING "The URL (or path) to retrieve MbedTLS from.")

set(MCUBOOT_PATH "DOWNLOAD" CACHE PATH "Path to MCUboot (or DOWNLOAD to fetch automatically")
set(MCUBOOT_VERSION "v2.1.0" CACHE STRING "The version of MCUboot to use")
set(MCUBOOT_VERSION "6071ceb" CACHE STRING "The version of MCUboot to use")

set(PLATFORM_PSA_ADAC_SECURE_DEBUG FALSE CACHE BOOL "Whether to use psa-adac secure debug.")
set(PLATFORM_PSA_ADAC_SOURCE_PATH "DOWNLOAD" CACHE PATH "Path to source dir of psa-adac.")
Expand Down

0 comments on commit a11cd27

Please sign in to comment.