From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AAA49C636D7 for ; Tue, 21 Feb 2023 20:48:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5939D85A7A; Tue, 21 Feb 2023 21:48:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="h5gTAyi8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 906F285ADB; Tue, 21 Feb 2023 21:23:39 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8CE5185AE0 for ; Tue, 21 Feb 2023 21:22:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 719AA611F9; Tue, 21 Feb 2023 20:22:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBC53C433EF; Tue, 21 Feb 2023 20:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677010955; bh=QPReYEUn3dUOdojvR3mwRXfijyeGOize3u41xD3RbYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5gTAyi8x4umjEhLbpbzQqgh2cTUt/d5PRogiKde7/d2pdkPdRDimePFyQJNsgvFv nw5jHf4GVkV0rQ0WfDk8qFh2LAhfimHvrUOuRxVJHl19vr1FNJZ36yOIo+xemv6d0t AVJ5eYNTQOgCYGNF/05XJLbyYTws9sZYADXd9CSonFh0x3Kf+uwCSzuCX3ILFxBLQI /mftVTZZLhiSLpxE0Y9sDs6YB5yJdl1upeDG6gvombc5xWTWgRQ9hHo/kYLWReceuS eDaw2DqKENP5sM0SUByi/HVQrdb4HG5NwUeW0CaGUbeylECmaoOZR7zygrPI0L1Kjm AMxII4HmrXxNg== Received: by pali.im (Postfix) id 785669FC; Tue, 21 Feb 2023 21:22:35 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: u-boot@lists.denx.de Cc: Stefan Roese , Tony Dinh , Josua Mayer Subject: [PATCH RFC u-boot-mvebu 48/59] tools: mkimage: Do not try to open datafile when it is skipped Date: Tue, 21 Feb 2023 21:19:14 +0100 Message-Id: <20230221201925.9644-49-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230221201925.9644-1-pali@kernel.org> References: <20230221201925.9644-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean When mkimage was instructed to skip datafile via option -s then do not try to validate or open datafile as it does not have to exist or to be specified via -d option. This change allows to use -s option for skipping datafile when -d option for datafile was not specified. Signed-off-by: Pali Rohár --- tools/mkimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkimage.c b/tools/mkimage.c index c53768f8d8de..19c139f402c9 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -567,7 +567,7 @@ int main(int argc, char **argv) exit (retval); } - if ((params.type != IH_TYPE_MULTI) && (params.type != IH_TYPE_SCRIPT)) { + if (!params.skipcpy && params.type != IH_TYPE_MULTI && params.type != IH_TYPE_SCRIPT) { if (!params.datafile) { fprintf(stderr, "%s: Option -d with image data file was not specified\n", params.cmdname); -- 2.20.1