merge mainline into newreloc

diff --cc conf/common.rmk
index fe1e11a1f5b075debd7c151f587e5246dd6ec372,8df232a0b915fe74b64944d67616f32c9b041c6c..3fa0f48d6155c164b6554a2c2644ad50ac82a878
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -118,8 -116,11 +116,11 @@@ DEFSYMFILES += kernel_syms.ls
  kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       machine/memory.h machine/loader.h machine/kernel.h \
-       list.h handler.h command.h i18n.h env_private.h mm_private.h
 -      list.h handler.h command.h i18n.h env_private.h libgcc.h
++      list.h handler.h command.h i18n.h env_private.h libgcc.h mm_private.h
+ 
+ ifneq ($(platform), emu)
+ kernel_img_HEADERS += machine/memory.h machine/loader.h machine/kernel.h
+ endif
  
  symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
        /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
@@@ -849,13 -855,7 +855,13 @@@ boot_mod_CFLAGS = $(COMMON_CFLAGS
  boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  bin_UTILITIES += grub-mkpasswd-pbkdf2
- grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+ grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
  grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
  
 +# Randomly generated
 +SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
 +BOOTCHECK_TIMEOUT=60
 +
 +bootcheck: $(BOOTCHECKS)
 +
  include $(srcdir)/conf/gcry.mk

diff --cc conf/i386-coreboot.rmk
Simple merge

diff --cc conf/i386-ieee1275.rmk
Simple merge

diff --cc conf/i386-pc.rmk
Simple merge

diff --cc conf/mips.rmk
Simple merge

diff --cc conf/powerpc-ieee1275.rmk
Simple merge

diff --cc conf/x86-efi.rmk
Simple merge

diff --cc include/grub/i386/multiboot.h
index 0000000000000000000000000000000000000000,1c711fad4cf541f97fdbef420dea6feb5a1f4268..a1b94883d47846dccca4eef49be802a76a662924
mode 000000,100644..100644
--- /dev/null
--- 2/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@@ -1,0 -1,41 +1,36 @@@
 -extern grub_uint32_t grub_multiboot_payload_eip;
 -extern char *grub_multiboot_payload_orig;
 -extern grub_addr_t grub_multiboot_payload_dest;
 -extern grub_size_t grub_multiboot_payload_size;
 -
+ /*
+  *  GRUB  --  GRand Unified Bootloader
+  *  Copyright (C) 2002,2003,2004,2007,2008,2009  Free Software Foundation, Inc.
+  *
+  *  GRUB is free software: you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation, either version 3 of the License, or
+  *  (at your option) any later version.
+  *
+  *  GRUB is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+ #ifndef GRUB_MULTIBOOT_CPU_HEADER
+ #define GRUB_MULTIBOOT_CPU_HEADER     1
+ 
+ #define MULTIBOOT_INITIAL_STATE  { .eax = MULTIBOOT_BOOTLOADER_MAGIC, \
+     .ecx = 0,                                                         \
+     .edx = 0,                                                         \
+     /* Set esp to some random location in low memory to avoid breaking */ \
+     /* non-compliant kernels.  */                                     \
+     .esp = 0x7ff00                                                    \
+       }
+ #define MULTIBOOT_ENTRY_REGISTER eip
+ #define MULTIBOOT_MBI_REGISTER ebx
+ #define MULTIBOOT_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_I386
+ 
+ #define MULTIBOOT_ELF32_MACHINE EM_386
+ #define MULTIBOOT_ELF64_MACHINE EM_X86_64
+ 
+ #endif /* ! GRUB_MULTIBOOT_CPU_HEADER */

diff --cc include/grub/misc.h
Simple merge

diff --cc kern/i386/pc/startup.S
Simple merge

diff --cc loader/i386/multiboot_mbi.c
Simple merge

diff --cc loader/multiboot.c
index 146ea0d32f5413449ebc03eacfacfe058065877b,ce1e75dda4eca060e287f8be3ac70d1a04e3ec96..53dc42abb42260a2852aa36aebe8e2b86fb3ba25
--- 1/loader/multiboot.c
--- 2/loader/multiboot.c
+++ b/loader/multiboot.c
@@@ -29,10 -29,9 +29,9 @@@
  
  #include <grub/loader.h>
  #include <grub/command.h>
--#include <grub/machine/loader.h>
  #include <grub/multiboot.h>
  #include <grub/cpu/multiboot.h>
 +#include <grub/machine/memory.h>
  #include <grub/elf.h>
  #include <grub/aout.h>
  #include <grub/file.h>