Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gS0s2-0001rP-FO for mharc-grub-devel@gnu.org; Wed, 28 Nov 2018 09:31:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gS0rw-0001ox-FK for grub-devel@gnu.org; Wed, 28 Nov 2018 09:31:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gS0rt-0008MS-9Y for grub-devel@gnu.org; Wed, 28 Nov 2018 09:31:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:41148 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gS0rt-0008M2-22 for grub-devel@gnu.org; Wed, 28 Nov 2018 09:31:09 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D4108B0E5; Wed, 28 Nov 2018 14:31:07 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Cc: leif.lindholm@linaro.org, Peter Jones , Jon Masters , Ard Biesheuvel , Nicolas Dechesne Subject: [PATCH 1/2] mkimage: Simplify header size logic Date: Wed, 28 Nov 2018 15:31:06 +0100 Message-Id: <20181128143107.37583-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20181128143107.37583-1-agraf@suse.de> References: <20181128143107.37583-1-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2018 14:31:16 -0000 For EFI images, we always have the following layout: [PE header] [padding] [first section (which also is the entry point)] Currently there are 2 places where we define how big header+padding are: in the .vaddr_offset member of our target image definition struct as well as in code in grub_install_generate_image(). Remove the latter, so that we only have a single place to modify if we need to change the padding. Signed-off-by: Alexander Graf --- util/mkimage.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/util/mkimage.c b/util/mkimage.c index b2f43fea6..05333a76a 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -1206,10 +1206,7 @@ grub_install_generate_image (const char *dir, const char *prefix, int header_size; int reloc_addr; - if (image_target->voidp_sizeof == 4) - header_size = EFI32_HEADER_SIZE; - else - header_size = EFI64_HEADER_SIZE; + header_size = image_target->vaddr_offset; reloc_addr = ALIGN_UP (header_size + core_size, image_target->section_align); -- 2.19.0