Message ID | 20210723091435.20388-15-marek.behun@nic.cz |
---|---|
State | Accepted |
Commit | 6458fd4fb1f6dd24c053238386a1aa6bf50563c1 |
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@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.a=rsa-sha256 header.s=default header.b=AEde8N5I; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GWNy66z5xz9sRN for <incoming@patchwork.ozlabs.org>; Fri, 23 Jul 2021 19:17:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B92882E8D; Fri, 23 Jul 2021 11:16:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="AEde8N5I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 69F9382D82; Fri, 23 Jul 2021 11:15:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail.nic.cz (lists.nic.cz [IPv6:2001:1488:800:400::400]) (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 121E782D86 for <u-boot@lists.denx.de>; Fri, 23 Jul 2021 11:14:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:8747:7254:5571:3010]) by mail.nic.cz (Postfix) with ESMTPSA id AE3FA1409F3; Fri, 23 Jul 2021 11:14:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1627031693; bh=4POc8uD/w8GtQXakN6gl58NSqREQxdAMRp7QPvdVwfs=; h=From:To:Date; b=AEde8N5IWBBTULICSxFk6+b2vEpd+IJqBS3Janyr6LXipDx2LhgbiMmVbSnkGjSXs YzwNQA07whx2yhghwLQD5jeuEKly9bVOa6byK5gEROSrjFQPC5hD3cBI+hzmSmrWP/ wYtJ6MaOeWTjzSC3ZG9TixGcVLI/rQXxVP6LkgSc= From: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> To: u-boot@lists.denx.de, Chris Packham <judge.packham@gmail.com>, Stefan Roese <sr@denx.de>, Baruch Siach <baruch@tkos.co.il>, Chris Packham <chris.packham@alliedtelesis.co.nz> Cc: Dennis Gilmore <dgilmore@redhat.com>, Mario Six <mario.six@gdsys.cc>, Jon Nettleton <jon@solid-run.com>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> Subject: [PATCH u-boot-mvebu v3 14/41] tools: kwbimage: Fix calculating size of binary header Date: Fri, 23 Jul 2021 11:14:08 +0200 Message-Id: <20210723091435.20388-15-marek.behun@nic.cz> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210723091435.20388-1-marek.behun@nic.cz> References: <20210723091435.20388-1-marek.behun@nic.cz> 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.34 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.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
kwboot / kwbimage improvements reducing image size
|
expand
|
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 2d4574af7d..6c9f93ae8b 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -984,7 +984,7 @@ static size_t image_headersz_v1(int *hasext) } headersz += sizeof(struct opt_hdr_v1) + - s.st_size + + ALIGN(s.st_size, 4) + (binarye->binary.nargs + 2) * sizeof(uint32_t); if (hasext) *hasext = 1; @@ -1051,14 +1051,7 @@ int add_binary_header_v1(uint8_t *cur) binhdrsz = sizeof(struct opt_hdr_v1) + (binarye->binary.nargs + 2) * sizeof(uint32_t) + - s.st_size; - - /* - * The size includes the binary image size, rounded - * up to a 4-byte boundary. Plus 4 bytes for the - * next-header byte and 3-byte alignment at the end. - */ - binhdrsz = ALIGN(binhdrsz, 4) + 4; + ALIGN(s.st_size, 4); hdr->headersz_lsb = cpu_to_le16(binhdrsz & 0xFFFF); hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;