* include/grub/arm64/linux.h: Remove leftovers. Add missing prefixes.
This commit is contained in:
parent
62956fe7b9
commit
74fa9ac1a6
3 changed files with 9 additions and 18 deletions
|
@ -1,3 +1,7 @@
|
|||
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* include/grub/arm64/linux.h: Remove leftovers. Add missing prefixes.
|
||||
|
||||
2013-12-23 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/loader/arm64/linux.c: Add missing bracket.
|
||||
|
|
|
@ -113,9 +113,9 @@ get_fdt (void)
|
|||
}
|
||||
|
||||
static grub_err_t
|
||||
check_kernel (struct linux_kernel_header *lh)
|
||||
check_kernel (struct grub_arm64_linux_kernel_header *lh)
|
||||
{
|
||||
if (lh->magic != GRUB_LINUX_MAGIC)
|
||||
if (lh->magic != GRUB_ARM64_LINUX_MAGIC)
|
||||
return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
|
||||
|
||||
if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC)
|
||||
|
@ -381,7 +381,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
int argc, char *argv[])
|
||||
{
|
||||
grub_file_t file = 0;
|
||||
struct linux_kernel_header lh;
|
||||
struct grub_arm64_linux_kernel_header lh;
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
|
|
|
@ -21,13 +21,10 @@
|
|||
|
||||
#include <grub/efi/efi.h>
|
||||
|
||||
#define GRUB_EFI_KERNEL_STUB_ENTRY_OFFSET 0
|
||||
#define GRUB_LINUX_MAX_LOAD_ADDR 0xffffffffffffULL
|
||||
|
||||
#define GRUB_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
|
||||
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
|
||||
|
||||
/* From linux/Documentation/arm64/booting.txt */
|
||||
struct linux_kernel_header
|
||||
struct grub_arm64_linux_kernel_header
|
||||
{
|
||||
grub_uint32_t code0; /* Executable code */
|
||||
grub_uint32_t code1; /* Executable code */
|
||||
|
@ -41,14 +38,4 @@ struct linux_kernel_header
|
|||
grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
|
||||
};
|
||||
|
||||
#define grub_linux_get_params() NULL
|
||||
extern grub_err_t grub_linux_init_params (void);
|
||||
extern grub_err_t grub_linux_finalize_params (void);
|
||||
extern grub_err_t grub_linux_register_kernel (struct linux_kernel_header *lh);
|
||||
extern grub_err_t grub_linux_register_cmdline (void * addr);
|
||||
extern grub_err_t grub_linux_register_initrd (void * addr, grub_size_t size);
|
||||
|
||||
extern void grub_efi_linux_arch_register_commands (void);
|
||||
extern void grub_efi_linux_arch_unregister_commands (void);
|
||||
|
||||
#endif /* ! GRUB_LINUX_CPU_HEADER */
|
||||
|
|
Loading…
Reference in a new issue