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 2B70CC433EF for ; Tue, 21 Dec 2021 15:58:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1BDDE83709; Tue, 21 Dec 2021 16:56:55 +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="fl+PdPEK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACAA6834CB; Tue, 21 Dec 2021 16:56:27 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (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 4242383592 for ; Tue, 21 Dec 2021 16:55:53 +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 E3CC8615DD; Tue, 21 Dec 2021 15:55:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 345DEC36AE8; Tue, 21 Dec 2021 15:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640102151; bh=PChRnTl/zad12+DZmg2TCDAP/uVkdDGB7RGpamfDiXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fl+PdPEKwVS2FnwllS451D+LO3LFaXjv2+T9BrUH9Ei79U8TZrjdfQkuCJ5w7GiQ1 xvD2tQxL/bRBT/9eh2mzyrmxIICReF5VtxEsLJkUXxHq8m4cD3PoJaoYZvqlDkWCCu vI9MELMz+crjD1UifZzMZKeD/PRVHs8WJbeehqMoXuhn9QHns0cgTqdA/EbkwdiQ9j +G7uBoUXC95xKQhbFGl76hJYgZHPulHf0QkZ4mjrX7RMGm+gLsZoaZ+3di19Rtjj4A OV7MkWALfDL+yQ9nv5vpbjaZTQo3YNZhSuteYtcOJje27fBNKQl2OMfymkbqJu14ef lMN4kHPA/I6Qg== Received: by pali.im (Postfix) id E0C57284D; Tue, 21 Dec 2021 16:55:50 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Chris Packham Cc: u-boot@lists.denx.de Subject: [PATCH u-boot-marvell 16/16] tools: kwbimage: Fix mkimage/dumpimage -l argument Date: Tue, 21 Dec 2021 16:54:16 +0100 Message-Id: <20211221155416.8557-17-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211221155416.8557-1-pali@kernel.org> References: <20211221155416.8557-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.38 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.2 at phobos.denx.de X-Virus-Status: Clean Do not check for kwbimage configuration file when just showing information about existing kwbimage file. The check for kwbimage configuration file is required only when creating kwbimage, not when showing information about image or when extracting data from image. With this change, it is possible to call mkimage -l and dumpimage -l also for existing kwbimage file. Signed-off-by: Pali Rohár Reviewed-by: Marek Behún --- tools/kwbimage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 3feab40c3fe1..4a3daf2d7cb0 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -2276,7 +2276,8 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params */ static int kwbimage_check_params(struct image_tool_params *params) { - if (!params->iflag && (!params->imagename || !strlen(params->imagename))) { + if (!params->lflag && !params->iflag && + (!params->imagename || !strlen(params->imagename))) { char *msg = "Configuration file for kwbimage creation omitted"; fprintf(stderr, "Error:%s - %s\n", params->cmdname, msg); -- 2.20.1