[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/4] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case
From: |
Alexander Graf |
Subject: |
[PATCH v3 2/4] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case |
Date: |
Mon, 14 Jan 2019 16:27:16 +0100 |
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 <address@hidden>
---
util/mkimage.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
index 88b991764..a670db456 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,
},
--
2.12.3
- [PATCH v3 3/4] mkimage: arm64-efi: Align header to page granularity, (continued)
[PATCH v3 1/4] mkimage: Simplify header size logic, Alexander Graf, 2019/01/14
[PATCH v3 4/4] mkimage: Align efi sections on 4k boundary, Alexander Graf, 2019/01/14
[PATCH v3 2/4] mkimage: Use EFI32_HEADER_SIZE define in arm-efi case,
Alexander Graf <=