tools/mkimage: Remove duplicate line of code
PATCH 1/1 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 <[email protected]>
--- tools/mkimage.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
tools/mkimage.c +0 -1
@@ -222,21 +222,20 @@ main (int argc, char **argv)fprintf (stderr,"%s: invalid entry point %s\n" , params.cmdname, *argv);exit (EXIT_FAILURE ); } params.eflag =1 ; goto NXTARG;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 ; goto NXTARG;case 'n' :
Signature · 1 line
1.6.2.1
Wolfgang Denk
AppliedPATCH 1/1 tools/mkimage: Remove duplicate line of code
Dear Peter Tyser,
Quoted 9 lines · In message <[email protected]> you wrote:
Recent commits
1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0eand6a590c5f5fd12cdd27f3153522acfac3854590e7both 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 <[email protected]>--- tools/mkimage.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
Thanks, applied - but I decided to reorder the code and comment a bit.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Children are natural mimics who act like their parents despite every effort to teach them good manners.