From: Peter Tyser <ptyser@xes-inc.com>
Date: Tue, 24 Nov 2009 22:42:08 +0000 (-0600)
Subject: tools/mkimage: Assume FDT image type for FIT images
X-Git-Tag: v2009.11-rc2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e;p=oweals%2Fu-boot.git

tools/mkimage: Assume FDT image type for FIT images

When building a Flattened Image Tree (FIT) the image type needs to be
"flat_dt".  Commit 89a4d6b12fd6394898b8a454cbabeaf1cd59bae5 introduced a
regression which caused the user to need to specify the "-T flat_dt"
parameter on the command line when building a FIT image.  The "-T
flat_dt" parameter should not be needed and is at odds with the current
FIT image documentation.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 8a20594f31..2bf9a5b5eb 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -232,6 +232,12 @@ main (int argc, char **argv)
 				params.type = IH_TYPE_FLATDT;
 				params.datafile = *++argv;
 				params.fflag = 1;
+
+				/*
+				 * The flattened image tree (FIT) format
+				 * requires a flattened device tree image type
+				 */
+				params.type = IH_TYPE_FLATDT;
 				goto NXTARG;
 			case 'n':
 				if (--argc <= 0)