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 --- tools/mkimage.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/tools/mkimage.c b/tools/mkimage.c index 6826eae..5a82b4e 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -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':