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

multiboot fixup

This commit is contained in:
Vladimir Serbinenko 2017-08-14 16:24:05 +02:00
parent 6cc79ec10c
commit 4bfd26623f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grub-core/loader/multiboot.c
View File

@ -138,8 +138,11 @@ static void
efi_boot (struct grub_relocator *rel,
grub_uint32_t target)
{
#ifdef GRUB_USE_MULTIBOOT2
struct grub_relocator_efi_state state_efi = MULTIBOOT2_EFI_INITIAL_STATE;
#else
struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE;
#endif
state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = grub_multiboot_payload_eip;
state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;

2
include/grub/mips/multiboot.h
View File

@ -23,7 +23,7 @@
.jumpreg = 1 }
#define MULTIBOOT_ENTRY_REGISTER gpr[1]
#define MULTIBOOT_MBI_REGISTER gpr[5]
#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_MIPS32
#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT2_ARCHITECTURE_MIPS32
#define MULTIBOOT_ELF32_MACHINE EM_MIPS
#define MULTIBOOT_ELF64_MACHINE EM_MIPS