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

rockchip: mkimage: play nice with dumpimage

Browse Source 
Dumpimage (it invoked with "-T rkspi" or "-T rksd") would not work due
to check_params failing. These changes ensure that we can both be called
with an empty imagename.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich 2017-04-17 17:48:05 +02:00 committed by Simon Glass
parent a1a2dfb870
commit 24aae93f97
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/rkcommon.c
View File

@ -86,6 +86,9 @@ static struct spl_info *rkcommon_get_spl_info(char *imagename)
{ {
int i; int i;
if (!imagename)
return NULL;
for (i = 0; i < ARRAY_SIZE(spl_infos); i++) for (i = 0; i < ARRAY_SIZE(spl_infos); i++)
if (!strncmp(imagename, spl_infos[i].imagename, 6)) if (!strncmp(imagename, spl_infos[i].imagename, 6))
return spl_infos + i; return spl_infos + i;
@ -98,17 +101,24 @@ int rkcommon_check_params(struct image_tool_params *params)
int i; int i;
if (rkcommon_get_spl_info(params->imagename) != NULL) if (rkcommon_get_spl_info(params->imagename) != NULL)
return 0; return EXIT_SUCCESS;
/*
* If this is a operation (list or extract), the don't require
* imagename to be set.
*/
if (params->lflag || params->iflag)
return EXIT_SUCCESS;
fprintf(stderr, "ERROR: imagename (%s) is not supported!\n", fprintf(stderr, "ERROR: imagename (%s) is not supported!\n",
strlen(params->imagename) > 0 ? params->imagename : "NULL"); params->imagename ? params->imagename : "NULL");
fprintf(stderr, "Available imagename:"); fprintf(stderr, "Available imagename:");
for (i = 0; i < ARRAY_SIZE(spl_infos); i++) for (i = 0; i < ARRAY_SIZE(spl_infos); i++)
fprintf(stderr, "\t%s", spl_infos[i].imagename); fprintf(stderr, "\t%s", spl_infos[i].imagename);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
return -1; return EXIT_FAILURE;
} }
const char *rkcommon_get_spl_hdr(struct image_tool_params *params) const char *rkcommon_get_spl_hdr(struct image_tool_params *params)