* grub-core/loader/efi/appleloader.c (MAKE_PIWG_PATH): New macro.
(devpath_1): Use MAKE_PIWG_PATH. (devpath_2): Likewise. (devpath_3): Likewise. (devpath_4): Likewise. (devpath_5): Likewise. (devpath_6): Likewise. The appleldr.mod was checked that to be binary identical to previous version.
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
7fae005102
commit
072b5d315a
2 changed files with 56 additions and 180 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
||||||
|
2011-05-05 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/loader/efi/appleloader.c (MAKE_PIWG_PATH): New macro.
|
||||||
|
(devpath_1): Use MAKE_PIWG_PATH.
|
||||||
|
(devpath_2): Likewise.
|
||||||
|
(devpath_3): Likewise.
|
||||||
|
(devpath_4): Likewise.
|
||||||
|
(devpath_5): Likewise.
|
||||||
|
(devpath_6): Likewise.
|
||||||
|
|
||||||
|
The appleldr.mod was checked that to be binary identical to previous
|
||||||
|
version.
|
||||||
|
|
||||||
2011-05-05 Zach <mikezackles>
|
2011-05-05 Zach <mikezackles>
|
||||||
|
|
||||||
Support 2010 Macbooks.
|
Support 2010 Macbooks.
|
||||||
|
|
|
||||||
|
|
@ -69,197 +69,60 @@ struct piwg_full_device_path
|
||||||
struct grub_efi_device_path end;
|
struct grub_efi_device_path end;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* early 2006 Core Duo / Core Solo models */
|
#define MAKE_PIWG_PATH(st, en) \
|
||||||
static struct piwg_full_device_path devpath_1 =
|
{ \
|
||||||
{
|
.comp1 = \
|
||||||
.comp1 =
|
{ \
|
||||||
{
|
.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), 0}
|
}, \
|
||||||
},
|
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO, \
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
.start_address = st, \
|
||||||
.start_address = 0xffe00000,
|
.end_address = en \
|
||||||
.end_address = 0xfff9ffff
|
}, \
|
||||||
},
|
.comp2 = \
|
||||||
.comp2 =
|
{ \
|
||||||
{
|
.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), 0}
|
}, \
|
||||||
},
|
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B, \
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
0x01, 0xAE, 0xF2, 0xB7}} \
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
}, \
|
||||||
},
|
.end = \
|
||||||
.end =
|
{ \
|
||||||
{
|
.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), 0}
|
} \
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
/* early 2006 Core Duo / Core Solo models */
|
||||||
|
static struct piwg_full_device_path devpath_1 = MAKE_PIWG_PATH (0xffe00000,
|
||||||
|
0xfff9ffff);
|
||||||
|
|
||||||
/* mid-2006 Mac Pro (and probably other Core 2 models) */
|
/* mid-2006 Mac Pro (and probably other Core 2 models) */
|
||||||
static struct piwg_full_device_path devpath_2 =
|
static struct piwg_full_device_path devpath_2 = MAKE_PIWG_PATH (0xffe00000,
|
||||||
{
|
0xfff7ffff);
|
||||||
.comp1 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0}
|
|
||||||
},
|
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
|
||||||
.start_address = 0xffe00000,
|
|
||||||
.end_address = 0xfff7ffff
|
|
||||||
},
|
|
||||||
.comp2 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_piwg_device_path), 0}
|
|
||||||
},
|
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
|
||||||
},
|
|
||||||
.end =
|
|
||||||
{
|
|
||||||
.type = GRUB_EFI_END_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_device_path), 0}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/* mid-2007 MBP ("Santa Rosa" based models) */
|
/* mid-2007 MBP ("Santa Rosa" based models) */
|
||||||
static struct piwg_full_device_path devpath_3 =
|
static struct piwg_full_device_path devpath_3 = MAKE_PIWG_PATH (0xffe00000,
|
||||||
{
|
0xfff8ffff);
|
||||||
.comp1 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0}
|
|
||||||
},
|
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
|
||||||
.start_address = 0xffe00000,
|
|
||||||
.end_address = 0xfff8ffff
|
|
||||||
},
|
|
||||||
.comp2 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_piwg_device_path), 0}
|
|
||||||
},
|
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
|
||||||
},
|
|
||||||
.end =
|
|
||||||
{
|
|
||||||
.type = GRUB_EFI_END_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_device_path), 0}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/* early-2008 MBA */
|
/* early-2008 MBA */
|
||||||
static struct piwg_full_device_path devpath_4 =
|
static struct piwg_full_device_path devpath_4 = MAKE_PIWG_PATH (0xffc00000,
|
||||||
{
|
0xfff8ffff);
|
||||||
.comp1 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0}
|
|
||||||
},
|
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
|
||||||
.start_address = 0xffc00000,
|
|
||||||
.end_address = 0xfff8ffff
|
|
||||||
},
|
|
||||||
.comp2 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_piwg_device_path), 0}
|
|
||||||
},
|
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
|
||||||
},
|
|
||||||
.end =
|
|
||||||
{
|
|
||||||
.type = GRUB_EFI_END_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_device_path), 0}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/* late-2008 MB/MBP (NVidia chipset) */
|
/* late-2008 MB/MBP (NVidia chipset) */
|
||||||
static struct piwg_full_device_path devpath_5 =
|
static struct piwg_full_device_path devpath_5 = MAKE_PIWG_PATH (0xffcb4000,
|
||||||
{
|
0xffffbfff);
|
||||||
.comp1 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0}
|
|
||||||
},
|
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
|
||||||
.start_address = 0xffcb4000,
|
|
||||||
.end_address = 0xffffbfff
|
|
||||||
},
|
|
||||||
.comp2 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_piwg_device_path), 0}
|
|
||||||
},
|
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
|
||||||
},
|
|
||||||
.end =
|
|
||||||
{
|
|
||||||
.type = GRUB_EFI_END_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_device_path), 0}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/* mid-2010 MB/MBP (NVidia chipset) */
|
/* mid-2010 MB/MBP (NVidia chipset) */
|
||||||
static struct piwg_full_device_path devpath_6 =
|
static struct piwg_full_device_path devpath_6 = MAKE_PIWG_PATH (0xffcc4000,
|
||||||
{
|
0xffffbfff);
|
||||||
.comp1 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_memory_mapped_device_path), 0}
|
|
||||||
},
|
|
||||||
.memory_type = GRUB_EFI_MEMORY_MAPPED_IO,
|
|
||||||
.start_address = 0xffcc4000,
|
|
||||||
.end_address = 0xffffbfff
|
|
||||||
},
|
|
||||||
.comp2 =
|
|
||||||
{
|
|
||||||
.header = {
|
|
||||||
.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_piwg_device_path), 0}
|
|
||||||
},
|
|
||||||
.guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,
|
|
||||||
0x01, 0xAE, 0xF2, 0xB7}}
|
|
||||||
},
|
|
||||||
.end =
|
|
||||||
{
|
|
||||||
.type = GRUB_EFI_END_DEVICE_PATH_TYPE,
|
|
||||||
.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,
|
|
||||||
.length = {sizeof (struct grub_efi_device_path), 0}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct devdata
|
struct devdata
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue