From patchwork Mon Jan 28 13:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156737 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3435521jaa; Mon, 28 Jan 2019 05:36:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN7aEdSqUzmOxbWK92/nsPlv9u8SjGGWTr/wRtMXqDf22LpF2MRaxz67fhayZ6z5LmxZRsX2 X-Received: by 2002:adf:eec9:: with SMTP id a9mr21496797wrp.242.1548682559923; Mon, 28 Jan 2019 05:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548682559; cv=none; d=google.com; s=arc-20160816; b=AODIF1Z0Th75A02wH056pyYQaPRveVmmB+jTieFbTLkXWrx2TBvjt0qsT/LIcnpiSP B8O9zvyJoZ6b8cKh4r6GSpv7I8AjeeJp+9GPHfjyc5FygPof2YovjZ2UrZ9AO1vyqkmm Jq5vwJ5yHqm1fSPXKX4Z1p2JnV6izh5Ln3p7iZBNtxHlYFXf0hF0pfMdT1Y4A4Pc9nq5 QiKqTka3tYU7H+GTq55yXCGuRynV3FKkf/M7RljTKM1p2+hYndV1ingClrOeRL8GokrY CtFWdxoGRj+bv1OTy2XO7hZRtO0difWw/El0Qatvc+hV+hOBROQg0DI/wfdeSQZPjvHa i0pA== 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=XFX8cB6d/hxrIdroQEPla+ZuaFljY2eFaDCqc+pX8aY=; b=CvJepr7Ocfw9Y7oupJ3KJ/ZW9JoAQTGw795o1uUN1YNan9m4qwLKt6Ign+xOg+rI3S 7k/SfsSfamd8pUgDn8oXnMBB7bbsjUzIB/fgMUhU6cOG3tKx3/8DwuqwqL8pa8EAAwrY tCCdRY67jJzZTiFdG1S7DwnMK8pr96kuq+6HEI+VqzZhKjMlqV+XE238b3kdubm33UEd 8JxrRkQ/73pe3SA4Gx5l55W1Kx3eBvXZXVvANSEYTO/9ZP9rK1/N/n8ZPTZU2t0GBlYi sngR0KUvBXrLgTSol2A7gUaPyp9YzfY0HWumgLkgUWCHTDubxhFgVPxTsHf/KLC+UB9Q wulw== 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 x7si39439733wrd.354.2019.01.28.05.35.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 28 Jan 2019 05:35:59 -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]:60321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go74w-00037W-TC for patch@linaro.org; Mon, 28 Jan 2019 08:35:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go74i-00035a-FK for grub-devel@gnu.org; Mon, 28 Jan 2019 08:35:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go74h-0000yx-Ka for grub-devel@gnu.org; Mon, 28 Jan 2019 08:35:44 -0500 Received: from mx2.suse.de ([195.135.220.15]:39746 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 1go74h-0000ME-9U for grub-devel@gnu.org; Mon, 28 Jan 2019 08:35:43 -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 9DBE3ACBF; Mon, 28 Jan 2019 13:35:29 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Subject: [PATCH v6 1/3] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case Date: Mon, 28 Jan 2019 14:35:27 +0100 Message-Id: <20190128133529.82445-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20190128133529.82445-1-agraf@suse.de> References: <20190128133529.82445-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 Reviewed-by: Daniel Kiper --- 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 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, },