Commit 481d394e authored by Lokesh Vutla's avatar Lokesh Vutla
Browse files

common: fit: Update board_fit_image_post_process() to pass fit and node_offset



board_fit_image_post_process() passes only start and size of the image,
but type of the image is not passed. So pass fit and node_offset, to
derive information about image to be processed.
Signed-off-by: Lokesh Vutla's avatarLokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini's avatarTom Rini <trini@konsulko.com>
Signed-off-by: default avatarTero Kristo <kristo@kernel.org>
parent 25805b6f
......@@ -18,7 +18,8 @@
#include <spl.h>
#include <asm/arch/sys_proto.h>
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
struct ti_sci_handle *ti_sci = get_ti_sci_handle();
struct ti_sci_proc_ops *proc_ops = &ti_sci->ops.proc_ops;
......
......@@ -103,7 +103,8 @@ static int k2_hs_bm_auth(int cmd, void *arg1)
return result;
}
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
int result = 0;
void *image = *p_image;
......
......@@ -103,7 +103,8 @@ __weak int board_fit_config_name_match(const char *name)
#endif
#if IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS)
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH)) {
if (socfpga_vendor_authentication(p_image, p_size))
......
......@@ -960,7 +960,8 @@ int board_fit_config_name_match(const char *name)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
......
......@@ -896,7 +896,8 @@ int embedded_dtb_select(void)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
......
......@@ -1199,7 +1199,8 @@ static int board_bootmode_has_emmc(void)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
......
......@@ -1065,7 +1065,8 @@ int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
void board_fit_image_post_process(void **p_image, size_t *p_size)
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
......
......@@ -2143,7 +2143,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
/* perform any post-processing on the image data */
if (!host_build() && IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS))
board_fit_image_post_process(&buf, &size);
board_fit_image_post_process(fit, noffset, &buf, &size);
len = (ulong)size;
......
......@@ -320,7 +320,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
}
if (CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS))
board_fit_image_post_process(&src, &length);
board_fit_image_post_process(fit, node, &src, &length);
load_ptr = map_sysmem(load_addr, length);
if (IS_ENABLED(CONFIG_SPL_GZIP) && image_comp == IH_COMP_GZIP) {
......
......@@ -1581,11 +1581,14 @@ int board_fit_config_name_match(const char *name);
* into the FIT creation (i.e. the binary blobs would have been pre-processed
* before being added to the FIT image).
*
* @fit: pointer to fit image
* @node: offset of image node
* @image: pointer to the image start pointer
* @size: pointer to the image size
* @return no return value (failure should be handled internally)
*/
void board_fit_image_post_process(void **p_image, size_t *p_size);
void board_fit_image_post_process(const void *fit, int node, void **p_image,
size_t *p_size);
#define FDT_ERROR ((ulong)(-1))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment