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

Merge "fix(plat/st): only check header major when booting" into integration

This commit is contained in:
Manish Pandey 2021-10-15 13:48:10 +02:00 committed by TrustedFirmware Code Review
parent 09665c8348 8ce8918745
commit 02d36a92fc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plat/st/common/stm32mp_common.c
View File

@ -17,6 +17,8 @@
#include <plat/common/platform.h>
#include <services/arm_arch_svc.h>
#define HEADER_VERSION_MAJOR_MASK GENMASK(23, 16)
uintptr_t plat_get_ns_image_entrypoint(void)
{
return BL33_BASE;
@ -93,7 +95,8 @@ int stm32mp_check_header(boot_api_image_header_t *header, uintptr_t buffer)
return -EINVAL;
}
if (header->header_version != BOOT_API_HEADER_VERSION) {
if ((header->header_version & HEADER_VERSION_MAJOR_MASK) !=
(BOOT_API_HEADER_VERSION & HEADER_VERSION_MAJOR_MASK)) {
ERROR("Header version\n");
return -EINVAL;
}