summaryrefslogtreecommitdiff
path: root/tools/mkimage.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/mkimage.c')
-rw-r--r--tools/mkimage.c45
1 files changed, 2 insertions, 43 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c
index d375c2a..3cdbb2c 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -37,7 +37,7 @@ static int h_compare_category_name(const void *vtype1, const void *vtype2)
return strcmp(name1, name2);
}
-int show_valid_options(enum ih_category category)
+static int show_valid_options(enum ih_category category)
{
int *order;
int count;
@@ -68,47 +68,6 @@ int show_valid_options(enum ih_category category)
return 0;
}
-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");
-}
-
static void usage(const char *msg)
{
fprintf(stderr, "Error: %s\n", msg);
@@ -286,7 +245,7 @@ static void process_args(int argc, char **argv)
case 'T':
type = genimg_get_type_id(optarg);
if (type < 0) {
- show_image_types();
+ show_valid_options(IH_TYPE);
usage("Invalid image type");
}
break;