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 afd@ti.com --- 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 5aca634b5e..0e4c2271ce 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -738,9 +738,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);

On 9/17/19 5:09 PM, Andrew F. Davis wrote:

The dumpimage utility errors out in a number of places without providing sufficient feedback to allow the user to easily determine what has gone wrong. Add additional error messages to make the cause of the failure more obvious.

Signed-off-by: Andrew F. Davis afd@ti.com

ping

tools/dumpimage.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/dumpimage.c b/tools/dumpimage.c index ee3d41dda4..d5f893daf1 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -35,14 +35,23 @@ static int dumpimage_extract_subimage(struct image_type_params *tparams, if (tparams->verify_header) { retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size, &params);

• if (retval != 0)
  

• if (retval != 0) {
  

• 	fprintf(stderr, "%s: failed to verify header of %s\n",
  

• 		params.cmdname, tparams->name);
  return -1;
  

• }
  

• /*
  • Extract the file from the image
  • if verify is successful
  */ if (tparams->extract_subimage) { retval = tparams->extract_subimage(ptr, &params);

• 	if (retval != 0) {
  

• 		fprintf(stderr, "%s: extract_subimage failed for %s\n",
  

• 			params.cmdname, tparams->name);
  

• 		return -3;
  

• 	}
  

  } else { fprintf(stderr, "%s: extract_subimage undefined for %s\n",

@@ -175,6 +184,9 @@ int main(int argc, char **argv) * image type. Returns the error code if not matched */ retval = dumpimage_extract_subimage(tparams, ptr, &sbuf);

• if (retval)
  

• 	fprintf(stderr, "%s: Can't extract subimage from %s\n",
  

• 		params.cmdname, params.imagefile);
  

  } else { /*
  • Print the image information for matched image type

On 18/09/19 2:39 AM, Andrew F. Davis wrote:

The dumpimage utility errors out in a number of places without providing sufficient feedback to allow the user to easily determine what has gone wrong. Add additional error messages to make the cause of the failure more obvious.

Signed-off-by: Andrew F. Davis afd@ti.com

Reviewed-by: Lokesh Vutla lokeshvutla@ti.com

Thanks and regards, Lokesh

---

tools/dumpimage.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/dumpimage.c b/tools/dumpimage.c index ee3d41dda4..d5f893daf1 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -35,14 +35,23 @@ static int dumpimage_extract_subimage(struct image_type_params *tparams, if (tparams->verify_header) { retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size, &params);

• if (retval != 0)
  

• if (retval != 0) {
  

• 	fprintf(stderr, "%s: failed to verify header of %s\n",
  

• 		params.cmdname, tparams->name);
  return -1;
  

• }
  

• /*
  • Extract the file from the image
  • if verify is successful
  */ if (tparams->extract_subimage) { retval = tparams->extract_subimage(ptr, &params);

• 	if (retval != 0) {
  

• 		fprintf(stderr, "%s: extract_subimage failed for %s\n",
  

• 			params.cmdname, tparams->name);
  

• 		return -3;
  

• 	}
  

  } else { fprintf(stderr, "%s: extract_subimage undefined for %s\n",

@@ -175,6 +184,9 @@ int main(int argc, char **argv) * image type. Returns the error code if not matched */ retval = dumpimage_extract_subimage(tparams, ptr, &sbuf);

• if (retval)
  

• 	fprintf(stderr, "%s: Can't extract subimage from %s\n",
  

• 		params.cmdname, params.imagefile);
  

  } else { /*
  • Print the image information for matched image type