Merge pull request #357 from phip1611/fix-uefi-bug

multiboot2: fix efi{32,64]_ih generation
This commit is contained in:
mintsuki 2024-05-23 08:43:04 +02:00 committed by GitHub
commit 18e2ae3b25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -592,15 +592,15 @@ reloc_fail:
#if defined (UEFI)
{
#if defined (__i386__)
struct multiboot_tag_efi64_ih *tag = (struct multiboot_tag_efi64_ih *)(mb2_info + info_idx);
tag->type = MULTIBOOT_TAG_TYPE_EFI64_IH;
tag->size = sizeof(struct multiboot_tag_efi64_ih);
#elif defined (__x86_64__)
struct multiboot_tag_efi32_ih *tag = (struct multiboot_tag_efi32_ih *)(mb2_info + info_idx);
tag->type = MULTIBOOT_TAG_TYPE_EFI32_IH;
tag->size = sizeof(struct multiboot_tag_efi32_ih);
#elif defined (__x86_64__)
struct multiboot_tag_efi64_ih *tag = (struct multiboot_tag_efi64_ih *)(mb2_info + info_idx);
tag->type = MULTIBOOT_TAG_TYPE_EFI64_IH;
tag->size = sizeof(struct multiboot_tag_efi64_ih);
#endif
tag->pointer = (uintptr_t)efi_image_handle;