Add %{_libexecdir}/installkernel directory to the %files list

Only the %{_libexecdir}/installkernel/installkernel-bls file was added to
the %files directive but the dir containing the file should also be listed.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

.git.diff.order

@@ -0,0 +1,15 @@
+*.dec
+*.dsc.inc
+*.dsc
+*.fdf
+*.inf
+*.vfr
+*.ac
+*.def
+*.c
+*.h
+*.S
+*.mk
+Makefile.*
+Make.*
+Makefile

0001-Add-support-for-Linux-EFI-stub-loading.patch

@@ -0,0 +1,997 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg@redhat.com>
+Date: Tue, 10 Jul 2012 11:58:52 -0400
+Subject: [PATCH] Add support for Linux EFI stub loading.
+
+Also:
+
+commit 71c843745f22f81e16d259e2e19c99bf3c1855c1
+Author: Colin Watson <cjwatson@ubuntu.com>
+Date:   Tue Oct 23 10:40:49 2012 -0400
+
+Don't allow insmod when secure boot is enabled.
+
+Hi,
+
+Fedora's patch to forbid insmod in UEFI Secure Boot environments is fine
+as far as it goes.  However, the insmod command is not the only way that
+modules can be loaded.  In particular, the 'normal' command, which
+implements the usual GRUB menu and the fully-featured command prompt,
+will implicitly load commands not currently loaded into memory.  This
+permits trivial Secure Boot violations by writing commands implementing
+whatever you want to do and pointing $prefix at the malicious code.
+
+I'm currently test-building this patch (replacing your current
+grub-2.00-no-insmod-on-sb.patch), but this should be more correct.  It
+moves the check into grub_dl_load_file.
+---
+ grub-core/Makefile.core.def       |  16 +-
+ grub-core/kern/dl.c               |  21 +++
+ grub-core/kern/efi/efi.c          |  28 ++++
+ grub-core/kern/efi/mm.c           |  32 ++++
+ grub-core/loader/arm64/linux.c    | 118 +++++++-------
+ grub-core/loader/arm64/xen_boot.c |   1 -
+ grub-core/loader/efi/linux.c      |  70 ++++++++
+ grub-core/loader/i386/efi/linux.c | 335 ++++++++++++++++++++++++++++++++++++++
+ grub-core/loader/i386/pc/linux.c  |  10 +-
+ include/grub/arm/linux.h          |   9 +
+ include/grub/arm64/linux.h        |  10 ++
+ include/grub/efi/efi.h            |   7 +-
+ include/grub/efi/linux.h          |  31 ++++
+ include/grub/i386/linux.h         |   1 +
+ 14 files changed, 620 insertions(+), 69 deletions(-)
+ create mode 100644 grub-core/loader/efi/linux.c
+ create mode 100644 grub-core/loader/i386/efi/linux.c
+ create mode 100644 include/grub/efi/linux.h
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 9590e87d9c0..0b4b0c2122d 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -1626,13 +1626,6 @@ module = {
+   enable = i386_pc;
+ };
+ 
+-
+-module = {
+-  name = linux16;
+-  common = loader/i386/pc/linux.c;
+-  enable = x86;
+-};
+-
+ module = {
+   name = ntldr;
+   i386_pc = loader/i386/pc/ntldr.c;
+@@ -1685,7 +1678,9 @@ module = {
+ 
+ module = {
+   name = linux;
+-  x86 = loader/i386/linux.c;
++  i386_pc = loader/i386/pc/linux.c;
++  x86_64_efi = loader/i386/efi/linux.c;
++  i386_efi = loader/i386/efi/linux.c;
+   xen = loader/i386/xen.c;
+   i386_pc = lib/i386/pc/vesa_modes_table.c;
+   mips = loader/mips/linux.c;
+@@ -1696,9 +1691,14 @@ module = {
+   arm_efi = loader/arm64/linux.c;
+   arm_uboot = loader/arm/linux.c;
+   arm64 = loader/arm64/linux.c;
++  emu = loader/emu/linux.c;
++  fdt = lib/fdt.c;
++
+   common = loader/linux.c;
+   common = lib/cmdline.c;
+   enable = noemu;
++
++  efi = loader/efi/linux.c;
+ };
+ 
+ module = {
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index e394cd96f8c..04e804d1668 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -38,6 +38,14 @@
+ #define GRUB_MODULES_MACHINE_READONLY
+ #endif
+ 
++#ifdef GRUB_MACHINE_EMU
++#include <sys/mman.h>
++#endif
++
++#ifdef GRUB_MACHINE_EFI
++#include <grub/efi/efi.h>
++#endif
++
+ 
+ 
+ #pragma GCC diagnostic ignored "-Wcast-align"
+@@ -686,6 +694,19 @@ grub_dl_load_file (const char *filename)
+   void *core = 0;
+   grub_dl_t mod = 0;
+ 
++#ifdef GRUB_MACHINE_EFI
++  if (grub_efi_secure_boot ())
++    {
++#if 0
++      /* This is an error, but grub2-mkconfig still generates a pile of
++       * insmod commands, so emitting it would be mostly just obnoxious. */
++      grub_error (GRUB_ERR_ACCESS_DENIED,
++		  "Secure Boot forbids loading module from %s", filename);
++#endif
++      return 0;
++    }
++#endif
++
+   grub_boot_time ("Loading module %s", filename);
+ 
+   file = grub_file_open (filename);
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 708581fcbde..c8a9d8307c0 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
+   return NULL;
+ }
+ 
++grub_efi_boolean_t
++grub_efi_secure_boot (void)
++{
++  grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;
++  grub_size_t datasize;
++  char *secure_boot = NULL;
++  char *setup_mode = NULL;
++  grub_efi_boolean_t ret = 0;
++
++  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
++
++  if (datasize != 1 || !secure_boot)
++    goto out;
++
++  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
++
++  if (datasize != 1 || !setup_mode)
++    goto out;
++
++  if (*secure_boot && !*setup_mode)
++    ret = 1;
++
++ out:
++  grub_free (secure_boot);
++  grub_free (setup_mode);
++  return ret;
++}
++
+ #pragma GCC diagnostic ignored "-Wcast-align"
+ 
+ /* Search the mods section from the PE32/PE32+ image. This code uses
+diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
+index 42ad7c570a5..5cdf6c943f2 100644
+--- a/grub-core/kern/efi/mm.c
++++ b/grub-core/kern/efi/mm.c
+@@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
+     }
+ }
+ 
++/* Allocate pages below a specified address */
++void *
++grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
++			     grub_efi_uintn_t pages)
++{
++  grub_efi_status_t status;
++  grub_efi_boot_services_t *b;
++  grub_efi_physical_address_t address = max;
++
++  if (max > 0xffffffff)
++    return 0;
++
++  b = grub_efi_system_table->boot_services;
++  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++
++  if (status != GRUB_EFI_SUCCESS)
++    return 0;
++
++  if (address == 0)
++    {
++      /* Uggh, the address 0 was allocated... This is too annoying,
++	 so reallocate another one.  */
++      address = max;
++      status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
++      grub_efi_free_pages (0, pages);
++      if (status != GRUB_EFI_SUCCESS)
++	return 0;
++    }
++
++  return (void *) ((grub_addr_t) address);
++}
++
+ /* Allocate pages. Return the pointer to the first of allocated pages.  */
+ void *
+ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 1f86229f86b..6c00af98dce 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -29,6 +29,7 @@
+ #include <grub/efi/efi.h>
+ #include <grub/efi/fdtload.h>
+ #include <grub/efi/memory.h>
++#include <grub/efi/linux.h>
+ #include <grub/efi/pe32.h>
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
+@@ -40,6 +41,7 @@ static int loaded;
+ 
+ static void *kernel_addr;
+ static grub_uint64_t kernel_size;
++static grub_uint32_t handover_offset;
+ 
+ static char *linux_args;
+ static grub_uint32_t cmdline_size;
+@@ -66,7 +68,8 @@ grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header * lh)
+ static grub_err_t
+ finalize_params_linux (void)
+ {
+-  int node, retval;
++  grub_efi_loaded_image_t *loaded_image = NULL;
++  int node, retval, len;
+ 
+   void *fdt;
+ 
+@@ -101,79 +104,70 @@ finalize_params_linux (void)
+   if (grub_fdt_install() != GRUB_ERR_NONE)
+     goto failure;
+ 
+-  return GRUB_ERR_NONE;
+-
+-failure:
+-  grub_fdt_unload();
+-  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
+-}
+-
+-grub_err_t
+-grub_armxx_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+-{
+-  grub_efi_memory_mapped_device_path_t *mempath;
+-  grub_efi_handle_t image_handle;
+-  grub_efi_boot_services_t *b;
+-  grub_efi_status_t status;
+-  grub_efi_loaded_image_t *loaded_image;
+-  int len;
+-
+-  mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t));
+-  if (!mempath)
+-    return grub_errno;
+-
+-  mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE;
+-  mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE;
+-  mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath));
+-  mempath[0].memory_type = GRUB_EFI_LOADER_DATA;
+-  mempath[0].start_address = addr;
+-  mempath[0].end_address = addr + size;
+-
+-  mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
+-  mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
+-  mempath[1].header.length = sizeof (grub_efi_device_path_t);
+-
+-  b = grub_efi_system_table->boot_services;
+-  status = b->load_image (0, grub_efi_image_handle,
+-			  (grub_efi_device_path_t *) mempath,
+-			  (void *) addr, size, &image_handle);
+-  if (status != GRUB_EFI_SUCCESS)
+-    return grub_error (GRUB_ERR_BAD_OS, "cannot load image");
+-
+-  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++  grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n",
++		fdt);
+ 
+   /* Convert command line to UCS-2 */
+-  loaded_image = grub_efi_get_loaded_image (image_handle);
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  if (!loaded_image)
++    goto failure;
++
+   loaded_image->load_options_size = len =
+-    (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
++    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);
+   loaded_image->load_options =
+     grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
+   if (!loaded_image->load_options)
+-    return grub_errno;
++    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");
+ 
+   loaded_image->load_options_size =
+     2 * grub_utf8_to_utf16 (loaded_image->load_options, len,
+-			    (grub_uint8_t *) args, len, NULL);
++			    (grub_uint8_t *) linux_args, len, NULL);
+ 
+-  grub_dprintf ("linux", "starting image %p\n", image_handle);
+-  status = b->start_image (image_handle, 0, NULL);
++  return GRUB_ERR_NONE;
+ 
+-  /* When successful, not reached */
+-  b->unload_image (image_handle);
+-  grub_efi_free_pages ((grub_addr_t) loaded_image->load_options,
+-		       GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++failure:
++  grub_fdt_unload();
++  return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
++}
+ 
+-  return grub_errno;
++static void
++free_params (void)
++{
++  grub_efi_loaded_image_t *loaded_image = NULL;
++
++  loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle);
++  if (loaded_image)
++    {
++      if (loaded_image->load_options)
++	grub_efi_free_pages ((grub_efi_physical_address_t)(grub_efi_uintn_t)loaded_image->load_options,
++			     GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
++      loaded_image->load_options = NULL;
++      loaded_image->load_options_size = 0;
++    }
++}
++
++grub_err_t
++grub_armxx_efi_linux_boot_image (grub_addr_t addr, char *args)
++{
++  grub_err_t retval;
++
++  retval = finalize_params_linux ();
++  if (retval != GRUB_ERR_NONE)
++    return grub_errno;
++
++  grub_dprintf ("linux", "linux command line: '%s'\n", args);
++
++  retval = grub_efi_linux_boot ((char *)addr, handover_offset, (void *)addr);
++
++  /* Never reached... */
++  free_params();
++  return retval;
+ }
+ 
+ static grub_err_t
+ grub_linux_boot (void)
+ {
+-  if (finalize_params_linux () != GRUB_ERR_NONE)
+-    return grub_errno;
+-
+-  return (grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr,
+-                                          kernel_size, linux_args));
++  return grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr, linux_args);
+ }
+ 
+ static grub_err_t
+@@ -287,6 +281,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ {
+   grub_file_t file = 0;
+   struct linux_armxx_kernel_header lh;
++  struct grub_armxx_linux_pe_header *pe;
+ 
+   grub_dl_ref (my_mod);
+ 
+@@ -331,6 +326,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 
+   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
+ 
++  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
++    {
++      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
++      goto fail;
++    }
++
++  pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
++  handover_offset = pe->opt.entry_addr;
++
+   cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
+   linux_args = grub_malloc (cmdline_size);
+   if (!linux_args)
+diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
+index 1003a0b9997..f35b16caa92 100644
+--- a/grub-core/loader/arm64/xen_boot.c
++++ b/grub-core/loader/arm64/xen_boot.c
+@@ -266,7 +266,6 @@ xen_boot (void)
+     return err;
+ 
+   return grub_armxx_efi_linux_boot_image (xen_hypervisor->start,
+-					  xen_hypervisor->size,
+ 					  xen_hypervisor->cmdline);
+ }
+ 
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+new file mode 100644
+index 00000000000..c24202a5dd1
+--- /dev/null
++++ b/grub-core/loader/efi/linux.c
+@@ -0,0 +1,70 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2014 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/>.
++ */
++
++#include <grub/err.h>
++#include <grub/mm.h>
++#include <grub/types.h>
++#include <grub/cpu/linux.h>
++#include <grub/efi/efi.h>
++#include <grub/efi/pe32.h>
++#include <grub/efi/linux.h>
++
++#define SHIM_LOCK_GUID \
++ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
++
++struct grub_efi_shim_lock
++{
++  grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size);
++};
++typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
++
++grub_efi_boolean_t
++grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
++{
++  grub_efi_guid_t guid = SHIM_LOCK_GUID;
++  grub_efi_shim_lock_t *shim_lock;
++
++  shim_lock = grub_efi_locate_protocol(&guid, NULL);
++
++  if (!shim_lock)
++    return 1;
++
++  if (shim_lock->verify(data, size) == GRUB_EFI_SUCCESS)
++    return 1;
++
++  return 0;
++}
++
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wcast-align"
++
++typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
++
++grub_err_t
++grub_efi_linux_boot (void *kernel_addr, grub_off_t offset,
++		     void *kernel_params)
++{
++  handover_func hf;
++
++  hf = (handover_func)((char *)kernel_addr + offset);
++  hf (grub_efi_image_handle, grub_efi_system_table, kernel_params);
++
++  return GRUB_ERR_BUG;
++}
++
++#pragma GCC diagnostic pop
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+new file mode 100644
+index 00000000000..3db82e782df
+--- /dev/null
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -0,0 +1,335 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2012  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/>.
++ */
++
++#include <grub/loader.h>
++#include <grub/file.h>
++#include <grub/err.h>
++#include <grub/types.h>
++#include <grub/mm.h>
++#include <grub/cpu/linux.h>
++#include <grub/command.h>
++#include <grub/i18n.h>
++#include <grub/lib/cmdline.h>
++#include <grub/efi/efi.h>
++#include <grub/efi/linux.h>
++
++GRUB_MOD_LICENSE ("GPLv3+");
++
++static grub_dl_t my_mod;
++static int loaded;
++static void *kernel_mem;
++static grub_uint64_t kernel_size;
++static grub_uint8_t *initrd_mem;
++static grub_uint32_t handover_offset;
++struct linux_kernel_params *params;
++static char *linux_cmdline;
++
++#define BYTES_TO_PAGES(bytes)   (((bytes) + 0xfff) >> 12)
++
++static grub_err_t
++grub_linuxefi_boot (void)
++{
++  int offset = 0;
++
++#ifdef __x86_64__
++  offset = 512;
++#endif
++  asm volatile ("cli");
++
++  return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset,
++			      params);
++}
++
++static grub_err_t
++grub_linuxefi_unload (void)
++{
++  grub_dl_unref (my_mod);
++  loaded = 0;
++  if (initrd_mem)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
++			 BYTES_TO_PAGES(params->ramdisk_size));
++  if (linux_cmdline)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
++			 linux_cmdline,
++			 BYTES_TO_PAGES(params->cmdline_size + 1));
++  if (kernel_mem)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
++			 BYTES_TO_PAGES(kernel_size));
++  if (params)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
++			 BYTES_TO_PAGES(16384));
++  return GRUB_ERR_NONE;
++}
++
++static grub_err_t
++grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
++                 int argc, char *argv[])
++{
++  grub_file_t *files = 0;
++  int i, nfiles = 0;
++  grub_size_t size = 0;
++  grub_uint8_t *ptr;
++
++  if (argc == 0)
++    {
++      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
++      goto fail;
++    }
++
++  if (!loaded)
++    {
++      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("you need to load the kernel first"));
++      goto fail;
++    }
++
++  files = grub_zalloc (argc * sizeof (files[0]));
++  if (!files)
++    goto fail;
++
++  for (i = 0; i < argc; i++)
++    {
++      grub_file_filter_disable_compression ();
++      files[i] = grub_file_open (argv[i]);
++      if (! files[i])
++        goto fail;
++      nfiles++;
++      size += ALIGN_UP (grub_file_size (files[i]), 4);
++    }
++
++  initrd_mem = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(size));
++  if (!initrd_mem)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate initrd"));
++      goto fail;
++    }
++
++  params->ramdisk_size = size;
++  params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
++
++  ptr = initrd_mem;
++
++  for (i = 0; i < nfiles; i++)
++    {
++      grub_ssize_t cursize = grub_file_size (files[i]);
++      if (grub_file_read (files[i], ptr, cursize) != cursize)
++        {
++          if (!grub_errno)
++            grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
++                        argv[i]);
++          goto fail;
++        }
++      ptr += cursize;
++      grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
++      ptr += ALIGN_UP_OVERHEAD (cursize, 4);
++    }
++
++  params->ramdisk_size = size;
++
++ fail:
++  for (i = 0; i < nfiles; i++)
++    grub_file_close (files[i]);
++  grub_free (files);
++
++  if (initrd_mem && grub_errno)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
++			 BYTES_TO_PAGES(size));
++
++  return grub_errno;
++}
++
++static grub_err_t
++grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
++		int argc, char *argv[])
++{
++  grub_file_t file = 0;
++  struct linux_kernel_header lh;
++  grub_ssize_t len, start, filelen;
++  void *kernel = NULL;
++
++  grub_dl_ref (my_mod);
++
++  if (argc == 0)
++    {
++      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
++      goto fail;
++    }
++
++  file = grub_file_open (argv[0]);
++  if (! file)
++    goto fail;
++
++  filelen = grub_file_size (file);
++
++  kernel = grub_malloc(filelen);
++
++  if (!kernel)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
++      goto fail;
++    }
++
++  if (grub_file_read (file, kernel, filelen) != filelen)
++    {
++      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"), argv[0]);
++      goto fail;
++    }
++
++  if (! grub_linuxefi_secure_validate (kernel, filelen))
++    {
++      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
++		  argv[0]);
++      goto fail;
++    }
++
++  params = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(16384));
++
++  if (! params)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
++      goto fail;
++    }
++
++  grub_memset (params, 0, 16384);
++
++  grub_memcpy (&lh, kernel, sizeof (lh));
++
++  if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
++    {
++      grub_error (GRUB_ERR_BAD_OS, N_("invalid magic number"));
++      goto fail;
++    }
++
++  if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
++    {
++      grub_error (GRUB_ERR_BAD_OS, N_("too many setup sectors"));
++      goto fail;
++    }
++
++  if (lh.version < grub_cpu_to_le16 (0x020b))
++    {
++      grub_error (GRUB_ERR_BAD_OS, N_("kernel too old"));
++      goto fail;
++    }
++
++  if (!lh.handover_offset)
++    {
++      grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support EFI handover"));
++      goto fail;
++    }
++
++  grub_dprintf ("linux", "setting up cmdline\n");
++  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
++					 BYTES_TO_PAGES(lh.cmdline_size + 1));
++
++  if (!linux_cmdline)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
++      goto fail;
++    }
++
++  grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
++  grub_create_loader_cmdline (argc, argv,
++                              linux_cmdline + sizeof (LINUX_IMAGE) - 1,
++			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
++
++  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
++
++  handover_offset = lh.handover_offset;
++
++  start = (lh.setup_sects + 1) * 512;
++  len = grub_file_size(file) - start;
++
++  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
++					   BYTES_TO_PAGES(lh.init_size));
++
++  if (!kernel_mem)
++    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
++					     BYTES_TO_PAGES(lh.init_size));
++
++  if (!kernel_mem)
++    {
++      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
++      goto fail;
++    }
++
++  grub_memcpy (kernel_mem, (char *)kernel + start, len);
++  grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
++  loaded=1;
++
++  lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
++  grub_memcpy (params, &lh, 2 * 512);
++
++  params->type_of_loader = 0x21;
++
++ fail:
++
++  if (file)
++    grub_file_close (file);
++
++  if (kernel)
++    grub_free (kernel);
++
++  if (grub_errno != GRUB_ERR_NONE)
++    {
++      grub_dl_unref (my_mod);
++      loaded = 0;
++    }
++
++  if (linux_cmdline && !loaded)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
++			 linux_cmdline,
++			 BYTES_TO_PAGES(lh.cmdline_size + 1));
++
++  if (kernel_mem && !loaded)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
++			 BYTES_TO_PAGES(kernel_size));
++
++  if (params && !loaded)
++    grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
++			 BYTES_TO_PAGES(16384));
++
++  return grub_errno;
++}
++
++static grub_command_t cmd_linux, cmd_initrd;
++static grub_command_t cmd_linuxefi, cmd_initrdefi;
++
++GRUB_MOD_INIT(linux)
++{
++  cmd_linux =
++    grub_register_command ("linux", grub_cmd_linux,
++                           0, N_("Load Linux."));
++  cmd_linuxefi =
++    grub_register_command ("linuxefi", grub_cmd_linux,
++                           0, N_("Load Linux."));
++  cmd_initrd =
++    grub_register_command ("initrd", grub_cmd_initrd,
++                           0, N_("Load initrd."));
++  cmd_initrdefi =
++    grub_register_command ("initrdefi", grub_cmd_initrd,
++                           0, N_("Load initrd."));
++  my_mod = mod;
++}
++
++GRUB_MOD_FINI(linux)
++{
++  grub_unregister_command (cmd_linux);
++  grub_unregister_command (cmd_linuxefi);
++  grub_unregister_command (cmd_initrd);
++  grub_unregister_command (cmd_initrdefi);
++}
+diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
+index b69cb7a3a7f..a3c87cf2fc2 100644
+--- a/grub-core/loader/i386/pc/linux.c
++++ b/grub-core/loader/i386/pc/linux.c
+@@ -468,14 +468,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+   return grub_errno;
+ }
+ 
+-static grub_command_t cmd_linux, cmd_initrd;
++static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
+ 
+ GRUB_MOD_INIT(linux16)
+ {
+   cmd_linux =
++    grub_register_command ("linux", grub_cmd_linux,
++			   0, N_("Load Linux."));
++  cmd_linux16 =
+     grub_register_command ("linux16", grub_cmd_linux,
+ 			   0, N_("Load Linux."));
+   cmd_initrd =
++    grub_register_command ("initrd", grub_cmd_initrd,
++			   0, N_("Load initrd."));
++  cmd_initrd16 =
+     grub_register_command ("initrd16", grub_cmd_initrd,
+ 			   0, N_("Load initrd."));
+   my_mod = mod;
+@@ -484,5 +490,7 @@ GRUB_MOD_INIT(linux16)
+ GRUB_MOD_FINI(linux16)
+ {
+   grub_unregister_command (cmd_linux);
++  grub_unregister_command (cmd_linux16);
+   grub_unregister_command (cmd_initrd);
++  grub_unregister_command (cmd_initrd16);
+ }
+diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
+index 712ba17b9ba..5900fc8a40c 100644
+--- a/include/grub/arm/linux.h
++++ b/include/grub/arm/linux.h
+@@ -20,6 +20,7 @@
+ #ifndef GRUB_ARM_LINUX_HEADER
+ #define GRUB_ARM_LINUX_HEADER 1
+ 
++#include <grub/efi/pe32.h>
+ #include "system.h"
+ 
+ #define GRUB_LINUX_ARM_MAGIC_SIGNATURE 0x016f2818
+@@ -34,9 +35,17 @@ struct linux_arm_kernel_header {
+   grub_uint32_t hdr_offset;
+ };
+ 
++struct grub_arm_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe32_optional_header opt;
++};
++
+ #if defined(__arm__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
+ # define linux_armxx_kernel_header linux_arm_kernel_header
++# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
+ #endif
+ 
+ #if defined GRUB_MACHINE_UBOOT
+diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
+index 8655067e039..7b533b57139 100644
+--- a/include/grub/arm64/linux.h
++++ b/include/grub/arm64/linux.h
+@@ -19,6 +19,8 @@
+ #ifndef GRUB_ARM64_LINUX_HEADER
+ #define GRUB_ARM64_LINUX_HEADER 1
+ 
++#include <grub/efi/pe32.h>
++
+ #define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */
+ 
+ /* From linux/Documentation/arm64/booting.txt */
+@@ -36,9 +38,17 @@ struct linux_arm64_kernel_header
+   grub_uint32_t hdr_offset;	/* Offset of PE/COFF header */
+ };
+ 
++struct grub_arm64_linux_pe_header
++{
++  grub_uint32_t magic;
++  struct grub_pe32_coff_header coff;
++  struct grub_pe64_optional_header opt;
++};
++
+ #if defined(__aarch64__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
+ # define linux_armxx_kernel_header linux_arm64_kernel_header
++# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
+ #endif
+ 
+ #endif /* ! GRUB_ARM64_LINUX_HEADER */
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 2c6648d46fc..1061aee9726 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
+ 				      grub_efi_uintn_t pages);
+ void *
+ EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
++void *
++EXPORT_FUNC(grub_efi_allocate_pages_max) (grub_efi_physical_address_t max,
++					  grub_efi_uintn_t pages);
+ void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
+ 				       grub_efi_uintn_t pages);
+ grub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);
+@@ -82,6 +85,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+ 				     const grub_efi_guid_t *guid,
+ 				     void *data,
+ 				     grub_size_t datasize);
++grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
+ int
+ EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
+ 					     const grub_efi_device_path_t *dp2);
+@@ -95,8 +99,7 @@ void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
+ grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
+ #include <grub/cpu/linux.h>
+ grub_err_t grub_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh);
+-grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+-                                           char *args);
++grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, char *args);
+ #endif
+ 
+ grub_addr_t grub_efi_modules_addr (void);
+diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
+new file mode 100644
+index 00000000000..d9ede36773b
+--- /dev/null
++++ b/include/grub/efi/linux.h
+@@ -0,0 +1,31 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2014  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_EFI_LINUX_HEADER
++#define GRUB_EFI_LINUX_HEADER	1
++
++#include <grub/efi/api.h>
++#include <grub/err.h>
++#include <grub/symbol.h>
++
++grub_efi_boolean_t
++EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
++grub_err_t
++EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
++				  void *kernel_param);
++
++#endif /* ! GRUB_EFI_LINUX_HEADER */
+diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
+index 60c7c3b5e66..bb19dbd5a77 100644
+--- a/include/grub/i386/linux.h
++++ b/include/grub/i386/linux.h
+@@ -142,6 +142,7 @@ struct linux_i386_kernel_header
+   grub_uint64_t setup_data;
+   grub_uint64_t pref_address;
+   grub_uint32_t init_size;
++  grub_uint32_t handover_offset;
+ } GRUB_PACKED;
+ 
+ /* Boot parameters for Linux based on 2.6.12. This is used by the setup

0001-Bump-version-to-2.03.patch

@@ -1,230 +0,0 @@
-From b0bad6fd9449d3333fe1ab58953c0e6c1ce12c0d Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 3 May 2017 11:55:52 +0200
-Subject: [PATCH 001/198] Bump version to 2.03
-
----
- configure.ac                |   2 +-
- grub-core/tests/checksums.h | 196 ++++++++++++++++++++++----------------------
- 2 files changed, 99 insertions(+), 99 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index edd184154..d10d8adac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
- dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
- dnl used for the target type. See INSTALL for full list of variables.
- 
--AC_INIT([GRUB],[2.02],[bug-grub@gnu.org])
-+AC_INIT([GRUB],[2.03],[bug-grub@gnu.org])
- 
- AC_CONFIG_AUX_DIR([build-aux])
- 
-diff --git a/grub-core/tests/checksums.h b/grub-core/tests/checksums.h
-index 68d8ce7c7..921e57ff4 100644
---- a/grub-core/tests/checksums.h
-+++ b/grub-core/tests/checksums.h
-@@ -1,101 +1,101 @@
--  { "cmdline_cat", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xcd5fc34e, 0xcd5fc34e, 0xeabbecab, 0xeabbecab, 0xc9950151, 0xc9950151, 0x2be222b6, 0x2be222b6, 0xe88c769e, 0xe88c769e, 0x6be4910e, 0x6be4910e, 0x1dc1fe4f, 0x1dc1fe4f, 0xd7613e8f, 0xd7613e8f, 0xf8124196, 0xf8124196, 0x130f5935, 0x130f5935, 0x2872330e, 0x2872330e, 0xaa7b7868, 0xaa7b7868, 0x558eaeea, 0x558eaeea, 0x92f7960f, 0x92f7960f, 0xc5bfc709, 0xc5bfc709, 0x699732fe, 0x699732fe, 0xc859125f, 0xc859125f, 0xfc6ac729, 0xfc6ac729, 0xcdab6cd4, 0xcdab6cd4, 0x58a8b7f8, 0x58a8b7f8, 0xc0e73385, 0x6560d6ef, 0x3be8bb5d, 0x3be8bb5d, }, 45 },
--  { "cmdline_cat", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x13029f94, 0x13029f94, 0x7785fdab, 0x7785fdab, 0x95a7c1e8, 0x95a7c1e8, 0x315ab3e3, 0x315ab3e3, 0x6787f012, 0x6787f012, 0x79b1ecdc, 0x79b1ecdc, 0xdbc67810, 0xdbc67810, 0xafaa982e, 0xafaa982e, 0xc5cd0157, 0xc5cd0157, 0x3c50dd64, 0x3c50dd64, 0x1056cac0, 0x1056cac0, 0x1d7a41fa, 0x1d7a41fa, 0x5690b1e8, 0x5690b1e8, 0x616831d6, 0x616831d6, 0xfaf8e726, 0xfaf8e726, 0xd1ec5e26, 0xd1ec5e26, 0x3c269e1f, 0x3c269e1f, 0x1aa7952d, 0x1aa7952d, 0x6e7e2f99, 0x6e7e2f99, 0x98f4c02, 0x98f4c02, 0xc3f1abf2, 0xe348bb73, 0xea53cd60, 0xea53cd60, }, 45 },
--  { "cmdline_cat", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x8fbb4f4c, 0x8fbb4f4c, 0x5dc00167, 0x5dc00167, 0xbc124df8, 0xbc124df8, 0x31cf0f8e, 0x31cf0f8e, 0x798cc4ed, 0x798cc4ed, 0xc5d2a091, 0xc5d2a091, 0xb58a0591, 0xb58a0591, 0x4d118aca, 0x4d118aca, 0xbb06c7ee, 0xbb06c7ee, 0x42179db7, 0x42179db7, 0x65f2d81e, 0x65f2d81e, 0xa2628bcb, 0xa2628bcb, 0xbdb7f4b, 0xbdb7f4b, 0x66b10309, 0x66b10309, 0x1a550ea9, 0x1a550ea9, 0x377a297d, 0x377a297d, 0x2ea99015, 0x2ea99015, 0x4e20d7bc, 0x4e20d7bc, 0x8ecbde02, 0x8ecbde02, 0xdfa2195a, 0xdfa2195a, 0xe113d2a, 0xe204ee5b, 0x734679c1, 0x734679c1, }, 45 },
--  { "cmdline_cat", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xe2f6bfe1, 0xe2f6bfe1, 0xf18aee15, 0xf18aee15, 0x5e83b689, 0x5e83b689, 0xb7e8b42c, 0xb7e8b42c, 0x85d78f92, 0x85d78f92, 0xd56fadae, 0xd56fadae, 0x7632f5bf, 0x7632f5bf, 0x2769a748, 0x2769a748, 0x4a6112cd, 0x4a6112cd, 0x4f9b66a4, 0x4f9b66a4, 0x70457d38, 0x70457d38, 0x8cadb1a7, 0x8cadb1a7, 0x451341f, 0x451341f, 0x8a62e741, 0x8a62e741, 0x1b1f9031, 0x1b1f9031, 0x75ab630e, 0x75ab630e, 0xd5ff53ac, 0xd5ff53ac, 0x73a2b3c7, 0x73a2b3c7, 0x7b52acd5, 0x7b52acd5, 0xf6f3e48c, 0xf6f3e48c, 0x8d0db133, 0x8db24310, 0x7aef56d4, 0x7aef56d4, }, 45 },
--  { "cmdline_cat", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x838a3f40, 0x838a3f40, 0x7351ba96, 0x7351ba96, 0x660963bb, 0x660963bb, 0x6f3362a6, 0x6f3362a6, 0x915d35d9, 0x915d35d9, 0xc7edaee9, 0xc7edaee9, 0xbc8ec24c, 0xbc8ec24c, 0xeb120ffd, 0xeb120ffd, 0x8f6d8232, 0x8f6d8232, 0x2de5d515, 0x2de5d515, 0x4f2ecd91, 0x4f2ecd91, 0x555a9b90, 0x555a9b90, 0x8f7b0d77, 0x8f7b0d77, 0x5f9536af, 0x5f9536af, 0x3dd79dbe, 0x3dd79dbe, 0xb555a0, 0xb555a0, 0x75aec882, 0x75aec882, 0xd5da89cb, 0xd5da89cb, 0xb47b3257, 0xb47b3257, 0x7c97c046, 0x7c97c046, 0x726a7abe, 0x4c8b8a56, 0xcffa0854, 0xcffa0854, }, 45 },
--  { "cmdline_cat", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x7bf761e, 0x7bf761e, 0xaf0b6dae, 0xaf0b6dae, 0x7db15930, 0x7db15930, 0xc9720d56, 0xc9720d56, 0x55590d6c, 0x55590d6c, 0xa0d193d9, 0xa0d193d9, 0x728987b2, 0x728987b2, 0x28aecde6, 0x28aecde6, 0xa59bb094, 0xa59bb094, 0x2d0b049d, 0x2d0b049d, 0xd8421240, 0xd8421240, 0x51fa339, 0x51fa339, 0xc625cc46, 0xc625cc46, 0x2c9e6fcc, 0x2c9e6fcc, 0x3d06ffd5, 0x3d06ffd5, 0x8dd72816, 0x8dd72816, 0xfcf2a982, 0xfcf2a982, 0x6ef2870f, 0x6ef2870f, 0xba2caab7, 0xba2caab7, 0x8e5a5872, 0x8e5a5872, 0x62b2fedc, 0x2bd3b588, 0x34ebdb15, 0x34ebdb15, }, 45 },
--  { "cmdline_cat", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xa133280a, 0xa133280a, 0x1e8f4227, 0x1e8f4227, 0xa01cd911, 0xa01cd911, 0xdcb3d617, 0xdcb3d617, 0x51200351, 0x51200351, 0x609ba305, 0x609ba305, 0x5d96abfd, 0x5d96abfd, 0xd855cc70, 0xd855cc70, 0xdbfaf18d, 0xdbfaf18d, 0x84814843, 0x84814843, 0x4b00e630, 0x4b00e630, 0xd362b0f5, 0xd362b0f5, 0xec863355, 0xec863355, 0x195898d0, 0x195898d0, 0xe8c698c7, 0xe8c698c7, 0x884229e7, 0x884229e7, 0xb41ed3a9, 0xb41ed3a9, 0x2be1ce40, 0x2be1ce40, 0x8c33eb7c, 0x8c33eb7c, 0xbbce1da, 0xbbce1da, 0xef9415fa, 0x22fbc0d, 0xd82c182c, 0xd82c182c, }, 45 },
--  { "gfxterm_menu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xbe029c, 0x6671ee1f, 0xbe029c, 0x4348cfdb, 0x59c36f00, 0x59c36f00, 0x3ad73295, 0x3ad73295, 0x3ad73295, 0x44575ff3, 0x44575ff3, 0x44575ff3, 0x26a14a21, 0x26a14a21, 0x26a14a21, 0x59c36f00, 0x4348cfdb, 0x4348cfdb, 0x59c36f00, }, 20 },
--  { "gfxterm_menu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x14e228ef, 0xb0c8af57, 0x14e228ef, 0x3ae7ad90, 0xaa4593fe, 0xaa4593fe, 0xbec19c1b, 0xbec19c1b, 0xbec19c1b, 0x1834917c, 0x1834917c, 0x1834917c, 0x350c3a04, 0x350c3a04, 0x350c3a04, 0xaa4593fe, 0x3ae7ad90, 0x3ae7ad90, 0xaa4593fe, }, 20 },
--  { "gfxterm_menu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x651fb144, 0xdf93ee9c, 0x651fb144, 0x3808dcc0, 0xc9cbf769, 0xc9cbf769, 0xe4861949, 0xe4861949, 0xe4861949, 0x1a5ed885, 0x1a5ed885, 0x1a5ed885, 0xf314678d, 0xf314678d, 0xf314678d, 0xc9cbf769, 0x3808dcc0, 0x3808dcc0, 0xc9cbf769, }, 20 },
--  { "gfxterm_menu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xdfd0119e, 0x6c7018a9, 0xdfd0119e, 0x71865846, 0x9813a416, 0x9813a416, 0xb5e8801c, 0xb5e8801c, 0xb5e8801c, 0x2433062f, 0x2433062f, 0x2433062f, 0x3d893bff, 0x3d893bff, 0x3d893bff, 0x9813a416, 0x71865846, 0x71865846, 0x9813a416, }, 20 },
--  { "gfxterm_menu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x4e4844e0, 0x5ebe5f81, 0x4e4844e0, 0x38ee7153, 0x5fcf013d, 0x5fcf013d, 0x819b5c4e, 0x819b5c4e, 0x819b5c4e, 0x538b4438, 0x538b4438, 0x538b4438, 0x45f87ba7, 0x45f87ba7, 0x45f87ba7, 0x5fcf013d, 0x38ee7153, 0x38ee7153, 0x5fcf013d, }, 20 },
--  { "gfxterm_menu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x701427d4, 0x246c830a, 0x701427d4, 0x6b11fdd3, 0xdd28f52b, 0xdd28f52b, 0xcd83646c, 0xcd83646c, 0xcd83646c, 0xecbf9d88, 0xecbf9d88, 0xecbf9d88, 0x91075604, 0x91075604, 0x91075604, 0xdd28f52b, 0x6b11fdd3, 0x6b11fdd3, 0xdd28f52b, }, 20 },
--  { "gfxterm_menu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x7b5bd4c, 0xac246af1, 0x7b5bd4c, 0xf80aa6cc, 0x43d1f34, 0x43d1f34, 0xb200c08a, 0xb200c08a, 0xb200c08a, 0xcd0a6922, 0xcd0a6922, 0xcd0a6922, 0x545b6ca4, 0x545b6ca4, 0x545b6ca4, 0x43d1f34, 0xf80aa6cc, 0xf80aa6cc, 0x43d1f34, }, 20 },
--  { "gfxmenu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x1027210c, 0x64e51c81, 0x1027210c, 0x45ca4a8a, 0x9a2e0d26, 0x12fd0f21, 0x12fd0f21, 0x12fd0f21, 0x4e25f9e1, 0x4e25f9e1, 0x4e25f9e1, 0x67bd3773, 0x67bd3773, 0x67bd3773, 0x59c36f00, 0x45ca4a8a, 0x45ca4a8a, }, 18 },
--  { "gfxmenu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x8d12f697, 0xc5b32248, 0x8d12f697, 0x56720aa4, 0xa9d58ccd, 0xf766a14d, 0xf766a14d, 0xf766a14d, 0xa2390b47, 0xa2390b47, 0xa2390b47, 0xcb0ac30e, 0xcb0ac30e, 0xcb0ac30e, 0xaa4593fe, 0x56720aa4, 0x56720aa4, }, 18 },
--  { "gfxmenu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xa5ec9f45, 0xdb7085d8, 0xa5ec9f45, 0x9caf1d3f, 0x5411be8b, 0xedc0ad83, 0xedc0ad83, 0xedc0ad83, 0x927e0b17, 0x927e0b17, 0x927e0b17, 0xd00a6b6f, 0xd00a6b6f, 0xd00a6b6f, 0xc9cbf769, 0x9caf1d3f, 0x9caf1d3f, }, 18 },
--  { "gfxmenu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x1c3742c9, 0xce8e83bf, 0xeb96c838, 0xce8e83bf, 0x73cb3bc1, 0x740d78cf, 0xb35c7e64, 0xb35c7e64, 0xb35c7e64, 0x58f99418, 0x58f99418, 0x58f99418, 0x5eb294e8, 0x5eb294e8, 0x5eb294e8, 0x1c3742c9, 0x73cb3bc1, 0x73cb3bc1, }, 18 },
--  { "gfxmenu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0x56a03e51, 0xee7d8d4b, 0x56a03e51, 0x5bdf9413, 0xbcda144c, 0x220f7a5e, 0x220f7a5e, 0x220f7a5e, 0x4d46a64f, 0x4d46a64f, 0x4d46a64f, 0x40b0384c, 0x40b0384c, 0x40b0384c, 0xcc5a7bed, 0x5bdf9413, 0x5bdf9413, }, 18 },
--  { "gfxmenu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xef4a3312, 0xea8a9cf0, 0x8929e522, 0xea8a9cf0, 0x78f3dfbc, 0x5d55a141, 0x377f1aeb, 0x377f1aeb, 0x377f1aeb, 0xf1cd5ef5, 0xf1cd5ef5, 0xf1cd5ef5, 0xe5a88e4a, 0xe5a88e4a, 0xe5a88e4a, 0xef4a3312, 0x78f3dfbc, 0x78f3dfbc, }, 18 },
--  { "gfxmenu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x54e48d80, 0x6dcf1d57, 0x925a4c8f, 0x6dcf1d57, 0x69005b38, 0x6d6bb4bc, 0x756a36b9, 0x756a36b9, 0x756a36b9, 0xf499c068, 0xf499c068, 0xf499c068, 0x623d7907, 0x623d7907, 0x623d7907, 0x54e48d80, 0x69005b38, 0x69005b38, }, 18 },
--  { "gfxterm_ar", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xa49d26b0, 0xaa7d9b28, 0xa49d26b0, 0xe76bebf7, 0x59c36f00, 0x59c36f00, 0xea6ab252, 0xea6ab252, 0xea6ab252, 0x94eadf34, 0x94eadf34, 0x94eadf34, 0xf61ccae6, 0xf61ccae6, 0xf61ccae6, 0x59c36f00, 0xe76bebf7, 0xe76bebf7, 0x59c36f00, }, 20 },
--  { "gfxterm_ar", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x7a277db, 0xf3bf80f7, 0x7a277db, 0x29a7f2a4, 0xaa4593fe, 0xaa4593fe, 0xf1cd57e3, 0xf1cd57e3, 0xf1cd57e3, 0x57385a84, 0x57385a84, 0x57385a84, 0x7a00f1fc, 0x7a00f1fc, 0x7a00f1fc, 0xaa4593fe, 0x29a7f2a4, 0x29a7f2a4, 0xaa4593fe, }, 20 },
--  { "gfxterm_ar", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x631edf85, 0x71926408, 0x631edf85, 0x3e09b201, 0xc9cbf769, 0xc9cbf769, 0xf224ab3, 0xf224ab3, 0xf224ab3, 0xf1fa8b7f, 0xf1fa8b7f, 0xf1fa8b7f, 0x18b03477, 0x18b03477, 0x18b03477, 0xc9cbf769, 0x3e09b201, 0x3e09b201, 0xc9cbf769, }, 20 },
--  { "gfxterm_ar", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xfbaf4635, 0xe69ef474, 0xfbaf4635, 0x55f90fed, 0x9813a416, 0x9813a416, 0x3aad8f41, 0x3aad8f41, 0x3aad8f41, 0xab760972, 0xab760972, 0xab760972, 0xb2cc34a2, 0xb2cc34a2, 0xb2cc34a2, 0x9813a416, 0x55f90fed, 0x55f90fed, 0x9813a416, }, 20 },
--  { "gfxterm_ar", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xdce50745, 0x1d8009e4, 0xdce50745, 0xaa4332f6, 0x5fcf013d, 0x5fcf013d, 0x354e5749, 0x354e5749, 0x354e5749, 0xe75e4f3f, 0xe75e4f3f, 0xe75e4f3f, 0xf12d70a0, 0xf12d70a0, 0xf12d70a0, 0x5fcf013d, 0xaa4332f6, 0xaa4332f6, 0x5fcf013d, }, 20 },
--  { "gfxterm_ar", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x3efebeff, 0xf101dfe2, 0x3efebeff, 0x25fb64f8, 0xdd28f52b, 0xdd28f52b, 0x70c69ebd, 0x70c69ebd, 0x70c69ebd, 0x51fa6759, 0x51fa6759, 0x51fa6759, 0x2c42acd5, 0x2c42acd5, 0x2c42acd5, 0xdd28f52b, 0x25fb64f8, 0x25fb64f8, 0xdd28f52b, }, 20 },
--  { "gfxterm_ar", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x59a34c64, 0x281cca78, 0x59a34c64, 0xa61c57e4, 0x43d1f34, 0x43d1f34, 0x95131d4, 0x95131d4, 0x95131d4, 0x765b987c, 0x765b987c, 0x765b987c, 0xef0a9dfa, 0xef0a9dfa, 0xef0a9dfa, 0x43d1f34, 0xa61c57e4, 0xa61c57e4, 0x43d1f34, }, 20 },
--  { "gfxterm_cyr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xa37c165, 0x72063383, 0xa37c165, 0x49c10c22, 0x59c36f00, 0x59c36f00, 0x4e53de8e, 0x4e53de8e, 0x4e53de8e, 0x30d3b3e8, 0x30d3b3e8, 0x30d3b3e8, 0x5225a63a, 0x5225a63a, 0x5225a63a, 0x59c36f00, 0x49c10c22, 0x49c10c22, 0x59c36f00, }, 20 },
--  { "gfxterm_cyr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x45bba0ba, 0xe60fd0b6, 0x45bba0ba, 0x6bbe25c5, 0xaa4593fe, 0xaa4593fe, 0x28de2b41, 0x28de2b41, 0x28de2b41, 0x8e2b2626, 0x8e2b2626, 0x8e2b2626, 0xa3138d5e, 0xa3138d5e, 0xa3138d5e, 0xaa4593fe, 0x6bbe25c5, 0x6bbe25c5, 0xaa4593fe, }, 20 },
--  { "gfxterm_cyr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xb43d4e9d, 0x16f88820, 0xb43d4e9d, 0xe92a2319, 0xc9cbf769, 0xc9cbf769, 0xb8959ec7, 0xb8959ec7, 0xb8959ec7, 0x464d5f0b, 0x464d5f0b, 0x464d5f0b, 0xaf07e003, 0xaf07e003, 0xaf07e003, 0xc9cbf769, 0xe92a2319, 0xe92a2319, 0xc9cbf769, }, 20 },
--  { "gfxterm_cyr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x46760365, 0x685ae30e, 0x46760365, 0xe8204abd, 0x9813a416, 0x9813a416, 0x8896050a, 0x8896050a, 0x8896050a, 0x194d8339, 0x194d8339, 0x194d8339, 0xf7bee9, 0xf7bee9, 0xf7bee9, 0x9813a416, 0xe8204abd, 0xe8204abd, 0x9813a416, }, 20 },
--  { "gfxterm_cyr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x6859aa86, 0xf3f11deb, 0x6859aa86, 0x1eff9f35, 0x5fcf013d, 0x5fcf013d, 0xd72b1482, 0xd72b1482, 0xd72b1482, 0x53b0cf4, 0x53b0cf4, 0x53b0cf4, 0x1348336b, 0x1348336b, 0x1348336b, 0x5fcf013d, 0x1eff9f35, 0x1eff9f35, 0x5fcf013d, }, 20 },
--  { "gfxterm_cyr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x688451e7, 0xf6936b72, 0x688451e7, 0x73818be0, 0xdd28f52b, 0xdd28f52b, 0xf12a65ac, 0xf12a65ac, 0xf12a65ac, 0xd0169c48, 0xd0169c48, 0xd0169c48, 0xadae57c4, 0xadae57c4, 0xadae57c4, 0xdd28f52b, 0x73818be0, 0x73818be0, 0xdd28f52b, }, 20 },
--  { "gfxterm_cyr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x9616af94, 0xd466be40, 0x9616af94, 0x69a9b414, 0x43d1f34, 0x43d1f34, 0xf3bb3240, 0xf3bb3240, 0xf3bb3240, 0x8cb19be8, 0x8cb19be8, 0x8cb19be8, 0x15e09e6e, 0x15e09e6e, 0x15e09e6e, 0x43d1f34, 0x69a9b414, 0x69a9b414, 0x43d1f34, }, 20 },
--  { "gfxterm_heb", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x8708d1bd, 0x85dd5e9c, 0x8708d1bd, 0xc4fe1cfa, 0x59c36f00, 0x59c36f00, 0x7ae8aced, 0x7ae8aced, 0x7ae8aced, 0x468c18b, 0x468c18b, 0x468c18b, 0x669ed459, 0x669ed459, 0x669ed459, 0x59c36f00, 0xc4fe1cfa, 0xc4fe1cfa, 0x59c36f00, }, 20 },
--  { "gfxterm_heb", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xa72b1043, 0x147d4ce0, 0xa72b1043, 0x892e953c, 0xaa4593fe, 0xaa4593fe, 0xb7b1dd40, 0xb7b1dd40, 0xb7b1dd40, 0x1144d027, 0x1144d027, 0x1144d027, 0x3c7c7b5f, 0x3c7c7b5f, 0x3c7c7b5f, 0xaa4593fe, 0x892e953c, 0x892e953c, 0xaa4593fe, }, 20 },
--  { "gfxterm_heb", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xc5fb1817, 0x745fb26c, 0xc5fb1817, 0x98ec7593, 0xc9cbf769, 0xc9cbf769, 0xf5f17e2d, 0xf5f17e2d, 0xf5f17e2d, 0xb29bfe1, 0xb29bfe1, 0xb29bfe1, 0xe26300e9, 0xe26300e9, 0xe26300e9, 0xc9cbf769, 0x98ec7593, 0x98ec7593, 0xc9cbf769, }, 20 },
--  { "gfxterm_heb", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x4be837e1, 0xbf4963ca, 0x4be837e1, 0xe5be7e39, 0x9813a416, 0x9813a416, 0xd886fca0, 0xd886fca0, 0xd886fca0, 0x495d7a93, 0x495d7a93, 0x495d7a93, 0x50e74743, 0x50e74743, 0x50e74743, 0x9813a416, 0xe5be7e39, 0xe5be7e39, 0x9813a416, }, 20 },
--  { "gfxterm_heb", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x21a8ccb8, 0x17719be, 0x21a8ccb8, 0x570ef90b, 0x5fcf013d, 0x5fcf013d, 0x2a7b5333, 0x2a7b5333, 0x2a7b5333, 0xf86b4b45, 0xf86b4b45, 0xf86b4b45, 0xee1874da, 0xee1874da, 0xee1874da, 0x5fcf013d, 0x570ef90b, 0x570ef90b, 0x5fcf013d, }, 20 },
--  { "gfxterm_heb", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x7001fe50, 0x4798153f, 0x7001fe50, 0x6b042457, 0xdd28f52b, 0xdd28f52b, 0x46489369, 0x46489369, 0x46489369, 0x67746a8d, 0x67746a8d, 0x67746a8d, 0x1acca101, 0x1acca101, 0x1acca101, 0xdd28f52b, 0x6b042457, 0x6b042457, 0xdd28f52b, }, 20 },
--  { "gfxterm_heb", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x6e10591c, 0x48bd926e, 0x6e10591c, 0x91af429c, 0x43d1f34, 0x43d1f34, 0x59cb829, 0x59cb829, 0x59cb829, 0x7a961181, 0x7a961181, 0x7a961181, 0xe3c71407, 0xe3c71407, 0xe3c71407, 0x43d1f34, 0x91af429c, 0x91af429c, 0x43d1f34, }, 20 },
--  { "gfxterm_gre", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x67627ed5, 0xdb276cef, 0x67627ed5, 0x2494b392, 0x59c36f00, 0x59c36f00, 0x43f511f3, 0x43f511f3, 0x43f511f3, 0x3d757c95, 0x3d757c95, 0x3d757c95, 0x5f836947, 0x5f836947, 0x5f836947, 0x59c36f00, 0x2494b392, 0x2494b392, 0x59c36f00, }, 20 },
--  { "gfxterm_gre", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x987cbf71, 0x6e4c645c, 0x987cbf71, 0xb6793a0e, 0xaa4593fe, 0xaa4593fe, 0xb943d716, 0xb943d716, 0xb943d716, 0x1fb6da71, 0x1fb6da71, 0x1fb6da71, 0x328e7109, 0x328e7109, 0x328e7109, 0xaa4593fe, 0xb6793a0e, 0xb6793a0e, 0xaa4593fe, }, 20 },
--  { "gfxterm_gre", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xf9987c07, 0x4a92eed9, 0xf9987c07, 0xa48f1183, 0xc9cbf769, 0xc9cbf769, 0x5eb3ddf4, 0x5eb3ddf4, 0x5eb3ddf4, 0xa06b1c38, 0xa06b1c38, 0xa06b1c38, 0x4921a330, 0x4921a330, 0x4921a330, 0xc9cbf769, 0xa48f1183, 0xa48f1183, 0xc9cbf769, }, 20 },
--  { "gfxterm_gre", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xccd804e2, 0xb99e8d91, 0xccd804e2, 0x628e4d3a, 0x9813a416, 0x9813a416, 0x5aec5acc, 0x5aec5acc, 0x5aec5acc, 0xcb37dcff, 0xcb37dcff, 0xcb37dcff, 0xd28de12f, 0xd28de12f, 0xd28de12f, 0x9813a416, 0x628e4d3a, 0x628e4d3a, 0x9813a416, }, 20 },
--  { "gfxterm_gre", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x4990d896, 0x2b3aa242, 0x4990d896, 0x3f36ed25, 0x5fcf013d, 0x5fcf013d, 0x3cc6048d, 0x3cc6048d, 0x3cc6048d, 0xeed61cfb, 0xeed61cfb, 0xeed61cfb, 0xf8a52364, 0xf8a52364, 0xf8a52364, 0x5fcf013d, 0x3f36ed25, 0x3f36ed25, 0x5fcf013d, }, 20 },
--  { "gfxterm_gre", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x4ff5c69f, 0x66586489, 0x4ff5c69f, 0x54f01c98, 0xdd28f52b, 0xdd28f52b, 0xc3ff0bf5, 0xc3ff0bf5, 0xc3ff0bf5, 0xe2c3f211, 0xe2c3f211, 0xe2c3f211, 0x9f7b399d, 0x9f7b399d, 0x9f7b399d, 0xdd28f52b, 0x54f01c98, 0x54f01c98, 0xdd28f52b, }, 20 },
--  { "gfxterm_gre", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x909b7bb4, 0x2bb2a58c, 0x909b7bb4, 0x6f246034, 0x43d1f34, 0x43d1f34, 0x2df40751, 0x2df40751, 0x2df40751, 0x52feaef9, 0x52feaef9, 0x52feaef9, 0xcbafab7f, 0xcbafab7f, 0xcbafab7f, 0x43d1f34, 0x6f246034, 0x6f246034, 0x43d1f34, }, 20 },
--  { "gfxterm_ru", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xc77bfcc6, 0xffcdf45d, 0xc77bfcc6, 0x848d3181, 0x59c36f00, 0x59c36f00, 0xd79cd5e, 0xd79cd5e, 0xd79cd5e, 0x73f9a038, 0x73f9a038, 0x73f9a038, 0x110fb5ea, 0x110fb5ea, 0x110fb5ea, 0x59c36f00, 0x848d3181, 0x848d3181, 0x59c36f00, }, 20 },
--  { "gfxterm_ru", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xd5494aa5, 0xa0924ec, 0xd5494aa5, 0xfb4ccfda, 0xaa4593fe, 0xaa4593fe, 0x8692c636, 0x8692c636, 0x8692c636, 0x2067cb51, 0x2067cb51, 0x2067cb51, 0xd5f6029, 0xd5f6029, 0xd5f6029, 0xaa4593fe, 0xfb4ccfda, 0xfb4ccfda, 0xaa4593fe, }, 20 },
--  { "gfxterm_ru", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x2436c4f, 0x2cde4e0c, 0x2436c4f, 0x5f5401cb, 0xc9cbf769, 0xc9cbf769, 0x558f50ae, 0x558f50ae, 0x558f50ae, 0xab579162, 0xab579162, 0xab579162, 0x421d2e6a, 0x421d2e6a, 0x421d2e6a, 0xc9cbf769, 0x5f5401cb, 0x5f5401cb, 0xc9cbf769, }, 20 },
--  { "gfxterm_ru", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x86f8a68c, 0xf4116451, 0x86f8a68c, 0x28aeef54, 0x9813a416, 0x9813a416, 0x7befbe43, 0x7befbe43, 0x7befbe43, 0xea343870, 0xea343870, 0xea343870, 0xf38e05a0, 0xf38e05a0, 0xf38e05a0, 0x9813a416, 0x28aeef54, 0x28aeef54, 0x9813a416, }, 20 },
--  { "gfxterm_ru", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x156c292f, 0x3c8eb473, 0x156c292f, 0x63ca1c9c, 0x5fcf013d, 0x5fcf013d, 0x895ea16b, 0x895ea16b, 0x895ea16b, 0x5b4eb91d, 0x5b4eb91d, 0x5b4eb91d, 0x4d3d8682, 0x4d3d8682, 0x4d3d8682, 0x5fcf013d, 0x63ca1c9c, 0x63ca1c9c, 0x5fcf013d, }, 20 },
--  { "gfxterm_ru", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xf57ebf12, 0x798b299b, 0xf57ebf12, 0xee7b6515, 0xdd28f52b, 0xdd28f52b, 0x22563fc6, 0x22563fc6, 0x22563fc6, 0x36ac622, 0x36ac622, 0x36ac622, 0x7ed20dae, 0x7ed20dae, 0x7ed20dae, 0xdd28f52b, 0xee7b6515, 0xee7b6515, 0xdd28f52b, }, 20 },
--  { "gfxterm_ru", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x2bc82eb1, 0x94064cc8, 0x2bc82eb1, 0xd4773531, 0x43d1f34, 0x43d1f34, 0x44cbf2f0, 0x44cbf2f0, 0x44cbf2f0, 0x3bc15b58, 0x3bc15b58, 0x3bc15b58, 0xa2905ede, 0xa2905ede, 0xa2905ede, 0x43d1f34, 0xd4773531, 0xd4773531, 0x43d1f34, }, 20 },
--  { "gfxterm_fr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x7f6dd146, 0x548af474, 0x7f6dd146, 0x3c9b1c01, 0x59c36f00, 0x59c36f00, 0x7d913e8d, 0x7d913e8d, 0x7d913e8d, 0x31153eb, 0x31153eb, 0x31153eb, 0x61e74639, 0x61e74639, 0x61e74639, 0x59c36f00, 0x3c9b1c01, 0x3c9b1c01, 0x59c36f00, }, 20 },
--  { "gfxterm_fr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xf29ad079, 0x50d47c0, 0xf29ad079, 0xdc9f5506, 0xaa4593fe, 0xaa4593fe, 0x6bcf4c90, 0x6bcf4c90, 0x6bcf4c90, 0xcd3a41f7, 0xcd3a41f7, 0xcd3a41f7, 0xe002ea8f, 0xe002ea8f, 0xe002ea8f, 0xaa4593fe, 0xdc9f5506, 0xdc9f5506, 0xaa4593fe, }, 20 },
--  { "gfxterm_fr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xb25e3082, 0x2ed845dd, 0xb25e3082, 0xef495d06, 0xc9cbf769, 0xc9cbf769, 0xd5322575, 0xd5322575, 0xd5322575, 0x2beae4b9, 0x2beae4b9, 0x2beae4b9, 0xc2a05bb1, 0xc2a05bb1, 0xc2a05bb1, 0xc9cbf769, 0xef495d06, 0xef495d06, 0xc9cbf769, }, 20 },
--  { "gfxterm_fr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x4cdfcd2e, 0x8bf091f, 0x4cdfcd2e, 0xe28984f6, 0x9813a416, 0x9813a416, 0x8217f630, 0x8217f630, 0x8217f630, 0x13cc7003, 0x13cc7003, 0x13cc7003, 0xa764dd3, 0xa764dd3, 0xa764dd3, 0x9813a416, 0xe28984f6, 0xe28984f6, 0x9813a416, }, 20 },
--  { "gfxterm_fr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xf2b49f88, 0x2eff252d, 0xf2b49f88, 0x8412aa3b, 0x5fcf013d, 0x5fcf013d, 0x5d3b9fe7, 0x5d3b9fe7, 0x5d3b9fe7, 0x8f2b8791, 0x8f2b8791, 0x8f2b8791, 0x9958b80e, 0x9958b80e, 0x9958b80e, 0x5fcf013d, 0x8412aa3b, 0x8412aa3b, 0x5fcf013d, }, 20 },
--  { "gfxterm_fr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x786673be, 0x536f1359, 0x786673be, 0x6363a9b9, 0xdd28f52b, 0xdd28f52b, 0x38653b12, 0x38653b12, 0x38653b12, 0x1959c2f6, 0x1959c2f6, 0x1959c2f6, 0x64e1097a, 0x64e1097a, 0x64e1097a, 0xdd28f52b, 0x6363a9b9, 0x6363a9b9, 0xdd28f52b, }, 20 },
--  { "gfxterm_fr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xac4a1127, 0x699c2ad8, 0xac4a1127, 0x53f50aa7, 0x43d1f34, 0x43d1f34, 0xfa47dfba, 0xfa47dfba, 0xfa47dfba, 0x854d7612, 0x854d7612, 0x854d7612, 0x1c1c7394, 0x1c1c7394, 0x1c1c7394, 0x43d1f34, 0x53f50aa7, 0x53f50aa7, 0x43d1f34, }, 20 },
--  { "gfxterm_quot", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xbc5f6633, 0xda908ab0, 0xbc5f6633, 0xffa9ab74, 0x59c36f00, 0x59c36f00, 0x3ad73295, 0x3ad73295, 0x3ad73295, 0x44575ff3, 0x44575ff3, 0x44575ff3, 0x26a14a21, 0x26a14a21, 0x26a14a21, 0x59c36f00, 0xffa9ab74, 0xffa9ab74, 0x59c36f00, }, 20 },
--  { "gfxterm_quot", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xad820d6b, 0x9a88ad3, 0xad820d6b, 0x83878814, 0xaa4593fe, 0xaa4593fe, 0xbec19c1b, 0xbec19c1b, 0xbec19c1b, 0x1834917c, 0x1834917c, 0x1834917c, 0x350c3a04, 0x350c3a04, 0x350c3a04, 0xaa4593fe, 0x83878814, 0x83878814, 0xaa4593fe, }, 20 },
--  { "gfxterm_quot", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xe5774112, 0x5ffb1eca, 0xe5774112, 0xb8602c96, 0xc9cbf769, 0xc9cbf769, 0xe4861949, 0xe4861949, 0xe4861949, 0x1a5ed885, 0x1a5ed885, 0x1a5ed885, 0xf314678d, 0xf314678d, 0xf314678d, 0xc9cbf769, 0xb8602c96, 0xb8602c96, 0xc9cbf769, }, 20 },
--  { "gfxterm_quot", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x6af1a2bc, 0xd951ab8b, 0x6af1a2bc, 0xc4a7eb64, 0x9813a416, 0x9813a416, 0xb5e8801c, 0xb5e8801c, 0xb5e8801c, 0x2433062f, 0x2433062f, 0x2433062f, 0x3d893bff, 0x3d893bff, 0x3d893bff, 0x9813a416, 0xc4a7eb64, 0xc4a7eb64, 0x9813a416, }, 20 },
--  { "gfxterm_quot", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xc6baa18, 0x1c9db179, 0xc6baa18, 0x7acd9fab, 0x5fcf013d, 0x5fcf013d, 0x819b5c4e, 0x819b5c4e, 0x819b5c4e, 0x538b4438, 0x538b4438, 0x538b4438, 0x45f87ba7, 0x45f87ba7, 0x45f87ba7, 0x5fcf013d, 0x7acd9fab, 0x7acd9fab, 0x5fcf013d, }, 20 },
--  { "gfxterm_quot", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xe424a6ab, 0xb05c0275, 0xe424a6ab, 0xff217cac, 0xdd28f52b, 0xdd28f52b, 0xcd83646c, 0xcd83646c, 0xcd83646c, 0xecbf9d88, 0xecbf9d88, 0xecbf9d88, 0x91075604, 0x91075604, 0x91075604, 0xdd28f52b, 0xff217cac, 0xff217cac, 0xdd28f52b, }, 20 },
--  { "gfxterm_quot", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x4a7dff41, 0xe1ec28fc, 0x4a7dff41, 0xb5c2e4c1, 0x43d1f34, 0x43d1f34, 0xb200c08a, 0xb200c08a, 0xb200c08a, 0xcd0a6922, 0xcd0a6922, 0xcd0a6922, 0x545b6ca4, 0x545b6ca4, 0x545b6ca4, 0x43d1f34, 0xb5c2e4c1, 0xb5c2e4c1, 0x43d1f34, }, 20 },
--  { "gfxterm_piglatin", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd3d3e4a2, 0x9c635046, 0xd3d3e4a2, 0x902529e5, 0x59c36f00, 0x59c36f00, 0x85e713, 0x85e713, 0x85e713, 0x7e058a75, 0x7e058a75, 0x7e058a75, 0x1cf39fa7, 0x1cf39fa7, 0x1cf39fa7, 0x59c36f00, 0x902529e5, 0x902529e5, 0x59c36f00, }, 20 },
--  { "gfxterm_piglatin", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xd61c80f5, 0xdf78b496, 0xd61c80f5, 0xf819058a, 0xaa4593fe, 0xaa4593fe, 0xefc0f7e7, 0xefc0f7e7, 0xefc0f7e7, 0x4935fa80, 0x4935fa80, 0x4935fa80, 0x640d51f8, 0x640d51f8, 0x640d51f8, 0xaa4593fe, 0xf819058a, 0xf819058a, 0xaa4593fe, }, 20 },
--  { "gfxterm_piglatin", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x936bc89d, 0x523a3e80, 0x936bc89d, 0xce7ca519, 0xc9cbf769, 0xc9cbf769, 0xaa99ffb1, 0xaa99ffb1, 0xaa99ffb1, 0x54413e7d, 0x54413e7d, 0x54413e7d, 0xbd0b8175, 0xbd0b8175, 0xbd0b8175, 0xc9cbf769, 0xce7ca519, 0xce7ca519, 0xc9cbf769, }, 20 },
--  { "gfxterm_piglatin", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x4fdd0291, 0x133fa83d, 0x4fdd0291, 0xe18b4b49, 0x9813a416, 0x9813a416, 0x74c38e90, 0x74c38e90, 0x74c38e90, 0xe51808a3, 0xe51808a3, 0xe51808a3, 0xfca23573, 0xfca23573, 0xfca23573, 0x9813a416, 0xe18b4b49, 0xe18b4b49, 0x9813a416, }, 20 },
--  { "gfxterm_piglatin", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x538203b0, 0x2a92e789, 0x538203b0, 0x25243603, 0x5fcf013d, 0x5fcf013d, 0x5e4d3dd8, 0x5e4d3dd8, 0x5e4d3dd8, 0x8c5d25ae, 0x8c5d25ae, 0x8c5d25ae, 0x9a2e1a31, 0x9a2e1a31, 0x9a2e1a31, 0x5fcf013d, 0x25243603, 0x25243603, 0x5fcf013d, }, 20 },
--  { "gfxterm_piglatin", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xcfc85125, 0xa5b0e11b, 0xcfc85125, 0xd4cd8b22, 0xdd28f52b, 0xdd28f52b, 0x1af8cddc, 0x1af8cddc, 0x1af8cddc, 0x3bc43438, 0x3bc43438, 0x3bc43438, 0x467cffb4, 0x467cffb4, 0x467cffb4, 0xdd28f52b, 0xd4cd8b22, 0xd4cd8b22, 0xdd28f52b, }, 20 },
--  { "gfxterm_piglatin", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xf2469ffb, 0x1d0c1d2, 0xf2469ffb, 0xdf9847b, 0x43d1f34, 0x43d1f34, 0xa2837c7a, 0xa2837c7a, 0xa2837c7a, 0xdd89d5d2, 0xdd89d5d2, 0xdd89d5d2, 0x44d8d054, 0x44d8d054, 0x44d8d054, 0x43d1f34, 0xdf9847b, 0xdf9847b, 0x43d1f34, }, 20 },
--  { "gfxterm_ch", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x27851cc1, 0x15f731b5, 0x27851cc1, 0x6473d186, 0x59c36f00, 0x59c36f00, 0x125bcddf, 0x125bcddf, 0x125bcddf, 0x6cdba0b9, 0x6cdba0b9, 0x6cdba0b9, 0xe2db56b, 0xe2db56b, 0xe2db56b, 0x59c36f00, 0x6473d186, 0x6473d186, 0x59c36f00, }, 20 },
--  { "gfxterm_ch", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xfcb223c, 0x2c2e18b9, 0xfcb223c, 0x21cea743, 0xaa4593fe, 0xaa4593fe, 0xd700be1a, 0xd700be1a, 0xd700be1a, 0x71f5b37d, 0x71f5b37d, 0x71f5b37d, 0x5ccd1805, 0x5ccd1805, 0x5ccd1805, 0xaa4593fe, 0x21cea743, 0x21cea743, 0xaa4593fe, }, 20 },
--  { "gfxterm_ch", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x807efaa5, 0xb673036a, 0x807efaa5, 0xdd699721, 0xc9cbf769, 0xc9cbf769, 0xdca3ed4b, 0xdca3ed4b, 0xdca3ed4b, 0x227b2c87, 0x227b2c87, 0x227b2c87, 0xcb31938f, 0xcb31938f, 0xcb31938f, 0xc9cbf769, 0xdd699721, 0xdd699721, 0xc9cbf769, }, 20 },
--  { "gfxterm_ch", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x651d0d50, 0xf0dc38fc, 0x651d0d50, 0xcb4b4488, 0x9813a416, 0x9813a416, 0x80d03ee8, 0x80d03ee8, 0x80d03ee8, 0x110bb8db, 0x110bb8db, 0x110bb8db, 0x8b1850b, 0x8b1850b, 0x8b1850b, 0x9813a416, 0xcb4b4488, 0xcb4b4488, 0x9813a416, }, 20 },
--  { "gfxterm_ch", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xb9b068f, 0xdc68ac3c, 0xb9b068f, 0x7d3d333c, 0x5fcf013d, 0x5fcf013d, 0xa1f0a6e4, 0xa1f0a6e4, 0xa1f0a6e4, 0x73e0be92, 0x73e0be92, 0x73e0be92, 0x6593810d, 0x6593810d, 0x6593810d, 0x5fcf013d, 0x7d3d333c, 0x7d3d333c, 0x5fcf013d, }, 20 },
--  { "gfxterm_ch", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xf0789d7e, 0x6f2f2b61, 0xf0789d7e, 0xeb7d4779, 0xdd28f52b, 0xdd28f52b, 0xb995630, 0xb995630, 0xb995630, 0x2aa5afd4, 0x2aa5afd4, 0x2aa5afd4, 0x571d6458, 0x571d6458, 0x571d6458, 0xdd28f52b, 0xeb7d4779, 0xeb7d4779, 0xdd28f52b, }, 20 },
--  { "gfxterm_ch", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x819821ff, 0xdd19128c, 0x819821ff, 0x7e273a7f, 0x43d1f34, 0x43d1f34, 0xf35981d3, 0xf35981d3, 0xf35981d3, 0x8c53287b, 0x8c53287b, 0x8c53287b, 0x15022dfd, 0x15022dfd, 0x15022dfd, 0x43d1f34, 0x7e273a7f, 0x7e273a7f, 0x43d1f34, }, 20 },
--  { "gfxterm_red", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xa99604d1, 0xcf59e852, 0xa99604d1, 0xfebbba0f, 0x59c36f00, 0x59c36f00, 0x53767ce3, 0x53767ce3, 0x53767ce3, 0x2df61185, 0x2df61185, 0x2df61185, 0x4f000457, 0x4f000457, 0x4f000457, 0x59c36f00, 0xfebbba0f, 0xfebbba0f, 0x59c36f00, }, 20 },
--  { "gfxterm_red", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x7d0a218, 0xa3fa25a0, 0x7d0a218, 0xb777784e, 0xaa4593fe, 0xaa4593fe, 0x35db26e1, 0x35db26e1, 0x35db26e1, 0x932e2b86, 0x932e2b86, 0x932e2b86, 0xbe1680fe, 0xbe1680fe, 0xbe1680fe, 0xaa4593fe, 0xb777784e, 0xb777784e, 0xaa4593fe, }, 20 },
--  { "gfxterm_red", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x63be90f4, 0xd932cf2c, 0x63be90f4, 0x739b8e5a, 0xc9cbf769, 0xc9cbf769, 0x70a00efe, 0x70a00efe, 0x70a00efe, 0x8e78cf32, 0x8e78cf32, 0x8e78cf32, 0x6732703a, 0x6732703a, 0x6732703a, 0xc9cbf769, 0x739b8e5a, 0x739b8e5a, 0xc9cbf769, }, 20 },
--  { "gfxterm_red", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x53460c90, 0xe0e605a7, 0x53460c90, 0x6337f0bf, 0x9813a416, 0x9813a416, 0x4161864c, 0x4161864c, 0x4161864c, 0xd0ba007f, 0xd0ba007f, 0xd0ba007f, 0xc9003daf, 0xc9003daf, 0xc9003daf, 0x9813a416, 0x6337f0bf, 0x6337f0bf, 0x9813a416, }, 20 },
--  { "gfxterm_red", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xf54761a0, 0xe5b17ac1, 0xf54761a0, 0x5b408e55, 0x5fcf013d, 0x5fcf013d, 0x580fda0e, 0x580fda0e, 0x580fda0e, 0x8a1fc278, 0x8a1fc278, 0x8a1fc278, 0x9c6cfde7, 0x9c6cfde7, 0x9c6cfde7, 0x5fcf013d, 0x5b408e55, 0x5b408e55, 0x5fcf013d, }, 20 },
--  { "gfxterm_red", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xec78b0c1, 0xb800141f, 0xec78b0c1, 0x621c7b1b, 0xdd28f52b, 0xdd28f52b, 0x8f60179, 0x8f60179, 0x8f60179, 0x29caf89d, 0x29caf89d, 0x29caf89d, 0x54723311, 0x54723311, 0x54723311, 0xdd28f52b, 0x621c7b1b, 0x621c7b1b, 0xdd28f52b, }, 20 },
--  { "gfxterm_red", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xf209411b, 0x599896a6, 0xf209411b, 0x6551c7bb, 0x43d1f34, 0x43d1f34, 0x5ac6bb4a, 0x5ac6bb4a, 0x5ac6bb4a, 0x25cc12e2, 0x25cc12e2, 0x25cc12e2, 0xbc9d1764, 0xbc9d1764, 0xbc9d1764, 0x43d1f34, 0x6551c7bb, 0x6551c7bb, 0x43d1f34, }, 20 },
--  { "gfxterm_high", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x93b4fcd8, 0xf57b105b, 0x93b4fcd8, 0x2bfe5312, 0x59c36f00, 0x59c36f00, 0x3ad73295, 0x3ad73295, 0x3ad73295, 0x44575ff3, 0x44575ff3, 0x44575ff3, 0x26a14a21, 0x26a14a21, 0x26a14a21, 0x59c36f00, 0x2bfe5312, 0x2bfe5312, 0x59c36f00, }, 20 },
--  { "gfxterm_high", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x656c9044, 0xc14617fc, 0x656c9044, 0xa6ea58cb, 0xaa4593fe, 0xaa4593fe, 0xbec19c1b, 0xbec19c1b, 0xbec19c1b, 0x1834917c, 0x1834917c, 0x1834917c, 0x350c3a04, 0x350c3a04, 0x350c3a04, 0xaa4593fe, 0xa6ea58cb, 0xa6ea58cb, 0xaa4593fe, }, 20 },
--  { "gfxterm_high", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xa11479ed, 0x1b982635, 0xa11479ed, 0xe37185d0, 0xc9cbf769, 0xc9cbf769, 0xe4861949, 0xe4861949, 0xe4861949, 0x1a5ed885, 0x1a5ed885, 0x1a5ed885, 0xf314678d, 0xf314678d, 0xf314678d, 0xc9cbf769, 0xe37185d0, 0xe37185d0, 0xc9cbf769, }, 20 },
--  { "gfxterm_high", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x244770a7, 0x97e77990, 0x244770a7, 0x6a54d2ee, 0x9813a416, 0x9813a416, 0xb5e8801c, 0xb5e8801c, 0xb5e8801c, 0x2433062f, 0x2433062f, 0x2433062f, 0x3d893bff, 0x3d893bff, 0x3d893bff, 0x9813a416, 0x6a54d2ee, 0x6a54d2ee, 0x9813a416, }, 20 },
--  { "gfxterm_high", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x8ca34476, 0x9c555f17, 0x8ca34476, 0x1fc54b41, 0x5fcf013d, 0x5fcf013d, 0x819b5c4e, 0x819b5c4e, 0x819b5c4e, 0x538b4438, 0x538b4438, 0x538b4438, 0x45f87ba7, 0x45f87ba7, 0x45f87ba7, 0x5fcf013d, 0x1fc54b41, 0x1fc54b41, 0x5fcf013d, }, 20 },
--  { "gfxterm_high", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xf19f6af8, 0xa5e7ce26, 0xf19f6af8, 0x1619aea6, 0xdd28f52b, 0xdd28f52b, 0xcd83646c, 0xcd83646c, 0xcd83646c, 0xecbf9d88, 0xecbf9d88, 0xecbf9d88, 0x91075604, 0x91075604, 0x91075604, 0xdd28f52b, 0x1619aea6, 0x1619aea6, 0xdd28f52b, }, 20 },
--  { "gfxterm_high", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x5f75414f, 0xf4e496f2, 0x5f75414f, 0x27fd1fe0, 0x43d1f34, 0x43d1f34, 0xb200c08a, 0xb200c08a, 0xb200c08a, 0xcd0a6922, 0xcd0a6922, 0xcd0a6922, 0x545b6ca4, 0x545b6ca4, 0x545b6ca4, 0x43d1f34, 0x27fd1fe0, 0x27fd1fe0, 0x43d1f34, }, 20 },
-+  { "cmdline_cat", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x8851b0ee, 0x8851b0ee, 0xafb59f0b, 0xafb59f0b, 0x8c9b72f1, 0x8c9b72f1, 0x6eec5116, 0x6eec5116, 0xad82053e, 0xad82053e, 0x2eeae2ae, 0x2eeae2ae, 0x58cf8def, 0x58cf8def, 0x926f4d2f, 0x926f4d2f, 0xbd1c3236, 0xbd1c3236, 0x56012a95, 0x56012a95, 0x6d7c40ae, 0x6d7c40ae, 0xef750bc8, 0xef750bc8, 0x1080dd4a, 0x1080dd4a, 0xd7f9e5af, 0xd7f9e5af, 0x80b1b4a9, 0x80b1b4a9, 0x2c99415e, 0x2c99415e, 0x8d5761ff, 0x8d5761ff, 0xb964b489, 0xb964b489, 0x88a51f74, 0x88a51f74, 0x1da6c458, 0x1da6c458, 0x85e94025, 0x206ea54f, 0x7ee6c8fd, 0x7ee6c8fd, }, 45 },
-+  { "cmdline_cat", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x834b70a0, 0x834b70a0, 0xe7cc129f, 0xe7cc129f, 0x5ee2edc, 0x5ee2edc, 0xa1135cd7, 0xa1135cd7, 0xf7ce1f26, 0xf7ce1f26, 0xe9f803e8, 0xe9f803e8, 0x4b8f9724, 0x4b8f9724, 0x3fe3771a, 0x3fe3771a, 0x5584ee63, 0x5584ee63, 0xac193250, 0xac193250, 0x801f25f4, 0x801f25f4, 0x8d33aece, 0x8d33aece, 0xc6d95edc, 0xc6d95edc, 0xf121dee2, 0xf121dee2, 0x6ab10812, 0x6ab10812, 0x41a5b112, 0x41a5b112, 0xac6f712b, 0xac6f712b, 0x8aee7a19, 0x8aee7a19, 0xfe37c0ad, 0xfe37c0ad, 0x99c6a336, 0x99c6a336, 0x53b844c6, 0x73015447, 0x7a1a2254, 0x7a1a2254, }, 45 },
-+  { "cmdline_cat", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xb121c912, 0xb121c912, 0x635a8739, 0x635a8739, 0x8288cba6, 0x8288cba6, 0xf5589d0, 0xf5589d0, 0x471642b3, 0x471642b3, 0xfb4826cf, 0xfb4826cf, 0x8b1083cf, 0x8b1083cf, 0x738b0c94, 0x738b0c94, 0x859c41b0, 0x859c41b0, 0x7c8d1be9, 0x7c8d1be9, 0x5b685e40, 0x5b685e40, 0x9cf80d95, 0x9cf80d95, 0x3541f915, 0x3541f915, 0x582b8557, 0x582b8557, 0x24cf88f7, 0x24cf88f7, 0x9e0af23, 0x9e0af23, 0x1033164b, 0x1033164b, 0x70ba51e2, 0x70ba51e2, 0xb051585c, 0xb051585c, 0xe1389f04, 0xe1389f04, 0x308bbb74, 0xdc9e6805, 0x4ddcff9f, 0x4ddcff9f, }, 45 },
-+  { "cmdline_cat", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xac16e832, 0xac16e832, 0xbf6ab9c6, 0xbf6ab9c6, 0x1063e15a, 0x1063e15a, 0xf908e3ff, 0xf908e3ff, 0xcb37d841, 0xcb37d841, 0x9b8ffa7d, 0x9b8ffa7d, 0x38d2a26c, 0x38d2a26c, 0x6989f09b, 0x6989f09b, 0x481451e, 0x481451e, 0x17b3177, 0x17b3177, 0x3ea52aeb, 0x3ea52aeb, 0xc24de674, 0xc24de674, 0x4ab163cc, 0x4ab163cc, 0xc482b092, 0xc482b092, 0x55ffc7e2, 0x55ffc7e2, 0x3b4b34dd, 0x3b4b34dd, 0x9b1f047f, 0x9b1f047f, 0x3d42e414, 0x3d42e414, 0x35b2fb06, 0x35b2fb06, 0xb813b35f, 0xb813b35f, 0xc3ede6e0, 0xc35214c3, 0x340f0107, 0x340f0107, }, 45 },
-+  { "cmdline_cat", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x9c47caee, 0x9c47caee, 0x6c9c4f38, 0x6c9c4f38, 0x79c49615, 0x79c49615, 0x70fe9708, 0x70fe9708, 0x8e90c077, 0x8e90c077, 0xd8205b47, 0xd8205b47, 0xa34337e2, 0xa34337e2, 0xf4dffa53, 0xf4dffa53, 0x90a0779c, 0x90a0779c, 0x322820bb, 0x322820bb, 0x50e3383f, 0x50e3383f, 0x4a976e3e, 0x4a976e3e, 0x90b6f8d9, 0x90b6f8d9, 0x4058c301, 0x4058c301, 0x221a6810, 0x221a6810, 0x1f78a00e, 0x1f78a00e, 0x6a633d2c, 0x6a633d2c, 0xca177c65, 0xca177c65, 0xabb6c7f9, 0xabb6c7f9, 0x635a35e8, 0x635a35e8, 0x6da78f10, 0x53467ff8, 0xd037fdfa, 0xd037fdfa, }, 45 },
-+  { "cmdline_cat", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x2b6b8225, 0x2b6b8225, 0x83df9995, 0x83df9995, 0x5165ad0b, 0x5165ad0b, 0xe5a6f96d, 0xe5a6f96d, 0x798df957, 0x798df957, 0x8c0567e2, 0x8c0567e2, 0x5e5d7389, 0x5e5d7389, 0x47a39dd, 0x47a39dd, 0x894f44af, 0x894f44af, 0x1dff0a6, 0x1dff0a6, 0xf496e67b, 0xf496e67b, 0x29cb5702, 0x29cb5702, 0xeaf1387d, 0xeaf1387d, 0x4a9bf7, 0x4a9bf7, 0x11d20bee, 0x11d20bee, 0xa103dc2d, 0xa103dc2d, 0xd0265db9, 0xd0265db9, 0x42267334, 0x42267334, 0x96f85e8c, 0x96f85e8c, 0xa28eac49, 0xa28eac49, 0x4e660ae7, 0x70741b3, 0x183f2f2e, 0x183f2f2e, }, 45 },
-+  { "cmdline_cat", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x77b51f44, 0x77b51f44, 0xc8097569, 0xc8097569, 0x769aee5f, 0x769aee5f, 0xa35e159, 0xa35e159, 0x87a6341f, 0x87a6341f, 0xb61d944b, 0xb61d944b, 0x8b109cb3, 0x8b109cb3, 0xed3fb3e, 0xed3fb3e, 0xd7cc6c3, 0xd7cc6c3, 0x52077f0d, 0x52077f0d, 0x9d86d17e, 0x9d86d17e, 0x5e487bb, 0x5e487bb, 0x3a00041b, 0x3a00041b, 0xcfdeaf9e, 0xcfdeaf9e, 0x3e40af89, 0x3e40af89, 0x5ec41ea9, 0x5ec41ea9, 0x6298e4e7, 0x6298e4e7, 0xfd67f90e, 0xfd67f90e, 0x5ab5dc32, 0x5ab5dc32, 0xdd3ad694, 0xdd3ad694, 0x391222b4, 0xd4a98b43, 0xeaa2f62, 0xeaa2f62, }, 45 },
-+  { "gfxterm_menu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x45b0713c, 0x237f9dbf, 0x45b0713c, 0x646bc7b, 0x59c36f00, 0x59c36f00, 0x7fd94135, 0x7fd94135, 0x7fd94135, 0x1592c53, 0x1592c53, 0x1592c53, 0x63af3981, 0x63af3981, 0x63af3981, 0x59c36f00, 0x646bc7b, 0x646bc7b, 0x59c36f00, }, 20 },
-+  { "gfxterm_menu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x84abc7db, 0x20814063, 0x84abc7db, 0xaaae42a4, 0xaa4593fe, 0xaa4593fe, 0x2e88732f, 0x2e88732f, 0x2e88732f, 0x887d7e48, 0x887d7e48, 0x887d7e48, 0xa545d530, 0xa545d530, 0xa545d530, 0xaa4593fe, 0xaaae42a4, 0xaaae42a4, 0xaa4593fe, }, 20 },
-+  { "gfxterm_menu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x5b85371a, 0xe10968c2, 0x5b85371a, 0x6925a9e, 0xc9cbf769, 0xc9cbf769, 0xda1c9f17, 0xda1c9f17, 0xda1c9f17, 0x24c45edb, 0x24c45edb, 0x24c45edb, 0xcd8ee1d3, 0xcd8ee1d3, 0xcd8ee1d3, 0xc9cbf769, 0x6925a9e, 0x6925a9e, 0xc9cbf769, }, 20 },
-+  { "gfxterm_menu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x9130464d, 0x22904f7a, 0x9130464d, 0x3f660f95, 0x9813a416, 0x9813a416, 0xfb08d7cf, 0xfb08d7cf, 0xfb08d7cf, 0x6ad351fc, 0x6ad351fc, 0x6ad351fc, 0x73696c2c, 0x73696c2c, 0x73696c2c, 0x9813a416, 0x3f660f95, 0x3f660f95, 0x9813a416, }, 20 },
-+  { "gfxterm_menu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x5185b14e, 0x4173aa2f, 0x5185b14e, 0x272384fd, 0x5fcf013d, 0x5fcf013d, 0x9e56a9e0, 0x9e56a9e0, 0x9e56a9e0, 0x4c46b196, 0x4c46b196, 0x4c46b196, 0x5a358e09, 0x5a358e09, 0x5a358e09, 0x5fcf013d, 0x272384fd, 0x272384fd, 0x5fcf013d, }, 20 },
-+  { "gfxterm_menu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x5cc0d3ef, 0x8b87731, 0x5cc0d3ef, 0x47c509e8, 0xdd28f52b, 0xdd28f52b, 0xe1579057, 0xe1579057, 0xe1579057, 0xc06b69b3, 0xc06b69b3, 0xc06b69b3, 0xbdd3a23f, 0xbdd3a23f, 0xbdd3a23f, 0xdd28f52b, 0x47c509e8, 0x47c509e8, 0xdd28f52b, }, 20 },
-+  { "gfxterm_menu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xd1338a02, 0x7aa25dbf, 0xd1338a02, 0x2e8c9182, 0x43d1f34, 0x43d1f34, 0x6486f7c4, 0x6486f7c4, 0x6486f7c4, 0x1b8c5e6c, 0x1b8c5e6c, 0x1b8c5e6c, 0x82dd5bea, 0x82dd5bea, 0x82dd5bea, 0x43d1f34, 0x2e8c9182, 0x2e8c9182, 0x43d1f34, }, 20 },
-+  { "gfxmenu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x1027210c, 0x64e51c81, 0x1027210c, 0x45ca4a8a, 0x9a2e0d26, 0x2b88b6ce, 0x2b88b6ce, 0x2b88b6ce, 0x7750400e, 0x7750400e, 0x7750400e, 0x5ec88e9c, 0x5ec88e9c, 0x5ec88e9c, 0x59c36f00, 0x45ca4a8a, 0x45ca4a8a, }, 18 },
-+  { "gfxmenu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x8d12f697, 0xc5b32248, 0x8d12f697, 0x56720aa4, 0xa9d58ccd, 0xa1b1a1b5, 0xa1b1a1b5, 0xa1b1a1b5, 0xf4ee0bbf, 0xf4ee0bbf, 0xf4ee0bbf, 0x9dddc3f6, 0x9dddc3f6, 0x9dddc3f6, 0xaa4593fe, 0x56720aa4, 0x56720aa4, }, 18 },
-+  { "gfxmenu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xa5ec9f45, 0xdb7085d8, 0xa5ec9f45, 0x9caf1d3f, 0x5411be8b, 0xa07e74d3, 0xa07e74d3, 0xa07e74d3, 0xdfc0d247, 0xdfc0d247, 0xdfc0d247, 0x9db4b23f, 0x9db4b23f, 0x9db4b23f, 0xc9cbf769, 0x9caf1d3f, 0x9caf1d3f, }, 18 },
-+  { "gfxmenu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x1c3742c9, 0xce8e83bf, 0xeb96c838, 0xce8e83bf, 0x73cb3bc1, 0x740d78cf, 0x84312594, 0x84312594, 0x84312594, 0x6f94cfe8, 0x6f94cfe8, 0x6f94cfe8, 0x69dfcf18, 0x69dfcf18, 0x69dfcf18, 0x1c3742c9, 0x73cb3bc1, 0x73cb3bc1, }, 18 },
-+  { "gfxmenu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0x56a03e51, 0xee7d8d4b, 0x56a03e51, 0x5bdf9413, 0xbcda144c, 0x131c0760, 0x131c0760, 0x131c0760, 0x7c55db71, 0x7c55db71, 0x7c55db71, 0x71a34572, 0x71a34572, 0x71a34572, 0xcc5a7bed, 0x5bdf9413, 0x5bdf9413, }, 18 },
-+  { "gfxmenu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xef4a3312, 0xea8a9cf0, 0x8929e522, 0xea8a9cf0, 0x78f3dfbc, 0x5d55a141, 0xb9092e0b, 0xb9092e0b, 0xb9092e0b, 0x7fbb6a15, 0x7fbb6a15, 0x7fbb6a15, 0x6bdebaaa, 0x6bdebaaa, 0x6bdebaaa, 0xef4a3312, 0x78f3dfbc, 0x78f3dfbc, }, 18 },
-+  { "gfxmenu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x54e48d80, 0x6dcf1d57, 0x925a4c8f, 0x6dcf1d57, 0x69005b38, 0x6d6bb4bc, 0x14f7c6b1, 0x14f7c6b1, 0x14f7c6b1, 0x95043060, 0x95043060, 0x95043060, 0x3a0890f, 0x3a0890f, 0x3a0890f, 0x54e48d80, 0x69005b38, 0x69005b38, }, 18 },
-+  { "gfxterm_ar", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x77ff5efc, 0x791fe364, 0x77ff5efc, 0x340993bb, 0x59c36f00, 0x59c36f00, 0x3908ca1e, 0x3908ca1e, 0x3908ca1e, 0x4788a778, 0x4788a778, 0x4788a778, 0x257eb2aa, 0x257eb2aa, 0x257eb2aa, 0x59c36f00, 0x340993bb, 0x340993bb, 0x59c36f00, }, 20 },
-+  { "gfxterm_ar", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xb2d04b0f, 0x46cdbc23, 0xb2d04b0f, 0x9cd5ce70, 0xaa4593fe, 0xaa4593fe, 0x44bf6b37, 0x44bf6b37, 0x44bf6b37, 0xe24a6650, 0xe24a6650, 0xe24a6650, 0xcf72cd28, 0xcf72cd28, 0xcf72cd28, 0xaa4593fe, 0x9cd5ce70, 0x9cd5ce70, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ar", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x4bb823b8, 0x59349835, 0x4bb823b8, 0x16af4e3c, 0xc9cbf769, 0xc9cbf769, 0x2784b68e, 0x2784b68e, 0x2784b68e, 0xd95c7742, 0xd95c7742, 0xd95c7742, 0x3016c84a, 0x3016c84a, 0x3016c84a, 0xc9cbf769, 0x16af4e3c, 0x16af4e3c, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ar", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xb821e44, 0x16b3ac05, 0xb821e44, 0xa5d4579c, 0x9813a416, 0x9813a416, 0xca80d730, 0xca80d730, 0xca80d730, 0x5b5b5103, 0x5b5b5103, 0x5b5b5103, 0x42e16cd3, 0x42e16cd3, 0x42e16cd3, 0x9813a416, 0xa5d4579c, 0xa5d4579c, 0x9813a416, }, 20 },
-+  { "gfxterm_ar", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xbe0b9671, 0x7f6e98d0, 0xbe0b9671, 0xc8ada3c2, 0x5fcf013d, 0x5fcf013d, 0x57a0c67d, 0x57a0c67d, 0x57a0c67d, 0x85b0de0b, 0x85b0de0b, 0x85b0de0b, 0x93c3e194, 0x93c3e194, 0x93c3e194, 0x5fcf013d, 0xc8ada3c2, 0xc8ada3c2, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ar", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x9f18b29e, 0x50e7d383, 0x9f18b29e, 0x841d6899, 0xdd28f52b, 0xdd28f52b, 0xd12092dc, 0xd12092dc, 0xd12092dc, 0xf01c6b38, 0xf01c6b38, 0xf01c6b38, 0x8da4a0b4, 0x8da4a0b4, 0x8da4a0b4, 0xdd28f52b, 0x841d6899, 0x841d6899, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ar", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x4e8d4d8c, 0x3f32cb90, 0x4e8d4d8c, 0xb132560c, 0x43d1f34, 0x43d1f34, 0x1e7f303c, 0x1e7f303c, 0x1e7f303c, 0x61759994, 0x61759994, 0x61759994, 0xf8249c12, 0xf8249c12, 0xf8249c12, 0x43d1f34, 0xb132560c, 0xb132560c, 0x43d1f34, }, 20 },
-+  { "gfxterm_cyr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x4f39b2c5, 0x37084023, 0x4f39b2c5, 0xccf7f82, 0x59c36f00, 0x59c36f00, 0xb5dad2e, 0xb5dad2e, 0xb5dad2e, 0x75ddc048, 0x75ddc048, 0x75ddc048, 0x172bd59a, 0x172bd59a, 0x172bd59a, 0x59c36f00, 0xccf7f82, 0xccf7f82, 0x59c36f00, }, 20 },
-+  { "gfxterm_cyr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xd5f24f8e, 0x76463f82, 0xd5f24f8e, 0xfbf7caf1, 0xaa4593fe, 0xaa4593fe, 0xb897c475, 0xb897c475, 0xb897c475, 0x1e62c912, 0x1e62c912, 0x1e62c912, 0x335a626a, 0x335a626a, 0x335a626a, 0xaa4593fe, 0xfbf7caf1, 0xfbf7caf1, 0xaa4593fe, }, 20 },
-+  { "gfxterm_cyr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x8aa7c8c3, 0x28620e7e, 0x8aa7c8c3, 0xd7b0a547, 0xc9cbf769, 0xc9cbf769, 0x860f1899, 0x860f1899, 0x860f1899, 0x78d7d955, 0x78d7d955, 0x78d7d955, 0x919d665d, 0x919d665d, 0x919d665d, 0xc9cbf769, 0xd7b0a547, 0xd7b0a547, 0xc9cbf769, }, 20 },
-+  { "gfxterm_cyr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x89654b6, 0x26bab4dd, 0x89654b6, 0xa6c01d6e, 0x9813a416, 0x9813a416, 0xc67652d9, 0xc67652d9, 0xc67652d9, 0x57add4ea, 0x57add4ea, 0x57add4ea, 0x4e17e93a, 0x4e17e93a, 0x4e17e93a, 0x9813a416, 0xa6c01d6e, 0xa6c01d6e, 0x9813a416, }, 20 },
-+  { "gfxterm_cyr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x77945f28, 0xec3ce845, 0x77945f28, 0x1326a9b, 0x5fcf013d, 0x5fcf013d, 0xc8e6e12c, 0xc8e6e12c, 0xc8e6e12c, 0x1af6f95a, 0x1af6f95a, 0x1af6f95a, 0xc85c6c5, 0xc85c6c5, 0xc85c6c5, 0x5fcf013d, 0x1326a9b, 0x1326a9b, 0x5fcf013d, }, 20 },
-+  { "gfxterm_cyr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x4450a5dc, 0xda479f49, 0x4450a5dc, 0x5f557fdb, 0xdd28f52b, 0xdd28f52b, 0xddfe9197, 0xddfe9197, 0xddfe9197, 0xfcc26873, 0xfcc26873, 0xfcc26873, 0x817aa3ff, 0x817aa3ff, 0x817aa3ff, 0xdd28f52b, 0x5f557fdb, 0x5f557fdb, 0xdd28f52b, }, 20 },
-+  { "gfxterm_cyr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x409098da, 0x2e0890e, 0x409098da, 0xbf2f835a, 0x43d1f34, 0x43d1f34, 0x253d050e, 0x253d050e, 0x253d050e, 0x5a37aca6, 0x5a37aca6, 0x5a37aca6, 0xc366a920, 0xc366a920, 0xc366a920, 0x43d1f34, 0xbf2f835a, 0xbf2f835a, 0x43d1f34, }, 20 },
-+  { "gfxterm_heb", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x546aa9f1, 0x56bf26d0, 0x546aa9f1, 0x179c64b6, 0x59c36f00, 0x59c36f00, 0xa98ad4a1, 0xa98ad4a1, 0xa98ad4a1, 0xd70ab9c7, 0xd70ab9c7, 0xd70ab9c7, 0xb5fcac15, 0xb5fcac15, 0xb5fcac15, 0x59c36f00, 0x179c64b6, 0x179c64b6, 0x59c36f00, }, 20 },
-+  { "gfxterm_heb", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x12592c97, 0xa10f7034, 0x12592c97, 0x3c5ca9e8, 0xaa4593fe, 0xaa4593fe, 0x2c3e194, 0x2c3e194, 0x2c3e194, 0xa436ecf3, 0xa436ecf3, 0xa436ecf3, 0x890e478b, 0x890e478b, 0x890e478b, 0xaa4593fe, 0x3c5ca9e8, 0x3c5ca9e8, 0xaa4593fe, }, 20 },
-+  { "gfxterm_heb", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xed5de42a, 0x5cf94e51, 0xed5de42a, 0xb04a89ae, 0xc9cbf769, 0xc9cbf769, 0xdd578210, 0xdd578210, 0xdd578210, 0x238f43dc, 0x238f43dc, 0x238f43dc, 0xcac5fcd4, 0xcac5fcd4, 0xcac5fcd4, 0xc9cbf769, 0xb04a89ae, 0xb04a89ae, 0xc9cbf769, }, 20 },
-+  { "gfxterm_heb", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xbbc56f90, 0x4f643bbb, 0xbbc56f90, 0x15932648, 0x9813a416, 0x9813a416, 0x28aba4d1, 0x28aba4d1, 0x28aba4d1, 0xb97022e2, 0xb97022e2, 0xb97022e2, 0xa0ca1f32, 0xa0ca1f32, 0xa0ca1f32, 0x9813a416, 0x15932648, 0x15932648, 0x9813a416, }, 20 },
-+  { "gfxterm_heb", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x43465d8c, 0x6399888a, 0x43465d8c, 0x35e0683f, 0x5fcf013d, 0x5fcf013d, 0x4895c207, 0x4895c207, 0x4895c207, 0x9a85da71, 0x9a85da71, 0x9a85da71, 0x8cf6e5ee, 0x8cf6e5ee, 0x8cf6e5ee, 0x5fcf013d, 0x35e0683f, 0x35e0683f, 0x5fcf013d, }, 20 },
-+  { "gfxterm_heb", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xd1e7f231, 0xe67e195e, 0xd1e7f231, 0xcae22836, 0xdd28f52b, 0xdd28f52b, 0xe7ae9f08, 0xe7ae9f08, 0xe7ae9f08, 0xc69266ec, 0xc69266ec, 0xc69266ec, 0xbb2aad60, 0xbb2aad60, 0xbb2aad60, 0xdd28f52b, 0xcae22836, 0xcae22836, 0xdd28f52b, }, 20 },
-+  { "gfxterm_heb", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x793e58f4, 0x5f939386, 0x793e58f4, 0x86814374, 0x43d1f34, 0x43d1f34, 0x12b2b9c1, 0x12b2b9c1, 0x12b2b9c1, 0x6db81069, 0x6db81069, 0x6db81069, 0xf4e915ef, 0xf4e915ef, 0xf4e915ef, 0x43d1f34, 0x86814374, 0x86814374, 0x43d1f34, }, 20 },
-+  { "gfxterm_gre", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x226c0d75, 0x9e291f4f, 0x226c0d75, 0x619ac032, 0x59c36f00, 0x59c36f00, 0x6fb6253, 0x6fb6253, 0x6fb6253, 0x787b0f35, 0x787b0f35, 0x787b0f35, 0x1a8d1ae7, 0x1a8d1ae7, 0x1a8d1ae7, 0x59c36f00, 0x619ac032, 0x619ac032, 0x59c36f00, }, 20 },
-+  { "gfxterm_gre", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x8355045, 0xfe058b68, 0x8355045, 0x2630d53a, 0xaa4593fe, 0xaa4593fe, 0x290a3822, 0x290a3822, 0x290a3822, 0x8fff3545, 0x8fff3545, 0x8fff3545, 0xa2c79e3d, 0xa2c79e3d, 0xa2c79e3d, 0xaa4593fe, 0x2630d53a, 0x2630d53a, 0xaa4593fe, }, 20 },
-+  { "gfxterm_gre", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xc702fa59, 0x74086887, 0xc702fa59, 0x9a1597dd, 0xc9cbf769, 0xc9cbf769, 0x60295baa, 0x60295baa, 0x60295baa, 0x9ef19a66, 0x9ef19a66, 0x9ef19a66, 0x77bb256e, 0x77bb256e, 0x77bb256e, 0xc9cbf769, 0x9a1597dd, 0x9a1597dd, 0xc9cbf769, }, 20 },
-+  { "gfxterm_gre", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x82385331, 0xf77eda42, 0x82385331, 0x2c6e1ae9, 0x9813a416, 0x9813a416, 0x140c0d1f, 0x140c0d1f, 0x140c0d1f, 0x85d78b2c, 0x85d78b2c, 0x85d78b2c, 0x9c6db6fc, 0x9c6db6fc, 0x9c6db6fc, 0x9813a416, 0x2c6e1ae9, 0x2c6e1ae9, 0x9813a416, }, 20 },
-+  { "gfxterm_gre", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x565d2d38, 0x34f757ec, 0x565d2d38, 0x20fb188b, 0x5fcf013d, 0x5fcf013d, 0x230bf123, 0x230bf123, 0x230bf123, 0xf11be955, 0xf11be955, 0xf11be955, 0xe768d6ca, 0xe768d6ca, 0xe768d6ca, 0x5fcf013d, 0x20fb188b, 0x20fb188b, 0x5fcf013d, }, 20 },
-+  { "gfxterm_gre", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x632132a4, 0x4a8c90b2, 0x632132a4, 0x7824e8a3, 0xdd28f52b, 0xdd28f52b, 0xef2bffce, 0xef2bffce, 0xef2bffce, 0xce17062a, 0xce17062a, 0xce17062a, 0xb3afcda6, 0xb3afcda6, 0xb3afcda6, 0xdd28f52b, 0x7824e8a3, 0x7824e8a3, 0xdd28f52b, }, 20 },
-+  { "gfxterm_gre", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x461d4cfa, 0xfd3492c2, 0x461d4cfa, 0xb9a2577a, 0x43d1f34, 0x43d1f34, 0xfb72301f, 0xfb72301f, 0xfb72301f, 0x847899b7, 0x847899b7, 0x847899b7, 0x1d299c31, 0x1d299c31, 0x1d299c31, 0x43d1f34, 0xb9a2577a, 0xb9a2577a, 0x43d1f34, }, 20 },
-+  { "gfxterm_ru", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x82758f66, 0xbac387fd, 0x82758f66, 0xc1834221, 0x59c36f00, 0x59c36f00, 0x4877befe, 0x4877befe, 0x4877befe, 0x36f7d398, 0x36f7d398, 0x36f7d398, 0x5401c64a, 0x5401c64a, 0x5401c64a, 0x59c36f00, 0xc1834221, 0xc1834221, 0x59c36f00, }, 20 },
-+  { "gfxterm_ru", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x4500a591, 0x9a40cbd8, 0x4500a591, 0x6b0520ee, 0xaa4593fe, 0xaa4593fe, 0x16db2902, 0x16db2902, 0x16db2902, 0xb02e2465, 0xb02e2465, 0xb02e2465, 0x9d168f1d, 0x9d168f1d, 0x9d168f1d, 0xaa4593fe, 0x6b0520ee, 0x6b0520ee, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ru", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x3cd9ea11, 0x1244c852, 0x3cd9ea11, 0x61ce8795, 0xc9cbf769, 0xc9cbf769, 0x6b15d6f0, 0x6b15d6f0, 0x6b15d6f0, 0x95cd173c, 0x95cd173c, 0x95cd173c, 0x7c87a834, 0x7c87a834, 0x7c87a834, 0xc9cbf769, 0x61ce8795, 0x61ce8795, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ru", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xc818f15f, 0xbaf13382, 0xc818f15f, 0x664eb887, 0x9813a416, 0x9813a416, 0x350fe990, 0x350fe990, 0x350fe990, 0xa4d46fa3, 0xa4d46fa3, 0xa4d46fa3, 0xbd6e5273, 0xbd6e5273, 0xbd6e5273, 0x9813a416, 0x664eb887, 0x664eb887, 0x9813a416, }, 20 },
-+  { "gfxterm_ru", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xaa1dc81, 0x234341dd, 0xaa1dc81, 0x7c07e932, 0x5fcf013d, 0x5fcf013d, 0x969354c5, 0x969354c5, 0x969354c5, 0x44834cb3, 0x44834cb3, 0x44834cb3, 0x52f0732c, 0x52f0732c, 0x52f0732c, 0x5fcf013d, 0x7c07e932, 0x7c07e932, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ru", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xd9aa4b29, 0x555fdda0, 0xd9aa4b29, 0xc2af912e, 0xdd28f52b, 0xdd28f52b, 0xe82cbfd, 0xe82cbfd, 0xe82cbfd, 0x2fbe3219, 0x2fbe3219, 0x2fbe3219, 0x5206f995, 0x5206f995, 0x5206f995, 0xdd28f52b, 0xc2af912e, 0xc2af912e, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ru", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xfd4e19ff, 0x42807b86, 0xfd4e19ff, 0x2f1027f, 0x43d1f34, 0x43d1f34, 0x924dc5be, 0x924dc5be, 0x924dc5be, 0xed476c16, 0xed476c16, 0xed476c16, 0x74166990, 0x74166990, 0x74166990, 0x43d1f34, 0x2f1027f, 0x2f1027f, 0x43d1f34, }, 20 },
-+  { "gfxterm_fr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x3a63a2e6, 0x118487d4, 0x3a63a2e6, 0x79956fa1, 0x59c36f00, 0x59c36f00, 0x389f4d2d, 0x389f4d2d, 0x389f4d2d, 0x461f204b, 0x461f204b, 0x461f204b, 0x24e93599, 0x24e93599, 0x24e93599, 0x59c36f00, 0x79956fa1, 0x79956fa1, 0x59c36f00, }, 20 },
-+  { "gfxterm_fr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x62d33f4d, 0x9544a8f4, 0x62d33f4d, 0x4cd6ba32, 0xaa4593fe, 0xaa4593fe, 0xfb86a3a4, 0xfb86a3a4, 0xfb86a3a4, 0x5d73aec3, 0x5d73aec3, 0x5d73aec3, 0x704b05bb, 0x704b05bb, 0x704b05bb, 0xaa4593fe, 0x4cd6ba32, 0x4cd6ba32, 0xaa4593fe, }, 20 },
-+  { "gfxterm_fr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x8cc4b6dc, 0x1042c383, 0x8cc4b6dc, 0xd1d3db58, 0xc9cbf769, 0xc9cbf769, 0xeba8a32b, 0xeba8a32b, 0xeba8a32b, 0x157062e7, 0x157062e7, 0x157062e7, 0xfc3addef, 0xfc3addef, 0xfc3addef, 0xc9cbf769, 0xd1d3db58, 0xd1d3db58, 0xc9cbf769, }, 20 },
-+  { "gfxterm_fr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x23f9afd, 0x465f5ecc, 0x23f9afd, 0xac69d325, 0x9813a416, 0x9813a416, 0xccf7a1e3, 0xccf7a1e3, 0xccf7a1e3, 0x5d2c27d0, 0x5d2c27d0, 0x5d2c27d0, 0x44961a00, 0x44961a00, 0x44961a00, 0x9813a416, 0xac69d325, 0xac69d325, 0x9813a416, }, 20 },
-+  { "gfxterm_fr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xed796a26, 0x3132d083, 0xed796a26, 0x9bdf5f95, 0x5fcf013d, 0x5fcf013d, 0x42f66a49, 0x42f66a49, 0x42f66a49, 0x90e6723f, 0x90e6723f, 0x90e6723f, 0x86954da0, 0x86954da0, 0x86954da0, 0x5fcf013d, 0x9bdf5f95, 0x9bdf5f95, 0x5fcf013d, }, 20 },
-+  { "gfxterm_fr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x54b28785, 0x7fbbe762, 0x54b28785, 0x4fb75d82, 0xdd28f52b, 0xdd28f52b, 0x14b1cf29, 0x14b1cf29, 0x14b1cf29, 0x358d36cd, 0x358d36cd, 0x358d36cd, 0x4835fd41, 0x4835fd41, 0x4835fd41, 0xdd28f52b, 0x4fb75d82, 0x4fb75d82, 0xdd28f52b, }, 20 },
-+  { "gfxterm_fr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x7acc2669, 0xbf1a1d96, 0x7acc2669, 0x85733de9, 0x43d1f34, 0x43d1f34, 0x2cc1e8f4, 0x2cc1e8f4, 0x2cc1e8f4, 0x53cb415c, 0x53cb415c, 0x53cb415c, 0xca9a44da, 0xca9a44da, 0xca9a44da, 0x43d1f34, 0x85733de9, 0x85733de9, 0x43d1f34, }, 20 },
-+  { "gfxterm_quot", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xf9511593, 0x9f9ef910, 0xf9511593, 0xbaa7d8d4, 0x59c36f00, 0x59c36f00, 0x7fd94135, 0x7fd94135, 0x7fd94135, 0x1592c53, 0x1592c53, 0x1592c53, 0x63af3981, 0x63af3981, 0x63af3981, 0x59c36f00, 0xbaa7d8d4, 0xbaa7d8d4, 0x59c36f00, }, 20 },
-+  { "gfxterm_quot", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x3dcbe25f, 0x99e165e7, 0x3dcbe25f, 0x13ce6720, 0xaa4593fe, 0xaa4593fe, 0x2e88732f, 0x2e88732f, 0x2e88732f, 0x887d7e48, 0x887d7e48, 0x887d7e48, 0xa545d530, 0xa545d530, 0xa545d530, 0xaa4593fe, 0x13ce6720, 0x13ce6720, 0xaa4593fe, }, 20 },
-+  { "gfxterm_quot", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xdbedc74c, 0x61619894, 0xdbedc74c, 0x86faaac8, 0xc9cbf769, 0xc9cbf769, 0xda1c9f17, 0xda1c9f17, 0xda1c9f17, 0x24c45edb, 0x24c45edb, 0x24c45edb, 0xcd8ee1d3, 0xcd8ee1d3, 0xcd8ee1d3, 0xc9cbf769, 0x86faaac8, 0x86faaac8, 0xc9cbf769, }, 20 },
-+  { "gfxterm_quot", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x2411f56f, 0x97b1fc58, 0x2411f56f, 0x8a47bcb7, 0x9813a416, 0x9813a416, 0xfb08d7cf, 0xfb08d7cf, 0xfb08d7cf, 0x6ad351fc, 0x6ad351fc, 0x6ad351fc, 0x73696c2c, 0x73696c2c, 0x73696c2c, 0x9813a416, 0x8a47bcb7, 0x8a47bcb7, 0x9813a416, }, 20 },
-+  { "gfxterm_quot", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x13a65fb6, 0x35044d7, 0x13a65fb6, 0x65006a05, 0x5fcf013d, 0x5fcf013d, 0x9e56a9e0, 0x9e56a9e0, 0x9e56a9e0, 0x4c46b196, 0x4c46b196, 0x4c46b196, 0x5a358e09, 0x5a358e09, 0x5a358e09, 0x5fcf013d, 0x65006a05, 0x65006a05, 0x5fcf013d, }, 20 },
-+  { "gfxterm_quot", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xc8f05290, 0x9c88f64e, 0xc8f05290, 0xd3f58897, 0xdd28f52b, 0xdd28f52b, 0xe1579057, 0xe1579057, 0xe1579057, 0xc06b69b3, 0xc06b69b3, 0xc06b69b3, 0xbdd3a23f, 0xbdd3a23f, 0xbdd3a23f, 0xdd28f52b, 0xd3f58897, 0xd3f58897, 0xdd28f52b, }, 20 },
-+  { "gfxterm_quot", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x9cfbc80f, 0x376a1fb2, 0x9cfbc80f, 0x6344d38f, 0x43d1f34, 0x43d1f34, 0x6486f7c4, 0x6486f7c4, 0x6486f7c4, 0x1b8c5e6c, 0x1b8c5e6c, 0x1b8c5e6c, 0x82dd5bea, 0x82dd5bea, 0x82dd5bea, 0x43d1f34, 0x6344d38f, 0x6344d38f, 0x43d1f34, }, 20 },
-+  { "gfxterm_piglatin", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd327ca68, 0x9c977e8c, 0xd327ca68, 0x90d1072f, 0x59c36f00, 0x59c36f00, 0x71c9d9, 0x71c9d9, 0x71c9d9, 0x7ef1a4bf, 0x7ef1a4bf, 0x7ef1a4bf, 0x1c07b16d, 0x1c07b16d, 0x1c07b16d, 0x59c36f00, 0x90d1072f, 0x90d1072f, 0x59c36f00, }, 20 },
-+  { "gfxterm_piglatin", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x2da3855b, 0x24c7b138, 0x2da3855b, 0x3a60024, 0xaa4593fe, 0xaa4593fe, 0x147ff249, 0x147ff249, 0x147ff249, 0xb28aff2e, 0xb28aff2e, 0xb28aff2e, 0x9fb25456, 0x9fb25456, 0x9fb25456, 0xaa4593fe, 0x3a60024, 0x3a60024, 0xaa4593fe, }, 20 },
-+  { "gfxterm_piglatin", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x660ab3d9, 0xa75b45c4, 0x660ab3d9, 0x3b1dde5d, 0xc9cbf769, 0xc9cbf769, 0x5ff884f5, 0x5ff884f5, 0x5ff884f5, 0xa1204539, 0xa1204539, 0xa1204539, 0x486afa31, 0x486afa31, 0x486afa31, 0xc9cbf769, 0x3b1dde5d, 0x3b1dde5d, 0xc9cbf769, }, 20 },
-+  { "gfxterm_piglatin", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x920957ee, 0xceebfd42, 0x920957ee, 0x3c5f1e36, 0x9813a416, 0x9813a416, 0xa917dbef, 0xa917dbef, 0xa917dbef, 0x38cc5ddc, 0x38cc5ddc, 0x38cc5ddc, 0x2176600c, 0x2176600c, 0x2176600c, 0x9813a416, 0x3c5f1e36, 0x3c5f1e36, 0x9813a416, }, 20 },
-+  { "gfxterm_piglatin", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x8298cd03, 0xfb88293a, 0x8298cd03, 0xf43ef8b0, 0x5fcf013d, 0x5fcf013d, 0x8f57f36b, 0x8f57f36b, 0x8f57f36b, 0x5d47eb1d, 0x5d47eb1d, 0x5d47eb1d, 0x4b34d482, 0x4b34d482, 0x4b34d482, 0x5fcf013d, 0xf43ef8b0, 0xf43ef8b0, 0x5fcf013d, }, 20 },
-+  { "gfxterm_piglatin", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xd8bbc577, 0xb2c37549, 0xd8bbc577, 0xc3be1f70, 0xdd28f52b, 0xdd28f52b, 0xd8b598e, 0xd8b598e, 0xd8b598e, 0x2cb7a06a, 0x2cb7a06a, 0x2cb7a06a, 0x510f6be6, 0x510f6be6, 0x510f6be6, 0xdd28f52b, 0xc3be1f70, 0xc3be1f70, 0xdd28f52b, }, 20 },
-+  { "gfxterm_piglatin", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x4d7993a1, 0xbeefcd88, 0x4d7993a1, 0xb2c68821, 0x43d1f34, 0x43d1f34, 0x1dbc7020, 0x1dbc7020, 0x1dbc7020, 0x62b6d988, 0x62b6d988, 0x62b6d988, 0xfbe7dc0e, 0xfbe7dc0e, 0xfbe7dc0e, 0x43d1f34, 0xb2c68821, 0xb2c68821, 0x43d1f34, }, 20 },
-+  { "gfxterm_ch", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x628b6f61, 0x50f94215, 0x628b6f61, 0x217da226, 0x59c36f00, 0x59c36f00, 0x5755be7f, 0x5755be7f, 0x5755be7f, 0x29d5d319, 0x29d5d319, 0x29d5d319, 0x4b23c6cb, 0x4b23c6cb, 0x4b23c6cb, 0x59c36f00, 0x217da226, 0x217da226, 0x59c36f00, }, 20 },
-+  { "gfxterm_ch", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x9f82cd08, 0xbc67f78d, 0x9f82cd08, 0xb1874877, 0xaa4593fe, 0xaa4593fe, 0x4749512e, 0x4749512e, 0x4749512e, 0xe1bc5c49, 0xe1bc5c49, 0xe1bc5c49, 0xcc84f731, 0xcc84f731, 0xcc84f731, 0xaa4593fe, 0xb1874877, 0xb1874877, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ch", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xbee47cfb, 0x88e98534, 0xbee47cfb, 0xe3f3117f, 0xc9cbf769, 0xc9cbf769, 0xe2396b15, 0xe2396b15, 0xe2396b15, 0x1ce1aad9, 0x1ce1aad9, 0x1ce1aad9, 0xf5ab15d1, 0xf5ab15d1, 0xf5ab15d1, 0xc9cbf769, 0xe3f3117f, 0xe3f3117f, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ch", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x2bfd5a83, 0xbe3c6f2f, 0x2bfd5a83, 0x85ab135b, 0x9813a416, 0x9813a416, 0xce30693b, 0xce30693b, 0xce30693b, 0x5febef08, 0x5febef08, 0x5febef08, 0x4651d2d8, 0x4651d2d8, 0x4651d2d8, 0x9813a416, 0x85ab135b, 0x85ab135b, 0x9813a416, }, 20 },
-+  { "gfxterm_ch", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x1456f321, 0xc3a55992, 0x1456f321, 0x62f0c692, 0x5fcf013d, 0x5fcf013d, 0xbe3d534a, 0xbe3d534a, 0xbe3d534a, 0x6c2d4b3c, 0x6c2d4b3c, 0x6c2d4b3c, 0x7a5e74a3, 0x7a5e74a3, 0x7a5e74a3, 0x5fcf013d, 0x62f0c692, 0x62f0c692, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ch", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xdcac6945, 0x43fbdf5a, 0xdcac6945, 0xc7a9b342, 0xdd28f52b, 0xdd28f52b, 0x274da20b, 0x274da20b, 0x274da20b, 0x6715bef, 0x6715bef, 0x6715bef, 0x7bc99063, 0x7bc99063, 0x7bc99063, 0xdd28f52b, 0xc7a9b342, 0xc7a9b342, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ch", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x571e16b1, 0xb9f25c2, 0x571e16b1, 0xa8a10d31, 0x43d1f34, 0x43d1f34, 0x25dfb69d, 0x25dfb69d, 0x25dfb69d, 0x5ad51f35, 0x5ad51f35, 0x5ad51f35, 0xc3841ab3, 0xc3841ab3, 0xc3841ab3, 0x43d1f34, 0xa8a10d31, 0xa8a10d31, 0x43d1f34, }, 20 },
-+  { "gfxterm_red", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xec987771, 0x8a579bf2, 0xec987771, 0xbbb5c9af, 0x59c36f00, 0x59c36f00, 0x16780f43, 0x16780f43, 0x16780f43, 0x68f86225, 0x68f86225, 0x68f86225, 0xa0e77f7, 0xa0e77f7, 0xa0e77f7, 0x59c36f00, 0xbbb5c9af, 0xbbb5c9af, 0x59c36f00, }, 20 },
-+  { "gfxterm_red", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x97994d2c, 0x33b3ca94, 0x97994d2c, 0x273e977a, 0xaa4593fe, 0xaa4593fe, 0xa592c9d5, 0xa592c9d5, 0xa592c9d5, 0x367c4b2, 0x367c4b2, 0x367c4b2, 0x2e5f6fca, 0x2e5f6fca, 0x2e5f6fca, 0xaa4593fe, 0x273e977a, 0x273e977a, 0xaa4593fe, }, 20 },
-+  { "gfxterm_red", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x5d2416aa, 0xe7a84972, 0x5d2416aa, 0x4d010804, 0xc9cbf769, 0xc9cbf769, 0x4e3a88a0, 0x4e3a88a0, 0x4e3a88a0, 0xb0e2496c, 0xb0e2496c, 0xb0e2496c, 0x59a8f664, 0x59a8f664, 0x59a8f664, 0xc9cbf769, 0x4d010804, 0x4d010804, 0xc9cbf769, }, 20 },
-+  { "gfxterm_red", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x1da65b43, 0xae065274, 0x1da65b43, 0x2dd7a76c, 0x9813a416, 0x9813a416, 0xf81d19f, 0xf81d19f, 0xf81d19f, 0x9e5a57ac, 0x9e5a57ac, 0x9e5a57ac, 0x87e06a7c, 0x87e06a7c, 0x87e06a7c, 0x9813a416, 0x2dd7a76c, 0x2dd7a76c, 0x9813a416, }, 20 },
-+  { "gfxterm_red", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xea8a940e, 0xfa7c8f6f, 0xea8a940e, 0x448d7bfb, 0x5fcf013d, 0x5fcf013d, 0x47c22fa0, 0x47c22fa0, 0x47c22fa0, 0x95d237d6, 0x95d237d6, 0x95d237d6, 0x83a10849, 0x83a10849, 0x83a10849, 0x5fcf013d, 0x448d7bfb, 0x448d7bfb, 0x5fcf013d, }, 20 },
-+  { "gfxterm_red", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xc0ac44fa, 0x94d4e024, 0xc0ac44fa, 0x4ec88f20, 0xdd28f52b, 0xdd28f52b, 0x2422f542, 0x2422f542, 0x2422f542, 0x51e0ca6, 0x51e0ca6, 0x51e0ca6, 0x78a6c72a, 0x78a6c72a, 0x78a6c72a, 0xdd28f52b, 0x4ec88f20, 0x4ec88f20, 0xdd28f52b, }, 20 },
-+  { "gfxterm_red", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x248f7655, 0x8f1ea1e8, 0x248f7655, 0xb3d7f0f5, 0x43d1f34, 0x43d1f34, 0x8c408c04, 0x8c408c04, 0x8c408c04, 0xf34a25ac, 0xf34a25ac, 0xf34a25ac, 0x6a1b202a, 0x6a1b202a, 0x6a1b202a, 0x43d1f34, 0xb3d7f0f5, 0xb3d7f0f5, 0x43d1f34, }, 20 },
-+  { "gfxterm_high", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd6ba8f78, 0xb07563fb, 0xd6ba8f78, 0x6ef020b2, 0x59c36f00, 0x59c36f00, 0x7fd94135, 0x7fd94135, 0x7fd94135, 0x1592c53, 0x1592c53, 0x1592c53, 0x63af3981, 0x63af3981, 0x63af3981, 0x59c36f00, 0x6ef020b2, 0x6ef020b2, 0x59c36f00, }, 20 },
-+  { "gfxterm_high", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xf5257f70, 0x510ff8c8, 0xf5257f70, 0x36a3b7ff, 0xaa4593fe, 0xaa4593fe, 0x2e88732f, 0x2e88732f, 0x2e88732f, 0x887d7e48, 0x887d7e48, 0x887d7e48, 0xa545d530, 0xa545d530, 0xa545d530, 0xaa4593fe, 0x36a3b7ff, 0x36a3b7ff, 0xaa4593fe, }, 20 },
-+  { "gfxterm_high", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x9f8effb3, 0x2502a06b, 0x9f8effb3, 0xddeb038e, 0xc9cbf769, 0xc9cbf769, 0xda1c9f17, 0xda1c9f17, 0xda1c9f17, 0x24c45edb, 0x24c45edb, 0x24c45edb, 0xcd8ee1d3, 0xcd8ee1d3, 0xcd8ee1d3, 0xc9cbf769, 0xddeb038e, 0xddeb038e, 0xc9cbf769, }, 20 },
-+  { "gfxterm_high", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x6aa72774, 0xd9072e43, 0x6aa72774, 0x24b4853d, 0x9813a416, 0x9813a416, 0xfb08d7cf, 0xfb08d7cf, 0xfb08d7cf, 0x6ad351fc, 0x6ad351fc, 0x6ad351fc, 0x73696c2c, 0x73696c2c, 0x73696c2c, 0x9813a416, 0x24b4853d, 0x24b4853d, 0x9813a416, }, 20 },
-+  { "gfxterm_high", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x936eb1d8, 0x8398aab9, 0x936eb1d8, 0x8beef, 0x5fcf013d, 0x5fcf013d, 0x9e56a9e0, 0x9e56a9e0, 0x9e56a9e0, 0x4c46b196, 0x4c46b196, 0x4c46b196, 0x5a358e09, 0x5a358e09, 0x5a358e09, 0x5fcf013d, 0x8beef, 0x8beef, 0x5fcf013d, }, 20 },
-+  { "gfxterm_high", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xdd4b9ec3, 0x89333a1d, 0xdd4b9ec3, 0x3acd5a9d, 0xdd28f52b, 0xdd28f52b, 0xe1579057, 0xe1579057, 0xe1579057, 0xc06b69b3, 0xc06b69b3, 0xc06b69b3, 0xbdd3a23f, 0xbdd3a23f, 0xbdd3a23f, 0xdd28f52b, 0x3acd5a9d, 0x3acd5a9d, 0xdd28f52b, }, 20 },
-+  { "gfxterm_high", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x89f37601, 0x2262a1bc, 0x89f37601, 0xf17b28ae, 0x43d1f34, 0x43d1f34, 0x6486f7c4, 0x6486f7c4, 0x6486f7c4, 0x1b8c5e6c, 0x1b8c5e6c, 0x1b8c5e6c, 0x82dd5bea, 0x82dd5bea, 0x82dd5bea, 0x43d1f34, 0xf17b28ae, 0xf17b28ae, 0x43d1f34, }, 20 },
-   { "videotest", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x1368a483, 0x1368a483, 0x1368a483, 0x1368a483, 0x1368a483, }, 5 },
-   { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, }, 5 },
-   { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, }, 5 },
--- 
-2.14.3
-

0002-Remove-bashisms-from-tests.patch

@@ -1,133 +0,0 @@
-From 5a0c548ba388b343b0bb6d2a38888e7eac5bbb96 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 03:47:13 +0300
-Subject: [PATCH 002/198] Remove bashisms from tests.
-
-Those tests don't actually need bash. Just use common shebang.
----
- tests/grub_cmd_date.in         | 2 +-
- tests/grub_cmd_regexp.in       | 2 +-
- tests/grub_cmd_set_date.in     | 2 +-
- tests/grub_cmd_sleep.in        | 2 +-
- tests/grub_cmd_test.in         | 2 +-
- tests/grub_cmd_tr.in           | 2 +-
- tests/grub_func_test.in        | 2 +-
- tests/grub_script_blockarg.in  | 2 +-
- tests/grub_script_expansion.in | 2 +-
- tests/help_test.in             | 2 +-
- tests/test_sha512sum.in        | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in
-index a459353e8..0d8162e98 100644
---- a/tests/grub_cmd_date.in
-+++ b/tests/grub_cmd_date.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in
-index e7e625701..7e9ab86aa 100644
---- a/tests/grub_cmd_regexp.in
-+++ b/tests/grub_cmd_regexp.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- # Run GRUB script in a Qemu instance
-diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
-index c594ae3fc..2f518dd9e 100644
---- a/tests/grub_cmd_set_date.in
-+++ b/tests/grub_cmd_set_date.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in
-index eb362aa24..05b8f6b73 100644
---- a/tests/grub_cmd_sleep.in
-+++ b/tests/grub_cmd_sleep.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in
-index 6269891c9..49ae8a9c8 100644
---- a/tests/grub_cmd_test.in
-+++ b/tests/grub_cmd_test.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- 
- # create a randome file
- empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
-diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in
-index 3fb15e35c..0e8d645eb 100644
---- a/tests/grub_cmd_tr.in
-+++ b/tests/grub_cmd_tr.in
-@@ -1,4 +1,4 @@
--#! /bin/bash -e
-+#! /bin/sh -e
- 
- # Run GRUB script in a Qemu instance
- # Copyright (C) 2010  Free Software Foundation, Inc.
-diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
-index c8cc26376..b32f24466 100644
---- a/tests/grub_func_test.in
-+++ b/tests/grub_func_test.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in
-index 2765b61ac..63b60a2ea 100644
---- a/tests/grub_script_blockarg.in
-+++ b/tests/grub_script_blockarg.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- 
- # Run GRUB script in a Qemu instance
- # Copyright (C) 2010  Free Software Foundation, Inc.
-diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
-index e46401c4c..2b7829568 100644
---- a/tests/grub_script_expansion.in
-+++ b/tests/grub_script_expansion.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- # Run GRUB script in a Qemu instance
-diff --git a/tests/help_test.in b/tests/help_test.in
-index e780924ef..aa9645835 100644
---- a/tests/help_test.in
-+++ b/tests/help_test.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in
-index d5ef7f9ea..80ebdc59f 100644
---- a/tests/test_sha512sum.in
-+++ b/tests/test_sha512sum.in
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- 
- # create a randome file
- file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
--- 
-2.14.3
-

0002-Rework-linux-command.patch

@@ -1,22 +1,24 @@
-From b7c180177336f1979385e02651ba41f7ee79fefc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 155/198] Rework linux command
+Subject: [PATCH] Rework linux command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel into it
 before pulling out the individual blocks later on.
 ---
- grub-core/loader/i386/linux.c | 34 +++++++++++++++++++++-------------
- 1 file changed, 21 insertions(+), 13 deletions(-)
+ grub-core/loader/i386/linux.c | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index b2438547d..e4b8342f5 100644
+index 9b53d3168f9..f7186be4002 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
-@@ -681,12 +681,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -685,13 +685,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ {
    grub_file_t file = 0;
-   struct linux_kernel_header lh;
+   struct linux_i386_kernel_header lh;
++  grub_uint8_t *linux_params_ptr;
    grub_uint8_t setup_sects;
 -  grub_size_t real_size, prot_size, prot_file_size;
 +  grub_size_t real_size, prot_size, prot_file_size, kernel_offset;
@@ -29,7 +31,7 @@ index b2438547d..e4b8342f5 100644
  
    grub_dl_ref (my_mod);
  
-@@ -700,7 +701,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -705,7 +707,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -46,7 +48,7 @@ index b2438547d..e4b8342f5 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -708,6 +717,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -713,6 +723,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -56,7 +58,15 @@ index b2438547d..e4b8342f5 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -807,13 +819,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -804,6 +817,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		      preferred_address))
+     goto fail;
+ 
++
+   grub_memset (&linux_params, 0, sizeof (linux_params));
+   grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
+ 
+@@ -812,13 +826,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    linux_params.ps_mouse = linux_params.padding10 =  0;
  
    len = sizeof (linux_params) - sizeof (lh);
@@ -68,12 +78,13 @@ index b2438547d..e4b8342f5 100644
 -      goto fail;
 -    }
 +
-+  grub_memcpy (&linux_params + sizeof (lh), kernel + kernel_offset, len);
++  linux_params_ptr = (void *)&linux_params;
++  grub_memcpy (linux_params_ptr + sizeof (lh), kernel + kernel_offset, len);
 +  kernel_offset += len;
  
    linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
  
-@@ -872,7 +880,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -877,7 +888,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
    /* The other parameters are filled when booting.  */
  
@@ -82,7 +93,7 @@ index b2438547d..e4b8342f5 100644
  
    grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
  		(unsigned) real_size, (unsigned) prot_size);
-@@ -1020,9 +1028,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1025,9 +1036,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  			      - (sizeof (LINUX_IMAGE) - 1));
  
    len = prot_file_size;
@@ -93,7 +104,7 @@ index b2438547d..e4b8342f5 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -1033,6 +1039,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -1038,6 +1047,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  
@@ -102,6 +113,3 @@ index b2438547d..e4b8342f5 100644
    if (file)
      grub_file_close (file);
  
--- 
-2.14.3
-

0003-Rework-linux16-command.patch

@@ -1,7 +1,7 @@
-From 60e7a1d746e39f10808a1cbd2c4928624026fbf1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 156/198] Rework linux16 command
+Subject: [PATCH] Rework linux16 command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel int it
@@ -11,12 +11,12 @@ before pulling out the individual blocks later on.
  1 file changed, 21 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 91283157e..b864e5403 100644
+index a3c87cf2fc2..caa76bee8af 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
-@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -123,13 +123,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_file_t file = 0;
-   struct linux_kernel_header lh;
+   struct linux_i386_kernel_header lh;
    grub_uint8_t setup_sects;
 -  grub_size_t real_size;
 +  grub_size_t real_size, kernel_offset = 0;
@@ -30,7 +30,7 @@ index 91283157e..b864e5403 100644
  
    grub_dl_ref (my_mod);
  
-@@ -144,7 +145,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -143,7 +144,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    if (! file)
      goto fail;
  
@@ -47,7 +47,7 @@ index 91283157e..b864e5403 100644
      {
        if (!grub_errno)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -152,6 +161,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -151,6 +160,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -57,7 +57,7 @@ index 91283157e..b864e5403 100644
    if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-@@ -315,13 +327,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -314,13 +326,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_memmove (grub_linux_real_chunk, &lh, sizeof (lh));
  
    len = real_size + GRUB_DISK_SECTOR_SIZE - sizeof (lh);
@@ -72,9 +72,9 @@ index 91283157e..b864e5403 100644
 +	       len);
 +  kernel_offset += len;
  
-   if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
+   if (lh.header != grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
        || grub_le_to_cpu16 (lh.version) < 0x0200)
-@@ -356,10 +364,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -355,10 +363,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    }
  
    len = grub_linux16_prot_size;
@@ -87,7 +87,7 @@ index 91283157e..b864e5403 100644
  
    if (grub_errno == GRUB_ERR_NONE)
      {
-@@ -369,6 +375,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -368,6 +374,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
  
   fail:
  
@@ -96,6 +96,3 @@ index 91283157e..b864e5403 100644
    if (file)
      grub_file_close (file);
  
--- 
-2.14.3
-

0003-fs-tester-make-sh-compatible.patch

@@ -1,746 +0,0 @@
-From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 14:35:59 +0300
-Subject: [PATCH 003/198] fs-tester: make sh-compatible
-
----
- tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------
- 1 file changed, 169 insertions(+), 137 deletions(-)
-
-diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
-index 2337771a1..4515d165e 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- set -e
- 
-@@ -13,8 +13,29 @@ run_it () {
-     LC_ALL=C "$GRUBFSTEST" "$@"
- }
- 
-+range() {
-+    range_counter="$1"
-+    while test "$range_counter" -le "$2"; do
-+	echo "$range_counter"
-+	range_counter="$((range_counter + $3))"
-+    done
-+}
-+
-+powrange() {
-+    range_counter="$1"
-+    while test "$range_counter" -le "$2"; do
-+	echo "$range_counter"
-+	range_counter="$((range_counter * 2))"
-+    done
-+}
-+
- run_grubfstest () {
--    run_it -c $NEED_IMAGES_N "${NEED_IMAGES[@]}"  "$@"
-+    need_images=
-+    for i in $(range 0 $((NEED_IMAGES_N-1)) 1); do
-+	need_images="$need_images $FSIMAGEP${i}.img";
-+    done
-+
-+    run_it -c $NEED_IMAGES_N $need_images  "$@"
- }
- 
- # OS LIMITATION: GNU/Linux has no AFS support, so we use a premade image and a reference tar file. I.a. no multiblocksize test
-@@ -51,7 +72,7 @@ case x"$fs" in
- 	# OS limitation: zfs-fuse always uses ashift=9 with loop devices
- 	MAXLOGSECSIZE=9;;
- esac
--for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE + 1)); do
-+for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
-     SECSIZE="$((1 << LOGSECSIZE))"
-     MINBLKSIZE=512
-     MAXBLKSIZE=512
-@@ -169,7 +190,12 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    MINBLKSIZE=1024
- 	    MAXBLKSIZE=4096;;
-     esac
--    for ((BLKSIZE=MINBLKSIZE;BLKSIZE<=MAXBLKSIZE;BLKSIZE=BLKSTEP?BLKSIZE+BLKSTEP:2*BLKSIZE)); do
-+    if test "$BLKSTEP" -eq 0; then
-+	blksizes="$(powrange "$MINBLKSIZE" "$MAXBLKSIZE")"
-+    else
-+	blksizes="$(range "$MINBLKSIZE" "$MAXBLKSIZE" "$BLKSTEP")"
-+    fi
-+    for BLKSIZE in $blksizes; do
- 	MAXDEVICES=1
- 	MINDEVICES=1
- 	export fs
-@@ -199,13 +225,11 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		MAXDEVICES=7;;
- 	esac
- 
--	for ((NDEVICES=MINDEVICES; NDEVICES <= MAXDEVICES; NDEVICES++)); do
-+	for NDEVICES in $(range "$MINDEVICES" "$MAXDEVICES" 1); do
- 	    export NDEVICES
--	    unset FSIMAGES
--	    for ((i=0; i < NDEVICES; i++)); do
--		FSIMAGES[i]="${tempdir}/${fs}_${SECSIZE}_${BLKSIZE}_${NDEVICES}_$i.img"
--	    done
--	    export FSIMAGES
-+	    unset FSIMAGEP
-+	    FSIMAGEP="${tempdir}/${fs}_${SECSIZE}_${BLKSIZE}_${NDEVICES}_"
-+	    export FSIMAGEP
- 	    unset NEED_IMAGES;
- 
- 	    case x$fs in
-@@ -226,11 +250,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		*)
- 		    NEED_IMAGES_N=$NDEVICES;;
- 	    esac
--	    for ((i=0;i < NEED_IMAGES_N; i++)); do
--		NEED_IMAGES[i]="${FSIMAGES[i]}";
--	    done
- 	    export NEED_IMAGES_N
--	    export NEED_IMAGES
- 
- 	    MNTPOINTRO="${tempdir}/${fs}_ro"
- 	    MNTPOINTRW="${tempdir}/${fs}_rw"
-@@ -238,20 +258,25 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    MOUNTFS="$fs"
- 	    MASTER="${tempdir}/master"
- 	    FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
--	    CFILESN=1
--	    if test -f /usr/share/dict/american-english; then
--		CFILESSRC[0]="/usr/share/dict/american-english"
--	    else
--		CFILESSRC[0]="/usr/share/dict/linux.words"
-+	    CFILESRC=
-+	    for cand in /usr/share/dict/american-english /usr/share/dict/linux.words; do
-+		if test -f "$cand" ; then
-+		    CFILESRC="$cand"
-+		    break
-+		fi
-+	    done
-+	    if test "$CFILESRC" = "" ; then
-+		echo "Couldn't find compressible file" >&2
-+		exit 1
- 	    fi
- 	    case x"$fs" in
- 		    # FS LIMITATION: 8.3 names
- 		xmsdos*)
--		    CFILES[0]="american.eng";;
-+		    CFILE="american.eng";;
- 		xiso9660)
--		    CFILES[0]="american_english";;
-+		    CFILE="american_english";;
- 		*)
--		    CFILES[0]="american-english";;
-+		    CFILE="american-english";;
- 	    esac
-         # OS LIMITATION: Limited by NAME_MAX (usually 255) in GNU/Linux
- 	    LONGNAME="qwertzuiopasdfghjklyxcvbnm1234567890qwertzuiopasdfghjklyxcvbnm1234567890oiewqfiewioqoiqoiurqruewqoiuwoieoiiuewqroreqiufieiuwrnureweriuvceoiroiewqoiricdsalkcndsakfirefoiwqeoircorejwoijfreoijojoiewjfwnfcoirenfoirefnreoifenoiwfnoi"
-@@ -388,8 +413,8 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    ;;
- 		x"vfat16" | xmsdos16)
- 		    BIGBLOCKCNT=$((25000 * BLKSIZE))
--		    if [ $BIGBLOCKCNT -gt $((16#ffffffff)) ]; then
--			BIGBLOCKCNT=$((16#ffffffff))
-+		    if [ $BIGBLOCKCNT -gt 4294967295 ]; then
-+			BIGBLOCKCNT=4294967295
- 		    fi
- 		    ;;
- 		x"minix")
-@@ -410,7 +435,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    BIGBLOCKCNT=$((4000 * 1048576));;
- 		    # FS LIMITATION: These FS have uint32 as file size field
- 		x"vfat"* | xmsdos* | x"cpio_crc" | x"cpio_newc" | x"cpio_bin" | x"cpio_hpbin" | xsfs*)
--		    BIGBLOCKCNT=$((16#ffffffff));;
-+		    BIGBLOCKCNT=4294967295;;
- 		    # FS LIMITATION: These FS have int32 as file size field
- 		    # FIXME: not so sure about AFFS
- 		    # OS LIMITATION: minix2/minix3 could be formatted in a way to permit more.
-@@ -543,18 +568,18 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 
- 	    PDIR=""
- 		# OS LIMITATION: Limited by PATH_MAX (usually 1024)
--	    for ((i=0;i<PDIRCOMPNUM;i++)); do
-+	    for i in $(range 0 $((PDIRCOMPNUM-1)) 1); do
- 		PDIR="$PDIR/$i";
--		if [ $((i%3)) == 0 ]; then
-+		if test $((i%3)) = 0; then
- 		    PDIR="$PDIR/"
- 		fi
- 	    done
- 
- 	    PDIR2=""
- 		# OS LIMITATION: Limited by PATH_MAX (usually 1024)
--	    for ((i=0;i<PDIR2COMPNUM;i++)); do
-+	    for i in $(range 0 $((PDIR2COMPNUM-1)) 1); do
- 		PDIR2="${PDIR2}/$i";
--		if [ $((i%3)) == 0 ]; then
-+		if test $((i%3)) = 0; then
- 		    PDIR2="${PDIR2}/"
- 		fi
- 	    done
-@@ -563,7 +588,9 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 
- 	    unset LODEVICES
- 	    GENERATED=n
--
-+	    LODEVICES=
-+	    MOUNTDEVICE=
-+	    
- 	    case x"$fs" in
- 		x"tarfs" | x"cpio_"*| x"ziso9660" | x"romfs" | x"squash4_"*\
-                     | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet \
-@@ -577,62 +604,65 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		*)
- 		    mkdir -p "$MNTPOINTRW"
- 		    mkdir -p "$MNTPOINTRO"
--		    for ((i=0; i < NDEVICES; i++)); do
--			dd if=/dev/zero of="${FSIMAGES[i]}" count=1 bs=1 seek=$((DISKSIZE-1)) &> /dev/null
--			LODEVICES[i]=`losetup -f`
--			losetup "${LODEVICES[i]}" "${FSIMAGES[i]}"
-+		    for i in $(range 0 $((NDEVICES-1)) 1); do
-+			dd if=/dev/zero of="$FSIMAGEP${i}.img" count=1 bs=1 seek=$((DISKSIZE-1)) &> /dev/null
-+			LODEVICE="$(losetup -f)"
-+			LODEVICES="$LODEVICES $LODEVICE"
-+			losetup "$LODEVICE" "$FSIMAGEP${i}.img"
-+			if test "$i" = 0; then
-+			    MOUNTDEVICE="$LODEVICE"
-+			fi
- 		    done ;;
- 	    esac
- 
--	    MOUNTDEVICE="${LODEVICES[0]}"
- 	    case x"$fs" in
- 		x"afs")
- 		    ;;
- 		x"btrfs")
--		    "mkfs.btrfs" -s $SECSIZE -L "$FSLABEL" "${LODEVICES[0]}" ;;
-+		    "mkfs.btrfs" -s $SECSIZE -L "$FSLABEL" "${MOUNTDEVICE}" ;;
- 		x"btrfs_zlib" | x"btrfs_lzo")
--		    "mkfs.btrfs" -s $SECSIZE -L "$FSLABEL" "${LODEVICES[0]}"
-+		    "mkfs.btrfs" -s $SECSIZE -L "$FSLABEL" "${MOUNTDEVICE}"
- 		    MOUNTOPTS="compress=${fs/btrfs_/},"
- 		    MOUNTFS="btrfs"
- 		    ;;
- 		x"btrfs_raid0")
--		    "mkfs.btrfs" -s $SECSIZE -d raid0 -m raid0 -L "$FSLABEL" "${LODEVICES[@]}"
-+		    "mkfs.btrfs" -s $SECSIZE -d raid0 -m raid0 -L "$FSLABEL" $LODEVICES
- 		    MOUNTFS="btrfs"
- 		    ;;
- 		x"btrfs_raid1")
--		    "mkfs.btrfs" -s $SECSIZE -d raid1 -m raid1 -L "$FSLABEL" "${LODEVICES[@]}"
-+		    "mkfs.btrfs" -s $SECSIZE -d raid1 -m raid1 -L "$FSLABEL" $LODEVICES
- 		    MOUNTFS="btrfs"
- 		    ;;
- 		x"btrfs_raid10")
--		    "mkfs.btrfs" -s $SECSIZE -d raid10 -m raid10 -L "$FSLABEL" "${LODEVICES[@]}"
-+		    "mkfs.btrfs" -s $SECSIZE -d raid10 -m raid10 -L "$FSLABEL" $LODEVICES
- 		    MOUNTFS="btrfs"
- 		    ;;
- 		x"btrfs_single")
--		    "mkfs.btrfs" -s $SECSIZE -d single -L "$FSLABEL" "${LODEVICES[@]}"
-+		    "mkfs.btrfs" -s $SECSIZE -d single -L "$FSLABEL" $LODEVICES
- 		    MOUNTFS="btrfs"
- 		    ;;
- 		x"exfat")
--		    "mkfs.$fs" -s $((BLKSIZE/512)) -n "$FSLABEL" "${LODEVICES[0]}"
-+		    "mkfs.$fs" -s $((BLKSIZE/512)) -n "$FSLABEL" "${MOUNTDEVICE}"
- 		    MOUNTOPTS="iocharset=utf8,"
- 		    MOUNTFS="exfat-fuse";;
- 		x"minix")
--		    "mkfs.minix" "${LODEVICES[0]}"
-+		    "mkfs.minix" "${MOUNTDEVICE}"
- 		    ;;
- 	# mkfs.hfs and mkfs.hfsplus don't fill UUID.
- 		x"hfsplus")
--		    "mkfs.hfsplus" -b $BLKSIZE -v "$FSLABEL" "${LODEVICES[0]}"
--		    dd if=/dev/urandom of="${LODEVICES[0]}" bs=1 seek=$((16#468)) conv=notrunc count=8 ;;
-+		    "mkfs.hfsplus" -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}"
-+		    dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8 ;;
- 		x"hfsplus_wrap")
--		    "mkfs.hfsplus" -w -b $BLKSIZE -v "$FSLABEL" "${LODEVICES[0]}"
--		    dd if=/dev/urandom of="${LODEVICES[0]}" bs=1 seek=$((16#468)) conv=notrunc count=8
-+		    "mkfs.hfsplus" -w -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}"
-+		    dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8
- 		    MOUNTFS="hfsplus";;
- 		x"hfsplus_casesens")
--		    "mkfs.hfsplus" -s -b $BLKSIZE -v "$FSLABEL" "${LODEVICES[0]}"
--		    dd if=/dev/urandom of="${LODEVICES[0]}" bs=1 seek=$((16#468)) conv=notrunc count=8
-+		    "mkfs.hfsplus" -s -b $BLKSIZE -v "$FSLABEL" "${MOUNTDEVICE}"
-+		    dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#468)) conv=notrunc count=8
- 		    MOUNTFS="hfsplus";;
- 		x"hfs")
--		    "mkfs.hfs" -b $BLKSIZE -v "`echo $FSLABEL |recode utf8..macroman`" -h "${LODEVICES[0]}"
--		    dd if=/dev/urandom of="${LODEVICES[0]}" bs=1 seek=$((16#474)) conv=notrunc count=8
-+		    "mkfs.hfs" -b $BLKSIZE -v "`echo $FSLABEL |recode utf8..macroman`" -h "${MOUNTDEVICE}"
-+		    dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((16#474)) conv=notrunc count=8
- 		    MOUNTOPTS="iocharset=utf8,codepage=macroman,"
- 		    ;;
- 		x"vfat"*|xmsdos*)
-@@ -643,98 +673,98 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    else
- 			A=
- 		    fi
--		    "mkfs.vfat" -a $A -S $SECSIZE -s $((BLKSIZE/SECSIZE)) -F "${BITS:0:2}" -n "$FSLABEL" "${FSIMAGES[0]}"
-+		    "mkfs.vfat" -a $A -S $SECSIZE -s $((BLKSIZE/SECSIZE)) -F "${BITS:0:2}" -n "$FSLABEL" "${MOUNTDEVICE}"
- 		    MOUNTOPTS="iocharset=utf8,codepage=437,"
- 		    MOUNTFS="$(echo "$fs"|sed 's,[0-9]*a\?$,,')";;
- 		x"minix2")
--		    "mkfs.minix" -v "${LODEVICES[0]}"
-+		    "mkfs.minix" -v "${MOUNTDEVICE}"
- 		    MOUNTFS="minix";;
- 		x"minix3")
--		    "mkfs.minix" -B $BLKSIZE -3 "${LODEVICES[0]}"
-+		    "mkfs.minix" -B $BLKSIZE -3 "${MOUNTDEVICE}"
- 		    MOUNTFS="minix";;
- 		x"ntfs"*)
--		    "mkfs.ntfs" -s "$SECSIZE" -c "$BLKSIZE" -L "$FSLABEL" -Q -q "${LODEVICES[0]}"
-+		    "mkfs.ntfs" -s "$SECSIZE" -c "$BLKSIZE" -L "$FSLABEL" -Q -q "${MOUNTDEVICE}"
- 		    MOUNTOPTS="iocharset=utf8,compression,"
- 		    MOUNTFS="ntfs-3g";;
- 		x"udf")
--		    "mkudffs" --utf8 -b $BLKSIZE --lvid="$FSLABEL" "${LODEVICES[0]}"
-+		    "mkudffs" --utf8 -b $BLKSIZE --lvid="$FSLABEL" "${MOUNTDEVICE}"
- 		    MOUNTOPTS="iocharset=utf8,bs=$BLKSIZE,";;
- 		x"ufs2")
--		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 2 "${LODEVICES[0]}"
-+		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 2 "${MOUNTDEVICE}"
- 		    MOUNTOPTS="ufstype=ufs2,"
- 		    MOUNTFS="ufs";;
- 		x"ufs1")
--		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 1 "${LODEVICES[0]}"
-+		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 1 "${MOUNTDEVICE}"
- 		    MOUNTOPTS="ufstype=44bsd,"
- 		    MOUNTFS="ufs";;
- 		x"ufs1_sun")
--		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 1 "${LODEVICES[0]}"
-+		    "mkfs.ufs" -b $BLKSIZE -L "$FSLABEL" -O 1 "${MOUNTDEVICE}"
- 		    MOUNTOPTS="ufstype=sun,"
- 		    MOUNTFS="ufs";;
- 		x"zfs")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" "${LODEVICES[0]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" "${MOUNTDEVICE}"
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_caseins")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" "${LODEVICES[0]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" "${MOUNTDEVICE}"
- 		    sleep 1
- 		    "zfs" create -o casesensitivity=insensitive "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_lzjb" | xzfs_gzip | xzfs_zle)
--		    "zpool" create -O compression=${fs/zfs_/} -R "$MNTPOINTRW" "$FSLABEL" "${LODEVICES[0]}"
-+		    "zpool" create -O compression=${fs/zfs_/} -R "$MNTPOINTRW" "$FSLABEL" "${MOUNTDEVICE}"
- 		    sleep 1
- 		    "zfs" create -o compression=${fs/zfs_/} "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_raidz")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz1 "${LODEVICES[@]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz1 $LODEVICES
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_raidz2")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz2 "${LODEVICES[@]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz2 $LODEVICES
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_raidz3")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz3 "${LODEVICES[@]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" raidz3 $LODEVICES
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_mirror")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" mirror "${LODEVICES[@]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" mirror $LODEVICES
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"zfs_stripe")
--		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" "${LODEVICES[@]}"
-+		    "zpool" create -R "$MNTPOINTRW" "$FSLABEL" $LODEVICES
- 		    sleep 1
- 		    "zfs" create "$FSLABEL"/"grub fs"
- 		    sleep 1;;
- 		x"tarfs" | x"cpio_"* | x"iso9660" | xjoliet | xrockridge | xrockridge_joliet | x"iso9660_1999" | xjoliet_1999 | xrockridge_1999 | xrockridge_joliet_1999 | x"ziso9660" | x"romfs" | x"squash4_"*)
- 		    INSTDEVICE=/dev/null;;
- 		x"reiserfs")
--		    "mkfs.reiserfs" --format=3.6 -b $BLKSIZE -l "$FSLABEL" -q "${LODEVICES[0]}" ;;
-+		    "mkfs.reiserfs" --format=3.6 -b $BLKSIZE -l "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		x"reiserfs_old")
--		    "mkfs.reiserfs" --format=3.5 -b $BLKSIZE -l "$FSLABEL" -q "${LODEVICES[0]}"
-+		    "mkfs.reiserfs" --format=3.5 -b $BLKSIZE -l "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTFS=reiserfs;;
- 		x"jfs")
--		    "mkfs.jfs" -L "$FSLABEL" -q "${LODEVICES[0]}"
-+		    "mkfs.jfs" -L "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTOPTS="iocharset=utf8,";;
- 		x"jfs_caseins")
--		    "mkfs.jfs" -O -L "$FSLABEL" -q "${LODEVICES[0]}"
-+		    "mkfs.jfs" -O -L "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTFS=jfs
- 		    MOUNTOPTS="iocharset=utf8,";;
- 		x"mdraid"*)
--		    mdadm -C --chunk=$((BLKSIZE/1024)) --force -e "${fs:6:1}.${fs:7:1}" "/dev/md/${fs}_${NDEVICES}" --level="${fs:13}" --raid-devices="$NDEVICES" "${LODEVICES[@]}"
-+		    mdadm -C --chunk=$((BLKSIZE/1024)) --force -e "${fs:6:1}.${fs:7:1}" "/dev/md/${fs}_${NDEVICES}" --level="${fs:13}" --raid-devices="$NDEVICES" $LODEVICES
- 		    MOUNTDEVICE="/dev/md/${fs}_${NDEVICES}"
- 		    MOUNTFS=ext2
- 		    "mkfs.ext2" -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		x"lvm"*)
--		    for ((i=0;i<NDEVICES;i++)); do
--			pvcreate "${LODEVICES[i]}"
-+		    for lodev in $LODEVICES; do
-+			pvcreate "$lodev"
- 		    done
--		    vgcreate -s $((BLKSIZE/1024))K grub_test "${LODEVICES[@]}"
-+		    vgcreate -s $((BLKSIZE/1024))K grub_test $LODEVICES
- 		    if [ x$fs = xlvm ] ; then
- 			lvcreate -l "$((NDEVICES*7*LVMBLKMUL))" -n testvol grub_test
- 		    elif [ x$fs = xlvm_stripe ] ; then
-@@ -757,22 +787,22 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    MOUNTFS=ext2
- 		    "mkfs.ext2" -L "$FSLABEL" -q "${MOUNTDEVICE}"  ;;
- 		xnilfs2)
--		    "mkfs.nilfs2" -L "$FSLABEL" -b $BLKSIZE  -q "${LODEVICES[0]}" ;;
-+		    "mkfs.nilfs2" -L "$FSLABEL" -b $BLKSIZE  -q "${MOUNTDEVICE}" ;;
- 		xext2_old)
--		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext2" -r 0 -b $BLKSIZE -L "$FSLABEL" -q "${LODEVICES[0]}"
-+		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext2" -r 0 -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTFS=ext2
- 		    ;;
- 		xext4_metabg)
--		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O meta_bg,^resize_inode -b $BLKSIZE -L "$FSLABEL" -q "${LODEVICES[0]}"
-+		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O meta_bg,^resize_inode -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTFS=ext4
- 		    ;;
- 		xext*)
--		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${LODEVICES[0]}" ;;
-+		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		xxfs)
--		    "mkfs.xfs" -m crc=0 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${LODEVICES[0]}" ;;
-+		    "mkfs.xfs" -m crc=0 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		xxfs_crc)
- 		    MOUNTFS="xfs"
--		    "mkfs.xfs" -m crc=1 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${LODEVICES[0]}" ;;
-+		    "mkfs.xfs" -m crc=1 -b size=$BLKSIZE -s size=$SECSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		*)
- 		    echo "Add appropriate mkfs command here"
- 		    exit 1
-@@ -873,11 +903,13 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		*)
- 		    if ! mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRW" -o ${MOUNTOPTS}${SELINUXOPTS}rw  ; then
- 			echo "MOUNT FAILED."
--			for ((i=0; i < NDEVICES; i++)); do
--			    while ! losetup -d "${LODEVICES[i]}"; do
-+			for lodev in $LODEVICES; do
-+			    while ! losetup -d "$lodev"; do
- 				sleep 1
- 			    done
--			    rm "${FSIMAGES[i]}"
-+			done
-+			for i in $(range 0 $((NDEVICES-1)) 1); do
-+			    rm "$FSIMAGEP${i}.img"
- 			done
- 			exit 1;
- 		    fi
-@@ -939,11 +971,11 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    if (test x$fs = xvfat12a || test x$fs = xmsdos12a) && test x$BLKSIZE = x131072; then
- 		    # With this config there isn't enough space for full copy.
- 		    # Copy as much as we can
--		cp "${CFILESSRC[0]}" "$MNTPOINTRW/$OSDIR/${CFILES[0]}" &> /dev/null;
-+		cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}" &> /dev/null;
- 	    else
--		for ((i=0;i<$CFILESN;i++)); do
--		    cp "${CFILESSRC[i]}" "$MNTPOINTRW/$OSDIR/${CFILES[i]}";
--		done
-+
-+		cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}";
-+
- 	    fi
- 
- 	    if [ x$NOSYMLINK != xy ]; then
-@@ -968,48 +1000,48 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    sleep 2
- 		    ;;
- 		x"tarfs")
--		    (cd "$MASTER"; tar cf "${FSIMAGES[0]}" .) ;;
-+		    (cd "$MASTER"; tar cf "${FSIMAGEP}0.img" .) ;;
- 		x"cpio_"*)
--		    (cd "$MASTER"; find . | cpio -o -H "${fs/cpio_/}" > "${FSIMAGES[0]}" ) ;;
-+		    (cd "$MASTER"; find . | cpio -o -H "$(echo ${fs} | sed 's@^cpio_@@')" > "${FSIMAGEP}0.img" ) ;;
- 		x"ziso9660")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs default -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}"  -- -set_filter_r --zisofs -- -zisofs default -add /="$MASTER" ;;
-+		    xorriso -compliance rec_mtime -set_filter_r --zisofs -- -zisofs default -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"  -- -set_filter_r --zisofs -- -zisofs default -add /="$MASTER" ;;
- 		x"iso9660")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"joliet")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"rockridge")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"rockridge_joliet")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"iso9660_1999")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge off -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"joliet_1999")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge off  -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"rockridge_1999")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"rockridge_joliet_1999")
- 		    FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
--		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGES[0]}" /="$MASTER"  ;;
-+		    xorriso --rockridge on -compliance rec_mtime -as mkisofs -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER"  ;;
- 		x"romfs")
--		    genromfs -V "$FSLABEL" -f "${FSIMAGES[0]}" -d "$MASTER" ;;
-+		    genromfs -V "$FSLABEL" -f "${FSIMAGEP}0.img" -d "$MASTER" ;;
- 		xsquash4_*)
--		    echo mksquashfs "$MASTER" "${FSIMAGES[0]}" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
--		    mksquashfs "$MASTER" "${FSIMAGES[0]}" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
-+		    echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
-+		    mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
- 		x"bfs")
- 		    sleep 1
- 		    fusermount -u "$MNTPOINTRW"
- 		    ;;
- 		xlvm*)
- 		    sleep 1
--		    for ((try=0;try < 20; try++)); do
-+		    for try in $(range 0 20 1); do
- 			if umount "$MNTPOINTRW" ; then
- 			    break;
- 			fi
-@@ -1021,7 +1053,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    ;;
- 		xmdraid*)
- 		    sleep 1
--		    for ((try=0;try < 20; try++)); do
-+		    for try in $(range 0 20 1); do
- 			if umount "$MNTPOINTRW" ; then
- 			    break;
- 			fi
-@@ -1033,7 +1065,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    ;;
- 		*)
- 		    sleep 1
--		    for ((try=0;try < 20; try++)); do
-+		    for try in $(range 0 20 1); do
- 			if umount "$MNTPOINTRW" ; then
- 			    break;
- 			fi
-@@ -1066,7 +1098,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    sleep 1
- 		    mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro ;;
- 		xmdraid*)
--		    mdadm --assemble /dev/md/"${fs}_$NDEVICES" "${LODEVICES[@]}"
-+		    mdadm --assemble /dev/md/"${fs}_$NDEVICES" $LODEVICES
- 		    sleep 1
- 		    mount -t "$MOUNTFS" "${MOUNTDEVICE}" "$MNTPOINTRO" -o ${MOUNTOPTS}${SELINUXOPTS}ro ;;
- 		*)
-@@ -1085,7 +1117,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo LIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		TZ=UTC ls -l "$MNTPOINTRO"
- 		exit 1
- 	    fi
- 
-@@ -1094,7 +1126,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo NLIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -lA "$MNTPOINTRO"
-+		TZ=UTC ls -lA "$MNTPOINTRO"
- 		exit 1
- 	    fi
- 
-@@ -1103,7 +1135,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo ILIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		TZ=UTC ls -l "$MNTPOINTRO"
- 		exit 1
- 	    fi
- 
-@@ -1112,7 +1144,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo LONG LIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		TZ=UTC ls -l "$MNTPOINTRO"
- 		exit 1
- 	    fi
- 
-@@ -1123,7 +1155,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		else
- 		    echo TIME FAIL
- 		    echo "$LSROUT"
--		    TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		    TZ=UTC ls -l "$MNTPOINTRO"
- 		    exit 1
- 		fi
- 
-@@ -1133,7 +1165,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		else
- 		    echo LONG TIME FAIL
- 		    echo "$LSROUT"
--		    TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		    TZ=UTC ls -l "$MNTPOINTRO"
- 		    exit 1
- 		fi
- 	    fi
-@@ -1149,7 +1181,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo DOT IN ROOTDIR FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+		TZ=UTC ls -l "$MNTPOINTRO"
- 		exit 1
- 	    fi
- 
-@@ -1163,7 +1195,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    else
- 			echo DOTDOT IN ROOTDIR FAIL
- 			echo "$LSROUT"
--			TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
-+			TZ=UTC ls -l "$MNTPOINTRO"
- 			exit 1
- 		    fi
- 		    ;;
-@@ -1180,7 +1212,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo SLIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO/sdir"
-+		TZ=UTC ls -l "$MNTPOINTRO/sdir"
- 		exit 1
- 	    fi
- 
-@@ -1195,7 +1227,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo PLIST FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO/$PDIR"
-+		TZ=UTC ls -l "$MNTPOINTRO/$PDIR"
- 		exit 1
- 	    fi
- 
-@@ -1210,7 +1242,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo DOT IN SUBDIR FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO/$OSDIR/sdir"
-+		TZ=UTC ls -l "$MNTPOINTRO/$OSDIR/sdir"
- 		exit 1
- 	    fi
- 
-@@ -1225,7 +1257,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    else
- 		echo DOTDOT IN SUBDIR FAIL
- 		echo "$LSROUT"
--		TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO/$OSDIR/ssdir"
-+		TZ=UTC ls -l "$MNTPOINTRO/$OSDIR/ssdir"
- 		exit 1
- 	    fi
- 
-@@ -1245,8 +1277,8 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 	    case x"$fs" in
- 		x"iso9660" | x"ziso9660" | xrockridge | xjoliet | xrockridge_joliet | x"iso9660_1999" | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999) ;;
- 		x"zfs"*)
--		    for ((i=0;i<NDEVICES;i++)); do
--			FSUUID=$(printf "%016x\n" $(blkid -o export "${LODEVICES[i]}" |grep -F UUID=|sed s,UUID=,,g))
-+		    for lodev in $LODEVICES; do
-+			FSUUID=$(printf "%016x\n" $(blkid -o export "$lodev" |grep -F UUID=|sed s,UUID=,,g))
- 			if [ "$FSUUID" != 0000000000000000 ]; then
- 			    break;
- 			fi
-@@ -1264,8 +1296,8 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 			echo UUID FAIL
- 			echo "$LSOUT"
- 			echo "$GRUBUUID"
--			for ((i=0;i<NDEVICES;i++)); do
--			    blkid "${LODEVICES[i]}"
-+			for lodev in $LODEVICES; do
-+			    blkid "$lodev"
- 			done
- 			exit 1
- 		    fi
-@@ -1290,7 +1322,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 			echo UUID FAIL
- 			echo "$FSUUID"
- 			echo "$LSOUT"
--			blkid "${LODEVICES[0]}"
-+			blkid "${MOUNTDEVICE}"
- 			exit 1
- 		    fi
- 		    ;;
-@@ -1304,7 +1336,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    # may be delayed for a long time.
- 		    FSTIME="$UMOUNT_TIME";;
- 		*)
--		    FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGES[0]}"|awk '{print $6; }'|sed 's,_, ,g')";;
-+		    FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGEP}0.img"|awk '{print $6; }'|sed 's,_, ,g')";;
- 	    esac
- 	    # With some abstractions like mdraid computing of UMOUNT_TIME
- 	    # is not precise. Account for small difference here.
-@@ -1410,11 +1442,9 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		exit 1
- 	    fi
- 	    ok=true
--	    for ((i=0;i<$CFILESN;i++)); do
--		if ! run_grubfstest cmp "$GRUBDIR/${CFILES[i]}" "$MNTPOINTRO/$OSDIR/${CFILES[i]}"  ; then
--		    ok=false;
--		fi
--	    done
-+	    if ! run_grubfstest cmp "$GRUBDIR/${CFILE}" "$MNTPOINTRO/$OSDIR/${CFILE}"  ; then
-+		ok=false;
-+	    fi
- 	    if  test x$ok = xtrue; then
- 		:
- 	    else
-@@ -1503,15 +1533,17 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
- 		    sleep 1
- 		    ;;
- 	    esac
--	    for ((i=0; i < NDEVICES; i++)); do
--		case x"$fs" in
--		    x"tarfs" | x"cpio_"* | x"iso9660" | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | x"iso9660_1999" | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999) ;;
--		    *)
--			while ! losetup -d "${LODEVICES[i]}"; do
-+	    case x"$fs" in
-+		x"tarfs" | x"cpio_"* | x"iso9660" | xrockridge | xjoliet | xrockridge_joliet | x"ziso9660" | x"romfs" | x"squash4_"* | x"iso9660_1999" | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999) ;;
-+		*)
-+		    for lodev in $LODEVICES; do
-+			while ! losetup -d "$lodev"; do
- 			    sleep 1
--			done;;
--		esac
--		rm "${FSIMAGES[i]}"
-+			done
-+		    done;;
-+	    esac
-+	    for i in $(range 0 $((NDEVICES-1)) 1); do
-+		rm "$FSIMAGEP${i}.img"
- 	    done
- 	    if [ x"$fs" = x"zfs" ]; then
- 		rmdir "$MNTPOINTRW"/"grub fs"  || true
--- 
-2.14.3
-

0004-support-busybox-date.patch

@@ -1,43 +0,0 @@
-From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 14:31:36 +0300
-Subject: [PATCH 004/198] support busybox date.
-
-Busybox date doesn't understand weekdays in -d input,
-so strip them beforehand.
----
- tests/grub_cmd_date.in  | 2 +-
- tests/grub_cmd_sleep.in | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in
-index 0d8162e98..60f039ebc 100644
---- a/tests/grub_cmd_date.in
-+++ b/tests/grub_cmd_date.in
-@@ -9,7 +9,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ];
- fi
- 
- pdt="$(date -u +%s)"
--dt=`echo date | @builddir@/grub-shell`
-+dt=`echo date | @builddir@/grub-shell | sed 's, [A-Z][a-z]*$,,'`
- dtg="$(date -u -d "$dt" +%s)"
- ndt="$(date -u +%s)"
- 
-diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in
-index 05b8f6b73..ac51d4209 100644
---- a/tests/grub_cmd_sleep.in
-+++ b/tests/grub_cmd_sleep.in
-@@ -11,8 +11,8 @@ fi
- # Compare RTC with interval timer.
- # Not 100% proper but should check that timer is running ok
- dt=`echo 'date; sleep 10; date' | @builddir@/grub-shell`
--dt1="$(date -u -d "$(echo "$dt" | head -n 1)" +%s)"
--dt2="$(date -u -d "$(echo "$dt" | tail -n 1)" +%s)"
-+dt1="$(date -u -d "$(echo "$dt" | head -n 1 | sed 's, [A-Z][a-z]*$,,')" +%s)"
-+dt2="$(date -u -d "$(echo "$dt" | tail -n 1 | sed 's, [A-Z][a-z]*$,,')" +%s)"
- 
- # Ignore QEMU bug
- if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then
--- 
-2.14.3
-

0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch

@@ -1,72 +0,0 @@
-From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 21:24:05 +0300
-Subject: [PATCH 005/198] Don't retrieve fstime when it's not useful.
-
----
- tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
-index 4515d165e..bf47305f3 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -1328,31 +1328,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
- 		    ;;
- 	    esac
- 
--	    case x$fs in
--		xiso9660 | xziso9660 | xrockridge | xjoliet | xrockridge_joliet | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999)
--		    FSTIME="$(date -d "$(echo ${FSUUID} | awk -F - '{ print $1"-"$2"-"$3" "$4":"$5":"$6 ;}')" '+%Y-%m-%d %H:%M:%S')";;
--		xlvm*|xmdraid*)
--		    # With some abstractions like mdraid flushing to disk
--		    # may be delayed for a long time.
--		    FSTIME="$UMOUNT_TIME";;
--		*)
--		    FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGEP}0.img"|awk '{print $6; }'|sed 's,_, ,g')";;
--	    esac
--	    # With some abstractions like mdraid computing of UMOUNT_TIME
--	    # is not precise. Account for small difference here.
--	    FSTIMEM1="$(date -d "$FSTIME UTC -1 second" -u "+%Y-%m-%d %H:%M:%S")"
--	    FSTIMEM2="$(date -d "$FSTIME UTC -2 second" -u "+%Y-%m-%d %H:%M:%S")"
--	    FSTIMEM3="$(date -d "$FSTIME UTC -3 second" -u "+%Y-%m-%d %H:%M:%S")"
-+	    if [ x$NOFSTIME != xy ]; then
-+		case x$fs in
-+		    xiso9660 | xziso9660 | xrockridge | xjoliet | xrockridge_joliet | xiso9660_1999 | xrockridge_1999 | xjoliet_1999 | xrockridge_joliet_1999)
-+			FSTIME="$(date -d "$(echo ${FSUUID} | awk -F - '{ print $1"-"$2"-"$3" "$4":"$5":"$6 ;}')" '+%Y-%m-%d %H:%M:%S')";;
-+		    xlvm*|xmdraid*)
-+			# With some abstractions like mdraid flushing to disk
-+			# may be delayed for a long time.
-+			FSTIME="$UMOUNT_TIME";;
-+		    *)
-+			FSTIME="$(TZ=UTC ls --time-style="+%Y-%m-%d_%H:%M:%S" -l -d "${FSIMAGEP}0.img"|awk '{print $6; }'|sed 's,_, ,g')";;
-+		esac
-+		# With some abstractions like mdraid computing of UMOUNT_TIME
-+		# is not precise. Account for small difference here.
-+		FSTIMEM1="$(date -d "$FSTIME UTC -1 second" -u "+%Y-%m-%d %H:%M:%S")"
-+		FSTIMEM2="$(date -d "$FSTIME UTC -2 second" -u "+%Y-%m-%d %H:%M:%S")"
-+		FSTIMEM3="$(date -d "$FSTIME UTC -3 second" -u "+%Y-%m-%d %H:%M:%S")"
- 
--	    if [ x$NOFSTIME = xy ]; then
--		:
--	    elif echo "$LSOUT" | grep -F 'Last modification time '"$FSTIME" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM1" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM2" || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM3" > /dev/null; then
--		:
--	    else
--		echo FSTIME FAIL
--		echo "$FSTIME"
--		echo "$LSOUT"
--		exit 1
-+		if echo "$LSOUT" | grep -F 'Last modification time '"$FSTIME" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM1" > /dev/null || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM2" || echo "$LSOUT" | grep -F 'Last modification time '"$FSTIMEM3" > /dev/null; then
-+		    :
-+		else
-+		    echo FSTIME FAIL
-+		    echo "$FSTIME"
-+		    echo "$LSOUT"
-+		    exit 1
-+		fi
- 	    fi
- 
- 	    if [ x$NOHARDLINK != xy ]; then
--- 
-2.14.3
-

0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -1,20 +1,20 @@
-From a59984e248881a8c47d0c6035ce3dc062fa2113f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 153/198] Make any of the loaders that link in efi mode honor
- secure boot.
+Subject: [PATCH] Make any of the loaders that link in efi mode honor secure
+ boot.
 
 And in this case "honor" means "even if somebody does link this in, they
 won't register commands if SB is enabled."
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/Makefile.am              |  1 +
  grub-core/Makefile.core.def        |  1 +
  grub-core/commands/iorw.c          |  7 +++++
  grub-core/commands/memrw.c         |  7 +++++
- grub-core/kern/efi/efi.c           | 28 ------------------
- grub-core/kern/efi/sb.c            | 58 ++++++++++++++++++++++++++++++++++++++
+ grub-core/kern/dl.c                |  1 +
+ grub-core/kern/efi/efi.c           | 34 --------------------
+ grub-core/kern/efi/sb.c            | 64 ++++++++++++++++++++++++++++++++++++++
  grub-core/loader/efi/appleloader.c |  7 +++++
  grub-core/loader/efi/chainloader.c |  1 +
  grub-core/loader/i386/bsd.c        |  7 +++++
@@ -23,12 +23,13 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/loader/multiboot.c       |  7 +++++
  grub-core/loader/xnu.c             |  7 +++++
  include/grub/efi/efi.h             |  1 -
- include/grub/efi/sb.h              | 29 +++++++++++++++++++
+ include/grub/efi/sb.h              | 29 +++++++++++++++++
  include/grub/ia64/linux.h          |  0
  include/grub/mips/linux.h          |  0
  include/grub/powerpc/linux.h       |  0
  include/grub/sparc64/linux.h       |  0
- 19 files changed, 146 insertions(+), 29 deletions(-)
+ grub-core/Makefile.am              |  1 +
+ 20 files changed, 153 insertions(+), 35 deletions(-)
  create mode 100644 grub-core/kern/efi/sb.c
  create mode 100644 include/grub/efi/sb.h
  create mode 100644 include/grub/ia64/linux.h
@@ -36,23 +37,11 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 include/grub/powerpc/linux.h
  create mode 100644 include/grub/sparc64/linux.h
 
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 104513847..f7b4d29b0 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 4857a1e5f..75a7ab344 100644
+index 0b4b0c2122d..e92a7ef322f 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -196,6 +196,7 @@ kernel = {
+@@ -195,6 +195,7 @@ kernel = {
    i386_multiboot = kern/i386/pc/acpi.c;
    i386_coreboot = kern/acpi.c;
    i386_multiboot = kern/acpi.c;
@@ -61,7 +50,7 @@ index 4857a1e5f..75a7ab344 100644
    x86 = kern/i386/tsc.c;
    x86 = kern/i386/tsc_pit.c;
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54..41a7f3f04 100644
+index a0c164e54f0..41a7f3f0466 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -23,6 +23,7 @@
@@ -93,7 +82,7 @@ index a0c164e54..41a7f3f04 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index 98769eadb..088cbe9e2 100644
+index 98769eadb34..088cbe9e2bc 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
 @@ -22,6 +22,7 @@
@@ -124,11 +113,23 @@ index 98769eadb..088cbe9e2 100644
    grub_unregister_extcmd (cmd_read_byte);
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
+diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
+index 04e804d1668..621070918d4 100644
+--- a/grub-core/kern/dl.c
++++ b/grub-core/kern/dl.c
+@@ -32,6 +32,7 @@
+ #include <grub/env.h>
+ #include <grub/cache.h>
+ #include <grub/i18n.h>
++#include <grub/efi/sb.h>
+ 
+ /* Platforms where modules are in a readonly area of memory.  */
+ #if defined(GRUB_MACHINE_QEMU)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 2588b481e..684ca93f8 100644
+index 91129e33566..708581fcbde 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -269,34 +269,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
+@@ -273,40 +273,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
    return NULL;
  }
  
@@ -142,14 +143,20 @@ index 2588b481e..684ca93f8 100644
 -  grub_efi_boolean_t ret = 0;
 -
 -  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
--
 -  if (datasize != 1 || !secure_boot)
+-    {
+-      grub_dprintf ("secureboot", "No SecureBoot variable\n");
 -      goto out;
+-    }
+-  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
 -
 -  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
--
 -  if (datasize != 1 || !setup_mode)
+-    {
+-      grub_dprintf ("secureboot", "No SetupMode variable\n");
 -      goto out;
+-    }
+-  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
 -
 -  if (*secure_boot && !*setup_mode)
 -    ret = 1;
@@ -165,10 +172,10 @@ index 2588b481e..684ca93f8 100644
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
 new file mode 100644
-index 000000000..a41b6c5b8
+index 00000000000..d74778b0cac
 --- /dev/null
 +++ b/grub-core/kern/efi/sb.c
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,64 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2014 Free Software Foundation, Inc.
@@ -207,14 +214,20 @@ index 000000000..a41b6c5b8
 +  grub_efi_boolean_t ret = 0;
 +
 +  secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
-+
 +  if (datasize != 1 || !secure_boot)
++    {
++      grub_dprintf ("secureboot", "No SecureBoot variable\n");
 +      goto out;
++    }
++  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
 +
 +  setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
-+
 +  if (datasize != 1 || !setup_mode)
++    {
++      grub_dprintf ("secureboot", "No SetupMode variable\n");
 +      goto out;
++    }
++  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
 +
 +  if (*secure_boot && !*setup_mode)
 +    ret = 1;
@@ -228,7 +241,7 @@ index 000000000..a41b6c5b8
 +#endif
 +}
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463..69c2a10d3 100644
+index 74888c463ba..69c2a10d351 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
 @@ -24,6 +24,7 @@
@@ -259,7 +272,7 @@ index 74888c463..69c2a10d3 100644
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 87a91e16f..aee8e6bec 100644
+index af2189619a3..5cd9b6e08a8 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -34,6 +34,7 @@
@@ -271,7 +284,7 @@ index 87a91e16f..aee8e6bec 100644
  #include <grub/i18n.h>
  #include <grub/net.h>
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 7f96515da..87709aa23 100644
+index 7f96515da65..87709aa23e8 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -38,6 +38,7 @@
@@ -303,7 +316,7 @@ index 7f96515da..87709aa23 100644
    grub_unregister_extcmd (cmd_openbsd);
    grub_unregister_extcmd (cmd_netbsd);
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 083f9417c..b2438547d 100644
+index f7186be4002..c84747ea857 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -35,6 +35,7 @@
@@ -314,7 +327,7 @@ index 083f9417c..b2438547d 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -1139,6 +1140,9 @@ static grub_command_t cmd_linux, cmd_initrd;
+@@ -1156,6 +1157,9 @@ static grub_command_t cmd_linux, cmd_initrd;
  
  GRUB_MOD_INIT(linux)
  {
@@ -324,7 +337,7 @@ index 083f9417c..b2438547d 100644
    cmd_linux = grub_register_command ("linux", grub_cmd_linux,
  				     0, N_("Load Linux."));
    cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-@@ -1148,6 +1152,9 @@ GRUB_MOD_INIT(linux)
+@@ -1165,6 +1169,9 @@ GRUB_MOD_INIT(linux)
  
  GRUB_MOD_FINI(linux)
  {
@@ -335,7 +348,7 @@ index 083f9417c..b2438547d 100644
    grub_unregister_command (cmd_initrd);
  }
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index a293b17aa..91283157e 100644
+index caa76bee8af..783a3cd93bc 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -35,6 +35,7 @@
@@ -346,7 +359,7 @@ index a293b17aa..91283157e 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -472,6 +473,9 @@ static grub_command_t cmd_linux, cmd_initrd;
+@@ -480,6 +481,9 @@ static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16;
  
  GRUB_MOD_INIT(linux16)
  {
@@ -354,9 +367,9 @@ index a293b17aa..91283157e 100644
 +    return;
 +
    cmd_linux =
-     grub_register_command ("linux16", grub_cmd_linux,
+     grub_register_command ("linux", grub_cmd_linux,
  			   0, N_("Load Linux."));
-@@ -483,6 +487,9 @@ GRUB_MOD_INIT(linux16)
+@@ -497,6 +501,9 @@ GRUB_MOD_INIT(linux16)
  
  GRUB_MOD_FINI(linux16)
  {
@@ -364,13 +377,13 @@ index a293b17aa..91283157e 100644
 +    return;
 +
    grub_unregister_command (cmd_linux);
+   grub_unregister_command (cmd_linux16);
    grub_unregister_command (cmd_initrd);
- }
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index bd9d5b3e6..fb044a60c 100644
+index 40c67e82489..26df46a4161 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
-@@ -42,6 +42,7 @@
+@@ -50,6 +50,7 @@
  #include <grub/video.h>
  #include <grub/memory.h>
  #include <grub/i18n.h>
@@ -378,7 +391,7 @@ index bd9d5b3e6..fb044a60c 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -431,6 +432,9 @@ static grub_command_t cmd_multiboot, cmd_module;
+@@ -446,6 +447,9 @@ static grub_command_t cmd_multiboot, cmd_module;
  
  GRUB_MOD_INIT(multiboot)
  {
@@ -388,7 +401,7 @@ index bd9d5b3e6..fb044a60c 100644
    cmd_multiboot =
  #ifdef GRUB_USE_MULTIBOOT2
      grub_register_command ("multiboot2", grub_cmd_multiboot,
-@@ -451,6 +455,9 @@ GRUB_MOD_INIT(multiboot)
+@@ -466,6 +470,9 @@ GRUB_MOD_INIT(multiboot)
  
  GRUB_MOD_FINI(multiboot)
  {
@@ -399,7 +412,7 @@ index bd9d5b3e6..fb044a60c 100644
    grub_unregister_command (cmd_module);
  }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index c9885b1bc..df8dfdb4b 100644
+index c9885b1bcd7..df8dfdb4ba0 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -33,6 +33,7 @@
@@ -431,10 +444,10 @@ index c9885b1bc..df8dfdb4b 100644
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index bb3ab7dfd..91e29ce66 100644
+index 1061aee9726..39480b38674 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
-@@ -83,7 +83,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
+@@ -85,7 +85,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
  				     const grub_efi_guid_t *guid,
  				     void *data,
  				     grub_size_t datasize);
@@ -444,7 +457,7 @@ index bb3ab7dfd..91e29ce66 100644
  					     const grub_efi_device_path_t *dp2);
 diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h
 new file mode 100644
-index 000000000..9629fbb0f
+index 00000000000..9629fbb0f9e
 --- /dev/null
 +++ b/include/grub/efi/sb.h
 @@ -0,0 +1,29 @@
@@ -479,16 +492,25 @@ index 000000000..9629fbb0f
 +#endif /* ! GRUB_EFI_SB_HEADER */
 diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 00000000000..e69de29bb2d
 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
--- 
-2.14.3
-
+index 00000000000..e69de29bb2d
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index f4ff62b769a..9c69aa88626 100644
+--- a/grub-core/Makefile.am
++++ b/grub-core/Makefile.am
+@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h

0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch

@@ -1,22 +1,22 @@
-From 7f34f8d670e4dccf341de5acf388cfa79c7361fd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Feb 2017 16:18:54 -0500
-Subject: [PATCH 166/198] Handle multi-arch (64-on-32) boot in linuxefi loader.
+Subject: [PATCH] Handle multi-arch (64-on-32) boot in linuxefi loader.
 
 Allow booting 64-bit kernels on 32-bit EFI on x86.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
- grub-core/loader/efi/linux.c      |   9 ++-
- grub-core/loader/i386/efi/linux.c | 114 +++++++++++++++++++++++++++-----------
+ grub-core/loader/efi/linux.c      |   9 +++-
+ grub-core/loader/i386/efi/linux.c | 110 ++++++++++++++++++++++++++------------
  include/grub/i386/linux.h         |   7 ++-
- 3 files changed, 95 insertions(+), 35 deletions(-)
+ 3 files changed, 89 insertions(+), 37 deletions(-)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 8890bdf05..2a7024134 100644
+index c8ecce6dfd0..0622dfa48d4 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
-@@ -56,12 +56,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
+@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
  
  grub_err_t
@@ -37,7 +37,7 @@ index 8890bdf05..2a7024134 100644
  
    return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 8b5a817b9..bed5919ca 100644
+index 8db228c5bf5..800c3e54022 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -44,14 +44,10 @@ static char *linux_cmdline;
@@ -57,16 +57,7 @@ index 8b5a817b9..bed5919ca 100644
  			      params);
  }
  
-@@ -119,6 +115,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-       goto fail;
-     }
- 
-+  grub_dprintf ("linuxefi", "initrd_mem = %lx\n", (unsigned long) initrd_mem);
-+
-   params->ramdisk_size = size;
-   params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
- 
-@@ -153,14 +151,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+@@ -154,14 +150,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_errno;
  }
  
@@ -81,14 +72,15 @@ index 8b5a817b9..bed5919ca 100644
  {
    grub_file_t file = 0;
 -  struct linux_kernel_header lh;
-+  struct linux_kernel_header *lh;
-   grub_ssize_t len, start, filelen;
+-  grub_ssize_t len, start, filelen;
++  struct linux_i386_kernel_header *lh = NULL;
++  grub_ssize_t start, filelen;
    void *kernel = NULL;
 +  int setup_header_end_offset;
    int rc;
  
    grub_dl_ref (my_mod);
-@@ -200,69 +204,107 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -201,48 +203,79 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
@@ -102,26 +94,27 @@ index 8b5a817b9..bed5919ca 100644
        goto fail;
      }
  
+-  grub_dprintf ("linux", "params = %lx\n", (unsigned long) params);
++  grub_dprintf ("linux", "params = %p\n", params);
+ 
 -  grub_memset (params, 0, 16384);
--
++  grub_memset (params, 0, sizeof(*params));
+ 
 -  grub_memcpy (&lh, kernel, sizeof (lh));
 -
 -  if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
-+  grub_dprintf ("linuxefi", "params = %p\n", (unsigned long) params);
-+
-+  grub_memset (params, 0, sizeof(*params));
-+
 +  setup_header_end_offset = *((grub_uint8_t *)kernel + 0x201);
-+  grub_dprintf ("linuxefi", "copying %d bytes from %p to %p\n",
-+		MIN(0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1,
++  grub_dprintf ("linux", "copying %lu bytes from %p to %p\n",
++		MIN((grub_size_t)0x202+setup_header_end_offset,
++		    sizeof (*params)) - 0x1f1,
 +		(grub_uint8_t *)kernel + 0x1f1,
 +		(grub_uint8_t *)params + 0x1f1);
 +  grub_memcpy ((grub_uint8_t *)params + 0x1f1,
 +	       (grub_uint8_t *)kernel + 0x1f1,
-+		MIN(0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1);
-+  lh = (struct linux_kernel_header *)params;
-+  grub_dprintf ("linuxefi", "lh is at %p\n", lh);
-+  grub_dprintf ("linuxefi", "checking lh->boot_flag\n");
++		MIN((grub_size_t)0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1);
++  lh = (struct linux_i386_kernel_header *)params;
++  grub_dprintf ("linux", "lh is at %p\n", lh);
++  grub_dprintf ("linux", "checking lh->boot_flag\n");
 +  if (lh->boot_flag != grub_cpu_to_le16 (0xaa55))
      {
        grub_error (GRUB_ERR_BAD_OS, N_("invalid magic number"));
@@ -129,7 +122,7 @@ index 8b5a817b9..bed5919ca 100644
      }
  
 -  if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
-+  grub_dprintf ("linuxefi", "checking lh->setup_sects\n");
++  grub_dprintf ("linux", "checking lh->setup_sects\n");
 +  if (lh->setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
      {
        grub_error (GRUB_ERR_BAD_OS, N_("too many setup sectors"));
@@ -137,7 +130,7 @@ index 8b5a817b9..bed5919ca 100644
      }
  
 -  if (lh.version < grub_cpu_to_le16 (0x020b))
-+  grub_dprintf ("linuxefi", "checking lh->version\n");
++  grub_dprintf ("linux", "checking lh->version\n");
 +  if (lh->version < grub_cpu_to_le16 (0x020b))
      {
        grub_error (GRUB_ERR_BAD_OS, N_("kernel too old"));
@@ -145,17 +138,15 @@ index 8b5a817b9..bed5919ca 100644
      }
  
 -  if (!lh.handover_offset)
-+  grub_dprintf ("linuxefi", "checking lh->handover_offset\n");
++  grub_dprintf ("linux", "checking lh->handover_offset\n");
 +  if (!lh->handover_offset)
      {
        grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support EFI handover"));
        goto fail;
      }
  
--  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
--					 BYTES_TO_PAGES(lh.cmdline_size + 1));
 +#if defined(__x86_64__) || defined(__aarch64__)
-+  grub_dprintf ("linuxefi", "checking lh->xloadflags\n");
++  grub_dprintf ("linux", "checking lh->xloadflags\n");
 +  if (!(lh->xloadflags & LINUX_XLF_KERNEL_64))
 +    {
 +      grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support 64-bit CPUs"));
@@ -172,19 +163,16 @@ index 8b5a817b9..bed5919ca 100644
 +      goto fail;
 +    }
 +#endif
- 
-+  grub_dprintf ("linuxefi", "setting up cmdline\n");
-+  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
++
+   grub_dprintf ("linux", "setting up cmdline\n");
+   linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
+-					 BYTES_TO_PAGES(lh.cmdline_size + 1));
+-
 +					 BYTES_TO_PAGES(lh->cmdline_size + 1));
    if (!linux_cmdline)
      {
        grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
-       goto fail;
-     }
- 
-+  grub_dprintf ("linuxefi", "linux_cmdline = %lx\n",
-+		(unsigned long)linux_cmdline);
-+
+@@ -255,21 +288,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
    grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
    grub_create_loader_cmdline (argc, argv,
                                linux_cmdline + sizeof (LINUX_IMAGE) - 1,
@@ -192,18 +180,19 @@ index 8b5a817b9..bed5919ca 100644
 +			      lh->cmdline_size - (sizeof (LINUX_IMAGE) - 1));
  
 -  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
-+  grub_dprintf ("linuxefi", "setting lh->cmd_line_ptr\n");
++  grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
++  grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
 +  lh->cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
  
 -  handover_offset = lh.handover_offset;
-+  grub_dprintf ("linuxefi", "computing handover offset\n");
++  grub_dprintf ("linux", "computing handover offset\n");
 +  handover_offset = lh->handover_offset;
  
 -  start = (lh.setup_sects + 1) * 512;
+-  len = grub_file_size(file) - start;
 +  start = (lh->setup_sects + 1) * 512;
-   len = grub_file_size(file) - start;
  
--  kernel_mem = grub_efi_allocate_pages(lh.pref_address,
+-  kernel_mem = grub_efi_allocate_pages_max(lh.pref_address,
 -					   BYTES_TO_PAGES(lh.init_size));
 +  kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
 +					   BYTES_TO_PAGES(lh->init_size));
@@ -215,16 +204,16 @@ index 8b5a817b9..bed5919ca 100644
  
    if (!kernel_mem)
      {
-@@ -270,17 +312,25 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+@@ -277,14 +312,21 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
        goto fail;
      }
  
 -  grub_memcpy (kernel_mem, (char *)kernel + start, len);
-+  grub_dprintf ("linuxefi", "kernel_mem = %lx\n", (unsigned long) kernel_mem);
++  grub_dprintf ("linux", "kernel_mem = %lx\n", (unsigned long) kernel_mem);
 +
    grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
    loaded=1;
-+  grub_dprintf ("linuxefi", "setting lh->code32_start to %p\n", kernel_mem);
++  grub_dprintf ("linux", "setting lh->code32_start to %p\n", kernel_mem);
 +  lh->code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
  
 -  lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
@@ -232,22 +221,21 @@ index 8b5a817b9..bed5919ca 100644
 +  grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
  
 -  params->type_of_loader = 0x21;
-+  grub_dprintf ("linuxefi", "setting lh->type_of_loader\n");
++  grub_dprintf ("linux", "setting lh->type_of_loader\n");
 +  lh->type_of_loader = 0x6;
- 
-- fail:
-+  grub_dprintf ("linuxefi", "setting lh->ext_loader_{type,ver}\n");
++
++  grub_dprintf ("linux", "setting lh->ext_loader_{type,ver}\n");
 +  params->ext_loader_type = 0;
 +  params->ext_loader_ver = 2;
-+  grub_dprintf("linuxefi", "kernel_mem: %p handover_offset: %08x\n",
-+	       kernel_mem, handover_offset);
+   grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
+ 	       kernel_mem, handover_offset);
  
-+ fail:
-   if (file)
-     grub_file_close (file);
+@@ -301,10 +343,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+       loaded = 0;
+     }
  
-@@ -296,7 +346,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   if (linux_cmdline && !loaded)
+-  if (linux_cmdline && !loaded)
++  if (linux_cmdline && lh && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
  			 linux_cmdline,
 -			 BYTES_TO_PAGES(lh.cmdline_size + 1));
@@ -256,10 +244,10 @@ index 8b5a817b9..bed5919ca 100644
    if (kernel_mem && !loaded)
      grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index fc36bdaf3..110ecf806 100644
+index bb19dbd5a77..8474a857ed2 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
-@@ -130,7 +130,12 @@ struct linux_kernel_header
+@@ -133,7 +133,12 @@ struct linux_i386_kernel_header
    grub_uint32_t kernel_alignment;
    grub_uint8_t relocatable;
    grub_uint8_t min_alignment;
@@ -273,6 +261,3 @@ index fc36bdaf3..110ecf806 100644
    grub_uint32_t cmdline_size;
    grub_uint32_t hardware_subarch;
    grub_uint64_t hardware_subarch_data;
--- 
-2.14.3
-

0006-Support-lseek64.patch

@@ -1,54 +0,0 @@
-From 608bec51128008afb81c9e3f297283e9f830a146 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 20:21:05 +0300
-Subject: [PATCH 006/198] Support lseek64.
-
-Android doesn't have 64-bit off_t, so use off64_t instead.
----
- configure.ac                    | 5 ++++-
- grub-core/osdep/unix/hostdisk.c | 8 ++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d10d8adac..e0262e159 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -373,7 +373,10 @@ case "$host_os" in
-      ;;
-   *)
-      AC_CHECK_SIZEOF(off_t)
--     test x"$ac_cv_sizeof_off_t" = x8 || AC_MSG_ERROR([Large file support is required]);;
-+     if test x"$ac_cv_sizeof_off_t" != x8 ; then
-+       AC_CHECK_SIZEOF(off64_t)
-+       test x"$ac_cv_sizeof_off64_t" = x8 || AC_MSG_ERROR([Large file support is required])
-+     fi;;
- esac
- 
- if test x$USE_NLS = xno; then
-diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c
-index 2a8c5882e..5450cf416 100644
---- a/grub-core/osdep/unix/hostdisk.c
-+++ b/grub-core/osdep/unix/hostdisk.c
-@@ -77,11 +77,19 @@ grub_util_get_fd_size (grub_util_fd_t fd, const char *name, unsigned *log_secsiz
- int
- grub_util_fd_seek (grub_util_fd_t fd, grub_uint64_t off)
- {
-+#if SIZEOF_OFF_T == 8
-   off_t offset = (off_t) off;
- 
-   if (lseek (fd, offset, SEEK_SET) != offset)
-     return -1;
-+#elif SIZEOF_OFF64_T == 8
-+  off64_t offset = (off64_t) off;
- 
-+  if (lseek64 (fd, offset, SEEK_SET) != offset)
-+    return -1;
-+#else
-+#error "No large file support"
-+#endif
-   return 0;
- }
- 
--- 
-2.14.3
-

0007-Use-SHELL-rather-than-bin-sh.patch

@@ -1,26 +0,0 @@
-From c2ea443446b7feea868e54f94a87781f69820375 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 00:55:30 +0300
-Subject: [PATCH 007/198] Use $(SHELL) rather than /bin/sh.
-
-/bin/sh doesn't exist under termux.
----
- grub-core/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 04e9395fd..809a8aa26 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -278,7 +278,7 @@ BUILT_SOURCES += symlist.h
- 
- symlist.c: symlist.h gensymlist.sh
- 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
--	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
-+	cat symlist.p | $(SHELL) $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
- 	rm -f symlist.p
- CLEANFILES += symlist.c
- BUILT_SOURCES += symlist.c
--- 
-2.14.3
-

0007-re-write-.gitignore.patch

@@ -1,10 +1,10 @@
-From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 8 Aug 2017 12:48:04 -0400
-Subject: [PATCH 065/198] re-write .gitignore
+Subject: [PATCH] re-write .gitignore
 
 ---
- .gitignore                        | 352 ++++++++++++--------------------------
+ .gitignore                        | 357 +++++++++++++-------------------------
  build-aux/.gitignore              |   9 +
  docs/.gitignore                   |   4 +
  grub-core/.gitignore              |  15 ++
@@ -13,7 +13,7 @@ Subject: [PATCH 065/198] re-write .gitignore
  include/grub/gcrypt/.gitignore    |   2 +
  po/.gitignore                     |   4 +
  util/bash-completion.d/.gitignore |   1 +
- 9 files changed, 170 insertions(+), 240 deletions(-)
+ 9 files changed, 175 insertions(+), 240 deletions(-)
  create mode 100644 build-aux/.gitignore
  create mode 100644 docs/.gitignore
  create mode 100644 grub-core/.gitignore
@@ -24,10 +24,10 @@ Subject: [PATCH 065/198] re-write .gitignore
  create mode 100644 util/bash-completion.d/.gitignore
 
 diff --git a/.gitignore b/.gitignore
-index eca17bec9..d95fac578 100644
+index eca17bec9b8..43f04d47277 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -1,249 +1,121 @@
+@@ -1,249 +1,126 @@
 -00_header
 -10_*
 -20_linux_xen
@@ -78,6 +78,7 @@ index eca17bec9..d95fac578 100644
 +# things very common editors create that we never want
 +*~
 +.*.sw?
++*.patch
 +
 +# built objects across the whole tree
 +Makefile.in
@@ -319,6 +320,9 @@ index eca17bec9..d95fac578 100644
 +
 +# stuff "make" creates
 +/[[:digit:]][[:digit:]]_?*
++/ascii.h
++/build-grub-gen-asciih
++/build-grub-gen-widthspec
 +/build-grub-mkfont
 +/config-util.h.in
  /garbage-gen
@@ -389,9 +393,10 @@ index eca17bec9..d95fac578 100644
 +/libgrub_a_init.c
 +/libgrub_a_init.lst
 +/stamp-h.in
++/widthspec.h
 diff --git a/build-aux/.gitignore b/build-aux/.gitignore
 new file mode 100644
-index 000000000..f2f17aab9
+index 00000000000..f2f17aab9ff
 --- /dev/null
 +++ b/build-aux/.gitignore
 @@ -0,0 +1,9 @@
@@ -406,7 +411,7 @@ index 000000000..f2f17aab9
 +/texinfo.tex
 diff --git a/docs/.gitignore b/docs/.gitignore
 new file mode 100644
-index 000000000..91aee84d3
+index 00000000000..91aee84d3e9
 --- /dev/null
 +++ b/docs/.gitignore
 @@ -0,0 +1,4 @@
@@ -416,7 +421,7 @@ index 000000000..91aee84d3
 +/version*.texi
 diff --git a/grub-core/.gitignore b/grub-core/.gitignore
 new file mode 100644
-index 000000000..c738ac6c6
+index 00000000000..c738ac6c649
 --- /dev/null
 +++ b/grub-core/.gitignore
 @@ -0,0 +1,15 @@
@@ -437,7 +442,7 @@ index 000000000..c738ac6c6
 +/trigtables.c
 diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore
 new file mode 100644
-index 000000000..29e199c2d
+index 00000000000..29e199c2db4
 --- /dev/null
 +++ b/grub-core/gnulib/.gitignore
 @@ -0,0 +1,22 @@
@@ -465,14 +470,14 @@ index 000000000..29e199c2d
 +/wctype.h
 diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
 new file mode 100644
-index 000000000..681545914
+index 00000000000..68154591404
 --- /dev/null
 +++ b/grub-core/lib/.gitignore
 @@ -0,0 +1 @@
 +/libgcrypt-grub/
 diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
 new file mode 100644
-index 000000000..8fbf56462
+index 00000000000..8fbf5646246
 --- /dev/null
 +++ b/include/grub/gcrypt/.gitignore
 @@ -0,0 +1,2 @@
@@ -480,7 +485,7 @@ index 000000000..8fbf56462
 +gcrypt.h
 diff --git a/po/.gitignore b/po/.gitignore
 new file mode 100644
-index 000000000..97b679c31
+index 00000000000..97b679c3138
 --- /dev/null
 +++ b/po/.gitignore
 @@ -0,0 +1,4 @@
@@ -490,11 +495,8 @@ index 000000000..97b679c31
 +/stamp-po
 diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
 new file mode 100644
-index 000000000..b7e1eb124
+index 00000000000..b7e1eb12428
 --- /dev/null
 +++ b/util/bash-completion.d/.gitignore
 @@ -0,0 +1 @@
 +grub
--- 
-2.14.3
-

0008-IBM-client-architecture-CAS-reboot-support.patch

@@ -1,7 +1,7 @@
-From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 066/198] IBM client architecture (CAS) reboot support
+Subject: [PATCH] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -18,20 +18,21 @@ Instead of return to the GRUB menu, it will check if the flag for CAS reboot is
 set. If so, grub will automatically boot the last booted kernel using the same
 parameters
 ---
- grub-core/kern/ieee1275/openfw.c | 62 ++++++++++++++++++++++++++++++++++++++++
+ grub-core/kern/ieee1275/openfw.c | 63 ++++++++++++++++++++++++++++++++++++++++
  grub-core/normal/main.c          | 19 ++++++++++++
  grub-core/script/execute.c       |  7 +++++
  include/grub/ieee1275/ieee1275.h |  2 ++
- 4 files changed, 90 insertions(+)
+ 4 files changed, 91 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index ddb778340..6db8b9865 100644
+index 62929d983bf..2d53c0e8608 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
-@@ -561,3 +561,65 @@ grub_ieee1275_canonicalise_devname (const char *path)
-   return NULL;
- }
+@@ -588,3 +588,66 @@ grub_ieee1275_get_boot_dev (void)
  
+   return bootpath;
+ }
++
 +/* Check if it's a CAS reboot. If so, set the script to be executed.  */
 +int
 +grub_ieee1275_cas_reboot (char *script)
@@ -95,7 +96,7 @@ index ddb778340..6db8b9865 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8bf..249e19bc7 100644
+index 78a70a8bf47..249e19bc788 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -33,6 +33,9 @@
@@ -132,7 +133,7 @@ index 78a70a8bf..249e19bc7 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a8502d907..ab78ca87f 100644
+index a8502d90711..ab78ca87f90 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -27,6 +27,9 @@
@@ -157,18 +158,15 @@ index a8502d907..ab78ca87f 100644
      {
        char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 8e4251303..9f26c69a2 100644
+index 8868f3a756f..2310f33dbc2 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
-@@ -234,6 +234,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
+@@ -252,6 +252,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
  void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias *alias);
  void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath,
  						struct grub_ieee1275_devalias *alias);
 +int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char *script);
 +int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char *text);
  
- #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
- 
--- 
-2.14.3
+ char *EXPORT_FUNC(grub_ieee1275_get_boot_dev) (void);
  

0008-po-Use-SHELL-rather-than-bin-sh.patch

@@ -1,26 +0,0 @@
-From 4341f82af0b61d3dfbe675670d4105dc759c0df3 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 14:54:03 +0300
-Subject: [PATCH 008/198] po: Use @SHELL@ rather than /bin/sh.
-
-/bin/sh might not exist.
----
- po/Makefile.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/Makefile.in.in b/po/Makefile.in.in
-index 3619458e8..e68e9da84 100644
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -15,7 +15,7 @@ PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- 
--SHELL = /bin/sh
-+SHELL = @SHELL@
- @SET_MAKE@
- 
- srcdir = @srcdir@
--- 
-2.14.3
-

0009-Add-termux-path-to-dict.patch

@@ -1,25 +0,0 @@
-From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 23 Jan 2017 14:52:48 +0300
-Subject: [PATCH 009/198] Add termux path to dict.
-
----
- tests/util/grub-fs-tester.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
-index bf47305f3..468d9e785 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -259,7 +259,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
- 	    MASTER="${tempdir}/master"
- 	    FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
- 	    CFILESRC=
--	    for cand in /usr/share/dict/american-english /usr/share/dict/linux.words; do
-+	    for cand in /usr/share/dict/american-english /usr/share/dict/linux.words /data/data/com.termux/files/usr/share/hunspell/en_US.dic; do
- 		if test -f "$cand" ; then
- 		    CFILESRC="$cand"
- 		    break
--- 
-2.14.3
-

0009-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -1,7 +1,7 @@
-From 070dc282d3cc6602571296e90945df9d4671aecb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 067/198] for ppc, reset console display attr when clear screen
+Subject: [PATCH] for ppc, reset console display attr when clear screen
 
 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa36..29df35e6d 100644
+index d317efa368d..29df35e6d20 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
@@ -27,6 +27,3 @@ index d317efa36..29df35e6d 100644
        data->reverse_video_on  = grub_strdup ("\e[7m");
        data->reverse_video_off = grub_strdup ("\e[m");
        if (grub_strcmp ("ieee1275", str) == 0)
--- 
-2.14.3
-

0010-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -1,7 +1,7 @@
-From 4e31478fdf4cda470305c1bb2acb9b820e790757 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 068/198] Disable GRUB video support for IBM power machines
+Subject: [PATCH] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 3e12e6b24..3e14f5393 100644
+index 3e12e6b24e1..3e14f539368 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
 @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@@ -28,7 +28,7 @@ index 3e12e6b24..3e14f5393 100644
    /* Old Macs have no key repeat, newer ones have fully working one.
       The ones inbetween when repeated key generates an escaoe sequence
 diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
-index 17a3dbbb5..b8e4b3feb 100644
+index 17a3dbbb575..b8e4b3feb32 100644
 --- a/grub-core/video/ieee1275.c
 +++ b/grub-core/video/ieee1275.c
 @@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
@@ -48,7 +48,7 @@ index 17a3dbbb5..b8e4b3feb 100644
  
  GRUB_MOD_FINI(ieee1275_fb)
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 9f26c69a2..ab4f284c3 100644
+index 2310f33dbc2..ca08bd96681 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
 @@ -146,6 +146,8 @@ enum grub_ieee1275_flag
@@ -60,6 +60,3 @@ index 9f26c69a2..ab4f284c3 100644
  };
  
  extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
--- 
-2.14.3
-

0010-Fix-shebang-for-termux.patch

@@ -1,684 +0,0 @@
-From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Sun, 22 Jan 2017 20:22:34 +0300
-Subject: [PATCH 010/198] Fix shebang for termux.
-
-Termux doesn't have a /bin/sh. So we needto use $SHELL.
-Keep /bin/sh as much as possible.
----
- configure.ac                         | 10 ++++++++++
- grub-core/genmod.sh.in               |  2 +-
- grub-core/gensyminfo.sh.in           |  2 +-
- grub-core/modinfo.sh.in              |  2 +-
- tests/ahci_test.in                   |  2 +-
- tests/btrfs_test.in                  |  2 +-
- tests/cdboot_test.in                 |  2 +-
- tests/core_compress_test.in          |  2 +-
- tests/cpio_test.in                   |  2 +-
- tests/ehci_test.in                   |  2 +-
- tests/example_scripted_test.in       |  2 +-
- tests/exfat_test.in                  |  2 +-
- tests/ext234_test.in                 |  2 +-
- tests/fat_test.in                    |  2 +-
- tests/fddboot_test.in                |  2 +-
- tests/file_filter_test.in            |  2 +-
- tests/gettext_strings_test.in        |  2 +-
- tests/grub_cmd_date.in               |  2 +-
- tests/grub_cmd_regexp.in             |  2 +-
- tests/grub_cmd_set_date.in           |  2 +-
- tests/grub_cmd_sleep.in              |  2 +-
- tests/grub_cmd_test.in               |  2 +-
- tests/grub_cmd_tr.in                 |  2 +-
- tests/grub_func_test.in              |  2 +-
- tests/grub_script_blanklines.in      |  2 +-
- tests/grub_script_blockarg.in        |  2 +-
- tests/grub_script_dollar.in          |  2 +-
- tests/grub_script_expansion.in       |  2 +-
- tests/grub_script_final_semicolon.in |  2 +-
- tests/grub_script_no_commands.in     |  2 +-
- tests/gzcompress_test.in             |  2 +-
- tests/hddboot_test.in                |  2 +-
- tests/help_test.in                   |  2 +-
- tests/hfs_test.in                    |  2 +-
- tests/hfsplus_test.in                |  2 +-
- tests/iso9660_test.in                |  2 +-
- tests/jfs_test.in                    |  2 +-
- tests/lzocompress_test.in            |  2 +-
- tests/minixfs_test.in                |  2 +-
- tests/netboot_test.in                |  2 +-
- tests/nilfs2_test.in                 |  2 +-
- tests/ntfs_test.in                   |  2 +-
- tests/ohci_test.in                   |  2 +-
- tests/partmap_test.in                |  2 +-
- tests/pata_test.in                   |  2 +-
- tests/pseries_test.in                |  2 +-
- tests/reiserfs_test.in               |  2 +-
- tests/romfs_test.in                  |  2 +-
- tests/squashfs_test.in               |  2 +-
- tests/syslinux_test.in               |  2 +-
- tests/tar_test.in                    |  2 +-
- tests/test_sha512sum.in              |  2 +-
- tests/udf_test.in                    |  2 +-
- tests/uhci_test.in                   |  2 +-
- tests/util/grub-fs-tester.in         |  2 +-
- tests/util/grub-shell-tester.in      |  2 +-
- tests/util/grub-shell.in             |  2 +-
- tests/xfs_test.in                    |  2 +-
- tests/xzcompress_test.in             |  2 +-
- tests/zfs_test.in                    |  2 +-
- 60 files changed, 69 insertions(+), 59 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e0262e159..ee2c86537 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -459,6 +459,16 @@ case "$build_os" in
- esac
- AC_SUBST(BUILD_EXEEXT)
- 
-+# In some build environments like termux /bin/sh is not a valid
-+# shebang. Use $SHELL instead if it's executable and /bin/sh isn't
-+BUILD_SHEBANG=/bin/sh
-+for she in /bin/sh "$SHELL"; do
-+  if test -x "$she" ; then
-+    BUILD_SHEBANG="$she"
-+  fi
-+done
-+AC_SUBST(BUILD_SHEBANG)
-+
- # For gnulib.
- gl_INIT
- 
-diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
-index 03cc3b7f6..3de06ee01 100644
---- a/grub-core/genmod.sh.in
-+++ b/grub-core/genmod.sh.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Copyright (C) 2010 Free Software Foundation, Inc.
-diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in
-index 2e8716b42..9bc767532 100644
---- a/grub-core/gensyminfo.sh.in
-+++ b/grub-core/gensyminfo.sh.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Copyright (C) 2010 Free Software Foundation, Inc.
-diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in
-index faf0ad30e..f6cd657ce 100644
---- a/grub-core/modinfo.sh.in
-+++ b/grub-core/modinfo.sh.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- # User-controllable options
- grub_modinfo_target_cpu=@target_cpu@
-diff --git a/tests/ahci_test.in b/tests/ahci_test.in
-index 1d01d1f59..7df560462 100644
---- a/tests/ahci_test.in
-+++ b/tests/ahci_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/btrfs_test.in b/tests/btrfs_test.in
-index c55d9477f..2b37ddd33 100644
---- a/tests/btrfs_test.in
-+++ b/tests/btrfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/cdboot_test.in b/tests/cdboot_test.in
-index 1cc901977..75acdfedb 100644
---- a/tests/cdboot_test.in
-+++ b/tests/cdboot_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/core_compress_test.in b/tests/core_compress_test.in
-index 1003587cc..9d216ebcf 100644
---- a/tests/core_compress_test.in
-+++ b/tests/core_compress_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/cpio_test.in b/tests/cpio_test.in
-index 0b09db549..5742cf17b 100644
---- a/tests/cpio_test.in
-+++ b/tests/cpio_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/ehci_test.in b/tests/ehci_test.in
-index 7dd8d3e8f..b197f8cdc 100644
---- a/tests/ehci_test.in
-+++ b/tests/ehci_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/example_scripted_test.in b/tests/example_scripted_test.in
-index 09633e893..783b7f138 100644
---- a/tests/example_scripted_test.in
-+++ b/tests/example_scripted_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- set -e
- 
- true
-diff --git a/tests/exfat_test.in b/tests/exfat_test.in
-index fc1a0fe5e..cd3cd4cb2 100644
---- a/tests/exfat_test.in
-+++ b/tests/exfat_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/ext234_test.in b/tests/ext234_test.in
-index c986960a8..892b99cbd 100644
---- a/tests/ext234_test.in
-+++ b/tests/ext234_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/fat_test.in b/tests/fat_test.in
-index 1d132b517..b6b4748ca 100644
---- a/tests/fat_test.in
-+++ b/tests/fat_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/fddboot_test.in b/tests/fddboot_test.in
-index a59645b7f..2d7dfc889 100644
---- a/tests/fddboot_test.in
-+++ b/tests/fddboot_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in
-index 8909e4021..bfb638227 100644
---- a/tests/file_filter_test.in
-+++ b/tests/file_filter_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2014  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/gettext_strings_test.in b/tests/gettext_strings_test.in
-index 5c305e75b..813999ebe 100644
---- a/tests/gettext_strings_test.in
-+++ b/tests/gettext_strings_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- cd '@srcdir@'
- 
-diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in
-index 60f039ebc..f7c9ca004 100644
---- a/tests/grub_cmd_date.in
-+++ b/tests/grub_cmd_date.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in
-index 7e9ab86aa..6520bd6d7 100644
---- a/tests/grub_cmd_regexp.in
-+++ b/tests/grub_cmd_regexp.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Run GRUB script in a Qemu instance
-diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
-index 2f518dd9e..aac120a6c 100644
---- a/tests/grub_cmd_set_date.in
-+++ b/tests/grub_cmd_set_date.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in
-index ac51d4209..8797f6632 100644
---- a/tests/grub_cmd_sleep.in
-+++ b/tests/grub_cmd_sleep.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in
-index 49ae8a9c8..3399eb292 100644
---- a/tests/grub_cmd_test.in
-+++ b/tests/grub_cmd_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- 
- # create a randome file
- empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
-diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in
-index 0e8d645eb..bed469c03 100644
---- a/tests/grub_cmd_tr.in
-+++ b/tests/grub_cmd_tr.in
-@@ -1,4 +1,4 @@
--#! /bin/sh -e
-+#! @BUILD_SHEBANG@ -e
- 
- # Run GRUB script in a Qemu instance
- # Copyright (C) 2010  Free Software Foundation, Inc.
-diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
-index b32f24466..c67f9e422 100644
---- a/tests/grub_func_test.in
-+++ b/tests/grub_func_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in
-index 89ed763d3..bd8735491 100644
---- a/tests/grub_script_blanklines.in
-+++ b/tests/grub_script_blanklines.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- @builddir@/grub-script-check <<EOF
-diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in
-index 63b60a2ea..6ea9b8c3d 100644
---- a/tests/grub_script_blockarg.in
-+++ b/tests/grub_script_blockarg.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- 
- # Run GRUB script in a Qemu instance
- # Copyright (C) 2010  Free Software Foundation, Inc.
-diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in
-index 2e076427a..392fe2e7a 100644
---- a/tests/grub_script_dollar.in
-+++ b/tests/grub_script_dollar.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- @builddir@/grub-script-check << EOF
-diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
-index 2b7829568..9d0dcdd29 100644
---- a/tests/grub_script_expansion.in
-+++ b/tests/grub_script_expansion.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Run GRUB script in a Qemu instance
-diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in
-index 3ac26540b..f17a9bf95 100644
---- a/tests/grub_script_final_semicolon.in
-+++ b/tests/grub_script_final_semicolon.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- @builddir@/grub-script-check <<EOF
-diff --git a/tests/grub_script_no_commands.in b/tests/grub_script_no_commands.in
-index c31d267e5..996bb1810 100644
---- a/tests/grub_script_no_commands.in
-+++ b/tests/grub_script_no_commands.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # grub-script-check refuses to pass a file with no commands; this usually
-diff --git a/tests/gzcompress_test.in b/tests/gzcompress_test.in
-index 11b6bb208..42c8fe7c4 100644
---- a/tests/gzcompress_test.in
-+++ b/tests/gzcompress_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/hddboot_test.in b/tests/hddboot_test.in
-index c229716a6..6d70847a5 100644
---- a/tests/hddboot_test.in
-+++ b/tests/hddboot_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/help_test.in b/tests/help_test.in
-index aa9645835..b08cf2013 100644
---- a/tests/help_test.in
-+++ b/tests/help_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- . "@builddir@/grub-core/modinfo.sh"
-diff --git a/tests/hfs_test.in b/tests/hfs_test.in
-index e3e88f190..d7ec56bef 100644
---- a/tests/hfs_test.in
-+++ b/tests/hfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/hfsplus_test.in b/tests/hfsplus_test.in
-index f947c4a44..85f1c37dc 100644
---- a/tests/hfsplus_test.in
-+++ b/tests/hfsplus_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/iso9660_test.in b/tests/iso9660_test.in
-index fdcc9e124..571b938d7 100644
---- a/tests/iso9660_test.in
-+++ b/tests/iso9660_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/jfs_test.in b/tests/jfs_test.in
-index c2e5ecedd..6cf7576b3 100644
---- a/tests/jfs_test.in
-+++ b/tests/jfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/lzocompress_test.in b/tests/lzocompress_test.in
-index 41984c254..4e5f7e078 100644
---- a/tests/lzocompress_test.in
-+++ b/tests/lzocompress_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/minixfs_test.in b/tests/minixfs_test.in
-index 1784b1261..3b16a4de0 100644
---- a/tests/minixfs_test.in
-+++ b/tests/minixfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/netboot_test.in b/tests/netboot_test.in
-index c757023d9..9f71e3d88 100644
---- a/tests/netboot_test.in
-+++ b/tests/netboot_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/nilfs2_test.in b/tests/nilfs2_test.in
-index 780b60ec1..ad44d5b33 100644
---- a/tests/nilfs2_test.in
-+++ b/tests/nilfs2_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/ntfs_test.in b/tests/ntfs_test.in
-index e25c6384a..9eb7b01f6 100644
---- a/tests/ntfs_test.in
-+++ b/tests/ntfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/ohci_test.in b/tests/ohci_test.in
-index 7fede6f26..8693f8c47 100644
---- a/tests/ohci_test.in
-+++ b/tests/ohci_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/partmap_test.in b/tests/partmap_test.in
-index f8dc456fb..6ef518b0a 100644
---- a/tests/partmap_test.in
-+++ b/tests/partmap_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Copyright (C) 2010  Free Software Foundation, Inc.
-diff --git a/tests/pata_test.in b/tests/pata_test.in
-index c1d0f63ea..4b18fdef3 100644
---- a/tests/pata_test.in
-+++ b/tests/pata_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/pseries_test.in b/tests/pseries_test.in
-index 226494593..655eb4f3a 100644
---- a/tests/pseries_test.in
-+++ b/tests/pseries_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/reiserfs_test.in b/tests/reiserfs_test.in
-index 678efe7b3..b5fed7635 100644
---- a/tests/reiserfs_test.in
-+++ b/tests/reiserfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/romfs_test.in b/tests/romfs_test.in
-index 83e09315a..98bb50c32 100644
---- a/tests/romfs_test.in
-+++ b/tests/romfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/squashfs_test.in b/tests/squashfs_test.in
-index ec34e0108..2f044f95d 100644
---- a/tests/squashfs_test.in
-+++ b/tests/squashfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/syslinux_test.in b/tests/syslinux_test.in
-index fc4edd8ef..4ea86390e 100644
---- a/tests/syslinux_test.in
-+++ b/tests/syslinux_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/tar_test.in b/tests/tar_test.in
-index 46ba3bce2..6e2f2de8b 100644
---- a/tests/tar_test.in
-+++ b/tests/tar_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in
-index 80ebdc59f..027092a8b 100644
---- a/tests/test_sha512sum.in
-+++ b/tests/test_sha512sum.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- 
- # create a randome file
- file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
-diff --git a/tests/udf_test.in b/tests/udf_test.in
-index fe244e2bd..fb92f0173 100644
---- a/tests/udf_test.in
-+++ b/tests/udf_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/uhci_test.in b/tests/uhci_test.in
-index 89e2c1805..4af72fd8f 100644
---- a/tests/uhci_test.in
-+++ b/tests/uhci_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
-index 468d9e785..88cbe7365 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
-index 5adce0a47..8a87109b1 100644
---- a/tests/util/grub-shell-tester.in
-+++ b/tests/util/grub-shell-tester.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Compares GRUB script output with BASH output.
-diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
-index 814f36c6b..d690d6734 100644
---- a/tests/util/grub-shell.in
-+++ b/tests/util/grub-shell.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- set -e
- 
- # Run GRUB script in a Qemu instance
-diff --git a/tests/xfs_test.in b/tests/xfs_test.in
-index 3807e2e5c..03a351359 100644
---- a/tests/xfs_test.in
-+++ b/tests/xfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
-diff --git a/tests/xzcompress_test.in b/tests/xzcompress_test.in
-index b2bd999ec..03bfb5e95 100644
---- a/tests/xzcompress_test.in
-+++ b/tests/xzcompress_test.in
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! @BUILD_SHEBANG@
- # Copyright (C) 2013  Free Software Foundation, Inc.
- #
- # GRUB is free software: you can redistribute it and/or modify
-diff --git a/tests/zfs_test.in b/tests/zfs_test.in
-index 047120e47..eee62c10d 100644
---- a/tests/zfs_test.in
-+++ b/tests/zfs_test.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@BUILD_SHEBANG@
- 
- set -e
- 
--- 
-2.14.3
-

0011-Add-strtoull-test.patch

@@ -1,28 +0,0 @@
-From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 3 May 2017 12:58:15 +0200
-Subject: [PATCH 011/198] Add strtoull test.
-
----
- grub-core/Makefile.core.def | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 2dfa22a92..8dcd0e5a9 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1961,6 +1961,11 @@ module = {
-   common = tests/example_functional_test.c;
- };
- 
-+module = {
-+  name = strtoull_test;
-+  common = tests/strtoull_test.c;
-+};
-+
- module = {
-   name = setjmp_test;
-   common = tests/setjmp_test.c;
--- 
-2.14.3
-

0011-Honor-a-symlink-when-generating-configuration-by-gru.patch

@@ -1,7 +1,7 @@
-From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 069/198] Honor a symlink when generating configuration by
+Subject: [PATCH] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that
@@ -11,10 +11,10 @@ the -o option follows it rather than overwriting it with a regular file.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8496d28b..3b070fd76 100644
+index 33332360eec..bc5a3f17541 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -276,7 +276,8 @@ and /etc/grub.d/* files or please file a bug report with
+@@ -287,7 +287,8 @@ and /etc/grub.d/* files or please file a bug report with
      exit 1
    else
      # none of the children aborted with error, install the new grub.cfg
@@ -24,6 +24,3 @@ index f8496d28b..3b070fd76 100644
    fi
  fi
  
--- 
-2.14.3
-

0012-Move-bash-completion-script-922997.patch

@@ -1,7 +1,7 @@
-From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 070/198] Move bash completion script (#922997)
+Subject: [PATCH] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---
@@ -10,10 +10,10 @@ Apparently these go in a new place now.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 571f7a0b5..9ae97f026 100644
+index c7888e40f66..783118ccdcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -288,6 +288,14 @@ AC_SUBST(grubdirname)
+@@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
  AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
      [Default grub directory name])
  
@@ -28,7 +28,7 @@ index 571f7a0b5..9ae97f026 100644
  #
  # Checks for build programs.
  #
-@@ -497,6 +505,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
+@@ -498,6 +506,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
  # Check for target programs.
  #
  
@@ -39,7 +39,7 @@ index 571f7a0b5..9ae97f026 100644
  if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
    tmp_ac_tool_prefix="$ac_tool_prefix"
 diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
-index 136287cf1..61108f054 100644
+index 136287cf1bf..61108f05429 100644
 --- a/util/bash-completion.d/Makefile.am
 +++ b/util/bash-completion.d/Makefile.am
 @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
@@ -50,6 +50,3 @@ index 136287cf1..61108f054 100644
  bashcompletion_DATA = $(bash_completion_script)
  
  $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
--- 
-2.14.3
-

0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch

@@ -1,68 +0,0 @@
-From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 10 Aug 2016 17:49:42 +0200
-Subject: [PATCH 012/198] strtoull: Fix behaviour on chars between '9' and 'a'.
-
-Reported by: Aaron Miller <aaronmiller@fb.com>
----
- grub-core/kern/misc.c                 | 13 +++++++------
- grub-core/tests/lib/functional_test.c | 13 +++++++++++--
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index d1a54df6c..3b633d51f 100644
---- a/grub-core/kern/misc.c
-+++ b/grub-core/kern/misc.c
-@@ -391,12 +391,13 @@ grub_strtoull (const char *str, char **end, int base)
-       unsigned long digit;
- 
-       digit = grub_tolower (*str) - '0';
--      if (digit > 9)
--	{
--	  digit += '0' - 'a' + 10;
--	  if (digit >= (unsigned long) base)
--	    break;
--	}
-+      if (digit >= 'a' - '0')
-+	digit += '0' - 'a' + 10;
-+      else if (digit > 9)
-+	break;
-+
-+      if (digit >= (unsigned long) base)
-+	break;
- 
-       found = 1;
- 
-diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
-index d4822a124..96781fb39 100644
---- a/grub-core/tests/lib/functional_test.c
-+++ b/grub-core/tests/lib/functional_test.c
-@@ -26,14 +26,23 @@ GRUB_MOD_LICENSE ("GPLv3+");
- 
- static grub_err_t
- grub_functional_test (grub_extcmd_context_t ctxt __attribute__ ((unused)),
--		      int argc __attribute__ ((unused)),
--		      char **args __attribute__ ((unused)))
-+		      int argc,
-+		      char **args)
- {
-   grub_test_t test;
-   int ok = 1;
-+  int i;
- 
-   FOR_LIST_ELEMENTS (test, grub_test_list)
-     {
-+      if (argc != 0)
-+	{
-+	  for (i = 0; i < argc; i++)
-+	    if (grub_strcmp(args[i], test->name) == 0)
-+	      break;
-+	  if (i == argc)
-+	    continue;
-+	}
-       grub_errno = 0;
-       ok = ok && !grub_test_run (test);
-       grub_errno = 0;
--- 
-2.14.3
-

0013-Add-Virtual-LAN-support.patch

@@ -1,349 +0,0 @@
-From d9f7de0ae3c0c09cff7257c55418450261f3e082 Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Mon, 23 Dec 2013 12:32:02 -0200
-Subject: [PATCH 013/198] Add Virtual LAN support.
-
-This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
-multiple VLANs in a bridged network to share the same physical network link
-but maintain isolation:
-
-http://en.wikipedia.org/wiki/IEEE_802.1Q
-
-* grub-core/net/ethernet.c: Add check, get, and set vlan tag id.
-* grub-core/net/drivers/ieee1275/ofnet.c: Get vlan tag id from bootargs.
-* grub-core/net/arp.c: Add check.
-* grub-core/net/ip.c: Likewise.
-* include/grub/net/arp.h: Add vlantag attribute.
-* include/grub/net/ip.h: Likewise.
----
- grub-core/net/arp.c                    | 12 +++++++--
- grub-core/net/drivers/ieee1275/ofnet.c |  9 ++++++-
- grub-core/net/ethernet.c               | 47 ++++++++++++++++++++++++++++++----
- grub-core/net/ip.c                     | 33 +++++++++++++++++-------
- include/grub/net.h                     |  3 +++
- include/grub/net/arp.h                 |  5 ++--
- include/grub/net/ip.h                  |  3 ++-
- 7 files changed, 92 insertions(+), 20 deletions(-)
-
-diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 4b68c4151..54306e3b1 100644
---- a/grub-core/net/arp.c
-+++ b/grub-core/net/arp.c
-@@ -111,8 +111,8 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
- }
- 
- grub_err_t
--grub_net_arp_receive (struct grub_net_buff *nb,
--		      struct grub_net_card *card)
-+grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
-+                      grub_uint16_t *vlantag)
- {
-   struct arppkt *arp_packet = (struct arppkt *) nb->data;
-   grub_net_network_level_address_t sender_addr, target_addr;
-@@ -138,6 +138,14 @@ grub_net_arp_receive (struct grub_net_buff *nb,
- 
-   FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
-   {
-+    /* Verify vlantag id */
-+    if (inf->card == card && inf->vlantag != *vlantag)
-+      {
-+        grub_dprintf ("net", "invalid vlantag! %x != %x\n",
-+                      inf->vlantag, *vlantag);
-+        break;
-+      }
-+
-     /* Am I the protocol address target? */
-     if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
- 	&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
-diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index a78d164db..002446be1 100644
---- a/grub-core/net/drivers/ieee1275/ofnet.c
-+++ b/grub-core/net/drivers/ieee1275/ofnet.c
-@@ -153,11 +153,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
-   char *comma_char = 0;
-   char *equal_char = 0;
-   grub_size_t field_counter = 0;
--
-   grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
-   grub_net_link_level_address_t hw_addr;
-   grub_net_interface_flags_t flags = 0;
-   struct grub_net_network_level_interface *inter = NULL;
-+  grub_uint16_t vlantag = 0;
- 
-   hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
- 
-@@ -175,6 +175,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
-           *equal_char = 0;
-           grub_env_set_net_property ((*card)->name, args, equal_char + 1,
-                                      grub_strlen(equal_char + 1));
-+
-+          if ((grub_strcmp (args, "vtag") == 0) &&
-+              (grub_strlen (equal_char + 1) == 8))
-+            vlantag = grub_strtoul (equal_char + 1 + 4, 0, 16);
-+
-           *equal_char = '=';
-         }
-       else
-@@ -213,8 +218,10 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
-                                   hw_addr.mac, sizeof(hw_addr.mac), 0);
-       inter = grub_net_add_addr ((*card)->name, *card, &client_addr, &hw_addr,
-                                  flags);
-+      inter->vlantag = vlantag;
-       grub_net_add_ipv4_local (inter,
-                           __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
-+
-     }
- 
-   if (gateway_addr.ipv4 != 0)
-diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
-index c397b1b34..4d7ceed6f 100644
---- a/grub-core/net/ethernet.c
-+++ b/grub-core/net/ethernet.c
-@@ -18,6 +18,7 @@
- 
- #include <grub/misc.h>
- #include <grub/mm.h>
-+#include <grub/env.h>
- #include <grub/net/ethernet.h>
- #include <grub/net/ip.h>
- #include <grub/net/arp.h>
-@@ -56,10 +57,17 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
- {
-   struct etherhdr *eth;
-   grub_err_t err;
-+  grub_uint8_t etherhdr_size;
-+  grub_uint16_t vlantag_id = VLANTAG_IDENTIFIER;
- 
--  COMPILE_TIME_ASSERT (sizeof (*eth) < GRUB_NET_MAX_LINK_HEADER_SIZE);
-+  etherhdr_size = sizeof (*eth);
-+  COMPILE_TIME_ASSERT (sizeof (*eth) + 4 < GRUB_NET_MAX_LINK_HEADER_SIZE);
- 
--  err = grub_netbuff_push (nb, sizeof (*eth));
-+  /* Increase ethernet header in case of vlantag */
-+  if (inf->vlantag != 0)
-+    etherhdr_size += 4;
-+
-+  err = grub_netbuff_push (nb, etherhdr_size);
-   if (err)
-     return err;
-   eth = (struct etherhdr *) nb->data;
-@@ -76,6 +84,19 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
- 	return err;
-       inf->card->opened = 1;
-     }
-+
-+  /* Check and add a vlan-tag if needed. */
-+  if (inf->vlantag != 0)
-+    {
-+      /* Move eth type to the right */
-+      grub_memcpy ((char *) nb->data + etherhdr_size - 2,
-+                   (char *) nb->data + etherhdr_size - 6, 2);
-+
-+      /* Add the tag in the middle */
-+      grub_memcpy ((char *) nb->data + etherhdr_size - 6, &vlantag_id, 2);
-+      grub_memcpy ((char *) nb->data + etherhdr_size - 4, (char *) &(inf->vlantag), 2);
-+    }
-+
-   return inf->card->driver->send (inf->card, nb);
- }
- 
-@@ -90,10 +111,25 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
-   grub_net_link_level_address_t hwaddress;
-   grub_net_link_level_address_t src_hwaddress;
-   grub_err_t err;
-+  grub_uint8_t etherhdr_size = sizeof (*eth);
-+  grub_uint16_t vlantag = 0;
-+
-+
-+  /* Check if a vlan-tag is present. If so, the ethernet header is 4 bytes */
-+  /* longer than the original one. The vlantag id is extracted and the header */
-+  /* is reseted to the original size. */
-+  if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) == VLANTAG_IDENTIFIER)
-+    {
-+      vlantag = grub_get_unaligned16 (nb->data + etherhdr_size);
-+      etherhdr_size += 4;
-+      /* Move eth type to the original position */
-+      grub_memcpy((char *) nb->data + etherhdr_size - 6,
-+                  (char *) nb->data + etherhdr_size - 2, 2);
-+    }
- 
-   eth = (struct etherhdr *) nb->data;
-   type = grub_be_to_cpu16 (eth->type);
--  err = grub_netbuff_pull (nb, sizeof (*eth));
-+  err = grub_netbuff_pull (nb, etherhdr_size);
-   if (err)
-     return err;
- 
-@@ -121,13 +157,14 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
-     {
-       /* ARP packet. */
-     case GRUB_NET_ETHERTYPE_ARP:
--      grub_net_arp_receive (nb, card);
-+      grub_net_arp_receive (nb, card, &vlantag);
-       grub_netbuff_free (nb);
-       return GRUB_ERR_NONE;
-       /* IP packet.  */
-     case GRUB_NET_ETHERTYPE_IP:
-     case GRUB_NET_ETHERTYPE_IP6:
--      return grub_net_recv_ip_packets (nb, card, &hwaddress, &src_hwaddress);
-+      return grub_net_recv_ip_packets (nb, card, &hwaddress, &src_hwaddress,
-+                                       &vlantag);
-     }
-   grub_netbuff_free (nb);
-   return GRUB_ERR_NONE;
-diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index aba4f8908..7c95cc746 100644
---- a/grub-core/net/ip.c
-+++ b/grub-core/net/ip.c
-@@ -228,12 +228,13 @@ handle_dgram (struct grub_net_buff *nb,
- 	      grub_net_ip_protocol_t proto,
- 	      const grub_net_network_level_address_t *source,
- 	      const grub_net_network_level_address_t *dest,
-+              grub_uint16_t *vlantag,
- 	      grub_uint8_t ttl)
- {
-   struct grub_net_network_level_interface *inf = NULL;
-   grub_err_t err;
-   int multicast = 0;
--  
-+
-   /* DHCP needs special treatment since we don't know IP yet.  */
-   {
-     struct udphdr *udph;
-@@ -293,6 +294,15 @@ handle_dgram (struct grub_net_buff *nb,
- 	&& grub_net_addr_cmp (&inf->address, dest) == 0
- 	&& grub_net_hwaddr_cmp (&inf->hwaddress, hwaddress) == 0)
-       break;
-+
-+    /* Verify vlantag id */
-+    if (inf->card == card && inf->vlantag != *vlantag)
-+      {
-+        grub_dprintf ("net", "invalid vlantag! %x != %x\n",
-+                      inf->vlantag, *vlantag);
-+        break;
-+      }
-+
-     /* Solicited node multicast.  */
-     if (inf->card == card
- 	&& inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6
-@@ -383,7 +393,8 @@ static grub_err_t
- grub_net_recv_ip4_packets (struct grub_net_buff *nb,
- 			   struct grub_net_card *card,
- 			   const grub_net_link_level_address_t *hwaddress,
--			   const grub_net_link_level_address_t *src_hwaddress)
-+			   const grub_net_link_level_address_t *src_hwaddress,
-+                           grub_uint16_t *vlantag)
- {
-   struct iphdr *iph = (struct iphdr *) nb->data;
-   grub_err_t err;
-@@ -458,7 +469,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
-       dest.ipv4 = iph->dest;
- 
-       return handle_dgram (nb, card, src_hwaddress, hwaddress, iph->protocol,
--			   &source, &dest, iph->ttl);
-+			   &source, &dest, vlantag, iph->ttl);
-     }
- 
-   for (prev = &reassembles, rsm = *prev; rsm; prev = &rsm->next, rsm = *prev)
-@@ -594,7 +605,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
-       dest.ipv4 = dst;
- 
-       return handle_dgram (ret, card, src_hwaddress,
--			   hwaddress, proto, &source, &dest,
-+			   hwaddress, proto, &source, &dest, vlantag,
- 			   ttl);
-     }
- }
-@@ -652,7 +663,8 @@ static grub_err_t
- grub_net_recv_ip6_packets (struct grub_net_buff *nb,
- 			   struct grub_net_card *card,
- 			   const grub_net_link_level_address_t *hwaddress,
--			   const grub_net_link_level_address_t *src_hwaddress)
-+			   const grub_net_link_level_address_t *src_hwaddress,
-+                           grub_uint16_t *vlantag)
- {
-   struct ip6hdr *iph = (struct ip6hdr *) nb->data;
-   grub_err_t err;
-@@ -703,21 +715,24 @@ grub_net_recv_ip6_packets (struct grub_net_buff *nb,
-   grub_memcpy (dest.ipv6, &iph->dest, sizeof (dest.ipv6));
- 
-   return handle_dgram (nb, card, src_hwaddress, hwaddress, iph->protocol,
--		       &source, &dest, iph->ttl);
-+		       &source, &dest, vlantag, iph->ttl);
- }
- 
- grub_err_t
- grub_net_recv_ip_packets (struct grub_net_buff *nb,
- 			  struct grub_net_card *card,
- 			  const grub_net_link_level_address_t *hwaddress,
--			  const grub_net_link_level_address_t *src_hwaddress)
-+			  const grub_net_link_level_address_t *src_hwaddress,
-+                          grub_uint16_t *vlantag)
- {
-   struct iphdr *iph = (struct iphdr *) nb->data;
- 
-   if ((iph->verhdrlen >> 4) == 4)
--    return grub_net_recv_ip4_packets (nb, card, hwaddress, src_hwaddress);
-+    return grub_net_recv_ip4_packets (nb, card, hwaddress, src_hwaddress,
-+                                      vlantag);
-   if ((iph->verhdrlen >> 4) == 6)
--    return grub_net_recv_ip6_packets (nb, card, hwaddress, src_hwaddress);
-+    return grub_net_recv_ip6_packets (nb, card, hwaddress, src_hwaddress,
-+                                      vlantag);
-   grub_dprintf ("net", "Bad IP version: %d\n", (iph->verhdrlen >> 4));
-   grub_netbuff_free (nb);
-   return GRUB_ERR_NONE;
-diff --git a/include/grub/net.h b/include/grub/net.h
-index 2192fa186..1096b2432 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -291,6 +291,7 @@ struct grub_net_network_level_interface
-   grub_net_interface_flags_t flags;
-   struct grub_net_bootp_packet *dhcp_ack;
-   grub_size_t dhcp_acklen;
-+  grub_uint16_t vlantag;
-   void *data;
- };
- 
-@@ -561,4 +562,6 @@ extern char *grub_net_default_server;
- #define GRUB_NET_INTERVAL 400
- #define GRUB_NET_INTERVAL_ADDITION 20
- 
-+#define VLANTAG_IDENTIFIER 0x8100
-+
- #endif /* ! GRUB_NET_HEADER */
-diff --git a/include/grub/net/arp.h b/include/grub/net/arp.h
-index bb1703622..8d9d08113 100644
---- a/include/grub/net/arp.h
-+++ b/include/grub/net/arp.h
-@@ -22,10 +22,11 @@
- #include <grub/net.h>
- 
- extern grub_err_t grub_net_arp_receive (struct grub_net_buff *nb,
--					struct grub_net_card *card);
-+                                        struct grub_net_card *card,
-+                                        grub_uint16_t *vlantag);
- 
- grub_err_t
- grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
--			   const grub_net_network_level_address_t *proto_addr);
-+                           const grub_net_network_level_address_t *proto_addr);
- 
- #endif 
-diff --git a/include/grub/net/ip.h b/include/grub/net/ip.h
-index dcceaa568..ab9d68f98 100644
---- a/include/grub/net/ip.h
-+++ b/include/grub/net/ip.h
-@@ -48,7 +48,8 @@ grub_err_t
- grub_net_recv_ip_packets (struct grub_net_buff *nb,
- 			  struct grub_net_card *card,
- 			  const grub_net_link_level_address_t *hwaddress,
--			  const grub_net_link_level_address_t *src_hwaddress);
-+			  const grub_net_link_level_address_t *src_hwaddress,
-+                          grub_uint16_t *vlantag);
- 
- grub_err_t
- grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,
--- 
-2.14.3
-

0014-Allow-fallback-to-include-entries-by-title-not-just-.patch

@@ -1,8 +1,8 @@
-From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 072/198] Allow "fallback" to include entries by title, not
- just number.
+Subject: [PATCH] Allow "fallback" to include entries by title, not just
+ number.
 
 Resolves: rhbz#1026084
 
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 58 insertions(+), 27 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index e7a83c2d6..d2f64b05e 100644
+index e7a83c2d6e2..d2f64b05e0a 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)
@@ -139,6 +139,3 @@ index e7a83c2d6..d2f64b05e 100644
  /* Get the entry number from the variable NAME.  */
  static int
  get_entry_number (grub_menu_t menu, const char *name)
--- 
-2.14.3
-

0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch

@@ -1,168 +0,0 @@
-From a35ac854308b0af7c86c2c7b199f6abdfa2110b0 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 17:32:15 +0200
-Subject: [PATCH 014/198] mkimage: Pass layout to mkimage_generate_elfXX rather
- than some fields.
-
-This allows easier extension of this function without having too long of
-arguments list.
----
- include/grub/util/mkimage.h |  8 ++++----
- util/grub-mkimagexx.c       | 35 ++++++++++++++++++-----------------
- util/mkimage.c              |  4 ++--
- 3 files changed, 24 insertions(+), 23 deletions(-)
-
-diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
-index 1a18708a8..b3a5ca132 100644
---- a/include/grub/util/mkimage.h
-+++ b/include/grub/util/mkimage.h
-@@ -51,13 +51,13 @@ grub_mkimage_load_image64 (const char *kernel_path,
- void
- grub_mkimage_generate_elf32 (const struct grub_install_image_target_desc *image_target,
- 			     int note, char **core_img, size_t *core_size,
--			     Elf32_Addr target_addr, grub_size_t align,
--			     size_t kernel_size, size_t bss_size);
-+			     Elf32_Addr target_addr,
-+			     struct grub_mkimage_layout *layout);
- void
- grub_mkimage_generate_elf64 (const struct grub_install_image_target_desc *image_target,
- 			     int note, char **core_img, size_t *core_size,
--			     Elf64_Addr target_addr, grub_size_t align,
--			     size_t kernel_size, size_t bss_size);
-+			     Elf64_Addr target_addr,
-+			     struct grub_mkimage_layout *layout);
- 
- struct grub_install_image_target_desc
- {
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index e63f148e4..3fab93e20 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -185,8 +185,8 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
- void
- SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc *image_target,
- 				    int note, char **core_img, size_t *core_size,
--				    Elf_Addr target_addr, grub_size_t align,
--				    size_t kernel_size, size_t bss_size)
-+				    Elf_Addr target_addr,
-+				    struct grub_mkimage_layout *layout)
- {
-   char *elf_img;
-   size_t program_size;
-@@ -214,7 +214,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-       footer_size += XEN_NOTE_SIZE;
-     }
-   header_size = ALIGN_UP (sizeof (*ehdr) + phnum * sizeof (*phdr)
--			  + shnum * sizeof (*shdr) + string_size, align);
-+			  + shnum * sizeof (*shdr) + string_size, layout->align);
- 
-   program_size = ALIGN_ADDR (*core_size);
- 
-@@ -258,7 +258,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-   ehdr->e_entry = grub_host_to_target32 (target_addr);
-   phdr->p_vaddr = grub_host_to_target32 (target_addr);
-   phdr->p_paddr = grub_host_to_target32 (target_addr);
--  phdr->p_align = grub_host_to_target32 (align > image_target->link_align ? align : image_target->link_align);
-+  phdr->p_align = grub_host_to_target32 (layout->align > image_target->link_align ?
-+					 layout->align : image_target->link_align);
-   if (image_target->id == IMAGE_LOONGSON_ELF)
-     ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
- 					   | EF_MIPS_PIC | EF_MIPS_CPIC);
-@@ -272,27 +273,27 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-   else
-     {
-       grub_uint32_t target_addr_mods;
--      phdr->p_filesz = grub_host_to_target32 (kernel_size);
--      phdr->p_memsz = grub_host_to_target32 (kernel_size + bss_size);
-+      phdr->p_filesz = grub_host_to_target32 (layout->kernel_size);
-+      phdr->p_memsz = grub_host_to_target32 (layout->kernel_size + layout->bss_size);
- 
-       phdr++;
-       phdr->p_type = grub_host_to_target32 (PT_GNU_STACK);
--      phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
-+      phdr->p_offset = grub_host_to_target32 (header_size + layout->kernel_size);
-       phdr->p_paddr = phdr->p_vaddr = phdr->p_filesz = phdr->p_memsz = 0;
-       phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
-       phdr->p_align = grub_host_to_target32 (image_target->link_align);
- 
-       phdr++;
-       phdr->p_type = grub_host_to_target32 (PT_LOAD);
--      phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
-+      phdr->p_offset = grub_host_to_target32 (header_size + layout->kernel_size);
-       phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
-       phdr->p_filesz = phdr->p_memsz
--	= grub_host_to_target32 (*core_size - kernel_size);
-+	= grub_host_to_target32 (*core_size - layout->kernel_size);
- 
-       if (image_target->id == IMAGE_COREBOOT)
- 	target_addr_mods = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
-       else
--	target_addr_mods = ALIGN_UP (target_addr + kernel_size + bss_size
-+	target_addr_mods = ALIGN_UP (target_addr + layout->kernel_size + layout->bss_size
- 				     + image_target->mod_gap,
- 				     image_target->mod_align);
-       phdr->p_vaddr = grub_host_to_target_addr (target_addr_mods);
-@@ -434,7 +435,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-     shdr->sh_size = grub_host_to_target32 (string_size);
-     shdr->sh_link = grub_host_to_target32 (0);
-     shdr->sh_info = grub_host_to_target32 (0);
--    shdr->sh_addralign = grub_host_to_target32 (align);
-+    shdr->sh_addralign = grub_host_to_target32 (layout->align);
-     shdr->sh_entsize = grub_host_to_target32 (0);
-     shdr++;
- 
-@@ -445,10 +446,10 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-     shdr->sh_type = grub_host_to_target32 (SHT_PROGBITS);
-     shdr->sh_addr = grub_host_to_target_addr (target_addr);
-     shdr->sh_offset = grub_host_to_target_addr (header_size);
--    shdr->sh_size = grub_host_to_target32 (kernel_size);
-+    shdr->sh_size = grub_host_to_target32 (layout->kernel_size);
-     shdr->sh_link = grub_host_to_target32 (0);
-     shdr->sh_info = grub_host_to_target32 (0);
--    shdr->sh_addralign = grub_host_to_target32 (align);
-+    shdr->sh_addralign = grub_host_to_target32 (layout->align);
-     shdr->sh_entsize = grub_host_to_target32 (0);
-     shdr++;
- 
-@@ -456,9 +457,9 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-     shdr->sh_name = grub_host_to_target32 (ptr - str_start);
-     ptr += sizeof ("mods");
-     shdr->sh_type = grub_host_to_target32 (SHT_PROGBITS);
--    shdr->sh_addr = grub_host_to_target_addr (target_addr + kernel_size);
--    shdr->sh_offset = grub_host_to_target_addr (header_size + kernel_size);
--    shdr->sh_size = grub_host_to_target32 (*core_size - kernel_size);
-+    shdr->sh_addr = grub_host_to_target_addr (target_addr + layout->kernel_size);
-+    shdr->sh_offset = grub_host_to_target_addr (header_size + layout->kernel_size);
-+    shdr->sh_size = grub_host_to_target32 (*core_size - layout->kernel_size);
-     shdr->sh_link = grub_host_to_target32 (0);
-     shdr->sh_info = grub_host_to_target32 (0);
-     shdr->sh_addralign = grub_host_to_target32 (image_target->voidp_sizeof);
-@@ -471,7 +472,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
- 	shdr->sh_name = grub_host_to_target32 (ptr - str_start);
- 	ptr += sizeof (".xen");
- 	shdr->sh_type = grub_host_to_target32 (SHT_PROGBITS);
--	shdr->sh_addr = grub_host_to_target_addr (target_addr + kernel_size);
-+	shdr->sh_addr = grub_host_to_target_addr (target_addr + layout->kernel_size);
- 	shdr->sh_offset = grub_host_to_target_addr (program_size + header_size);
- 	shdr->sh_size = grub_host_to_target32 (XEN_NOTE_SIZE);
- 	shdr->sh_link = grub_host_to_target32 (0);
-diff --git a/util/mkimage.c b/util/mkimage.c
-index 9ad4cfe42..528166c87 100644
---- a/util/mkimage.c
-+++ b/util/mkimage.c
-@@ -1638,10 +1638,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
- 	  target_addr = image_target->link_addr;
- 	if (image_target->voidp_sizeof == 4)
- 	  grub_mkimage_generate_elf32 (image_target, note, &core_img, &core_size,
--				       target_addr, layout.align, layout.kernel_size, layout.bss_size);
-+				       target_addr, &layout);
- 	else
- 	  grub_mkimage_generate_elf64 (image_target, note, &core_img, &core_size,
--				       target_addr, layout.align, layout.kernel_size, layout.bss_size);
-+				       target_addr, &layout);
-       }
-       break;
-     }
--- 
-2.14.3
-

0015-Add-GRUB_DISABLE_UUID.patch

@@ -1,7 +1,7 @@
-From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 073/198] Add GRUB_DISABLE_UUID.
+Subject: [PATCH] Add GRUB_DISABLE_UUID.
 
 This will cause "search --fs-uuid --set=root ..." not to be generated by
 grub2-mkconfig, and instead simply attempt to use the grub device name
@@ -10,15 +10,15 @@ as it understands it.
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/grub.texi            |  7 +++++++
- util/grub-mkconfig.in     | 12 ++++++++++--
+ util/grub-mkconfig.in     | 22 +++++++++++++++++++---
  util/grub-mkconfig_lib.in |  4 ++--
- 3 files changed, 19 insertions(+), 4 deletions(-)
+ 3 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index a0c4b9e4e..6fdd2a041 100644
+index 2adfa97bee8..2fd32608c01 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -1409,6 +1409,13 @@ disable the use of UUIDs, set this option to @samp{true}.
+@@ -1441,6 +1441,13 @@ enable the use of partition UUIDs, set this option to @samp{false}.
  If this option is set to @samp{true}, disable the generation of recovery
  mode menu entries.
  
@@ -33,15 +33,17 @@ index a0c4b9e4e..6fdd2a041 100644
  If graphical video support is required, either because the @samp{gfxterm}
  graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3b070fd76..c088b7054 100644
+index bc5a3f17541..b0a8626dd1c 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -133,11 +133,11 @@ fi
+@@ -133,12 +133,12 @@ fi
  
  # Device containing our userland.  Typically used for root= parameter.
  GRUB_DEVICE="`${grub_probe} --target=device /`"
 -GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+-GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
 +GRUB_DEVICE_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
++GRUB_DEVICE_PARTUUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
  
  # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
  GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
@@ -50,30 +52,38 @@ index 3b070fd76..c088b7054 100644
  
  # Filesystem for the device containing our userland.  Used for stuff like
  # choosing Hurd filesystem module.
-@@ -151,6 +151,13 @@ if test -f ${sysconfdir}/default/grub ; then
+@@ -158,6 +158,21 @@ if test -f ${sysconfdir}/default/grub ; then
    . ${sysconfdir}/default/grub
  fi
  
-+if [ "x$GRUB_DISABLE_UUID" != "xtrue" -a -z "$GRUB_DEVICE_UUID" ]; then
++if [ "x$GRUB_DISABLE_UUID" != "xtrue" ]; then
++  if [ -z "$GRUB_DEVICE_UUID" ]; then
 +    GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
-+fi
-+if [ "x$GRUB_DISABLE_UUID" != "xtrue" -a -z "$GRUB_DEVICE_BOOT_UUID" ]; then
++  fi
++  if [ -z "$GRUB_DEVICE_BOOT_UUID" ]; then
 +    GRUB_DEVICE_BOOT_UUID="$GRUB_DEVICE_BOOT_UUID_GENERATED"
++  fi
++  if [ -z "$GRUB_DEVICE_UUID" ]; then
++    GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
++  fi
++  if [ -z "$GRUB_DEVICE_PART_UUID" ]; then
++    GRUB_DEVICE_PART_UUID="$GRUB_DEVICE_PART_UUID_GENERATED"
++  fi
 +fi
 +
  # XXX: should this be deprecated at some point?
  if [ "x${GRUB_TERMINAL}" != "x" ] ; then
    GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
-@@ -216,6 +223,7 @@ export GRUB_DEFAULT \
-   GRUB_SERIAL_COMMAND \
+@@ -227,6 +242,7 @@ export GRUB_DEFAULT \
    GRUB_DISABLE_LINUX_UUID \
+   GRUB_DISABLE_LINUX_PARTUUID \
    GRUB_DISABLE_RECOVERY \
 +  GRUB_DISABLE_UUID \
    GRUB_VIDEO_BACKEND \
    GRUB_GFXMODE \
    GRUB_BACKGROUND \
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 60b31cadd..cf35e4174 100644
+index 0f801cab3e4..1001a12232b 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -156,7 +156,7 @@ prepare_grub_to_access_device ()
@@ -94,6 +104,3 @@ index 60b31cadd..cf35e4174 100644
      echo "$fs_uuid";
    else
      echo $device |sed 's, ,_,g'
--- 
-2.14.3
-

0015-Refactor-arm-uboot-code-to-make-it-genereic.patch

@@ -1,404 +0,0 @@
-From d08c9685149e7788001ac9a209baa1d84c3628e0 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 17:47:57 +0200
-Subject: [PATCH 015/198] Refactor arm-uboot code to make it genereic.
-
-arm-coreboot startup code can be very similar to arm-uboot but current code has
-U-Boot specific references. So split U-Boot part from generic part.
----
- grub-core/Makefile.core.def              |  4 +-
- grub-core/kern/arm/{uboot => }/startup.S | 64 ++++------------------------
- grub-core/kern/arm/uboot/init.c          | 70 ++++++++++++++++++++++++++++++
- grub-core/kern/arm/uboot/uboot.S         | 73 ++++++++++++++++++++++++++++++++
- grub-core/kern/uboot/init.c              | 16 -------
- grub-core/kern/uboot/uboot.c             | 35 ---------------
- include/grub/arm/startup.h               | 16 +++++++
- 7 files changed, 170 insertions(+), 108 deletions(-)
- rename grub-core/kern/arm/{uboot => }/startup.S (77%)
- create mode 100644 grub-core/kern/arm/uboot/init.c
- create mode 100644 grub-core/kern/arm/uboot/uboot.S
- create mode 100644 include/grub/arm/startup.h
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8dcd0e5a9..fb59a7b1d 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -105,7 +105,7 @@ kernel = {
-   mips_startup = kern/mips/startup.S;
-   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
-   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
--  arm_uboot_startup = kern/arm/uboot/startup.S;
-+  arm_uboot_startup = kern/arm/startup.S;
-   arm_efi_startup = kern/arm/efi/startup.S;
-   arm64_efi_startup = kern/arm64/efi/startup.S;
- 
-@@ -149,6 +149,8 @@ kernel = {
-   uboot = kern/uboot/init.c;
-   uboot = kern/uboot/hw.c;
-   uboot = term/uboot/console.c;
-+  arm_uboot = kern/arm/uboot/init.c;
-+  arm_uboot = kern/arm/uboot/uboot.S;
- 
-   terminfoinkernel = term/terminfo.c;
-   terminfoinkernel = term/tparm.c;
-diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/startup.S
-similarity index 77%
-rename from grub-core/kern/arm/uboot/startup.S
-rename to grub-core/kern/arm/startup.S
-index 5efaae16e..640837cba 100644
---- a/grub-core/kern/arm/uboot/startup.S
-+++ b/grub-core/kern/arm/startup.S
-@@ -86,7 +86,7 @@ FUNCTION(codestart)
- 	@ Stack pointer used as start address for signature probing
- 	mov	r12, sp
- 	adr	sp, entry_state
--	push	{r1-r12,lr}	@ store U-Boot context (sp in r12)
-+	push	{r0-r12,lr}	@ store U-Boot context (sp in r12)
- 
- 	adr     r1, _start
- 	ldr	r0, bss_start_ptr		@ src
-@@ -153,69 +153,21 @@ reloc_done:
- 	
- 	b	EXT_C(grub_main)
- 
--	/*
--	 * uboot_syscall():
--	 *   This function is effectively a veneer, so it cannot
--	 *   modify the stack or corrupt any registers other than
--	 *   r12 (ip). Furthermore it needs to restore r8 for
--	 *   U-Boot (Global Data Pointer) and preserve it for Grub.
--	 */
--FUNCTION(grub_uboot_syscall)
--	str     r8, transition_space
--	str     lr, transition_space + 4
--	str     r9, transition_space + 8
--
--	ldr	r8, gd_backup
--	ldr	r9, gd_backup + 4
--
--	bl	do_syscall
--
--	ldr     r8, transition_space
--	ldr     lr, transition_space + 4
--	ldr     r9, transition_space + 8
--
--	bx	lr
--do_syscall:
--
--	ldr	ip, grub_uboot_syscall_ptr
--	bx	ip
--	
--FUNCTION(grub_uboot_return)
--	adr	sp, entry_state_end
--	pop	{r4-r12, lr}
--	mov	sp, r12
--	bx	lr
--
--	
- 	.align	3
--@ U-boot context stack space
--entry_state_end:
--VARIABLE(grub_uboot_machine_type)
-+@ U-boot/coreboot context stack space
-+VARIABLE(grub_arm_saved_registers)
-+	.long	0	@ r0
- 	.long	0	@ r1
--VARIABLE(grub_uboot_boot_data)
- 	.long	0	@ r2
- 	.long	0	@ r3
- 	.long	0	@ r4
- 	.long	0	@ r5
- 	.long	0	@ r6
- 	.long	0	@ r7
--gd_backup:	
--	.long	0	@ r8 - U-Boot global data pointer up to 2013-09-21
--	.long	0	@ r9 - U-Boot global data pointer 2013-09-21 onwards
-+	.long	0	@ r8
-+	.long	0	@ r9
- 	.long	0	@ r10
- 	.long	0	@ r11
--VARIABLE(grub_uboot_search_hint)@ U-Boot stack pointer - 
--	.long	0	@ also API signature address hint.
--	.long	0	@ lr
--entry_state:		@ backup for U-Boot context
--
--@ GRUB context stack space
--transition_space:	
--	.long	0	@ r8
-+	.long	0	@ sp
- 	.long	0	@ lr
--	.long	0	@ r9
--
--VARIABLE(grub_uboot_syscall_ptr)
--	.long	0	@
--
--	END
-+entry_state:
-diff --git a/grub-core/kern/arm/uboot/init.c b/grub-core/kern/arm/uboot/init.c
-new file mode 100644
-index 000000000..2a6aa3fdd
---- /dev/null
-+++ b/grub-core/kern/arm/uboot/init.c
-@@ -0,0 +1,70 @@
-+/* init.c - generic U-Boot initialization and finalization */
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2016  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/>.
-+ */
-+
-+#include <grub/uboot/uboot.h>
-+#include <grub/arm/startup.h>
-+#include <grub/uboot/api_public.h>
-+
-+extern int (*grub_uboot_syscall_ptr) (int, int *, ...);
-+
-+grub_uint32_t
-+grub_uboot_get_machine_type (void)
-+{
-+  return grub_arm_saved_registers.r[1];
-+}
-+
-+grub_addr_t
-+grub_uboot_get_boot_data (void)
-+{
-+  return grub_arm_saved_registers.r[2];
-+}
-+
-+int
-+grub_uboot_api_init (void)
-+{
-+  struct api_signature *start, *end;
-+  struct api_signature *p;
-+  grub_addr_t grub_uboot_search_hint = grub_arm_saved_registers.sp;
-+  if (grub_uboot_search_hint)
-+    {
-+      /* Extended search range to work around Trim Slice U-Boot issue */
-+      start = (struct api_signature *) ((grub_uboot_search_hint & ~0x000fffff)
-+					- 0x00500000);
-+      end =
-+	(struct api_signature *) ((grub_addr_t) start + UBOOT_API_SEARCH_LEN -
-+				  API_SIG_MAGLEN + 0x00500000);
-+    }
-+  else
-+    {
-+      start = 0;
-+      end = (struct api_signature *) (256 * 1024 * 1024);
-+    }
-+
-+  /* Structure alignment is (at least) 8 bytes */
-+  for (p = start; p < end; p = (void *) ((grub_addr_t) p + 8))
-+    {
-+      if (grub_memcmp (&(p->magic), API_SIG_MAGIC, API_SIG_MAGLEN) == 0)
-+	{
-+	  grub_uboot_syscall_ptr = p->syscall;
-+	  return p->version;
-+	}
-+    }
-+
-+  return 0;
-+}
-diff --git a/grub-core/kern/arm/uboot/uboot.S b/grub-core/kern/arm/uboot/uboot.S
-new file mode 100644
-index 000000000..d128775f1
---- /dev/null
-+++ b/grub-core/kern/arm/uboot/uboot.S
-@@ -0,0 +1,73 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2013  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/>.
-+ */
-+
-+#include <grub/offsets.h>
-+#include <grub/symbol.h>
-+#include <grub/machine/kernel.h>
-+
-+	/*
-+	 * uboot_syscall():
-+	 *   This function is effectively a veneer, so it cannot
-+	 *   modify the stack or corrupt any registers other than
-+	 *   r12 (ip). Furthermore it needs to restore r8 for
-+	 *   U-Boot (Global Data Pointer) and preserve it for Grub.
-+	 */
-+FUNCTION(grub_uboot_syscall)
-+	str     r8, transition_space
-+	str     lr, transition_space + 4
-+	str     r9, transition_space + 8
-+
-+	ldr	ip, saved_registers_ptr
-+	ldr	r8, [ip, #4 * 8]
-+	ldr	r9, [ip, #4 * 9]
-+
-+	bl	do_syscall
-+
-+	ldr     r8, transition_space
-+	ldr     lr, transition_space + 4
-+	ldr     r9, transition_space + 8
-+
-+	bx	lr
-+do_syscall:
-+
-+	ldr	ip, grub_uboot_syscall_ptr
-+	bx	ip
-+	
-+FUNCTION(grub_uboot_return)
-+	ldr	ip, saved_registers_ptr
-+	ldr	sp, [ip, #4 * 4]
-+	pop	{r4-r12, lr}
-+	mov	sp, r12
-+	bx	lr
-+
-+	
-+	.align	3
-+
-+@ GRUB context stack space
-+transition_space:	
-+	.long	0	@ r8
-+	.long	0	@ lr
-+	.long	0	@ r9
-+
-+saved_registers_ptr:
-+	.long EXT_C(grub_arm_saved_registers)
-+
-+VARIABLE(grub_uboot_syscall_ptr)
-+	.long	0	@
-+
-+	END
-diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 5dcc106ed..3e338645c 100644
---- a/grub-core/kern/uboot/init.c
-+++ b/grub-core/kern/uboot/init.c
-@@ -36,30 +36,14 @@
- extern char __bss_start[];
- extern char _end[];
- extern grub_size_t grub_total_module_size;
--extern int (*grub_uboot_syscall_ptr) (int, int *, ...);
- static unsigned long timer_start;
- 
--extern grub_uint32_t grub_uboot_machine_type;
--extern grub_addr_t grub_uboot_boot_data;
--
- void
- grub_exit (void)
- {
-   grub_uboot_return (0);
- }
- 
--grub_uint32_t
--grub_uboot_get_machine_type (void)
--{
--  return grub_uboot_machine_type;
--}
--
--grub_addr_t
--grub_uboot_get_boot_data (void)
--{
--  return grub_uboot_boot_data;
--}
--
- static grub_uint64_t
- uboot_timer_ms (void)
- {
-diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
-index 6800a4beb..cf0168e62 100644
---- a/grub-core/kern/uboot/uboot.c
-+++ b/grub-core/kern/uboot/uboot.c
-@@ -39,48 +39,13 @@
-  * returns:	0 if the call not found, 1 if serviced
-  */
- 
--extern int (*grub_uboot_syscall_ptr) (int, int *, ...);
- extern int grub_uboot_syscall (int, int *, ...);
--extern grub_addr_t grub_uboot_search_hint;
- 
- static struct sys_info uboot_sys_info;
- static struct mem_region uboot_mem_info[5];
- static struct device_info * devices;
- static int num_devices;
- 
--int
--grub_uboot_api_init (void)
--{
--  struct api_signature *start, *end;
--  struct api_signature *p;
--
--  if (grub_uboot_search_hint)
--    {
--      /* Extended search range to work around Trim Slice U-Boot issue */
--      start = (struct api_signature *) ((grub_uboot_search_hint & ~0x000fffff)
--					- 0x00500000);
--      end =
--	(struct api_signature *) ((grub_addr_t) start + UBOOT_API_SEARCH_LEN -
--				  API_SIG_MAGLEN + 0x00500000);
--    }
--  else
--    {
--      start = 0;
--      end = (struct api_signature *) (256 * 1024 * 1024);
--    }
--
--  /* Structure alignment is (at least) 8 bytes */
--  for (p = start; p < end; p = (void *) ((grub_addr_t) p + 8))
--    {
--      if (grub_memcmp (&(p->magic), API_SIG_MAGIC, API_SIG_MAGLEN) == 0)
--	{
--	  grub_uboot_syscall_ptr = p->syscall;
--	  return p->version;
--	}
--    }
--
--  return 0;
--}
- 
- /*
-  * All functions below are wrappers around the grub_uboot_syscall() function
-diff --git a/include/grub/arm/startup.h b/include/grub/arm/startup.h
-new file mode 100644
-index 000000000..9afb6c57c
---- /dev/null
-+++ b/include/grub/arm/startup.h
-@@ -0,0 +1,16 @@
-+#ifndef GRUB_STARTUP_CPU_HEADER
-+#define GRUB_STARTUP_CPU_HEADER
-+
-+struct grub_arm_startup_registers
-+{
-+  /* registers 0-11 */
-+  /* for U-boot r[1] is machine type */
-+  /* for U-boot r[2] is boot data */
-+  grub_uint32_t r[12];
-+  grub_uint32_t sp;
-+  grub_uint32_t lr;
-+};
-+
-+extern struct grub_arm_startup_registers grub_arm_saved_registers;
-+
-+#endif
--- 
-2.14.3
-

0016-Make-exit-take-a-return-code.patch

@@ -1,7 +1,7 @@
-From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 074/198] Make "exit" take a return code.
+Subject: [PATCH] Make "exit" take a return code.
 
 This adds "exit" with a return code.  With this patch, any "exit"
 command /may/ include a return code, and on platforms that support
@@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  14 files changed, 39 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index a3a118241..b25ca4b9f 100644
+index a3a11824172..b25ca4b9f17 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
 @@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -60,10 +60,10 @@ index a3a118241..b25ca4b9f 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index d467785fc..684ca93f8 100644
+index 708581fcbde..e339f264b3a 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
+@@ -164,11 +164,16 @@ grub_reboot (void)
  }
  
  void
@@ -83,7 +83,7 @@ index d467785fc..684ca93f8 100644
  }
  
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 425bb9603..55ea5a11c 100644
+index 425bb960347..55ea5a11ccd 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
 @@ -67,7 +67,7 @@ grub_reboot (void)
@@ -96,7 +96,7 @@ index 425bb9603..55ea5a11c 100644
    grub_reboot ();
  }
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 76661337f..82012a72f 100644
+index 76661337f10..82012a72fcb 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
 @@ -137,9 +137,10 @@ xasprintf (const char *fmt, ...)
@@ -113,7 +113,7 @@ index 76661337f..82012a72f 100644
  #endif
  
 diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 3314f027f..36f9134b7 100644
+index 3314f027fec..36f9134b7b7 100644
 --- a/grub-core/kern/i386/coreboot/init.c
 +++ b/grub-core/kern/i386/coreboot/init.c
 @@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
@@ -126,7 +126,7 @@ index 3314f027f..36f9134b7 100644
    /* We can't use grub_fatal() in this function.  This would create an infinite
       loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
-index 271b6fbfa..9fafe98f0 100644
+index 271b6fbfabd..9fafe98f015 100644
 --- a/grub-core/kern/i386/qemu/init.c
 +++ b/grub-core/kern/i386/qemu/init.c
 @@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
@@ -139,7 +139,7 @@ index 271b6fbfa..9fafe98f0 100644
    /* We can't use grub_fatal() in this function.  This would create an infinite
       loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 12590225e..e69c0133e 100644
+index 0d8ebf58b95..f5423ce27d9 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;
@@ -152,7 +152,7 @@ index 12590225e..e69c0133e 100644
    grub_ieee1275_exit ();
  }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 3834a1490..86b3a25ec 100644
+index 3834a149093..86b3a25ec40 100644
 --- a/grub-core/kern/mips/arc/init.c
 +++ b/grub-core/kern/mips/arc/init.c
 @@ -276,7 +276,7 @@ grub_halt (void)
@@ -165,7 +165,7 @@ index 3834a1490..86b3a25ec 100644
    GRUB_ARC_FIRMWARE_VECTOR->exit ();
  
 diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
-index 7b96531b9..dff598ca7 100644
+index 7b96531b983..dff598ca7b0 100644
 --- a/grub-core/kern/mips/loongson/init.c
 +++ b/grub-core/kern/mips/loongson/init.c
 @@ -304,7 +304,7 @@ grub_halt (void)
@@ -178,7 +178,7 @@ index 7b96531b9..dff598ca7 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index be88b77d2..8b6c55ffc 100644
+index be88b77d22d..8b6c55ffc01 100644
 --- a/grub-core/kern/mips/qemu_mips/init.c
 +++ b/grub-core/kern/mips/qemu_mips/init.c
 @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@@ -191,7 +191,7 @@ index be88b77d2..8b6c55ffc 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d51f..952411d5d 100644
+index 3b633d51f4c..952411d5dc6 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -1095,7 +1095,7 @@ grub_abort (void)
@@ -204,7 +204,7 @@ index 3b633d51f..952411d5d 100644
  
  void
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 3e338645c..be2a5be1d 100644
+index 3e338645c57..be2a5be1d07 100644
 --- a/grub-core/kern/uboot/init.c
 +++ b/grub-core/kern/uboot/init.c
 @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@@ -229,7 +229,7 @@ index 3e338645c..be2a5be1d 100644
    else if (ver > API_SIG_VERSION)
      {
 diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 0559c033c..fce526d41 100644
+index 0559c033c3d..fce526d417b 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
 @@ -549,7 +549,7 @@ grub_machine_init (void)
@@ -242,7 +242,7 @@ index 0559c033c..fce526d41 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 2a9f87cc2..062081437 100644
+index 372f009e84f..83fd69f4ada 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
 @@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
@@ -254,6 +254,3 @@ index 2a9f87cc2..062081437 100644
  grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
  					  grub_uint64_t d,
  					  grub_uint64_t *r);
--- 
-2.14.3
-

0016-coreboot-Split-parts-that-are-platform-independent.patch

@@ -1,344 +0,0 @@
-From 461bfab7b7e47fd0a76bf6076a438af1b7e2184a Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 19:06:22 +0200
-Subject: [PATCH 016/198] coreboot: Split parts that are platform-independent.
-
-We currently assume that coreboot is always i386, it's no longer the case,
-so split i386-coreboot parts from generic coreboot code.
----
- grub-core/Makefile.am                            |  2 +-
- grub-core/Makefile.core.def                      |  6 +-
- grub-core/commands/i386/coreboot/cb_timestamps.c |  2 +-
- grub-core/commands/i386/coreboot/cbls.c          |  2 +-
- grub-core/kern/coreboot/cbtable.c                | 70 ++++++++++++++++++++++++
- grub-core/kern/{i386 => }/coreboot/mmap.c        |  6 +-
- grub-core/kern/i386/coreboot/cbtable.c           | 53 +++---------------
- grub-core/term/i386/coreboot/cbmemc.c            |  2 +-
- grub-core/video/{i386 => }/coreboot/cbfb.c       |  2 +-
- include/grub/{i386 => }/coreboot/lbio.h          |  9 +++
- 10 files changed, 99 insertions(+), 55 deletions(-)
- create mode 100644 grub-core/kern/coreboot/cbtable.c
- rename grub-core/kern/{i386 => }/coreboot/mmap.c (97%)
- rename grub-core/video/{i386 => }/coreboot/cbfb.c (99%)
- rename include/grub/{i386 => }/coreboot/lbio.h (93%)
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 809a8aa26..781d0ffbf 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -112,7 +112,7 @@ endif
- 
- if COND_i386_coreboot
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
--KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/coreboot/lbio.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/coreboot/lbio.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index fb59a7b1d..45ed0fa6b 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -166,7 +166,7 @@ kernel = {
-   i386_multiboot = kern/i386/coreboot/init.c;
-   i386_qemu = kern/i386/qemu/init.c;
-   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
--  i386_coreboot = video/i386/coreboot/cbfb.c;
-+  i386_coreboot = video/coreboot/cbfb.c;
- 
-   efi = disk/efi/efidisk.c;
-   efi = kern/efi/efi.c;
-@@ -227,8 +227,9 @@ kernel = {
-   i386_qemu = kern/vga_init.c;
-   i386_qemu = kern/i386/qemu/mmap.c;
- 
--  i386_coreboot = kern/i386/coreboot/mmap.c;
-+  i386_coreboot = kern/coreboot/mmap.c;
-   i386_coreboot = kern/i386/coreboot/cbtable.c;
-+  i386_coreboot = kern/coreboot/cbtable.c;
- 
-   i386_multiboot = kern/i386/multiboot_mmap.c;
- 
-@@ -643,6 +644,7 @@ module = {
- module = {
-   name = cbtable;
-   common = kern/i386/coreboot/cbtable.c;
-+  common = kern/coreboot/cbtable.c;
-   enable = i386_pc;
-   enable = i386_efi;
-   enable = i386_qemu;
-diff --git a/grub-core/commands/i386/coreboot/cb_timestamps.c b/grub-core/commands/i386/coreboot/cb_timestamps.c
-index e72f38d6e..e97ea6bed 100644
---- a/grub-core/commands/i386/coreboot/cb_timestamps.c
-+++ b/grub-core/commands/i386/coreboot/cb_timestamps.c
-@@ -20,7 +20,7 @@
- #include <grub/misc.h>
- #include <grub/command.h>
- #include <grub/i18n.h>
--#include <grub/i386/coreboot/lbio.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/i386/tsc.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
-diff --git a/grub-core/commands/i386/coreboot/cbls.c b/grub-core/commands/i386/coreboot/cbls.c
-index e0a10596f..102291f42 100644
---- a/grub-core/commands/i386/coreboot/cbls.c
-+++ b/grub-core/commands/i386/coreboot/cbls.c
-@@ -20,7 +20,7 @@
- #include <grub/misc.h>
- #include <grub/command.h>
- #include <grub/i18n.h>
--#include <grub/i386/coreboot/lbio.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/i386/tsc.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
-diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c
-new file mode 100644
-index 000000000..996d3f407
---- /dev/null
-+++ b/grub-core/kern/coreboot/cbtable.c
-@@ -0,0 +1,70 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2007,2008,2013  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/>.
-+ */
-+
-+#include <grub/i386/coreboot/memory.h>
-+#include <grub/coreboot/lbio.h>
-+#include <grub/types.h>
-+#include <grub/err.h>
-+#include <grub/misc.h>
-+#include <grub/dl.h>
-+
-+/* Helper for grub_linuxbios_table_iterate.  */
-+int
-+grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header)
-+{
-+  if (! grub_memcmp (tbl_header->signature, "LBIO", 4))
-+    return 1;
-+
-+  return 0;
-+}
-+
-+grub_err_t
-+grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
-+					   void *),
-+			      void *hook_data)
-+{
-+  grub_linuxbios_table_header_t table_header = grub_linuxbios_get_tables ();
-+  grub_linuxbios_table_item_t table_item;
-+
-+  if (!table_header)
-+    return 0;
-+
-+signature_found:
-+
-+  table_item =
-+    (grub_linuxbios_table_item_t) ((char *) table_header +
-+				   table_header->header_size);
-+  for (; table_item < (grub_linuxbios_table_item_t) ((char *) table_header
-+						     + table_header->header_size
-+						     + table_header->table_size);
-+       table_item = (grub_linuxbios_table_item_t) ((char *) table_item + table_item->size))
-+    {
-+      if (table_item->tag == GRUB_LINUXBIOS_MEMBER_LINK
-+         && grub_linuxbios_check_signature ((grub_linuxbios_table_header_t) (grub_addr_t)
-+                             *(grub_uint64_t *) (table_item + 1)))
-+       {
-+         table_header = (grub_linuxbios_table_header_t) (grub_addr_t)
-+           *(grub_uint64_t *) (table_item + 1);
-+         goto signature_found;   
-+       }
-+      if (hook (table_item, hook_data))
-+       return 1;
-+    }
-+
-+  return 0;
-+}
-diff --git a/grub-core/kern/i386/coreboot/mmap.c b/grub-core/kern/coreboot/mmap.c
-similarity index 97%
-rename from grub-core/kern/i386/coreboot/mmap.c
-rename to grub-core/kern/coreboot/mmap.c
-index 4d29f6b7d..caf8f7cef 100644
---- a/grub-core/kern/i386/coreboot/mmap.c
-+++ b/grub-core/kern/coreboot/mmap.c
-@@ -16,8 +16,8 @@
-  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <grub/machine/memory.h>
--#include <grub/machine/lbio.h>
-+#include <grub/memory.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/types.h>
- #include <grub/err.h>
- #include <grub/misc.h>
-@@ -49,6 +49,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
-     {
-       grub_uint64_t start = mem_region->addr;
-       grub_uint64_t end = mem_region->addr + mem_region->size;
-+#ifdef __i386__
-       /* Mark region 0xa0000 - 0x100000 as reserved.  */
-       if (start < 0x100000 && end >= 0xa0000
- 	  && mem_region->type == GRUB_MACHINE_MEMORY_AVAILABLE)
-@@ -75,6 +76,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
- 	  if (end <= start)
- 	    continue;
- 	}
-+#endif
-       if (ctx->hook (start, end - start,
- 		     /* Multiboot mmaps match with the coreboot mmap
- 		        definition.  Therefore, we can just pass type
-diff --git a/grub-core/kern/i386/coreboot/cbtable.c b/grub-core/kern/i386/coreboot/cbtable.c
-index 1669bc0ca..34a2b59be 100644
---- a/grub-core/kern/i386/coreboot/cbtable.c
-+++ b/grub-core/kern/i386/coreboot/cbtable.c
-@@ -17,7 +17,7 @@
-  */
- 
- #include <grub/i386/coreboot/memory.h>
--#include <grub/i386/coreboot/lbio.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/types.h>
- #include <grub/err.h>
- #include <grub/misc.h>
-@@ -25,59 +25,20 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
--/* Helper for grub_linuxbios_table_iterate.  */
--static int
--check_signature (grub_linuxbios_table_header_t tbl_header)
--{
--  if (! grub_memcmp (tbl_header->signature, "LBIO", 4))
--    return 1;
--
--  return 0;
--}
--
--grub_err_t
--grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
--					   void *),
--			      void *hook_data)
-+grub_linuxbios_table_header_t
-+grub_linuxbios_get_tables (void)
- {
-   grub_linuxbios_table_header_t table_header;
--  grub_linuxbios_table_item_t table_item;
--
-   /* Assuming table_header is aligned to its size (8 bytes).  */
--
-   for (table_header = (grub_linuxbios_table_header_t) 0x500;
-        table_header < (grub_linuxbios_table_header_t) 0x1000; table_header++)
--    if (check_signature (table_header))
--      goto signature_found;
-+    if (grub_linuxbios_check_signature (table_header))
-+      return table_header;
- 
-   for (table_header = (grub_linuxbios_table_header_t) 0xf0000;
-        table_header < (grub_linuxbios_table_header_t) 0x100000; table_header++)
--    if (check_signature (table_header))
--      goto signature_found;
--
--  return 0;
--
--signature_found:
--
--  table_item =
--    (grub_linuxbios_table_item_t) ((char *) table_header +
--				   table_header->header_size);
--  for (; table_item < (grub_linuxbios_table_item_t) ((char *) table_header
--						     + table_header->header_size
--						     + table_header->table_size);
--       table_item = (grub_linuxbios_table_item_t) ((char *) table_item + table_item->size))
--    {
--      if (table_item->tag == GRUB_LINUXBIOS_MEMBER_LINK
--         && check_signature ((grub_linuxbios_table_header_t) (grub_addr_t)
--                             *(grub_uint64_t *) (table_item + 1)))
--       {
--         table_header = (grub_linuxbios_table_header_t) (grub_addr_t)
--           *(grub_uint64_t *) (table_item + 1);
--         goto signature_found;   
--       }
--      if (hook (table_item, hook_data))
--       return 1;
--    }
-+    if (grub_linuxbios_check_signature (table_header))
-+      return table_header;
- 
-   return 0;
- }
-diff --git a/grub-core/term/i386/coreboot/cbmemc.c b/grub-core/term/i386/coreboot/cbmemc.c
-index 25e64a05c..129248c7f 100644
---- a/grub-core/term/i386/coreboot/cbmemc.c
-+++ b/grub-core/term/i386/coreboot/cbmemc.c
-@@ -23,7 +23,7 @@
- #include <grub/time.h>
- #include <grub/terminfo.h>
- #include <grub/dl.h>
--#include <grub/i386/coreboot/lbio.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/command.h>
- #include <grub/normal.h>
- 
-diff --git a/grub-core/video/i386/coreboot/cbfb.c b/grub-core/video/coreboot/cbfb.c
-similarity index 99%
-rename from grub-core/video/i386/coreboot/cbfb.c
-rename to grub-core/video/coreboot/cbfb.c
-index dede0c37e..9af81fa5b 100644
---- a/grub-core/video/i386/coreboot/cbfb.c
-+++ b/grub-core/video/coreboot/cbfb.c
-@@ -25,7 +25,7 @@
- #include <grub/mm.h>
- #include <grub/video.h>
- #include <grub/video_fb.h>
--#include <grub/machine/lbio.h>
-+#include <grub/coreboot/lbio.h>
- #include <grub/machine/console.h>
- 
- struct grub_linuxbios_table_framebuffer *grub_video_coreboot_fbtable;
-diff --git a/include/grub/i386/coreboot/lbio.h b/include/grub/coreboot/lbio.h
-similarity index 93%
-rename from include/grub/i386/coreboot/lbio.h
-rename to include/grub/coreboot/lbio.h
-index 1c3fa6f19..5076d36c7 100644
---- a/include/grub/i386/coreboot/lbio.h
-+++ b/include/grub/coreboot/lbio.h
-@@ -20,6 +20,9 @@
- #ifndef _GRUB_MACHINE_LBIO_HEADER
- #define _GRUB_MACHINE_LBIO_HEADER      1
- 
-+#include <grub/types.h>
-+#include <grub/err.h>
-+
- struct grub_linuxbios_table_header
- {
-   grub_uint8_t signature[4];
-@@ -102,4 +105,10 @@ EXPORT_FUNC(grub_linuxbios_table_iterate) (int (*hook) (grub_linuxbios_table_ite
- 					   void *),
- 					   void *hook_data);
- 
-+grub_linuxbios_table_header_t
-+grub_linuxbios_get_tables (void);
-+
-+int
-+grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header);
-+
- #endif
--- 
-2.14.3
-

0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch

@@ -1,8 +1,8 @@
-From 126f6952b853ea67e784650ed12f365ab7988f51 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 075/198] Mark po/exclude.pot as binary so git won't try to
- diff nonprintables.
+Subject: [PATCH] Mark po/exclude.pot as binary so git won't try to diff
+ nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -12,11 +12,8 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 
 diff --git a/.gitattributes b/.gitattributes
 new file mode 100644
-index 000000000..33ffaa404
+index 00000000000..33ffaa40460
 --- /dev/null
 +++ b/.gitattributes
 @@ -0,0 +1 @@
 +po/exclude.pot binary
--- 
-2.14.3
-

0017-Rename-uboot-halt.c-to-dummy-halt.c.patch

@@ -1,32 +0,0 @@
-From 1daa716c7017f1858de117a20a31da66815435c5 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 19:31:55 +0200
-Subject: [PATCH 017/198] Rename uboot/halt.c to dummy/halt.c.
-
-It's not U-Boot specific and it's a stub.
----
- grub-core/Makefile.core.def           | 2 +-
- grub-core/lib/{uboot => dummy}/halt.c | 0
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename grub-core/lib/{uboot => dummy}/halt.c (100%)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 45ed0fa6b..2a38bd4bc 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -841,7 +841,7 @@ module = {
-   efi = lib/efi/halt.c;
-   ieee1275 = lib/ieee1275/halt.c;
-   emu = lib/emu/halt.c;
--  uboot = lib/uboot/halt.c;
-+  uboot = lib/dummy/halt.c;
- };
- 
- module = {
-diff --git a/grub-core/lib/uboot/halt.c b/grub-core/lib/dummy/halt.c
-similarity index 100%
-rename from grub-core/lib/uboot/halt.c
-rename to grub-core/lib/dummy/halt.c
--- 
-2.14.3
-

0018-Make-efi-machines-load-an-env-block-from-a-variable.patch

@@ -1,7 +1,7 @@
-From 506b52759b2b2ad46e7b389979fcbaa78d68dab9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 076/198] Make efi machines load an env block from a variable
+Subject: [PATCH] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index a65c27f7f..1eb86bed3 100644
+index e92a7ef322f..f8065388213 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -191,6 +191,7 @@ kernel = {
@@ -22,7 +22,7 @@ index a65c27f7f..1eb86bed3 100644
    i386_multiboot = kern/i386/pc/acpi.c;
    i386_coreboot = kern/acpi.c;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 2c31847bf..f7782b6e1 100644
+index 3dfdf2d22b0..71d2279a0c1 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
 @@ -25,9 +25,40 @@
@@ -79,6 +79,3 @@ index 2c31847bf..f7782b6e1 100644
  			     char **device,
  			     char **path);
  
--- 
-2.14.3
-

0018-Rename-uboot-datetime-to-dummy-datetime.patch

@@ -1,58 +0,0 @@
-From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 19:37:29 +0200
-Subject: [PATCH 018/198] Rename uboot/datetime to dummy/datetime.
-
-It's just a stub and is not UBoot-specific.
----
- grub-core/Makefile.core.def               | 2 +-
- grub-core/lib/{uboot => dummy}/datetime.c | 5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
- rename grub-core/lib/{uboot => dummy}/datetime.c (91%)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 2a38bd4bc..6540dc951 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1552,7 +1552,7 @@ module = {
-   name = datetime;
-   cmos = lib/cmos_datetime.c;
-   efi = lib/efi/datetime.c;
--  uboot = lib/uboot/datetime.c;
-+  uboot = lib/dummy/datetime.c;
-   sparc64_ieee1275 = lib/ieee1275/datetime.c;
-   powerpc_ieee1275 = lib/ieee1275/datetime.c;
-   sparc64_ieee1275 = lib/ieee1275/cmos.c;
-diff --git a/grub-core/lib/uboot/datetime.c b/grub-core/lib/dummy/datetime.c
-similarity index 91%
-rename from grub-core/lib/uboot/datetime.c
-rename to grub-core/lib/dummy/datetime.c
-index 4be716928..cf693fc6b 100644
---- a/grub-core/lib/uboot/datetime.c
-+++ b/grub-core/lib/dummy/datetime.c
-@@ -18,7 +18,6 @@
- 
- #include <grub/types.h>
- #include <grub/symbol.h>
--#include <grub/uboot/uboot.h>
- #include <grub/datetime.h>
- #include <grub/dl.h>
- 
-@@ -30,12 +29,12 @@ grub_err_t
- grub_get_datetime (struct grub_datetime *datetime __attribute__ ((unused)))
- {
-   return grub_error (GRUB_ERR_INVALID_COMMAND,
--		     "can\'t get datetime using U-Boot");
-+		     "can\'t get datetime on this machine");
- }
- 
- grub_err_t
- grub_set_datetime (struct grub_datetime * datetime __attribute__ ((unused)))
- {
-   return grub_error (GRUB_ERR_INVALID_COMMAND,
--		     "can\'t set datetime using U-Boot");
-+		     "can\'t set datetime on this machine");
- }
--- 
-2.14.3
-

0019-DHCP-client-ID-and-UUID-options-added.patch

@@ -1,7 +1,7 @@
-From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 077/198] DHCP client ID and UUID options added.
+Subject: [PATCH] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@@ -9,7 +9,7 @@ Subject: [PATCH 077/198] DHCP client ID and UUID options added.
  2 files changed, 81 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 9e2fdb795..f03eeab2f 100644
+index 9e2fdb795f5..f03eeab2fb4 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -25,6 +25,49 @@
@@ -128,7 +128,7 @@ index 9e2fdb795..f03eeab2f 100644
  grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
  		  int argc, char **args)
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 1096b2432..e266bae23 100644
+index 1096b24322e..e266bae23f4 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -457,6 +457,8 @@ enum
@@ -140,6 +140,3 @@ index 1096b2432..e266bae23 100644
      GRUB_NET_BOOTP_END = 0xff
    };
  
--- 
-2.14.3
-

0019-arm-coreboot-Start-new-port.patch

@@ -1,827 +0,0 @@
-From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 20:53:28 +0200
-Subject: [PATCH 019/198] arm-coreboot: Start new port.
-
----
- configure.ac                           |   2 +
- gentpl.py                              |   8 ++-
- grub-core/Makefile.am                  |  10 +++
- grub-core/Makefile.core.def            |  18 ++++-
- grub-core/kern/arm/coreboot/cbtable.c  |  40 +++++++++++
- grub-core/kern/arm/coreboot/coreboot.S |  44 ++++++++++++
- grub-core/kern/arm/coreboot/init.c     | 127 +++++++++++++++++++++++++++++++++
- grub-core/kern/arm/coreboot/timer.c    |  65 +++++++++++++++++
- grub-core/kern/arm/startup.S           |   4 ++
- grub-core/kern/coreboot/cbtable.c      |   2 +
- grub-core/lib/dummy/reboot.c           |  32 +++++++++
- grub-core/loader/arm/linux.c           |   3 +
- include/grub/arm/coreboot/console.h    |  29 ++++++++
- include/grub/arm/coreboot/kernel.h     |  44 ++++++++++++
- include/grub/offsets.h                 |   6 ++
- util/grub-mkimagexx.c                  |  19 +++--
- util/mkimage.c                         |  41 ++++++++++-
- 17 files changed, 482 insertions(+), 12 deletions(-)
- create mode 100644 grub-core/kern/arm/coreboot/cbtable.c
- create mode 100644 grub-core/kern/arm/coreboot/coreboot.S
- create mode 100644 grub-core/kern/arm/coreboot/init.c
- create mode 100644 grub-core/kern/arm/coreboot/timer.c
- create mode 100644 grub-core/lib/dummy/reboot.c
- create mode 100644 include/grub/arm/coreboot/console.h
- create mode 100644 include/grub/arm/coreboot/kernel.h
-
-diff --git a/configure.ac b/configure.ac
-index ee2c86537..571f7a0b5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -167,6 +167,7 @@ case "$target_cpu"-"$platform" in
-   mipsel-fuloong) platform=loongson ;;
-   mipsel-loongson) ;;
-   arm-uboot) ;;
-+  arm-coreboot) ;;
-   arm-efi) ;;
-   arm64-efi) ;;
-   *-emu) ;;
-@@ -1918,6 +1919,7 @@ AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])
- AM_CONDITIONAL([COND_mipseb], [test x$target_cpu = xmips])
- AM_CONDITIONAL([COND_arm], [test x$target_cpu = xarm ])
- AM_CONDITIONAL([COND_arm_uboot], [test x$target_cpu = xarm -a x$platform = xuboot])
-+AM_CONDITIONAL([COND_arm_coreboot], [test x$target_cpu = xarm -a x$platform = xcoreboot])
- AM_CONDITIONAL([COND_arm_efi], [test x$target_cpu = xarm -a x$platform = xefi])
- AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ])
- AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi])
-diff --git a/gentpl.py b/gentpl.py
-index f08bcc404..ed268178b 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -31,7 +31,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
-                    "i386_xen", "x86_64_xen",
-                    "mips_loongson", "sparc64_ieee1275",
-                    "powerpc_ieee1275", "mips_arc", "ia64_efi",
--                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi" ]
-+                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",
-+                   "arm_coreboot"]
- 
- GROUPS = {}
- 
-@@ -44,7 +45,7 @@ GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
- GROUPS["mips"]     = [ "mips_loongson", "mips_qemu_mips", "mips_arc" ]
- GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]
- GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]
--GROUPS["arm"]      = [ "arm_uboot", "arm_efi" ]
-+GROUPS["arm"]      = [ "arm_uboot", "arm_efi", "arm_coreboot" ]
- GROUPS["arm64"]    = [ "arm64_efi" ]
- 
- # Groups based on firmware
-@@ -52,6 +53,7 @@ GROUPS["efi"]  = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi"
- GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
- GROUPS["uboot"] = [ "arm_uboot" ]
- GROUPS["xen"]  = [ "i386_xen", "x86_64_xen" ]
-+GROUPS["coreboot"]  = [ "i386_coreboot", "arm_coreboot" ]
- 
- # emu is a special case so many core functionality isn't needed on this platform
- GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")
-@@ -64,7 +66,7 @@ GROUPS["pci"]      = GROUPS["x86"] + ["mips_loongson"]
- GROUPS["usb"]      = GROUPS["pci"]
- 
- # If gfxterm is main output console integrate it into kernel
--GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ]
-+GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]
- GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
- for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
- 
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 781d0ffbf..bec058554 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -239,6 +239,16 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
- endif
- 
-+if COND_arm_coreboot
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h
-+endif
-+
- if COND_arm_efi
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6540dc951..411dca46b 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -92,6 +92,8 @@ kernel = {
-   emu_cppflags = '$(CPPFLAGS_GNULIB)';
-   arm_uboot_ldflags       = '-Wl,-r,-d';
-   arm_uboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
-+  arm_coreboot_ldflags       = '-Wl,-r,-d';
-+  arm_coreboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
- 
-   i386_pc_startup = kern/i386/pc/startup.S;
-   i386_efi_startup = kern/i386/efi/startup.S;
-@@ -106,6 +108,7 @@ kernel = {
-   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
-   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
-   arm_uboot_startup = kern/arm/startup.S;
-+  arm_coreboot_startup = kern/arm/startup.S;
-   arm_efi_startup = kern/arm/efi/startup.S;
-   arm64_efi_startup = kern/arm64/efi/startup.S;
- 
-@@ -152,6 +155,10 @@ kernel = {
-   arm_uboot = kern/arm/uboot/init.c;
-   arm_uboot = kern/arm/uboot/uboot.S;
- 
-+  arm_coreboot = kern/arm/coreboot/init.c;
-+  arm_coreboot = kern/arm/coreboot/timer.c;
-+  arm_coreboot = kern/arm/coreboot/coreboot.S;
-+
-   terminfoinkernel = term/terminfo.c;
-   terminfoinkernel = term/tparm.c;
-   terminfoinkernel = commands/extcmd.c;
-@@ -166,7 +173,7 @@ kernel = {
-   i386_multiboot = kern/i386/coreboot/init.c;
-   i386_qemu = kern/i386/qemu/init.c;
-   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
--  i386_coreboot = video/coreboot/cbfb.c;
-+  coreboot = video/coreboot/cbfb.c;
- 
-   efi = disk/efi/efidisk.c;
-   efi = kern/efi/efi.c;
-@@ -227,9 +234,10 @@ kernel = {
-   i386_qemu = kern/vga_init.c;
-   i386_qemu = kern/i386/qemu/mmap.c;
- 
--  i386_coreboot = kern/coreboot/mmap.c;
-+  coreboot = kern/coreboot/mmap.c;
-   i386_coreboot = kern/i386/coreboot/cbtable.c;
--  i386_coreboot = kern/coreboot/cbtable.c;
-+  coreboot = kern/coreboot/cbtable.c;
-+  arm_coreboot = kern/arm/coreboot/cbtable.c;
- 
-   i386_multiboot = kern/i386/multiboot_mmap.c;
- 
-@@ -758,6 +766,7 @@ module = {
-   enable = arm_efi;
-   enable = arm64_efi;
-   enable = arm_uboot;
-+  enable = arm_coreboot;
- };
- 
- module = {
-@@ -842,6 +851,7 @@ module = {
-   ieee1275 = lib/ieee1275/halt.c;
-   emu = lib/emu/halt.c;
-   uboot = lib/dummy/halt.c;
-+  arm_coreboot = lib/dummy/halt.c;
- };
- 
- module = {
-@@ -859,6 +869,7 @@ module = {
-   mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
-   xen = lib/xen/reboot.c;
-   uboot = lib/uboot/reboot.c;
-+  arm_coreboot = lib/dummy/reboot.c;
-   common = commands/reboot.c;
- };
- 
-@@ -1553,6 +1564,7 @@ module = {
-   cmos = lib/cmos_datetime.c;
-   efi = lib/efi/datetime.c;
-   uboot = lib/dummy/datetime.c;
-+  arm_coreboot = lib/dummy/datetime.c;
-   sparc64_ieee1275 = lib/ieee1275/datetime.c;
-   powerpc_ieee1275 = lib/ieee1275/datetime.c;
-   sparc64_ieee1275 = lib/ieee1275/cmos.c;
-diff --git a/grub-core/kern/arm/coreboot/cbtable.c b/grub-core/kern/arm/coreboot/cbtable.c
-new file mode 100644
-index 000000000..8a655bb5c
---- /dev/null
-+++ b/grub-core/kern/arm/coreboot/cbtable.c
-@@ -0,0 +1,40 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2007,2008,2013  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/>.
-+ */
-+
-+#include <grub/coreboot/lbio.h>
-+#include <grub/types.h>
-+#include <grub/err.h>
-+#include <grub/misc.h>
-+#include <grub/dl.h>
-+#include <grub/arm/startup.h>
-+
-+GRUB_MOD_LICENSE ("GPLv3+");
-+
-+#pragma GCC diagnostic ignored "-Wcast-align"
-+
-+grub_linuxbios_table_header_t
-+grub_linuxbios_get_tables (void)
-+{
-+  grub_linuxbios_table_header_t table_header
-+    = (grub_linuxbios_table_header_t) grub_arm_saved_registers.r[0];
-+
-+  if (!grub_linuxbios_check_signature (table_header))
-+    return 0;
-+
-+  return table_header;
-+}
-diff --git a/grub-core/kern/arm/coreboot/coreboot.S b/grub-core/kern/arm/coreboot/coreboot.S
-new file mode 100644
-index 000000000..a1104526c
---- /dev/null
-+++ b/grub-core/kern/arm/coreboot/coreboot.S
-@@ -0,0 +1,44 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2016  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/>.
-+ */
-+
-+#include <grub/symbol.h>
-+
-+	.file	"coreboot.S"
-+	.text
-+	.syntax	unified
-+#if !defined (__thumb2__)
-+	.arch	armv7a
-+	.arm
-+#else
-+	.arch	armv7
-+	.thumb
-+#endif
-+
-+FUNCTION(grub_arm_pfr1)
-+	mrc p15, 0, r0, c0, c1, 1
-+	bx	lr
-+
-+FUNCTION(grub_armv7_get_timer_value)
-+	isb
-+	mrrc p15, 1, r0, r1, c14
-+	bx	lr
-+
-+FUNCTION(grub_armv7_get_timer_frequency)
-+	mrc p15, 0, r0, c14, c0, 0
-+	bx	lr
-+
-diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
-new file mode 100644
-index 000000000..51ecaceb0
---- /dev/null
-+++ b/grub-core/kern/arm/coreboot/init.c
-@@ -0,0 +1,127 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2013  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/>.
-+ */
-+
-+#include <grub/kernel.h>
-+#include <grub/mm.h>
-+#include <grub/memory.h>
-+#include <grub/machine/console.h>
-+#include <grub/machine/kernel.h>
-+#include <grub/offsets.h>
-+#include <grub/types.h>
-+#include <grub/err.h>
-+#include <grub/dl.h>
-+#include <grub/misc.h>
-+#include <grub/loader.h>
-+#include <grub/env.h>
-+#include <grub/cache.h>
-+#include <grub/time.h>
-+#include <grub/symbol.h>
-+#include <grub/video.h>
-+#include <grub/coreboot/lbio.h>
-+
-+extern grub_uint8_t _start[];
-+extern grub_uint8_t _end[];
-+extern grub_uint8_t _edata[];
-+grub_addr_t start_of_ram = ~(grub_addr_t)0;
-+
-+void  __attribute__ ((noreturn))
-+grub_exit (void)
-+{
-+  /* We can't use grub_fatal() in this function.  This would create an infinite
-+     loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
-+  while (1)
-+    grub_cpu_idle ();
-+}
-+
-+static grub_uint64_t modend;
-+static int have_memory = 0;
-+
-+/* Helper for grub_machine_init.  */
-+static int
-+heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
-+	   void *data __attribute__ ((unused)))
-+{
-+  grub_uint64_t begin = addr, end = addr + size;
-+
-+#if GRUB_CPU_SIZEOF_VOID_P == 4
-+  /* Restrict ourselves to 32-bit memory space.  */
-+  if (begin > GRUB_ULONG_MAX)
-+    return 0;
-+  if (end > GRUB_ULONG_MAX)
-+    end = GRUB_ULONG_MAX;
-+#endif
-+
-+  if (start_of_ram > begin)
-+    start_of_ram = begin;
-+
-+  if (type != GRUB_MEMORY_AVAILABLE)
-+    return 0;
-+
-+  if (modend && begin < modend)
-+    {
-+      if (begin < (grub_addr_t)_start)
-+	{
-+	  grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) ((grub_addr_t)_start - begin));
-+	  have_memory = 1;
-+	}
-+      begin = modend;
-+    }
-+
-+  /* Avoid DMA problems.  */
-+  if (end >= 0xfe000000)
-+    end = 0xfe000000;
-+
-+  if (end <= begin)
-+    return 0;
-+
-+  grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) (end - begin));
-+
-+  have_memory = 1;
-+
-+  return 0;
-+}
-+
-+void
-+grub_machine_init (void)
-+{
-+  modend = grub_modules_get_end ();
-+
-+  grub_video_coreboot_fb_early_init ();
-+
-+  grub_machine_mmap_iterate (heap_init, NULL);
-+  if (!have_memory)
-+    grub_fatal ("No memory found");
-+
-+  grub_video_coreboot_fb_late_init ();
-+
-+  grub_font_init ();
-+  grub_gfxterm_init ();
-+
-+  grub_machine_timer_init ();
-+}
-+
-+void
-+grub_machine_get_bootlocation (char **device __attribute__ ((unused)),
-+			       char **path __attribute__ ((unused)))
-+{
-+}
-+
-+void
-+grub_machine_fini (int flags __attribute__ ((unused)))
-+{
-+}
-diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c
-new file mode 100644
-index 000000000..ebefb99d5
---- /dev/null
-+++ b/grub-core/kern/arm/coreboot/timer.c
-@@ -0,0 +1,65 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2016  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/>.
-+ */
-+
-+#include <grub/mm.h>
-+#include <grub/machine/kernel.h>
-+#include <grub/types.h>
-+#include <grub/err.h>
-+#include <grub/time.h>
-+#include <grub/misc.h>
-+
-+grub_uint64_t
-+grub_armv7_get_timer_value(void);
-+
-+grub_uint32_t
-+grub_armv7_get_timer_frequency(void);
-+
-+grub_uint32_t
-+grub_arm_pfr1(void);
-+
-+static int have_timer = 0;
-+static grub_uint32_t timer_frequency_in_khz;
-+
-+static grub_uint64_t
-+generic_get_time_ms (void)
-+{
-+  return grub_divmod64 (grub_armv7_get_timer_value(), timer_frequency_in_khz, 0);
-+}
-+
-+static int
-+try_generic_timer (void)
-+{
-+  if (((grub_arm_pfr1 () >> 16) & 0xf) != 1)
-+    return 0;
-+  grub_printf ("freq = %x\n", grub_armv7_get_timer_frequency());
-+  timer_frequency_in_khz = 0x016e3600 / 1000; //grub_armv7_get_timer_frequency() / 1000;
-+  if (timer_frequency_in_khz == 0)
-+    return 0;
-+  grub_install_get_time_ms (generic_get_time_ms);
-+  have_timer = 1;
-+  return 1;
-+}
-+
-+void
-+grub_machine_timer_init (void)
-+{
-+  if (!have_timer)
-+    try_generic_timer ();
-+  if (!have_timer)
-+    grub_fatal ("No timer found");
-+}
-diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
-index 640837cba..3946fe8e1 100644
---- a/grub-core/kern/arm/startup.S
-+++ b/grub-core/kern/arm/startup.S
-@@ -24,6 +24,7 @@
-  * GRUB is called from U-Boot as a Linux Kernel type image, which
-  * means among other things that it always enters in ARM state.
-  *
-+ * coreboot starts in ARM mode as well.
-  *
-  * Overview of GRUB image layout:
-  *
-@@ -127,6 +128,8 @@ reloc_done:
- 
- 	str     r1, EXT_C(grub_modbase)
- 
-+	/* Coreboot already places modules at right place.  */
-+#ifndef GRUB_MACHINE_COREBOOT
- 	add	r1, r1, r2
- 	add	r0, r0, r2
- 	sub     r1, r1, #4
-@@ -136,6 +139,7 @@ reloc_done:
- 	str	r3, [r1], #-4			@ *dst-- = r3 
- 	subs	r2, #4				@ remaining -= 4
- 	bne	1b				@ while remaining != 0
-+#endif
- 
- 	@ Since we _are_ the C run-time, we need to manually zero the BSS
- 	@ region before continuing
-diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c
-index 996d3f407..aec63dbd1 100644
---- a/grub-core/kern/coreboot/cbtable.c
-+++ b/grub-core/kern/coreboot/cbtable.c
-@@ -23,6 +23,8 @@
- #include <grub/misc.h>
- #include <grub/dl.h>
- 
-+#pragma GCC diagnostic ignored "-Wcast-align"
-+
- /* Helper for grub_linuxbios_table_iterate.  */
- int
- grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header)
-diff --git a/grub-core/lib/dummy/reboot.c b/grub-core/lib/dummy/reboot.c
-new file mode 100644
-index 000000000..b8cbed8f8
---- /dev/null
-+++ b/grub-core/lib/dummy/reboot.c
-@@ -0,0 +1,32 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2013  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/>.
-+ */
-+
-+#include <grub/misc.h>
-+#include <grub/mm.h>
-+#include <grub/kernel.h>
-+#include <grub/loader.h>
-+
-+void
-+grub_reboot (void)
-+{
-+  grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
-+
-+  /* Just stop here */
-+
-+  while (1);
-+}
-diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 5b39f02bb..01374ee78 100644
---- a/grub-core/loader/arm/linux.c
-+++ b/grub-core/loader/arm/linux.c
-@@ -31,6 +31,8 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-+#ifndef GRUB_MACHINE_COREBOOT
-+
- static grub_dl_t my_mod;
- 
- static grub_addr_t initrd_start;
-@@ -527,3 +529,4 @@ GRUB_MOD_FINI (linux)
-   grub_unregister_command (cmd_initrd);
-   grub_unregister_command (cmd_devicetree);
- }
-+#endif
-diff --git a/include/grub/arm/coreboot/console.h b/include/grub/arm/coreboot/console.h
-new file mode 100644
-index 000000000..13a14b783
---- /dev/null
-+++ b/include/grub/arm/coreboot/console.h
-@@ -0,0 +1,29 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 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_MACHINE_CONSOLE_HEADER
-+#define GRUB_MACHINE_CONSOLE_HEADER	1
-+
-+void grub_video_coreboot_fb_init (void);
-+void grub_video_coreboot_fb_early_init (void);
-+void grub_video_coreboot_fb_late_init (void);
-+void grub_video_coreboot_fb_fini (void);
-+
-+extern struct grub_linuxbios_table_framebuffer *grub_video_coreboot_fbtable;
-+
-+#endif /* ! GRUB_MACHINE_CONSOLE_HEADER */
-diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h
-new file mode 100644
-index 000000000..09cd7fe32
---- /dev/null
-+++ b/include/grub/arm/coreboot/kernel.h
-@@ -0,0 +1,44 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2013 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_KERNEL_MACHINE_HEADER
-+#define GRUB_KERNEL_MACHINE_HEADER	1
-+
-+#ifndef ASM_FILE
-+
-+#include <grub/symbol.h>
-+#include <grub/types.h>
-+
-+struct grub_fdt_board
-+{
-+  const char *vendor, *part;
-+  const grub_uint8_t *dtb;
-+  grub_size_t dtb_size;
-+};
-+
-+extern struct grub_fdt_board grub_fdt_boards[];
-+void grub_machine_timer_init (void);
-+void grub_pl050_init (void);
-+void
-+grub_cros_init (void);
-+extern grub_addr_t EXPORT_VAR (start_of_ram);
-+#endif /* ! ASM_FILE */
-+
-+#define GRUB_KERNEL_MACHINE_STACK_SIZE GRUB_KERNEL_ARM_STACK_SIZE
-+
-+#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
-diff --git a/include/grub/offsets.h b/include/grub/offsets.h
-index c88c86d4d..bf0689fc9 100644
---- a/include/grub/offsets.h
-+++ b/include/grub/offsets.h
-@@ -122,6 +122,12 @@
- #define GRUB_KERNEL_ARM_UBOOT_MOD_ALIGN 	0x8
- #define GRUB_KERNEL_ARM_UBOOT_TOTAL_MODULE_SIZE	0x4
- 
-+#define GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN 	0x8
-+#define GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE	0x4
-+
-+#define GRUB_KERNEL_ARM_STACK_SIZE 0x40000
-+#define GRUB_KERNEL_ARM_COREBOOT_MOD_GAP (GRUB_KERNEL_ARM_STACK_SIZE + 1024)
-+
- /* Minimal gap between _end and the start of the modules.  It's a hack
-    for PowerMac to prevent "CLAIM failed" error.  The real fix is to
-    rewrite grub-mkimage to generate valid ELF files.  */
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index 3fab93e20..a2bb05439 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -87,7 +87,8 @@ struct fixup_block_list
- static int
- is_relocatable (const struct grub_install_image_target_desc *image_target)
- {
--  return image_target->id == IMAGE_EFI || image_target->id == IMAGE_UBOOT;
-+  return image_target->id == IMAGE_EFI || image_target->id == IMAGE_UBOOT
-+    || (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM);
- }
- 
- #ifdef MKIMAGE_ELF32
-@@ -274,7 +275,10 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-     {
-       grub_uint32_t target_addr_mods;
-       phdr->p_filesz = grub_host_to_target32 (layout->kernel_size);
--      phdr->p_memsz = grub_host_to_target32 (layout->kernel_size + layout->bss_size);
-+      if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM)
-+	phdr->p_memsz = grub_host_to_target32 (layout->kernel_size);
-+      else
-+	phdr->p_memsz = grub_host_to_target32 (layout->kernel_size + layout->bss_size);
- 
-       phdr++;
-       phdr->p_type = grub_host_to_target32 (PT_GNU_STACK);
-@@ -290,8 +294,12 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
-       phdr->p_filesz = phdr->p_memsz
- 	= grub_host_to_target32 (*core_size - layout->kernel_size);
- 
--      if (image_target->id == IMAGE_COREBOOT)
-+      if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_386)
- 	target_addr_mods = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
-+      else if (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM)
-+	target_addr_mods = ALIGN_UP (target_addr + layout->end
-+				     + image_target->mod_gap,
-+				     image_target->mod_align);
-       else
- 	target_addr_mods = ALIGN_UP (target_addr + layout->kernel_size + layout->bss_size
- 				     + image_target->mod_gap,
-@@ -1876,7 +1884,7 @@ SUFFIX (locate_sections) (Elf_Ehdr *e, const char *kernel_path,
-      Platforms other than EFI and U-boot shouldn't have .bss in
-      their binaries as we build with -Wl,-Ttext.
-   */
--  if (image_target->id != IMAGE_UBOOT)
-+  if (image_target->id == IMAGE_EFI || !is_relocatable (image_target))
-     layout->kernel_size = layout->end;
- 
-   return section_addresses;
-@@ -1979,6 +1987,7 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
-   if (image_target->id == IMAGE_SPARC64_AOUT
-       || image_target->id == IMAGE_SPARC64_RAW
-       || image_target->id == IMAGE_UBOOT
-+      || image_target->id == IMAGE_COREBOOT
-       || image_target->id == IMAGE_SPARC64_CDCORE)
-     layout->kernel_size = ALIGN_UP (layout->kernel_size, image_target->mod_align);
- 
-@@ -2084,7 +2093,7 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
- 	   Platforms other than EFI and U-boot shouldn't have .bss in
- 	   their binaries as we build with -Wl,-Ttext.
- 	*/
--	|| (SUFFIX (is_bss_section) (s, image_target) && (image_target->id != IMAGE_UBOOT))
-+	|| (SUFFIX (is_bss_section) (s, image_target) && (image_target->id == IMAGE_EFI || !is_relocatable (image_target)))
- 	|| SUFFIX (is_text_section) (s, image_target))
-       {
- 	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
-diff --git a/util/mkimage.c b/util/mkimage.c
-index 528166c87..6aa77ed73 100644
---- a/util/mkimage.c
-+++ b/util/mkimage.c
-@@ -533,6 +533,45 @@ static const struct grub_install_image_target_desc image_targets[] =
-       .mod_align = GRUB_KERNEL_ARM_UBOOT_MOD_ALIGN,
-       .link_align = 4
-     },
-+    /* For coreboot versions that don't support self-relocating images. */
-+    {
-+      .dirname = "arm-coreboot-vexpress",
-+      .names = { "arm-coreboot-vexpress", NULL },
-+      .voidp_sizeof = 4,
-+      .bigendian = 0,
-+      .id = IMAGE_COREBOOT,
-+      .flags = PLATFORM_FLAGS_NONE,
-+      .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
-+      .decompressor_compressed_size = TARGET_NO_FIELD,
-+      .decompressor_uncompressed_size = TARGET_NO_FIELD,
-+      .decompressor_uncompressed_addr = TARGET_NO_FIELD,
-+      .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
-+      .vaddr_offset = 0,
-+      .elf_target = EM_ARM,
-+      .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
-+      .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
-+      .link_align = 4,
-+      .link_addr = 0x62000000,
-+    },
-+    {
-+      .dirname = "arm-coreboot-veyron",
-+      .names = { "arm-coreboot-veyron", NULL },
-+      .voidp_sizeof = 4,
-+      .bigendian = 0,
-+      .id = IMAGE_COREBOOT,
-+      .flags = PLATFORM_FLAGS_NONE,
-+      .total_module_size = GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE,
-+      .decompressor_compressed_size = TARGET_NO_FIELD,
-+      .decompressor_uncompressed_size = TARGET_NO_FIELD,
-+      .decompressor_uncompressed_addr = TARGET_NO_FIELD,
-+      .section_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
-+      .vaddr_offset = 0,
-+      .elf_target = EM_ARM,
-+      .mod_gap = GRUB_KERNEL_ARM_COREBOOT_MOD_GAP,
-+      .mod_align = GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN,
-+      .link_align = 4,
-+      .link_addr = 0x43000000,
-+    },
-     {
-       .dirname = "arm-efi",
-       .names = { "arm-efi", NULL },
-@@ -1033,7 +1072,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
- 	/* fallthrough */
-     case IMAGE_COREBOOT:
-     case IMAGE_QEMU:
--	if (layout.kernel_size + layout.bss_size + GRUB_KERNEL_I386_PC_LINK_ADDR > 0x68000)
-+	if (image_target->elf_target != EM_ARM && layout.kernel_size + layout.bss_size + GRUB_KERNEL_I386_PC_LINK_ADDR > 0x68000)
- 	  grub_util_error (_("kernel image is too big (0x%x > 0x%x)"),
- 			   (unsigned) layout.kernel_size + (unsigned) layout.bss_size
- 			   + GRUB_KERNEL_I386_PC_LINK_ADDR,
--- 
-2.14.3
-

0020-Add-support-for-device-tree-based-drivers.patch

@@ -1,851 +0,0 @@
-From fcbb723d4b1f7ad4687191562621dd0eb25f4d9e Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 21:19:59 +0200
-Subject: [PATCH 020/198] Add support for device-tree-based drivers.
-
----
- conf/Makefile.common               |   4 +-
- grub-core/Makefile.am              |  10 ++
- grub-core/Makefile.core.def        |   2 +
- grub-core/bus/fdt.c                | 255 +++++++++++++++++++++++++++++++++++++
- grub-core/kern/arm/coreboot/init.c |  20 +++
- grub-core/lib/fdt.c                | 142 +++++++++++++++------
- include/grub/fdt.h                 |  23 ++--
- include/grub/fdtbus.h              |  73 +++++++++++
- include/grub/kernel.h              |   3 +-
- include/grub/util/install.h        |   2 +-
- util/grub-install-common.c         |   2 +-
- util/grub-mkimage.c                |  11 +-
- util/mkimage.c                     |  24 +++-
- 13 files changed, 519 insertions(+), 52 deletions(-)
- create mode 100644 grub-core/bus/fdt.c
- create mode 100644 include/grub/fdtbus.h
-
-diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 11296b550..311da61c6 100644
---- a/conf/Makefile.common
-+++ b/conf/Makefile.common
-@@ -86,9 +86,11 @@ CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST
- CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)'
- CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)'
- CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
-+CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
- CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
- 	$(CPPFLAGS_PARTTOOL_LIST) $(CPPFLAGS_PARTMAP_LIST) \
--	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST)
-+	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST) \
-+	$(CPPFLAGS_FDT_LIST)
- 
- # Define these variables to calm down automake
- 
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index bec058554..fc6ca3051 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -368,6 +368,16 @@ terminal.lst: $(MARKER_FILES)
- platform_DATA += terminal.lst
- CLEANFILES += terminal.lst
- 
-+fdt.lst: $(MARKER_FILES)
-+	(for pp in $^; do \
-+	  b=`basename $$pp .marker`; \
-+	  sed -n \
-+	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/i\1: $$b/;p;}" \
-+	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/o\1: $$b/;p;}" $$pp; \
-+	done) | sort -u > $@
-+platform_DATA += fdt.lst
-+CLEANFILES += fdt.lst
-+
- parttool.lst: $(MARKER_FILES)
- 	(for pp in $^; do \
- 	  b=`basename $$pp .marker`; \
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 411dca46b..77d0b019e 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -158,6 +158,8 @@ kernel = {
-   arm_coreboot = kern/arm/coreboot/init.c;
-   arm_coreboot = kern/arm/coreboot/timer.c;
-   arm_coreboot = kern/arm/coreboot/coreboot.S;
-+  arm_coreboot = lib/fdt.c;
-+  arm_coreboot = bus/fdt.c;
- 
-   terminfoinkernel = term/terminfo.c;
-   terminfoinkernel = term/tparm.c;
-diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c
-new file mode 100644
-index 000000000..6fb077000
---- /dev/null
-+++ b/grub-core/bus/fdt.c
-@@ -0,0 +1,255 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2016  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/>.
-+ */
-+
-+#include <grub/fdtbus.h>
-+#include <grub/fdt.h>
-+#include <grub/term.h>
-+
-+static const void *dtb;
-+static grub_size_t root_address_cells, root_size_cells;
-+/* Pointer to this symbol signals invalid mapping.  */
-+char grub_fdtbus_invalid_mapping[1];
-+
-+struct grub_fdtbus_dev
-+{
-+  struct grub_fdtbus_dev *next;
-+  struct grub_fdtbus_dev *parent;
-+  int node;
-+  struct grub_fdtbus_driver *driver;
-+};
-+
-+struct grub_fdtbus_dev *devs;
-+struct grub_fdtbus_driver *drivers;
-+
-+static int
-+is_compatible (struct grub_fdtbus_driver *driver,
-+	       int node)
-+{
-+  grub_size_t compatible_size;
-+  const char *compatible = grub_fdt_get_prop (dtb, node, "compatible",
-+					      &compatible_size);
-+  const char *compatible_end = compatible + compatible_size;
-+  while (compatible < compatible_end)
-+    {
-+      if (grub_strcmp (driver->compatible, compatible) == 0)
-+	return 1;
-+      compatible += grub_strlen (compatible) + 1;
-+    }
-+  return 0;
-+}
-+
-+static void
-+fdtbus_scan (struct grub_fdtbus_dev *parent)
-+{
-+  int node;
-+  for (node = grub_fdt_first_node (dtb, parent ? parent->node : 0); node >= 0;
-+       node = grub_fdt_next_node (dtb, node))
-+    {
-+      struct grub_fdtbus_dev *dev;
-+      struct grub_fdtbus_driver *driver;
-+      dev = grub_zalloc (sizeof (*dev));
-+      if (!dev)
-+	{
-+	  grub_print_error ();
-+	  return;
-+	}
-+      dev->node = node;
-+      dev->next = devs;
-+      dev->parent = parent;
-+      devs = dev;
-+      FOR_LIST_ELEMENTS(driver, drivers)
-+	if (!dev->driver && is_compatible (driver, node))
-+	  {
-+	    if (driver->attach(dev) == GRUB_ERR_NONE)
-+	      {
-+		dev->driver = driver;
-+		break;
-+	      }
-+	    grub_print_error ();
-+	  }
-+      fdtbus_scan (dev);
-+    }
-+}
-+
-+void
-+grub_fdtbus_register (struct grub_fdtbus_driver *driver)
-+{
-+  struct grub_fdtbus_dev *dev;
-+  grub_list_push (GRUB_AS_LIST_P (&drivers),
-+		  GRUB_AS_LIST (driver));
-+  for (dev = devs; dev; dev = dev->next)
-+    if (!dev->driver && is_compatible (driver, dev->node))
-+      {
-+	if (driver->attach(dev) == GRUB_ERR_NONE)
-+	  dev->driver = driver;
-+	grub_print_error ();
-+      }
-+}
-+
-+void
-+grub_fdtbus_unregister (struct grub_fdtbus_driver *driver)
-+{
-+  grub_list_remove (GRUB_AS_LIST (driver));
-+  struct grub_fdtbus_dev *dev;
-+  for (dev = devs; dev; dev = dev->next)
-+    if (dev->driver == driver)
-+      {
-+	if (driver->detach)
-+	  driver->detach(dev);
-+	dev->driver = 0;
-+      }
-+}
-+
-+void
-+grub_fdtbus_init (const void *dtb_in, grub_size_t size)
-+{
-+  if (!dtb_in || grub_fdt_check_header (dtb_in, size) < 0)
-+    grub_fatal ("invalid FDT");
-+  dtb = dtb_in;
-+  const grub_uint32_t *prop = grub_fdt_get_prop (dtb, 0, "#address-cells", 0);
-+  if (prop)
-+    root_address_cells = grub_be_to_cpu32 (*prop);
-+  else
-+    root_address_cells = 1;
-+
-+  prop = grub_fdt_get_prop (dtb, 0, "#size-cells", 0);
-+  if (prop)
-+    root_size_cells = grub_be_to_cpu32 (*prop);
-+  else
-+    root_size_cells = 1;
-+
-+  fdtbus_scan (0);
-+}
-+
-+static int
-+get_address_cells (const struct grub_fdtbus_dev *dev)
-+{
-+  const grub_uint32_t *prop;
-+  if (!dev)
-+    return root_address_cells;
-+  prop = grub_fdt_get_prop (dtb, dev->node, "#address-cells", 0);
-+  if (prop)
-+    return grub_be_to_cpu32 (*prop);
-+  return 1;
-+}
-+
-+static int
-+get_size_cells (const struct grub_fdtbus_dev *dev)
-+{
-+  const grub_uint32_t *prop;
-+  if (!dev)
-+    return root_size_cells;
-+  prop = grub_fdt_get_prop (dtb, dev->node, "#size-cells", 0);
-+  if (prop)
-+    return grub_be_to_cpu32 (*prop);
-+  return 1;
-+}
-+
-+static grub_uint64_t
-+get64 (const grub_uint32_t *reg, grub_size_t cells)
-+{
-+  grub_uint64_t val = 0;
-+  if (cells >= 1)
-+    val = grub_be_to_cpu32 (reg[cells - 1]);
-+  if (cells >= 2)
-+    val |= ((grub_uint64_t) grub_be_to_cpu32 (reg[cells - 2])) << 32;
-+  return val;
-+}
-+
-+static volatile void *
-+translate (const struct grub_fdtbus_dev *dev, const grub_uint32_t *reg)
-+{
-+  volatile void *ret;
-+  const grub_uint32_t *ranges;
-+  grub_size_t ranges_size, cells_per_mapping;
-+  grub_size_t parent_address_cells, child_address_cells, child_size_cells;
-+  grub_size_t nmappings, i;
-+  if (dev == 0)
-+    {
-+      grub_uint64_t val;
-+      val = get64 (reg, root_address_cells);
-+      if (sizeof (void *) == 4 && (val >> 32))
-+	return grub_fdtbus_invalid_mapping;
-+      return (void *) (grub_addr_t) val;
-+    }
-+  ranges = grub_fdt_get_prop (dtb, dev->node, "ranges", &ranges_size);
-+  if (!ranges)
-+    return grub_fdtbus_invalid_mapping;
-+  if (ranges_size == 0)
-+    return translate (dev->parent, reg);
-+  parent_address_cells = get_address_cells (dev->parent);
-+  child_address_cells = get_address_cells (dev);
-+  child_size_cells = get_size_cells (dev);
-+  cells_per_mapping = parent_address_cells + child_address_cells + child_size_cells;
-+  nmappings = ranges_size / 4 / cells_per_mapping;
-+  for (i = 0; i < nmappings; i++)
-+    {
-+      const grub_uint32_t *child_addr = &ranges[i * cells_per_mapping];
-+      const grub_uint32_t *parent_addr = child_addr + child_address_cells;
-+      grub_uint64_t child_size = get64 (parent_addr + parent_address_cells, child_size_cells);
-+
-+      if (child_address_cells > 2 && grub_memcmp (reg, child_addr, (child_address_cells - 2) * 4) != 0)
-+	continue;
-+      if (get64 (reg, child_address_cells) < get64 (child_addr, child_address_cells))
-+	continue;
-+
-+      grub_uint64_t offset = get64 (reg, child_address_cells) - get64 (child_addr, child_address_cells);
-+      if (offset >= child_size)
-+	continue;
-+
-+      ret = translate (dev->parent, parent_addr);
-+      if (grub_fdtbus_is_mapping_valid (ret))
-+	ret = (volatile char *) ret + offset;
-+      return ret;
-+    }
-+  return grub_fdtbus_invalid_mapping;
-+}
-+
-+volatile void *
-+grub_fdtbus_map_reg (const struct grub_fdtbus_dev *dev, int regno, grub_size_t *size)
-+{
-+  grub_size_t address_cells, size_cells;
-+  address_cells = get_address_cells (dev->parent);
-+  size_cells = get_size_cells (dev->parent);
-+  const grub_uint32_t *reg = grub_fdt_get_prop (dtb, dev->node, "reg", 0);
-+  if (size && size_cells)
-+    *size = reg[(address_cells + size_cells) * regno + address_cells];
-+  if (size && !size_cells)
-+    *size = 0;
-+  return translate (dev->parent, reg + (address_cells + size_cells) * regno);
-+}
-+
-+const char *
-+grub_fdtbus_get_name (const struct grub_fdtbus_dev *dev)
-+{
-+  return grub_fdt_get_nodename (dtb, dev->node);
-+}
-+
-+const void *
-+grub_fdtbus_get_prop (const struct grub_fdtbus_dev *dev,
-+		      const char *name,
-+		      grub_uint32_t *len)
-+{
-+  return grub_fdt_get_prop (dtb, dev->node, name, len);
-+}
-+
-+const void *
-+grub_fdtbus_get_fdt (void)
-+{
-+  return dtb;
-+}
-diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
-index 51ecaceb0..aec75c672 100644
---- a/grub-core/kern/arm/coreboot/init.c
-+++ b/grub-core/kern/arm/coreboot/init.c
-@@ -33,6 +33,7 @@
- #include <grub/symbol.h>
- #include <grub/video.h>
- #include <grub/coreboot/lbio.h>
-+#include <grub/fdtbus.h>
- 
- extern grub_uint8_t _start[];
- extern grub_uint8_t _end[];
-@@ -99,6 +100,10 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
- void
- grub_machine_init (void)
- {
-+  struct grub_module_header *header;
-+  void *dtb = 0;
-+  grub_size_t dtb_size = 0;
-+
-   modend = grub_modules_get_end ();
- 
-   grub_video_coreboot_fb_early_init ();
-@@ -112,6 +117,21 @@ grub_machine_init (void)
-   grub_font_init ();
-   grub_gfxterm_init ();
- 
-+  FOR_MODULES (header)
-+    if (header->type == OBJ_TYPE_DTB)
-+      {
-+	char *dtb_orig_addr, *dtb_copy;
-+	dtb_orig_addr = (char *) header + sizeof (struct grub_module_header);
-+
-+	dtb_size = header->size - sizeof (struct grub_module_header);
-+	dtb = dtb_copy = grub_malloc (dtb_size);
-+	grub_memmove (dtb_copy, dtb_orig_addr, dtb_size);
-+	break;
-+      }
-+  if (!dtb)
-+    grub_fatal ("No DTB found");
-+  grub_fdtbus_init (dtb, dtb_size);
-+
-   grub_machine_timer_init ();
- }
- 
-diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index b5d520f20..bdc630244 100644
---- a/grub-core/lib/fdt.c
-+++ b/grub-core/lib/fdt.c
-@@ -102,13 +102,13 @@ static grub_uint32_t *get_next_node (const void *fdt, char *node_name)
- static int get_mem_rsvmap_size (const void *fdt)
- {
-   int size = 0;
--  grub_uint64_t *ptr = (void *) ((grub_addr_t) fdt
--                                 + grub_fdt_get_off_mem_rsvmap (fdt));
-+  grub_unaligned_uint64_t *ptr = (void *) ((grub_addr_t) fdt
-+					   + grub_fdt_get_off_mem_rsvmap (fdt));
- 
-   do
-   {
-     size += 2 * sizeof(*ptr);
--    if (!*ptr && !*(ptr + 1))
-+    if (!ptr[0].val && !ptr[1].val)
-       return size;
-     ptr += 2;
-   } while ((grub_addr_t) ptr <= (grub_addr_t) fdt + grub_fdt_get_totalsize (fdt)
-@@ -229,7 +229,7 @@ static int rearrange_blocks (void *fdt, unsigned int clearance)
-   return 0;
- }
- 
--static grub_uint32_t *find_prop (void *fdt, unsigned int nodeoffset,
-+static grub_uint32_t *find_prop (const void *fdt, unsigned int nodeoffset,
- 				 const char *name)
- {
-   grub_uint32_t *prop = (void *) ((grub_addr_t) fdt
-@@ -268,9 +268,9 @@ static grub_uint32_t *find_prop (void *fdt, unsigned int nodeoffset,
-    the size allocated for the FDT; if this function is called before the other
-    functions in this file and returns success, the other functions are
-    guaranteed not to access memory locations outside the allocated memory. */
--int grub_fdt_check_header_nosize (void *fdt)
-+int grub_fdt_check_header_nosize (const void *fdt)
- {
--  if (((grub_addr_t) fdt & 0x7) || (grub_fdt_get_magic (fdt) != FDT_MAGIC)
-+  if (((grub_addr_t) fdt & 0x3) || (grub_fdt_get_magic (fdt) != FDT_MAGIC)
-       || (grub_fdt_get_version (fdt) < FDT_SUPPORTED_VERSION)
-       || (grub_fdt_get_last_comp_version (fdt) > FDT_SUPPORTED_VERSION)
-       || (grub_fdt_get_off_dt_struct (fdt) & 0x00000003)
-@@ -286,7 +286,7 @@ int grub_fdt_check_header_nosize (void *fdt)
-   return 0;
- }
- 
--int grub_fdt_check_header (void *fdt, unsigned int size)
-+int grub_fdt_check_header (const void *fdt, unsigned int size)
- {
-   if (size < sizeof (grub_fdt_header_t)
-       || (grub_fdt_get_totalsize (fdt) > size)
-@@ -295,41 +295,29 @@ int grub_fdt_check_header (void *fdt, unsigned int size)
-   return 0;
- }
- 
--/* Find a direct sub-node of a given parent node. */
--int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
--			   const char *name)
-+static const grub_uint32_t *
-+advance_token (const void *fdt, const grub_uint32_t *token, const grub_uint32_t *end, int skip_current)
- {
--  grub_uint32_t *token, *end;
--  char *node_name;
--
--  if (parentoffset & 0x3)
--    return -1;
--  token = (void *) ((grub_addr_t) fdt + grub_fdt_get_off_dt_struct(fdt)
--                    + parentoffset);
--  end = (void *) struct_end (fdt);
--  if ((token >= end) || (grub_be_to_cpu32(*token) != FDT_BEGIN_NODE))
--    return -1;
--  SKIP_NODE_NAME(node_name, token, end);
--  while (token < end)
-+  for (; token < end; skip_current = 0)
-   {
--    switch (grub_be_to_cpu32(*token))
-+    switch (grub_be_to_cpu32 (*token))
-     {
-       case FDT_BEGIN_NODE:
--        node_name = (char *) (token + 1);
--        if (node_name + grub_strlen (name) >= (char *) end)
--          return -1;
--        if (!grub_strcmp (node_name, name))
--          return (int) ((grub_addr_t) token - (grub_addr_t) fdt
--                        - grub_fdt_get_off_dt_struct (fdt));
--        token = get_next_node (fdt, node_name);
--        if (!token)
--          return -1;
--        break;
-+	if (skip_current)
-+	  {
-+	    token = get_next_node (fdt, (char *) (token + 1));
-+	    continue;
-+	  }
-+	char *ptr;
-+	for (ptr = (char *) (token + 1); *ptr && ptr < (char *) end; ptr++);
-+        if (ptr >= (char *) end)
-+          return 0;
-+	return token;
-       case FDT_PROP:
-         /* Skip property token and following data (len, nameoff and property
-            value). */
-         if (token >= end - 1)
--          return -1;
-+          return 0;
-         token += prop_entry_size(grub_be_to_cpu32(*(token + 1)))
-                  / sizeof(*token);
-         break;
-@@ -337,10 +325,74 @@ int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
-         token++;
-         break;
-       default:
--        return -1;
-+        return 0;
-     }
-   }
--  return -1;
-+  return 0;
-+}
-+
-+int grub_fdt_next_node (const void *fdt, unsigned int currentoffset)
-+{
-+  const grub_uint32_t *token = (const grub_uint32_t *) fdt + (currentoffset + grub_fdt_get_off_dt_struct (fdt)) / 4;
-+  token = advance_token (fdt, token, (const void *) struct_end (fdt), 1);
-+  if (!token)
-+    return -1;
-+  return (int) ((grub_addr_t) token - (grub_addr_t) fdt
-+		- grub_fdt_get_off_dt_struct (fdt));
-+}			 
-+
-+int grub_fdt_first_node (const void *fdt, unsigned int parentoffset)
-+{
-+  const grub_uint32_t *token, *end;
-+  char *node_name;
-+
-+  if (parentoffset & 0x3)
-+    return -1;
-+  token = (const void *) ((grub_addr_t) fdt + grub_fdt_get_off_dt_struct(fdt)
-+                    + parentoffset);
-+  end = (const void *) struct_end (fdt);
-+  if ((token >= end) || (grub_be_to_cpu32(*token) != FDT_BEGIN_NODE))
-+    return -1;
-+  SKIP_NODE_NAME(node_name, token, end);
-+  token = advance_token (fdt, token, end, 0);
-+  if (!token)
-+    return -1;
-+  return (int) ((grub_addr_t) token - (grub_addr_t) fdt
-+		- grub_fdt_get_off_dt_struct (fdt));
-+}			 
-+
-+/* Find a direct sub-node of a given parent node. */
-+int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
-+			   const char *name)
-+{
-+  const grub_uint32_t *token, *end;
-+  const char *node_name;
-+  int skip_current = 0;
-+
-+  if (parentoffset & 0x3)
-+    return -1;
-+  token = (const void *) ((grub_addr_t) fdt + grub_fdt_get_off_dt_struct(fdt)
-+                    + parentoffset);
-+  end = (const void *) struct_end (fdt);
-+  if ((token >= end) || (grub_be_to_cpu32(*token) != FDT_BEGIN_NODE))
-+    return -1;
-+  SKIP_NODE_NAME(node_name, token, end);
-+  while (1) {
-+    token = advance_token (fdt, token, end, skip_current);
-+    if (!token)
-+      return -1;
-+    skip_current = 1;
-+    node_name = (const char *) token + 4;
-+    if (grub_strcmp (node_name, name) == 0)
-+      return (int) ((grub_addr_t) token - (grub_addr_t) fdt
-+		    - grub_fdt_get_off_dt_struct (fdt));
-+  }
-+}
-+
-+const char *
-+grub_fdt_get_nodename (const void *fdt, unsigned int nodeoffset)
-+{
-+  return (const char *) fdt + grub_fdt_get_off_dt_struct(fdt) + nodeoffset + 4;
- }
- 
- int grub_fdt_add_subnode (void *fdt, unsigned int parentoffset,
-@@ -359,6 +411,24 @@ int grub_fdt_add_subnode (void *fdt, unsigned int parentoffset,
-   return add_subnode (fdt, parentoffset, name);
- }
- 
-+const void *
-+grub_fdt_get_prop (const void *fdt, unsigned int nodeoffset, const char *name,
-+		   grub_uint32_t *len)
-+{
-+  grub_uint32_t *prop;
-+  if ((nodeoffset >= grub_fdt_get_size_dt_struct (fdt)) || (nodeoffset & 0x3)
-+      || (grub_be_to_cpu32(*(grub_uint32_t *) ((grub_addr_t) fdt
-+					       + grub_fdt_get_off_dt_struct (fdt) + nodeoffset))
-+          != FDT_BEGIN_NODE))
-+    return 0;
-+  prop = find_prop (fdt, nodeoffset, name);
-+  if (!prop)
-+    return 0;
-+  if (len)
-+    *len = grub_be_to_cpu32 (*(prop + 1));
-+  return prop + 3;
-+}
-+
- int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name,
- 		       const void *val, grub_uint32_t len)
- {
-diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index fdfca75bf..75525fa31 100644
---- a/include/grub/fdt.h
-+++ b/include/grub/fdt.h
-@@ -20,6 +20,7 @@
- #define GRUB_FDT_HEADER	1
- 
- #include <grub/types.h>
-+#include <grub/symbol.h>
- 
- #define FDT_MAGIC 0xD00DFEED
- 
-@@ -95,16 +96,22 @@ struct grub_fdt_empty_tree {
- #define grub_fdt_set_size_dt_struct(fdt, value)	\
- 	grub_fdt_set_header(fdt, size_dt_struct, value)
- 
--int grub_fdt_create_empty_tree (void *fdt, unsigned int size);
--int grub_fdt_check_header (void *fdt, unsigned int size);
--int grub_fdt_check_header_nosize (void *fdt);
--int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
--			   const char *name);
--int grub_fdt_add_subnode (void *fdt, unsigned int parentoffset,
-+int EXPORT_FUNC(grub_fdt_create_empty_tree) (void *fdt, unsigned int size);
-+int EXPORT_FUNC(grub_fdt_check_header) (const void *fdt, unsigned int size);
-+int EXPORT_FUNC(grub_fdt_check_header_nosize) (const void *fdt);
-+int EXPORT_FUNC(grub_fdt_find_subnode) (const void *fdt, unsigned int parentoffset,
-+					const char *name);
-+int EXPORT_FUNC(grub_fdt_first_node) (const void *fdt, unsigned int parentoffset);
-+int EXPORT_FUNC(grub_fdt_next_node) (const void *fdt, unsigned int currentoffset);
-+int EXPORT_FUNC(grub_fdt_add_subnode) (void *fdt, unsigned int parentoffset,
- 			  const char *name);
-+const char *
-+EXPORT_FUNC(grub_fdt_get_nodename) (const void *fdt, unsigned int nodeoffset);
-+const void *EXPORT_FUNC(grub_fdt_get_prop) (const void *fdt, unsigned int nodeoffset, const char *name,
-+					    grub_uint32_t *len);
- 
--int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name,
--		      const void *val, grub_uint32_t len);
-+int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const char *name,
-+				    const void *val, grub_uint32_t len);
- #define grub_fdt_set_prop32(fdt, nodeoffset, name, val)	\
- ({ \
-   grub_uint32_t _val = grub_cpu_to_be32(val); \
-diff --git a/include/grub/fdtbus.h b/include/grub/fdtbus.h
-new file mode 100644
-index 000000000..985837e55
---- /dev/null
-+++ b/include/grub/fdtbus.h
-@@ -0,0 +1,73 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2016  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_FDTBUS_HEADER
-+#define GRUB_FDTBUS_HEADER	1
-+
-+#include <grub/fdt.h>
-+#include <grub/err.h>
-+
-+struct grub_fdtbus_dev;
-+
-+struct grub_fdtbus_driver
-+{
-+  struct grub_fdtbus_driver *next;
-+  struct grub_fdtbus_driver **prev;
-+
-+  const char *compatible;
-+
-+  grub_err_t (*attach) (const struct grub_fdtbus_dev *dev);
-+  void (*detach) (const struct grub_fdtbus_dev *dev);
-+};
-+
-+extern char EXPORT_VAR(grub_fdtbus_invalid_mapping)[1];
-+
-+static inline int
-+grub_fdtbus_is_mapping_valid (volatile void *m)
-+{
-+  return m != grub_fdtbus_invalid_mapping;
-+}
-+
-+volatile void *
-+EXPORT_FUNC(grub_fdtbus_map_reg) (const struct grub_fdtbus_dev *dev, int reg, grub_size_t *size);
-+
-+const void *
-+EXPORT_FUNC(grub_fdtbus_get_fdt) (void);
-+
-+const char *
-+EXPORT_FUNC(grub_fdtbus_get_name) (const struct grub_fdtbus_dev *dev);
-+
-+const void *
-+EXPORT_FUNC(grub_fdtbus_get_prop) (const struct grub_fdtbus_dev *dev,
-+		      const char *name,
-+		      grub_uint32_t *len);
-+
-+void
-+EXPORT_FUNC(grub_fdtbus_register) (struct grub_fdtbus_driver *driver);
-+
-+void
-+EXPORT_FUNC(grub_fdtbus_unregister) (struct grub_fdtbus_driver *driver);
-+
-+/* Must be called before any register(). */
-+/* dtb is assumed to be unfreeable and must remain
-+   valid for lifetime of GRUB.
-+ */
-+void
-+grub_fdtbus_init (const void *dtb, grub_size_t size);
-+
-+#endif
-diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index 20ddf2da2..ecd88ca72 100644
---- a/include/grub/kernel.h
-+++ b/include/grub/kernel.h
-@@ -28,7 +28,8 @@ enum
-   OBJ_TYPE_MEMDISK,
-   OBJ_TYPE_CONFIG,
-   OBJ_TYPE_PREFIX,
--  OBJ_TYPE_PUBKEY
-+  OBJ_TYPE_PUBKEY,
-+  OBJ_TYPE_DTB
- };
- 
- /* The module header.  */
-diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 5ca4811cd..6abd288c3 100644
---- a/include/grub/util/install.h
-+++ b/include/grub/util/install.h
-@@ -176,7 +176,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
- 			     char *config_path,
- 			     const struct grub_install_image_target_desc *image_target,
- 			     int note,
--			     grub_compression_t comp);
-+			     grub_compression_t comp, const char *dtb_file);
- 
- const struct grub_install_image_target_desc *
- grub_install_get_image_target (const char *arg);
-diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 452b230da..8539ff348 100644
---- a/util/grub-install-common.c
-+++ b/util/grub-install-common.c
-@@ -499,7 +499,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
-   grub_install_generate_image (dir, prefix, fp, outname,
- 			       modules.entries, memdisk_path,
- 			       pubkeys, npubkeys, config_path, tgt,
--			       note, compression);
-+			       note, compression, 0);
-   while (dc--)
-     grub_install_pop_module ();
- }
-diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index aba19d21b..98d24cc06 100644
---- a/util/grub-mkimage.c
-+++ b/util/grub-mkimage.c
-@@ -71,6 +71,7 @@ static struct argp_option options[] = {
-    N_("embed FILE as a memdisk image\n"
-       "Implies `-p (memdisk)/boot/grub' and overrides any prefix supplied previously,"
-       " but the prefix itself can be overridden by later options"), 0},
-+  {"dtb",  'D', N_("FILE"), 0, N_("embed FILE as a device tree (DTB)\n"), 0},
-    /* TRANSLATORS: "embed" is a verb (command description).  "*/
-   {"config",   'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},
-    /* TRANSLATORS: "embed" is a verb (command description).  "*/
-@@ -117,6 +118,7 @@ struct arguments
-   char *dir;
-   char *prefix;
-   char *memdisk;
-+  char *dtb;
-   char **pubkeys;
-   size_t npubkeys;
-   char *font;
-@@ -176,6 +178,13 @@ argp_parser (int key, char *arg, struct argp_state *state)
-       arguments->prefix = xstrdup ("(memdisk)/boot/grub");
-       break;
- 
-+    case 'D':
-+      if (arguments->dtb)
-+	free (arguments->dtb);
-+
-+      arguments->dtb = xstrdup (arg);
-+      break;
-+
-     case 'k':
-       arguments->pubkeys = xrealloc (arguments->pubkeys,
- 				     sizeof (arguments->pubkeys[0])
-@@ -300,7 +309,7 @@ main (int argc, char *argv[])
- 			       arguments.memdisk, arguments.pubkeys,
- 			       arguments.npubkeys, arguments.config,
- 			       arguments.image_target, arguments.note,
--			       arguments.comp);
-+			       arguments.comp, arguments.dtb);
- 
-   grub_util_file_sync  (fp);
-   fclose (fp);
-diff --git a/util/mkimage.c b/util/mkimage.c
-index 6aa77ed73..e22d82afa 100644
---- a/util/mkimage.c
-+++ b/util/mkimage.c
-@@ -777,13 +777,12 @@ grub_install_generate_image (const char *dir, const char *prefix,
- 			     char *memdisk_path, char **pubkey_paths,
- 			     size_t npubkeys, char *config_path,
- 			     const struct grub_install_image_target_desc *image_target,
--			     int note,
--			     grub_compression_t comp)
-+			     int note, grub_compression_t comp, const char *dtb_path)
- {
-   char *kernel_img, *core_img;
-   size_t total_module_size, core_size;
-   size_t memdisk_size = 0, config_size = 0;
--  size_t prefix_size = 0;
-+  size_t prefix_size = 0, dtb_size = 0;
-   char *kernel_path;
-   size_t offset;
-   struct grub_util_path_list *path_list, *p;
-@@ -828,6 +827,12 @@ grub_install_generate_image (const char *dir, const char *prefix,
-       total_module_size += memdisk_size + sizeof (struct grub_module_header);
-     }
- 
-+  if (dtb_path)
-+    {
-+      dtb_size = ALIGN_UP(grub_util_get_image_size (dtb_path), 4);
-+      total_module_size += dtb_size + sizeof (struct grub_module_header);
-+    }
-+
-   if (config_path)
-     {
-       config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1);
-@@ -950,6 +955,19 @@ grub_install_generate_image (const char *dir, const char *prefix,
-       offset += memdisk_size;
-     }
- 
-+  if (dtb_path)
-+    {
-+      struct grub_module_header *header;
-+
-+      header = (struct grub_module_header *) (kernel_img + offset);
-+      header->type = grub_host_to_target32 (OBJ_TYPE_DTB);
-+      header->size = grub_host_to_target32 (dtb_size + sizeof (*header));
-+      offset += sizeof (*header);
-+
-+      grub_util_load_image (dtb_path, kernel_img + offset);
-+      offset += dtb_size;
-+    }
-+
-   if (config_path)
-     {
-       struct grub_module_header *header;
--- 
-2.14.3
-

0020-trim-arp-packets-with-abnormal-size.patch

@@ -1,7 +1,7 @@
-From c0fa21c8898437747ce093884e6aba48d45ac329 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 5 Feb 2014 09:42:42 -0200
-Subject: [PATCH 078/198] trim arp packets with abnormal size
+Subject: [PATCH] trim arp packets with abnormal size
 
 GRUB uses arp request to create the arp response. If the incoming packet
 is foobared, GRUB needs to trim the arp response packet before sending it.
@@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it.
  1 file changed, 6 insertions(+)
 
 diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b1..2083b5a4b 100644
+index 54306e3b16d..d1c69ed2b55 100644
 --- a/grub-core/net/arp.c
 +++ b/grub-core/net/arp.c
 @@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
@@ -19,13 +19,10 @@ index 54306e3b1..2083b5a4b 100644
        {
 +        if ((nb->tail - nb->data) > 50)
 +          {
-+            grub_dprintf ("net", "arp packet with abnormal size (%d bytes).\n",
++            grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n",
 +                         nb->tail - nb->data);
 +            nb->tail = nb->data + 50;
 +          }
  	grub_net_link_level_address_t target;
  	struct grub_net_buff nb_reply;
  	struct arppkt *arp_reply;
--- 
-2.14.3
-

0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -1,7 +1,7 @@
-From 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 079/198] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 
@@ -20,11 +20,11 @@ Resolves: rhbz#1063414
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index de9044c7f..cf6331f2a 100644
+index 61ebd7dc714..87a7da34982 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -224,7 +224,11 @@ while [ "x$list" != "x" ] ; do
-     linux_root_device_thisversion=${GRUB_DEVICE}
+@@ -261,7 +261,11 @@ while [ "x$list" != "x" ] ; do
+     fi
    fi
  
 -  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
@@ -36,6 +36,3 @@ index de9044c7f..cf6331f2a 100644
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
  
--- 
-2.14.3
-

0021-arm-coreboot-Support-for-vexpress-timer.patch

@@ -1,73 +0,0 @@
-From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 21:26:36 +0200
-Subject: [PATCH 021/198] arm-coreboot: Support for vexpress timer.
-
----
- grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
-diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c
-index ebefb99d5..d97b844f8 100644
---- a/grub-core/kern/arm/coreboot/timer.c
-+++ b/grub-core/kern/arm/coreboot/timer.c
-@@ -21,6 +21,7 @@
- #include <grub/types.h>
- #include <grub/err.h>
- #include <grub/time.h>
-+#include <grub/fdtbus.h>
- #include <grub/misc.h>
- 
- grub_uint64_t
-@@ -33,6 +34,39 @@ grub_uint32_t
- grub_arm_pfr1(void);
- 
- static int have_timer = 0;
-+static volatile grub_uint32_t *sp804_regs;
-+
-+static grub_uint64_t
-+sp804_get_time_ms (void)
-+{
-+  static grub_uint32_t high, last_low;
-+  grub_uint32_t low = ~sp804_regs[1];
-+  if (last_low > low)
-+    high++;
-+  last_low = low;
-+  return grub_divmod64 ((((grub_uint64_t) high) << 32) | low,
-+			1000, 0);
-+}
-+
-+static grub_err_t
-+sp804_attach(const struct grub_fdtbus_dev *dev)
-+{
-+  if (have_timer)
-+    return GRUB_ERR_NONE;
-+  sp804_regs = grub_fdtbus_map_reg (dev, 0, 0);
-+  if (!grub_fdtbus_is_mapping_valid (sp804_regs))
-+    return grub_error (GRUB_ERR_IO, "could not map sp804: %p", sp804_regs);
-+  grub_install_get_time_ms (sp804_get_time_ms);
-+  have_timer = 1;
-+  return GRUB_ERR_NONE;
-+}
-+
-+struct grub_fdtbus_driver sp804 =
-+{
-+  .compatible = "arm,sp804",
-+  .attach = sp804_attach
-+};
-+
- static grub_uint32_t timer_frequency_in_khz;
- 
- static grub_uint64_t
-@@ -58,6 +92,8 @@ try_generic_timer (void)
- void
- grub_machine_timer_init (void)
- {
-+  grub_fdtbus_register (&sp804);
-+
-   if (!have_timer)
-     try_generic_timer ();
-   if (!have_timer)
--- 
-2.14.3
-

0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -1,8 +1,7 @@
-From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 080/198] Add support for UEFI operating systems returned by
- os-prober
+Subject: [PATCH] Add support for UEFI operating systems returned by os-prober
 
 os-prober returns UEFI operating systems in the form:
 
@@ -15,7 +14,7 @@ contrast to legacy OSes, where path is the device string. Handle this case.
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7a..9b8f5968e 100644
+index 515a68c7aa0..9b8f5968e2d 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -328,8 +328,23 @@ EOF
@@ -45,6 +44,3 @@ index 515a68c7a..9b8f5968e 100644
 +      esac
    esac
  done
--- 
-2.14.3
-

0022-arm-coreboot-Export-FDT-routines.patch

@@ -1,27 +0,0 @@
-From ac6b41b89fbb82a3ba843a7ed19115d81432b604 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 21:29:48 +0200
-Subject: [PATCH 022/198] arm-coreboot: Export FDT routines.
-
-We need to use them from modules as well.
----
- grub-core/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index fc6ca3051..147e6959c 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -246,7 +246,9 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h
- endif
- 
- if COND_arm_efi
--- 
-2.14.3
-

0023-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -1,7 +1,7 @@
-From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 081/198] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH] Migrate PPC from Yaboot to Grub2
 
 Add configuration support for serial terminal consoles.  This will set the
 maximum screen size so that text is not overwritten.
@@ -12,10 +12,10 @@ maximum screen size so that text is not overwritten.
  create mode 100644 util/grub.d/20_ppc_terminfo.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index f9caccb97..6d452da02 100644
+index 3180ac880a9..c7b775bce73 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -486,6 +486,13 @@ script = {
+@@ -487,6 +487,13 @@ script = {
    condition = COND_HOST_LINUX;
  };
  
@@ -31,7 +31,7 @@ index f9caccb97..6d452da02 100644
    common = util/grub.d/30_os-prober.in;
 diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
 new file mode 100644
-index 000000000..10d665868
+index 00000000000..10d66586820
 --- /dev/null
 +++ b/util/grub.d/20_ppc_terminfo.in
 @@ -0,0 +1,114 @@
@@ -149,6 +149,3 @@ index 000000000..10d665868
 +cat << EOF
 +  terminfo -g ${X}x${Y} ${TERMINAL}
 +EOF
--- 
-2.14.3
-

0024-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
-From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 082/198] Add fw_path variable (revised)
+Subject: [PATCH] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the
@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c448..8ab7794c4 100644
+index 9cad0c4485c..8ab7794c47b 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
@@ -41,7 +41,7 @@ index 9cad0c448..8ab7794c4 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 249e19bc7..759c475c4 100644
+index 249e19bc788..759c475c4d9 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
@@ -76,6 +76,3 @@ index 249e19bc7..759c475c4 100644
  
        prefix = grub_env_get ("prefix");
        if (prefix)
--- 
-2.14.3
-

0024-arm_coreboot-Support-keyboard-for-vexpress.patch

@@ -1,249 +0,0 @@
-From 848bed9d92cf20e9f25db4c69a20efad23996ca0 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 21:42:37 +0200
-Subject: [PATCH 024/198] arm_coreboot: Support keyboard for vexpress.
-
----
- grub-core/Makefile.am              |   1 +
- grub-core/Makefile.core.def        |   3 +
- grub-core/kern/arm/coreboot/init.c |   1 +
- grub-core/term/arm/pl050.c         | 189 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 194 insertions(+)
- create mode 100644 grub-core/term/arm/pl050.c
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 147e6959c..a2aaf9f54 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -240,6 +240,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
- endif
- 
- if COND_arm_coreboot
-+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6ade6e950..6be6e7f61 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -160,6 +160,9 @@ kernel = {
-   arm_coreboot = kern/arm/coreboot/coreboot.S;
-   arm_coreboot = lib/fdt.c;
-   arm_coreboot = bus/fdt.c;
-+  arm_coreboot = term/ps2.c;
-+  arm_coreboot = term/arm/pl050.c;
-+  arm_coreboot = commands/keylayouts.c;
- 
-   terminfoinkernel = term/terminfo.c;
-   terminfoinkernel = term/tparm.c;
-diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
-index aec75c672..a06ccb72f 100644
---- a/grub-core/kern/arm/coreboot/init.c
-+++ b/grub-core/kern/arm/coreboot/init.c
-@@ -133,6 +133,7 @@ grub_machine_init (void)
-   grub_fdtbus_init (dtb, dtb_size);
- 
-   grub_machine_timer_init ();
-+  grub_pl050_init ();
- }
- 
- void
-diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c
-new file mode 100644
-index 000000000..e4cda3056
---- /dev/null
-+++ b/grub-core/term/arm/pl050.c
-@@ -0,0 +1,189 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 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/>.
-+ */
-+
-+#include <grub/ps2.h>
-+#include <grub/fdtbus.h>
-+#include <grub/err.h>
-+#include <grub/machine/kernel.h>
-+#include <grub/at_keyboard.h>
-+#include <grub/misc.h>
-+#include <grub/term.h>
-+#include <grub/time.h>
-+#include <grub/ps2.h>
-+#include <grub/fdtbus.h>
-+
-+static volatile grub_uint32_t *pl050_regs;
-+
-+struct grub_ps2_state ps2_state;
-+
-+static void
-+keyboard_controller_wait_until_ready (void)
-+{
-+  while (! (pl050_regs[1] & 0x40));
-+}
-+
-+static grub_uint8_t
-+wait_ack (void)
-+{
-+  grub_uint64_t endtime;
-+  grub_uint8_t ack;
-+
-+  endtime = grub_get_time_ms () + 20;
-+  do
-+    ack = pl050_regs[2];
-+  while (ack != GRUB_AT_ACK && ack != GRUB_AT_NACK
-+	 && grub_get_time_ms () < endtime);
-+  return ack;
-+}
-+
-+
-+static int
-+write_mode (int mode)
-+{
-+  unsigned i;
-+  for (i = 0; i < GRUB_AT_TRIES; i++)
-+    {
-+      grub_uint8_t ack;
-+      keyboard_controller_wait_until_ready ();
-+      pl050_regs[2] = 0xf0;
-+      keyboard_controller_wait_until_ready ();
-+      pl050_regs[2] = mode;
-+      keyboard_controller_wait_until_ready ();
-+      ack = wait_ack ();
-+      if (ack == GRUB_AT_NACK)
-+	continue;
-+      if (ack == GRUB_AT_ACK)
-+	break;
-+      return 0;
-+    }
-+
-+  return (i != GRUB_AT_TRIES);
-+}
-+
-+static int
-+query_mode (void)
-+{
-+  grub_uint8_t ret;
-+  int e;
-+
-+  e = write_mode (0);
-+  if (!e)
-+    return 0;
-+
-+  keyboard_controller_wait_until_ready ();
-+
-+  do
-+    ret = pl050_regs[2];
-+  while (ret == GRUB_AT_ACK);
-+
-+  /* QEMU translates the set even in no-translate mode.  */
-+  if (ret == 0x43 || ret == 1)
-+    return 1;
-+  if (ret == 0x41 || ret == 2)
-+    return 2;
-+  if (ret == 0x3f || ret == 3)
-+    return 3;
-+  return 0;
-+}
-+
-+static void
-+set_scancodes (void)
-+{
-+  write_mode (2);
-+  ps2_state.current_set = query_mode ();
-+  grub_dprintf ("atkeyb", "returned set %d\n", ps2_state.current_set);
-+  if (ps2_state.current_set == 2)
-+    return;
-+
-+  write_mode (1);
-+  ps2_state.current_set = query_mode ();
-+  grub_dprintf ("atkeyb", "returned set %d\n", ps2_state.current_set);
-+  if (ps2_state.current_set == 1)
-+    return;
-+  grub_dprintf ("atkeyb", "no supported scancode set found\n");
-+}
-+
-+static void
-+keyboard_controller_led (grub_uint8_t leds)
-+{
-+  keyboard_controller_wait_until_ready ();
-+  pl050_regs[2] = 0xed;
-+  keyboard_controller_wait_until_ready ();
-+  pl050_regs[2] = leds & 0x7;
-+}
-+
-+/* If there is a character pending, return it;
-+   otherwise return GRUB_TERM_NO_KEY.  */
-+static int
-+grub_pl050_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
-+{
-+  grub_uint8_t at_key;
-+  int ret;
-+  grub_uint8_t old_led;
-+
-+  if (!(pl050_regs[1] & 0x10))
-+    return -1;
-+  at_key = pl050_regs[2];
-+  old_led = ps2_state.led_status;
-+
-+  ret = grub_ps2_process_incoming_byte (&ps2_state, at_key);
-+  if (old_led != ps2_state.led_status)
-+    keyboard_controller_led (ps2_state.led_status);
-+  return ret;
-+}
-+
-+static struct grub_term_input grub_pl050_keyboard_term =
-+  {
-+    .name = "pl050_keyboard",
-+    .getkey = grub_pl050_keyboard_getkey
-+  };
-+
-+static grub_err_t
-+pl050_attach(const struct grub_fdtbus_dev *dev)
-+{
-+  const grub_uint32_t *reg;
-+  reg = grub_fdtbus_get_prop (dev, "reg", 0);
-+
-+  /* Mouse.  Nothing to do.  */
-+  if (grub_be_to_cpu32 (*reg) == 0x7000)
-+    return 0;
-+
-+  pl050_regs = grub_fdtbus_map_reg (dev, 0, 0);
-+
-+  if (!grub_fdtbus_is_mapping_valid (pl050_regs))
-+    return grub_error (GRUB_ERR_IO, "could not map pl050");
-+
-+  ps2_state.at_keyboard_status = 0;
-+  set_scancodes ();
-+  keyboard_controller_led (ps2_state.led_status);
-+
-+  grub_term_register_input ("pl050_keyboard", &grub_pl050_keyboard_term);
-+  return GRUB_ERR_NONE;
-+}
-+
-+struct grub_fdtbus_driver pl050 =
-+{
-+  .compatible = "arm,pl050",
-+  .attach = pl050_attach
-+};
-+
-+void
-+grub_pl050_init (void)
-+{
-+  grub_fdtbus_register (&pl050);
-+}
--- 
-2.14.3
-

0025-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -1,8 +1,7 @@
-From cc8be4cafeb5a0af779afe5d2856da434c165612 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 086/198] Pass "\x[[:hex:]][[:hex:]]" straight through
- unmolested.
+Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
 
 ---
  grub-core/commands/wildcard.c | 16 +++++++++++++++-
@@ -11,7 +10,7 @@ Subject: [PATCH 086/198] Pass "\x[[:hex:]][[:hex:]]" straight through
  3 files changed, 84 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 9b4e72766..02c46f9fd 100644
+index 9b4e72766ff..02c46f9fdfa 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
 @@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
@@ -45,7 +44,7 @@ index 9b4e72766..02c46f9fd 100644
  	  *optr++ = iptr[1];
  	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index d5e10ee87..0a5b2afb9 100644
+index d5e10ee8798..0a5b2afb94b 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -20,6 +20,12 @@
@@ -104,7 +103,7 @@ index d5e10ee87..0a5b2afb9 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ab78ca87f..cf6cd6601 100644
+index ab78ca87f90..cf6cd6601d6 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;
@@ -178,6 +177,3 @@ index ab78ca87f..cf6cd6601 100644
  	break;
        case '$':
  	if (escaped)
--- 
-2.14.3
-

0025-arm_coreboot-Support-grub-mkstandalone.patch

@@ -1,158 +0,0 @@
-From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 21:59:48 +0200
-Subject: [PATCH 025/198] arm_coreboot: Support grub-mkstandalone.
-
----
- include/grub/util/install.h |  6 +++++-
- util/grub-install-common.c  | 12 ++++++++++--
- util/grub-install.c         |  7 +++++++
- 3 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 6abd288c3..5910b0c09 100644
---- a/include/grub/util/install.h
-+++ b/include/grub/util/install.h
-@@ -29,6 +29,8 @@
- #define GRUB_INSTALL_OPTIONS					  \
-   { "modules",      GRUB_INSTALL_OPTIONS_MODULES, N_("MODULES"),	  \
-     0, N_("pre-load specified modules MODULES"), 1 },			  \
-+  { "dtb",      GRUB_INSTALL_OPTIONS_DTB, N_("FILE"),	  \
-+    0, N_("embed a specific DTB"), 1 },			  \
-   { "install-modules", GRUB_INSTALL_OPTIONS_INSTALL_MODULES,	  \
-     N_("MODULES"), 0,							  \
-     N_("install only MODULES and their dependencies [default=all]"), 1 }, \
-@@ -99,6 +101,7 @@ enum grub_install_plat
-     GRUB_INSTALL_PLATFORM_I386_XEN,
-     GRUB_INSTALL_PLATFORM_X86_64_XEN,
-     GRUB_INSTALL_PLATFORM_ARM64_EFI,
-+    GRUB_INSTALL_PLATFORM_ARM_COREBOOT,
-     GRUB_INSTALL_PLATFORM_MAX
-   };
- 
-@@ -115,7 +118,8 @@ enum grub_install_options {
-   GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY,
-   GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY,
-   GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE,
--  GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS
-+  GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,
-+  GRUB_INSTALL_OPTIONS_DTB
- };
- 
- extern char *grub_install_source_directory;
-diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 8539ff348..9e3e358c9 100644
---- a/util/grub-install-common.c
-+++ b/util/grub-install-common.c
-@@ -73,6 +73,7 @@ grub_install_help_filter (int key, const char *text,
- 
- static int (*compress_func) (const char *src, const char *dest) = NULL;
- char *grub_install_copy_buffer;
-+static char *dtb;
- 
- int
- grub_install_copy_file (const char *src,
-@@ -364,6 +365,11 @@ grub_install_parse (int key, char *arg)
-     case GRUB_INSTALL_OPTIONS_INSTALL_FONTS:
-       handle_install_list (&install_fonts, arg, 0);
-       return 1;
-+    case GRUB_INSTALL_OPTIONS_DTB:
-+      if (dtb)
-+	free (dtb);
-+      dtb = xstrdup (arg);
-+      return 1;
-     case GRUB_INSTALL_OPTIONS_INSTALL_COMPRESS:
-       if (strcmp (arg, "no") == 0
- 	  || strcmp (arg, "none") == 0)
-@@ -486,9 +492,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
- 
-   grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'"
- 		  " --output '%s' "
-+		  " --dtb '%s' "
- 		  "--format '%s' --compression '%s' %s %s\n",
- 		  dir, prefix,
--		  outname, mkimage_target,
-+		  outname, dtb ? : "", mkimage_target,
- 		  compnames[compression], note ? "--note" : "", s);
-   free (s);
- 
-@@ -499,7 +506,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
-   grub_install_generate_image (dir, prefix, fp, outname,
- 			       modules.entries, memdisk_path,
- 			       pubkeys, npubkeys, config_path, tgt,
--			       note, compression, 0);
-+			       note, compression, dtb);
-   while (dc--)
-     grub_install_pop_module ();
- }
-@@ -666,6 +673,7 @@ static struct
-     [GRUB_INSTALL_PLATFORM_ARM_EFI] =          { "arm",     "efi"       },
-     [GRUB_INSTALL_PLATFORM_ARM64_EFI] =        { "arm64",   "efi"       },
-     [GRUB_INSTALL_PLATFORM_ARM_UBOOT] =        { "arm",     "uboot"     },
-+    [GRUB_INSTALL_PLATFORM_ARM_COREBOOT] =     { "arm",     "coreboot"  },
-   }; 
- 
- char *
-diff --git a/util/grub-install.c b/util/grub-install.c
-index 9074d3e9e..75e3e5ba6 100644
---- a/util/grub-install.c
-+++ b/util/grub-install.c
-@@ -486,6 +486,7 @@ have_bootdev (enum grub_install_plat pl)
- 
-     case GRUB_INSTALL_PLATFORM_I386_QEMU:
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
-     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
-@@ -911,6 +912,7 @@ main (int argc, char *argv[])
- 
-     case GRUB_INSTALL_PLATFORM_I386_QEMU:
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
-@@ -946,6 +948,7 @@ main (int argc, char *argv[])
-     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_QEMU:
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
-@@ -1448,6 +1451,7 @@ main (int argc, char *argv[])
- 		  case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
- 		  case GRUB_INSTALL_PLATFORM_I386_QEMU:
- 		  case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+		  case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
- 		  case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
- 		  case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
- 		  case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
-@@ -1542,6 +1546,7 @@ main (int argc, char *argv[])
-       break;
- 
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_IEEE1275:
-     case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:
-@@ -1629,6 +1634,7 @@ main (int argc, char *argv[])
-     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
-     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_PC:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
-@@ -1889,6 +1895,7 @@ main (int argc, char *argv[])
-     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
-     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
-     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:
-+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:
-     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:
-     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
-     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
--- 
-2.14.3
-

0026-Add-X-option-to-printf-functions.patch

@@ -1,14 +1,14 @@
-From d3e9800ae2fe7c0ed2d7795eae2be17a66e625ff Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 087/198] Add %X option to printf functions.
+Subject: [PATCH] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 952411d5d..8344526be 100644
+index 952411d5dc6..8344526be7f 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
@@ -53,6 +53,3 @@ index 952411d5d..8344526be 100644
  	case 'u':
  	case 'd':
  	  {
--- 
-2.14.3
-

0026-arm_coreboot-Support-loading-linux-images.patch

@@ -1,302 +0,0 @@
-From 656c3b0d7fbe23f0e1ab561c8faa4ac4a37364d1 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 22:00:06 +0200
-Subject: [PATCH 026/198] arm_coreboot: Support loading linux images.
-
----
- grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------
- include/grub/arm/linux.h     |  16 ++++++
- 2 files changed, 83 insertions(+), 65 deletions(-)
-
-diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 01374ee78..260cbf068 100644
---- a/grub-core/loader/arm/linux.c
-+++ b/grub-core/loader/arm/linux.c
-@@ -31,8 +31,6 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
--#ifndef GRUB_MACHINE_COREBOOT
--
- static grub_dl_t my_mod;
- 
- static grub_addr_t initrd_start;
-@@ -44,7 +42,7 @@ static grub_size_t linux_size;
- static char *linux_args;
- 
- static grub_uint32_t machine_type;
--static void *fdt_addr;
-+static const void *current_fdt;
- 
- typedef void (*kernel_entry_t) (int, unsigned long, void *);
- 
-@@ -56,9 +54,9 @@ typedef void (*kernel_entry_t) (int, unsigned long, void *);
- #define LINUX_FDT_PHYS_OFFSET    (LINUX_INITRD_PHYS_OFFSET - 0x10000)
- 
- static grub_size_t
--get_atag_size (grub_uint32_t *atag)
-+get_atag_size (const grub_uint32_t *atag)
- {
--  grub_uint32_t *atag0 = atag;
-+  const grub_uint32_t *atag0 = atag;
-   while (atag[0] && atag[1])
-     atag += atag[0];
-   return atag - atag0;
-@@ -70,10 +68,11 @@ get_atag_size (grub_uint32_t *atag)
-  *   Merges in command line parameters and sets up initrd addresses.
-  */
- static grub_err_t
--linux_prepare_atag (void)
-+linux_prepare_atag (void *target_atag)
- {
--  grub_uint32_t *atag_orig = (grub_uint32_t *) fdt_addr;
--  grub_uint32_t *tmp_atag, *from, *to;
-+  const grub_uint32_t *atag_orig = (const grub_uint32_t *) current_fdt;
-+  grub_uint32_t *tmp_atag, *to;
-+  const grub_uint32_t *from;
-   grub_size_t tmp_size;
-   grub_size_t arg_size = grub_strlen (linux_args);
-   char *cmdline_orig = NULL;
-@@ -144,7 +143,7 @@ linux_prepare_atag (void)
-   to += 2;
- 
-   /* Copy updated FDT to its launch location */
--  grub_memcpy (atag_orig, tmp_atag, sizeof (grub_uint32_t) * (to - tmp_atag));
-+  grub_memcpy (target_atag, tmp_atag, sizeof (grub_uint32_t) * (to - tmp_atag));
-   grub_free (tmp_atag);
- 
-   grub_dprintf ("loader", "ATAG updated for Linux boot\n");
-@@ -158,19 +157,19 @@ linux_prepare_atag (void)
-  *   Merges in command line parameters and sets up initrd addresses.
-  */
- static grub_err_t
--linux_prepare_fdt (void)
-+linux_prepare_fdt (void *target_fdt)
- {
-   int node;
-   int retval;
-   int tmp_size;
-   void *tmp_fdt;
- 
--  tmp_size = grub_fdt_get_totalsize (fdt_addr) + 0x100 + grub_strlen (linux_args);
-+  tmp_size = grub_fdt_get_totalsize (current_fdt) + 0x100 + grub_strlen (linux_args);
-   tmp_fdt = grub_malloc (tmp_size);
-   if (!tmp_fdt)
-     return grub_errno;
- 
--  grub_memcpy (tmp_fdt, fdt_addr, grub_fdt_get_totalsize (fdt_addr));
-+  grub_memcpy (tmp_fdt, current_fdt, grub_fdt_get_totalsize (current_fdt));
-   grub_fdt_set_totalsize (tmp_fdt, tmp_size);
- 
-   /* Find or create '/chosen' node */
-@@ -211,7 +210,7 @@ linux_prepare_fdt (void)
-     }
- 
-   /* Copy updated FDT to its launch location */
--  grub_memcpy (fdt_addr, tmp_fdt, tmp_size);
-+  grub_memcpy (target_fdt, tmp_fdt, tmp_size);
-   grub_free (tmp_fdt);
- 
-   grub_dprintf ("loader", "FDT updated for Linux boot\n");
-@@ -228,16 +227,17 @@ linux_boot (void)
- {
-   kernel_entry_t linuxmain;
-   int fdt_valid, atag_valid;
-+  void *target_fdt = 0;
- 
--  fdt_valid = (fdt_addr && grub_fdt_check_header_nosize (fdt_addr) == 0);
--  atag_valid = ((((grub_uint16_t *) fdt_addr)[3] & ~3) == 0x5440
--		&& *((grub_uint32_t *) fdt_addr));
-+  fdt_valid = (current_fdt && grub_fdt_check_header_nosize (current_fdt) == 0);
-+  atag_valid = ((((const grub_uint16_t *) current_fdt)[3] & ~3) == 0x5440
-+		&& *((const grub_uint32_t *) current_fdt));
-   grub_dprintf ("loader", "atag: %p, %x, %x, %s, %s\n",
--		fdt_addr,
--		((grub_uint16_t *) fdt_addr)[3],
--		*((grub_uint32_t *) fdt_addr),
--		(char *) fdt_addr,
--		(char *) fdt_addr + 1);
-+		current_fdt,
-+		((const grub_uint16_t *) current_fdt)[3],
-+		*((const grub_uint32_t *) current_fdt),
-+		(const char *) current_fdt,
-+		(const char *) current_fdt + 1);
- 
-   if (!fdt_valid && machine_type == GRUB_ARM_MACHINE_TYPE_FDT)
-     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-@@ -247,23 +247,40 @@ linux_boot (void)
- 
-   grub_dprintf ("loader", "Kernel at: 0x%x\n", linux_addr);
- 
-+  if (fdt_valid || atag_valid)
-+    {
-+#ifdef GRUB_MACHINE_EFI
-+      grub_size_t size;
-+      if (fdt_valid)
-+	size = grub_fdt_get_totalsize (fdt_addr);
-+      else
-+	size = 4 * get_atag_size (atag_orig);
-+      size += grub_strlen (linux_args) + 256;
-+      target_fdt = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
-+      if (!fdt_addr)
-+	return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-+#else
-+      target_fdt = (void *) LINUX_FDT_ADDRESS;
-+#endif
-+    }
-+
-   if (fdt_valid)
-     {
-       grub_err_t err;
- 
--      err = linux_prepare_fdt ();
-+      err = linux_prepare_fdt (target_fdt);
-       if (err)
- 	return err;
--      grub_dprintf ("loader", "FDT @ 0x%p\n", fdt_addr);
-+      grub_dprintf ("loader", "FDT @ %p\n", target_fdt);
-     }
-   else if (atag_valid)
-     {
-       grub_err_t err;
- 
--      err = linux_prepare_atag ();
-+      err = linux_prepare_atag (target_fdt);
-       if (err)
- 	return err;
--      grub_dprintf ("loader", "ATAG @ 0x%p\n", fdt_addr);
-+      grub_dprintf ("loader", "ATAG @ %p\n", target_fdt);
-     }
- 
-   grub_dprintf ("loader", "Jumping to Linux...\n");
-@@ -287,7 +304,7 @@ linux_boot (void)
- 
-   grub_arm_disable_caches_mmu ();
- 
--  linuxmain (0, machine_type, fdt_addr);
-+  linuxmain (0, machine_type, target_fdt);
- 
-   return grub_error (GRUB_ERR_BAD_OS, "Linux call returned");
- }
-@@ -446,11 +463,26 @@ fail:
- static grub_err_t
- load_dtb (grub_file_t dtb, int size)
- {
--  if ((grub_file_read (dtb, fdt_addr, size) != size)
--      || (grub_fdt_check_header (fdt_addr, size) != 0))
--    return grub_error (GRUB_ERR_BAD_OS, N_("invalid device tree"));
-+  void *new_fdt = grub_zalloc (size);
-+  if (!new_fdt)
-+    return grub_errno;
-+  grub_dprintf ("loader", "Loading device tree to %p\n",
-+		new_fdt);
-+  if ((grub_file_read (dtb, new_fdt, size) != size)
-+      || (grub_fdt_check_header (new_fdt, size) != 0))
-+    {
-+      grub_free (new_fdt);
-+      return grub_error (GRUB_ERR_BAD_OS, N_("invalid device tree"));
-+    }
-+
-+  grub_fdt_set_totalsize (new_fdt, size);
-+  current_fdt = new_fdt;
-+  /* 
-+   * We've successfully loaded an FDT, so any machine type passed
-+   * from firmware is now obsolete.
-+   */
-+  machine_type = GRUB_ARM_MACHINE_TYPE_FDT;
- 
--  grub_fdt_set_totalsize (fdt_addr, size);
-   return GRUB_ERR_NONE;
- }
- 
-@@ -466,42 +498,13 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
- 
-   dtb = grub_file_open (argv[0]);
-   if (!dtb)
--    goto out;
-+    return grub_errno;
- 
-   size = grub_file_size (dtb);
-   if (size == 0)
--    {
--      grub_error (GRUB_ERR_BAD_OS, "empty file");
--      goto out;
--    }
--
--#ifdef GRUB_MACHINE_EFI
--  fdt_addr = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
--  if (!fdt_addr)
--    {
--      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
--      goto out;
--    }
--#else
--  fdt_addr = (void *) LINUX_FDT_ADDRESS;
--#endif
--
--  grub_dprintf ("loader", "Loading device tree to 0x%08x\n",
--		(grub_addr_t) fdt_addr);
--  load_dtb (dtb, size);
--  if (grub_errno != GRUB_ERR_NONE)
--    {
--      fdt_addr = NULL;
--      goto out;
--    }
--
--  /* 
--   * We've successfully loaded an FDT, so any machine type passed
--   * from firmware is now obsolete.
--   */
--  machine_type = GRUB_ARM_MACHINE_TYPE_FDT;
--
-- out:
-+    grub_error (GRUB_ERR_BAD_OS, "empty file");
-+  else
-+    load_dtb (dtb, size);
-   grub_file_close (dtb);
- 
-   return grub_errno;
-@@ -519,7 +522,7 @@ GRUB_MOD_INIT (linux)
- 					  /* TRANSLATORS: DTB stands for device tree blob.  */
- 					  0, N_("Load DTB file."));
-   my_mod = mod;
--  fdt_addr = (void *) grub_arm_firmware_get_boot_data ();
-+  current_fdt = grub_arm_firmware_get_boot_data ();
-   machine_type = grub_arm_firmware_get_machine_type ();
- }
- 
-@@ -529,4 +532,3 @@ GRUB_MOD_FINI (linux)
-   grub_unregister_command (cmd_initrd);
-   grub_unregister_command (cmd_devicetree);
- }
--#endif
-diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index a66caad13..f217f8281 100644
---- a/include/grub/arm/linux.h
-+++ b/include/grub/arm/linux.h
-@@ -46,6 +46,22 @@ grub_arm_firmware_get_machine_type (void)
- {
-   return GRUB_ARM_MACHINE_TYPE_FDT;
- }
-+#elif defined (GRUB_MACHINE_COREBOOT)
-+#include <grub/fdtbus.h>
-+#include <grub/machine/kernel.h>
-+# define LINUX_ADDRESS        (start_of_ram + 0x8000)
-+# define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000)
-+# define LINUX_FDT_ADDRESS    (LINUX_INITRD_ADDRESS - 0x10000)
-+static inline const void *
-+grub_arm_firmware_get_boot_data (void)
-+{
-+  return grub_fdtbus_get_fdt ();
-+}
-+static inline grub_uint32_t
-+grub_arm_firmware_get_machine_type (void)
-+{
-+  return GRUB_ARM_MACHINE_TYPE_FDT;
-+}
- #endif
- 
- #define FDT_ADDITIONAL_ENTRIES_SIZE	0x300
--- 
-2.14.3
-

0027-Search-for-specific-config-file-for-netboot.patch

@@ -1,7 +1,7 @@
-From 30c15e39be47d60f6a4a45628a687911a9f11091 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 088/198] Search for specific config file for netboot
+Subject: [PATCH] Search for specific config file for netboot
 
 This patch implements a search for a specific configuration when the config
 file is on a remoteserver. It uses the following order:
@@ -22,7 +22,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=873406
  3 files changed, 135 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 10773fc34..0769bf850 100644
+index 10773fc3435..0769bf850d3 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
@@ -151,7 +151,7 @@ index 10773fc34..0769bf850 100644
  
  static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 759c475c4..b2654ef62 100644
+index 759c475c4d9..b2654ef62e8 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -33,6 +33,7 @@
@@ -187,7 +187,7 @@ index 759c475c4..b2654ef62 100644
  	  grub_enter_normal_mode (config);
  	  grub_free (config);
 diff --git a/include/grub/net.h b/include/grub/net.h
-index e266bae23..50d62ab0c 100644
+index e266bae23f4..50d62ab0c8c 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -566,4 +566,7 @@ extern char *grub_net_default_server;
@@ -198,6 +198,3 @@ index e266bae23..50d62ab0c 100644
 +grub_net_search_configfile (char *config);
 +
  #endif /* ! GRUB_NET_HEADER */
--- 
-2.14.3
-

0027-arm_coreboot-Support-DMA.patch

@@ -1,292 +0,0 @@
-From 265292f2b0da0eb414c409871ba0f94a99ec33c1 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 22:06:04 +0200
-Subject: [PATCH 027/198] arm_coreboot: Support DMA.
-
-This is needed to support USB and some other busses.
----
- grub-core/Makefile.am             |  1 +
- grub-core/Makefile.core.def       |  1 +
- grub-core/kern/arm/cache.c        | 34 ++++++++++++++++++++++
- grub-core/kern/arm/cache_armv7.S  | 12 ++++++++
- grub-core/kern/arm/coreboot/dma.c | 59 +++++++++++++++++++++++++++++++++++++++
- include/grub/cache.h              |  7 ++---
- include/grub/dma.h                | 44 +++++++++++++++++++++++++++++
- include/grub/pci.h                | 22 +--------------
- 8 files changed, 155 insertions(+), 25 deletions(-)
- create mode 100644 grub-core/kern/arm/coreboot/dma.c
- create mode 100644 include/grub/dma.h
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index a2aaf9f54..104513847 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -248,6 +248,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h
-+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dma.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h
- KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h
- endif
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6be6e7f61..e4f253a20 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -163,6 +163,7 @@ kernel = {
-   arm_coreboot = term/ps2.c;
-   arm_coreboot = term/arm/pl050.c;
-   arm_coreboot = commands/keylayouts.c;
-+  arm_coreboot = kern/arm/coreboot/dma.c;
- 
-   terminfoinkernel = term/terminfo.c;
-   terminfoinkernel = term/tparm.c;
-diff --git a/grub-core/kern/arm/cache.c b/grub-core/kern/arm/cache.c
-index 34154ccdb..af1c4bbf5 100644
---- a/grub-core/kern/arm/cache.c
-+++ b/grub-core/kern/arm/cache.c
-@@ -29,6 +29,8 @@ void grub_arm_clean_dcache_range_armv6 (grub_addr_t start, grub_addr_t end,
- 					grub_addr_t dlinesz);
- void grub_arm_clean_dcache_range_armv7 (grub_addr_t start, grub_addr_t end,
- 					grub_addr_t dlinesz);
-+void grub_arm_clean_dcache_range_poc_armv7 (grub_addr_t start, grub_addr_t end,
-+					    grub_addr_t dlinesz);
- void grub_arm_invalidate_icache_range_armv6 (grub_addr_t start, grub_addr_t end,
- 					     grub_addr_t dlinesz);
- void grub_arm_invalidate_icache_range_armv7 (grub_addr_t start, grub_addr_t end,
-@@ -252,6 +254,38 @@ grub_arch_sync_caches (void *address, grub_size_t len)
-     }
- }
- 
-+void
-+grub_arch_sync_dma_caches (volatile void *address, grub_size_t len)
-+{
-+  grub_addr_t start = (grub_addr_t) address;
-+  grub_addr_t end = start + len;
-+
-+  if (type == ARCH_UNKNOWN)
-+    probe_caches ();
-+  start = ALIGN_DOWN (start, grub_arch_cache_max_linesz);
-+  end = ALIGN_UP (end, grub_arch_cache_max_linesz);
-+  switch (type)
-+    {
-+    case ARCH_ARMV6:
-+      grub_arm_clean_dcache_range_armv6 (start, end, grub_arch_cache_dlinesz);
-+      grub_arm_invalidate_icache_range_armv6 (start, end,
-+					      grub_arch_cache_ilinesz);
-+      break;
-+    case ARCH_ARMV5_WRITE_THROUGH:
-+    case ARCH_ARMV6_UNIFIED:
-+      grub_arm_clean_dcache_range_armv6 (start, end, grub_arch_cache_dlinesz);
-+      break;
-+    case ARCH_ARMV7:
-+      grub_arm_clean_dcache_range_poc_armv7 (start, end, grub_arch_cache_dlinesz);
-+      grub_arm_invalidate_icache_range_armv7 (start, end,
-+					      grub_arch_cache_ilinesz);
-+      break;
-+      /* Pacify GCC.  */
-+    case ARCH_UNKNOWN:
-+      break;
-+    }
-+}
-+
- void
- grub_arm_disable_caches_mmu (void)
- {
-diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S
-index 1ef2754af..5ae76a3d8 100644
---- a/grub-core/kern/arm/cache_armv7.S
-+++ b/grub-core/kern/arm/cache_armv7.S
-@@ -33,6 +33,18 @@
- # define ISB	isb
- #define ARMV7 1
- 
-+FUNCTION(grub_arm_clean_dcache_range_poc_armv7)
-+	DSB
-+	@ Clean data cache for range to point-of-coherence
-+1:	cmp	r0, r1
-+	bge	2f
-+	mcr	p15, 0, r0, c7, c14, 1	@ DCCMVAC
-+	add	r0, r0, r2		@ Next line
-+	b	1b
-+2:	DSB
-+	bx	lr
-+
-+
- 	@ r0  - CLIDR
- 	@ r1  - LoC
- 	@ r2  - current level
-diff --git a/grub-core/kern/arm/coreboot/dma.c b/grub-core/kern/arm/coreboot/dma.c
-new file mode 100644
-index 000000000..2c2a62789
---- /dev/null
-+++ b/grub-core/kern/arm/coreboot/dma.c
-@@ -0,0 +1,59 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2007,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/>.
-+ */
-+
-+#include <grub/dl.h>
-+#include <grub/dma.h>
-+#include <grub/mm.h>
-+#include <grub/misc.h>
-+#include <grub/mm_private.h>
-+#include <grub/cache.h>
-+
-+struct grub_pci_dma_chunk *
-+grub_memalign_dma32 (grub_size_t align, grub_size_t size)
-+{
-+  void *ret;
-+  if (align < 64)
-+    align = 64;
-+  size = ALIGN_UP (size, align);
-+  ret = grub_memalign (align, size);
-+  if (!ret)
-+    return 0;
-+  grub_arch_sync_dma_caches (ret, size);
-+  return ret;
-+}
-+
-+void
-+grub_dma_free (struct grub_pci_dma_chunk *ch)
-+{
-+  grub_size_t size = (((struct grub_mm_header *) ch) - 1)->size * GRUB_MM_ALIGN;
-+  grub_arch_sync_dma_caches (ch, size);
-+  grub_free (ch);
-+}
-+
-+volatile void *
-+grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
-+{
-+  return (void *) ch;
-+}
-+
-+grub_uint32_t
-+grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
-+{
-+  return (grub_uint32_t) (grub_addr_t) ch;
-+}
-+
-diff --git a/include/grub/cache.h b/include/grub/cache.h
-index fc669dfd1..1c98ce270 100644
---- a/include/grub/cache.h
-+++ b/include/grub/cache.h
-@@ -34,15 +34,14 @@ void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
- #endif
- 
- #ifndef GRUB_MACHINE_EMU
--#ifdef _mips
--void EXPORT_FUNC(grub_arch_sync_dma_caches) (volatile void *address,
--					     grub_size_t len);
--#else
-+#if defined (__i386__) || defined (__x86_64__)
- static inline void
- grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)),
- 			   grub_size_t len __attribute__ ((unused)))
- {
- }
-+#else
-+void EXPORT_FUNC(grub_arch_sync_dma_caches) (volatile void *address, grub_size_t len);
- #endif
- #endif
- 
-diff --git a/include/grub/dma.h b/include/grub/dma.h
-new file mode 100644
-index 000000000..19992ebc1
---- /dev/null
-+++ b/include/grub/dma.h
-@@ -0,0 +1,44 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 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_DMA_H
-+#define	GRUB_DMA_H	1
-+
-+struct grub_pci_dma_chunk;
-+
-+struct grub_pci_dma_chunk *EXPORT_FUNC(grub_memalign_dma32) (grub_size_t align,
-+							     grub_size_t size);
-+void EXPORT_FUNC(grub_dma_free) (struct grub_pci_dma_chunk *ch);
-+volatile void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
-+grub_uint32_t EXPORT_FUNC(grub_dma_get_phys) (struct grub_pci_dma_chunk *ch);
-+
-+static inline void *
-+grub_dma_phys2virt (grub_uint32_t phys, struct grub_pci_dma_chunk *chunk)
-+{
-+  return ((grub_uint8_t *) grub_dma_get_virt (chunk)
-+	  + (phys - grub_dma_get_phys (chunk)));
-+}
-+
-+static inline grub_uint32_t
-+grub_dma_virt2phys (volatile void *virt, struct grub_pci_dma_chunk *chunk)
-+{
-+  return (((grub_uint8_t *) virt - (grub_uint8_t *) grub_dma_get_virt (chunk))
-+	  + grub_dma_get_phys (chunk));
-+}
-+
-+#endif
-diff --git a/include/grub/pci.h b/include/grub/pci.h
-index 70d9a0513..262c89b74 100644
---- a/include/grub/pci.h
-+++ b/include/grub/pci.h
-@@ -142,27 +142,7 @@ grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (grub_pci_device_t dev,
- void EXPORT_FUNC(grub_pci_iterate) (grub_pci_iteratefunc_t hook,
- 				    void *hook_data);
- 
--struct grub_pci_dma_chunk;
--
--struct grub_pci_dma_chunk *EXPORT_FUNC(grub_memalign_dma32) (grub_size_t align,
--							     grub_size_t size);
--void EXPORT_FUNC(grub_dma_free) (struct grub_pci_dma_chunk *ch);
--volatile void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
--grub_uint32_t EXPORT_FUNC(grub_dma_get_phys) (struct grub_pci_dma_chunk *ch);
--
--static inline void *
--grub_dma_phys2virt (grub_uint32_t phys, struct grub_pci_dma_chunk *chunk)
--{
--  return ((grub_uint8_t *) grub_dma_get_virt (chunk)
--	  + (phys - grub_dma_get_phys (chunk)));
--}
--
--static inline grub_uint32_t
--grub_dma_virt2phys (volatile void *virt, struct grub_pci_dma_chunk *chunk)
--{
--  return (((grub_uint8_t *) virt - (grub_uint8_t *) grub_dma_get_virt (chunk))
--	  + grub_dma_get_phys (chunk));
--}
-+#include <grub/dma.h>
- 
- grub_uint8_t
- EXPORT_FUNC (grub_pci_find_capability) (grub_pci_device_t dev, grub_uint8_t cap);
--- 
-2.14.3
-

0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -1,8 +1,8 @@
-From 266c7e797971879dc229594556a687a79c92d3b6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 089/198] blscfg: add blscfg module to parse Boot Loader
- Specification snippets
+Subject: [PATCH] blscfg: add blscfg module to parse Boot Loader Specification
+ snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
 
@@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  create mode 100644 grub-core/commands/blscfg.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c653c71c5..7f3d5a2bf 100644
+index f8065388213..cd0902b46b8 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -768,6 +768,14 @@ module = {
@@ -41,7 +41,7 @@ index c653c71c5..7f3d5a2bf 100644
    common = commands/boot.c;
 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
 new file mode 100644
-index 000000000..4274aca5a
+index 00000000000..4274aca5a9d
 --- /dev/null
 +++ b/grub-core/commands/blscfg.c
 @@ -0,0 +1,201 @@
@@ -246,6 +246,3 @@ index 000000000..4274aca5a
 +{
 +  grub_unregister_extcmd (cmd);
 +}
--- 
-2.14.3
-

0028-ehci-Split-core-code-from-PCI-part.patch

@@ -1,571 +0,0 @@
-From 058df7b5a9cc7aaa9872eaa916b715544a8f9840 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 22:10:26 +0200
-Subject: [PATCH 028/198] ehci: Split core  code from PCI part.
-
-On ARM often EHCI is present without PCI and just declared in device
-tree. So splitcore from PCI part.
----
- grub-core/Makefile.core.def  |   1 +
- grub-core/bus/usb/ehci-pci.c | 208 +++++++++++++++++++++++++++++++++++++++++++
- grub-core/bus/usb/ehci.c     | 201 +++--------------------------------------
- 3 files changed, 223 insertions(+), 187 deletions(-)
- create mode 100644 grub-core/bus/usb/ehci-pci.c
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e4f253a20..4745eb4d9 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -593,6 +593,7 @@ module = {
- module = {
-   name = ehci;
-   common = bus/usb/ehci.c;
-+  pci = bus/usb/ehci-pci.c;
-   enable = pci;
- };
- 
-diff --git a/grub-core/bus/usb/ehci-pci.c b/grub-core/bus/usb/ehci-pci.c
-new file mode 100644
-index 000000000..65e6cb574
---- /dev/null
-+++ b/grub-core/bus/usb/ehci-pci.c
-@@ -0,0 +1,208 @@
-+/* ehci.c - EHCI Support.  */
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2011  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/>.
-+ */
-+
-+#include <grub/pci.h>
-+#include <grub/cpu/pci.h>
-+#include <grub/cs5536.h>
-+#include <grub/misc.h>
-+#include <grub/mm.h>
-+#include <grub/time.h>
-+#include <grub/usb.h>
-+
-+#define GRUB_EHCI_PCI_SBRN_REG  0x60
-+#define GRUB_EHCI_ADDR_MEM_MASK	(~0xff)
-+
-+/* USBLEGSUP bits and related OS OWNED byte offset */
-+enum
-+{
-+  GRUB_EHCI_BIOS_OWNED = (1 << 16),
-+  GRUB_EHCI_OS_OWNED = (1 << 24)
-+};
-+
-+/* PCI iteration function... */
-+static int
-+grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
-+		    void *data __attribute__ ((unused)))
-+{
-+  volatile grub_uint32_t *regs;
-+  grub_uint32_t base, base_h;
-+  grub_uint32_t eecp_offset;
-+  grub_uint32_t usblegsup = 0;
-+  grub_uint64_t maxtime;
-+  grub_uint32_t interf;
-+  grub_uint32_t subclass;
-+  grub_uint32_t class;
-+  grub_uint8_t release;
-+  grub_uint32_t class_code;
-+
-+  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: begin\n");
-+
-+  if (pciid == GRUB_CS5536_PCIID)
-+    {
-+      grub_uint64_t basereg;
-+
-+      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE);
-+      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
-+	{
-+	  /* Shouldn't happen.  */
-+	  grub_dprintf ("ehci", "No EHCI address is assigned\n");
-+	  return 0;
-+	}
-+      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
-+      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
-+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
-+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
-+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_SMI_ENABLE;
-+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE, basereg);
-+    }
-+  else
-+    {
-+      grub_pci_address_t addr;
-+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-+      class_code = grub_pci_read (addr) >> 8;
-+      interf = class_code & 0xFF;
-+      subclass = (class_code >> 8) & 0xFF;
-+      class = class_code >> 16;
-+
-+      /* If this is not an EHCI controller, just return.  */
-+      if (class != 0x0c || subclass != 0x03 || interf != 0x20)
-+	return 0;
-+
-+      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: class OK\n");
-+
-+      /* Check Serial Bus Release Number */
-+      addr = grub_pci_make_address (dev, GRUB_EHCI_PCI_SBRN_REG);
-+      release = grub_pci_read_byte (addr);
-+      if (release != 0x20)
-+	{
-+	  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: Wrong SBRN: %0x\n",
-+			release);
-+	  return 0;
-+	}
-+      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n");
-+  
-+      /* Determine EHCI EHCC registers base address.  */
-+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
-+      base = grub_pci_read (addr);
-+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
-+      base_h = grub_pci_read (addr);
-+      /* Stop if registers are mapped above 4G - GRUB does not currently
-+       * work with registers mapped above 4G */
-+      if (((base & GRUB_PCI_ADDR_MEM_TYPE_MASK) != GRUB_PCI_ADDR_MEM_TYPE_32)
-+	  && (base_h != 0))
-+	{
-+	  grub_dprintf ("ehci",
-+			"EHCI grub_ehci_pci_iter: registers above 4G are not supported\n");
-+	  return 0;
-+	}
-+      base &= GRUB_PCI_ADDR_MEM_MASK;
-+      if (!base)
-+	{
-+	  grub_dprintf ("ehci",
-+			"EHCI: EHCI is not mapped\n");
-+	  return 0;
-+	}
-+
-+      /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
-+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-+      grub_pci_write_word(addr,
-+			  GRUB_PCI_COMMAND_MEM_ENABLED
-+			  | GRUB_PCI_COMMAND_BUS_MASTER
-+			  | grub_pci_read_word(addr));
-+      
-+      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
-+    }
-+
-+  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: iobase of EHCC: %08x\n",
-+		(base & GRUB_EHCI_ADDR_MEM_MASK));
-+
-+  regs = grub_pci_device_map_range (dev,
-+				    (base & GRUB_EHCI_ADDR_MEM_MASK),
-+				    0x100);
-+
-+  /* Is there EECP ? */
-+  eecp_offset = (grub_le_to_cpu32 (regs[2]) >> 8) & 0xff;
-+
-+    /* Determine and change ownership. */
-+  /* EECP offset valid in HCCPARAMS */
-+  /* Ownership can be changed via EECP only */
-+  if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40)	
-+    {
-+      grub_pci_address_t pciaddr_eecp;
-+      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset);
-+
-+      usblegsup = grub_pci_read (pciaddr_eecp);
-+      if (usblegsup & GRUB_EHCI_BIOS_OWNED)
-+	{
-+	  grub_boot_time ("Taking ownership of EHCI controller");
-+	  grub_dprintf ("ehci",
-+			"EHCI grub_ehci_pci_iter: EHCI owned by: BIOS\n");
-+	  /* Ownership change - set OS_OWNED bit */
-+	  grub_pci_write (pciaddr_eecp, usblegsup | GRUB_EHCI_OS_OWNED);
-+	  /* Ensure PCI register is written */
-+	  grub_pci_read (pciaddr_eecp);
-+
-+	  /* Wait for finish of ownership change, EHCI specification
-+	   * doesn't say how long it can take... */
-+	  maxtime = grub_get_time_ms () + 1000;
-+	  while ((grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
-+		 && (grub_get_time_ms () < maxtime));
-+	  if (grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
-+	    {
-+	      grub_dprintf ("ehci",
-+			    "EHCI grub_ehci_pci_iter: EHCI change ownership timeout");
-+	      /* Change ownership in "hard way" - reset BIOS ownership */
-+	      grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
-+	      /* Ensure PCI register is written */
-+	      grub_pci_read (pciaddr_eecp);
-+	    }
-+	}
-+      else if (usblegsup & GRUB_EHCI_OS_OWNED)
-+	/* XXX: What to do in this case - nothing ? Can it happen ? */
-+	grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: EHCI owned by: OS\n");
-+      else
-+	{
-+	  grub_dprintf ("ehci",
-+			"EHCI grub_ehci_pci_iter: EHCI owned by: NONE\n");
-+	  /* XXX: What to do in this case ? Can it happen ?
-+	   * Is code below correct ? */
-+	  /* Ownership change - set OS_OWNED bit */
-+	  grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
-+	  /* Ensure PCI register is written */
-+	  grub_pci_read (pciaddr_eecp);
-+	}
-+
-+      /* Disable SMI, just to be sure.  */
-+      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset + 4);
-+      grub_pci_write (pciaddr_eecp, 0);
-+      /* Ensure PCI register is written */
-+      grub_pci_read (pciaddr_eecp);
-+    }
-+
-+  grub_dprintf ("ehci", "inithw: EHCI grub_ehci_pci_iter: ownership OK\n");
-+
-+  grub_ehci_init_device (regs);
-+  return 0;
-+}
-+
-+void
-+grub_ehci_pci_scan (void)
-+{
-+  grub_pci_iterate (grub_ehci_pci_iter, NULL);
-+}
-diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
-index 5f4297bb2..c772e7654 100644
---- a/grub-core/bus/usb/ehci.c
-+++ b/grub-core/bus/usb/ehci.c
-@@ -22,13 +22,10 @@
- #include <grub/usb.h>
- #include <grub/usbtrans.h>
- #include <grub/misc.h>
--#include <grub/pci.h>
--#include <grub/cpu/pci.h>
--#include <grub/cpu/io.h>
- #include <grub/time.h>
- #include <grub/loader.h>
--#include <grub/cs5536.h>
- #include <grub/disk.h>
-+#include <grub/dma.h>
- #include <grub/cache.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
-@@ -39,8 +36,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
-  *      - is not supporting interrupt transfers
-  */
- 
--#define GRUB_EHCI_PCI_SBRN_REG  0x60
--
- /* Capability registers offsets */
- enum
- {
-@@ -54,7 +49,6 @@ enum
- #define GRUB_EHCI_EECP_MASK     (0xff << 8)
- #define GRUB_EHCI_EECP_SHIFT    8
- 
--#define GRUB_EHCI_ADDR_MEM_MASK	(~0xff)
- #define GRUB_EHCI_POINTER_MASK	(~0x1f)
- 
- /* Capability register SPARAMS bits */
-@@ -85,13 +79,6 @@ enum
- 
- #define GRUB_EHCI_QH_EMPTY 1
- 
--/* USBLEGSUP bits and related OS OWNED byte offset */
--enum
--{
--  GRUB_EHCI_BIOS_OWNED = (1 << 16),
--  GRUB_EHCI_OS_OWNED = (1 << 24)
--};
--
- /* Operational registers offsets */
- enum
- {
-@@ -455,9 +442,10 @@ grub_ehci_reset (struct grub_ehci *e)
- 
-   sync_all_caches (e);
- 
-+  grub_dprintf ("ehci", "reset\n");
-+
-   grub_ehci_oper_write32 (e, GRUB_EHCI_COMMAND,
--			  GRUB_EHCI_CMD_HC_RESET
--			  | grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-+			  GRUB_EHCI_CMD_HC_RESET);
-   /* Ensure command is written */
-   grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND);
-   /* XXX: How long time could take reset of HC ? */
-@@ -473,116 +461,24 @@ grub_ehci_reset (struct grub_ehci *e)
- }
- 
- /* PCI iteration function... */
--static int
--grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
--		    void *data __attribute__ ((unused)))
-+void
-+grub_ehci_init_device (volatile void *regs)
- {
--  grub_uint8_t release;
--  grub_uint32_t class_code;
--  grub_uint32_t interf;
--  grub_uint32_t subclass;
--  grub_uint32_t class;
--  grub_uint32_t base, base_h;
-   struct grub_ehci *e;
--  grub_uint32_t eecp_offset;
-   grub_uint32_t fp;
-   int i;
--  grub_uint32_t usblegsup = 0;
--  grub_uint64_t maxtime;
-   grub_uint32_t n_ports;
-   grub_uint8_t caplen;
- 
--  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: begin\n");
--
--  if (pciid == GRUB_CS5536_PCIID)
--    {
--      grub_uint64_t basereg;
--
--      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE);
--      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
--	{
--	  /* Shouldn't happen.  */
--	  grub_dprintf ("ehci", "No EHCI address is assigned\n");
--	  return 0;
--	}
--      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
--      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
--      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
--      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
--      basereg &= ~GRUB_CS5536_MSR_USB_BASE_SMI_ENABLE;
--      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE, basereg);
--    }
--  else
--    {
--      grub_pci_address_t addr;
--      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
--      class_code = grub_pci_read (addr) >> 8;
--      interf = class_code & 0xFF;
--      subclass = (class_code >> 8) & 0xFF;
--      class = class_code >> 16;
--
--      /* If this is not an EHCI controller, just return.  */
--      if (class != 0x0c || subclass != 0x03 || interf != 0x20)
--	return 0;
--
--      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: class OK\n");
--
--      /* Check Serial Bus Release Number */
--      addr = grub_pci_make_address (dev, GRUB_EHCI_PCI_SBRN_REG);
--      release = grub_pci_read_byte (addr);
--      if (release != 0x20)
--	{
--	  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: Wrong SBRN: %0x\n",
--			release);
--	  return 0;
--	}
--      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n");
--  
--      /* Determine EHCI EHCC registers base address.  */
--      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
--      base = grub_pci_read (addr);
--      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
--      base_h = grub_pci_read (addr);
--      /* Stop if registers are mapped above 4G - GRUB does not currently
--       * work with registers mapped above 4G */
--      if (((base & GRUB_PCI_ADDR_MEM_TYPE_MASK) != GRUB_PCI_ADDR_MEM_TYPE_32)
--	  && (base_h != 0))
--	{
--	  grub_dprintf ("ehci",
--			"EHCI grub_ehci_pci_iter: registers above 4G are not supported\n");
--	  return 0;
--	}
--      base &= GRUB_PCI_ADDR_MEM_MASK;
--      if (!base)
--	{
--	  grub_dprintf ("ehci",
--			"EHCI: EHCI is not mapped\n");
--	  return 0;
--	}
--
--      /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
--      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
--      grub_pci_write_word(addr,
--			  GRUB_PCI_COMMAND_MEM_ENABLED
--			  | GRUB_PCI_COMMAND_BUS_MASTER
--			  | grub_pci_read_word(addr));
--      
--      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
--    }
--
-   /* Allocate memory for the controller and fill basic values. */
-   e = grub_zalloc (sizeof (*e));
-   if (!e)
--    return 1;
-+    return;
-   e->framelist_chunk = NULL;
-   e->td_chunk = NULL;
-   e->qh_chunk = NULL;
--  e->iobase_ehcc = grub_pci_device_map_range (dev,
--					      (base & GRUB_EHCI_ADDR_MEM_MASK),
--					      0x100);
-+  e->iobase_ehcc = regs;
- 
--  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: iobase of EHCC: %08x\n",
--		(base & GRUB_EHCI_ADDR_MEM_MASK));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CAPLEN: %02x\n",
- 		grub_ehci_ehcc_read8 (e, GRUB_EHCI_EHCC_CAPLEN));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: VERSION: %04x\n",
-@@ -598,7 +494,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
-   if (caplen & (sizeof (grub_uint32_t) - 1))
-     {
-       grub_dprintf ("ehci", "Unaligned caplen\n");
--      return 0;
-+      return;
-     }
-   e->iobase = ((volatile grub_uint32_t *) e->iobase_ehcc
- 	       + (caplen / sizeof (grub_uint32_t)));
-@@ -609,7 +505,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
- 
-   grub_dprintf ("ehci",
- 		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
--		(base & GRUB_EHCI_ADDR_MEM_MASK) + caplen);
-+		(grub_addr_t) e->iobase_ehcc + caplen);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
-@@ -625,10 +521,6 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CONFIG_FLAG: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_CONFIG_FLAG));
- 
--  /* Is there EECP ? */
--  eecp_offset = (grub_ehci_ehcc_read32 (e, GRUB_EHCI_EHCC_CPARAMS)
--		 & GRUB_EHCI_EECP_MASK) >> GRUB_EHCI_EECP_SHIFT;
--
-   /* Check format of data structures requested by EHCI */
-   /* XXX: In fact it is not used at any place, it is prepared for future
-    * This implementation uses 32-bits pointers only */
-@@ -732,65 +624,6 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
- 
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: QH/TD init. OK\n");
- 
--  /* Determine and change ownership. */
--  /* EECP offset valid in HCCPARAMS */
--  /* Ownership can be changed via EECP only */
--  if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40)	
--    {
--      grub_pci_address_t pciaddr_eecp;
--      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset);
--
--      usblegsup = grub_pci_read (pciaddr_eecp);
--      if (usblegsup & GRUB_EHCI_BIOS_OWNED)
--	{
--	  grub_boot_time ("Taking ownership of EHCI controller");
--	  grub_dprintf ("ehci",
--			"EHCI grub_ehci_pci_iter: EHCI owned by: BIOS\n");
--	  /* Ownership change - set OS_OWNED bit */
--	  grub_pci_write (pciaddr_eecp, usblegsup | GRUB_EHCI_OS_OWNED);
--	  /* Ensure PCI register is written */
--	  grub_pci_read (pciaddr_eecp);
--
--	  /* Wait for finish of ownership change, EHCI specification
--	   * doesn't say how long it can take... */
--	  maxtime = grub_get_time_ms () + 1000;
--	  while ((grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
--		 && (grub_get_time_ms () < maxtime));
--	  if (grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
--	    {
--	      grub_dprintf ("ehci",
--			    "EHCI grub_ehci_pci_iter: EHCI change ownership timeout");
--	      /* Change ownership in "hard way" - reset BIOS ownership */
--	      grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
--	      /* Ensure PCI register is written */
--	      grub_pci_read (pciaddr_eecp);
--	    }
--	}
--      else if (usblegsup & GRUB_EHCI_OS_OWNED)
--	/* XXX: What to do in this case - nothing ? Can it happen ? */
--	grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: EHCI owned by: OS\n");
--      else
--	{
--	  grub_dprintf ("ehci",
--			"EHCI grub_ehci_pci_iter: EHCI owned by: NONE\n");
--	  /* XXX: What to do in this case ? Can it happen ?
--	   * Is code below correct ? */
--	  /* Ownership change - set OS_OWNED bit */
--	  grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
--	  /* Ensure PCI register is written */
--	  grub_pci_read (pciaddr_eecp);
--	}
--
--    /* Disable SMI, just to be sure.  */
--    pciaddr_eecp = grub_pci_make_address (dev, eecp_offset + 4);
--    grub_pci_write (pciaddr_eecp, 0);
--    /* Ensure PCI register is written */
--    grub_pci_read (pciaddr_eecp);
--
--    }
--
--  grub_dprintf ("ehci", "inithw: EHCI grub_ehci_pci_iter: ownership OK\n");
--
-   /* Now we can setup EHCI (maybe...) */
- 
-   /* Check if EHCI is halted and halt it if not */
-@@ -864,7 +697,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
- 
-   grub_dprintf ("ehci",
- 		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
--		(base & GRUB_EHCI_ADDR_MEM_MASK));
-+		(grub_addr_t) regs);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
-@@ -880,7 +713,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CONFIG_FLAG: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_CONFIG_FLAG));
- 
--  return 0;
-+  return;
- 
- fail:
-   if (e)
-@@ -894,7 +727,7 @@ fail:
-     }
-   grub_free (e);
- 
--  return 0;
-+  return;
- }
- 
- static int
-@@ -1891,12 +1724,6 @@ grub_ehci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
-     }
- }
- 
--static void
--grub_ehci_inithw (void)
--{
--  grub_pci_iterate (grub_ehci_pci_iter, NULL);
--}
--
- static grub_err_t
- grub_ehci_restore_hw (void)
- {
-@@ -1997,7 +1824,7 @@ GRUB_MOD_INIT (ehci)
-   grub_stop_disk_firmware ();
- 
-   grub_boot_time ("Initing EHCI hardware");
--  grub_ehci_inithw ();
-+  grub_ehci_pci_scan ();
-   grub_boot_time ("Registering EHCI driver");
-   grub_usb_controller_dev_register (&usb_controller);
-   grub_boot_time ("EHCI driver registered");
--- 
-2.14.3
-

0029-Add-devicetree-loading.patch

@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 Jan 2014 13:12:23 -0500
+Subject: [PATCH] Add devicetree loading
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+
+Switch to use APM Mustang device tree, for hardware testing.
+
+Signed-off-by: David A. Marlin <d.marlin@redhat.com>
+
+Use the default device tree from the grub default file
+
+instead of hardcoding a value.
+
+Signed-off-by: David A. Marlin <dmarlin@redhat.com>
+---
+ util/grub-mkconfig.in   |  3 ++-
+ util/grub.d/10_linux.in | 15 +++++++++++++++
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index b0a8626dd1c..f68d4925ee6 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
+   GRUB_ENABLE_CRYPTODISK \
+   GRUB_BADRAM \
+   GRUB_OS_PROBER_SKIP_LIST \
+-  GRUB_DISABLE_SUBMENU
++  GRUB_DISABLE_SUBMENU \
++  GRUB_DEFAULT_DTB
+ 
+ if test "x${grub_cfg}" != "x"; then
+   rm -f "${grub_cfg}.new"
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 87a7da34982..233754ff296 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -153,6 +153,13 @@ EOF
+     sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+ 	initrd	$(echo $initrd_path)
++EOF
++  fi
++  if test -n "${fdt}" ; then
++    message="$(gettext_printf "Loading fdt ...")"
++    sed "s/^/$submenu_indentation/" << EOF
++	echo	'$(echo "$message" | grub_quote)'
++	devicetree	${rel_dirname}/${fdt}
+ EOF
+   fi
+   sed "s/^/$submenu_indentation/" << EOF
+@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
+     gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
+   fi
+ 
++  fdt=
++  for i in "dtb-${version}" "dtb-${alt_version}"; do
++    if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
++      fdt="${i}/${GRUB_DEFAULT_DTB}"
++      break
++    fi
++  done
++
+   config=
+   for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+     if test -e "${i}" ; then

0029-arm_coreboot-Support-EHCI.patch

@@ -1,123 +0,0 @@
-From d11ced1e1fb93676942e51618eb53c140f541890 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 8 May 2017 22:14:28 +0200
-Subject: [PATCH 029/198] arm_coreboot: Support EHCI.
-
----
- gentpl.py                    |  2 +-
- grub-core/Makefile.core.def  |  2 ++
- grub-core/bus/usb/ehci-fdt.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
- grub-core/bus/usb/usbtrans.c |  2 +-
- include/grub/usb.h           |  4 ++++
- 5 files changed, 53 insertions(+), 2 deletions(-)
- create mode 100644 grub-core/bus/usb/ehci-fdt.c
-
-diff --git a/gentpl.py b/gentpl.py
-index ed268178b..da67965a4 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -63,7 +63,7 @@ GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_loongson", "mips_qemu_mips",
-                                      "sparc64_ieee1275", "powerpc_ieee1275"]
- GROUPS["cmos"].remove("i386_efi"); GROUPS["cmos"].remove("x86_64_efi");
- GROUPS["pci"]      = GROUPS["x86"] + ["mips_loongson"]
--GROUPS["usb"]      = GROUPS["pci"]
-+GROUPS["usb"]      = GROUPS["pci"] + ["arm_coreboot"]
- 
- # If gfxterm is main output console integrate it into kernel
- GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 4745eb4d9..5ce506597 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -593,8 +593,10 @@ module = {
- module = {
-   name = ehci;
-   common = bus/usb/ehci.c;
-+  arm_coreboot = bus/usb/ehci-fdt.c;
-   pci = bus/usb/ehci-pci.c;
-   enable = pci;
-+  enable = arm_coreboot;
- };
- 
- module = {
-diff --git a/grub-core/bus/usb/ehci-fdt.c b/grub-core/bus/usb/ehci-fdt.c
-new file mode 100644
-index 000000000..29b50bdd5
---- /dev/null
-+++ b/grub-core/bus/usb/ehci-fdt.c
-@@ -0,0 +1,45 @@
-+/* ehci.c - EHCI Support.  */
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2011  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/>.
-+ */
-+
-+#include <grub/misc.h>
-+#include <grub/mm.h>
-+#include <grub/time.h>
-+#include <grub/usb.h>
-+#include <grub/fdtbus.h>
-+
-+static grub_err_t
-+ehci_attach(const struct grub_fdtbus_dev *dev)
-+{
-+  grub_dprintf ("ehci", "Found generic-ehci\n");
-+
-+  grub_ehci_init_device (grub_fdtbus_map_reg (dev, 0, 0));
-+  return 0;
-+}
-+
-+struct grub_fdtbus_driver ehci =
-+{
-+  .compatible = "generic-ehci",
-+  .attach = ehci_attach
-+};
-+
-+void
-+grub_ehci_pci_scan (void)
-+{
-+  grub_fdtbus_register (&ehci);
-+}
-diff --git a/grub-core/bus/usb/usbtrans.c b/grub-core/bus/usb/usbtrans.c
-index 9266e4931..85f081fff 100644
---- a/grub-core/bus/usb/usbtrans.c
-+++ b/grub-core/bus/usb/usbtrans.c
-@@ -18,7 +18,7 @@
-  */
- 
- #include <grub/dl.h>
--#include <grub/pci.h>
-+#include <grub/dma.h>
- #include <grub/mm.h>
- #include <grub/misc.h>
- #include <grub/usb.h>
-diff --git a/include/grub/usb.h b/include/grub/usb.h
-index 11d96481f..512ae1dd0 100644
---- a/include/grub/usb.h
-+++ b/include/grub/usb.h
-@@ -321,5 +321,9 @@ grub_usb_err_t
- grub_usb_check_transfer (grub_usb_transfer_t trans, grub_size_t *actual);
- void
- grub_usb_cancel_transfer (grub_usb_transfer_t trans);
-+void
-+grub_ehci_init_device (volatile void *regs);
-+void
-+grub_ehci_pci_scan (void);
- 
- #endif /* GRUB_USB_H */
--- 
-2.14.3
-

0030-Don-t-write-messages-to-the-screen.patch

@@ -1,51 +1,21 @@
-From 6609ba848331d9153c554bb52f2ef0a33531cf55 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH 090/198] Don't write messages to the screen
+Subject: [PATCH] Don't write messages to the screen
 
 Writing messages to the screen before the menus or boot splash
 happens so quickly it looks like something is wrong and isn't
 very appealing.
 ---
- grub-core/boot/i386/pc/boot.S     |  3 ---
- grub-core/boot/i386/pc/diskboot.S |  5 -----
  grub-core/gettext/gettext.c       | 25 +++++--------------------
  grub-core/kern/main.c             |  5 -----
+ grub-core/boot/i386/pc/boot.S     |  3 ---
+ grub-core/boot/i386/pc/diskboot.S |  5 -----
  util/grub.d/10_linux.in           |  7 -------
  5 files changed, 5 insertions(+), 40 deletions(-)
 
-diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d28..ea167fe12 100644
---- a/grub-core/boot/i386/pc/boot.S
-+++ b/grub-core/boot/i386/pc/boot.S
-@@ -249,9 +249,6 @@ real_start:
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
--	/* print a notification message on the screen */
--	MSG(notification_string)
--
- 	/* set %si to the disk address packet */
- 	movw	$disk_address_packet, %si
- 
-diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index 1ee4cf5b2..c8b87ed29 100644
---- a/grub-core/boot/i386/pc/diskboot.S
-+++ b/grub-core/boot/i386/pc/diskboot.S
-@@ -50,11 +50,6 @@ _start:
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
--	/* print a notification message on the screen */
--	pushw	%si
--	MSG(notification_string)
--	popw	%si
--
- 	/* this sets up for the first run through "bootloop" */
- 	movw	$LOCAL(firstlist), %di
- 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4880cefe3..b22e1bcc9 100644
+index 4880cefe3f8..b22e1bcc94b 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -434,16 +434,12 @@ static char *
@@ -127,7 +97,7 @@ index 4880cefe3..b22e1bcc9 100644
    grub_register_variable_hook ("locale_dir", NULL, read_main);
    grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 8ab7794c4..da47b18b5 100644
+index 8ab7794c47b..da47b18b50e 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -268,11 +268,6 @@ grub_main (void)
@@ -142,40 +112,65 @@ index 8ab7794c4..da47b18b5 100644
    grub_load_config ();
  
    grub_boot_time ("Before loading embedded modules.");
+diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
+index 2bd0b2d2866..ea167fe1206 100644
+--- a/grub-core/boot/i386/pc/boot.S
++++ b/grub-core/boot/i386/pc/boot.S
+@@ -249,9 +249,6 @@ real_start:
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
+-	/* print a notification message on the screen */
+-	MSG(notification_string)
+-
+ 	/* set %si to the disk address packet */
+ 	movw	$disk_address_packet, %si
+ 
+diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
+index c1addc0df29..68d31de0c4c 100644
+--- a/grub-core/boot/i386/pc/diskboot.S
++++ b/grub-core/boot/i386/pc/diskboot.S
+@@ -50,11 +50,6 @@ _start:
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
+-	/* print a notification message on the screen */
+-	pushw	%si
+-	MSG(notification_string)
+-	popw	%si
+-
+ 	/* this sets up for the first run through "bootloop" */
+ 	movw	$LOCAL(firstlist), %di
+ 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 8ccf012f7..a3d9711d6 100644
+index 233754ff296..3a5aa0f8dc9 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -128,29 +128,22 @@ linux_entry ()
+@@ -138,27 +138,20 @@ linux_entry ()
      fi
      printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
    fi
 -  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-   if [ -d /sys/firmware/efi ]; then
-     sed "s/^/$submenu_indentation/" << EOF
--	echo	'$(echo "$message" | grub_quote)'
- 	linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
- EOF
-   else
    sed "s/^/$submenu_indentation/" << EOF
 -	echo	'$(echo "$message" | grub_quote)'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
  EOF
-   fi
    if test -n "${initrd}" ; then
 -    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
 -    message="$(gettext_printf "Loading initial ramdisk ...")"
-     if [ -d /sys/firmware/efi ]; then
+     initrd_path=
+     for i in ${initrd}; do
+       initrd_path="${initrd_path} ${rel_dirname}/${i}"
+     done
      sed "s/^/$submenu_indentation/" << EOF
 -	echo	'$(echo "$message" | grub_quote)'
- 	initrdefi ${rel_dirname}/${initrd}
- EOF
-     else
-       sed "s/^/$submenu_indentation/" << EOF
--	echo	'$message'
- 	initrd	${rel_dirname}/${initrd}
+ 	initrd	$(echo $initrd_path)
+ EOF
+   fi
+   if test -n "${fdt}" ; then
+-    message="$(gettext_printf "Loading fdt ...")"
+     sed "s/^/$submenu_indentation/" << EOF
+-	echo	'$(echo "$message" | grub_quote)'
+ 	devicetree	${rel_dirname}/${fdt}
  EOF
    fi
--- 
-2.14.3
-

0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch

@@ -1,25 +0,0 @@
-From 4f8471532d454b2db96434c28bf7105ed69e0f4d Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 08:39:40 +0200
-Subject: [PATCH 030/198] Fix bug on FDT nodes with compatible property
-
----
- grub-core/bus/fdt.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c
-index 6fb077000..34d535457 100644
---- a/grub-core/bus/fdt.c
-+++ b/grub-core/bus/fdt.c
-@@ -43,6 +43,8 @@ is_compatible (struct grub_fdtbus_driver *driver,
-   grub_size_t compatible_size;
-   const char *compatible = grub_fdt_get_prop (dtb, node, "compatible",
- 					      &compatible_size);
-+  if (!compatible)
-+    return 0;
-   const char *compatible_end = compatible + compatible_size;
-   while (compatible < compatible_end)
-     {
--- 
-2.14.3
-

0031-Don-t-print-GNU-GRUB-header.patch

@@ -1,7 +1,7 @@
-From 95aeba5fe67ad11a995eb8e583708a722b8bdeb9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:53:48 -0400
-Subject: [PATCH 091/198] Don't print GNU GRUB header
+Subject: [PATCH] Don't print GNU GRUB header
 
 No one cares.
 ---
@@ -9,7 +9,7 @@ No one cares.
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index b2654ef62..f57b7508a 100644
+index b2654ef62e8..f57b7508a76 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -202,15 +202,16 @@ read_config_file (const char *config)
@@ -40,6 +40,3 @@ index b2654ef62..f57b7508a 100644
  }
  
  static void
--- 
-2.14.3
-

0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch

@@ -1,134 +0,0 @@
-From c4313c812dc14e82a774b580b5e34d40e7f3fae6 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 08:40:29 +0200
-Subject: [PATCH 031/198] fdtbus: Add ability to send/receive messages on
- parent busses.
-
----
- grub-core/bus/fdt.c   | 35 +++++++++++++++++------------------
- include/grub/fdtbus.h | 18 +++++++++++++++++-
- 2 files changed, 34 insertions(+), 19 deletions(-)
-
-diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c
-index 34d535457..135da497b 100644
---- a/grub-core/bus/fdt.c
-+++ b/grub-core/bus/fdt.c
-@@ -25,30 +25,22 @@ static grub_size_t root_address_cells, root_size_cells;
- /* Pointer to this symbol signals invalid mapping.  */
- char grub_fdtbus_invalid_mapping[1];
- 
--struct grub_fdtbus_dev
--{
--  struct grub_fdtbus_dev *next;
--  struct grub_fdtbus_dev *parent;
--  int node;
--  struct grub_fdtbus_driver *driver;
--};
--
- struct grub_fdtbus_dev *devs;
- struct grub_fdtbus_driver *drivers;
- 
--static int
--is_compatible (struct grub_fdtbus_driver *driver,
--	       int node)
-+int
-+grub_fdtbus_is_compatible (const char *compat_string,
-+			   const struct grub_fdtbus_dev *dev)
- {
-   grub_size_t compatible_size;
--  const char *compatible = grub_fdt_get_prop (dtb, node, "compatible",
-+  const char *compatible = grub_fdt_get_prop (dtb, dev->node, "compatible",
- 					      &compatible_size);
-   if (!compatible)
-     return 0;
-   const char *compatible_end = compatible + compatible_size;
-   while (compatible < compatible_end)
-     {
--      if (grub_strcmp (driver->compatible, compatible) == 0)
-+      if (grub_strcmp (compat_string, compatible) == 0)
- 	return 1;
-       compatible += grub_strlen (compatible) + 1;
-     }
-@@ -75,10 +67,12 @@ fdtbus_scan (struct grub_fdtbus_dev *parent)
-       dev->parent = parent;
-       devs = dev;
-       FOR_LIST_ELEMENTS(driver, drivers)
--	if (!dev->driver && is_compatible (driver, node))
-+	if (!dev->driver && grub_fdtbus_is_compatible (driver->compatible, dev))
- 	  {
--	    if (driver->attach(dev) == GRUB_ERR_NONE)
-+	    grub_dprintf ("fdtbus", "Attaching %s\n", driver->compatible);
-+	    if (driver->attach (dev) == GRUB_ERR_NONE)
- 	      {
-+		grub_dprintf ("fdtbus", "Attached %s\n", driver->compatible);
- 		dev->driver = driver;
- 		break;
- 	      }
-@@ -92,13 +86,18 @@ void
- grub_fdtbus_register (struct grub_fdtbus_driver *driver)
- {
-   struct grub_fdtbus_dev *dev;
-+  grub_dprintf ("fdtbus", "Registering %s\n", driver->compatible);
-   grub_list_push (GRUB_AS_LIST_P (&drivers),
- 		  GRUB_AS_LIST (driver));
-   for (dev = devs; dev; dev = dev->next)
--    if (!dev->driver && is_compatible (driver, dev->node))
-+    if (!dev->driver && grub_fdtbus_is_compatible (driver->compatible, dev))
-       {
--	if (driver->attach(dev) == GRUB_ERR_NONE)
--	  dev->driver = driver;
-+	grub_dprintf ("fdtbus", "Attaching %s (%p)\n", driver->compatible, dev);
-+	if (driver->attach (dev) == GRUB_ERR_NONE)
-+	  {
-+	    grub_dprintf ("fdtbus", "Attached %s\n", driver->compatible);
-+	    dev->driver = driver;
-+	  }
- 	grub_print_error ();
-       }
- }
-diff --git a/include/grub/fdtbus.h b/include/grub/fdtbus.h
-index 985837e55..f519c40ec 100644
---- a/include/grub/fdtbus.h
-+++ b/include/grub/fdtbus.h
-@@ -22,7 +22,13 @@
- #include <grub/fdt.h>
- #include <grub/err.h>
- 
--struct grub_fdtbus_dev;
-+struct grub_fdtbus_dev
-+{
-+  struct grub_fdtbus_dev *next;
-+  struct grub_fdtbus_dev *parent;
-+  int node;
-+  struct grub_fdtbus_driver *driver;
-+};
- 
- struct grub_fdtbus_driver
- {
-@@ -33,6 +39,12 @@ struct grub_fdtbus_driver
- 
-   grub_err_t (*attach) (const struct grub_fdtbus_dev *dev);
-   void (*detach) (const struct grub_fdtbus_dev *dev);
-+
-+  /* Message bus operations.  */
-+  grub_err_t (*send) (const struct grub_fdtbus_dev *dev, const void *data, grub_size_t sz);
-+  grub_err_t (*receive) (const struct grub_fdtbus_dev *dev, void *data, grub_size_t sz);
-+  grub_err_t (*start) (const struct grub_fdtbus_dev *dev);
-+  void (*stop) (const struct grub_fdtbus_dev *dev);
- };
- 
- extern char EXPORT_VAR(grub_fdtbus_invalid_mapping)[1];
-@@ -63,6 +75,10 @@ EXPORT_FUNC(grub_fdtbus_register) (struct grub_fdtbus_driver *driver);
- void
- EXPORT_FUNC(grub_fdtbus_unregister) (struct grub_fdtbus_driver *driver);
- 
-+int
-+EXPORT_FUNC(grub_fdtbus_is_compatible) (const char *compat_string,
-+					const struct grub_fdtbus_dev *dev);
-+
- /* Must be called before any register(). */
- /* dtb is assumed to be unfreeable and must remain
-    valid for lifetime of GRUB.
--- 
-2.14.3
-

0032-Don-t-add-to-highlighted-row.patch

@@ -1,7 +1,7 @@
-From aca25c56911ece3e4d82ae9edbde6c705c1eaacc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 092/198] Don't add '*' to highlighted row
+Subject: [PATCH] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -9,7 +9,7 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6..a3d1f23f6 100644
+index e22bb91f6e8..a3d1f23f68f 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
@@ -21,6 +21,3 @@ index e22bb91f6..a3d1f23f6 100644
  
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
--- 
-2.14.3
-

0032-rk3288_spi-Add-SPI-driver.patch

@@ -1,165 +0,0 @@
-From b0b1b81a11f8bae8ab9e8edd87ac3f4f7949d03b Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 08:42:14 +0200
-Subject: [PATCH 032/198] rk3288_spi: Add SPI driver
-
----
- grub-core/Makefile.core.def        |   1 +
- grub-core/bus/spi/rk3288_spi.c     | 103 +++++++++++++++++++++++++++++++++++++
- grub-core/kern/arm/coreboot/init.c |   2 +
- include/grub/arm/coreboot/kernel.h |   4 +-
- 4 files changed, 108 insertions(+), 2 deletions(-)
- create mode 100644 grub-core/bus/spi/rk3288_spi.c
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 5ce506597..d2239f171 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -162,6 +162,7 @@ kernel = {
-   arm_coreboot = bus/fdt.c;
-   arm_coreboot = term/ps2.c;
-   arm_coreboot = term/arm/pl050.c;
-+  arm_coreboot = bus/spi/rk3288_spi.c;
-   arm_coreboot = commands/keylayouts.c;
-   arm_coreboot = kern/arm/coreboot/dma.c;
- 
-diff --git a/grub-core/bus/spi/rk3288_spi.c b/grub-core/bus/spi/rk3288_spi.c
-new file mode 100644
-index 000000000..aacb79ffe
---- /dev/null
-+++ b/grub-core/bus/spi/rk3288_spi.c
-@@ -0,0 +1,103 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *
-+ *  Copyright (C) 2012  Google Inc.
-+ *  Copyright (C) 2016  Free Software Foundation, Inc.
-+ *
-+ *  This is based on depthcharge code.
-+ *
-+ *  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/>.
-+ */
-+
-+#include <grub/mm.h>
-+#include <grub/time.h>
-+#include <grub/misc.h>
-+#include <grub/fdtbus.h>
-+#include <grub/machine/kernel.h>
-+
-+static grub_err_t
-+spi_send (const struct grub_fdtbus_dev *dev, const void *data, grub_size_t sz)
-+{
-+  const grub_uint8_t *ptr = data, *end = ptr + sz;
-+  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
-+  spi[2] = 0;
-+  spi[1] = sz - 1;
-+  spi[0] = ((1 << 18) | spi[0]) & ~(1 << 19);
-+  spi[2] = 1;
-+  while (ptr < end)
-+    {
-+      while (spi[9] & 2);
-+      spi[256] = *ptr++;
-+    }
-+  while (spi[9] & 1);
-+  return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+spi_receive (const struct grub_fdtbus_dev *dev, void *data, grub_size_t sz)
-+{
-+  grub_uint8_t *ptr = data, *end = ptr + sz;
-+  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
-+  spi[2] = 0;
-+  spi[1] = sz - 1;
-+  spi[0] = ((1 << 19) | spi[0]) & ~(1 << 18);
-+  spi[2] = 1;
-+  while (ptr < end)
-+    {
-+      while (spi[9] & 8);
-+      *ptr++ = spi[512];
-+    }
-+  while (spi[9] & 1);
-+  return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+spi_start (const struct grub_fdtbus_dev *dev)
-+{
-+  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
-+  spi[3] = 1;
-+  return GRUB_ERR_NONE;
-+}
-+
-+static void
-+spi_stop (const struct grub_fdtbus_dev *dev)
-+{
-+  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
-+  spi[3] = 0;
-+}
-+
-+static grub_err_t
-+spi_attach(const struct grub_fdtbus_dev *dev)
-+{
-+  if (!grub_fdtbus_is_mapping_valid (grub_fdtbus_map_reg (dev, 0, 0)))
-+    return GRUB_ERR_IO;
-+
-+  return GRUB_ERR_NONE;
-+}
-+
-+static struct grub_fdtbus_driver spi =
-+{
-+  .compatible = "rockchip,rk3288-spi",
-+  .attach = spi_attach,
-+  .send = spi_send,
-+  .receive = spi_receive,
-+  .start = spi_start,
-+  .stop = spi_stop,
-+};
-+
-+void
-+grub_rk3288_spi_init (void)
-+{
-+  grub_fdtbus_register (&spi);
-+}
-diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
-index a06ccb72f..0126ff638 100644
---- a/grub-core/kern/arm/coreboot/init.c
-+++ b/grub-core/kern/arm/coreboot/init.c
-@@ -132,6 +132,8 @@ grub_machine_init (void)
-     grub_fatal ("No DTB found");
-   grub_fdtbus_init (dtb, dtb_size);
- 
-+  grub_rk3288_spi_init ();
-+
-   grub_machine_timer_init ();
-   grub_pl050_init ();
- }
-diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h
-index 09cd7fe32..269505342 100644
---- a/include/grub/arm/coreboot/kernel.h
-+++ b/include/grub/arm/coreboot/kernel.h
-@@ -34,8 +34,8 @@ struct grub_fdt_board
- extern struct grub_fdt_board grub_fdt_boards[];
- void grub_machine_timer_init (void);
- void grub_pl050_init (void);
--void
--grub_cros_init (void);
-+void grub_cros_init (void);
-+void grub_rk3288_spi_init (void);
- extern grub_addr_t EXPORT_VAR (start_of_ram);
- #endif /* ! ASM_FILE */
- 
--- 
-2.14.3
-

0033-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
-From eef343ff642b42f0e46eb5e8ff5d89fef375f4a2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH 093/198] Message string cleanups
+Subject: [PATCH] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---
@@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon.
  1 file changed, 9 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index a3d1f23f6..64a83862f 100644
+index a3d1f23f68f..64a83862f66 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
@@ -66,6 +66,3 @@ index a3d1f23f6..64a83862f 100644
    if (!msg_translated)
      {
        grub_print_error ();
--- 
-2.14.3
-

0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch

@@ -1,419 +0,0 @@
-From 5c3fd1b135bd73c8e3467b9b635b25ca4d360a19 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 08:47:34 +0200
-Subject: [PATCH 033/198] arm_coreboot: Add Chromebook keyboard driver.
-
----
- grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++
- grub-core/term/arm/cros_ec.c | 238 +++++++++++++++++++++++++++++++++++++++++++
- include/grub/arm/cros_ec.h   |  21 ++++
- 3 files changed, 384 insertions(+)
- create mode 100644 grub-core/term/arm/cros.c
- create mode 100644 grub-core/term/arm/cros_ec.c
- create mode 100644 include/grub/arm/cros_ec.h
-
-diff --git a/grub-core/term/arm/cros.c b/grub-core/term/arm/cros.c
-new file mode 100644
-index 000000000..1ff9f8ccf
---- /dev/null
-+++ b/grub-core/term/arm/cros.c
-@@ -0,0 +1,125 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *
-+ *  Copyright (C) 2012  Google Inc.
-+ *  Copyright (C) 2016  Free Software Foundation, Inc.
-+ *
-+ *  This is based on depthcharge code.
-+ *
-+ *  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/>.
-+ */
-+
-+#include <grub/ps2.h>
-+#include <grub/fdtbus.h>
-+#include <grub/err.h>
-+#include <grub/machine/kernel.h>
-+#include <grub/misc.h>
-+#include <grub/term.h>
-+#include <grub/time.h>
-+#include <grub/fdtbus.h>
-+#include <grub/arm/cros_ec.h>
-+
-+struct grub_ps2_state ps2_state;
-+
-+struct grub_cros_ec_keyscan old_scan;
-+
-+static const struct grub_fdtbus_dev *cros_ec;
-+
-+static grub_uint8_t map_code[GRUB_CROS_EC_KEYSCAN_COLS][GRUB_CROS_EC_KEYSCAN_ROWS];
-+
-+static grub_uint8_t e0_translate[16] =
-+  {
-+    0x1c, 0x1d, 0x35, 0x00,
-+    0x38, 0x00, 0x47, 0x48,
-+    0x49, 0x4b, 0x4d, 0x4f,
-+    0x50, 0x51, 0x52, 0x53,
-+  };
-+
-+/* If there is a character pending, return it;
-+   otherwise return GRUB_TERM_NO_KEY.  */
-+static int
-+grub_cros_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
-+{
-+  struct grub_cros_ec_keyscan scan;
-+  int i, j;
-+  if (grub_cros_ec_scan_keyboard (cros_ec, &scan) < 0)
-+    return GRUB_TERM_NO_KEY;
-+  for (i = 0; i < GRUB_CROS_EC_KEYSCAN_COLS; i++)
-+    if (scan.data[i] ^ old_scan.data[i])
-+      for (j = 0; j < GRUB_CROS_EC_KEYSCAN_ROWS; j++)
-+	if ((scan.data[i] ^ old_scan.data[i]) & (1 << j))
-+	  {
-+	    grub_uint8_t code = map_code[i][j];
-+	    int ret;
-+	    grub_uint8_t brk = 0;
-+	    if (!(scan.data[i] & (1 << j)))
-+	      brk = 0x80;
-+	    grub_dprintf ("cros_keyboard", "key <%d, %d> code %x\n", i, j, code);
-+	    if (code < 0x60)
-+	      ret = grub_ps2_process_incoming_byte (&ps2_state, code | brk);
-+	    else if (code >= 0x60 && code < 0x70 && e0_translate[code - 0x60])
-+	      {
-+		grub_ps2_process_incoming_byte (&ps2_state, 0xe0);
-+		ret = grub_ps2_process_incoming_byte (&ps2_state, e0_translate[code - 0x60] | brk);
-+	      }
-+	    else
-+	      ret = GRUB_TERM_NO_KEY;
-+	    old_scan.data[i] ^= (1 << j);
-+	    if (ret != GRUB_TERM_NO_KEY)
-+	      return ret;
-+	  }
-+  return GRUB_TERM_NO_KEY;
-+}
-+
-+static struct grub_term_input grub_cros_keyboard_term =
-+  {
-+    .name = "cros_keyboard",
-+    .getkey = grub_cros_keyboard_getkey
-+  };
-+
-+static grub_err_t
-+cros_attach (const struct grub_fdtbus_dev *dev)
-+{
-+  grub_size_t keymap_size, i;
-+  const grub_uint8_t *keymap = grub_fdtbus_get_prop (dev, "linux,keymap", &keymap_size);
-+
-+  if (!dev->parent || !grub_cros_ec_validate (dev->parent))
-+    return GRUB_ERR_IO;
-+
-+  if (keymap)
-+    {
-+      for (i = 0; i + 3 < keymap_size; i += 4)
-+	if (keymap[i+1] < GRUB_CROS_EC_KEYSCAN_COLS && keymap[i] < GRUB_CROS_EC_KEYSCAN_ROWS
-+	    && keymap[i+2] == 0 && keymap[i+3] < 0x80)
-+	  map_code[keymap[i+1]][keymap[i]] = keymap[i+3];
-+    }
-+
-+  cros_ec = dev->parent;
-+  ps2_state.current_set = 1;
-+  ps2_state.at_keyboard_status = 0;
-+  grub_term_register_input ("cros_keyboard", &grub_cros_keyboard_term);
-+  return GRUB_ERR_NONE;
-+}
-+
-+static struct grub_fdtbus_driver cros =
-+{
-+  .compatible = "google,cros-ec-keyb",
-+  .attach = cros_attach
-+};
-+
-+void
-+grub_cros_init (void)
-+{
-+  grub_fdtbus_register (&cros);
-+}
-diff --git a/grub-core/term/arm/cros_ec.c b/grub-core/term/arm/cros_ec.c
-new file mode 100644
-index 000000000..f4144818b
---- /dev/null
-+++ b/grub-core/term/arm/cros_ec.c
-@@ -0,0 +1,238 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *
-+ *  Copyright (C) 2012  Google Inc.
-+ *  Copyright (C) 2016  Free Software Foundation, Inc.
-+ *
-+ *  This is based on depthcharge code.
-+ *
-+ *  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/>.
-+ */
-+
-+#include <grub/mm.h>
-+#include <grub/time.h>
-+#include <grub/misc.h>
-+#include <grub/arm/cros_ec.h>
-+#include <grub/fdtbus.h>
-+
-+static const grub_uint64_t FRAMING_TIMEOUT_MS = 300;
-+
-+static const grub_uint8_t EC_FRAMING_BYTE = 0xec;
-+
-+#define EC_CMD_MKBP_STATE 0x60
-+#define EC_CMD_VERSION0 0xdc
-+
-+static grub_uint64_t last_transfer;
-+
-+static void
-+stop_bus (const struct grub_fdtbus_dev *spi)
-+{
-+  spi->driver->stop (spi);
-+  last_transfer = grub_get_time_ms ();
-+}
-+
-+static int
-+wait_for_frame (const struct grub_fdtbus_dev *spi)
-+{
-+  grub_uint64_t start = grub_get_time_ms ();
-+  grub_uint8_t byte;
-+  do
-+    {
-+      if (spi->driver->receive (spi, &byte, 1))
-+	return -1;
-+      if (byte != EC_FRAMING_BYTE &&
-+	  grub_get_time_ms () - start > FRAMING_TIMEOUT_MS)
-+	{
-+	  grub_dprintf ("cros", "Timeout waiting for framing byte.\n");
-+	  return -1;
-+	}
-+    }
-+  while (byte != EC_FRAMING_BYTE);
-+  return 0;
-+}
-+
-+/*
-+ * Calculate a simple 8-bit checksum of a data block
-+ *
-+ * @param data	Data block to checksum
-+ * @param size	Size of data block in bytes
-+ * @return checksum value (0 to 255)
-+ */
-+static grub_uint8_t
-+cros_ec_calc_checksum (const void *data, int size)
-+{
-+  grub_uint8_t csum;
-+  const grub_uint8_t *bytes = data;
-+  int i;
-+
-+  for (i = csum = 0; i < size; i++)
-+    csum += bytes[i];
-+  return csum & 0xff;
-+}
-+
-+enum
-+{
-+  /* response, arglen */
-+  CROS_EC_SPI_IN_HDR_SIZE = 2,
-+  /* version, cmd, arglen */
-+  CROS_EC_SPI_OUT_HDR_SIZE = 3
-+};
-+
-+static grub_uint8_t busbuf[256];
-+#define MSG_BYTES ((int)sizeof (busbuf))
-+
-+static int
-+ec_command (const struct grub_fdtbus_dev *dev, int cmd, int cmd_version,
-+	    const void *dout, int dout_len, void *din, int din_len)
-+{
-+  const struct grub_fdtbus_dev *spi = dev->parent;
-+  grub_uint8_t *bytes;
-+
-+  /* Header + data + checksum. */
-+  grub_uint32_t out_bytes = CROS_EC_SPI_OUT_HDR_SIZE + dout_len + 1;
-+  grub_uint32_t in_bytes = CROS_EC_SPI_IN_HDR_SIZE + din_len + 1;
-+
-+  /*
-+   * Sanity-check I/O sizes given transaction overhead in internal
-+   * buffers.
-+   */
-+  if (out_bytes > MSG_BYTES)
-+    {
-+      grub_dprintf ("cros", "Cannot send %d bytes\n", dout_len);
-+      return -1;
-+    }
-+  if (in_bytes > MSG_BYTES)
-+    {
-+      grub_dprintf ("cros", "Cannot receive %d bytes\n", din_len);
-+      return -1;
-+    }
-+
-+  /* Prepare the output. */
-+  bytes = busbuf;
-+  *bytes++ = EC_CMD_VERSION0 + cmd_version;
-+  *bytes++ = cmd;
-+  *bytes++ = dout_len;
-+  grub_memcpy (bytes, dout, dout_len);
-+  bytes += dout_len;
-+
-+  *bytes++ = cros_ec_calc_checksum (busbuf,
-+				    CROS_EC_SPI_OUT_HDR_SIZE + dout_len);
-+
-+  /* Depthcharge uses 200 us here but GRUB timer resolution is only 1ms,
-+     decrease this when we increase timer resolution.  */
-+  while (grub_get_time_ms () - last_transfer < 1)
-+    ;
-+
-+  if (spi->driver->start (spi))
-+    return -1;
-+
-+  /* Allow EC to ramp up clock after being awoken. */
-+  /* Depthcharge only waits 100 us here but GRUB timer resolution is only 1ms,
-+     decrease this when we increase timer resolution.  */
-+  grub_millisleep (1);
-+
-+  if (spi->driver->send (spi, busbuf, out_bytes))
-+    {
-+      stop_bus (spi);
-+      return -1;
-+    }
-+
-+  /* Wait until the EC is ready. */
-+  if (wait_for_frame (spi))
-+    {
-+      stop_bus (spi);
-+      return -1;
-+    }
-+
-+  /* Read the response code and the data length. */
-+  bytes = busbuf;
-+  if (spi->driver->receive (spi, bytes, 2))
-+    {
-+      stop_bus (spi);
-+      return -1;
-+    }
-+  grub_uint8_t result = *bytes++;
-+  grub_uint8_t length = *bytes++;
-+
-+  /* Make sure there's enough room for the data. */
-+  if (CROS_EC_SPI_IN_HDR_SIZE + length + 1 > MSG_BYTES)
-+    {
-+      grub_dprintf ("cros", "Received length %#02x too large\n", length);
-+      stop_bus (spi);
-+      return -1;
-+    }
-+
-+  /* Read the data and the checksum, and finish up. */
-+  if (spi->driver->receive (spi, bytes, length + 1))
-+    {
-+      stop_bus (spi);
-+      return -1;
-+    }
-+  bytes += length;
-+  int expected = *bytes++;
-+  stop_bus (spi);
-+
-+  /* Check the integrity of the response. */
-+  if (result != 0)
-+    {
-+      grub_dprintf ("cros", "Received bad result code %d\n", result);
-+      return -result;
-+    }
-+
-+  int csum = cros_ec_calc_checksum (busbuf,
-+				    CROS_EC_SPI_IN_HDR_SIZE + length);
-+
-+  if (csum != expected)
-+    {
-+      grub_dprintf ("cros", "Invalid checksum rx %#02x, calced %#02x\n",
-+		    expected, csum);
-+      return -1;
-+    }
-+
-+  /* If the caller wants the response, copy it out for them. */
-+  if (length < din_len)
-+    din_len = length;
-+  if (din)
-+    {
-+      grub_memcpy (din, (grub_uint8_t *) busbuf + CROS_EC_SPI_IN_HDR_SIZE, din_len);
-+    }
-+
-+  return din_len;
-+}
-+
-+int
-+grub_cros_ec_scan_keyboard (const struct grub_fdtbus_dev *dev, struct grub_cros_ec_keyscan *scan)
-+{
-+  if (ec_command (dev, EC_CMD_MKBP_STATE, 0, NULL, 0, scan,
-+		  sizeof (*scan)) < (int) sizeof (*scan))
-+    return -1;
-+
-+  return 0;
-+}
-+
-+int
-+grub_cros_ec_validate (const struct grub_fdtbus_dev *dev)
-+{
-+  if (!grub_fdtbus_is_compatible("google,cros-ec-spi", dev))
-+    return 0;
-+  if (!dev->parent)
-+    return 0;
-+  if (!dev->parent->driver)
-+    return 0;
-+  if (!dev->parent->driver->send
-+      || !dev->parent->driver->receive)
-+    return 0;
-+  return 1;
-+}
-+
-diff --git a/include/grub/arm/cros_ec.h b/include/grub/arm/cros_ec.h
-new file mode 100644
-index 000000000..45a372572
---- /dev/null
-+++ b/include/grub/arm/cros_ec.h
-@@ -0,0 +1,21 @@
-+#ifndef GRUB_ARM_CROS_EC_H
-+#define GRUB_ARM_CROS_EC_H 1
-+
-+#include <grub/types.h>
-+#include <grub/fdtbus.h>
-+
-+#define GRUB_CROS_EC_KEYSCAN_COLS 13
-+#define GRUB_CROS_EC_KEYSCAN_ROWS 8
-+
-+struct grub_cros_ec_keyscan {
-+  grub_uint8_t data[GRUB_CROS_EC_KEYSCAN_COLS];
-+};
-+
-+int
-+grub_cros_ec_scan_keyboard (const struct grub_fdtbus_dev *dev,
-+			    struct grub_cros_ec_keyscan *scan);
-+
-+int
-+grub_cros_ec_validate (const struct grub_fdtbus_dev *dev);
-+
-+#endif
--- 
-2.14.3
-

0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -1,14 +1,14 @@
-From c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH 094/198] Fix border spacing now that we aren't displaying it
+Subject: [PATCH] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 64a83862f..1062d64ee 100644
+index 64a83862f66..1062d64ee29 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,
@@ -27,6 +27,3 @@ index 64a83862f..1062d64ee 100644
  
    geo->timeout_lines = 2;
  
--- 
-2.14.3
-

0034-Missing-parts-of-previous-commit.patch

@@ -1,38 +0,0 @@
-From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 09:02:15 +0200
-Subject: [PATCH 034/198] Missing parts of previous commit
-
----
- grub-core/Makefile.core.def        | 2 ++
- grub-core/kern/arm/coreboot/init.c | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index d2239f171..1d86bd22e 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -162,6 +162,8 @@ kernel = {
-   arm_coreboot = bus/fdt.c;
-   arm_coreboot = term/ps2.c;
-   arm_coreboot = term/arm/pl050.c;
-+  arm_coreboot = term/arm/cros.c;
-+  arm_coreboot = term/arm/cros_ec.c;
-   arm_coreboot = bus/spi/rk3288_spi.c;
-   arm_coreboot = commands/keylayouts.c;
-   arm_coreboot = kern/arm/coreboot/dma.c;
-diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
-index 0126ff638..8d8c5b829 100644
---- a/grub-core/kern/arm/coreboot/init.c
-+++ b/grub-core/kern/arm/coreboot/init.c
-@@ -135,6 +135,7 @@ grub_machine_init (void)
-   grub_rk3288_spi_init ();
- 
-   grub_machine_timer_init ();
-+  grub_cros_init ();
-   grub_pl050_init ();
- }
- 
--- 
-2.14.3
-

0035-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -1,7 +1,7 @@
-From e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH 095/198] Use the correct indentation for the term help text
+Subject: [PATCH] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---
@@ -9,7 +9,7 @@ That is consistent with the menu help text
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index f57b7508a..0ce59fdc3 100644
+index f57b7508a76..0ce59fdc3f0 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)
@@ -23,6 +23,3 @@ index f57b7508a..0ce59fdc3 100644
      else
        grub_print_message_indented (msg_formatted, 0, 0, term);
      grub_putcode ('\n', term);
--- 
-2.14.3
-

0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch

@@ -1,98 +0,0 @@
-From 70b555a52a065b2beb91e6fc97a6b358c931b303 Mon Sep 17 00:00:00 2001
-From: Julius Werner <jwerner@chromium.org>
-Date: Tue, 9 May 2017 09:03:02 +0200
-Subject: [PATCH 035/198] coreboot: Changed cbmemc to support updated console
- format from coreboot.
-
----
- grub-core/term/i386/coreboot/cbmemc.c | 50 ++++++++++++++++++++++++-----------
- 1 file changed, 35 insertions(+), 15 deletions(-)
-
-diff --git a/grub-core/term/i386/coreboot/cbmemc.c b/grub-core/term/i386/coreboot/cbmemc.c
-index 129248c7f..cea9b8431 100644
---- a/grub-core/term/i386/coreboot/cbmemc.c
-+++ b/grub-core/term/i386/coreboot/cbmemc.c
-@@ -29,11 +29,14 @@
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-+#define CURSOR_MASK ((1 << 28) - 1)
-+#define OVERFLOW (1 << 31)
-+
- struct grub_linuxbios_cbmemc
- {
-   grub_uint32_t size;
--  grub_uint32_t pointer;
--  char data[0];
-+  grub_uint32_t cursor;
-+  char body[0];
- };
- 
- static struct grub_linuxbios_cbmemc *cbmemc;
-@@ -41,11 +44,20 @@ static struct grub_linuxbios_cbmemc *cbmemc;
- static void
- put (struct grub_term_output *term __attribute__ ((unused)), const int c)
- {
-+  grub_uint32_t flags, cursor;
-   if (!cbmemc)
-     return;
--  if (cbmemc->pointer < cbmemc->size)
--    cbmemc->data[cbmemc->pointer] = c;
--  cbmemc->pointer++;
-+  flags = cbmemc->cursor & ~CURSOR_MASK;
-+  cursor = cbmemc->cursor & CURSOR_MASK;
-+  if (cursor >= cbmemc->size)
-+    return;
-+  cbmemc->body[cursor++] = c;
-+  if (cursor >= cbmemc->size)
-+    {
-+      cursor = 0;
-+      flags |= OVERFLOW;
-+    }
-+  cbmemc->cursor = flags | cursor;
- }
- 
- struct grub_terminfo_output_state grub_cbmemc_terminfo_output =
-@@ -87,21 +99,29 @@ grub_cmd_cbmemc (struct grub_command *cmd __attribute__ ((unused)),
- 		 int argc __attribute__ ((unused)),
- 		 char *argv[] __attribute__ ((unused)))
- {
--  grub_size_t len;
--  char *str;
--  struct grub_linuxbios_cbmemc *cbmemc_saved;
-+  grub_size_t size, cursor;
-+  struct grub_linuxbios_cbmemc *real_cbmemc;
- 
-   if (!cbmemc)
-     return grub_error (GRUB_ERR_IO, "no CBMEM console found");
- 
--  len = cbmemc->pointer;
--  if (len > cbmemc->size)
--    len = cbmemc->size;
--  str = cbmemc->data;
--  cbmemc_saved = cbmemc;
-+  real_cbmemc = cbmemc;
-   cbmemc = 0;
--  grub_xnputs (str, len);
--  cbmemc = cbmemc_saved;
-+  cursor = real_cbmemc->cursor & CURSOR_MASK;
-+  if (!(real_cbmemc->cursor & OVERFLOW) && cursor < real_cbmemc->size)
-+    size = cursor;
-+  else
-+    size = real_cbmemc->size;
-+  if (real_cbmemc->cursor & OVERFLOW)
-+    {
-+      if (cursor > size)
-+        cursor = 0;
-+      grub_xnputs(real_cbmemc->body + cursor, size - cursor);
-+      grub_xnputs(real_cbmemc->body, cursor);
-+    }
-+  else
-+    grub_xnputs(real_cbmemc->body, size);
-+  cbmemc = real_cbmemc;
-   return 0;
- }
- 
--- 
-2.14.3
-

0036-Indent-menu-entries.patch

@@ -1,14 +1,14 @@
-From a67be6e17cd318ad3d4a669efb2b8c5f6e76c003 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH 096/198] Indent menu entries
+Subject: [PATCH] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1062d64ee..ecc60f99f 100644
+index 1062d64ee29..ecc60f99fc3 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
@@ -21,6 +21,3 @@ index 1062d64ee..ecc60f99f 100644
  
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
--- 
-2.14.3
-

0036-at_keyboard-Fix-falco-chromebook-case.patch

@@ -1,89 +0,0 @@
-From c4b8bec5fee4e30a165fd14a188cf3ab8eccd095 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 9 May 2017 14:27:52 +0200
-Subject: [PATCH 036/198] at_keyboard: Fix falco chromebook case.
-
-EC is slow, so we need few delays for it to toggle the bits correctly.
-
-Command to enable clock and keyboard were not sent.
----
- grub-core/term/at_keyboard.c | 23 ++++++++++++++---------
- include/grub/at_keyboard.h   |  2 ++
- 2 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index 3ab4e205f..f0a986eb1 100644
---- a/grub-core/term/at_keyboard.c
-+++ b/grub-core/term/at_keyboard.c
-@@ -40,6 +40,8 @@ grub_keyboard_controller_init (void);
- static void
- keyboard_controller_wait_until_ready (void)
- {
-+  /* 50 us would be enough but our current time resolution is 1ms.  */
-+  grub_millisleep (1);
-   while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)));
- }
- 
-@@ -50,10 +52,11 @@ wait_ack (void)
-   grub_uint8_t ack;
- 
-   endtime = grub_get_time_ms () + 20;
--  do
-+  do {
-+    keyboard_controller_wait_until_ready ();
-     ack = grub_inb (KEYBOARD_REG_DATA);
--  while (ack != GRUB_AT_ACK && ack != GRUB_AT_NACK
--	 && grub_get_time_ms () < endtime);
-+  } while (ack != GRUB_AT_ACK && ack != GRUB_AT_NACK
-+	   && grub_get_time_ms () < endtime);
-   return ack;
- }
- 
-@@ -135,12 +138,10 @@ query_mode (void)
-   if (!e)
-     return 0;
- 
--  keyboard_controller_wait_until_ready ();
--
--  do
-+  do {
-+    keyboard_controller_wait_until_ready ();
-     ret = grub_inb (KEYBOARD_REG_DATA);
--  while (ret == GRUB_AT_ACK);
--
-+  } while (ret == GRUB_AT_ACK);
-   /* QEMU translates the set even in no-translate mode.  */
-   if (ret == 0x43 || ret == 1)
-     return 1;
-@@ -169,7 +170,11 @@ set_scancodes (void)
- #else
- 
-   grub_keyboard_controller_write (grub_keyboard_controller_orig
--				  & ~KEYBOARD_AT_TRANSLATE);
-+				  & ~KEYBOARD_AT_TRANSLATE
-+				  & ~KEYBOARD_AT_DISABLE);
-+
-+  keyboard_controller_wait_until_ready ();
-+  grub_outb (KEYBOARD_COMMAND_ENABLE, KEYBOARD_REG_DATA);
- 
-   write_mode (2);
-   ps2_state.current_set = query_mode ();
-diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
-index b031523eb..bcb4d9ba7 100644
---- a/include/grub/at_keyboard.h
-+++ b/include/grub/at_keyboard.h
-@@ -23,9 +23,11 @@
- #define KEYBOARD_COMMAND_ISREADY(x)	!((x) & 0x02)
- #define KEYBOARD_COMMAND_READ		0x20
- #define KEYBOARD_COMMAND_WRITE		0x60
-+#define KEYBOARD_COMMAND_ENABLE		0xf4
- #define KEYBOARD_COMMAND_REBOOT		0xfe
- 
- #define KEYBOARD_AT_TRANSLATE		0x40
-+#define KEYBOARD_AT_DISABLE		0x10
- 
- #define KEYBOARD_ISMAKE(x)	!((x) & 0x80)
- #define KEYBOARD_ISREADY(x)	((x) & 0x01)
--- 
-2.14.3
-

0037-Fix-margins.patch

@@ -1,14 +1,14 @@
-From 8e5a006c6c48002f3debd99f4c377b443f9f8369 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH 097/198] Fix margins
+Subject: [PATCH] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index ecc60f99f..0e43f2c10 100644
+index ecc60f99fc3..0e43f2c10cc 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,
@@ -32,6 +32,3 @@ index ecc60f99f..0e43f2c10 100644
      - 1 /* empty line before info message*/
      - geo->timeout_lines /* timeout */
      - 1 /* empty final line  */;
--- 
-2.14.3
-

0037-sparc64-Close-cdboot-ihandle.patch

@@ -1,48 +0,0 @@
-From bd4e40aadded7093908d786d03b4acf60b7b1707 Mon Sep 17 00:00:00 2001
-From: Eric Snowberg <eric.snowberg@oracle.com>
-Date: Thu, 11 May 2017 18:42:23 -0700
-Subject: [PATCH 037/198] sparc64: Close cdboot ihandle
-
-The ihandle is left open with a cd-core image.  This will cause a delay
-booting grub from a virtual cdrom in a LDOM.  It will also cause problems
-as Linux boots, since it expects the ihandle to be closed during init.
-
-Orabug: 25911275
-
-Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/boot/sparc64/ieee1275/boot.S | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S
-index 586efb401..9ea9b4e06 100644
---- a/grub-core/boot/sparc64/ieee1275/boot.S
-+++ b/grub-core/boot/sparc64/ieee1275/boot.S
-@@ -69,6 +69,10 @@ prom_seek_name:		.asciz "seek"
- prom_read_name:		.asciz "read"
- prom_exit_name:		.asciz "exit"
- grub_name:		.asciz "GRUB "
-+#ifdef CDBOOT
-+prom_close_name:	.asciz "close"
-+#endif
-+
- #define GRUB_NAME_LEN	5
- 
- 	.align	4
-@@ -213,6 +217,12 @@ bootpath_known:
- 	call	prom_call_3_1_o1
- #ifdef CDBOOT
- 	 LDUW_ABS(kernel_size, 0x00, %o3)
-+
-+	GET_ABS(prom_close_name, %o0)
-+	mov	1, %g1
-+	mov	0, %o5
-+	call	prom_call
-+	 mov	BOOTDEV_REG, %o1
- #else
- 	 mov	512, %o3
- #endif
--- 
-2.14.3
-

0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -1,7 +1,7 @@
-From 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 098/198] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 0e43f2c10..537d4bf86 100644
+index 0e43f2c10cc..537d4bf86ff 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,
@@ -22,6 +22,3 @@ index 0e43f2c10..537d4bf86 100644
  
    geo->first_entry_y = 3; /* three empty lines*/
  
--- 
-2.14.3
-

0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch

@@ -1,32 +0,0 @@
-From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001
-From: Julien Grall <julien.grall@linaro.org>
-Date: Fri, 19 Feb 2016 16:28:52 +0000
-Subject: [PATCH 038/198] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
-
-Xen is currently crashing because of malformed compatible property for
-the boot module. This is because the property string is not
-null-terminated as requested by the ePAR spec.
-
-Signed-off-by: Julien Grall <julien.grall@linaro.org>
-Tested-by: Fu Wei <fu.wei@linaro.org>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/loader/arm64/xen_boot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index a914eb8e2..8ae43d7e8 100644
---- a/grub-core/loader/arm64/xen_boot.c
-+++ b/grub-core/loader/arm64/xen_boot.c
-@@ -156,7 +156,7 @@ prepare_xen_module_params (struct xen_boot_binary *module, void *xen_boot_fdt)
-       grub_fdt_add_subnode (xen_boot_fdt, chosen_node, module_name);
- 
-   retval = grub_fdt_set_prop (xen_boot_fdt, module_node, "compatible",
--			      MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE) - 1);
-+			      MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE));
-   if (retval)
-     return grub_error (GRUB_ERR_IO, "failed to update FDT");
- 
--- 
-2.14.3
-

0039-Enable-pager-by-default.-985860.patch

@@ -1,7 +1,7 @@
-From cc60fb5b7693dabcf100c910d42b3ffe1816597f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 100/198] Enable pager by default. (#985860)
+Subject: [PATCH] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233e..858b526c9 100644
+index 93a90233ead..858b526c925 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_
@@ -21,6 +21,3 @@ index 93a90233e..858b526c9 100644
  if [ -s \$prefix/grubenv ]; then
    load_env
  fi
--- 
-2.14.3
-

0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch

@@ -1,56 +0,0 @@
-From 8eed7be8a61c295df700e918744a984162378ca9 Mon Sep 17 00:00:00 2001
-From: Fu Wei <fu.wei@linaro.org>
-Date: Sun, 14 May 2017 15:43:45 +0800
-Subject: [PATCH 039/198] arm64: Add "--nounzip" option support in xen_module
- command
-
-This patch adds "--nounzip" option support in order to
-be compatible with the module command of multiboot on other architecture,
-by this way we can simplify grub-mkconfig support code.
-
-This patch also allow us to use zip compressed module(like Linux kernel
-for Dom0).
-
-Signed-off-by: Fu Wei <fu.wei@linaro.org>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/loader/arm64/xen_boot.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 8ae43d7e8..27ede46ca 100644
---- a/grub-core/loader/arm64/xen_boot.c
-+++ b/grub-core/loader/arm64/xen_boot.c
-@@ -379,6 +379,20 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)),
- 
-   struct xen_boot_binary *module = NULL;
-   grub_file_t file = 0;
-+  int nounzip = 0;
-+
-+  if (!argc)
-+    {
-+      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-+      goto fail;
-+    }
-+
-+  if (grub_strcmp (argv[0], "--nounzip") == 0)
-+    {
-+      argv++;
-+      argc--;
-+      nounzip = 1;
-+    }
- 
-   if (!argc)
-     {
-@@ -403,6 +417,8 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)),
- 
-   grub_dprintf ("xen_loader", "Init module and node info\n");
- 
-+  if (nounzip)
-+    grub_file_filter_disable_compression ();
-   file = grub_file_open (argv[0]);
-   if (!file)
-     goto fail;
--- 
-2.14.3
-

0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -1,8 +1,8 @@
-From f1cb6c5a7640406294b7dffab3c5e4a4afdaf745 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 101/198] F10 doesn't work on serial, so don't tell the user to
- hit it (#987443)
+Subject: [PATCH] F10 doesn't work on serial, so don't tell the user to hit it
+ (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 537d4bf86..452d55bf9 100644
+index 537d4bf86ff..452d55bf9ff 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
@@ -22,6 +22,3 @@ index 537d4bf86..452d55bf9 100644
  command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."),
  					       STANDARD_MARGIN, STANDARD_MARGIN,
  					       term, dry_run);
--- 
-2.14.3
-

0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch

@@ -1,63 +0,0 @@
-From d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe Mon Sep 17 00:00:00 2001
-From: Fu Wei <fu.wei@linaro.org>
-Date: Sun, 14 May 2017 15:43:46 +0800
-Subject: [PATCH 040/198] util/grub.d/20_linux_xen.in: Add xen_boot command
- support for aarch64
-
-This patch adds the support of xen_boot command for aarch64:
-    xen_hypervisor
-    xen_module
-These two commands are only for aarch64, since it has its own protocol and
-commands to boot xen hypervisor and Dom0, but not multiboot.
-
-For other architectures, they are still using multiboot and module
-commands.
-
-Signed-off-by: Fu Wei <fu.wei@linaro.org>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- util/grub.d/20_linux_xen.in | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index c48af948d..c002fc9f9 100644
---- a/util/grub.d/20_linux_xen.in
-+++ b/util/grub.d/20_linux_xen.in
-@@ -122,16 +122,16 @@ linux_entry ()
-         else
-             xen_rm_opts="no-real-mode edd=off"
-         fi
--	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
-+	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
- 	echo	'$(echo "$lmessage" | grub_quote)'
--	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
-+	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
- EOF
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-     message="$(gettext_printf "Loading initial ramdisk ...")"
-     sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
--	module	--nounzip   ${rel_dirname}/${initrd}
-+	${module_loader}	--nounzip   ${rel_dirname}/${initrd}
- EOF
-   fi
-   sed "s/^/$submenu_indentation/" << EOF
-@@ -206,6 +206,14 @@ while [ "x${xen_list}" != "x" ] ; do
-     if [ "x$is_top_level" != xtrue ]; then
- 	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
-     fi
-+    $grub_file --is-arm64-efi $current_xen
-+    if [ $? -ne 0 ]; then
-+	xen_loader="multiboot"
-+	module_loader="module"
-+    else
-+	xen_loader="xen_hypervisor"
-+	module_loader="xen_module"
-+    fi
-     while [ "x$list" != "x" ] ; do
- 	linux=`version_find_latest $list`
- 	gettext_printf "Found linux image: %s\n" "$linux" >&2
--- 
-2.14.3
-

0041-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -1,7 +1,7 @@
-From 13c028af4104555993650dd9a26dd633c516d23f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 102/198] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
@@ -9,7 +9,7 @@ Subject: [PATCH 102/198] Don't say "GNU/Linux" in generated menus.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f3bf6acd8..ef52cf3db 100644
+index 3a5aa0f8dc9..6299836b5cd 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -25,7 +25,7 @@ index f3bf6acd8..ef52cf3db 100644
  fi
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index c002fc9f9..54f1ec8a2 100644
+index e8143b079dc..972a4b5a03d 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -40,6 +40,3 @@ index c002fc9f9..54f1ec8a2 100644
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
  fi
  
--- 
-2.14.3
-

0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch

@@ -1,93 +0,0 @@
-From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001
-From: Fu Wei <fu.wei@linaro.org>
-Date: Sun, 14 May 2017 15:43:47 +0800
-Subject: [PATCH 041/198] arm64: Update the introduction of Xen boot commands
- in docs/grub.texi
-
-delete: xen_linux, xen_initrd, xen_xsm
-add: xen_module
-
-This update bases on
-    commit 0edd750e50698854068358ea53528100a9192902
-    Author: Vladimir Serbinenko <phcoder@gmail.com>
-    Date:   Fri Jan 22 10:18:47 2016 +0100
-
-        xen_boot: Remove obsolete module type distinctions.
-
-Also bases on the module loading mechanism of Xen code:
-488c2a8 docs/arm64: clarify the documention for loading XSM support
-67831c4 docs/arm64: update the documentation for loading XSM support
-ca32012 xen/arm64: check XSM Magic from the second unknown module.
-
-Signed-off-by: Fu Wei <fu.wei@linaro.org>
-Reviewed-by: Julien Grall <julien.grall@arm.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- docs/grub.texi | 38 +++++++++++++-------------------------
- 1 file changed, 13 insertions(+), 25 deletions(-)
-
-diff --git a/docs/grub.texi b/docs/grub.texi
-index e935af33e..a0c4b9e4e 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -3873,11 +3873,9 @@ you forget a command, you can run the command @command{help}
- @comment * vbeinfo::                     List available video modes
- * verify_detached::             Verify detached digital signature
- * videoinfo::                   List available video modes
--@comment * xen_*::              Xen boot commands
--* xen_hypervisor::              Load xen hypervisor binary
--* xen_linux::                   Load dom0 kernel for xen hypervisor
--* xen_initrd::                  Load dom0 initrd for dom0 kernel
--* xen_xsm::                     Load xen security module for xen hypervisor
-+@comment * xen_*::              Xen boot commands for AArch64
-+* xen_hypervisor::              Load xen hypervisor binary (only on AArch64)
-+* xen_module::                  Load xen modules for xen hypervisor (only on AArch64)
- @end menu
- 
- 
-@@ -5153,32 +5151,22 @@ List available video modes. If resolution is given, show only matching modes.
- Load a Xen hypervisor binary from @var{file}. The rest of the line is passed
- verbatim as the @dfn{kernel command-line}. Any other binaries must be
- reloaded after using this command.
-+This command is only available on AArch64 systems.
- @end deffn
- 
--@node xen_linux
--@subsection xen_linux
-+@node xen_module
-+@subsection xen_module
- 
--@deffn Command xen_linux file [arguments]
--Load a dom0 kernel image for xen hypervisor at the booting process of xen.
-+@deffn Command xen_module [--nounzip] file [arguments]
-+Load a module for xen hypervisor at the booting process of xen.
- The rest of the line is passed verbatim as the module command line.
-+Modules should be loaded in the following order:
-+ - dom0 kernel image
-+ - dom0 ramdisk if present
-+ - XSM policy if present
-+This command is only available on AArch64 systems.
- @end deffn
- 
--@node xen_initrd
--@subsection xen_initrd
--
--@deffn Command xen_initrd file
--Load a initrd image for dom0 kernel at the booting process of xen.
--@end deffn
--
--@node xen_xsm
--@subsection xen_xsm
--
--@deffn Command xen_xsm file
--Load a xen security module for xen hypervisor at the booting process of xen.
--See @uref{http://wiki.xen.org/wiki/XSM} for more detail.
--@end deffn
--
--
- @node Networking commands
- @section The list of networking commands
- 
--- 
-2.14.3
-

0042-Don-t-draw-a-border-around-the-menu.patch

@@ -1,7 +1,7 @@
-From 8b51cba8f5587746d1559bd6ec957db3e185c049 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 103/198] Don't draw a border around the menu
+Subject: [PATCH] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---
@@ -9,7 +9,7 @@ It looks cleaner without it.
  1 file changed, 43 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 452d55bf9..1ed2bd92c 100644
+index 452d55bf9ff..1ed2bd92cf8 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
@@ -69,6 +69,3 @@ index 452d55bf9..1ed2bd92c 100644
    grub_term_normal_color = old_color_normal;
    grub_term_highlight_color = old_color_highlight;
    geo->timeout_y = geo->first_entry_y + geo->num_entries
--- 
-2.14.3
-

0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch

@@ -1,53 +0,0 @@
-From f8679cedff703b437171f4708d46adbfcff80a65 Mon Sep 17 00:00:00 2001
-From: Eric Snowberg <eric.snowberg@oracle.com>
-Date: Thu, 18 May 2017 17:10:22 -0600
-Subject: [PATCH 042/198] sparc64: Don't use devspec to determine the OBP path
-
-Don't use devspec to determine the OBP path on SPARC hardware.  Within all
-versions of Linux on SPARC, the devspec returns one of three values:
-"none", "vnet-port", or "vdisk".  Unlike on PPC, none of these values
-are useful in determining the OBP path.
-
-Before this patch grub-ofpathname always returned the wrong value
-for a virtual disk. For example:
-
-% grub-ofpathname /dev/vdiskc2
-vdisk/disk@2:b
-
-After this patch it now returns the correct value:
-
-% grub-ofpathname /dev/vdiskc2
-/virtual-devices@100/channel-devices@200/disk@2:b
-
-Orabug: 24459765
-
-Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/osdep/linux/ofpath.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
-index a79682a5e..dce4e59d0 100644
---- a/grub-core/osdep/linux/ofpath.c
-+++ b/grub-core/osdep/linux/ofpath.c
-@@ -120,6 +120,8 @@ find_obppath (const char *sysfs_path_orig)
- #endif
- 
-       fd = open(path, O_RDONLY);
-+
-+#ifndef __sparc__
-       if (fd < 0 || fstat (fd, &st) < 0)
- 	{
- 	  if (fd >= 0)
-@@ -127,6 +129,7 @@ find_obppath (const char *sysfs_path_orig)
- 	  snprintf(path, path_size, "%s/devspec", sysfs_path);
- 	  fd = open(path, O_RDONLY);
- 	}
-+#endif
- 
-       if (fd < 0 || fstat (fd, &st) < 0)
- 	{
--- 
-2.14.3
-

0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch

@@ -1,140 +0,0 @@
-From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001
-From: Eric Biggers <ebiggers@google.com>
-Date: Thu, 29 Jun 2017 13:27:49 +0000
-Subject: [PATCH 043/198] Allow GRUB to mount ext2/3/4 filesystems that have
- the encryption feature.
-
-On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set.
-For a regular file, this means its contents are encrypted; for a
-directory, this means the filenames in its directory entries are
-encrypted; and for a symlink, this means its target is encrypted.  Since
-GRUB cannot decrypt encrypted contents or filenames, just issue an error
-if it would need to do so.  This is sufficient to allow unencrypted boot
-files to co-exist with encrypted files elsewhere on the filesystem.
-
-(Note that encrypted regular files and symlinks will not normally be
-encountered outside an encrypted directory; however, it's possible via
-hard links, so they still need to be handled.)
-
-Tested by booting from an ext4 /boot partition on which I had run
-'tune2fs -O encrypt'.  I also verified that the expected error messages
-are printed when trying to access encrypted directories, files, and
-symlinks from the GRUB command line.  Also ran 'sudo ./grub-fs-tester
-ext4_encrypt'; note that this requires e2fsprogs v1.43+ and Linux v4.1+.
-
-Signed-off-by: Eric Biggers <ebiggers@google.com>
----
- grub-core/fs/ext2.c          | 23 ++++++++++++++++++++++-
- tests/ext234_test.in         |  1 +
- tests/util/grub-fs-tester.in | 10 ++++++++++
- 3 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index cdce63bcc..b8ad75a0f 100644
---- a/grub-core/fs/ext2.c
-+++ b/grub-core/fs/ext2.c
-@@ -102,6 +102,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
- #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
- #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
-+#define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000
- 
- /* The set of back-incompatible features this driver DOES support. Add (OR)
-  * flags here as the related features are implemented into the driver.  */
-@@ -109,7 +110,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
-                                        | EXT4_FEATURE_INCOMPAT_EXTENTS  \
-                                        | EXT4_FEATURE_INCOMPAT_FLEX_BG \
-                                        | EXT2_FEATURE_INCOMPAT_META_BG \
--                                       | EXT4_FEATURE_INCOMPAT_64BIT)
-+                                       | EXT4_FEATURE_INCOMPAT_64BIT \
-+                                       | EXT4_FEATURE_INCOMPAT_ENCRYPT)
- /* List of rationales for the ignored "incompatible" features:
-  * needs_recovery: Not really back-incompatible - was added as such to forbid
-  *                 ext2 drivers from mounting an ext3 volume with a dirty
-@@ -138,6 +140,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define EXT3_JOURNAL_FLAG_DELETED	4
- #define EXT3_JOURNAL_FLAG_LAST_TAG	8
- 
-+#define EXT4_ENCRYPT_FLAG              0x800
- #define EXT4_EXTENTS_FLAG		0x80000
- 
- /* The ext2 superblock.  */
-@@ -706,6 +709,12 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
-       grub_ext2_read_inode (diro->data, diro->ino, &diro->inode);
-       if (grub_errno)
- 	return 0;
-+
-+      if (diro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
-+       {
-+         grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "symlink is encrypted");
-+         return 0;
-+       }
-     }
- 
-   symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
-@@ -749,6 +758,12 @@ grub_ext2_iterate_dir (grub_fshelp_node_t dir,
- 	return 0;
-     }
- 
-+  if (diro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
-+    {
-+      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "directory is encrypted");
-+      return 0;
-+    }
-+
-   /* Search the file.  */
-   while (fpos < grub_le_to_cpu32 (diro->inode.size))
-     {
-@@ -859,6 +874,12 @@ grub_ext2_open (struct grub_file *file, const char *name)
- 	goto fail;
-     }
- 
-+  if (fdiro->inode.flags & grub_cpu_to_le32_compile_time (EXT4_ENCRYPT_FLAG))
-+    {
-+      err = grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "file is encrypted");
-+      goto fail;
-+    }
-+
-   grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_ext2_inode));
-   grub_free (fdiro);
- 
-diff --git a/tests/ext234_test.in b/tests/ext234_test.in
-index 892b99cbd..4f1eb527e 100644
---- a/tests/ext234_test.in
-+++ b/tests/ext234_test.in
-@@ -30,3 +30,4 @@ fi
- "@builddir@/grub-fs-tester" ext3
- "@builddir@/grub-fs-tester" ext4
- "@builddir@/grub-fs-tester" ext4_metabg
-+"@builddir@/grub-fs-tester" ext4_encrypt
-diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
-index 88cbe7365..fd7e0f14b 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -156,6 +156,12 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
- 		# Could go further but what's the point?
- 	    MAXBLKSIZE=$((65536*1024))
- 	    ;;
-+       xext4_encrypt)
-+           # OS LIMITATION: Linux currently only allows the 'encrypt' feature
-+           # in combination with block_size = PAGE_SIZE (4096 bytes on x86).
-+           MINBLKSIZE=$(getconf PAGE_SIZE)
-+           MAXBLKSIZE=$MINBLKSIZE
-+           ;;
- 	xext*)
- 	    MINBLKSIZE=1024
- 	    if [ $MINBLKSIZE -lt $SECSIZE ]; then
-@@ -796,6 +802,10 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
- 		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O meta_bg,^resize_inode -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
- 		    MOUNTFS=ext4
- 		    ;;
-+               xext4_encrypt)
-+                   MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext4" -O encrypt -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}"
-+                   MOUNTFS=ext4
-+                   ;;
- 		xext*)
- 		    MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;;
- 		xxfs)
--- 
-2.14.3
-

0043-Use-the-standard-margin-for-the-timeout-string.patch

@@ -1,7 +1,7 @@
-From 137250b0ef67150568074da35c568c6c649899f6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 104/198] Use the standard margin for the timeout string
+Subject: [PATCH] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---
@@ -9,7 +9,7 @@ So that it aligns with the other messages
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1ed2bd92c..7681f7d28 100644
+index 1ed2bd92cf8..7681f7d2893 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
@@ -38,6 +38,3 @@ index 1ed2bd92c..7681f7d28 100644
  	}
      }
  
--- 
-2.14.3
-

0044-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -1,14 +1,14 @@
-From 0464db837a67b88a761f100391b135a70b7054eb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 105/198] Add .eh_frame to list of relocations stripped
+Subject: [PATCH] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 311da61c6..044ab3abe 100644
+index 311da61c6c5..044ab3abe88 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
 @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
@@ -20,6 +20,3 @@ index 311da61c6..044ab3abe 100644
  
  CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
--- 
-2.14.3
-

0044-ehci-Fix-compilation-for-amd64.patch

@@ -1,38 +0,0 @@
-From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001
-From: phcoder <phcoder@sid.debian.laptop.phnet>
-Date: Sun, 9 Jul 2017 20:58:31 +0200
-Subject: [PATCH 044/198] ehci: Fix compilation for amd64
-
----
- grub-core/bus/usb/ehci.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
-index c772e7654..7b7061f53 100644
---- a/grub-core/bus/usb/ehci.c
-+++ b/grub-core/bus/usb/ehci.c
-@@ -504,8 +504,8 @@ grub_ehci_init_device (volatile void *regs)
- #endif
- 
-   grub_dprintf ("ehci",
--		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
--		(grub_addr_t) e->iobase_ehcc + caplen);
-+		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llxx\n",
-+		(unsigned long long) e->iobase_ehcc + caplen);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
-@@ -696,8 +696,8 @@ grub_ehci_init_device (volatile void *regs)
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: OK at all\n");
- 
-   grub_dprintf ("ehci",
--		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
--		(grub_addr_t) regs);
-+		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llx\n",
-+		(unsigned long long) regs);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
--- 
-2.14.3
-

0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -1,8 +1,8 @@
-From ff25c6034ab8213d911414e666b7d44bc44496aa Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH 108/198] Don't munge raw spaces when we're doing our cmdline
- escaping (#923374)
+Subject: [PATCH] Don't munge raw spaces when we're doing our cmdline escaping
+ (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 10 deletions(-)
 
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 0a5b2afb9..970ea868c 100644
+index 0a5b2afb94b..970ea868c14 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
@@ -31,6 +31,3 @@ index 0a5b2afb9..970ea868c 100644
  		   is_hex(*(c+2)) && is_hex(*(c+3)))
  	    {
  	      *buf++ = *c++;
--- 
-2.14.3
-

0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch

@@ -1,27 +0,0 @@
-From d8901e3ba115d705c9c08ecedd201aca8b4867b8 Mon Sep 17 00:00:00 2001
-From: phcoder <phcoder@sid.debian.laptop.phnet>
-Date: Sun, 9 Jul 2017 20:59:15 +0200
-Subject: [PATCH 045/198] cache: Fix compilation for ppc, sparc and arm64
-
----
- include/grub/cache.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/grub/cache.h b/include/grub/cache.h
-index 1c98ce270..ccfa717e6 100644
---- a/include/grub/cache.h
-+++ b/include/grub/cache.h
-@@ -34,7 +34,9 @@ void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
- #endif
- 
- #ifndef GRUB_MACHINE_EMU
--#if defined (__i386__) || defined (__x86_64__)
-+#if defined (__aarch64__) || defined (__powerpc__) || defined (__sparc__)
-+
-+#elif defined (__i386__) || defined (__x86_64__)
- static inline void
- grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)),
- 			   grub_size_t len __attribute__ ((unused)))
--- 
-2.14.3
-

0046-Don-t-require-a-password-to-boot-entries-generated-b.patch

@@ -1,7 +1,7 @@
-From 2df38f07986a91d2a06cb3e432f9121d9f678f89 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 109/198] Don't require a password to boot entries generated by
+Subject: [PATCH] Don't require a password to boot entries generated by
  grub-mkconfig.
 
 When we set a password, we just want that to mean you can't /edit/ an entry.
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 452a9f69d..79a747ebd 100644
+index 6299836b5cd..b744438e04a 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
@@ -26,6 +26,3 @@ index 452a9f69d..79a747ebd 100644
  
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS="$(sed 's, release .*$,,g' /etc/system-release)"
--- 
-2.14.3
-

0046-ehci-Fix-compilation-on-i386.patch

@@ -1,34 +0,0 @@
-From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Sun, 9 Jul 2017 21:31:19 +0200
-Subject: [PATCH 046/198] ehci: Fix compilation on i386
-
----
- grub-core/bus/usb/ehci.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
-index 7b7061f53..d966fc210 100644
---- a/grub-core/bus/usb/ehci.c
-+++ b/grub-core/bus/usb/ehci.c
-@@ -505,7 +505,7 @@ grub_ehci_init_device (volatile void *regs)
- 
-   grub_dprintf ("ehci",
- 		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llxx\n",
--		(unsigned long long) e->iobase_ehcc + caplen);
-+		(unsigned long long) (grub_addr_t) e->iobase_ehcc + caplen);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
-@@ -697,7 +697,7 @@ grub_ehci_init_device (volatile void *regs)
- 
-   grub_dprintf ("ehci",
- 		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llx\n",
--		(unsigned long long) regs);
-+		(unsigned long long) (grub_addr_t) regs);
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
- 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
-   grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
--- 
-2.14.3
-

0047-Don-t-emit-Booting-.-message.patch

@@ -1,7 +1,7 @@
-From a72d4819fb7275cbf65b5de901c50d076bf861fd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 110/198] Don't emit "Booting ..." message.
+Subject: [PATCH] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d2f64b05e..5e2f5283d 100644
+index d2f64b05e0a..5e2f5283d3d 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,7 +34,7 @@ index d2f64b05e..5e2f5283d 100644
  
  /* Callback invoked when a default menu entry executed because of a timeout
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a3..5785f67ee 100644
+index cdf3590a364..5785f67ee1c 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -1167,9 +1167,6 @@ run (struct screen *screen)
@@ -47,6 +47,3 @@ index cdf3590a3..5785f67ee 100644
  
    errs_before = grub_err_printed_errors;
  
--- 
-2.14.3
-

0047-crypto-Fix-use-after-free.patch

@@ -1,28 +0,0 @@
-From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001
-From: AppChecker <appchecker>
-Date: Sun, 9 Jul 2017 21:57:35 +0200
-Subject: [PATCH 047/198] crypto: Fix use after free.
-
-Reported by: AppChecker
-Transformed to patch by: Satish Govindarajan
----
- grub-core/normal/crypto.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/crypto.c b/grub-core/normal/crypto.c
-index 2bfd67c8e..e6d345f33 100644
---- a/grub-core/normal/crypto.c
-+++ b/grub-core/normal/crypto.c
-@@ -147,8 +147,8 @@ read_crypto_list (const char *prefix)
-       if (! cur->modname)
- 	{
- 	  grub_errno = GRUB_ERR_NONE;
--	  grub_free (cur);
- 	  grub_free (cur->name);
-+	  grub_free (cur);
- 	  continue;
- 	}
-       cur->next = crypto_specs;
--- 
-2.14.3
-

0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch

@@ -1,12 +1,12 @@
-From 6412d775976361b52c0914f6e5e3b0a4b99cdba9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 111/198] Replace a lot of man pages with slightly nicer ones.
+Subject: [PATCH] Replace a lot of man pages with slightly nicer ones.
 
 Replace a bunch of machine generated ones with ones that look nicer.
 ---
- conf/Makefile.extra-dist          |   1 -
  configure.ac                      |  23 ++++++
+ conf/Makefile.extra-dist          |   1 -
  docs/Makefile.am                  |   2 -
  docs/man/grub-bios-setup.h2m      |   6 --
  docs/man/grub-editenv.h2m         |   5 --
@@ -121,20 +121,8 @@ Replace a bunch of machine generated ones with ones that look nicer.
  create mode 100644 util/grub-set-default.8
  create mode 100644 util/grub-sparc64-setup.8
 
-diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b16bd9253..39eb94bde 100644
---- a/conf/Makefile.extra-dist
-+++ b/conf/Makefile.extra-dist
-@@ -11,7 +11,6 @@ EXTRA_DIST += unicode
- EXTRA_DIST += util/import_gcry.py
- EXTRA_DIST += util/import_unicode.py
- 
--EXTRA_DIST += docs/man
- EXTRA_DIST += docs/autoiso.cfg
- EXTRA_DIST += docs/grub.cfg
- EXTRA_DIST += docs/osdetect.cfg
 diff --git a/configure.ac b/configure.ac
-index 9ae97f026..0cb971a92 100644
+index 783118ccdcd..d5db2803ec4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
@@ -167,8 +155,20 @@ index 9ae97f026..0cb971a92 100644
  
  # Optimization flag.  Allow user to override.
  if test "x$TARGET_CFLAGS" = x; then
+diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
+index b16bd925320..39eb94bded6 100644
+--- a/conf/Makefile.extra-dist
++++ b/conf/Makefile.extra-dist
+@@ -11,7 +11,6 @@ EXTRA_DIST += unicode
+ EXTRA_DIST += util/import_gcry.py
+ EXTRA_DIST += util/import_unicode.py
+ 
+-EXTRA_DIST += docs/man
+ EXTRA_DIST += docs/autoiso.cfg
+ EXTRA_DIST += docs/grub.cfg
+ EXTRA_DIST += docs/osdetect.cfg
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index e396ba10f..0669729cc 100644
+index 93eb3962765..ab28f199694 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -179,7 +179,7 @@ index e396ba10f..0669729cc 100644
 -
 diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
 deleted file mode 100644
-index ac6ede362..000000000
+index ac6ede36296..00000000000
 --- a/docs/man/grub-bios-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -191,7 +191,7 @@ index ac6ede362..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
 deleted file mode 100644
-index 3859d3d4c..000000000
+index 3859d3d4c4f..00000000000
 --- a/docs/man/grub-editenv.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -202,7 +202,7 @@ index 3859d3d4c..000000000
 -.BR grub-set-default (8)
 diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
 deleted file mode 100644
-index ef1c00065..000000000
+index ef1c000656a..00000000000
 --- a/docs/man/grub-emu.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -214,7 +214,7 @@ index ef1c00065..000000000
 -rather than this program.
 diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
 deleted file mode 100644
-index e09bb4d31..000000000
+index e09bb4d3101..00000000000
 --- a/docs/man/grub-file.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -222,7 +222,7 @@ index e09bb4d31..000000000
 -grub-file \- check file type
 diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
 deleted file mode 100644
-index 9676b159a..000000000
+index 9676b159afd..00000000000
 --- a/docs/man/grub-fstest.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -232,7 +232,7 @@ index 9676b159a..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
 deleted file mode 100644
-index c1c6ded49..000000000
+index c1c6ded49ff..00000000000
 --- a/docs/man/grub-glue-efi.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -242,7 +242,7 @@ index c1c6ded49..000000000
 -grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.
 diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
 deleted file mode 100644
-index 8cbbc87a0..000000000
+index 8cbbc87a0f2..00000000000
 --- a/docs/man/grub-install.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -254,7 +254,7 @@ index 8cbbc87a0..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
 deleted file mode 100644
-index d81f9157e..000000000
+index d81f9157e01..00000000000
 --- a/docs/man/grub-kbdcomp.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -270,7 +270,7 @@ index d81f9157e..000000000
 -.BR grub-mklayout (8)
 diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
 deleted file mode 100644
-index 0197c0087..000000000
+index 0197c0087d7..00000000000
 --- a/docs/man/grub-macbless.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -280,7 +280,7 @@ index 0197c0087..000000000
 -.BR grub-install (1)
 diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
 deleted file mode 100644
-index d79aaeed8..000000000
+index d79aaeed8f9..00000000000
 --- a/docs/man/grub-macho2img.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -290,7 +290,7 @@ index d79aaeed8..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
 deleted file mode 100644
-index c2e0055ed..000000000
+index c2e0055ed7e..00000000000
 --- a/docs/man/grub-menulst2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -300,7 +300,7 @@ index c2e0055ed..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
 deleted file mode 100644
-index 9b42f8130..000000000
+index 9b42f813010..00000000000
 --- a/docs/man/grub-mkconfig.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -310,7 +310,7 @@ index 9b42f8130..000000000
 -.BR grub-install (8)
 diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
 deleted file mode 100644
-index d46fe600e..000000000
+index d46fe600eca..00000000000
 --- a/docs/man/grub-mkfont.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -320,7 +320,7 @@ index d46fe600e..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
 deleted file mode 100644
-index f0fbc2bb1..000000000
+index f0fbc2bb197..00000000000
 --- a/docs/man/grub-mkimage.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -332,7 +332,7 @@ index f0fbc2bb1..000000000
 -.BR grub-mknetdir (8)
 diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
 deleted file mode 100644
-index 1e43409c0..000000000
+index 1e43409c0ab..00000000000
 --- a/docs/man/grub-mklayout.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -348,7 +348,7 @@ index 1e43409c0..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
 deleted file mode 100644
-index a2ef13ec1..000000000
+index a2ef13ec111..00000000000
 --- a/docs/man/grub-mknetdir.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -358,7 +358,7 @@ index a2ef13ec1..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
 deleted file mode 100644
-index 4d202f3da..000000000
+index 4d202f3da7e..00000000000
 --- a/docs/man/grub-mkpasswd-pbkdf2.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -368,7 +368,7 @@ index 4d202f3da..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
 deleted file mode 100644
-index d01f3961e..000000000
+index d01f3961e3f..00000000000
 --- a/docs/man/grub-mkrelpath.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -378,7 +378,7 @@ index d01f3961e..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
 deleted file mode 100644
-index a427f02e3..000000000
+index a427f02e3c6..00000000000
 --- a/docs/man/grub-mkrescue.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -388,7 +388,7 @@ index a427f02e3..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
 deleted file mode 100644
-index c77313978..000000000
+index c77313978ad..00000000000
 --- a/docs/man/grub-mkstandalone.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -398,7 +398,7 @@ index c77313978..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
 deleted file mode 100644
-index 8d168982d..000000000
+index 8d168982d72..00000000000
 --- a/docs/man/grub-mount.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -406,7 +406,7 @@ index 8d168982d..000000000
 -grub-mount \- export GRUB filesystem with FUSE
 diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
 deleted file mode 100644
-index 74b43eea0..000000000
+index 74b43eea039..00000000000
 --- a/docs/man/grub-ofpathname.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -416,7 +416,7 @@ index 74b43eea0..000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
 deleted file mode 100644
-index 7ca29bd70..000000000
+index 7ca29bd703c..00000000000
 --- a/docs/man/grub-pe2elf.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -426,7 +426,7 @@ index 7ca29bd70..000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
 deleted file mode 100644
-index 6e1ffdcf9..000000000
+index 6e1ffdcf937..00000000000
 --- a/docs/man/grub-probe.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -436,7 +436,7 @@ index 6e1ffdcf9..000000000
 -.BR grub-fstest (1)
 diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
 deleted file mode 100644
-index e4acace65..000000000
+index e4acace65ce..00000000000
 --- a/docs/man/grub-reboot.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -447,7 +447,7 @@ index e4acace65..000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
 deleted file mode 100644
-index 50ae5247c..000000000
+index 50ae5247c05..00000000000
 --- a/docs/man/grub-render-label.h2m
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -456,7 +456,7 @@ index 50ae5247c..000000000
 -
 diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
 deleted file mode 100644
-index 365368267..000000000
+index 3653682671a..00000000000
 --- a/docs/man/grub-script-check.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -466,7 +466,7 @@ index 365368267..000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
 deleted file mode 100644
-index 7945001c1..000000000
+index 7945001c154..00000000000
 --- a/docs/man/grub-set-default.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -477,7 +477,7 @@ index 7945001c1..000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
 deleted file mode 100644
-index 18f803a50..000000000
+index 18f803a50db..00000000000
 --- a/docs/man/grub-sparc64-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -489,7 +489,7 @@ index 18f803a50..000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
 deleted file mode 100644
-index ad25c8ab7..000000000
+index ad25c8ab753..00000000000
 --- a/docs/man/grub-syslinux2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -498,7 +498,7 @@ index ad25c8ab7..000000000
 -[SEE ALSO]
 -.BR grub-menulst2cfg (8)
 diff --git a/gentpl.py b/gentpl.py
-index da67965a4..bf8439fa7 100644
+index da67965a41a..bf8439fa743 100644
 --- a/gentpl.py
 +++ b/gentpl.py
 @@ -802,10 +802,7 @@ def manpage(defn, adddeps):
@@ -515,7 +515,7 @@ index da67965a4..bf8439fa7 100644
  
 diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
 new file mode 100644
-index 000000000..56f582b3d
+index 00000000000..56f582b3d75
 --- /dev/null
 +++ b/util/grub-bios-setup.8
 @@ -0,0 +1,54 @@
@@ -575,7 +575,7 @@ index 000000000..56f582b3d
 +.BR "info grub"
 diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
 new file mode 100644
-index 000000000..d28ba03ba
+index 00000000000..d28ba03ba42
 --- /dev/null
 +++ b/util/grub-editenv.1
 @@ -0,0 +1,46 @@
@@ -627,7 +627,7 @@ index 000000000..d28ba03ba
 +.BR "info grub"
 diff --git a/util/grub-file.1 b/util/grub-file.1
 new file mode 100644
-index 000000000..b29cb3278
+index 00000000000..b29cb327889
 --- /dev/null
 +++ b/util/grub-file.1
 @@ -0,0 +1,165 @@
@@ -798,7 +798,7 @@ index 000000000..b29cb3278
 +.BR "info grub"
 diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
 new file mode 100644
-index 000000000..792fa7863
+index 00000000000..792fa78634c
 --- /dev/null
 +++ b/util/grub-fstest.1
 @@ -0,0 +1,99 @@
@@ -903,7 +903,7 @@ index 000000000..792fa7863
 +.BR "info grub"
 diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
 new file mode 100644
-index 000000000..72bd555d5
+index 00000000000..72bd555d577
 --- /dev/null
 +++ b/util/grub-glue-efi.1
 @@ -0,0 +1,31 @@
@@ -940,7 +940,7 @@ index 000000000..72bd555d5
 +.BR "info grub"
 diff --git a/util/grub-install.8 b/util/grub-install.8
 new file mode 100644
-index 000000000..76272a39d
+index 00000000000..76272a39d2e
 --- /dev/null
 +++ b/util/grub-install.8
 @@ -0,0 +1,129 @@
@@ -1075,7 +1075,7 @@ index 000000000..76272a39d
 +.BR "info grub"
 diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
 new file mode 100644
-index 000000000..0bb969a5b
+index 00000000000..0bb969a5b43
 --- /dev/null
 +++ b/util/grub-kbdcomp.1
 @@ -0,0 +1,19 @@
@@ -1100,7 +1100,7 @@ index 000000000..0bb969a5b
 +.BR "info grub"
 diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
 new file mode 100644
-index 000000000..41a96186f
+index 00000000000..41a96186f70
 --- /dev/null
 +++ b/util/grub-macbless.1
 @@ -0,0 +1,22 @@
@@ -1128,7 +1128,7 @@ index 000000000..41a96186f
 +.BR "info grub"
 diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
 new file mode 100644
-index 000000000..91e2ef871
+index 00000000000..91e2ef87113
 --- /dev/null
 +++ b/util/grub-menulst2cfg.1
 @@ -0,0 +1,12 @@
@@ -1146,7 +1146,7 @@ index 000000000..91e2ef871
 +.BR "info grub"
 diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
 new file mode 100644
-index 000000000..a2d1f577b
+index 00000000000..a2d1f577b9b
 --- /dev/null
 +++ b/util/grub-mkconfig.8
 @@ -0,0 +1,17 @@
@@ -1169,7 +1169,7 @@ index 000000000..a2d1f577b
 +.BR "info grub"
 diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
 new file mode 100644
-index 000000000..349485798
+index 00000000000..3494857987d
 --- /dev/null
 +++ b/util/grub-mkfont.1
 @@ -0,0 +1,87 @@
@@ -1262,7 +1262,7 @@ index 000000000..349485798
 +.BR "info grub"
 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
 new file mode 100644
-index 000000000..4dea4f545
+index 00000000000..4dea4f54597
 --- /dev/null
 +++ b/util/grub-mkimage.1
 @@ -0,0 +1,95 @@
@@ -1363,7 +1363,7 @@ index 000000000..4dea4f545
 +.BR "info grub"
 diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
 new file mode 100644
-index 000000000..d1bbc2ec5
+index 00000000000..d1bbc2ec515
 --- /dev/null
 +++ b/util/grub-mklayout.1
 @@ -0,0 +1,27 @@
@@ -1396,7 +1396,7 @@ index 000000000..d1bbc2ec5
 +.BR "info grub"
 diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
 new file mode 100644
-index 000000000..fa7e8d4ef
+index 00000000000..fa7e8d4ef0d
 --- /dev/null
 +++ b/util/grub-mknetdir.1
 @@ -0,0 +1,12 @@
@@ -1414,7 +1414,7 @@ index 000000000..fa7e8d4ef
 +.BR "info grub"
 diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
 new file mode 100644
-index 000000000..73c437c15
+index 00000000000..73c437c15d8
 --- /dev/null
 +++ b/util/grub-mkpasswd-pbkdf2.1
 @@ -0,0 +1,27 @@
@@ -1447,7 +1447,7 @@ index 000000000..73c437c15
 +.BR "info grub"
 diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
 new file mode 100644
-index 000000000..85f111362
+index 00000000000..85f1113621d
 --- /dev/null
 +++ b/util/grub-mkrelpath.1
 @@ -0,0 +1,12 @@
@@ -1465,7 +1465,7 @@ index 000000000..85f111362
 +.BR "info grub"
 diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
 new file mode 100644
-index 000000000..4ed9fc723
+index 00000000000..4ed9fc723fd
 --- /dev/null
 +++ b/util/grub-mkrescue.1
 @@ -0,0 +1,123 @@
@@ -1594,7 +1594,7 @@ index 000000000..4ed9fc723
 +.BR "info grub"
 diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
 new file mode 100644
-index 000000000..ba2d2bdf2
+index 00000000000..ba2d2bdf279
 --- /dev/null
 +++ b/util/grub-mkstandalone.1
 @@ -0,0 +1,100 @@
@@ -1700,7 +1700,7 @@ index 000000000..ba2d2bdf2
 +.BR "info grub"
 diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
 new file mode 100644
-index 000000000..bf3743aeb
+index 00000000000..bf3743aeba1
 --- /dev/null
 +++ b/util/grub-ofpathname.8
 @@ -0,0 +1,12 @@
@@ -1718,7 +1718,7 @@ index 000000000..bf3743aeb
 +.BR "info grub"
 diff --git a/util/grub-probe.8 b/util/grub-probe.8
 new file mode 100644
-index 000000000..04e26c832
+index 00000000000..04e26c832bb
 --- /dev/null
 +++ b/util/grub-probe.8
 @@ -0,0 +1,80 @@
@@ -1804,7 +1804,7 @@ index 000000000..04e26c832
 +.BR "info grub"
 diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
 new file mode 100644
-index 000000000..faa5e4eec
+index 00000000000..faa5e4eece2
 --- /dev/null
 +++ b/util/grub-reboot.8
 @@ -0,0 +1,21 @@
@@ -1831,7 +1831,7 @@ index 000000000..faa5e4eec
 +.BR "info grub"
 diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
 new file mode 100644
-index 000000000..4d51c8abf
+index 00000000000..4d51c8abf01
 --- /dev/null
 +++ b/util/grub-render-label.1
 @@ -0,0 +1,51 @@
@@ -1888,7 +1888,7 @@ index 000000000..4d51c8abf
 +.BR "info grub"
 diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
 new file mode 100644
-index 000000000..0f1f625b0
+index 00000000000..0f1f625b05d
 --- /dev/null
 +++ b/util/grub-script-check.1
 @@ -0,0 +1,21 @@
@@ -1915,7 +1915,7 @@ index 000000000..0f1f625b0
 +.BR "info grub"
 diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
 new file mode 100644
-index 000000000..a96265a15
+index 00000000000..a96265a1509
 --- /dev/null
 +++ b/util/grub-set-default.8
 @@ -0,0 +1,21 @@
@@ -1942,7 +1942,7 @@ index 000000000..a96265a15
 +.BR "info grub"
 diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
 new file mode 100644
-index 000000000..37ea2dd5e
+index 00000000000..37ea2dd5eaa
 --- /dev/null
 +++ b/util/grub-sparc64-setup.8
 @@ -0,0 +1,12 @@
@@ -1958,6 +1958,3 @@ index 000000000..37ea2dd5e
 +
 +.SH SEE ALSO
 +.BR "info grub"
--- 
-2.14.3
-

0048-arm-efi-Fix-compilation.patch

@@ -1,41 +0,0 @@
-From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Sun, 9 Jul 2017 21:48:37 +0000
-Subject: [PATCH 048/198] arm-efi: Fix compilation
-
----
- grub-core/loader/arm/linux.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 260cbf068..e64c79a95 100644
---- a/grub-core/loader/arm/linux.c
-+++ b/grub-core/loader/arm/linux.c
-@@ -252,12 +252,12 @@ linux_boot (void)
- #ifdef GRUB_MACHINE_EFI
-       grub_size_t size;
-       if (fdt_valid)
--	size = grub_fdt_get_totalsize (fdt_addr);
-+	size = grub_fdt_get_totalsize (current_fdt);
-       else
--	size = 4 * get_atag_size (atag_orig);
-+	size = 4 * get_atag_size (current_fdt);
-       size += grub_strlen (linux_args) + 256;
-       target_fdt = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
--      if (!fdt_addr)
-+      if (!target_fdt)
- 	return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
- #else
-       target_fdt = (void *) LINUX_FDT_ADDRESS;
-@@ -522,7 +522,7 @@ GRUB_MOD_INIT (linux)
- 					  /* TRANSLATORS: DTB stands for device tree blob.  */
- 					  0, N_("Load DTB file."));
-   my_mod = mod;
--  current_fdt = grub_arm_firmware_get_boot_data ();
-+  current_fdt = (const void *) grub_arm_firmware_get_boot_data ();
-   machine_type = grub_arm_firmware_get_machine_type ();
- }
- 
--- 
-2.14.3
-

0049-fdt-silence-clang-warning.patch

@@ -1,26 +0,0 @@
-From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 10 Jul 2017 01:34:22 +0000
-Subject: [PATCH 049/198] fdt: silence clang warning.
-
----
- grub-core/lib/fdt.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index bdc630244..2705f2629 100644
---- a/grub-core/lib/fdt.c
-+++ b/grub-core/lib/fdt.c
-@@ -309,7 +309,8 @@ advance_token (const void *fdt, const grub_uint32_t *token, const grub_uint32_t
- 	    continue;
- 	  }
- 	char *ptr;
--	for (ptr = (char *) (token + 1); *ptr && ptr < (char *) end; ptr++);
-+	for (ptr = (char *) (token + 1); *ptr && ptr < (char *) end; ptr++)
-+	  ;
-         if (ptr >= (char *) end)
-           return 0;
- 	return token;
--- 
-2.14.3
-

0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch

@@ -1,8 +1,7 @@
-From acf4cfa6d1691a9476b36949af7e296080c88d25 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 19 Feb 2014 15:58:43 -0500
-Subject: [PATCH 112/198] use fw_path prefix when fallback searching for grub
- config
+Subject: [PATCH] use fw_path prefix when fallback searching for grub config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg
 in the fw_path directory where the grub application was found. If
@@ -18,7 +17,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0ce59fdc3..a3713efcd 100644
+index 0ce59fdc3f0..a3713efcd90 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
@@ -40,6 +39,3 @@ index 0ce59fdc3..a3713efcd 100644
        if (prefix)
          {
            grub_size_t config_len;
--- 
-2.14.3
-

0050-Fix-a-segfault-in-lsefi.patch

@@ -1,33 +0,0 @@
-From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001
-From: Rob Clark <rclark@redhat.com>
-Date: Wed, 19 Jul 2017 15:47:41 -0400
-Subject: [PATCH 050/198] Fix a segfault in lsefi
-
-when protocols_per_handle returns error, we can't use the pointers we
-passed to it, and that includes trusting num_protocols.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/commands/efi/lsefi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
-index d901c3892..d1ce99af4 100644
---- a/grub-core/commands/efi/lsefi.c
-+++ b/grub-core/commands/efi/lsefi.c
-@@ -109,8 +109,10 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
- 
-       status = efi_call_3 (grub_efi_system_table->boot_services->protocols_per_handle,
- 			   handle, &protocols, &num_protocols);
--      if (status != GRUB_EFI_SUCCESS)
-+      if (status != GRUB_EFI_SUCCESS) {
- 	grub_printf ("Unable to retrieve protocols\n");
-+	continue;
-+      }
-       for (j = 0; j < num_protocols; j++)
- 	{
- 	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
--- 
-2.14.3
-