leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: image-fit: Use a common function to get address

Browse Source 
FIT image supports load address and entry address. Getting these
addresses can use a common function.

Signed-off-by: York Sun <york.sun@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
York Sun 2016-02-29 15:48:40 -08:00 committed by Tom Rini
parent 2ac07f75d1
commit 6004765d14
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/image-fit.c
View File

@ -433,7 +433,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) || if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) ||
(type == IH_TYPE_RAMDISK)) { (type == IH_TYPE_RAMDISK)) {
fit_image_get_entry(fit, image_noffset, &entry); ret = fit_image_get_entry(fit, image_noffset, &entry);
printf("%s Entry Point: ", p); printf("%s Entry Point: ", p);
if (ret) if (ret)
printf("unavailable\n"); printf("unavailable\n");
@ -675,6 +675,22 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp)
return 0; return 0;
} }
static int fit_image_get_address(const void *fit, int noffset, char *name,
ulong *load)
{
int len;
const uint32_t *data;
data = fdt_getprop(fit, noffset, name, &len);
if (data == NULL) {
fit_get_debug(fit, noffset, name, len);
return -1;
}
*load = uimage_to_cpu(*data);
return 0;
}
/** /**
* fit_image_get_load() - get load addr property for given component image node * fit_image_get_load() - get load addr property for given component image node
* @fit: pointer to the FIT format image header * @fit: pointer to the FIT format image header
@ -690,17 +706,7 @@ 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 len; return fit_image_get_address(fit, noffset, FIT_LOAD_PROP, load);
const uint32_t *data;
data = fdt_getprop(fit, noffset, FIT_LOAD_PROP, &len);
if (data == NULL) {
fit_get_debug(fit, noffset, FIT_LOAD_PROP, len);
return -1;
}
*load = uimage_to_cpu(*data);
return 0;
} }
/** /**
@ -722,17 +728,7 @@ 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 len; return fit_image_get_address(fit, noffset, FIT_ENTRY_PROP, entry);
const uint32_t *data;
data = fdt_getprop(fit, noffset, FIT_ENTRY_PROP, &len);
if (data == NULL) {
fit_get_debug(fit, noffset, FIT_ENTRY_PROP, len);
return -1;
}
*entry = uimage_to_cpu(*data);
return 0;
} }
/** /**