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

arm64/linux/loader: Rename functions and macros and move to common headers

Browse source 
In preparation for using the linux loader for 32-bit and 64-bit platforms,
rename grub_arm64*/GRUB_ARM64* to grub_armxx*/GRUB_ARMXX*.

Move prototypes for now-common functions to efi/efi.h.

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-07-09 18:33:02 +01:00 committed by Vincent Batts
parent af26eb0e1a
commit ba3da3c002
4 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,9 +50,9 @@ 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 linux_arm64_kernel_header * lh) grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header * lh)
{ {
if (lh->magic != GRUB_LINUX_ARM64_MAGIC_SIGNATURE) if (lh->magic != GRUB_LINUX_ARMXX_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)
@ -111,7 +111,7 @@ failure:
} }
grub_err_t grub_err_t
grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args) grub_armxx_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
{ {
grub_efi_memory_mapped_device_path_t *mempath; grub_efi_memory_mapped_device_path_t *mempath;
grub_efi_handle_t image_handle; grub_efi_handle_t image_handle;
@ -174,7 +174,7 @@ grub_linux_boot (void)
if (finalize_params_linux () != GRUB_ERR_NONE) if (finalize_params_linux () != GRUB_ERR_NONE)
return grub_errno; return grub_errno;
return (grub_arm64_uefi_boot_image((grub_addr_t)kernel_addr, return (grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr,
kernel_size, linux_args)); kernel_size, linux_args));
} }
@ -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 linux_arm64_kernel_header lh; struct linux_armxx_kernel_header lh;
grub_dl_ref (my_mod); grub_dl_ref (my_mod);
@ -270,7 +270,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh)) if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh))
return grub_errno; return grub_errno;
if (grub_arm64_uefi_check_image (&lh) != GRUB_ERR_NONE) if (grub_armxx_efi_linux_check_image (&lh) != GRUB_ERR_NONE)
goto fail; goto fail;
grub_loader_unset(); grub_loader_unset();

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

@ -265,7 +265,7 @@ xen_boot (void)
if (err) if (err)
return err; return err;
return grub_arm64_uefi_boot_image (xen_hypervisor->start, return grub_armxx_efi_linux_boot_image (xen_hypervisor->start,
xen_hypervisor->size, xen_hypervisor->size,
xen_hypervisor->cmdline); xen_hypervisor->cmdline);
} }
@ -468,8 +468,8 @@ 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_armxx_efi_linux_check_image
((struct linux_arm64_kernel_header *) &sh) != GRUB_ERR_NONE) ((struct linux_armxx_kernel_header *) &sh) != GRUB_ERR_NONE)
goto fail; goto fail;
grub_file_seek (file, 0); grub_file_seek (file, 0);

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

@ -19,8 +19,6 @@
#ifndef GRUB_ARM64_LINUX_HEADER #ifndef GRUB_ARM64_LINUX_HEADER
#define GRUB_ARM64_LINUX_HEADER 1 #define GRUB_ARM64_LINUX_HEADER 1
#include <grub/efi/efi.h>
#define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */ #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
/* From linux/Documentation/arm64/booting.txt */ /* From linux/Documentation/arm64/booting.txt */
@ -38,8 +36,9 @@ struct linux_arm64_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 linux_arm64_kernel_header *lh); #if defined(__aarch64__)
grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
char *args); # define linux_armxx_kernel_header linux_arm64_kernel_header
#endif
#endif /* ! GRUB_ARM64_LINUX_HEADER */ #endif /* ! GRUB_ARM64_LINUX_HEADER */

4
include/grub/efi/efi.h
View file

@ -97,6 +97,10 @@ void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
#endif #endif
#if defined(__aarch64__) #if defined(__aarch64__)
grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *); grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
#include <grub/cpu/linux.h>
grub_err_t grub_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh);
grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
char *args);
#endif #endif
grub_addr_t grub_efi_modules_addr (void); grub_addr_t grub_efi_modules_addr (void);