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

arm64: align linux kernel header struct naming with i386

Browse source 
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>
This commit is contained in:
Leif Lindholm 2018-02-01 18:18:53 +00:00 • committed by Vincent Batts
parent 103779a19e
commit 324bbebdb7
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ static grub_addr_t initrd_start;
static grub_addr_t initrd_end; static grub_addr_t initrd_end;
grub_err_t 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) 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");
@ -251,7 +251,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) int argc, char *argv[])
{ {
grub_file_t file = 0; grub_file_t file = 0;
struct grub_arm64_linux_kernel_header lh; struct linux_arm64_kernel_header lh;
grub_dl_ref (my_mod); grub_dl_ref (my_mod);

4
grub-core/loader/arm64/xen_boot.c
View file

@ -67,7 +67,7 @@ typedef enum module_type module_type_t;
struct xen_hypervisor_header 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. */ /* This is always PE\0\0. */
grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE]; 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)) if (grub_file_read (file, &sh, sizeof (sh)) != (long) sizeof (sh))
goto fail; goto fail;
if (grub_arm64_uefi_check_image 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; goto fail;
grub_file_seek (file, 0); grub_file_seek (file, 0);

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

@ -24,7 +24,7 @@
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
/* From linux/Documentation/arm64/booting.txt */ /* 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 code0; /* Executable code */
grub_uint32_t code1; /* 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_uint32_t hdr_offset; /* Offset of PE/COFF header */
}; };
grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header grub_err_t grub_arm64_uefi_check_image (struct linux_arm64_kernel_header *lh);
*lh);
grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size,
char *args); char *args);