Message ID | 1467305540-13607-2-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 20deaddd465aeab6f6939fb1b660622d763791a9 |
Delegated to: | Tom Rini |
Headers | show |
On Thu, Jun 30, 2016 at 10:52:07AM -0600, Simon Glass wrote: > 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>
On Thu, Jun 30, 2016 at 10:52:07AM -0600, Simon Glass wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/tools/mkimage.c b/tools/mkimage.c index ff3024a..53fa8bb 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) {
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> --- tools/mkimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)