random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

mkimage: Skip adding non-existent IDs to a list

Browse Source 
In show_valid_options(), this patch introduces checking whether
a category has an entry ID. If not, adding it to a list for output
is skipped before calling qsort().
This patch will affect all kinds of image header categories
(-A, -C, -O and -T flags).

Signed-off-by: Naoki Hayama <naoki.hayama@lineo.co.jp>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Naoki Hayama 2020-10-07 11:21:55 +09:00 committed by Tom Rini
parent 02d41b01bd
commit ad5fb9f2e6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/mkimage.c
View File

@ -51,8 +51,13 @@ static int show_valid_options(enum ih_category category)
return -ENOMEM; return -ENOMEM;
/* Sort the names in order of short name for easier reading */ /* Sort the names in order of short name for easier reading */
for (item = 0; item < count; item++) for (i = 0, item = 0; i < count; i++, item++) {
order[item] = item; while (!genimg_cat_has_id(category, item) && i < count) {
item++;
count--;
}
order[i] = item;
}
cur_category = category; cur_category = category;
qsort(order, count, sizeof(int), h_compare_category_name); qsort(order, count, sizeof(int), h_compare_category_name);