From: Simon Glass <sjg@chromium.org>
Date: Thu, 30 Jun 2016 16:52:07 +0000 (-0600)
Subject: mkimage: Honour the default image type with auto-fit
X-Git-Tag: v2016.09-rc1~126
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=20deaddd465aeab6f6939fb1b660622d763791a9;p=oweals%2Fu-boot.git

mkimage: Honour the default image type with auto-fit

The default image type is supposed to be IH_TYPE_KERNEL, as set in the
'params' variable. Honour this with auto-fit also.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index ff3024a8f1..53fa8bb3a8 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -272,7 +272,7 @@ static void process_args(int argc, char **argv)
 	 * will always be IH_TYPE_FLATDT in this case).
 	 */
 	if (params.type == IH_TYPE_FLATDT) {
-		params.fit_image_type = type;
+		params.fit_image_type = type ? type : IH_TYPE_KERNEL;
 		if (!params.auto_its)
 			params.datafile = datafile;
 	} else if (type != IH_TYPE_INVALID) {