Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

imx: spl: fix imx8m secure boot

Browse source 
cherry-picked from NXP code:
719d665a87c6: ("MLK-20467 imx8m: Fix issue for booting signed image through uuu")

which fixes secure boot on imx8m based boards. Problem was
that FIT header and so IVT header too, was loaded to
memallocated address. So the ivt header address coded
in IVT itself does not fit with the real position.

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Heiko Schocher 2021-08-17 08:17:18 +02:00 committed by Stefano Babic
parent 9de3544858
commit deb80ec023
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/mach-imx/spl.c
View file

@ -334,6 +334,20 @@ void board_spl_fit_post_load(const void *fit)
} }
#endif #endif
void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len)
{
int align_len = ARCH_DMA_MINALIGN - 1;
/* Some devices like SDP, NOR, NAND, SPI are using bl_len =1, so their fit address
* is different with SD/MMC, this cause mismatch with signed address. Thus, adjust
* the bl_len to align with SD/MMC.
*/
if (bl_len < 512)
bl_len = 512;
return (void *)((CONFIG_SYS_TEXT_BASE - fit_size - bl_len -
align_len) & ~align_len);
}
#endif #endif
#if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT) #if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT)

7
common/spl/spl_fit.c
View file

@ -538,6 +538,11 @@ static void *spl_get_fit_load_buffer(size_t size)
return buf; return buf;
} }
__weak void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len)
{
return spl_get_fit_load_buffer(sectors * bl_len);
}
/* /*
* Weak default function to allow customizing SPL fit loading for load-only * Weak default function to allow customizing SPL fit loading for load-only
* use cases by allowing to skip the parsing/processing of the FIT contents * use cases by allowing to skip the parsing/processing of the FIT contents
@ -640,7 +645,7 @@ static int spl_simple_fit_read(struct spl_fit_info *ctx,
* For FIT with external data, data is not loaded in this step. * For FIT with external data, data is not loaded in this step.
*/ */
sectors = get_aligned_image_size(info, size, 0); sectors = get_aligned_image_size(info, size, 0);
buf = spl_get_fit_load_buffer(sectors * info->bl_len); buf = board_spl_fit_buffer_addr(size, sectors, info->bl_len);
count = info->read(info, sector, sectors, buf); count = info->read(info, sector, sectors, buf);
ctx->fit = buf; ctx->fit = buf;