Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

SPL: Add FIT data-position property support

Browse source 
For external data, FIT has a optional property "data-position" which
can set the external data to a fixed offset to FIT beginning.
Add the support for this property in SPL FIT.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tomas Melin <tomas.melin@vaisala.com>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: "Andrew F. Davis" <afd@ti.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: "tomas.melin@vaisala.com" <tomas.melin@vaisala.com>
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: "Cooper Jr., Franklin" <fcooper@ti.com>
Cc: George McCollister <george.mccollister@gmail.com>
Cc: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>
Cc: Rick Altherr <raltherr@google.com>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Peng Fan 2017-12-05 13:20:59 +08:00 committed by Tom Rini
parent 6032c02947
commit a1be94b654
4 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/image-fit.c
View file

@ -806,6 +806,31 @@ int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset)
return 0; return 0;
} }
/**
* Get 'data-position' property from a given image node.
*
* @fit: pointer to the FIT image header
* @noffset: component image node offset
* @data_position: holds the data-position property
*
* returns:
* 0, on success
* -ENOENT if the property could not be found
*/
int fit_image_get_data_position(const void *fit, int noffset,
int *data_position)
{
const fdt32_t *val;
val = fdt_getprop(fit, noffset, FIT_DATA_POSITION_PROP, NULL);
if (!val)
return -ENOENT;
*data_position = fdt32_to_cpu(*val);
return 0;
}
/** /**
* Get 'data-size' property from a given image node. * Get 'data-size' property from a given image node.
* *

11
common/spl/spl_fit.c
View file

@ -173,6 +173,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
int align_len = ARCH_DMA_MINALIGN - 1; int align_len = ARCH_DMA_MINALIGN - 1;
uint8_t image_comp = -1, type = -1; uint8_t image_comp = -1, type = -1;
const void *data; const void *data;
bool external_data = false;
if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) { if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) {
if (fit_image_get_comp(fit, node, &image_comp)) if (fit_image_get_comp(fit, node, &image_comp))
@ -189,9 +190,15 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
if (fit_image_get_load(fit, node, &load_addr)) if (fit_image_get_load(fit, node, &load_addr))
load_addr = image_info->load_addr; load_addr = image_info->load_addr;
if (!fit_image_get_data_offset(fit, node, &offset)) { if (!fit_image_get_data_position(fit, node, &offset)) {
/* External data */ external_data = true;
} else if (!fit_image_get_data_offset(fit, node, &offset)) {
offset += base_offset; offset += base_offset;
external_data = true;
}
if (external_data) {
/* External data */
if (fit_image_get_data_size(fit, node, &len)) if (fit_image_get_data_size(fit, node, &len))
return -ENOENT; return -ENOENT;

3
doc/uImage.FIT/source_file_format.txt
View file

@ -288,7 +288,8 @@ In this case the 'data' property is omitted. Instead you can use:
The 'data-offset' property can be substituted with 'data-position', which The 'data-offset' property can be substituted with 'data-position', which
defines an absolute position or address as the offset. This is helpful when defines an absolute position or address as the offset. This is helpful when
booting U-Boot proper before performing relocation. booting U-Boot proper before performing relocation. Pass '-p [offset]' to
mkimage to enable 'data-position'.
Normal kernel FIT image has data embedded within FIT structure. U-Boot image Normal kernel FIT image has data embedded within FIT structure. U-Boot image
for SPL boot has external data. Existence of 'data-offset' can be used to for SPL boot has external data. Existence of 'data-offset' can be used to

3
include/image.h
View file

@ -887,6 +887,7 @@ int bootz_setup(ulong image, ulong *start, ulong *end);
/* image node */ /* image node */
#define FIT_DATA_PROP "data" #define FIT_DATA_PROP "data"
#define FIT_DATA_POSITION_PROP "data-position"
#define FIT_DATA_OFFSET_PROP "data-offset" #define FIT_DATA_OFFSET_PROP "data-offset"
#define FIT_DATA_SIZE_PROP "data-size" #define FIT_DATA_SIZE_PROP "data-size"
#define FIT_TIMESTAMP_PROP "timestamp" #define FIT_TIMESTAMP_PROP "timestamp"
@ -968,6 +969,8 @@ 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_data(const void *fit, int noffset,
const void **data, size_t *size); const void **data, 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 *data_position);
int fit_image_get_data_size(const void *fit, int noffset, int *data_size); int fit_image_get_data_size(const void *fit, int noffset, int *data_size);
int fit_image_hash_get_algo(const void *fit, int noffset, char **algo); int fit_image_hash_get_algo(const void *fit, int noffset, char **algo);