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

arm64: align linux kernel magic macro naming with i386

Browse source 
Change GRUB_ARM64_LINUX_MAGIC to GRUB_LINUX_ARM64_MAGIC_SIGNATURE.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Leif Lindholm 2018-02-01 18:18:54 +00:00 committed by Daniel Kiper
parent ff1cf2548a
commit 7fd9722d0c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ static grub_addr_t initrd_end;
grub_err_t grub_err_t
grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh) grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh)
{ {
if (lh->magic != GRUB_ARM64_LINUX_MAGIC) if (lh->magic != GRUB_LINUX_ARM64_MAGIC_SIGNATURE)
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_PE32_MAGIC) if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)

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

@ -21,7 +21,7 @@
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
/* From linux/Documentation/arm64/booting.txt */ /* From linux/Documentation/arm64/booting.txt */
struct linux_arm64_kernel_header struct linux_arm64_kernel_header