Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-01 08:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

boot: Rename fit_image_get_data()

Browse source 
This function can only be used with FITs that use embedded data. Rename
it so this is clear.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Simon Glass 2025-01-10 17:00:12 -07:00 • committed by Tom Rini
parent 9578694140
commit dc39ce8d90
9 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv8/sec_firmware.c
View file

@ -128,7 +128,7 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img,
return -EINVAL; return -EINVAL;
} }
if (fit_image_get_data(sec_firmware_img, ld_node_off, if (fit_image_get_emb_data(sec_firmware_img, ld_node_off,
&data, &size)) { &data, &size)) {
printf("SEC Loadable: Can't get subimage data/size"); printf("SEC Loadable: Can't get subimage data/size");
return -ENOENT; return -ENOENT;

2
arch/arm/mach-k3/r5/sysfw-loader.c
View file

@ -115,7 +115,7 @@ static int fit_get_data_by_name(const void *fit, int images, const char *name,
if (node_offset < 0) if (node_offset < 0)
return -ENOENT; return -ENOENT;
return fit_image_get_data(fit, node_offset, addr, size); return fit_image_get_emb_data(fit, node_offset, addr, size);
} }
static void k3_start_system_controller(int rproc_id, bool rproc_loaded, static void k3_start_system_controller(int rproc_id, bool rproc_loaded,

2
arch/x86/lib/bootm.c
View file

@ -104,7 +104,7 @@ static int boot_prep_linux(struct bootm_headers *images)
is_zimage = 1; is_zimage = 1;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
} else if (images->fit_uname_os && is_zimage) { } else if (images->fit_uname_os && is_zimage) {
ret = fit_image_get_data(images->fit_hdr_os, ret = fit_image_get_emb_data(images->fit_hdr_os,
images->fit_noffset_os, images->fit_noffset_os,
(const void **)&data, &len); (const void **)&data, &len);
if (ret) { if (ret) {

10
boot/image-fit.c
View file

@ -902,13 +902,13 @@ int fit_image_get_entry(const void *fit, int noffset, ulong *entry)
} }
/** /**
* fit_image_get_data - get data property and its size for a given component image node * fit_image_get_emb_data - get data property and its size for a given component image node
* @fit: pointer to the FIT format image header * @fit: pointer to the FIT format image header
* @noffset: component image node offset * @noffset: component image node offset
* @data: double pointer to void, will hold data property's data address * @data: double pointer to void, will hold data property's data address
* @size: pointer to size_t, will hold data property's data size * @size: pointer to size_t, will hold data property's data size
* *
* fit_image_get_data() finds data property in a given component image node. * fit_image_get_emb_data() finds data property in a given component image node.
* If the property is found its data start address and size are returned to * If the property is found its data start address and size are returned to
* the caller. * the caller.
* *
@ -916,8 +916,8 @@ int fit_image_get_entry(const void *fit, int noffset, ulong *entry)
* 0, on success * 0, on success
* -1, on failure * -1, on failure
*/ */
int fit_image_get_data(const void *fit, int noffset, int fit_image_get_emb_data(const void *fit, int noffset, const void **data,
const void **data, size_t *size) size_t *size)
{ {
int len; int len;
@ -1074,7 +1074,7 @@ int fit_image_get_data_and_size(const void *fit, int noffset,
*size = len; *size = len;
} }
} else { } else {
ret = fit_image_get_data(fit, noffset, data, size); ret = fit_image_get_emb_data(fit, noffset, data, size);
} }
return ret; return ret;

2
common/spl/spl_fit.c
View file

@ -289,7 +289,7 @@ static int load_simple_fit(struct spl_load_info *info, ulong fit_offset,
src = src_ptr + overhead; src = src_ptr + overhead;
} else { } else {
/* Embedded data */ /* Embedded data */
if (fit_image_get_data(fit, node, &data, &length)) { if (fit_image_get_emb_data(fit, node, &data, &length)) {
puts("Cannot get image data/size\n"); puts("Cannot get image data/size\n");
return -ENOENT; return -ENOENT;
} }

4
common/splash_source.c
View file

@ -396,7 +396,9 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
/* Extract the splash data from FIT */ /* Extract the splash data from FIT */
/* 1. Test if splash is in FIT internal data. */ /* 1. Test if splash is in FIT internal data. */
if (!fit_image_get_data(fit_header, node_offset, &internal_splash_data, &internal_splash_size)) if (!fit_image_get_emb_data(fit_header, node_offset,
&internal_splash_data,
&internal_splash_size))
memmove((void *)(uintptr_t)bmp_load_addr, internal_splash_data, internal_splash_size); memmove((void *)(uintptr_t)bmp_load_addr, internal_splash_data, internal_splash_size);
/* 2. Test if splash is in FIT external data with fixed position. */ /* 2. Test if splash is in FIT external data with fixed position. */
else if (!fit_image_get_data_position(fit_header, node_offset, &external_splash_addr)) else if (!fit_image_get_data_position(fit_header, node_offset, &external_splash_addr))

2
common/update.c
View file

@ -200,7 +200,7 @@ static int update_fit_getparams(const void *fit, int noffset, ulong *addr,
{ {
const void *data; const void *data;
if (fit_image_get_data(fit, noffset, &data, (size_t *)size)) if (fit_image_get_emb_data(fit, noffset, &data, (size_t *)size))
return 1; return 1;
if (fit_image_get_load(fit, noffset, (ulong *)fladdr)) if (fit_image_get_load(fit, noffset, (ulong *)fladdr))

4
include/image.h
View file

@ -1160,8 +1160,8 @@ int fit_image_get_type(const void *fit, int noffset, uint8_t *type);
int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp); int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp);
int fit_image_get_load(const void *fit, int noffset, ulong *load); int fit_image_get_load(const void *fit, int noffset, ulong *load);
int fit_image_get_entry(const void *fit, int noffset, ulong *entry); int fit_image_get_entry(const void *fit, int noffset, ulong *entry);
int fit_image_get_data(const void *fit, int noffset, int fit_image_get_emb_data(const void *fit, int noffset, const void **data,
const void **data, size_t *size); size_t *size);
int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset); int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset);
int fit_image_get_data_position(const void *fit, int noffset, int fit_image_get_data_position(const void *fit, int noffset,
int *data_position); int *data_position);

4
tools/image-host.c
View file

@ -574,7 +574,7 @@ int fit_image_cipher_data(const char *keydir, void *keydest,
} }
/* Get image data and data length */ /* Get image data and data length */
if (fit_image_get_data(fit, image_noffset, &data, &size)) { if (fit_image_get_emb_data(fit, image_noffset, &data, &size)) {
fprintf(stderr, "Can't get image data/size\n"); fprintf(stderr, "Can't get image data/size\n");
return -1; return -1;
} }
@ -654,7 +654,7 @@ int fit_image_add_verification_data(const char *keydir, const char *keyfile,
int noffset; int noffset;
/* Get image data and data length */ /* Get image data and data length */
if (fit_image_get_data(fit, image_noffset, &data, &size)) { if (fit_image_get_emb_data(fit, image_noffset, &data, &size)) {
fprintf(stderr, "Can't get image data/size\n"); fprintf(stderr, "Can't get image data/size\n");
return -1; return -1;
} }