merge mainline into efigfx

diff --cc commands/videotest.c
Simple merge

diff --cc conf/i386-efi.rmk
index a037ed383b281b481afae7ce9b260621ed7c4b9b,261fe40920bc14dc6e0d822cc38ee462e4f9e25c..5869ca554c49c0e2214e962dec98a182b6045575
--- 1/conf/i386-efi.rmk
--- 2/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 b71a7edc0114f6c46a345f84f191cf3177b9437c,046c71641e11b92659952fed582d2e8f90c0261c..2aee9e678994d2de65ceceb6455fe74b5ee0cabc
--- 1/conf/i386-pc.rmk
--- 2/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 6db52f480837af787f9a0b177bf77fcdfdf0c06c,0d1289c6f0191c0706a744aa782dff95b25a52b7..de45a9f868132e3794a9425d34a1f7587bd954fb
--- 1/conf/x86_64-efi.rmk
--- 2/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 include/grub/i386/xnu.h
Simple merge

diff --cc loader/i386/xnu.c
index 23fbbe7e09b309f5355207b7a6ad6019a0f2f796,b1509cdc821dce794f1ed8b79c85f5c654123490..0b307ae53abf25e80f40671bd9c9e4871e5442e4
--- 1/loader/i386/xnu.c
--- 2/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;

diff --cc video/i386/pc/vbe.c
Simple merge