From patchwork Thu Jun 30 16:52:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 642694 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rgQZs34Tzz9s9n for ; Fri, 1 Jul 2016 02:52:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=ois8Cofy; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A89FDA756D; Thu, 30 Jun 2016 18:52:48 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ubsXdlohB4hf; Thu, 30 Jun 2016 18:52:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E3BC8A7528; Thu, 30 Jun 2016 18:52:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79170A74FB for ; Thu, 30 Jun 2016 18:52:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OdC_uSVYBK-f for ; Thu, 30 Jun 2016 18:52:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f181.google.com (mail-io0-f181.google.com [209.85.223.181]) by theia.denx.de (Postfix) with ESMTPS id 0449F4BA5C for ; Thu, 30 Jun 2016 18:52:41 +0200 (CEST) Received: by mail-io0-f181.google.com with SMTP id t74so77396758ioi.0 for ; Thu, 30 Jun 2016 09:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=urjEZVb9cgQuT30npAHMrijbLqwxidGpQwMusfqrZ18=; b=ois8Cofyf/vez3NO5FNfODrwQIDd96kfqtNuQNvFOPxi1DjYJSm0xpxTrL4GmOk7mh FxxBQt4FP3JtBzVpzA0G6UFCb0xvGVbCDQgQRxWrUsUTKOSi4I8OlPzhIVbXSDiV5BOG HHkHwuRo184rqLrsPsZD496v1QYON6D5/3MjUzmg0F3z2yWz45Sk7YpYA1Tk6sos/idh 9opP03D20oAukX6fsCXkNMsS76BndM/1/YvkjgX8SN1+MeDIiqDHqswIWUW8ZVpKaQle 9HkCy9D/hrHSbfYwj7mxiNg2zYTDRku1H6FmKLSgm4GGivslxcgquu5OtjdupA23Kcw8 hv4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=urjEZVb9cgQuT30npAHMrijbLqwxidGpQwMusfqrZ18=; b=CS3KIubwV45S1cuK/Q9JXItH+/S73fA8PMdGXNcoRVyzwePNuChh5XxBfTfR+APqh/ sWOe8xY+O6QfseLNx3lcfjJgNP+HYQ0GoHbQPF/ZRnzzgdxBCCevHnoZjsVYg2jG66iv eerktCEZUXcD+e7nW75KCXRoAVTgQCk3qx07IgymLCSLYc6FTfbsTlVHegbYSGqTT8kL +ETO/Z+2tKPi1GnFS9HWfKYdzu7PQ+0KjbSS740k4jPkdXDa3wyVAylL9WSQ0j+ZN/ND y4OUXCZ9tW0fNPEDyErcg3CTVEwLd+SxKJtyMZaj+aOjC6VFs3fmDDhF4rdV0gue/AW/ 959A== X-Gm-Message-State: ALyK8tKyztmh8RvbCLZlZPIpojcpp6T5YUIgZH301gI50x0a4G9Wg+pexYQahsOz/lgDi/Mk X-Received: by 10.107.5.12 with SMTP id 12mr15941552iof.160.1467305560139; Thu, 30 Jun 2016 09:52:40 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.57]) by smtp.gmail.com with ESMTPSA id g11sm1785827iod.41.2016.06.30.09.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2016 09:52:39 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 3184D220BC2; Thu, 30 Jun 2016 10:52:39 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 30 Jun 2016 10:52:07 -0600 Message-Id: <1467305540-13607-2-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1467305540-13607-1-git-send-email-sjg@chromium.org> References: <1467305540-13607-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Vinoth Eswaran , Joe Hershberger Subject: [U-Boot] [PATCH 01/14] mkimage: Honour the default image type with auto-fit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Tom Rini --- tools/mkimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) {