merge mainline into newreloc

diff --cc Makefile.in
Simple merge

diff --cc conf/common.rmk
index 29d69f27af217e467060c1e9e0972950fa6e9439,4186c61b2b17dbda55ac0f71e18b2f4ab1ae912a..04a2861a9cfddeabce75759730ca0b98087f8744
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -860,14 -846,7 +846,14 @@@ 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 util/mm.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 kern/emu/misc.c kern/emu/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
 +# tianocore cd access is very slow
 +BOOTCHECK_TIMEOUT=180
 +
 +bootcheck: $(BOOTCHECKS)
 +
  include $(srcdir)/conf/gcry.mk

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