mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 14:59:34 +00:00
* grub-core/loader/xnu.c (grub_cmd_xnu_kernel) [! GRUB_MACHINE_EFI]:
Preload EFIemu. (grub_cmd_xnu_kernel64) [! GRUB_MACHINE_EFI]: Likewise.
This commit is contained in:
1 parent
693db2df56
commit
14b48a19c2
2 files changed
+22
No files matched your search
@@ -1,3 +1,9 @@
|
|||||||
|
2010-12-27 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/loader/xnu.c (grub_cmd_xnu_kernel) [! GRUB_MACHINE_EFI]:
|
||||||
|
Preload EFIemu.
|
||||||
|
(grub_cmd_xnu_kernel64) [! GRUB_MACHINE_EFI]: Likewise.
|
||||||
|
|
||||||
2010-12-27 Vladimir Serbinenko <phcoder@gmail.com>
|
2010-12-27 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* grub-core/loader/xnu.c (grub_cmd_xnu_kext): Abort if no kernel
|
* grub-core/loader/xnu.c (grub_cmd_xnu_kext): Abort if no kernel
|
||||||
|
|||||||
@@ -34,6 +34,10 @@
|
|||||||
#include <grub/env.h>
|
#include <grub/env.h>
|
||||||
#include <grub/i18n.h>
|
#include <grub/i18n.h>
|
||||||
|
|
||||||
|
#if defined (__i386) && !defined (GRUB_MACHINE_EFI)
|
||||||
|
#include <grub/autoefi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
struct grub_xnu_devtree_key *grub_xnu_devtree_root = 0;
|
struct grub_xnu_devtree_key *grub_xnu_devtree_root = 0;
|
||||||
static int driverspackagenum = 0;
|
static int driverspackagenum = 0;
|
||||||
static int driversnum = 0;
|
static int driversnum = 0;
|
||||||
@@ -424,6 +428,12 @@ grub_cmd_xnu_kernel (grub_command_t cmd __attribute__ ((unused)),
|
|||||||
if (ptr != grub_xnu_cmdline)
|
if (ptr != grub_xnu_cmdline)
|
||||||
*(ptr - 1) = 0;
|
*(ptr - 1) = 0;
|
||||||
|
|
||||||
|
#if defined (__i386) && !defined (GRUB_MACHINE_EFI)
|
||||||
|
err = grub_efiemu_autocore ();
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
#endif
|
||||||
|
|
||||||
grub_loader_set (grub_xnu_boot, grub_xnu_unload, 0);
|
grub_loader_set (grub_xnu_boot, grub_xnu_unload, 0);
|
||||||
|
|
||||||
grub_xnu_lock ();
|
grub_xnu_lock ();
|
||||||
@@ -529,6 +539,12 @@ grub_cmd_xnu_kernel64 (grub_command_t cmd __attribute__ ((unused)),
|
|||||||
if (ptr != grub_xnu_cmdline)
|
if (ptr != grub_xnu_cmdline)
|
||||||
*(ptr - 1) = 0;
|
*(ptr - 1) = 0;
|
||||||
|
|
||||||
|
#if defined (__i386) && !defined (GRUB_MACHINE_EFI)
|
||||||
|
err = grub_efiemu_autocore ();
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
#endif
|
||||||
|
|
||||||
grub_loader_set (grub_xnu_boot, grub_xnu_unload, 0);
|
grub_loader_set (grub_xnu_boot, grub_xnu_unload, 0);
|
||||||
|
|
||||||
grub_xnu_lock ();
|
grub_xnu_lock ();
|
||||||
|
|||||||
Reference in new issue
Block a user