Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grub/slr_table.h: indicate Multiboot version in constants #15

Merged
merged 1 commit into from
Jan 11, 2024
Merged

grub/slr_table.h: indicate Multiboot version in constants #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grub-core/loader/multiboot_mbi2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ add_multiboot2_slrt_policy_entries (void)
for (i = 0, cur = modules; i < modcnt; i++, cur = cur->next)
{
grub_slaunch_add_slrt_policy_entry (17,
GRUB_SLR_ET_MULTIBOOT_MODULE,
GRUB_SLR_ET_MULTIBOOT2_MODULE,
/*flags=*/0,
cur->start,
cur->size,
Expand Down Expand Up @@ -1208,7 +1208,7 @@ grub_multiboot2_prepare_slaunch_txt (grub_uint32_t mbi_target,
}

grub_slaunch_add_slrt_policy_entry (18,
GRUB_SLR_ET_MULTIBOOT_INFO,
GRUB_SLR_ET_MULTIBOOT2_INFO,
/*flags=*/0,
mbi_target,
mbi_size,
Expand Down
4 changes: 2 additions & 2 deletions include/grub/slr_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
#define GRUB_SLR_ET_CMDLINE 0x0004
#define GRUB_SLR_ET_UEFI_MEMMAP 0x0005
#define GRUB_SLR_ET_RAMDISK 0x0006
#define GRUB_SLR_ET_MULTIBOOT_INFO 0x0007
#define GRUB_SLR_ET_MULTIBOOT_MODULE 0x0008
#define GRUB_SLR_ET_MULTIBOOT2_INFO 0x0007
#define GRUB_SLR_ET_MULTIBOOT2_MODULE 0x0008
#define GRUB_SLR_ET_TXT_OS2MLE 0x0010
#define GRUB_SLR_ET_UNUSED 0xffff

Expand Down