57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
Date: Thu, 3 Aug 2017 11:04:25 +0100
|
|
Subject: [PATCH] efi: Add GRUB_PE32_MAGIC definition
|
|
|
|
Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete
|
|
the existing one in arm64/linux.h.
|
|
|
|
Update arm64 Linux loader to use this new definition.
|
|
|
|
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
---
|
|
grub-core/loader/arm64/linux.c | 2 +-
|
|
include/grub/arm64/linux.h | 2 --
|
|
include/grub/efi/pe32.h | 2 ++
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
index 3e2f9b74296..a652ee9088e 100644
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
@@ -52,7 +52,7 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
|
|
if (lh->magic != GRUB_ARM64_LINUX_MAGIC)
|
|
return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
|
|
|
|
- if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC)
|
|
+ if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
|
|
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
|
|
|
|
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
|
|
index 1ea23696e7a..a981df5d15f 100644
|
|
--- a/include/grub/arm64/linux.h
|
|
+++ b/include/grub/arm64/linux.h
|
|
@@ -23,8 +23,6 @@
|
|
|
|
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
|
|
|
|
-#define GRUB_EFI_PE_MAGIC 0x5A4D
|
|
-
|
|
/* From linux/Documentation/arm64/booting.txt */
|
|
struct grub_arm64_linux_kernel_header
|
|
{
|
|
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
|
|
index f79c36c026e..7d44732d2c3 100644
|
|
--- a/include/grub/efi/pe32.h
|
|
+++ b/include/grub/efi/pe32.h
|
|
@@ -45,6 +45,8 @@
|
|
|
|
#define GRUB_PE32_MSDOS_STUB_SIZE 0x80
|
|
|
|
+#define GRUB_PE32_MAGIC 0x5a4d
|
|
+
|
|
/* According to the spec, the minimal alignment is 512 bytes...
|
|
But some examples (such as EFI drivers in the Intel
|
|
Sample Implementation) use 32 bytes (0x20) instead, and it seems
|