[new uImage] Add new uImage format support for imls and iminfo commands
authorMarian Balakowicz <m8@semihalf.com>
Tue, 11 Mar 2008 11:35:20 +0000 (12:35 +0100)
committerMarian Balakowicz <m8@semihalf.com>
Tue, 11 Mar 2008 11:35:20 +0000 (12:35 +0100)
imls and iminfo can now recognize nad print out contents of the new (FIT)
format uImages.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
common/cmd_bootm.c

index 10403aa0fa9ef80ae3f8475fdc17d93329fb4ac6..daee7bf22ad75c69965b82a7f234b352c1a317ae 100644 (file)
@@ -556,7 +556,13 @@ static int image_info (ulong addr)
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
                puts ("   FIT image found\n");
-               fit_unsupported ("iminfo");
+
+               if (!fit_check_format (hdr)) {
+                       puts ("Bad FIT image format!\n");
+                       return 1;
+               }
+
+               fit_print_contents (hdr);
                return 0;
 #endif
        default:
@@ -601,9 +607,6 @@ int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                        switch (genimg_get_format (hdr)) {
                        case IMAGE_FORMAT_LEGACY:
-                               if (!image_check_magic (hdr))
-                                       goto next_sector;
-
                                if (!image_check_hcrc (hdr))
                                        goto next_sector;
 
@@ -619,8 +622,11 @@ int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                break;
 #if defined(CONFIG_FIT)
                        case IMAGE_FORMAT_FIT:
+                               if (!fit_check_format (hdr))
+                                       goto next_sector;
+
                                printf ("FIT Image at %08lX:\n", (ulong)hdr);
-                               fit_unsupported ("imls");
+                               fit_print_contents (hdr);
                                break;
 #endif
                        default: