2018-07-12 14:56:34 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-07-10 19:08:14 +00:00
|
|
|
From: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
|
|
Date: Thu, 1 Feb 2018 18:18:54 +0000
|
|
|
|
|
Subject: [PATCH] arm64: align linux kernel magic macro naming with i386
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
grub-core/loader/arm64/linux.c | 2 +-
|
|
|
|
|
include/grub/arm64/linux.h | 2 +-
|
|
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
|
|
|
index 79f25a71152..ebe1e730d63 100644
|
|
|
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
|
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
|
|
|
@@ -50,7 +50,7 @@ static grub_addr_t initrd_end;
|
|
|
|
|
grub_err_t
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
|
|
|
|
|
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
|
|
|
|
|
index abe7e9cc3a6..b0634762450 100644
|
|
|
|
|
--- a/include/grub/arm64/linux.h
|
|
|
|
|
+++ b/include/grub/arm64/linux.h
|
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
|
|
|
|
#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 */
|
|
|
|
|
struct linux_arm64_kernel_header
|
