brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

spl: fit: Drop 'length' argument to board_spl_fit_post_load()

Browse Source 
The size is derived from the FIT image itself. Any alignment
requirements are machine-specific and known by the board code. Thus
the total length can be derived from the FIT image and knowledge of
the platform. The 'length' argument is redundant. Remove it.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
CC: Matt Porter <mporter@konsulko.com>
This commit is contained in:
Alexandru Gagniuc 2021-01-20 10:46:49 -06:00 committed by Tom Rini
parent 496f49464d
commit efc4ad0bc7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-imx/spl.c
View File

@ -19,6 +19,7 @@
#include <asm/mach-imx/hab.h>
#include <asm/mach-imx/boot_mode.h>
#include <g_dnl.h>
#include <linux/libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
@ -321,11 +322,11 @@ ulong board_spl_fit_size_align(ulong size)
return size;
}
void board_spl_fit_post_load(ulong load_addr, size_t length)
void board_spl_fit_post_load(const void *fit)
{
u32 offset = length - CONFIG_CSF_SIZE;
u32 offset = ALIGN(fdt_totalsize(fit), 0x1000);
if (imx_hab_authenticate_image(load_addr,
if (imx_hab_authenticate_image((uintptr_t)fit,
offset + IVT_SIZE + CSF_PAD_SIZE,
offset)) {
panic("spl: ERROR: image authentication unsuccessful\n");

4
common/spl/spl_fit.c
View File

@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
#endif
__weak void board_spl_fit_post_load(ulong load_addr, size_t length)
__weak void board_spl_fit_post_load(const void *fit)
{
}
@ -726,7 +726,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
spl_image->flags |= SPL_FIT_FOUND;
#ifdef CONFIG_IMX_HAB
board_spl_fit_post_load((ulong)fit, size);
board_spl_fit_post_load(fit);
#endif
return 0;

4
include/spl.h
View File

@ -701,9 +701,9 @@ int board_return_to_bootrom(struct spl_image_info *spl_image,
/**
* board_spl_fit_post_load - allow process images after loading finished
*
* @fit: Pointer to a valid Flattened Image Tree blob
*/
void board_spl_fit_post_load(ulong load_addr, size_t length);
void board_spl_fit_post_load(const void *fit);
/**
* board_spl_fit_size_align - specific size align before processing payload