vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

efi: Add GRUB_PE32_MAGIC definition

Browse source 
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>
This commit is contained in:
Leif Lindholm 2017-08-03 11:04:25 +01:00 • committed by Vladimir Serbinenko
parent 8c9465fac9
commit c5841ba7f0
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/arm64/linux.c
View file

@ -52,7 +52,7 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
if (lh->magic != GRUB_ARM64_LINUX_MAGIC) if (lh->magic != GRUB_ARM64_LINUX_MAGIC)
return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); 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, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled")); N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));

2
include/grub/arm64/linux.h
View file

@ -23,8 +23,6 @@
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
#define GRUB_EFI_PE_MAGIC 0x5A4D
/* From linux/Documentation/arm64/booting.txt */ /* From linux/Documentation/arm64/booting.txt */
struct grub_arm64_linux_kernel_header struct grub_arm64_linux_kernel_header
{ {

2
include/grub/efi/pe32.h
View file

@ -45,6 +45,8 @@
#define GRUB_PE32_MSDOS_STUB_SIZE 0x80 #define GRUB_PE32_MSDOS_STUB_SIZE 0x80
#define GRUB_PE32_MAGIC 0x5a4d
/* According to the spec, the minimal alignment is 512 bytes... /* According to the spec, the minimal alignment is 512 bytes...
But some examples (such as EFI drivers in the Intel But some examples (such as EFI drivers in the Intel
Sample Implementation) use 32 bytes (0x20) instead, and it seems Sample Implementation) use 32 bytes (0x20) instead, and it seems