From e5b5628e8a3e4476509a025121315480ea7b79ca Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 17 Sep 2019 17:09:34 -0400 Subject: [PATCH] tools: fit_image: Use fit_image_get_data_and_size for getting offset/size This is very similar to fit_image_get_data but has the benefit of working on FIT images with external data unlike fit_image_get_data. This is useful for extracting sub-images from type of FIT image as this would previously just silently fail. Add an error message also so if this still fails it is easier to find out why. Signed-off-by: Andrew F. Davis Reviewed-by: Lokesh Vutla --- tools/fit_image.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index 0201cc44d8..114df5af30 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -741,9 +741,14 @@ static int fit_image_extract( { const void *file_data; size_t file_size = 0; + int ret; - /* get the "data" property of component at offset "image_noffset" */ - fit_image_get_data(fit, image_noffset, &file_data, &file_size); + /* get the data address and size of component at offset "image_noffset" */ + ret = fit_image_get_data_and_size(fit, image_noffset, &file_data, &file_size); + if (ret) { + fprintf(stderr, "Could not get component information\n"); + return ret; + } /* save the "file_data" into the file specified by "file_name" */ return imagetool_save_subimage(file_name, (ulong) file_data, file_size); -- 2.39.5