Support 2010 Macbooks.

	* grub-core/loader/efi/appleloader.c (devpath_6): New variable.
	(devs): Add devpath_6.

diff --git a/ChangeLog b/ChangeLog
index 5dd39905ead06002dca32da740e5d4939f8dc3d0..81deaf96dd5f6d7a3eb43a4a945ba3ff45ae9ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-05  Zach <mikezackles>
+
+       Support 2010 Macbooks.
+
+       * grub-core/loader/efi/appleloader.c (devpath_6): New variable.
+       (devs): Add devpath_6.
+
 2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkpasswd-pbkdf2.c (main): Use /dev/urandom and not

diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
index 847750dc0897f010138229cdaa836cdd81917ca9..d8ca4a7f3e4ef9218f2fe98d90db676d56163f4a 100644 (file)
--- a/grub-core/loader/efi/appleloader.c
+++ b/grub-core/loader/efi/appleloader.c
@@ -229,6 +229,38 @@ static struct piwg_full_device_path devpath_5 =
   }
 };
 
+/* mid-2010 MB/MBP (NVidia chipset)  */
+static struct piwg_full_device_path devpath_6 =
+{
+  .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
 {
   char *model;
@@ -242,6 +274,7 @@ struct devdata devs[] =
   {"MBP", (grub_efi_device_path_t *) &devpath_3},
   {"MBA", (grub_efi_device_path_t *) &devpath_4},
   {"MB NV", (grub_efi_device_path_t *) &devpath_5},
+  {"MB NV2", (grub_efi_device_path_t *) &devpath_6},
   {NULL, NULL},
 };