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:53 +0000
|
|
|
|
|
Subject: [PATCH] arm64: align linux kernel header struct naming with i386
|
|
|
|
|
|
|
|
|
|
Rename struct grub_arm64_linux_kernel_header -> linux_arm64_kernel_header.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
|
|
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
---
|
|
|
|
|
grub-core/loader/arm64/linux.c | 4 ++--
|
|
|
|
|
grub-core/loader/arm64/xen_boot.c | 4 ++--
|
|
|
|
|
include/grub/arm64/linux.h | 5 ++---
|
|
|
|
|
3 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
|
|
|
index ca01a234961..79f25a71152 100644
|
|
|
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
|
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
|
|
|
@@ -48,7 +48,7 @@ static grub_addr_t initrd_start;
|
|
|
|
|
static grub_addr_t initrd_end;
|
|
|
|
|
|
|
|
|
|
grub_err_t
|
|
|
|
|
-grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
|
|
|
|
|
+grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh)
|
|
|
|
|
{
|
|
|
|
|
if (lh->magic != GRUB_ARM64_LINUX_MAGIC)
|
|
|
|
|
return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
|
|
|
|
|
@@ -249,7 +249,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
|
int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
grub_file_t file = 0;
|
|
|
|
|
- struct grub_arm64_linux_kernel_header lh;
|
|
|
|
|
+ struct linux_arm64_kernel_header lh;
|
|
|
|
|
|
|
|
|
|
grub_dl_ref (my_mod);
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
|
|
|
|
|
index 0a40e16be33..258264c79e8 100644
|
|
|
|
|
--- a/grub-core/loader/arm64/xen_boot.c
|
|
|
|
|
+++ b/grub-core/loader/arm64/xen_boot.c
|
|
|
|
|
@@ -67,7 +67,7 @@ typedef enum module_type module_type_t;
|
|
|
|
|
|
|
|
|
|
struct xen_hypervisor_header
|
|
|
|
|
{
|
|
|
|
|
- struct grub_arm64_linux_kernel_header efi_head;
|
|
|
|
|
+ struct linux_arm64_kernel_header efi_head;
|
|
|
|
|
|
|
|
|
|
/* This is always PE\0\0. */
|
|
|
|
|
grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE];
|
|
|
|
|
@@ -469,7 +469,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
|
if (grub_file_read (file, &sh, sizeof (sh)) != (long) sizeof (sh))
|
|
|
|
|
goto fail;
|
|
|
|
|
if (grub_arm64_uefi_check_image
|
|
|
|
|
- ((struct grub_arm64_linux_kernel_header *) &sh) != GRUB_ERR_NONE)
|
|
|
|
|
+ ((struct linux_arm64_kernel_header *) &sh) != GRUB_ERR_NONE)
|
|
|
|
|
goto fail;
|
|
|
|
|
grub_file_seek (file, 0);
|
|
|
|
|
|
|
|
|
|
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
|
|
|
|
|
index a8edf50dc2c..abe7e9cc3a6 100644
|
|
|
|
|
--- a/include/grub/arm64/linux.h
|
|
|
|
|
+++ b/include/grub/arm64/linux.h
|
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
|
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
|
|
|
|
|
|
|
|
|
|
/* From linux/Documentation/arm64/booting.txt */
|
|
|
|
|
-struct grub_arm64_linux_kernel_header
|
|
|
|
|
+struct linux_arm64_kernel_header
|
|
|
|
|
{
|
|
|
|
|
grub_uint32_t code0; /* Executable code */
|
|
|
|
|
grub_uint32_t code1; /* Executable code */
|
|
|
|
|
@@ -38,8 +38,7 @@ struct grub_arm64_linux_kernel_header
|
|
|
|
|
grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
-grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header
|
|
|
|
|
- *lh);
|
|
|
|
|
+grub_err_t grub_arm64_uefi_check_image (struct linux_arm64_kernel_header *lh);
|
|
|
|
|
grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size,
|
|
|
|
|
char *args);
|
|
|
|
|
|
