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 C5AB0C433EF for ; Wed, 12 Jan 2022 17:25:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AD79E835BA; Wed, 12 Jan 2022 18:22:30 +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="U6OL7o/X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EAFB38327E; Wed, 12 Jan 2022 18:22:14 +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 87F44834DC for ; Wed, 12 Jan 2022 18:22:01 +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 7300E616C7; Wed, 12 Jan 2022 17:22:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5F1DC36AEA; Wed, 12 Jan 2022 17:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642008119; bh=XF0QVsenUQedxOAL1Hr/MSIf50E3QkIwmMZzGn9Q3X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U6OL7o/XTKVptiJ3t7y3AVwNHRTGR1lIR+F9cd3dc6Iu137zCol8LWfWYkLZaRABn c2wZKo9SRw9IfUFp11AiIXkJZ9ZvlLKTfR3atX6h5uKZgsKGc0YS9j3SPOV9MOZwtH PPQNe+Lo0R1OTYj2wBALQP4V52rMUsrKAzt26xZHz7douUeWs6uxuAX+Pt3yodDmw0 vl27L4mcalkjXg3NeJZ2Zj2tQcQqoDQKb0r0dJs/ABv9+IbIs7s4mD8e3V4wcy5xy/ MrArm3S76VKF5Sbw0aYeym2BcK7JnW/1p3WbZ9zcTaAAoVEPbUI4M0dNXb38F+cdZX rG3SDiJ4CzEEA== Received: by pali.im (Postfix) id 6A263768; Wed, 12 Jan 2022 18:21:59 +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 v2 20/20] tools: kwbimage: Fix mkimage/dumpimage -l argument Date: Wed, 12 Jan 2022 18:20:54 +0100 Message-Id: <20220112172054.5961-21-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220112172054.5961-1-pali@kernel.org> References: <20211221155416.8557-1-pali@kernel.org> <20220112172054.5961-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.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 d159087d9dd6..9b63ce80ff4e 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -2331,7 +2331,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