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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9B65C07E96 for ; Thu, 15 Jul 2021 08:34:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1FC866127C for ; Thu, 15 Jul 2021 08:34:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FC866127C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28B6B8203B; Thu, 15 Jul 2021 10:34:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1626338068; bh=X5PV1Jfbp9D4kcHZKwoXjWV6RKVkuASk71i3Ap7A7No=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PFhlx72scz/0EX8vypUFyBDn7Dc7bFhPn1hX1mVGNB5AHznzMTeuAF1mMLwtS6w46 NtXe6XvOg7AAwMS/0sKJrCaSFM7vqxjeEyKlAxImCyJSZS1c7i+Ng56+aLvgP+asDq ZWmysk8YfauD3EkwNFFoaCTmm3aOUqZ7717hDB3ejyXYgzD/Zini/PSXInX9hOD+Ix SC5IRLbRqceoB7RccIRig6OV+dBGpDnvXoBDwDAxETTuUEAR+ah2kjQbhZMMwbkZge A1Ld9IUM8NJgipVUL1gQ2pmXygOsP2NxIqSN3o+ja94DPTURmPTadcK/s3iPlncu7L 4Wh3L+S3CAzdw== Received: by phobos.denx.de (Postfix, from userid 109) id 1FC9A8203B; Thu, 15 Jul 2021 10:34:26 +0200 (CEST) Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [91.198.250.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 342A481E53 for ; Thu, 15 Jul 2021 10:34:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4GQSMz0ybNzQk9p; Thu, 15 Jul 2021 10:34:23 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 7xCA7J3Rejo6; Thu, 15 Jul 2021 10:34:19 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu 03/31] tools: kwbimage: Align SPI and NAND images to 256 bytes To: =?UTF-8?Q?Marek_Beh=c3=ban?= , u-boot@lists.denx.de, Chris Packham , Baruch Siach , Dirk Eibach , Chris Packham Cc: Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20210708173032.27999-1-marek.behun@nic.cz> <20210708173032.27999-4-marek.behun@nic.cz> From: Stefan Roese Message-ID: <1d1fe69a-2fa2-a6c7-9aa9-cebf7ab712c4@denx.de> Date: Thu, 15 Jul 2021 10:34:18 +0200 MIME-Version: 1.0 In-Reply-To: <20210708173032.27999-4-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -5.06 / 15.00 / 15.00 X-Rspamd-Queue-Id: 2BA6D18AD X-Rspamd-UID: 68d09e X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 On 08.07.21 19:30, Marek Behún wrote: > From: Pali Rohár > > Writing into SPI NOR and NAND memory can be done only in 256 bytes long > blocks. Align final image size so that when it is burned into SPI NOR or > NAND memory via U-Boot's commands (sf or mtd), we can use the $filesize > variable directly as the length argument. > > Signed-off-by: Pali Rohár > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese Thanks, Stefan > --- > tools/kwbimage.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/tools/kwbimage.c b/tools/kwbimage.c > index c775abf0e3..f40ba0994d 100644 > --- a/tools/kwbimage.c > +++ b/tools/kwbimage.c > @@ -1510,6 +1510,17 @@ static int image_get_version(void) > return e->version; > } > > +static int image_get_bootfrom(void) > +{ > + struct image_cfg_element *e; > + > + e = image_find_option(IMAGE_CFG_BOOT_FROM); > + if (!e) > + return -1; > + > + return e->bootfrom; > +} > + > static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd, > struct image_tool_params *params) > { > @@ -1642,6 +1653,7 @@ static int kwbimage_generate(struct image_tool_params *params, > FILE *fcfg; > struct stat s; > int alloc_len; > + int bootfrom; > int version; > void *hdr; > int ret; > @@ -1678,6 +1690,7 @@ static int kwbimage_generate(struct image_tool_params *params, > exit(EXIT_FAILURE); > } > > + bootfrom = image_get_bootfrom(); > version = image_get_version(); > switch (version) { > /* > @@ -1717,8 +1730,12 @@ static int kwbimage_generate(struct image_tool_params *params, > * The resulting image needs to be 4-byte aligned. At least > * the Marvell hdrparser tool complains if its unaligned. > * After the image data is stored 4-byte checksum. > + * Final SPI and NAND images must be aligned to 256 bytes. > */ > - return 4 + (4 - s.st_size % 4) % 4; > + if (bootfrom == IBR_HDR_SPI_ID || bootfrom == IBR_HDR_NAND_ID) > + return 4 + (256 - (alloc_len + s.st_size + 4) % 256) % 256; > + else > + return 4 + (4 - s.st_size % 4) % 4; > } > > /* > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de