mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
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>
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@csgraf.de>
|
|
Date: Tue, 30 Apr 2019 22:43:57 +0200
|
|
Subject: [PATCH] arm: Align section alignment with manual relocation offset
|
|
code
|
|
|
|
The arm relocation code has a manual special case for EFI binaries to
|
|
add the natural alignment to its own relocation awareness.
|
|
|
|
Since commit a51f953f4ee87 ("mkimage: Align efi sections on 4k
|
|
boundary") we changed that alignment from 0x400 to 0x1000 bytes. Reflect
|
|
the change in that branch that we forgot as well.
|
|
|
|
This fixes running 32bit arm grub efi binaries for me again.
|
|
|
|
Fixes: a51f953f4ee87 ("mkimage: Align efi sections on 4k boundary")
|
|
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
Reported-by: Steve McIntyre <steve@einval.com>
|
|
Signed-off-by: Alexander Graf <agraf@csgraf.de>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Tested-by: Julien ROBIN <julien.robin28@free.fr>
|
|
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
util/grub-mkimagexx.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
|
|
index 86e6254a27e..75773446d0f 100644
|
|
--- a/util/grub-mkimagexx.c
|
|
+++ b/util/grub-mkimagexx.c
|
|
@@ -1099,7 +1099,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
|
|
(int) sym_addr, (int) sym_addr);
|
|
/* Data will be naturally aligned */
|
|
if (image_target->id == IMAGE_EFI)
|
|
- sym_addr += 0x400;
|
|
+ sym_addr += GRUB_PE32_SECTION_ALIGNMENT;
|
|
*target = grub_host_to_target32 (grub_target_to_host32 (*target) + sym_addr);
|
|
}
|
|
break;
|