From patchwork Fri Jan 25 11:45:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156571 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp260563jaa; Fri, 25 Jan 2019 03:49:55 -0800 (PST) X-Google-Smtp-Source: ALg8bN57TR8jWw1KXoW5wSFu/pKXex/IO2RRh/cAcyXnozYzBQFhHtSbxpBVOdJaxha0seRiW0fN X-Received: by 2002:a1c:a104:: with SMTP id k4mr6476131wme.54.1548416995325; Fri, 25 Jan 2019 03:49:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548416995; cv=none; d=google.com; s=arc-20160816; b=SycfqIphYvVylCNJ67ieYyz5Zxq3PIjbsZnGZ1JB6gwVtpJwHsUhzXwDk8QrJcTS/c WdlBT6nQR/OZa9kjjIRlW0vnAzhi2IItuYvmCUdddKGtDSvITlv/ShYit0k1m2uJel4j UntKneItFUHwAQ3FsnCwvWMjQWNRFElMXoLkhb1A7MsJqHQD1u4uWZip/SBJ6Gfxp4QG yCAUDyJW0ZDvUZqSANsPSmmF1gN96fPHbM7hC0QGisMZkWFkRmuGhxEXie/1OPw6hbT5 ocRIZMq6KlpSgR2E0jyjmHixCBoD7yMwNVrjveNcSOWO3Ku3dNNCMFfBDuA94DuMCPk4 QUTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from; bh=eCVKMzfjoduKRJwhhIk8o5X4kek1JXEzqfOWuUm0gq8=; b=1Hbs8bBkFfXuyRSdT7m3rBq3T+KvtEQ08VLgUgJhijM81ZuMlbhPPHp5ODNdjerkXZ hF0Bw7mFLiZV4Gk8YRFScnSBkgTg8RJt89UnZT4U7zJ97RhYEE85ZYS3uSXyUKFxIO57 qcxV5suBqTeB+oGPAdDSmuMflyR0NXuBT7UBrVOaD66xlbzdTvNkUCavtljAgbEzhNdZ 14fuf8enPP5UVS0jVL/G+0rL8ukpKr2A+L6Cf6doMuc+3nkDqWkOpVZvYubjZobzaecM q3PfZDOWxlqqce4UWlIiTgiHu6FPF+673ExeQtwg9DlUQ2onGJJLCbafqotKxMIQnj0t FW0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 37si30774428wrb.194.2019.01.25.03.49.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Jan 2019 03:49:55 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org" Received: from localhost ([127.0.0.1]:43051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmzze-0008Vf-8e for patch@linaro.org; Fri, 25 Jan 2019 06:49:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmzzQ-0008U4-Ra for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmzzP-0004HS-SK for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:40 -0500 Received: from mx2.suse.de ([195.135.220.15]:52248 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 1gmzzP-0004Bp-Jj for grub-devel@gnu.org; Fri, 25 Jan 2019 06:49:39 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D8CF9ADF5; Fri, 25 Jan 2019 11:49:28 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Subject: [PATCH v5 1/3] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case Date: Fri, 25 Jan 2019 12:45:14 +0100 Message-Id: <20190125114516.12127-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20190125114516.12127-1-agraf@suse.de> References: <20190125114516.12127-1-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] 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: , Reply-To: The development of GNU GRUB Cc: Jon Masters , Leif Lindholm , Daniel Kiper MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" The efi-arm case was defining its own header size calculation, even though it's 100% identical to the common EFI32_HEADER_SIZE definition. So let's clean it up to use the common define. Signed-off-by: Alexander Graf --- util/mkimage.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.12.3 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel Reviewed-by: Daniel Kiper diff --git a/util/mkimage.c b/util/mkimage.c index 353bb1098..16af12e0c 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -602,12 +602,7 @@ static const struct grub_install_image_target_desc image_targets[] = .decompressor_uncompressed_size = TARGET_NO_FIELD, .decompressor_uncompressed_addr = TARGET_NO_FIELD, .section_align = GRUB_PE32_SECTION_ALIGNMENT, - .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE - + GRUB_PE32_SIGNATURE_SIZE - + sizeof (struct grub_pe32_coff_header) - + sizeof (struct grub_pe32_optional_header) - + 4 * sizeof (struct grub_pe32_section_table), - GRUB_PE32_SECTION_ALIGNMENT), + .vaddr_offset = EFI32_HEADER_SIZE, .pe_target = GRUB_PE32_MACHINE_ARMTHUMB_MIXED, .elf_target = EM_ARM, },