aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-12-06 01:33:24 -0600
committerWolfgang Denk <wd@denx.de>2009-12-07 23:01:42 +0100
commitfbc1c8f6f6c972524197829c56dd8f2f5da0200a (patch)
tree6171d1192ee32afbdfa3e59aee3bb6c11f33ace9 /tools
parentdf002fa6b9cd475909ede35bf95b803c2289c6a4 (diff)
downloadu-boot-linaro-stable-fbc1c8f6f6c972524197829c56dd8f2f5da0200a.tar.gz
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/mkimage.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 6826eae77..1bed93360 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)