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

Propagate the EFI commits to x86-efi specific parts.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-11 16:11:17 +01:00
parent 3e3dff249f
commit 44bbfa33b8
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-11 Vladimir Serbinenko <phcoder@gmail.com>
Propagate the EFI commits to x86-efi specific parts.
2013-12-11 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/efi/lssal.c: Fix terminating condition. * grub-core/commands/efi/lssal.c: Fix terminating condition.

2
grub-core/commands/efi/loadbios.c
View file

@ -105,7 +105,7 @@ fake_bios_data (int use_rom)
smbios = 0; smbios = 0;
for (i = 0; i < grub_efi_system_table->num_table_entries; i++) for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
{ {
grub_efi_guid_t *guid = grub_efi_packed_guid_t *guid =
&grub_efi_system_table->configuration_table[i].vendor_guid; &grub_efi_system_table->configuration_table[i].vendor_guid;
if (! grub_memcmp (guid, &acpi2_guid, sizeof (grub_efi_guid_t))) if (! grub_memcmp (guid, &acpi2_guid, sizeof (grub_efi_guid_t)))

6
grub-core/loader/efi/appleloader.c
View file

@ -76,7 +76,7 @@ struct piwg_full_device_path
.header = { \ .header = { \
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE, \ .type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE, \
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE, \ .subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE, \
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0} \ .length = sizeof (struct grub_efi_memory_mapped_device_path) \
}, \ }, \
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO, \ .memory_type = GRUB_EFI_MEMORY_MAPPED_IO, \
.start_address = st, \ .start_address = st, \
@ -87,7 +87,7 @@ struct piwg_full_device_path
.header = { \ .header = { \
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE, \ .type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE, \
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE, \ .subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE, \
.length = {sizeof (struct grub_efi_piwg_device_path), 0} \ .length = sizeof (struct grub_efi_piwg_device_path) \
}, \ }, \
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B, \ .guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B, \
0x01, 0xAE, 0xF2, 0xB7}} \ 0x01, 0xAE, 0xF2, 0xB7}} \
@ -96,7 +96,7 @@ struct piwg_full_device_path
{ \ { \
.type = GRUB_EFI_END_DEVICE_PATH_TYPE, \ .type = GRUB_EFI_END_DEVICE_PATH_TYPE, \
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE, \ .subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE, \
.length = {sizeof (struct grub_efi_device_path), 0} \ .length = sizeof (struct grub_efi_device_path) \
} \ } \
} }

2
grub-core/loader/i386/xnu.c
View file

@ -671,7 +671,7 @@ grub_cpu_xnu_fill_devicetree (grub_uint64_t *fsbfreq_out)
{ {
void *ptr; void *ptr;
struct grub_xnu_devtree_key *curkey; struct grub_xnu_devtree_key *curkey;
grub_efi_guid_t guid; grub_efi_packed_guid_t guid;
char guidbuf[64]; char guidbuf[64];
/* Retrieve current key. */ /* Retrieve current key. */