From patchwork Wed Jan 23 15:34:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156386 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp852566jaa; Wed, 23 Jan 2019 07:37:25 -0800 (PST) X-Google-Smtp-Source: ALg8bN77Eph6A+vfm/QgOI2PXYn+0IWZuG2s7py1Un1Yw85aTkADsSW+3jdek+yduG8HR1kEddLS X-Received: by 2002:adf:9361:: with SMTP id 88mr3240827wro.204.1548257845420; Wed, 23 Jan 2019 07:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548257845; cv=none; d=google.com; s=arc-20160816; b=X5XMgI5YB9gmFyPnnSkJK5moqGFIolVq9ZP08DK30TYYi4ZBWb8ZNFco+pRLLGCeDp p6L4KHsh2i5jSijXmB7/TKOSde7KYQo23t5W1wTN7lqCJY5R8BDKCWrdRIAlY71/bV3E shBxhbxUqbO3WaqWjRhRUefLzsh1uq/8jj2X9h+K4ye/f4XFIsn3mrCCQkbVLAmhaqmW cYZ82L3XbhiK/Cq/wgSR8VLaoU53bgOoSYEKy1dZ58lSpBQljXJxAlVVai5aHKP7jmt3 AAhwxBQ1w/rRwAha6sAw1+68Hb6h8eOWTZwZyDab+FKqxtL0HRo7hGqva0LbQV6rc5A8 iItA== 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=y2MfyX1VPZX9dj6FvvhKDwdVx2lYQrl6kOpPzrL2ljUK1HU7zrOB5y+9iIxOKDeRZD V1FqwAdPBzUtDcZVUOUqpzEd+SM5MkdvLxo/AoCTo6Hivm0R8MukegkPE5lgqNk5JK+E ZYygO6CF4UUYhy5XY41NEGXaCMoLEXnfsK7Mhtc/bRy7KpnFY/Z8J5pMUvdRMQ6SHIzx gn2TMpG4bZl4q+oIDJOiK1zPAorodRkwT3MJ6BjDnuDYSDFd/d5Yfp0aEqPUShQkunxQ nvgPAwQvgdAWSOgQc1vDaZZpD0ZDtXLPFR9FfeqXd6L1FHZsrMXyhj683+krWWWygkoQ QT4w== 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 b6si69901335wrr.321.2019.01.23.07.37.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Jan 2019 07:37:25 -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]:36972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKah-00031y-UN for patch@linaro.org; Wed, 23 Jan 2019 10:37:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKYX-0001Z0-2b for grub-devel@gnu.org; Wed, 23 Jan 2019 10:35:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKYT-00088x-KH for grub-devel@gnu.org; Wed, 23 Jan 2019 10:35:08 -0500 Received: from mx2.suse.de ([195.135.220.15]:39696 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 1gmKYT-000841-AC for grub-devel@gnu.org; Wed, 23 Jan 2019 10:35:05 -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 1F296B041; Wed, 23 Jan 2019 15:34:59 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Subject: [PATCH v4 1/2] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case Date: Wed, 23 Jan 2019 16:34:57 +0100 Message-Id: <20190123153458.35215-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20190123153458.35215-1-agraf@suse.de> References: <20190123153458.35215-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 , Daniel Kiper , Leif Lindholm , Ard Biesheuvel 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, },