tools/mkimage: Remove duplicate line of code

Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and
6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the
same manner.  Unfortunately git was "smart" enough to merge both changes
which resulted in some duplicate code.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reordered code and comment a bit.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 6826eae7710ce73280daaff6e3fe76ee5d294fe7..1bed93360e8645dd6c2ea22bd6d3b8ce322686c7 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -229,15 +229,13 @@ main (int argc, char **argv)
                        case 'f':
                                if (--argc <= 0)
                                        usage ();
-                               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;
+                               params.datafile = *++argv;
+                               params.fflag = 1;
                                goto NXTARG;
                        case 'n':
                                if (--argc <= 0)