| Message ID | 20230221201925.9644-39-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 0a3a392c7122fccc1977d026cea9e48652b75688 |
| Delegated to: | Stefan Roese |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=PoREGtS8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrgP19hWz240n for <incoming@patchwork.ozlabs.org>; Wed, 22 Feb 2023 07:37:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B284E85B66; Tue, 21 Feb 2023 21:25: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=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="PoREGtS8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2AD7F85B22; Tue, 21 Feb 2023 21:24:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 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 1874C85B26 for <u-boot@lists.denx.de>; Tue, 21 Feb 2023 21:22:47 +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 B1A43611EB; Tue, 21 Feb 2023 20:22:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65BA1C4339C; Tue, 21 Feb 2023 20:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677010954; bh=IJlkqX9LHekWOg3vN0LLbPJUlyi/ctvcPZwWmBcWmnA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PoREGtS8YdfefTNK1Q9Xilcj5iGJXOXdsvHWB7iqnUhjriQCJ9PdpdY8hHs3pG4If 5R7bqxMa6h1pK10yhRCgyK1d3DtNyROZyjYfD7DffMJL5MwXHZvYCxzflWpdBaIE0f QzO2EBw3B02yFPHvL0bGEorl2hekJO9fk252BsZTMzv34nDjfk7AdtRFCaX+h91+9j wWKlGabUPTjfPs6lW1t0Hbu7cQZY5FUAPoj1820TkBE4pcfacR8dRVG/+rPJJtDqhp jR9DQy5lrXEpJpsDoRhzhlJnWYSyzrzasNyXqcusUo11z7mJLbXhSu940js/zkD3Iv bJr5kDedtf6Cg== Received: by pali.im (Postfix) id 225579FC; Tue, 21 Feb 2023 21:22:34 +0100 (CET) From: =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org> To: u-boot@lists.denx.de Cc: Stefan Roese <sr@denx.de>, Tony Dinh <mibodhi@gmail.com>, Josua Mayer <josua@solid-run.com> Subject: [PATCH RFC u-boot-mvebu 38/59] tools: kwbimage: Add support for dumping NAND_BLKSZ for v0 images Date: Tue, 21 Feb 2023 21:19:04 +0100 Message-Id: <20230221201925.9644-39-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
| Series |
arm: mvebu: Various fixes
|
expand
|
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 0c3b40d075e9..eb99ac944d24 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -2185,7 +2185,7 @@ static int kwbimage_generate_config(void *ptr, struct image_tool_params *params) if (mhdr->blockid == IBR_HDR_NAND_ID) fprintf(f, "NAND_PAGE_SIZE 0x%x\n", (unsigned)le16_to_cpu(mhdr->nandpagesize)); - if (version != 0 && mhdr->blockid == IBR_HDR_NAND_ID) { + if (mhdr->blockid == IBR_HDR_NAND_ID && (version != 0 || is_v0_ext || mhdr->nandblocksize != 0)) { if (mhdr->nandblocksize != 0) /* block size explicitly set in 64 kB unit */ fprintf(f, "NAND_BLKSZ 0x%x\n", (unsigned)mhdr->nandblocksize * 64*1024); else if (le16_to_cpu(mhdr->nandpagesize) > 512)
In Dove functional specification, which use kwbimage v0, is also defined nand block size field. So dump NAND_BLKSZ also for v0 images. In Kirkwood functional specification, which also use kwbimage v0, this field is not defined. So when it is zero and Kirkwood is detected, do not dump it. Fixes: f76ae2571fe0 ("tools: kwbimage: Add support for dumping extended and binary v0 headers") Signed-off-by: Pali Rohár <pali@kernel.org> --- tools/kwbimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)