]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
tools/mkimage: Assume FDT image type for FIT images
authorPeter Tyser <ptyser@xes-inc.com>
Tue, 24 Nov 2009 22:42:08 +0000 (16:42 -0600)
committerWolfgang Denk <wd@denx.de>
Sat, 5 Dec 2009 00:12:39 +0000 (01:12 +0100)
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>
tools/mkimage.c

index 8a20594f316e558a63d9511316fadc38f946846d..2bf9a5b5eb500336b838c11ead83307082d699db 100644 (file)
@@ -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)