Commit 5b9d44df authored by Simon Glass's avatar Simon Glass
Browse files

mkimage: Display a better list of available image types



Offer to display the available image types in help. Also, rather than
hacking the genimg_get_type_id() function to display a list of types,
do this in the tool. Also, sort the list.

The list of image types is quite long, and hard to discover. Print it out
when we show help information.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent a3c3cff0
......@@ -543,6 +543,15 @@ void genimg_print_time(time_t timestamp)
}
#endif
const table_entry_t *get_table_entry(const table_entry_t *table, int id)
{
for (; table->id >= 0; ++table) {
if (table->id == id)
return table;
}
return NULL;
}
/**
* get_table_entry_name - translate entry id to long name
* @table: pointer to a translation table for entries of a specific type
......@@ -559,15 +568,14 @@ void genimg_print_time(time_t timestamp)
*/
char *get_table_entry_name(const table_entry_t *table, char *msg, int id)
{
for (; table->id >= 0; ++table) {
if (table->id == id)
table = get_table_entry(table, id);
if (!table)
return msg;
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC)
return table->lname;
return table->lname;
#else
return table->lname + gd->reloc_off;
return table->lname + gd->reloc_off;
#endif
}
return (msg);
}
const char *genimg_get_os_name(uint8_t os)
......@@ -586,6 +594,20 @@ const char *genimg_get_type_name(uint8_t type)
return (get_table_entry_name(uimage_type, "Unknown Image", type));
}
const char *genimg_get_type_short_name(uint8_t type)
{
const table_entry_t *table;
table = get_table_entry(uimage_type, type);
if (!table)
return "unknown";
#if defined(USE_HOSTCC) || !defined(CONFIG_NEEDS_MANUAL_RELOC)
return table->sname;
#else
return table->sname + gd->reloc_off;
#endif
}
const char *genimg_get_comp_name(uint8_t comp)
{
return (get_table_entry_name(uimage_comp, "Unknown Compression",
......@@ -610,34 +632,18 @@ int get_table_entry_id(const table_entry_t *table,
const char *table_name, const char *name)
{
const table_entry_t *t;
#ifdef USE_HOSTCC
int first = 1;
for (t = table; t->id >= 0; ++t) {
if (t->sname && strcasecmp(t->sname, name) == 0)
return(t->id);
}
fprintf(stderr, "\nInvalid %s Type - valid names are", table_name);
for (t = table; t->id >= 0; ++t) {
if (t->sname == NULL)
continue;
fprintf(stderr, "%c %s", (first) ? ':' : ',', t->sname);
first = 0;
}
fprintf(stderr, "\n");
#else
for (t = table; t->id >= 0; ++t) {
#ifdef CONFIG_NEEDS_MANUAL_RELOC
if (t->sname && strcmp(t->sname + gd->reloc_off, name) == 0)
if (t->sname && strcasecmp(t->sname + gd->reloc_off, name) == 0)
#else
if (t->sname && strcmp(t->sname, name) == 0)
if (t->sname && strcasecmp(t->sname, name) == 0)
#endif
return (t->id);
}
debug("Invalid %s Type: %s\n", table_name, name);
#endif /* USE_HOSTCC */
return (-1);
return -1;
}
int genimg_get_os_id(const char *name)
......
......@@ -246,6 +246,8 @@ struct lmb;
#define IH_TYPE_LPC32XXIMAGE 21 /* x86 setup.bin Image */
#define IH_TYPE_LOADABLE 22 /* A list of typeless images */
#define IH_TYPE_COUNT 23 /* Number of image types */
/*
* Compression Types
*/
......@@ -411,6 +413,15 @@ char *get_table_entry_name(const table_entry_t *table, char *msg, int id);
const char *genimg_get_os_name(uint8_t os);
const char *genimg_get_arch_name(uint8_t arch);
const char *genimg_get_type_name(uint8_t type);
/**
* genimg_get_type_short_name() - get the short name for an image type
*
* @param type Image type (IH_TYPE_...)
* @return image short name, or "unknown" if unknown
*/
const char *genimg_get_type_short_name(uint8_t type);
const char *genimg_get_comp_name(uint8_t comp);
int genimg_get_os_id(const char *name);
int genimg_get_arch_id(const char *name);
......
......@@ -26,8 +26,48 @@ struct image_tool_params params = {
.imagename2 = "",
};
int
main (int argc, char **argv)
static int h_compare_image_name(const void *vtype1, const void *vtype2)
{
const int *type1 = vtype1;
const int *type2 = vtype2;
const char *name1 = genimg_get_type_short_name(*type1);
const char *name2 = genimg_get_type_short_name(*type2);
return strcmp(name1, name2);
}
/* Show all image types supported by mkimage */
static void show_image_types(void)
{
struct image_type_params *tparams;
int order[IH_TYPE_COUNT];
int count;
int type;
int i;
/* Sort the names in order of short name for easier reading */
memset(order, '\0', sizeof(order));
for (count = 0, type = 0; type < IH_TYPE_COUNT; type++) {
tparams = imagetool_get_type(type);
if (tparams)
order[count++] = type;
}
qsort(order, count, sizeof(int), h_compare_image_name);
fprintf(stderr, "\nInvalid image type. Supported image types:\n");
for (i = 0; i < count; i++) {
type = order[i];
tparams = imagetool_get_type(type);
if (tparams) {
fprintf(stderr, "\t%-15s %s\n",
genimg_get_type_short_name(type),
genimg_get_type_name(type));
}
}
fprintf(stderr, "\n");
}
int main(int argc, char **argv)
{
int ifd = -1;
struct stat sbuf;
......@@ -75,12 +115,16 @@ main (int argc, char **argv)
usage ();
goto NXTARG;
case 'T':
if ((--argc <= 0) ||
(params.type =
genimg_get_type_id (*++argv)) < 0)
usage ();
params.type = -1;
if (--argc >= 0 && argv[1]) {
params.type =
genimg_get_type_id(*++argv);
}
if (params.type < 0) {
show_image_types();
usage();
}
goto NXTARG;
case 'a':
if (--argc <= 0)
usage ();
......@@ -546,6 +590,7 @@ static void usage(void)
#endif
fprintf (stderr, " %s -V ==> print version information and exit\n",
params.cmdname);
fprintf(stderr, "Use -T to see a list of available image types\n");
exit (EXIT_FAILURE);
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment