Merge branch '2021-02-18-SPL-FIT-OP-TEE-Linux-improvements'
- Improve interactions between SPL / OP-TEE and Linux in FIT images
This commit is contained in:
Tom Rini
commit
766927a759
@ -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");
|
||||
|
||||
@ -27,7 +27,14 @@ 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)
|
||||
struct spl_fit_info {
|
||||
const void *fit; /* Pointer to a valid FIT blob */
|
||||
size_t ext_data_offset; /* Offset to FIT external data (end of FIT) */
|
||||
int images_node; /* FDT offset to "/images" node */
|
||||
int conf_node; /* FDT offset to selected configuration node */
|
||||
};
|
||||
|
||||
__weak void board_spl_fit_post_load(const void *fit)
|
||||
{
|
||||
}
|
||||
|
||||
@ -71,32 +78,17 @@ static int find_node_from_desc(const void *fit, int node, const char *str)
|
||||
*
|
||||
* Return: 0 on success, or a negative error number
|
||||
*/
|
||||
static int spl_fit_get_image_name(const void *fit, int images,
|
||||
static int spl_fit_get_image_name(const struct spl_fit_info *ctx,
|
||||
const char *type, int index,
|
||||
const char **outname)
|
||||
{
|
||||
struct udevice *sysinfo;
|
||||
const char *name, *str;
|
||||
__maybe_unused int node;
|
||||
int conf_node;
|
||||
int len, i;
|
||||
bool found = true;
|
||||
|
||||
conf_node = fit_find_config_node(fit);
|
||||
if (conf_node < 0) {
|
||||
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
printf("No matching DT out of these options:\n");
|
||||
for (node = fdt_first_subnode(fit, conf_node);
|
||||
node >= 0;
|
||||
node = fdt_next_subnode(fit, node)) {
|
||||
name = fdt_getprop(fit, node, "description", &len);
|
||||
printf(" %s\n", name);
|
||||
}
|
||||
#endif
|
||||
return conf_node;
|
||||
}
|
||||
|
||||
name = fdt_getprop(fit, conf_node, type, &len);
|
||||
name = fdt_getprop(ctx->fit, ctx->conf_node, type, &len);
|
||||
if (!name) {
|
||||
debug("cannot find property '%s': %d\n", type, len);
|
||||
return -EINVAL;
|
||||
@ -130,11 +122,11 @@ static int spl_fit_get_image_name(const void *fit, int images,
|
||||
* node name.
|
||||
*/
|
||||
int node;
|
||||
int images = fdt_path_offset(fit, FIT_IMAGES_PATH);
|
||||
int images = fdt_path_offset(ctx->fit, FIT_IMAGES_PATH);
|
||||
|
||||
node = find_node_from_desc(fit, images, str);
|
||||
node = find_node_from_desc(ctx->fit, images, str);
|
||||
if (node > 0)
|
||||
str = fdt_get_name(fit, node, NULL);
|
||||
str = fdt_get_name(ctx->fit, node, NULL);
|
||||
|
||||
found = true;
|
||||
}
|
||||
@ -161,20 +153,20 @@ static int spl_fit_get_image_name(const void *fit, int images,
|
||||
* Return: the node offset of the respective image node or a negative
|
||||
* error number.
|
||||
*/
|
||||
static int spl_fit_get_image_node(const void *fit, int images,
|
||||
static int spl_fit_get_image_node(const struct spl_fit_info *ctx,
|
||||
const char *type, int index)
|
||||
{
|
||||
const char *str;
|
||||
int err;
|
||||
int node;
|
||||
|
||||
err = spl_fit_get_image_name(fit, images, type, index, &str);
|
||||
err = spl_fit_get_image_name(ctx, type, index, &str);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
debug("%s: '%s'\n", type, str);
|
||||
|
||||
node = fdt_subnode_offset(fit, images, str);
|
||||
node = fdt_subnode_offset(ctx->fit, ctx->images_node, str);
|
||||
if (node < 0) {
|
||||
pr_err("cannot find image node '%s': %d\n", str, node);
|
||||
return -EINVAL;
|
||||
@ -225,10 +217,7 @@ static int get_aligned_image_size(struct spl_load_info *info, int data_size,
|
||||
* spl_load_fit_image(): load the image described in a certain FIT node
|
||||
* @info: points to information about the device to load data from
|
||||
* @sector: the start sector of the FIT image on the device
|
||||
* @fit: points to the flattened device tree blob describing the FIT
|
||||
* image
|
||||
* @base_offset: the beginning of the data area containing the actual
|
||||
* image data, relative to the beginning of the FIT
|
||||
* @ctx: points to the FIT context structure
|
||||
* @node: offset of the DT node describing the image to load (relative
|
||||
* to @fit)
|
||||
* @image_info: will be filled with information about the loaded image
|
||||
@ -239,7 +228,7 @@ static int get_aligned_image_size(struct spl_load_info *info, int data_size,
|
||||
* Return: 0 on success or a negative error number.
|
||||
*/
|
||||
static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
|
||||
void *fit, ulong base_offset, int node,
|
||||
const struct spl_fit_info *ctx, int node,
|
||||
struct spl_image_info *image_info)
|
||||
{
|
||||
int offset;
|
||||
@ -253,6 +242,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
|
||||
int align_len = ARCH_DMA_MINALIGN - 1;
|
||||
uint8_t image_comp = -1, type = -1;
|
||||
const void *data;
|
||||
const void *fit = ctx->fit;
|
||||
bool external_data = false;
|
||||
|
||||
if (IS_ENABLED(CONFIG_SPL_FPGA) ||
|
||||
@ -274,7 +264,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
|
||||
if (!fit_image_get_data_position(fit, node, &offset)) {
|
||||
external_data = true;
|
||||
} else if (!fit_image_get_data_offset(fit, node, &offset)) {
|
||||
offset += base_offset;
|
||||
offset += ctx->ext_data_offset;
|
||||
external_data = true;
|
||||
}
|
||||
|
||||
@ -308,18 +298,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
|
||||
src = (void *)data;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_FIT_SIGNATURE
|
||||
printf("## Checking hash(es) for Image %s ... ",
|
||||
fit_get_name(fit, node, NULL));
|
||||
if (!fit_image_verify_with_data(fit, node,
|
||||
src, length))
|
||||
return -EPERM;
|
||||
puts("OK\n");
|
||||
#endif
|
||||
if (CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
|
||||
printf("## Checking hash(es) for Image %s ... ",
|
||||
fit_get_name(fit, node, NULL));
|
||||
if (!fit_image_verify_with_data(fit, node, src, length))
|
||||
return -EPERM;
|
||||
puts("OK\n");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS
|
||||
board_fit_image_post_process(&src, &length);
|
||||
#endif
|
||||
if (CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS))
|
||||
board_fit_image_post_process(&src, &length);
|
||||
|
||||
if (IS_ENABLED(CONFIG_SPL_GZIP) && image_comp == IH_COMP_GZIP) {
|
||||
size = length;
|
||||
@ -348,9 +336,21 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool os_takes_devicetree(uint8_t os)
|
||||
{
|
||||
switch (os) {
|
||||
case IH_OS_U_BOOT:
|
||||
return true;
|
||||
case IH_OS_LINUX:
|
||||
return IS_ENABLED(CONFIG_SPL_OS_BOOT);
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
struct spl_load_info *info, ulong sector,
|
||||
void *fit, int images, ulong base_offset)
|
||||
const struct spl_fit_info *ctx)
|
||||
{
|
||||
struct spl_image_info image_info;
|
||||
int node, ret = 0, index = 0;
|
||||
@ -362,7 +362,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
image_info.load_addr = spl_image->load_addr + spl_image->size;
|
||||
|
||||
/* Figure out which device tree the board wants to use */
|
||||
node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, index++);
|
||||
node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++);
|
||||
if (node < 0) {
|
||||
debug("%s: cannot find FDT node\n", __func__);
|
||||
|
||||
@ -376,7 +376,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
else
|
||||
return node;
|
||||
} else {
|
||||
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
|
||||
ret = spl_load_fit_image(info, sector, ctx, node,
|
||||
&image_info);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
@ -384,13 +384,14 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
|
||||
/* Make the load-address of the FDT available for the SPL framework */
|
||||
spl_image->fdt_addr = (void *)image_info.load_addr;
|
||||
#if !CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
|
||||
if (CONFIG_IS_ENABLED(FIT_IMAGE_TINY))
|
||||
return 0;
|
||||
|
||||
if (CONFIG_IS_ENABLED(LOAD_FIT_APPLY_OVERLAY)) {
|
||||
void *tmpbuffer = NULL;
|
||||
|
||||
for (; ; index++) {
|
||||
node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP,
|
||||
index);
|
||||
node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index);
|
||||
if (node == -E2BIG) {
|
||||
debug("%s: No additional FDT node\n", __func__);
|
||||
break;
|
||||
@ -413,7 +414,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
__func__);
|
||||
}
|
||||
image_info.load_addr = (ulong)tmpbuffer;
|
||||
ret = spl_load_fit_image(info, sector, fit, base_offset,
|
||||
ret = spl_load_fit_image(info, sector, ctx,
|
||||
node, &image_info);
|
||||
if (ret < 0)
|
||||
break;
|
||||
@ -428,12 +429,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
(void *)image_info.load_addr);
|
||||
if (ret) {
|
||||
pr_err("failed to apply DT overlay %s\n",
|
||||
fit_get_name(fit, node, NULL));
|
||||
fit_get_name(ctx->fit, node, NULL));
|
||||
break;
|
||||
}
|
||||
|
||||
debug("%s: DT overlay %s applied\n", __func__,
|
||||
fit_get_name(fit, node, NULL));
|
||||
fit_get_name(ctx->fit, node, NULL));
|
||||
}
|
||||
free(tmpbuffer);
|
||||
if (ret)
|
||||
@ -443,39 +444,39 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
|
||||
ret = fdt_shrink_to_minimum(spl_image->fdt_addr, 8192);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int spl_fit_record_loadable(const void *fit, int images, int index,
|
||||
static int spl_fit_record_loadable(const struct spl_fit_info *ctx, int index,
|
||||
void *blob, struct spl_image_info *image)
|
||||
{
|
||||
int ret = 0;
|
||||
#if !CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
|
||||
const char *name;
|
||||
int node;
|
||||
|
||||
ret = spl_fit_get_image_name(fit, images, "loadables",
|
||||
index, &name);
|
||||
if (CONFIG_IS_ENABLED(FIT_IMAGE_TINY))
|
||||
return 0;
|
||||
|
||||
ret = spl_fit_get_image_name(ctx, "loadables", index, &name);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
node = spl_fit_get_image_node(fit, images, "loadables", index);
|
||||
node = spl_fit_get_image_node(ctx, "loadables", index);
|
||||
|
||||
ret = fdt_record_loadable(blob, index, name, image->load_addr,
|
||||
image->size, image->entry_point,
|
||||
fdt_getprop(fit, node, "type", NULL),
|
||||
fdt_getprop(fit, node, "os", NULL));
|
||||
#endif
|
||||
fdt_getprop(ctx->fit, node, "type", NULL),
|
||||
fdt_getprop(ctx->fit, node, "os", NULL));
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int spl_fit_image_get_os(const void *fit, int noffset, uint8_t *os)
|
||||
{
|
||||
#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) && !defined(CONFIG_SPL_OS_BOOT)
|
||||
const char *name = fdt_getprop(fit, noffset, FIT_OS_PROP, NULL);
|
||||
if (!CONFIG_IS_ENABLED(FIT_IMAGE_TINY) || CONFIG_IS_ENABLED(OS_BOOT))
|
||||
return fit_image_get_os(fit, noffset, os);
|
||||
|
||||
const char *name = fdt_getprop(fit, noffset, FIT_OS_PROP, NULL);
|
||||
if (!name)
|
||||
return -ENOENT;
|
||||
|
||||
@ -490,9 +491,6 @@ static int spl_fit_image_get_os(const void *fit, int noffset, uint8_t *os)
|
||||
*os = IH_OS_INVALID;
|
||||
|
||||
return 0;
|
||||
#else
|
||||
return fit_image_get_os(fit, noffset, os);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -522,28 +520,22 @@ __weak bool spl_load_simple_fit_skip_processing(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
struct spl_load_info *info, ulong sector, void *fit)
|
||||
static int spl_simple_fit_read(struct spl_fit_info *ctx,
|
||||
struct spl_load_info *info, ulong sector,
|
||||
const void *fit_header)
|
||||
{
|
||||
unsigned long count, size;
|
||||
int sectors;
|
||||
ulong size, hsize;
|
||||
unsigned long count;
|
||||
struct spl_image_info image_info;
|
||||
int node = -1;
|
||||
int images, ret;
|
||||
int base_offset;
|
||||
int index = 0;
|
||||
int firmware_node;
|
||||
void *buf;
|
||||
|
||||
/*
|
||||
* For FIT with external data, figure out where the external images
|
||||
* start. This is the base for the data-offset properties in each
|
||||
* image.
|
||||
*/
|
||||
size = fdt_totalsize(fit);
|
||||
size = (size + 3) & ~3;
|
||||
size = ALIGN(fdt_totalsize(fit_header), 4);
|
||||
size = board_spl_fit_size_align(size);
|
||||
base_offset = (size + 3) & ~3;
|
||||
ctx->ext_data_offset = ALIGN(size, 4);
|
||||
|
||||
/*
|
||||
* So far we only have one block of data from the FIT. Read the entire
|
||||
@ -553,42 +545,69 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
* For FIT with external data, data is not loaded in this step.
|
||||
*/
|
||||
sectors = get_aligned_image_size(info, size, 0);
|
||||
hsize = sectors * info->bl_len;
|
||||
fit = spl_get_fit_load_buffer(hsize);
|
||||
count = info->read(info, sector, sectors, fit);
|
||||
buf = spl_get_fit_load_buffer(sectors * info->bl_len);
|
||||
|
||||
count = info->read(info, sector, sectors, buf);
|
||||
ctx->fit = buf;
|
||||
debug("fit read sector %lx, sectors=%d, dst=%p, count=%lu, size=0x%lx\n",
|
||||
sector, sectors, fit, count, size);
|
||||
sector, sectors, buf, count, size);
|
||||
|
||||
if (count == 0)
|
||||
return -EIO;
|
||||
return (count == 0) ? -EIO : 0;
|
||||
}
|
||||
|
||||
/* skip further processing if requested to enable load-only use cases */
|
||||
if (spl_load_simple_fit_skip_processing())
|
||||
return 0;
|
||||
static int spl_simple_fit_parse(struct spl_fit_info *ctx)
|
||||
{
|
||||
/* Find the correct subnode under "/configurations" */
|
||||
ctx->conf_node = fit_find_config_node(ctx->fit);
|
||||
if (ctx->conf_node < 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (IS_ENABLED(CONFIG_SPL_FIT_SIGNATURE)) {
|
||||
int conf_offset = fit_find_config_node(fit);
|
||||
|
||||
printf("## Checking hash(es) for config %s ... ",
|
||||
fit_get_name(fit, conf_offset, NULL));
|
||||
if (fit_config_verify(fit, conf_offset))
|
||||
fit_get_name(ctx->fit, ctx->conf_node, NULL));
|
||||
if (fit_config_verify(ctx->fit, ctx->conf_node))
|
||||
return -EPERM;
|
||||
puts("OK\n");
|
||||
}
|
||||
|
||||
/* find the node holding the images information */
|
||||
images = fdt_path_offset(fit, FIT_IMAGES_PATH);
|
||||
if (images < 0) {
|
||||
debug("%s: Cannot find /images node: %d\n", __func__, images);
|
||||
return -1;
|
||||
ctx->images_node = fdt_path_offset(ctx->fit, FIT_IMAGES_PATH);
|
||||
if (ctx->images_node < 0) {
|
||||
debug("%s: Cannot find /images node: %d\n", __func__,
|
||||
ctx->images_node);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
struct spl_load_info *info, ulong sector, void *fit)
|
||||
{
|
||||
struct spl_image_info image_info;
|
||||
struct spl_fit_info ctx;
|
||||
int node = -1;
|
||||
int ret;
|
||||
int index = 0;
|
||||
int firmware_node;
|
||||
|
||||
ret = spl_simple_fit_read(&ctx, info, sector, fit);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* skip further processing if requested to enable load-only use cases */
|
||||
if (spl_load_simple_fit_skip_processing())
|
||||
return 0;
|
||||
|
||||
ret = spl_simple_fit_parse(&ctx);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
#ifdef CONFIG_SPL_FPGA
|
||||
node = spl_fit_get_image_node(fit, images, "fpga", 0);
|
||||
node = spl_fit_get_image_node(&ctx, "fpga", 0);
|
||||
if (node >= 0) {
|
||||
/* Load the image and set up the spl_image structure */
|
||||
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
|
||||
spl_image);
|
||||
ret = spl_load_fit_image(info, sector, &ctx, node, spl_image);
|
||||
if (ret) {
|
||||
printf("%s: Cannot load the FPGA: %i\n", __func__, ret);
|
||||
return ret;
|
||||
@ -617,15 +636,14 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
* - fall back to using the first 'loadables' entry
|
||||
*/
|
||||
if (node < 0)
|
||||
node = spl_fit_get_image_node(fit, images, FIT_FIRMWARE_PROP,
|
||||
0);
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
if (node < 0)
|
||||
node = spl_fit_get_image_node(fit, images, FIT_KERNEL_PROP, 0);
|
||||
#endif
|
||||
node = spl_fit_get_image_node(&ctx, FIT_FIRMWARE_PROP, 0);
|
||||
|
||||
if (node < 0 && IS_ENABLED(CONFIG_SPL_OS_BOOT))
|
||||
node = spl_fit_get_image_node(&ctx, FIT_KERNEL_PROP, 0);
|
||||
|
||||
if (node < 0) {
|
||||
debug("could not find firmware image, trying loadables...\n");
|
||||
node = spl_fit_get_image_node(fit, images, "loadables", 0);
|
||||
node = spl_fit_get_image_node(&ctx, "loadables", 0);
|
||||
/*
|
||||
* If we pick the U-Boot image from "loadables", start at
|
||||
* the second image when later loading additional images.
|
||||
@ -639,8 +657,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
}
|
||||
|
||||
/* Load the image and set up the spl_image structure */
|
||||
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
|
||||
spl_image);
|
||||
ret = spl_load_fit_image(info, sector, &ctx, node, spl_image);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -648,21 +665,18 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
* For backward compatibility, we treat the first node that is
|
||||
* as a U-Boot image, if no OS-type has been declared.
|
||||
*/
|
||||
if (!spl_fit_image_get_os(fit, node, &spl_image->os))
|
||||
if (!spl_fit_image_get_os(ctx.fit, node, &spl_image->os))
|
||||
debug("Image OS is %s\n", genimg_get_os_name(spl_image->os));
|
||||
#if !defined(CONFIG_SPL_OS_BOOT)
|
||||
else
|
||||
else if (!IS_ENABLED(CONFIG_SPL_OS_BOOT))
|
||||
spl_image->os = IH_OS_U_BOOT;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Booting a next-stage U-Boot may require us to append the FDT.
|
||||
* We allow this to fail, as the U-Boot image might embed its FDT.
|
||||
*/
|
||||
if (spl_image->os == IH_OS_U_BOOT) {
|
||||
ret = spl_fit_append_fdt(spl_image, info, sector, fit,
|
||||
images, base_offset);
|
||||
if (!IS_ENABLED(CONFIG_OF_EMBED) && ret < 0)
|
||||
if (os_takes_devicetree(spl_image->os)) {
|
||||
ret = spl_fit_append_fdt(spl_image, info, sector, &ctx);
|
||||
if (ret < 0 && spl_image->os != IH_OS_U_BOOT)
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -671,7 +685,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
for (; ; index++) {
|
||||
uint8_t os_type = IH_OS_INVALID;
|
||||
|
||||
node = spl_fit_get_image_node(fit, images, "loadables", index);
|
||||
node = spl_fit_get_image_node(&ctx, "loadables", index);
|
||||
if (node < 0)
|
||||
break;
|
||||
|
||||
@ -683,20 +697,18 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
if (firmware_node == node)
|
||||
continue;
|
||||
|
||||
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
|
||||
&image_info);
|
||||
ret = spl_load_fit_image(info, sector, &ctx, node, &image_info);
|
||||
if (ret < 0) {
|
||||
printf("%s: can't load image loadables index %d (ret = %d)\n",
|
||||
__func__, index, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (!spl_fit_image_get_os(fit, node, &os_type))
|
||||
if (!spl_fit_image_get_os(ctx.fit, node, &os_type))
|
||||
debug("Loadable is %s\n", genimg_get_os_name(os_type));
|
||||
|
||||
if (os_type == IH_OS_U_BOOT) {
|
||||
spl_fit_append_fdt(&image_info, info, sector,
|
||||
fit, images, base_offset);
|
||||
if (os_takes_devicetree(os_type)) {
|
||||
spl_fit_append_fdt(&image_info, info, sector, &ctx);
|
||||
spl_image->fdt_addr = image_info.fdt_addr;
|
||||
}
|
||||
|
||||
@ -710,7 +722,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
||||
|
||||
/* Record our loadables into the FDT */
|
||||
if (spl_image->fdt_addr)
|
||||
spl_fit_record_loadable(fit, images, index,
|
||||
spl_fit_record_loadable(&ctx, index,
|
||||
spl_image->fdt_addr,
|
||||
&image_info);
|
||||
}
|
||||
@ -725,9 +737,8 @@ 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);
|
||||
#endif
|
||||
if (IS_ENABLED(CONFIG_IMX_HAB))
|
||||
board_spl_fit_post_load(ctx.fit);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1556,8 +1556,6 @@ bool android_image_print_dtb_contents(ulong hdr_addr);
|
||||
*/
|
||||
int board_fit_config_name_match(const char *name);
|
||||
|
||||
#if defined(CONFIG_SPL_FIT_IMAGE_POST_PROCESS) || \
|
||||
defined(CONFIG_FIT_IMAGE_POST_PROCESS)
|
||||
/**
|
||||
* board_fit_image_post_process() - Do any post-process on FIT binary data
|
||||
*
|
||||
@ -1572,11 +1570,6 @@ int board_fit_config_name_match(const char *name);
|
||||
* @return no return value (failure should be handled internally)
|
||||
*/
|
||||
void board_fit_image_post_process(void **p_image, size_t *p_size);
|
||||
#else
|
||||
static inline void board_fit_image_post_process(void **p_image, size_t *p_size)
|
||||
{
|
||||
}
|
||||
#endif /* CONFIG_SPL_FIT_IMAGE_POST_PROCESS */
|
||||
|
||||
#define FDT_ERROR ((ulong)(-1))
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user