From fbc1c8f6f6c972524197829c56dd8f2f5da0200a Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Sun, 6 Dec 2009 01:33:24 -0600 Subject: [PATCH] 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 Reordered code and comment a bit. Signed-off-by: Wolfgang Denk --- tools/mkimage.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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) -- 2.25.1