7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Mon, 28 Jan 2019 14:35:27 +0100
|
|
Subject: [PATCH] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case
|
|
|
|
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 <agraf@suse.de>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Tested-by: Julien ROBIN <julien.robin28@free.fr>
|
|
---
|
|
util/mkimage.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/util/mkimage.c b/util/mkimage.c
|
|
index e22d82afa61..d18ce87a55d 100644
|
|
--- a/util/mkimage.c
|
|
+++ b/util/mkimage.c
|
|
@@ -584,12 +584,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,
|
|
},
|