From: Peter Tyser <ptyser@xes-inc.com>
Date: Sun, 6 Dec 2009 07:33:24 +0000 (-0600)
Subject: tools/mkimage: Remove duplicate line of code
X-Git-Tag: v2009.11-rc2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fbc1c8f6f6c972524197829c56dd8f2f5da0200a;p=u-boot

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 6826eae771..1bed93360e 100644
--- 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)