cmd: fit_image: Add default property for FIT format scripts
PATCH 1/1 cmd: fit_image: Add default property for FIT format scripts
When sourcing a FIT format script, if we've not been told the unit name to use, look for a default property at the root of /images to work out which unit we should use.
Signed-off-by Alex Kiernan <[email protected]>
---
cmd/source.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
cmd/source.c +26 -5
@@ -22,6 +22,24 @@#include <asm/byteorder.h> #include <asm/io.h> +#if defined(CONFIG_FIT ) +/** +* get_default_image() - Return default property from /images +* +* Return: Pointer to value of default property (or NULL) +*/ +static const char *get_default_image (const void *fit) +{ +int images_noffset; + + images_noffset =fdt_path_offset (fit,FIT_IMAGES_PATH ); +if (images_noffset <0 ) +return NULL ; + +return fdt_getprop (fit, images_noffset,FIT_DEFAULT_PROP ,NULL ); +} +#endif +int source (ulong addr,const char *fit_uname) {
@@ -87,17 +105,20 @@ source (ulong addr, const char *fit_uname)#endif #if defined(CONFIG_FIT )case IMAGE_FORMAT_FIT : -if (fit_uname ==NULL ) { -puts ("No FIT subimage unit name\n" ); -return 1 ; - } - fit_hdr = buf;if (!fit_check_format (fit_hdr)) {puts ("Bad FIT image format\n" );return 1 ; } +if (!fit_uname) + fit_uname =get_default_image (fit_hdr); + +if (!fit_uname) { +puts ("No FIT subimage unit name\n" ); +return 1 ; + } +/* get script component image node offset */ noffset =fit_image_get_node (fit_hdr, fit_uname);if (noffset <0 ) {
Signature · 1 line
2.17.1
PATCH 1/1 cmd: fit_image: Add default property for FIT format scripts
Quoted 9 lines · Alex Kiernan
When sourcing a FIT format script, if we've not been told the unit name to use, look for a default property at the root of /images to work out which unit we should use.
Signed-off-by Alex Kiernan <[email protected]>---
cmd/source.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
Reviewed-by Simon Glass <[email protected]>
Quoted 6 lines · Alex Kiernan
When sourcing a FIT format script, if we've not been told the unit name to use, look for a default property at the root of /images to work out which unit we should use.
Signed-off-by Alex Kiernan <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180720/00a07465/attachment.sig>