From: Bartlomiej Sieka <tur@semihalf.com>
Date: Thu, 20 Mar 2008 22:10:19 +0000 (+0100)
Subject: [new uImage] Fix autoscr command used with new uImage format
X-Git-Tag: v1.3.3-rc1~141^2^2~4
X-Git-Url: https://git.sur5r.net/?p=u-boot;a=commitdiff_plain;h=36cc8cbb3379d5166f882641123521735c469f92

[new uImage] Fix autoscr command used with new uImage format

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
---

diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 5163d57cc4..1a37b90d79 100644
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -100,6 +100,13 @@ autoscript (ulong addr, const char *fit_uname)
 			puts ("Empty Script\n");
 			return 1;
 		}
+
+		/*
+		 * scripts are just multi-image files with one component, seek
+		 * past the zero-terminated sequence of image lengths to get
+		 * to the actual image data
+		 */
+		while (*data++);
 		break;
 #if defined(CONFIG_FIT)
 	case IMAGE_FORMAT_FIT:
@@ -155,8 +162,6 @@ autoscript (ulong addr, const char *fit_uname)
 		return 1;
 	}
 
-	while (*data++);
-
 	/* make sure cmd is null terminated */
 	memmove (cmd, (char *)data, len);
 	*(cmd + len) = 0;