Merge branch 'master' into leiflindholm/arm64

Conflicts:
	include/grub/util/install.h

diff --cc Makefile.util.def
Simple merge

diff --cc conf/Makefile.common
Simple merge

diff --cc configure.ac
Simple merge

diff --cc gentpl.py
Simple merge

diff --cc grub-core/Makefile.am
Simple merge

diff --cc include/grub/util/install.h
index 0aead0a,1b1ccd0..744e2f4
--- 1/include/grub/util/install.h
--- 2/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@@ -87,7 -87,8 +87,9 @@@ enum grub_install_pla
      GRUB_INSTALL_PLATFORM_ARM_EFI,
      GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS,
      GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS,
+     GRUB_INSTALL_PLATFORM_I386_XEN,
+     GRUB_INSTALL_PLATFORM_X86_64_XEN,
 +    GRUB_INSTALL_PLATFORM_ARM64_EFI,
      GRUB_INSTALL_PLATFORM_MAX
    };
  

diff --cc util/grub-install-common.c
Simple merge

diff --cc util/grub-install.c
Simple merge

diff --cc util/grub-mkimagexx.c
Simple merge