andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(fwu): rename is_fwu_initialized 

The variable is_fwu_initialized was initialized after
plat_fwu_set_images_source() is called.
But some functions called by plat_fwu_set_images_source() for STM32MP1
implementation expect is_fwu_initialized is set to true with asserts.
Rename is_fwu_initialized to is_metadata_initialized, and set it before
plat_fwu_set_images_source() is called.

Change-Id: I17c6ee6293dfa55385b0c859db442647f0bebaed
Signed-off-by: Sebastien Pasdeloup <sebastien.pasdeloup-ext@st.com>
Signed-off-by: Yann Gautier <yann.gautier@st.com>
This commit is contained in:
Sebastien Pasdeloup 2022-03-01 14:13:21 +01:00 committed by Yann Gautier
parent d62a210ab5
commit aae7c96de6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/fwu/fwu.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Arm Limited. All rights reserved.
* Copyright (c) 2021-2022, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -25,7 +25,7 @@ CASSERT((offsetof(struct fwu_metadata, crc_32) == 0),
crc_32_must_be_first_member_of_structure);
static struct fwu_metadata metadata;
static bool is_fwu_initialized;
static bool is_metadata_initialized __unused;
/*******************************************************************************
* Compute CRC32 of the FWU metadata, and check it against the CRC32 value
@ -142,7 +142,7 @@ bool fwu_is_trial_run_state(void)
{
bool trial_run = false;
assert(is_fwu_initialized);
assert(is_metadata_initialized);
for (unsigned int i = 0U; i < NR_OF_IMAGES_IN_FW_BANK; i++) {
struct fwu_image_entry *entry = &metadata.img_entry[i];
@ -159,7 +159,7 @@ bool fwu_is_trial_run_state(void)
const struct fwu_metadata *fwu_get_metadata(void)
{
assert(is_fwu_initialized);
assert(is_metadata_initialized);
return &metadata;
}
@ -188,7 +188,7 @@ void fwu_init(void)
}
}
plat_fwu_set_images_source(&metadata);
is_metadata_initialized = true;
is_fwu_initialized = true;
plat_fwu_set_images_source(&metadata);
}