[new uImage] Add new uImage format handling to other bootm related commands
Updated commands:
docboot - cmd_doc.c
fdcboot - cmd_fdc.c
diskboot - cmd_ide.c
nboot - cmd_nand.c
scsiboot - cmd_scsi.c
usbboot - cmd_usb.c
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 7868805..f49531e 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -211,6 +211,9 @@
disk_partition_t info;
image_header_t *hdr;
int rcode = 0;
+#if defined(CONFIG_FIT)
+ const void *fit_hdr;
+#endif
switch (argc) {
case 1:
@@ -277,11 +280,6 @@
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *)addr;
- if (!image_check_magic (hdr)) {
- printf("\n** Bad Magic Number **\n");
- return 1;
- }
-
if (!image_check_hcrc (hdr)) {
puts ("\n** Bad Header Checksum **\n");
return 1;
@@ -292,8 +290,15 @@
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
- fit_unsupported ("scsi");
- return 1;
+ fit_hdr = (const void *)addr;
+ if (!fit_check_format (fit_hdr)) {
+ puts ("** Bad FIT image format\n");
+ return 1;
+ }
+ puts ("Fit image detected...\n");
+
+ cnt = fit_get_size (fit_hdr);
+ break;
#endif
default:
puts ("** Unknown image type\n");
@@ -309,6 +314,13 @@
printf ("** Read error on %d:%d\n", dev, part);
return 1;
}
+
+#if defined(CONFIG_FIT)
+ /* This cannot be done earlier, we need complete FIT image in RAM first */
+ if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT)
+ fit_print_contents ((const void *)addr);
+#endif
+
/* Loading ok, update default load address */
load_addr = addr;