X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_scsi.c;h=e648f7d6014eb1bf31f8eb972b6d222e6a582bfa;hb=4b13860e746b65e796213f2c97de8a80db8b68be;hp=786880521b9c4a4a42ee09cea30e941beaa5ca95;hpb=9a4daad0a35eb5143037eea9f786a3e9d672bdd6;p=u-boot

diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 786880521b..e648f7d601 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -211,6 +211,9 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	disk_partition_t info;
 	image_header_t *hdr;
 	int rcode = 0;
+#if defined(CONFIG_FIT)
+	const void *fit_hdr = NULL;
+#endif
 
 	switch (argc) {
 	case 1:
@@ -277,11 +280,6 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	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,11 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		break;
 #if defined(CONFIG_FIT)
 	case IMAGE_FORMAT_FIT:
-		fit_unsupported ("scsi");
-		return 1;
+		fit_hdr = (const void *)addr;
+		puts ("Fit image detected...\n");
+
+		cnt = fit_get_size (fit_hdr);
+		break;
 #endif
 	default:
 		puts ("** Unknown image type\n");
@@ -309,6 +310,18 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		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) {
+		if (!fit_check_format (fit_hdr)) {
+			puts ("** Bad FIT image format\n");
+			return 1;
+		}
+		fit_print_contents (fit_hdr);
+	}
+#endif
+
 	/* Loading ok, update default load address */
 	load_addr = addr;
 
@@ -381,7 +394,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			}
 			printf ("Usage:\n%s\n", cmdtp->usage);
 			return 1;
-  	case 3:
+	case 3:
 			if (strncmp(argv[1],"dev",3) == 0) {
 				int dev = (int)simple_strtoul(argv[2], NULL, 10);
 				printf ("\nSCSI device %d: ", dev);