← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty

« back to all changes in this revision

Viewing changes to grub-core/loader/efi/appleloader.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-01-16 15:18:04 UTC
  • mfrom: (17.6.38 experimental)
  • Revision ID: package-import@ubuntu.com-20140116151804-3foouk7fpqcq3sxx
Tags: 2.02~beta2-2
* Convert patch handling to git-dpm.
* Add bi-endian support to ELF parser (Tomohiro B Berry).
* Adjust restore_mkdevicemap.patch to mark get_kfreebsd_version as static,
  to appease "gcc -Werror=missing-prototypes".
* Cherry-pick from upstream:
  - Change grub-macbless' manual page section to 8.
* Install grub-glue-efi, grub-macbless, grub-render-label, and
  grub-syslinux2cfg.
* grub-shell: Pass -no-pad to xorriso when building floppy images.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/loader/efi/appleloader.c
76
76
      .header = {                                                       \
77
77
        .type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE,                     \
78
78
        .subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE,          \
79
 
        .length = {sizeof (struct grub_efi_memory_mapped_device_path), 0} \
 
79
        .length = sizeof (struct grub_efi_memory_mapped_device_path)    \
80
80
      },                                                                \
81
81
      .memory_type = GRUB_EFI_MEMORY_MAPPED_IO,                         \
82
82
      .start_address = st,                                              \
87
87
        .header = {                                                     \
88
88
          .type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE,                      \
89
89
          .subtype = GRUB_EFI_PIWG_DEVICE_PATH_SUBTYPE,                 \
90
 
          .length = {sizeof (struct grub_efi_piwg_device_path), 0}      \
 
90
          .length = sizeof (struct grub_efi_piwg_device_path)           \
91
91
        },                                                              \
92
 
        .guid = {0x2B0585EB, 0xD8B8, 0x49A9, {0x8B, 0x8C, 0xE2, 0x1B,   \
93
 
                                              0x01, 0xAE, 0xF2, 0xB7}}  \
 
92
        .guid = GRUB_EFI_VENDOR_APPLE_GUID                              \
94
93
      },                                                                \
95
94
       .end =                                                           \
96
95
          {                                                             \
97
96
            .type = GRUB_EFI_END_DEVICE_PATH_TYPE,                      \
98
97
            .subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE,         \
99
 
            .length = {sizeof (struct grub_efi_device_path), 0}         \
 
98
            .length = sizeof (struct grub_efi_device_path)              \
100
99
          }                                                             \
101
100
  }
102
101
 
127
126
static struct piwg_full_device_path devpath_7 = MAKE_PIWG_PATH (0xff981000,
128
127
                                                                0xffc8ffff);
129
128
 
 
129
/* mid-2012 MBP retina (MacBookPro10,1) */ 
 
130
static struct piwg_full_device_path devpath_8 = MAKE_PIWG_PATH (0xff990000,
 
131
                                                                0xffb2ffff);
 
132
 
130
133
struct devdata
131
134
{
132
135
  const char *model;
142
145
  {"MB NV", (grub_efi_device_path_t *) &devpath_5},
143
146
  {"MB NV2", (grub_efi_device_path_t *) &devpath_6},
144
147
  {"MBP2011", (grub_efi_device_path_t *) &devpath_7},
 
148
  {"MBP2012", (grub_efi_device_path_t *) &devpath_8},
145
149
  {NULL, NULL},
146
150
};
147
151