multiboot fixup
This commit is contained in:
parent
6cc79ec10c
commit
4bfd26623f
2 changed files with 5 additions and 2 deletions
|
@ -138,8 +138,11 @@ static void
|
||||||
efi_boot (struct grub_relocator *rel,
|
efi_boot (struct grub_relocator *rel,
|
||||||
grub_uint32_t target)
|
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;
|
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_ENTRY_REGISTER = grub_multiboot_payload_eip;
|
||||||
state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;
|
state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
.jumpreg = 1 }
|
.jumpreg = 1 }
|
||||||
#define MULTIBOOT_ENTRY_REGISTER gpr[1]
|
#define MULTIBOOT_ENTRY_REGISTER gpr[1]
|
||||||
#define MULTIBOOT_MBI_REGISTER gpr[5]
|
#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_ELF32_MACHINE EM_MIPS
|
||||||
#define MULTIBOOT_ELF64_MACHINE EM_MIPS
|
#define MULTIBOOT_ELF64_MACHINE EM_MIPS
|
||||||
|
|
Loading…
Reference in a new issue