minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 03:23:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

tools/mkimage: Remove duplicate line of code

Browse Source 
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>
This commit is contained in:
Peter Tyser 2009-12-06 01:33:24 -06:00 committed by Wolfgang Denk
parent df002fa6b9
commit fbc1c8f6f6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mkimage.c
View File

@ -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)