From patchwork Thu Dec 21 22:59:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heimpold X-Patchwork-Id: 852165 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Oiyhl0C9"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=heimpold.de header.i=@heimpold.de header.b="IQbWrxRS"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z2nDP0117z9s7F for ; Fri, 22 Dec 2017 10:00:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QjWrLJLQmWEfp5k3eDwdmxQRzIE4TNBgzebI1pgIlcE=; b=Oiyhl0C9ZIAok5 QW5H4PInhFh8T2b/dBcw8MPsvq9UuA/jb/bhNWXNShzojwKtRQENu9hqa9FYVYkaYe1c0hQaO/0uq XMXBvG9cW1BqvYjoRRIisXOEtSYrKZUoWtIA0uwkFlLhrUWUaGFRf0LuK0ZRZfWQdzMcSdiU/vecq SSoyUwa0+jkevDQ3vdcCP1B0dWjE3oshVGu/GJQMjF+OnXhxqDJpaC5jh+agAPBfybQF7PUsKyenE fblAnBvAUbSWA7lmDxkzawb3pCn8h3UxW7qEefXD6I9ZwQe1Vv+OkJXhYeZOaLqk90uZuSU+Z6yrJ 9/jIC7mgnAyv8bOVxt3Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eS9pD-0006E2-9B; Thu, 21 Dec 2017 23:00:27 +0000 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::11]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eS9om-0005Vt-3P for lede-dev@lists.infradead.org; Thu, 21 Dec 2017 23:00:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1513897187; s=domk; d=heimpold.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject; bh=f6r7g6e5T8l9BrZowp1E55p1Sa7pMWXnahkdacfoecg=; b=IQbWrxRSTP4CfYJE0en29oQTwCIBXOhekMm/L6m/Q9oBtVf/PoaeDGcHgc0Aap0DaQ iML93H7Yl9BFNle2QFAqHXrMXoj0riaIxBpNpSEUgM++sMT4FUHZXPypm0bm58Tssawu 6agcJYX3ZZ2/Wadk3jcCRczHSOQDz07nJ3Y5Q= X-RZG-AUTH: :O2kGeEG7b/pS1EW8QnKjhhg/vO4pzqdNytq77N6ZPUGwIpLOmsCM+BB/JuKj9RosYI7owD/XKfycfQ== X-RZG-CLASS-ID: mo00 Received: from tonne.mhei.heimpold.itr (p5DC3A286.dip0.t-ipconnect.de [93.195.162.134]) by smtp.strato.de (RZmta 42.14 DYNA|AUTH) with ESMTPSA id Y00a23tBLMxkSWT (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Thu, 21 Dec 2017 23:59:46 +0100 (CET) Received: from kerker.mhei.heimpold.itr (kerker.mhei.heimpold.itr [192.168.8.1]) by tonne.mhei.heimpold.itr (Postfix) with ESMTP id A3E7915F104; Thu, 21 Dec 2017 23:59:46 +0100 (CET) From: Michael Heimpold To: lede-dev@lists.infradead.org Date: Thu, 21 Dec 2017 23:59:33 +0100 Message-Id: <1513897174-20803-7-git-send-email-mhei@heimpold.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513897174-20803-1-git-send-email-mhei@heimpold.de> References: <1513897174-20803-1-git-send-email-mhei@heimpold.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171221_150000_614912_2A70990F X-CRM114-Status: UNSURE ( 7.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a01:238:20a:202:5300:0:0:11 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 6/7] firmware-tools/ptgen: fix start sector calculation X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Heimpold MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Consider the following example: $ ./ptgen -v -a 0 -h 255 -s 63 -l 1024 -o test2.img -p 3M -p 128M -p 128M Partition 0: start=1048576, end=4194304, size=3145728 1048576 3145728 Partition 1: start=5242880, end=139460608, size=134217728 5242880 134217728 Partition 2: start=140509184, end=274726912, size=134217728 140509184 134217728 Opening the image file with cfdisk shows that there is free space between the partitions which is not required/intended: Size: 1 GiB, 1073741824 bytes, 2097152 sectors Label: dos, identifier: 0x5452574f Device Boot Start End Sectors Size Id Type test2.img1 2048 8191 6144 3M 83 Linux Free space 8192 10239 2048 1M test2.img2 10240 272383 262144 128M 83 Linux Free space 272384 274431 2048 1M test2.img3 274432 536575 262144 128M 83 Linux Free space 536576 2097151 1560576 762M With this patch the very same execution of ptgen results in: $ ./ptgen -v -a 0 -h 255 -s 63 -l 1024 -o test2.img -p 3M -p 128M -p 128M Partition 0: start=1048576, end=4194304, size=3145728 1048576 3145728 Partition 1: start=4194304, end=138412032, size=134217728 4194304 134217728 Partition 2: start=138412032, end=272629760, size=134217728 138412032 134217728 And the view with cfdisk shows, that there is no free space inserted anymore: Disk: test2.img Size: 1 GiB, 1073741824 bytes, 2097152 sectors Label: dos, identifier: 0x5452574f Device Boot Start End Sectors Size Id Type test2.img1 2048 8191 6144 3M 83 Linux test2.img2 8192 270335 262144 128M 83 Linux test2.img3 270336 532479 262144 128M 83 Linux Free space 532480 2097151 1564672 764M Signed-off-by: Michael Heimpold --- tools/firmware-utils/src/ptgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c index 3e1b8ba..d549faf 100644 --- a/tools/firmware-utils/src/ptgen.c +++ b/tools/firmware-utils/src/ptgen.c @@ -149,7 +149,7 @@ static int gen_ptable(uint32_t signature, int nr) pte[i].active = ((i + 1) == active) ? 0x80 : 0; pte[i].type = parts[i].type; - start = sect + sectors; + start = sect + ((i == 0) ? sectors : 0); if (kb_align != 0) start = round_to_kb(start); pte[i].start = cpu_to_le32(start);