[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/10] commands/file: use definitions from arm64/linux.h
From: |
Leif Lindholm |
Subject: |
[PATCH 10/10] commands/file: use definitions from arm64/linux.h |
Date: |
Thu, 1 Feb 2018 18:18:58 +0000 |
Clean up code for matching IS_ARM64 slightly by making use of struct
linux_arm_kernel_header and GRUB_LINUX_ARM64_MAGIC_SIGNATURE.
Signed-off-by: Leif Lindholm <address@hidden>
---
grub-core/commands/file.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c
index fad191202..dd729a8a8 100644
--- a/grub-core/commands/file.c
+++ b/grub-core/commands/file.c
@@ -28,6 +28,7 @@
#include <grub/xen_file.h>
#include <grub/efi/pe32.h>
#include <grub/arm/linux.h>
+#include <grub/arm64/linux.h>
#include <grub/i386/linux.h>
#include <grub/xnu.h>
#include <grub/machoload.h>
@@ -404,13 +405,13 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char
**args)
}
case IS_ARM64_LINUX:
{
- grub_uint32_t sig;
+ struct linux_arm64_kernel_header lh;
- if (grub_file_seek (file, 0x38) == (grub_size_t) -1)
- break;
- if (grub_file_read (file, &sig, 4) != 4)
+ if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
break;
- if (sig == grub_cpu_to_le32_compile_time (0x644d5241))
+
+ if (lh.magic ==
+ grub_cpu_to_le32_compile_time (GRUB_LINUX_ARM64_MAGIC_SIGNATURE))
{
ret = 1;
break;
--
2.11.0
- [PATCH 04/10] i386: make struct linux_kernel_header architecture specific, (continued)
- [PATCH 06/10] arm64: align linux kernel magic macro naming with i386, Leif Lindholm, 2018/02/01
- [PATCH 07/10] arm: switch linux loader to linux_arm_kernel_header struct, Leif Lindholm, 2018/02/01
- [PATCH 10/10] commands/file: use definitions from arm64/linux.h,
Leif Lindholm <=
- [PATCH 05/10] arm64: align linux kernel header struct naming with i386, Leif Lindholm, 2018/02/01
- [PATCH 09/10] commands/file: use definitions from arm/linux.h, Leif Lindholm, 2018/02/01
- [PATCH 08/10] arm: make linux.h safe to include for non-native builds, Leif Lindholm, 2018/02/01
- Re: [PATCH 00/10] various cleanup, Daniel Kiper, 2018/02/15