From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 22 Dec 2009 12:34:01 +0000 (+0100)
Subject: merge mainline into efigfx
X-Git-Tag: 1.99~629^2~169^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a2869b584e92eaaf889822c533bd508306d78f6;p=thirdparty%2Fgrub.git

merge mainline into efigfx
---

2a2869b584e92eaaf889822c533bd508306d78f6
diff --cc conf/i386-efi.rmk
index a037ed383,261fe4092..5869ca554
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@@ -154,8 -154,8 +154,8 @@@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS
  efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  pkglib_MODULES += xnu.mod
 -xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
 +xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
- 	 loader/macho.c loader/xnu.c
+ 	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
  xnu_mod_CFLAGS = $(COMMON_CFLAGS)
  xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
  xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --cc conf/i386-pc.rmk
index b71a7edc0,046c71641..2aee9e678
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -183,8 -183,8 +183,8 @@@ linux_mod_CFLAGS = $(COMMON_CFLAGS
  linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  pkglib_MODULES += xnu.mod
 -xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c \
 +xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
- 	 loader/macho.c loader/xnu.c
+ 	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
  xnu_mod_CFLAGS = $(COMMON_CFLAGS)
  xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
  xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --cc conf/x86_64-efi.rmk
index 6db52f480,0d1289c6f..de45a9f86
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@@ -160,8 -160,8 +160,8 @@@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS
  efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  pkglib_MODULES += xnu.mod
 -xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
 +xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
- 	 loader/macho.c loader/xnu.c
+ 	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
  xnu_mod_CFLAGS = $(COMMON_CFLAGS)
  xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
  xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --cc loader/i386/xnu.c
index 23fbbe7e0,b1509cdc8..0b307ae53
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@@ -25,15 -25,14 +25,19 @@@
  #include <grub/loader.h>
  #include <grub/autoefi.h>
  #include <grub/i386/tsc.h>
+ #include <grub/efi/api.h>
  #include <grub/i386/pit.h>
  #include <grub/misc.h>
+ #include <grub/charset.h>
  #include <grub/term.h>
+ #include <grub/command.h>
+ #include <grub/gzio.h>
  
 +#define min(a,b) (((a) < (b)) ? (a) : (b))
 +#define max(a,b) (((a) > (b)) ? (a) : (b))
 +
 +#define DEFAULT_VIDEO_MODE "auto"
 +
  char grub_xnu_cmdline[1024];
  grub_uint32_t grub_xnu_heap_will_be_at;
  grub_uint32_t grub_xnu_entry_point, grub_xnu_arg1, grub_xnu_stack;