Dump a bunch of work-in-progress patches for now.

Signed-off-by: Peter Jones <pjones@redhat.com>

0001-Bump-version-to-2.03.patch

@@ -1,7 +1,7 @@
 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/225] Bump version to 2.03
+Subject: [PATCH 001/198] Bump version to 2.03
 
 ---
  configure.ac                |   2 +-

0002-Remove-bashisms-from-tests.patch

@@ -1,7 +1,7 @@
 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/225] Remove bashisms from tests.
+Subject: [PATCH 002/198] Remove bashisms from tests.
 
 Those tests don't actually need bash. Just use common shebang.
 ---

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

@@ -1,7 +1,7 @@
 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/225] fs-tester: make sh-compatible
+Subject: [PATCH 003/198] fs-tester: make sh-compatible
 
 ---
  tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------

0004-support-busybox-date.patch

@@ -1,7 +1,7 @@
 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/225] support busybox date.
+Subject: [PATCH 004/198] support busybox date.
 
 Busybox date doesn't understand weekdays in -d input,
 so strip them beforehand.

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

@@ -1,7 +1,7 @@
 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/225] Don't retrieve fstime when it's not useful.
+Subject: [PATCH 005/198] Don't retrieve fstime when it's not useful.
 
 ---
  tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------

0006-Support-lseek64.patch

@@ -1,7 +1,7 @@
 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/225] Support lseek64.
+Subject: [PATCH 006/198] Support lseek64.
 
 Android doesn't have 64-bit off_t, so use off64_t instead.
 ---

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

@@ -1,7 +1,7 @@
 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/225] Use $(SHELL) rather than /bin/sh.
+Subject: [PATCH 007/198] Use $(SHELL) rather than /bin/sh.
 
 /bin/sh doesn't exist under termux.
 ---

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

@@ -1,7 +1,7 @@
 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/225] po: Use @SHELL@ rather than /bin/sh.
+Subject: [PATCH 008/198] po: Use @SHELL@ rather than /bin/sh.
 
 /bin/sh might not exist.
 ---

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

@@ -1,7 +1,7 @@
 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/225] Add termux path to dict.
+Subject: [PATCH 009/198] Add termux path to dict.
 
 ---
  tests/util/grub-fs-tester.in | 2 +-

0010-Fix-shebang-for-termux.patch

@@ -1,7 +1,7 @@
 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/225] Fix shebang for termux.
+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.

0011-Add-strtoull-test.patch

@@ -1,7 +1,7 @@
 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/225] Add strtoull test.
+Subject: [PATCH 011/198] Add strtoull test.
 
 ---
  grub-core/Makefile.core.def | 5 +++++

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

@@ -1,7 +1,7 @@
 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/225] strtoull: Fix behaviour on chars between '9' and 'a'.
+Subject: [PATCH 012/198] strtoull: Fix behaviour on chars between '9' and 'a'.
 
 Reported by: Aaron Miller <aaronmiller@fb.com>
 ---

0013-Add-Virtual-LAN-support.patch

@@ -1,7 +1,7 @@
 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/225] Add Virtual LAN support.
+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

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

@@ -1,7 +1,7 @@
 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/225] mkimage: Pass layout to mkimage_generate_elfXX rather
+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

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

@@ -1,7 +1,7 @@
 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/225] Refactor arm-uboot code to make it genereic.
+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.

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

@@ -1,7 +1,7 @@
 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/225] coreboot: Split parts that are platform-independent.
+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.

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

@@ -1,7 +1,7 @@
 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/225] Rename uboot/halt.c to dummy/halt.c.
+Subject: [PATCH 017/198] Rename uboot/halt.c to dummy/halt.c.
 
 It's not U-Boot specific and it's a stub.
 ---

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

@@ -1,7 +1,7 @@
 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/225] Rename uboot/datetime to dummy/datetime.
+Subject: [PATCH 018/198] Rename uboot/datetime to dummy/datetime.
 
 It's just a stub and is not UBoot-specific.
 ---

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

@@ -1,7 +1,7 @@
 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/225] arm-coreboot: Start new port.
+Subject: [PATCH 019/198] arm-coreboot: Start new port.
 
 ---
  configure.ac                           |   2 +

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

@@ -1,7 +1,7 @@
 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/225] Add support for device-tree-based drivers.
+Subject: [PATCH 020/198] Add support for device-tree-based drivers.
 
 ---
  conf/Makefile.common               |   4 +-

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

@@ -1,7 +1,7 @@
 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/225] arm-coreboot: Support for vexpress timer.
+Subject: [PATCH 021/198] arm-coreboot: Support for vexpress timer.
 
 ---
  grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
 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/225] arm-coreboot: Export FDT routines.
+Subject: [PATCH 022/198] arm-coreboot: Export FDT routines.
 
 We need to use them from modules as well.
 ---

0023-at_keyboard-Split-protocol-from-controller-code.patch

@@ -1,7 +1,7 @@
 From 216950a4eea1a1ead1c28eaca94e34ea2ef2ad19 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 8 May 2017 21:41:22 +0200
-Subject: [PATCH 023/225] at_keyboard: Split protocol from controller code.
+Subject: [PATCH 023/198] at_keyboard: Split protocol from controller code.
 
 On vexpress controller is different but protocol is the same, so reuse the
 code.

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

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Support keyboard for vexpress.
+Subject: [PATCH 024/198] arm_coreboot: Support keyboard for vexpress.
 
 ---
  grub-core/Makefile.am              |   1 +

0025-arm_coreboot-Support-grub-mkstandalone.patch

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Support grub-mkstandalone.
+Subject: [PATCH 025/198] arm_coreboot: Support grub-mkstandalone.
 
 ---
  include/grub/util/install.h |  6 +++++-

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

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Support loading linux images.
+Subject: [PATCH 026/198] arm_coreboot: Support loading linux images.
 
 ---
  grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------

0027-arm_coreboot-Support-DMA.patch

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Support DMA.
+Subject: [PATCH 027/198] arm_coreboot: Support DMA.
 
 This is needed to support USB and some other busses.
 ---

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

@@ -1,7 +1,7 @@
 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/225] ehci: Split core  code from PCI part.
+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.

0029-arm_coreboot-Support-EHCI.patch

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Support EHCI.
+Subject: [PATCH 029/198] arm_coreboot: Support EHCI.
 
 ---
  gentpl.py                    |  2 +-

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

@@ -1,7 +1,7 @@
 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/225] Fix bug on FDT nodes with compatible property
+Subject: [PATCH 030/198] Fix bug on FDT nodes with compatible property
 
 ---
  grub-core/bus/fdt.c | 2 ++

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

@@ -1,7 +1,7 @@
 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/225] fdtbus: Add ability to send/receive messages on
+Subject: [PATCH 031/198] fdtbus: Add ability to send/receive messages on
  parent busses.
 
 ---

0032-rk3288_spi-Add-SPI-driver.patch

@@ -1,7 +1,7 @@
 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/225] rk3288_spi: Add SPI driver
+Subject: [PATCH 032/198] rk3288_spi: Add SPI driver
 
 ---
  grub-core/Makefile.core.def        |   1 +

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

@@ -1,7 +1,7 @@
 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/225] arm_coreboot: Add Chromebook keyboard driver.
+Subject: [PATCH 033/198] arm_coreboot: Add Chromebook keyboard driver.
 
 ---
  grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
 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/225] Missing parts of previous commit
+Subject: [PATCH 034/198] Missing parts of previous commit
 
 ---
  grub-core/Makefile.core.def        | 2 ++

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

@@ -1,7 +1,7 @@
 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/225] coreboot: Changed cbmemc to support updated console
+Subject: [PATCH 035/198] coreboot: Changed cbmemc to support updated console
  format from coreboot.
 
 ---

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

@@ -1,7 +1,7 @@
 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/225] at_keyboard: Fix falco chromebook case.
+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.
 

0037-sparc64-Close-cdboot-ihandle.patch

@@ -1,7 +1,7 @@
 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/225] sparc64: Close cdboot ihandle
+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

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

@@ -1,7 +1,7 @@
 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/225] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
+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

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

@@ -1,7 +1,7 @@
 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/225] arm64: Add "--nounzip" option support in xen_module
+Subject: [PATCH 039/198] arm64: Add "--nounzip" option support in xen_module
  command
 
 This patch adds "--nounzip" option support in order to

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

@@ -1,7 +1,7 @@
 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/225] util/grub.d/20_linux_xen.in: Add xen_boot command
+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:

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

@@ -1,7 +1,7 @@
 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/225] arm64: Update the introduction of Xen boot commands
+Subject: [PATCH 041/198] arm64: Update the introduction of Xen boot commands
  in docs/grub.texi
 
 delete: xen_linux, xen_initrd, xen_xsm

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

@@ -1,7 +1,7 @@
 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/225] sparc64: Don't use devspec to determine the OBP path
+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:

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

@@ -1,7 +1,7 @@
 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/225] Allow GRUB to mount ext2/3/4 filesystems that have
+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.

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

@@ -1,7 +1,7 @@
 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/225] ehci: Fix compilation for amd64
+Subject: [PATCH 044/198] ehci: Fix compilation for amd64
 
 ---
  grub-core/bus/usb/ehci.c | 8 ++++----

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

@@ -1,7 +1,7 @@
 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/225] cache: Fix compilation for ppc, sparc and arm64
+Subject: [PATCH 045/198] cache: Fix compilation for ppc, sparc and arm64
 
 ---
  include/grub/cache.h | 4 +++-

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

@@ -1,7 +1,7 @@
 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/225] ehci: Fix compilation on i386
+Subject: [PATCH 046/198] ehci: Fix compilation on i386
 
 ---
  grub-core/bus/usb/ehci.c | 4 ++--

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

@@ -1,7 +1,7 @@
 From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001
 From: AppChecker <appchecker>
 Date: Sun, 9 Jul 2017 21:57:35 +0200
-Subject: [PATCH 047/225] crypto: Fix use after free.
+Subject: [PATCH 047/198] crypto: Fix use after free.
 
 Reported by: AppChecker
 Transformed to patch by: Satish Govindarajan

0048-arm-efi-Fix-compilation.patch

@@ -1,7 +1,7 @@
 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/225] arm-efi: Fix compilation
+Subject: [PATCH 048/198] arm-efi: Fix compilation
 
 ---
  grub-core/loader/arm/linux.c | 8 ++++----

0049-fdt-silence-clang-warning.patch

@@ -1,7 +1,7 @@
 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/225] fdt: silence clang warning.
+Subject: [PATCH 049/198] fdt: silence clang warning.
 
 ---
  grub-core/lib/fdt.c | 3 ++-

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

@@ -1,7 +1,7 @@
 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/225] Fix a segfault in lsefi
+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.

0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch

@@ -1,7 +1,7 @@
 From fa42786264cef98c56e972b3bb6b8448000e1c70 Mon Sep 17 00:00:00 2001
 From: Pete Batard <pete@akeo.ie>
 Date: Thu, 3 Aug 2017 15:46:15 +0100
-Subject: [PATCH 051/225] zfs: remove size_t typedef and use grub_size_t
+Subject: [PATCH 051/198] zfs: remove size_t typedef and use grub_size_t
  instead
 
 * Prevents some toolchains from issuing a warning on size_t redef.

0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch

@@ -1,7 +1,7 @@
 From 76188809d5ca40c5285b0ab202b5edea7be3f04d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
 Date: Thu, 22 Jun 2017 14:33:17 +0200
-Subject: [PATCH 052/225] udf: Fix reading label, lvd.ident is dstring
+Subject: [PATCH 052/198] udf: Fix reading label, lvd.ident is dstring
 
 UDF dstring has stored length in the last byte of buffer. Therefore last
 byte is not part of recorded characters. And empty string in dstring is

0053-grub-core-fs-udf.c-Add-support-for-UUID.patch

@@ -1,7 +1,7 @@
 From 435fa75e01ef40917239c7f775e505e86f70d202 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
 Date: Thu, 22 Jun 2017 14:42:16 +0200
-Subject: [PATCH 053/225] * grub-core/fs/udf.c: Add support for UUID
+Subject: [PATCH 053/198] * grub-core/fs/udf.c: Add support for UUID
 
 Use same algorithm as in libblkid from util-linux v2.30.
 

0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch

@@ -1,7 +1,7 @@
 From 9e962fd3c42081e2eef1f99a0eaab38fd04d2620 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 7 Aug 2017 18:05:17 +0200
-Subject: [PATCH 054/225] mkrescue: Check xorriso presence before doing
+Subject: [PATCH 054/198] mkrescue: Check xorriso presence before doing
  anything else.
 
 mkrescue can't do anything useful without xorriso, so abort early if it's

0055-Fail-if-xorriso-failed.patch

@@ -1,7 +1,7 @@
 From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 7 Aug 2017 18:08:39 +0200
-Subject: [PATCH 055/225] Fail if xorriso failed.
+Subject: [PATCH 055/198] Fail if xorriso failed.
 
 If xorriso failed most likely we didn't generate a meaningful image.
 ---

0056-efi-refactor-grub_efi_allocate_pages.patch

@@ -1,7 +1,7 @@
 From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Thu, 3 Aug 2017 11:04:23 +0100
-Subject: [PATCH 056/225] efi: refactor grub_efi_allocate_pages
+Subject: [PATCH 056/198] efi: refactor grub_efi_allocate_pages
 
 Expose a new function, grub_efi_allocate_pages_real(), making it possible
 to specify allocation type and memory type as supported by the UEFI

0057-Remove-grub_efi_allocate_pages.patch

@@ -1,7 +1,7 @@
 From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 7 Aug 2017 18:33:29 +0200
-Subject: [PATCH 057/225] Remove grub_efi_allocate_pages.
+Subject: [PATCH 057/198] Remove grub_efi_allocate_pages.
 
 grub_efi_allocate_pages Essentially does 2 unrelated things:
 * Allocate at fixed address.

0058-efi-move-fdt-helper-library.patch

@@ -1,7 +1,7 @@
 From 8c9465fac901caac6802d6872a1374518b001517 Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Thu, 3 Aug 2017 11:04:24 +0100
-Subject: [PATCH 058/225] efi: move fdt helper library
+Subject: [PATCH 058/198] efi: move fdt helper library
 
 There is nothing ARM64 (or even ARM) specific about the efi fdt helper
 library, which is used for locating or overriding a firmware-provided

0059-efi-Add-GRUB_PE32_MAGIC-definition.patch

@@ -1,7 +1,7 @@
 From c5841ba7f0d14c193f20854e7e55b4f7ce9207d5 Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Thu, 3 Aug 2017 11:04:25 +0100
-Subject: [PATCH 059/225] efi: Add GRUB_PE32_MAGIC definition
+Subject: [PATCH 059/198] efi: Add GRUB_PE32_MAGIC definition
 
 Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete
 the existing one in arm64/linux.h.

0060-arm64-linux-loader-improve-type-portability.patch

@@ -1,7 +1,7 @@
 From 91212e0aa07e704a61e4540c18a27f149f5e51c3 Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Thu, 3 Aug 2017 11:04:26 +0100
-Subject: [PATCH 060/225] arm64 linux loader: improve type portability
+Subject: [PATCH 060/198] arm64 linux loader: improve type portability
 
 In preparation for turning this into a common loader for 32-bit and 64-bit
 platforms, ensure the code will compile cleanly for either.

0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch

@@ -1,7 +1,7 @@
 From f826330683675f0deb55b58fd229afd7d65fb053 Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Thu, 3 Aug 2017 11:04:32 +0100
-Subject: [PATCH 061/225] efi: change heap allocation type to
+Subject: [PATCH 061/198] efi: change heap allocation type to
  GRUB_EFI_LOADER_CODE
 
 With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may

0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch

@@ -1,7 +1,7 @@
 From bdd89d239cd9b4089630bfb5ec862aab8086dca2 Mon Sep 17 00:00:00 2001
 From: Pete Batard <pete@akeo.ie>
 Date: Mon, 7 Aug 2017 16:20:30 +0100
-Subject: [PATCH 062/225] core: use GRUB_TERM_ definitions when handling term
+Subject: [PATCH 062/198] core: use GRUB_TERM_ definitions when handling term
  characters
 
 * Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard and is not understood by some compilers

0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch

@@ -1,7 +1,7 @@
 From 1deebd85ef87cc581e995ce0a51dc0802ac9c367 Mon Sep 17 00:00:00 2001
 From: Pete Batard <pete@akeo.ie>
 Date: Mon, 7 Aug 2017 16:23:12 +0100
-Subject: [PATCH 063/225] io: add a GRUB_GZ prefix to gzio specific defines
+Subject: [PATCH 063/198] io: add a GRUB_GZ prefix to gzio specific defines
 
 * This is done to avoid a conflict with a PACKED define in the EDK2
 ---

0064-grub.texi-Fix-typo.patch

@@ -1,26 +0,0 @@
-From 7108c0c86ea26f75dfba4e21e78bf8464c433143 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 11:36:50 +0200
-Subject: [PATCH 064/225] grub.texi: Fix typo
-
-Reported by: 	Ori Avtalion <saltyhorse>
----
- docs/grub.texi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/grub.texi b/docs/grub.texi
-index a0c4b9e4e..137b894fa 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -4643,7 +4643,7 @@ range 0-0xFF (prefix with @samp{0x} to enter it in hexadecimal).
- When enabled, this hides the selected partition by setting the @dfn{hidden}
- bit in its partition type code; when disabled, unhides the selected
- partition by clearing this bit.  This is useful only when booting DOS or
--Wwindows and multiple primary FAT partitions exist in one disk.  See also
-+Windows and multiple primary FAT partitions exist in one disk.  See also
- @ref{DOS/Windows}.
- @end table
- @end deffn
--- 
-2.14.3
-

0064-info-in-builddir.patch

@@ -1,13 +1,8 @@
-From 238f753f0e7ffae2a73356377ba4178b2d12a193 Mon Sep 17 00:00:00 2001
+From 5cf0df8753c19e83251c7244cafe38869a65060f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 8 Aug 2017 13:08:59 -0400
-Subject: [PATCH 097/225] docs/Makefile.am: use info-in-builddir
+Subject: [PATCH 064/198] info-in-builddir
 
-This makes it so builds in subdirectories don't contaminate the main
-build directory with their .info files.  While the result is two
-identical targets built, it still makes packaging more straightforward.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  docs/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

0065-hdparm-Depend-on-hexdump-rather-than-having-a-second.patch

@@ -1,25 +0,0 @@
-From 6662372053bb7f580cf1b6a56b11e1190d81a40c Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 12:48:58 +0200
-Subject: [PATCH 065/225] hdparm: Depend on hexdump rather than having a second
- copy of hexdump.
-
----
- grub-core/Makefile.core.def | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index a65c27f7f..8d57a59a0 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -902,7 +902,6 @@ module = {
- module = {
-   name = hdparm;
-   common = commands/hdparm.c;
--  common = lib/hexdump.c;
-   enable = pci;
-   enable = mips_qemu_mips;
- };
--- 
-2.14.3
-

0065-re-write-.gitignore.patch

@@ -1,14 +1,8 @@
-From 75a56b418d61781dc386e300b05e65764c651a98 Mon Sep 17 00:00:00 2001
+From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 8 Aug 2017 12:48:04 -0400
-Subject: [PATCH 095/225] Re-write .gitignore
+Subject: [PATCH 065/198] re-write .gitignore
 
-This re-writes the main .gitignore file, putting only things in it that
-need to be, and adding comments about what's there and why.  It also
-moves ignored things from subdirectories into .gitignore in those
-subdirectories.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
  .gitignore                        | 352 ++++++++++++--------------------------
  build-aux/.gitignore              |   9 +

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

@@ -1,7 +1,7 @@
-From 9a445f819d5648c3a25535536dd85bff407a1a09 Mon Sep 17 00:00:00 2001
+From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 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 099/225] IBM client architecture (CAS) reboot support
+Subject: [PATCH 066/198] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 

0066-multiboot-disentangle-multiboot-and-multiboot2.patch

@@ -1,620 +0,0 @@
-From 21e4a6fa039bb7dc6be42e1e4c171ddc398b8431 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 12:51:26 +0200
-Subject: [PATCH 066/225] multiboot: disentangle multiboot and multiboot2.
-
-Previously we had multiboot and multiboot2 declaring the same symbols.
-This can potentially lead to aliasing and strange behaviours when e.g.
-module instead of module2 is used with multiboot2.
-
-Bug: #51137
----
- grub-core/loader/i386/multiboot_mbi.c |  4 +--
- grub-core/loader/multiboot.c          | 66 ++++++++++++++++++++--------------
- grub-core/loader/multiboot_elfxx.c    | 14 ++++----
- grub-core/loader/multiboot_mbi2.c     | 68 +++++++++++++++++------------------
- include/grub/i386/multiboot.h         |  9 ++++-
- include/grub/mips/multiboot.h         |  4 +--
- include/grub/multiboot.h              | 11 +-----
- include/multiboot2.h                  |  4 +--
- 8 files changed, 95 insertions(+), 85 deletions(-)
-
-diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index fd7b41b0c..dc98dbcae 100644
---- a/grub-core/loader/i386/multiboot_mbi.c
-+++ b/grub-core/loader/i386/multiboot_mbi.c
-@@ -239,7 +239,7 @@ grub_multiboot_get_mbi_size (void)
-   ret = sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
-     + modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
-     + ALIGN_UP (sizeof(PACKAGE_STRING), 4) 
--    + grub_get_multiboot_mmap_count () * sizeof (struct multiboot_mmap_entry)
-+    + grub_multiboot_get_mmap_count () * sizeof (struct multiboot_mmap_entry)
-     + elf_sec_entsize * elf_sec_num
-     + 256 * sizeof (struct multiboot_color)
- #if GRUB_MACHINE_HAS_VBE || GRUB_MACHINE_HAS_VGA_TEXT
-@@ -542,7 +542,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
-       mbi->mods_count = 0;
-     }
- 
--  mmap_size = grub_get_multiboot_mmap_count () 
-+  mmap_size = grub_multiboot_get_mmap_count () 
-     * sizeof (struct multiboot_mmap_entry);
-   grub_fill_multiboot_mmap ((struct multiboot_mmap_entry *) ptrorig);
-   mbi->mmap_length = mmap_size;
-diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index bd9d5b3e6..bd3dc1990 100644
---- a/grub-core/loader/multiboot.c
-+++ b/grub-core/loader/multiboot.c
-@@ -28,7 +28,15 @@
- 
- #include <grub/loader.h>
- #include <grub/command.h>
-+#ifdef GRUB_USE_MULTIBOOT2
-+#include <grub/multiboot2.h>
-+#define GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER
-+#define GRUB_MULTIBOOT_CONSOLE_EGA_TEXT GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT
-+#define GRUB_MULTIBOOT(x) grub_multiboot2_ ## x
-+#else
- #include <grub/multiboot.h>
-+#define GRUB_MULTIBOOT(x) grub_multiboot_ ## x
-+#endif
- #include <grub/cpu/multiboot.h>
- #include <grub/elf.h>
- #include <grub/aout.h>
-@@ -49,8 +57,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #include <grub/efi/efi.h>
- #endif
- 
--struct grub_relocator *grub_multiboot_relocator = NULL;
--grub_uint32_t grub_multiboot_payload_eip;
-+struct grub_relocator *GRUB_MULTIBOOT (relocator) = NULL;
-+grub_uint32_t GRUB_MULTIBOOT (payload_eip);
- #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
- #define DEFAULT_VIDEO_MODE "text"
- #else
-@@ -78,7 +86,7 @@ count_hook (grub_uint64_t addr __attribute__ ((unused)),
- /* Return the length of the Multiboot mmap that will be needed to allocate
-    our platform's map.  */
- grub_uint32_t
--grub_get_multiboot_mmap_count (void)
-+GRUB_MULTIBOOT (get_mmap_count) (void)
- {
-   grub_size_t count = 0;
- 
-@@ -88,7 +96,7 @@ grub_get_multiboot_mmap_count (void)
- }
- 
- grub_err_t
--grub_multiboot_set_video_mode (void)
-+GRUB_MULTIBOOT (set_video_mode) (void)
- {
-   grub_err_t err;
-   const char *modevar;
-@@ -164,19 +172,23 @@ static grub_err_t
- grub_multiboot_boot (void)
- {
-   grub_err_t err;
--  struct grub_relocator32_state state = MULTIBOOT_INITIAL_STATE;
- 
--  state.MULTIBOOT_ENTRY_REGISTER = grub_multiboot_payload_eip;
-+#ifdef GRUB_USE_MULTIBOOT2
-+  struct grub_relocator32_state state = MULTIBOOT2_INITIAL_STATE;
-+#else
-+  struct grub_relocator32_state state = MULTIBOOT_INITIAL_STATE;
-+#endif
-+  state.MULTIBOOT_ENTRY_REGISTER = GRUB_MULTIBOOT (payload_eip);
- 
--  err = grub_multiboot_make_mbi (&state.MULTIBOOT_MBI_REGISTER);
-+  err = GRUB_MULTIBOOT (make_mbi) (&state.MULTIBOOT_MBI_REGISTER);
- 
-   if (err)
-     return err;
- 
-   if (grub_efi_is_finished)
--    normal_boot (grub_multiboot_relocator, state);
-+    normal_boot (GRUB_MULTIBOOT (relocator), state);
-   else
--    efi_boot (grub_multiboot_relocator, state.MULTIBOOT_MBI_REGISTER);
-+    efi_boot (GRUB_MULTIBOOT (relocator), state.MULTIBOOT_MBI_REGISTER);
- 
-   /* Not reached.  */
-   return GRUB_ERR_NONE;
-@@ -185,10 +197,10 @@ grub_multiboot_boot (void)
- static grub_err_t
- grub_multiboot_unload (void)
- {
--  grub_multiboot_free_mbi ();
-+  GRUB_MULTIBOOT (free_mbi) ();
- 
--  grub_relocator_unload (grub_multiboot_relocator);
--  grub_multiboot_relocator = NULL;
-+  grub_relocator_unload (GRUB_MULTIBOOT (relocator));
-+  GRUB_MULTIBOOT (relocator) = NULL;
- 
-   grub_dl_unref (my_mod);
- 
-@@ -207,7 +219,7 @@ static grub_uint64_t highest_load;
- 
- /* Load ELF32 or ELF64.  */
- grub_err_t
--grub_multiboot_load_elf (mbi_load_data_t *mld)
-+GRUB_MULTIBOOT (load_elf) (mbi_load_data_t *mld)
- {
-   if (grub_multiboot_is_elf32 (mld->buffer))
-     return grub_multiboot_load_elf32 (mld);
-@@ -218,9 +230,9 @@ grub_multiboot_load_elf (mbi_load_data_t *mld)
- }
- 
- grub_err_t
--grub_multiboot_set_console (int console_type, int accepted_consoles,
--			    int width, int height, int depth,
--			    int console_req)
-+GRUB_MULTIBOOT (set_console) (int console_type, int accepted_consoles,
-+			      int width, int height, int depth,
-+			      int console_req)
- {
-   console_required = console_req;
-   if (!(accepted_consoles 
-@@ -313,19 +325,19 @@ grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
-   grub_dl_ref (my_mod);
- 
-   /* Skip filename.  */
--  grub_multiboot_init_mbi (argc - 1, argv + 1);
-+  GRUB_MULTIBOOT (init_mbi) (argc - 1, argv + 1);
- 
--  grub_relocator_unload (grub_multiboot_relocator);
--  grub_multiboot_relocator = grub_relocator_new ();
-+  grub_relocator_unload (GRUB_MULTIBOOT (relocator));
-+  GRUB_MULTIBOOT (relocator) = grub_relocator_new ();
- 
--  if (!grub_multiboot_relocator)
-+  if (!GRUB_MULTIBOOT (relocator))
-     goto fail;
- 
--  err = grub_multiboot_load (file, argv[0]);
-+  err = GRUB_MULTIBOOT (load) (file, argv[0]);
-   if (err)
-     goto fail;
- 
--  grub_multiboot_set_bootdev ();
-+  GRUB_MULTIBOOT (set_bootdev) ();
- 
-   grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 0);
- 
-@@ -335,8 +347,8 @@ grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
- 
-   if (grub_errno != GRUB_ERR_NONE)
-     {
--      grub_relocator_unload (grub_multiboot_relocator);
--      grub_multiboot_relocator = NULL;
-+      grub_relocator_unload (GRUB_MULTIBOOT (relocator));
-+      GRUB_MULTIBOOT (relocator) = NULL;
-       grub_dl_unref (my_mod);
-     }
- 
-@@ -368,7 +380,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
-   if (argc == 0)
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
- 
--  if (!grub_multiboot_relocator)
-+  if (!GRUB_MULTIBOOT (relocator))
-     return grub_error (GRUB_ERR_BAD_ARGUMENT,
- 		       N_("you need to load the kernel first"));
- 
-@@ -389,7 +401,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
-   if (size)
-   {
-     grub_relocator_chunk_t ch;
--    err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
-+    err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch,
- 					    lowest_addr, (0xffffffff - size) + 1,
- 					    size, MULTIBOOT_MOD_ALIGN,
- 					    GRUB_RELOCATOR_PREFERENCE_NONE, 1);
-@@ -407,7 +419,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
-       target = 0;
-     }
- 
--  err = grub_multiboot_add_module (target, size, argc - 1, argv + 1);
-+  err = GRUB_MULTIBOOT (add_module) (target, size, argc - 1, argv + 1);
-   if (err)
-     {
-       grub_file_close (file);
-diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index 5e649ed25..67daf5944 100644
---- a/grub-core/loader/multiboot_elfxx.c
-+++ b/grub-core/loader/multiboot_elfxx.c
-@@ -104,13 +104,13 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
-       if (load_size > mld->max_addr || mld->min_addr > mld->max_addr - load_size)
- 	return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size");
- 
--      err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
-+      err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch,
- 					      mld->min_addr, mld->max_addr - load_size,
- 					      load_size, mld->align ? mld->align : 1,
- 					      mld->preference, mld->avoid_efi_boot_services);
-     }
-   else
--    err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, &ch,
-+    err = grub_relocator_alloc_chunk_addr (GRUB_MULTIBOOT (relocator), &ch,
- 					   mld->link_base_addr, load_size);
- 
-   if (err)
-@@ -167,7 +167,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
-     if (phdr(i)->p_vaddr <= ehdr->e_entry
- 	&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
-       {
--	grub_multiboot_payload_eip = (ehdr->e_entry - phdr(i)->p_vaddr)
-+	GRUB_MULTIBOOT (payload_eip) = (ehdr->e_entry - phdr(i)->p_vaddr)
- 	  + phdr(i)->p_paddr;
- #ifdef MULTIBOOT_LOAD_ELF64
- # ifdef __mips
-@@ -191,7 +191,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
- #if defined (__i386__) || defined (__x86_64__)
-   
- #elif defined (__mips)
--  grub_multiboot_payload_eip |= 0x80000000;
-+  GRUB_MULTIBOOT (payload_eip) |= 0x80000000;
- #else
- #error Please complete this
- #endif
-@@ -238,7 +238,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
- 	  if (sh->sh_size == 0)
- 	    continue;
- 
--	  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch, 0,
-+	  err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, 0,
- 						  (0xffffffff - sh->sh_size) + 1,
- 						  sh->sh_size, sh->sh_addralign,
- 						  GRUB_RELOCATOR_PREFERENCE_NONE,
-@@ -264,8 +264,8 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
- 	    }
- 	  sh->sh_addr = target;
- 	}
--      grub_multiboot_add_elfsyms (ehdr->e_shnum, ehdr->e_shentsize,
--				  ehdr->e_shstrndx, shdr);
-+      GRUB_MULTIBOOT (add_elfsyms) (ehdr->e_shnum, ehdr->e_shentsize,
-+				    ehdr->e_shstrndx, shdr);
-     }
- 
- #undef phdr
-diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index b0679a9f6..4df659595 100644
---- a/grub-core/loader/multiboot_mbi2.c
-+++ b/grub-core/loader/multiboot_mbi2.c
-@@ -22,7 +22,7 @@
- #include <grub/machine/apm.h>
- #include <grub/machine/memory.h>
- #endif
--#include <grub/multiboot.h>
-+#include <grub/multiboot2.h>
- #include <grub/cpu/multiboot.h>
- #include <grub/cpu/relocator.h>
- #include <grub/disk.h>
-@@ -71,7 +71,7 @@ static int keep_bs = 0;
- static grub_uint32_t load_base_addr;
- 
- void
--grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize,
-+grub_multiboot2_add_elfsyms (grub_size_t num, grub_size_t entsize,
- 			    unsigned shndx, void *data)
- {
-   elf_sec_num = num;
-@@ -90,17 +90,17 @@ find_header (grub_properly_aligned_t *buffer, grub_ssize_t len)
-        ((char *) header <= (char *) buffer + len - 12);
-        header = (struct multiboot_header *) ((grub_uint32_t *) header + MULTIBOOT_HEADER_ALIGN / 4))
-     {
--      if (header->magic == MULTIBOOT_HEADER_MAGIC
-+      if (header->magic == MULTIBOOT2_HEADER_MAGIC
- 	  && !(header->magic + header->architecture
- 	       + header->header_length + header->checksum)
--	  && header->architecture == MULTIBOOT_ARCHITECTURE_CURRENT)
-+	  && header->architecture == MULTIBOOT2_ARCHITECTURE_CURRENT)
- 	return header;
-     }
-   return NULL;
- }
- 
- grub_err_t
--grub_multiboot_load (grub_file_t file, const char *filename)
-+grub_multiboot2_load (grub_file_t file, const char *filename)
- {
-   grub_ssize_t len;
-   struct multiboot_header *header;
-@@ -112,7 +112,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
-   grub_addr_t entry = 0, efi_entry = 0;
-   grub_uint32_t console_required = 0;
-   struct multiboot_header_tag_framebuffer *fbtag = NULL;
--  int accepted_consoles = GRUB_MULTIBOOT_CONSOLE_EGA_TEXT;
-+  int accepted_consoles = GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT;
-   mbi_load_data_t mld;
- 
-   mld.mbi_ver = 2;
-@@ -210,7 +210,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
-       case MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS:
- 	if (!(((struct multiboot_header_tag_console_flags *) tag)->console_flags
- 	    & MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED))
--	  accepted_consoles &= ~GRUB_MULTIBOOT_CONSOLE_EGA_TEXT;
-+	  accepted_consoles &= ~GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT;
- 	if (((struct multiboot_header_tag_console_flags *) tag)->console_flags
- 	    & MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED)
- 	  console_required = 1;
-@@ -218,7 +218,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
- 
-       case MULTIBOOT_HEADER_TAG_FRAMEBUFFER:
- 	fbtag = (struct multiboot_header_tag_framebuffer *) tag;
--	accepted_consoles |= GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER;
-+	accepted_consoles |= GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER;
- 	break;
- 
-       case MULTIBOOT_HEADER_TAG_RELOCATABLE:
-@@ -295,13 +295,13 @@ grub_multiboot_load (grub_file_t file, const char *filename)
- 	      return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size");
- 	    }
- 
--	  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
-+	  err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch,
- 						  mld.min_addr, mld.max_addr - code_size,
- 						  code_size, mld.align ? mld.align : 1,
- 						  mld.preference, keep_bs);
- 	}
-       else
--	err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator,
-+	err = grub_relocator_alloc_chunk_addr (grub_multiboot2_relocator,
- 					       &ch, load_addr, code_size);
-       if (err)
- 	{
-@@ -343,7 +343,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
-       mld.file = file;
-       mld.filename = filename;
-       mld.avoid_efi_boot_services = keep_bs;
--      err = grub_multiboot_load_elf (&mld);
-+      err = grub_multiboot2_load_elf (&mld);
-       if (err)
- 	{
- 	  grub_free (mld.buffer);
-@@ -354,9 +354,9 @@ grub_multiboot_load (grub_file_t file, const char *filename)
-   load_base_addr = mld.load_base_addr;
- 
-   if (keep_bs && efi_entry_specified)
--    grub_multiboot_payload_eip = efi_entry;
-+    grub_multiboot2_payload_eip = efi_entry;
-   else if (entry_specified)
--    grub_multiboot_payload_eip = entry;
-+    grub_multiboot2_payload_eip = entry;
- 
-   if (mld.relocatable)
-     {
-@@ -370,20 +370,20 @@ grub_multiboot_load (grub_file_t file, const char *filename)
-        * 64-bit int here.
-        */
-       if (mld.load_base_addr >= mld.link_base_addr)
--	grub_multiboot_payload_eip += mld.load_base_addr - mld.link_base_addr;
-+	grub_multiboot2_payload_eip += mld.load_base_addr - mld.link_base_addr;
-       else
--	grub_multiboot_payload_eip -= mld.link_base_addr - mld.load_base_addr;
-+	grub_multiboot2_payload_eip -= mld.link_base_addr - mld.load_base_addr;
-     }
- 
-   if (fbtag)
--    err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
--				      accepted_consoles,
--				      fbtag->width, fbtag->height,
--				      fbtag->depth, console_required);
-+    err = grub_multiboot2_set_console (GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER,
-+				       accepted_consoles,
-+				       fbtag->width, fbtag->height,
-+				       fbtag->depth, console_required);
-   else
--    err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT,
--				      accepted_consoles,
--				      0, 0, 0, console_required);
-+    err = grub_multiboot2_set_console (GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT,
-+				       accepted_consoles,
-+				       0, 0, 0, console_required);
-   return err;
- }
- 
-@@ -459,7 +459,7 @@ net_size (void)
- }
- 
- static grub_size_t
--grub_multiboot_get_mbi_size (void)
-+grub_multiboot2_get_mbi_size (void)
- {
- #ifdef GRUB_MACHINE_EFI
-   if (!keep_bs && !efi_mmap_size)
-@@ -478,7 +478,7 @@ grub_multiboot_get_mbi_size (void)
-     + ALIGN_UP (sizeof (struct multiboot_tag_elf_sections), MULTIBOOT_TAG_ALIGN)
-     + ALIGN_UP (elf_sec_entsize * elf_sec_num, MULTIBOOT_TAG_ALIGN)
-     + ALIGN_UP ((sizeof (struct multiboot_tag_mmap)
--		 + grub_get_multiboot_mmap_count ()
-+		 + grub_multiboot2_get_mmap_count ()
- 		 * sizeof (struct multiboot_mmap_entry)), MULTIBOOT_TAG_ALIGN)
-     + ALIGN_UP (sizeof (struct multiboot_tag_framebuffer), MULTIBOOT_TAG_ALIGN)
-     + ALIGN_UP (sizeof (struct multiboot_tag_old_acpi)
-@@ -522,7 +522,7 @@ grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag)
- 
-   tag->type = MULTIBOOT_TAG_TYPE_MMAP;
-   tag->size = sizeof (struct multiboot_tag_mmap)
--    + sizeof (struct multiboot_mmap_entry) * grub_get_multiboot_mmap_count (); 
-+    + sizeof (struct multiboot_mmap_entry) * grub_multiboot2_get_mmap_count (); 
-   tag->entry_size = sizeof (struct multiboot_mmap_entry);
-   tag->entry_version = 0;
- 
-@@ -588,7 +588,7 @@ retrieve_video_parameters (grub_properly_aligned_t **ptrorig)
-   struct multiboot_tag_framebuffer *tag
-     = (struct multiboot_tag_framebuffer *) *ptrorig;
- 
--  err = grub_multiboot_set_video_mode ();
-+  err = grub_multiboot2_set_video_mode ();
-   if (err)
-     {
-       grub_print_error ();
-@@ -731,7 +731,7 @@ retrieve_video_parameters (grub_properly_aligned_t **ptrorig)
- }
- 
- grub_err_t
--grub_multiboot_make_mbi (grub_uint32_t *target)
-+grub_multiboot2_make_mbi (grub_uint32_t *target)
- {
-   grub_properly_aligned_t *ptrorig;
-   grub_properly_aligned_t *mbistart;
-@@ -739,11 +739,11 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
-   grub_size_t bufsize;
-   grub_relocator_chunk_t ch;
- 
--  bufsize = grub_multiboot_get_mbi_size ();
-+  bufsize = grub_multiboot2_get_mbi_size ();
- 
-   COMPILE_TIME_ASSERT (MULTIBOOT_TAG_ALIGN % sizeof (grub_properly_aligned_t) == 0);
- 
--  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
-+  err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch,
- 					  0, 0xffffffff - bufsize,
- 					  bufsize, MULTIBOOT_TAG_ALIGN,
- 					  GRUB_RELOCATOR_PREFERENCE_NONE, 1);
-@@ -1039,7 +1039,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
- }
- 
- void
--grub_multiboot_free_mbi (void)
-+grub_multiboot2_free_mbi (void)
- {
-   struct module *cur, *next;
- 
-@@ -1061,11 +1061,11 @@ grub_multiboot_free_mbi (void)
- }
- 
- grub_err_t
--grub_multiboot_init_mbi (int argc, char *argv[])
-+grub_multiboot2_init_mbi (int argc, char *argv[])
- {
-   grub_ssize_t len = 0;
- 
--  grub_multiboot_free_mbi ();
-+  grub_multiboot2_free_mbi ();
- 
-   len = grub_loader_cmdline_size (argc, argv);
- 
-@@ -1081,7 +1081,7 @@ grub_multiboot_init_mbi (int argc, char *argv[])
- }
- 
- grub_err_t
--grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
-+grub_multiboot2_add_module (grub_addr_t start, grub_size_t size,
- 			   int argc, char *argv[])
- {
-   struct module *newmod;
-@@ -1119,7 +1119,7 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
- }
- 
- void
--grub_multiboot_set_bootdev (void)
-+grub_multiboot2_set_bootdev (void)
- {
-   grub_device_t dev;
- 
-diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
-index 807a1de27..9cd97dfce 100644
---- a/include/grub/i386/multiboot.h
-+++ b/include/grub/i386/multiboot.h
-@@ -19,6 +19,13 @@
- #ifndef GRUB_MULTIBOOT_CPU_HEADER
- #define GRUB_MULTIBOOT_CPU_HEADER	1
- 
-+#define MULTIBOOT2_INITIAL_STATE  { .eax = MULTIBOOT2_BOOTLOADER_MAGIC,	\
-+    .ecx = 0,								\
-+    .edx = 0,								\
-+    /* Set esp to some random location in low memory to avoid breaking */ \
-+    /* non-compliant kernels.  */					\
-+    .esp = 0x7ff00							\
-+      }
- #define MULTIBOOT_INITIAL_STATE  { .eax = MULTIBOOT_BOOTLOADER_MAGIC,	\
-     .ecx = 0,								\
-     .edx = 0,								\
-@@ -28,7 +35,7 @@
-       }
- #define MULTIBOOT_ENTRY_REGISTER eip
- #define MULTIBOOT_MBI_REGISTER ebx
--#define MULTIBOOT_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_I386
-+#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT2_ARCHITECTURE_I386
- 
- #ifdef GRUB_MACHINE_EFI
- #ifdef __x86_64__
-diff --git a/include/grub/mips/multiboot.h b/include/grub/mips/multiboot.h
-index 4aebf29e7..c4eee2dd0 100644
---- a/include/grub/mips/multiboot.h
-+++ b/include/grub/mips/multiboot.h
-@@ -19,11 +19,11 @@
- #ifndef GRUB_MULTIBOOT_CPU_HEADER
- #define GRUB_MULTIBOOT_CPU_HEADER	1
- 
--#define MULTIBOOT_INITIAL_STATE  { .gpr[4] = MULTIBOOT_BOOTLOADER_MAGIC, \
-+#define MULTIBOOT2_INITIAL_STATE  { .gpr[4] = MULTIBOOT2_BOOTLOADER_MAGIC, \
-     .jumpreg = 1 }
- #define MULTIBOOT_ENTRY_REGISTER gpr[1]
- #define MULTIBOOT_MBI_REGISTER gpr[5]
--#define MULTIBOOT_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_MIPS32
-+#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_MIPS32
- 
- #define MULTIBOOT_ELF32_MACHINE EM_MIPS
- #define MULTIBOOT_ELF64_MACHINE EM_MIPS
-diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
-index c96492bb5..bd0a9873e 100644
---- a/include/grub/multiboot.h
-+++ b/include/grub/multiboot.h
-@@ -22,19 +22,11 @@
- 
- #include <grub/file.h>
- 
--#ifdef GRUB_USE_MULTIBOOT2
--#include <multiboot2.h>
--/* Same thing as far as our loader is concerned.  */
--#define MULTIBOOT_BOOTLOADER_MAGIC	MULTIBOOT2_BOOTLOADER_MAGIC
--#define MULTIBOOT_HEADER_MAGIC		MULTIBOOT2_HEADER_MAGIC
--#else
- #include <multiboot.h>
--#endif
- 
- #include <grub/types.h>
- #include <grub/err.h>
- 
--#ifndef GRUB_USE_MULTIBOOT2
- typedef enum
-   {
-     GRUB_MULTIBOOT_QUIRKS_NONE = 0,
-@@ -42,7 +34,6 @@ typedef enum
-     GRUB_MULTIBOOT_QUIRK_MODULES_AFTER_KERNEL = 2
-   } grub_multiboot_quirks_t;
- extern grub_multiboot_quirks_t grub_multiboot_quirks;
--#endif
- 
- extern struct grub_relocator *grub_multiboot_relocator;
- 
-@@ -60,7 +51,7 @@ void
- grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize,
- 			    unsigned shndx, void *data);
- 
--grub_uint32_t grub_get_multiboot_mmap_count (void);
-+grub_uint32_t grub_multiboot_get_mmap_count (void);
- grub_err_t grub_multiboot_set_video_mode (void);
- 
- /* FIXME: support coreboot as well.  */
-diff --git a/include/multiboot2.h b/include/multiboot2.h
-index 5a3db5a7c..5693923c0 100644
---- a/include/multiboot2.h
-+++ b/include/multiboot2.h
-@@ -75,8 +75,8 @@
- #define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64  9
- #define MULTIBOOT_HEADER_TAG_RELOCATABLE  10
- 
--#define MULTIBOOT_ARCHITECTURE_I386  0
--#define MULTIBOOT_ARCHITECTURE_MIPS32  4
-+#define MULTIBOOT2_ARCHITECTURE_I386  0
-+#define MULTIBOOT2_ARCHITECTURE_MIPS32  4
- #define MULTIBOOT_HEADER_TAG_OPTIONAL 1
- 
- #define MULTIBOOT_LOAD_PREFERENCE_NONE 0
--- 
-2.14.3
-

0067-Fix-symbols-appearing-in-several-modules-in-linux.patch

@@ -1,67 +0,0 @@
-From 26e5aea9418aab83df0debd0c672086fa9f2d9c8 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 14:09:30 +0200
-Subject: [PATCH 067/225] Fix symbols appearing in several modules in linux*.
-
-If same symbol is provided by 2 modules its semantics are undefined.
-Avoid this by depending rather than double-including files.
----
- grub-core/Makefile.core.def | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8d57a59a0..66144222c 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -770,6 +770,7 @@ module = {
- module = {
-   name = boot;
-   common = commands/boot.c;
-+  common = lib/cmdline.c;
-   i386_pc = lib/i386/pc/biosnum.c;
-   enable = x86;
-   enable = emu;
-@@ -1630,8 +1631,6 @@ module = {
- module = {
-   name = linux16;
-   common = loader/i386/pc/linux.c;
--  common = loader/linux.c;
--  common = lib/cmdline.c;
-   enable = x86;
- };
- 
-@@ -1666,7 +1665,6 @@ module = {
-   cppflags = "-DGRUB_USE_MULTIBOOT2";
- 
-   common = loader/multiboot.c;
--  common = lib/cmdline.c;
-   common = loader/multiboot_mbi2.c;
-   enable = x86;
-   enable = mips;
-@@ -1675,7 +1673,6 @@ module = {
- module = {
-   name = multiboot;
-   common = loader/multiboot.c;
--  common = lib/cmdline.c;
-   x86 = loader/i386/multiboot_mbi.c;
-   extra_dist = loader/multiboot_elfxx.c;
-   enable = x86;
-@@ -1683,7 +1680,6 @@ module = {
- 
- module = {
-   name = xen_boot;
--  common = lib/cmdline.c;
-   arm64 = loader/arm64/xen_boot.c;
-   enable = arm64;
- };
-@@ -1700,7 +1696,6 @@ module = {
-   arm = loader/arm/linux.c;
-   arm64 = loader/arm64/linux.c;
-   common = loader/linux.c;
--  common = lib/cmdline.c;
-   enable = noemu;
- };
- 
--- 
-2.14.3
-

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

@@ -1,10 +1,13 @@
-From 0252f348aa6da30c30051b86421bc1a5e5a33725 Mon Sep 17 00:00:00 2001
+From 070dc282d3cc6602571296e90945df9d4671aecb 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 100/225] ppc: Use \x0c instead of a literal ^L for terminfo's
+Subject: [PATCH 067/198] for ppc, reset console display attr when clear screen
- ->cls() method
 
-This makes future patches less awkward.
+v2: Also use \x0c instead of a literal ^L to make future patches less
+awkward.
+
+This should fix this bugzilla:
+https://bugzilla.redhat.com/show_bug.cgi?id=908519
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

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

@@ -1,7 +1,7 @@
-From 88e906f88bda94b9c96ef02a09491aec23c5862f Mon Sep 17 00:00:00 2001
+From 4e31478fdf4cda470305c1bb2acb9b820e790757 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 101/225] Disable GRUB video support for IBM power machines
+Subject: [PATCH 068/198] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205

0068-genmoddep-Check-that-no-modules-provide-the-same-sym.patch

@@ -1,30 +0,0 @@
-From 3732816bc08ef605ed3b6c016ff0ed562829f243 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 14:10:48 +0200
-Subject: [PATCH 068/225] genmoddep: Check that no modules provide the same
- symbol.
-
-The semantics of 2 modules providing the same symbol are undefined. So
-ensure that it doesn't happen.
----
- grub-core/genmoddep.awk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
-index bd98d84cd..8976beb91 100644
---- a/grub-core/genmoddep.awk
-+++ b/grub-core/genmoddep.awk
-@@ -18,6 +18,10 @@ BEGIN {
- 
- {
-   if ($1 == "defined") {
-+    if ($3 in symtab) {
-+      printf "%s in %s is duplicated in %s\n", $3, $2, symtab[$3] >"/dev/stderr";
-+      error++;
-+    }
-     symtab[$3] = $2;
-     modtab[$2] = "" modtab[$2]
-   } else if ($1 == "undefined") {
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 5e06c7c7ea67f482e48ad79b51b3a56f312468cd Mon Sep 17 00:00:00 2001
+From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 102/225] Honor a symlink when generating configuration by
+Subject: [PATCH 069/198] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that

0069-yylex-Explicilty-cast-fprintf-to-void.patch

@@ -1,26 +0,0 @@
-From c36c2a86404f373100775305f532c09d46f3c6ce Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 14:11:43 +0200
-Subject: [PATCH 069/225] yylex: Explicilty cast fprintf to void.
-
-It's needed to avoid warning on recent GCC.
----
- grub-core/script/yylex.l | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 95b219170..7b44c37b7 100644
---- a/grub-core/script/yylex.l
-+++ b/grub-core/script/yylex.l
-@@ -91,7 +91,7 @@ typedef size_t yy_size_t;
- #define stdin  0
- #define stdout 0
- 
--#define fprintf(...) 0
-+#define fprintf(...) (void)0
- #define exit(...) grub_fatal("fatal error in lexer")
- #endif
- 
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From af71c599231367520ee2509280e9b8826384d2bf Mon Sep 17 00:00:00 2001
+From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 103/225] Move bash completion script (#922997)
+Subject: [PATCH 070/198] 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 c7888e40f..783118ccd 100644
+index 571f7a0b5..9ae97f026 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
+@@ -288,6 +288,14 @@ AC_SUBST(grubdirname)
  AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
      [Default grub directory name])
  
@@ -28,7 +28,7 @@ index c7888e40f..783118ccd 100644
  #
  # Checks for build programs.
  #
-@@ -498,6 +506,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
+@@ -497,6 +505,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
  # Check for target programs.
  #
  

0070-linux-fixup.patch

@@ -1,32 +0,0 @@
-From 6cc79ec10ccafc5935d776e4a396193b93d7e842 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 16:23:52 +0200
-Subject: [PATCH 070/225] linux fixup
-
----
- grub-core/Makefile.core.def | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 66144222c..6edf68286 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -770,7 +770,6 @@ module = {
- module = {
-   name = boot;
-   common = commands/boot.c;
--  common = lib/cmdline.c;
-   i386_pc = lib/i386/pc/biosnum.c;
-   enable = x86;
-   enable = emu;
-@@ -1696,6 +1695,7 @@ module = {
-   arm = loader/arm/linux.c;
-   arm64 = loader/arm64/linux.c;
-   common = loader/linux.c;
-+  common = lib/cmdline.c;
-   enable = noemu;
- };
- 
--- 
-2.14.3
-

0071-Update-to-minilzo-2.08.patch

@@ -1,7 +1,7 @@
-From 0d3701ae7256a5721b59017106442818b8f4180a Mon Sep 17 00:00:00 2001
+From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 104/225] Update to minilzo-2.08
+Subject: [PATCH 071/198] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 

0071-multiboot-fixup.patch

@@ -1,43 +0,0 @@
-From 4bfd26623f590c8f19c516f4edd342ff18f07bc1 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 16:24:05 +0200
-Subject: [PATCH 071/225] multiboot fixup
-
----
- grub-core/loader/multiboot.c  | 5 ++++-
- include/grub/mips/multiboot.h | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index bd3dc1990..3b57cb132 100644
---- a/grub-core/loader/multiboot.c
-+++ b/grub-core/loader/multiboot.c
-@@ -138,8 +138,11 @@ static void
- efi_boot (struct grub_relocator *rel,
- 	  grub_uint32_t target)
- {
-+#ifdef GRUB_USE_MULTIBOOT2
-+  struct grub_relocator_efi_state state_efi = MULTIBOOT2_EFI_INITIAL_STATE;
-+#else
-   struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE;
--
-+#endif
-   state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = grub_multiboot_payload_eip;
-   state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;
- 
-diff --git a/include/grub/mips/multiboot.h b/include/grub/mips/multiboot.h
-index c4eee2dd0..cdfb41e31 100644
---- a/include/grub/mips/multiboot.h
-+++ b/include/grub/mips/multiboot.h
-@@ -23,7 +23,7 @@
-     .jumpreg = 1 }
- #define MULTIBOOT_ENTRY_REGISTER gpr[1]
- #define MULTIBOOT_MBI_REGISTER gpr[5]
--#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_MIPS32
-+#define MULTIBOOT2_ARCHITECTURE_CURRENT MULTIBOOT2_ARCHITECTURE_MIPS32
- 
- #define MULTIBOOT_ELF32_MACHINE EM_MIPS
- #define MULTIBOOT_ELF64_MACHINE EM_MIPS
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 35bf7ce4bd7e3beb060cacfee867668056453485 Mon Sep 17 00:00:00 2001
+From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 111/225] Allow "fallback" to include entries by title, not
+Subject: [PATCH 072/198] Allow "fallback" to include entries by title, not
  just number.
 
 Resolves: rhbz#1026084

0072-enforcing-fixup.patch

@@ -1,25 +0,0 @@
-From 6ccb2d54bce2eef8e71b93b467c0f49253835c74 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Mon, 14 Aug 2017 16:27:10 +0200
-Subject: [PATCH 072/225] enforcing fixup
-
----
- grub-core/genmoddep.awk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
-index 8976beb91..04c2863e5 100644
---- a/grub-core/genmoddep.awk
-+++ b/grub-core/genmoddep.awk
-@@ -18,7 +18,7 @@ BEGIN {
- 
- {
-   if ($1 == "defined") {
--    if ($3 in symtab) {
-+    if ($3 !~ /^\.refptr\./ && $3 in symtab) {
-       printf "%s in %s is duplicated in %s\n", $3, $2, symtab[$3] >"/dev/stderr";
-       error++;
-     }
--- 
-2.14.3
-

0073-Add-GRUB_DISABLE_UUID.patch

@@ -1,7 +1,7 @@
-From 0b3e2c5f46d39ba2c414b684de2f63723bd98ebb Mon Sep 17 00:00:00 2001
+From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 117/225] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 073/198] 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
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 137b894fa..a07dfbfa3 100644
+index a0c4b9e4e..6fdd2a041 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1409,6 +1409,13 @@ disable the use of UUIDs, set this option to @samp{true}.
@@ -73,7 +73,7 @@ index 3b070fd76..c088b7054 100644
    GRUB_GFXMODE \
    GRUB_BACKGROUND \
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3..1001a1223 100644
+index 60b31cadd..cf35e4174 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -156,7 +156,7 @@ prepare_grub_to_access_device ()

0073-Set-have_exec-to-y-on-cygwin-so-we-have-grub_mkrescu.patch

@@ -1,27 +0,0 @@
-From 5435aaac3c8bfb14bb01a826ec747b783947c86f Mon Sep 17 00:00:00 2001
-From: Xuan Guo <nbdd0121>
-Date: Mon, 14 Aug 2017 16:27:53 +0200
-Subject: [PATCH 073/225] Set have_exec to y on cygwin so we have
- grub_mkrescue.
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 571f7a0b5..c7888e40f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -204,7 +204,8 @@ case "$host_os" in
- esac
- 
- case "$host_os" in
--  cygwin | windows* | mingw32*)	have_exec=n ;;
-+  cygwin) have_exec=y ;;
-+  windows* | mingw32*) have_exec=n ;;
-   aros*) have_exec=n ;;
-   *) have_exec=y;;
- esac
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 17f0301053032e4da761bb786159860e63340555 Mon Sep 17 00:00:00 2001
+From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 105/225] Make "exit" take a return code.
+Subject: [PATCH 074/198] 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
@@ -20,11 +20,11 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  grub-core/kern/mips/arc/init.c       |  2 +-
  grub-core/kern/mips/loongson/init.c  |  2 +-
  grub-core/kern/mips/qemu_mips/init.c |  2 +-
- grub-core/kern/misc.c                | 11 ++++++++++-
+ grub-core/kern/misc.c                |  2 +-
  grub-core/kern/uboot/init.c          |  6 +++---
  grub-core/kern/xen/init.c            |  2 +-
  include/grub/misc.h                  |  2 +-
- 14 files changed, 48 insertions(+), 21 deletions(-)
+ 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
@@ -60,17 +60,17 @@ index a3a118241..b25ca4b9f 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcb..f3fb6e654 100644
+index d467785fc..684ca93f8 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
-@@ -164,11 +164,16 @@ grub_reboot (void)
+@@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
  }
  
  void
 -grub_exit (void)
 +grub_exit (int retval)
  {
-+  grub_efi_status_t rc = GRUB_EFI_LOAD_ERROR;
++  int rc = GRUB_EFI_LOAD_ERROR;
 +
 +  if (retval == 0)
 +    rc = GRUB_EFI_SUCCESS;
@@ -191,10 +191,10 @@ index be88b77d2..8b6c55ffc 100644
    grub_halt ();
  }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d51f..cd63a8cea 100644
+index 3b633d51f..952411d5d 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -1095,9 +1095,18 @@ grub_abort (void)
+@@ -1095,7 +1095,7 @@ grub_abort (void)
        grub_getkey ();
      }
  
@@ -202,18 +202,7 @@ index 3b633d51f..cd63a8cea 100644
 +  grub_exit (1);
  }
  
-+#if defined (__clang__) && !defined (GRUB_UTIL)
-+/* clang emits references to abort().  */
-+void __attribute__ ((noreturn))
-+abort (void)
-+{
-+  grub_abort ();
-+}
-+#endif
-+
  void
- grub_fatal (const char *fmt, ...)
- {
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
 index 3e338645c..be2a5be1d 100644
 --- a/grub-core/kern/uboot/init.c
@@ -253,7 +242,7 @@ index 0559c033c..fce526d41 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 372f009e8..83fd69f4a 100644
+index 2a9f87cc2..062081437 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,

0074-arc-Do-not-create-spurious-variable-grub_arc_memory_.patch

@@ -1,26 +0,0 @@
-From 3d86efda0074285fb86aa6ffe5d97327ebd134a4 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 30 Aug 2017 15:18:24 +0200
-Subject: [PATCH 074/225] arc: Do not create spurious variable
- grub_arc_memory_type_t.
-
----
- include/grub/arc/arc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/grub/arc/arc.h b/include/grub/arc/arc.h
-index 7615a49a9..999de7196 100644
---- a/include/grub/arc/arc.h
-+++ b/include/grub/arc/arc.h
-@@ -53,7 +53,7 @@ enum grub_arc_memory_type
- #ifndef GRUB_CPU_WORDS_BIGENDIAN
-     GRUB_ARC_MEMORY_FREE_CONTIGUOUS,
- #endif
--  } grub_arc_memory_type_t;
-+  };
- 
- struct grub_arc_timeinfo
- {
--- 
-2.14.3
-

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

@@ -1,12 +1,8 @@
-From 13d072ac934f4f5f7861e271080b739f18f5bb91 Mon Sep 17 00:00:00 2001
+From 126f6952b853ea67e784650ed12f365ab7988f51 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 096/225] git: Mark po/exclude.pot as binary so git won't diff
+Subject: [PATCH 075/198] Mark po/exclude.pot as binary so git won't try to
- nonprintables.
+ diff nonprintables.
-
-Right now when we diff the .pot file, things really really don't work.
-This patch adds the "binary" attribute to the file, so that it'll diff
-it as a binary blob instead of ascii/utf-8.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0075-unix-exec-avoid-atexit-handlers-when-child-exits.patch

@@ -1,73 +0,0 @@
-From e75cf4a58b5eaf482804e5e1b2cc7d4399df350e Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@pks.im>
-Date: Mon, 28 Aug 2017 20:57:19 +0200
-Subject: [PATCH 075/225] unix exec: avoid atexit handlers when child exits
-
-The `grub_util_exec_redirect_all` helper function can be used to
-spawn an executable and redirect its output to some files. After calling
-`fork()`, the parent will wait for the child to terminate with
-`waitpid()` while the child prepares its file descriptors, environment
-and finally calls `execvp()`. If something in the children's setup
-fails, it will stop by calling `exit(127)`.
-
-Calling `exit()` will cause any function registered via `atexit()` to be
-executed, which is usually the wrong thing to do in a child. And
-actually, one can easily observe faulty behaviour on musl-based systems
-without modprobe(8) installed: executing `grub-install --help` will call
-`grub_util_exec_redirect_all` with "modprobe", which obviously fails if
-modprobe(8) is not installed. Due to the child now exiting and invoking
-the `atexit()` handlers, it will clean up some data structures of the
-parent and cause it to be deadlocked in the `waitpid()` syscall.
-
-The issue can easily be fixed by calling `_exit(127)` instead, which is
-especially designed to be called when the atexit-handlers should not be
-executed.
-
-Signed-off-by: Patrick Steinhardt <ps@pks.im>
----
- grub-core/osdep/unix/exec.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/osdep/unix/exec.c b/grub-core/osdep/unix/exec.c
-index 935ff120e..db3259f65 100644
---- a/grub-core/osdep/unix/exec.c
-+++ b/grub-core/osdep/unix/exec.c
-@@ -99,7 +99,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
- 	{
- 	  fd = open (stdin_file, O_RDONLY);
- 	  if (fd < 0)
--	    exit (127);
-+	    _exit (127);
- 	  dup2 (fd, STDIN_FILENO);
- 	  close (fd);
- 	}
-@@ -108,7 +108,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
- 	{
- 	  fd = open (stdout_file, O_WRONLY | O_CREAT, 0700);
- 	  if (fd < 0)
--	    exit (127);
-+	    _exit (127);
- 	  dup2 (fd, STDOUT_FILENO);
- 	  close (fd);
- 	}
-@@ -117,7 +117,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
- 	{
- 	  fd = open (stderr_file, O_WRONLY | O_CREAT, 0700);
- 	  if (fd < 0)
--	    exit (127);
-+	    _exit (127);
- 	  dup2 (fd, STDERR_FILENO);
- 	  close (fd);
- 	}
-@@ -126,7 +126,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
-       setenv ("LC_ALL", "C", 1);
- 
-       execvp ((char *) argv[0], (char **) argv);
--      exit (127);
-+      _exit (127);
-     }
-   waitpid (pid, &status, 0);
-   if (!WIFEXITED (status))
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 70e1efe6f19c90d33eab8bf9b3098c3c1447414f Mon Sep 17 00:00:00 2001
+From 506b52759b2b2ad46e7b389979fcbaa78d68dab9 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 118/225] Make efi machines load an env block from a variable
+Subject: [PATCH 076/198] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -10,10 +10,10 @@ 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 540955519..0f06d8f09 100644
+index a65c27f7f..1eb86bed3 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
-@@ -195,6 +195,7 @@ kernel = {
+@@ -191,6 +191,7 @@ kernel = {
    efi = term/efi/console.c;
    efi = kern/acpi.c;
    efi = kern/efi/acpi.c;
@@ -22,7 +22,7 @@ index 540955519..0f06d8f09 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 3dfdf2d22..71d2279a0 100644
+index 2c31847bf..f7782b6e1 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
 @@ -25,9 +25,40 @@

0076-xfs-Don-t-attempt-to-iterate-over-empty-directory.patch

@@ -1,27 +0,0 @@
-From c42acc23ff91ea0170eab5f1e10499dcfc4e0c92 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 30 Aug 2017 15:56:19 +0200
-Subject: [PATCH 076/225] xfs: Don't attempt to iterate over empty directory.
-
-Reported by: Tuomas Tynkkynen
----
- grub-core/fs/xfs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 9f66dd6e4..c6031bd3f 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -828,6 +828,9 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
- 	    entries = (grub_be_to_cpu32 (tail->leaf_count)
- 		       - grub_be_to_cpu32 (tail->leaf_stale));
- 
-+	    if (!entries)
-+	      continue;
-+
- 	    /* Iterate over all entries within this block.  */
- 	    while ((char *)direntry < (char *)tail)
- 	      {
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 028660516264a1642fdf1629fb03184d1f3dea3a Mon Sep 17 00:00:00 2001
+From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 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 119/225] DHCP client ID and UUID options added.
+Subject: [PATCH 077/198] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

0077-Implement-checksum-verification-for-gunzip.patch

@@ -1,130 +0,0 @@
-From b18ce97c672615bb5ac44883676b37a9ec758d83 Mon Sep 17 00:00:00 2001
-From: Stefan Fritsch <sf@sfritsch.de>
-Date: Sun, 1 May 2016 14:32:30 +0200
-Subject: [PATCH 077/225] Implement checksum verification for gunzip
-
-This implements the crc32 check for the gzip format. Support for zlib's
-adler checksum is not included, yet.
----
- grub-core/io/gzio.c | 46 +++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 41 insertions(+), 5 deletions(-)
-
-diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index a8e33033b..dcf3a8701 100644
---- a/grub-core/io/gzio.c
-+++ b/grub-core/io/gzio.c
-@@ -43,6 +43,7 @@
- #include <grub/dl.h>
- #include <grub/deflate.h>
- #include <grub/i18n.h>
-+#include <grub/crypto.h>
- 
- GRUB_MOD_LICENSE ("GPLv3+");
- 
-@@ -94,6 +95,14 @@ struct grub_gzio
-   struct huft *tl;
-   /* The distance code table.  */
-   struct huft *td;
-+  /* The checksum algorithm */
-+  const gcry_md_spec_t *hdesc;
-+  /* The wanted checksum */
-+  grub_uint32_t orig_checksum;
-+  /* The uncompressed length */
-+  grub_size_t orig_len;
-+  /* Context for checksum calculation */
-+  grub_uint8_t *hcontext;
-   /* The lookup bits for the literal/length code table. */
-   int bl;
-   /* The lookup bits for the distance code table.  */
-@@ -180,7 +189,7 @@ test_gzip_header (grub_file_t file)
-     grub_uint8_t os_type;
-   } hdr;
-   grub_uint16_t extra_len;
--  grub_uint32_t orig_len;
-+  grub_uint32_t crc32;
-   grub_gzio_t gzio = file->data;
- 
-   if (grub_file_tell (gzio->file) != 0)
-@@ -215,12 +224,15 @@ test_gzip_header (grub_file_t file)
- 
-   /* FIXME: don't do this on not easily seekable files.  */
-   {
--    grub_file_seek (gzio->file, grub_file_size (gzio->file) - 4);
--    if (grub_file_read (gzio->file, &orig_len, 4) != 4)
-+    grub_file_seek (gzio->file, grub_file_size (gzio->file) - 8);
-+    if (grub_file_read (gzio->file, &crc32, 4) != 4)
-+      return 0;
-+    gzio->orig_checksum = grub_le_to_cpu32 (crc32);
-+    if (grub_file_read (gzio->file, &gzio->orig_len, 4) != 4)
-       return 0;
-     /* FIXME: this does not handle files whose original size is over 4GB.
-        But how can we know the real original size?  */
--    file->size = grub_le_to_cpu32 (orig_len);
-+    file->size = grub_le_to_cpu32 (gzio->orig_len);
-   }
- 
-   initialize_tables (gzio);
-@@ -1095,7 +1107,23 @@ inflate_window (grub_gzio_t gzio)
- 
-   gzio->saved_offset += gzio->wp;
- 
--  /* XXX do CRC calculation here! */
-+  if (gzio->hcontext)
-+    {
-+      gzio->hdesc->write (gzio->hcontext, gzio->slide, gzio->wp);
-+
-+      if (gzio->saved_offset == gzio->orig_len)
-+	{
-+	  grub_uint32_t csum;
-+
-+	  gzio->hdesc->final (gzio->hcontext);
-+	  csum = *(grub_uint32_t *)gzio->hdesc->read (gzio->hcontext);
-+	  csum = grub_be_to_cpu32 (csum);
-+	  if (csum != gzio->orig_checksum)
-+	    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-+			"checksum mismatch %08x/%08x",
-+			gzio->orig_checksum, csum);
-+	}
-+    }
- }
- 
- 
-@@ -1118,6 +1146,9 @@ initialize_tables (grub_gzio_t gzio)
-   huft_free (gzio->td);
-   gzio->tl = NULL;
-   gzio->td = NULL;
-+
-+  if (gzio->hcontext)
-+    gzio->hdesc->init(gzio->hcontext);
- }
- 
- 
-@@ -1143,6 +1174,9 @@ grub_gzio_open (grub_file_t io, const char *name __attribute__ ((unused)))
- 
-   gzio->file = io;
- 
-+  gzio->hdesc = GRUB_MD_CRC32;
-+  gzio->hcontext = grub_malloc(gzio->hdesc->contextsize);
-+
-   file->device = io->device;
-   file->data = gzio;
-   file->fs = &grub_gzio_fs;
-@@ -1151,6 +1185,7 @@ grub_gzio_open (grub_file_t io, const char *name __attribute__ ((unused)))
-   if (! test_gzip_header (file))
-     {
-       grub_errno = GRUB_ERR_NONE;
-+      grub_free (gzio->hcontext);
-       grub_free (gzio);
-       grub_free (file);
-       grub_file_seek (io, 0);
-@@ -1287,6 +1322,7 @@ grub_gzio_close (grub_file_t file)
-   grub_file_close (gzio->file);
-   huft_free (gzio->tl);
-   huft_free (gzio->td);
-+  grub_free (gzio->hcontext);
-   grub_free (gzio);
- 
-   /* No need to close the same device twice.  */
--- 
-2.14.3
-

0078-qemu-coreboot-multiboot-Change-linking-address-to-0x.patch

@@ -1,57 +0,0 @@
-From ec763ed00ac55deb1c429bda5057bd5a147183d1 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 30 Aug 2017 16:29:59 +0200
-Subject: [PATCH 078/225] qemu, coreboot, multiboot: Change linking address to
- 0x9000.
-
-It's common for distros to use a defective ld which links at 0x9000. Instead
-of fighting it, just move link target to 0x9000.
----
- grub-core/Makefile.core.def | 6 +++---
- include/grub/offsets.h      | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6edf68286..d90ad6220 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -68,11 +68,11 @@ kernel = {
-   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
-   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
-   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
--  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-+  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x9000';
-   i386_coreboot_ldflags    = '$(TARGET_IMG_LDFLAGS)';
--  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-+  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x9000';
-   i386_multiboot_ldflags   = '$(TARGET_IMG_LDFLAGS)';
--  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-+  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x9000';
-   i386_ieee1275_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-   i386_ieee1275_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x10000';
-   i386_xen_ldflags         = '$(TARGET_IMG_LDFLAGS)';
-diff --git a/include/grub/offsets.h b/include/grub/offsets.h
-index bf0689fc9..330e4c707 100644
---- a/include/grub/offsets.h
-+++ b/include/grub/offsets.h
-@@ -50,7 +50,7 @@
- /* The offset of GRUB_CORE_ENTRY_ADDR.  */
- #define GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR	0x8
- 
--#define GRUB_KERNEL_I386_QEMU_LINK_ADDR         0x8200
-+#define GRUB_KERNEL_I386_QEMU_LINK_ADDR         0x9000
- 
- /* The offset of GRUB_TOTAL_MODULE_SIZE.  */
- #define GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE	0x8
-@@ -91,7 +91,7 @@
- 
- #define GRUB_KERNEL_MIPS_ARC_TOTAL_MODULE_SIZE	0x08
- 
--#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x8200
-+#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x9000
- #define GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR  0x100000
- 
- #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From fc080913f7a4fdc5163a2482828a407a931cd522 Mon Sep 17 00:00:00 2001
+From c0fa21c8898437747ce093884e6aba48d45ac329 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 120/225] trim arp packets with abnormal size
+Subject: [PATCH 078/198] 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..d1c69ed2b 100644
+index 54306e3b1..2083b5a4b 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,7 +19,7 @@ index 54306e3b1..d1c69ed2b 100644
        {
 +        if ((nb->tail - nb->data) > 50)
 +          {
-+            grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n",
++            grub_dprintf ("net", "arp packet with abnormal size (%d bytes).\n",
 +                         nb->tail - nb->data);
 +            nb->tail = nb->data + 50;
 +          }

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

@@ -1,7 +1,7 @@
-From 3f83f30c816bf0cfd314154ab34d31788c6c9ae7 Mon Sep 17 00:00:00 2001
+From 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 121/225] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 079/198] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 

0079-printf_unit_test-Disable-Wformat-truncation-on-GCC-7.patch

@@ -1,29 +0,0 @@
-From 32099228e6ccf209f64d509cd7e13413ea10778e Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 30 Aug 2017 16:59:25 +0200
-Subject: [PATCH 079/225] printf_unit_test: Disable Wformat-truncation on GCC
- >= 7
-
-We intentionally pass NULL as argument to format, hence disable the warning.
----
- tests/printf_unit_test.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/printf_unit_test.c b/tests/printf_unit_test.c
-index d7b12c6db..098c29fd9 100644
---- a/tests/printf_unit_test.c
-+++ b/tests/printf_unit_test.c
-@@ -23,6 +23,10 @@
- 
- #define MSG "printf test failed: %s, %s", real, expected
- 
-+#if defined(__GNUC__) && __GNUC__ >= 7
-+#pragma GCC diagnostic ignored "-Wformat-truncation="
-+#endif
-+
- static void
- printf_test (void)
- {
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 1ca2fc680297fc0ba1e9b24e83272b17e6df9b46 Mon Sep 17 00:00:00 2001
+From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 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 125/225] Add support for UEFI operating systems returned by
+Subject: [PATCH 080/198] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:

0080-Regenerate-checksum.h-with-newer-unifont.patch

@@ -1,277 +0,0 @@
-From 061258a05edd7077f3cb15f51bda2823f513d261 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Wed, 30 Aug 2017 17:12:04 +0200
-Subject: [PATCH 080/225] Regenerate checksum.h with newer unifont.
-
-Old link is broken. New unifont is
-http://ftp.de.debian.org/debian/pool/main/u/unifont/xfonts-unifont_9.0.06-2_all.deb
----
- grub-core/tests/checksums.h | 258 ++++++++++++++++++++++----------------------
- 1 file changed, 129 insertions(+), 129 deletions(-)
-
-diff --git a/grub-core/tests/checksums.h b/grub-core/tests/checksums.h
-index 921e57ff4..8273bd105 100644
---- a/grub-core/tests/checksums.h
-+++ b/grub-core/tests/checksums.h
-@@ -1,129 +1,129 @@
--  { "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 },
--  { "videotest", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x4c2cef83, 0x1b215a88, 0xe2378595, 0xb53a309e, 0x15f64d5e, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x758f388c, 0xd4442397, 0x33f5784b, 0x923e6350, 0xf97bb902, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xb9f6f52a, 0x4e24e8b7, 0x53beb8e1, 0xa46ca57c, 0x688a184d, }, 5 },
--  { "videotest", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x5bd98ce3, 0x15df7962, 0xc7d467e1, 0x89d29260, 0x662e2c16, }, 5 },
--  { "videotest", 640, 480, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi256 */, (grub_uint32_t []) { 0xf9847b65, 0xf9847b65, 0xf9847b65, 0xf9847b65, 0xf9847b65, }, 5 },
--  { "videotest", 800, 600, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi256 */, (grub_uint32_t []) { 0xc421716d, 0xc421716d, 0xc421716d, 0xc421716d, 0xc421716d, }, 5 },
--  { "videotest", 1024, 768, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi256 */, (grub_uint32_t []) { 0x5d46f2a8, 0x5d46f2a8, 0x5d46f2a8, 0x5d46f2a8, 0x5d46f2a8, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 640x480xrgba5550 */, (grub_uint32_t []) { 0x25690db2, 0x25690db2, 0x25690db2, 0x25690db2, 0x25690db2, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 800x600xrgba5550 */, (grub_uint32_t []) { 0x7333f220, 0x7333f220, 0x7333f220, 0x7333f220, 0x7333f220, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 1024x768xrgba5550 */, (grub_uint32_t []) { 0xac52d537, 0xac52d537, 0xac52d537, 0xac52d537, 0xac52d537, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 640x480xrgba5650 */, (grub_uint32_t []) { 0xd4cbcd66, 0xd4cbcd66, 0xd4cbcd66, 0xd4cbcd66, 0xd4cbcd66, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 800x600xrgba5650 */, (grub_uint32_t []) { 0x9d23f9d1, 0x9d23f9d1, 0x9d23f9d1, 0x9d23f9d1, 0x9d23f9d1, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 1024x768xrgba5650 */, (grub_uint32_t []) { 0x89acbf88, 0x89acbf88, 0x89acbf88, 0x89acbf88, 0x89acbf88, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 640x480xrgba8880 */, (grub_uint32_t []) { 0x335fadcb, 0x1f517b5c, 0x6b4200e5, 0x474cd672, 0x8364f797, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 800x600xrgba8880 */, (grub_uint32_t []) { 0xcf9985f8, 0x1d92c7fc, 0x6e637701, 0xbc683505, 0x898016fb, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 1024x768xrgba8880 */, (grub_uint32_t []) { 0xdb824190, 0x378d05dc, 0x670bff9, 0xea7ffbb5, 0x658bcbb3, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 640x480xbgra5550 */, (grub_uint32_t []) { 0x18ed532e, 0x18ed532e, 0x18ed532e, 0x18ed532e, 0x18ed532e, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 800x600xbgra5550 */, (grub_uint32_t []) { 0x2b35b09f, 0x2b35b09f, 0x2b35b09f, 0x2b35b09f, 0x2b35b09f, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 1024x768xbgra5550 */, (grub_uint32_t []) { 0xa24c4d98, 0xa24c4d98, 0xa24c4d98, 0xa24c4d98, 0xa24c4d98, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 640x480xbgra5650 */, (grub_uint32_t []) { 0xc07dde33, 0xc07dde33, 0xc07dde33, 0xc07dde33, 0xc07dde33, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 800x600xbgra5650 */, (grub_uint32_t []) { 0x7e6ed757, 0x7e6ed757, 0x7e6ed757, 0x7e6ed757, 0x7e6ed757, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 1024x768xbgra5650 */, (grub_uint32_t []) { 0x700255dd, 0x700255dd, 0x700255dd, 0x700255dd, 0x700255dd, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 640x480xbgra8880 */, (grub_uint32_t []) { 0x157232bd, 0x5e6bdacd, 0x8341e25d, 0xc8580a2d, 0x3cf9e58c, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 800x600xbgra8880 */, (grub_uint32_t []) { 0xbfafd7cd, 0x51650951, 0x67d61c04, 0x891cc298, 0xab036ae, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 1024x768xbgra8880 */, (grub_uint32_t []) { 0x760580c9, 0xdc6d8205, 0x2739f3a0, 0x8d51f16c, 0xd47d661b, }, 5 },
--  { "videotest", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 640x480xbgra8888 */, (grub_uint32_t []) { 0xada3b5f, 0x24cd61a6, 0x56f48ead, 0x78e3d454, 0xb28750bb, }, 5 },
--  { "videotest", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 800x600xbgra8888 */, (grub_uint32_t []) { 0x827694e2, 0x9d97c3dd, 0xbdb43a9c, 0xa2556da3, 0xfdf3c81e, }, 5 },
--  { "videotest", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 1024x768xbgra8888 */, (grub_uint32_t []) { 0x664534a5, 0xcd0979a0, 0x3531d85e, 0x9e7d955b, 0xc0aced53, }, 5 },
-+  { "cmdline_cat", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xc69be699, 0xc69be699, 0xe17fc97c, 0xe17fc97c, 0xc2512486, 0xc2512486, 0x20260761, 0x20260761, 0xe3485349, 0xe3485349, 0x6020b4d9, 0x6020b4d9, 0x1605db98, 0x1605db98, 0xdca51b58, 0xdca51b58, 0xf3d66441, 0xf3d66441, 0x18cb7ce2, 0x18cb7ce2, 0x23b616d9, 0x23b616d9, 0xa1bf5dbf, 0xa1bf5dbf, 0x5e4a8b3d, 0x5e4a8b3d, 0x9933b3d8, 0x9933b3d8, 0xce7be2de, 0xce7be2de, 0x62531729, 0x62531729, 0xc39d3788, 0xc39d3788, 0xf7aee2fe, 0xf7aee2fe, 0xc66f4903, 0xc66f4903, 0x536c922f, 0x536c922f, 0xcb231652, 0x4ae07b67, 0x146816d5, 0x146816d5, }, 45 },
-+  { "cmdline_cat", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x29d0cfb7, 0x29d0cfb7, 0x4d57ad88, 0x4d57ad88, 0xaf7591cb, 0xaf7591cb, 0xb88e3c0, 0xb88e3c0, 0x5d55a031, 0x5d55a031, 0x4363bcff, 0x4363bcff, 0xe1142833, 0xe1142833, 0x9578c80d, 0x9578c80d, 0xff1f5174, 0xff1f5174, 0x6828d47, 0x6828d47, 0x2a849ae3, 0x2a849ae3, 0x27a811d9, 0x27a811d9, 0x6c42e1cb, 0x6c42e1cb, 0x5bba61f5, 0x5bba61f5, 0xc02ab705, 0xc02ab705, 0xeb3e0e05, 0xeb3e0e05, 0x6f4ce3c, 0x6f4ce3c, 0x2075c50e, 0x2075c50e, 0x54ac7fba, 0x54ac7fba, 0x335d1c21, 0x335d1c21, 0xf923fbd1, 0x1b489d4d, 0x1253eb5e, 0x1253eb5e, }, 45 },
-+  { "cmdline_cat", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x6ff92a98, 0x6ff92a98, 0xbd8264b3, 0xbd8264b3, 0x5c50282c, 0x5c50282c, 0xd18d6a5a, 0xd18d6a5a, 0x99cea139, 0x99cea139, 0x2590c545, 0x2590c545, 0x55c86045, 0x55c86045, 0xad53ef1e, 0xad53ef1e, 0x5b44a23a, 0x5b44a23a, 0xa255f863, 0xa255f863, 0x85b0bdca, 0x85b0bdca, 0x4220ee1f, 0x4220ee1f, 0xeb991a9f, 0xeb991a9f, 0x86f366dd, 0x86f366dd, 0xfa176b7d, 0xfa176b7d, 0xd7384ca9, 0xd7384ca9, 0xceebf5c1, 0xceebf5c1, 0xae62b268, 0xae62b268, 0x6e89bbd6, 0x6e89bbd6, 0x3fe07c8e, 0x3fe07c8e, 0xee5358fe, 0x162d1a8a, 0x876f8d10, 0x876f8d10, }, 45 },
-+  { "cmdline_cat", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xb96afaea, 0xb96afaea, 0xaa16ab1e, 0xaa16ab1e, 0x51ff382, 0x51ff382, 0xec74f127, 0xec74f127, 0xde4bca99, 0xde4bca99, 0x8ef3e8a5, 0x8ef3e8a5, 0x2daeb0b4, 0x2daeb0b4, 0x7cf5e243, 0x7cf5e243, 0x11fd57c6, 0x11fd57c6, 0x140723af, 0x140723af, 0x2bd93833, 0x2bd93833, 0xd731f4ac, 0xd731f4ac, 0x5fcd7114, 0x5fcd7114, 0xd1fea24a, 0xd1fea24a, 0x4083d53a, 0x4083d53a, 0x2e372605, 0x2e372605, 0x8e6316a7, 0x8e6316a7, 0x283ef6cc, 0x283ef6cc, 0x20cee9de, 0x20cee9de, 0xad6fa187, 0xad6fa187, 0xd691f438, 0xf3257e63, 0x4786ba7, 0x4786ba7, }, 45 },
-+  { "cmdline_cat", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x48acf1bf, 0x48acf1bf, 0xb8777469, 0xb8777469, 0xad2fad44, 0xad2fad44, 0xa415ac59, 0xa415ac59, 0x5a7bfb26, 0x5a7bfb26, 0xccb6016, 0xccb6016, 0x77a80cb3, 0x77a80cb3, 0x2034c102, 0x2034c102, 0x444b4ccd, 0x444b4ccd, 0xe6c31bea, 0xe6c31bea, 0x8408036e, 0x8408036e, 0x9e7c556f, 0x9e7c556f, 0x445dc388, 0x445dc388, 0x94b3f850, 0x94b3f850, 0xf6f15341, 0xf6f15341, 0xcb939b5f, 0xcb939b5f, 0xbe88067d, 0xbe88067d, 0x1efc4734, 0x1efc4734, 0x7f5dfca8, 0x7f5dfca8, 0xb7b10eb9, 0xb7b10eb9, 0xb94cb441, 0x9571329, 0x8a26912b, 0x8a26912b, }, 45 },
-+  { "cmdline_cat", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xc508d04e, 0xc508d04e, 0x6dbccbfe, 0x6dbccbfe, 0xbf06ff60, 0xbf06ff60, 0xbc5ab06, 0xbc5ab06, 0x97eeab3c, 0x97eeab3c, 0x62663589, 0x62663589, 0xb03e21e2, 0xb03e21e2, 0xea196bb6, 0xea196bb6, 0x672c16c4, 0x672c16c4, 0xefbca2cd, 0xefbca2cd, 0x1af5b410, 0x1af5b410, 0xc7a80569, 0xc7a80569, 0x4926a16, 0x4926a16, 0xee29c99c, 0xee29c99c, 0xffb15985, 0xffb15985, 0x4f608e46, 0x4f608e46, 0x3e450fd2, 0x3e450fd2, 0xac45215f, 0xac45215f, 0x789b0ce7, 0x789b0ce7, 0x4cedfe22, 0x4cedfe22, 0xa005588c, 0x701da05c, 0x6f25cec1, 0x6f25cec1, }, 45 },
-+  { "cmdline_cat", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x29e7a7f, 0x29e7a7f, 0xbd221052, 0xbd221052, 0x3b18b64, 0x3b18b64, 0x7f1e8462, 0x7f1e8462, 0xf28d5124, 0xf28d5124, 0xc336f170, 0xc336f170, 0xfe3bf988, 0xfe3bf988, 0x7bf89e05, 0x7bf89e05, 0x7857a3f8, 0x7857a3f8, 0x272c1a36, 0x272c1a36, 0xe8adb445, 0xe8adb445, 0x70cfe280, 0x70cfe280, 0x4f2b6120, 0x4f2b6120, 0xbaf5caa5, 0xbaf5caa5, 0x4b6bcab2, 0x4b6bcab2, 0x2bef7b92, 0x2bef7b92, 0x17b381dc, 0x17b381dc, 0x884c9c35, 0x884c9c35, 0x2f9eb909, 0x2f9eb909, 0xa811b3af, 0xa811b3af, 0x4c39478f, 0x5a72c3ab, 0x8071678a, 0x8071678a, }, 45 },
-+  { "gfxterm_menu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd9f04953, 0xbf3fa5d0, 0xd9f04953, 0x9a068414, 0x59c36f00, 0x59c36f00, 0x620c0067, 0x620c0067, 0x620c0067, 0x1c8c6d01, 0x1c8c6d01, 0x1c8c6d01, 0xc3269013, 0xc3269013, 0xc3269013, 0x59c36f00, 0x9a068414, 0x9a068414, 0x59c36f00, }, 20 },
-+  { "gfxterm_menu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x9254157f, 0x367e92c7, 0x9254157f, 0xbc519000, 0xaa4593fe, 0xaa4593fe, 0xa8a596c8, 0xa8a596c8, 0xa8a596c8, 0xe509baf, 0xe509baf, 0xe509baf, 0x16f0dc06, 0x16f0dc06, 0x16f0dc06, 0xaa4593fe, 0xbc519000, 0xbc519000, 0xaa4593fe, }, 20 },
-+  { "gfxterm_menu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x354b1976, 0x8fc746ae, 0x354b1976, 0x685c74f2, 0xc9cbf769, 0xc9cbf769, 0x3ce35e1d, 0x3ce35e1d, 0x3ce35e1d, 0xc23b9fd1, 0xc23b9fd1, 0xc23b9fd1, 0x5b18528e, 0x5b18528e, 0x5b18528e, 0xc9cbf769, 0x685c74f2, 0x685c74f2, 0xc9cbf769, }, 20 },
-+  { "gfxterm_menu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x1c9ec014, 0xaf3ec923, 0x1c9ec014, 0x43f5296, 0x9813a416, 0x9813a416, 0x43fda3fa, 0x43fda3fa, 0x43fda3fa, 0xd22625c9, 0xd22625c9, 0xd22625c9, 0x76a62c0a, 0x76a62c0a, 0x76a62c0a, 0x9813a416, 0x43f5296, 0x43f5296, 0x9813a416, }, 20 },
-+  { "gfxterm_menu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xa704f7ea, 0xb7f2ec8b, 0xa704f7ea, 0xb279bf59, 0x5fcf013d, 0x5fcf013d, 0xf3582c48, 0xf3582c48, 0xf3582c48, 0x2148343e, 0x2148343e, 0x2148343e, 0x9c719024, 0x9c719024, 0x9c719024, 0x5fcf013d, 0xb279bf59, 0xb279bf59, 0x5fcf013d, }, 20 },
-+  { "gfxterm_menu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xf293ce36, 0xa6eb6ae8, 0xf293ce36, 0xcd87647e, 0xdd28f52b, 0xdd28f52b, 0xb3c7ef80, 0xb3c7ef80, 0xb3c7ef80, 0x92fb1664, 0x92fb1664, 0x92fb1664, 0xd15b5e2e, 0xd15b5e2e, 0xd15b5e2e, 0xdd28f52b, 0xcd87647e, 0xcd87647e, 0xdd28f52b, }, 20 },
-+  { "gfxterm_menu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x31e75bd7, 0x9a768c6a, 0x31e75bd7, 0xa8fc31a6, 0x43d1f34, 0x43d1f34, 0xa0717008, 0xa0717008, 0xa0717008, 0xdf7bd9a0, 0xdf7bd9a0, 0xdf7bd9a0, 0x8e5a9312, 0x8e5a9312, 0x8e5a9312, 0x43d1f34, 0xa8fc31a6, 0xa8fc31a6, 0x43d1f34, }, 20 },
-+  { "gfxmenu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x1ce7bd78, 0x682580f5, 0x1ce7bd78, 0x490ad6fe, 0x9a2e0d26, 0x64eb71ba, 0x64eb71ba, 0x64eb71ba, 0x3833877a, 0x3833877a, 0x3833877a, 0xcfc14f0a, 0xcfc14f0a, 0xcfc14f0a, 0x59c36f00, 0x490ad6fe, 0x490ad6fe, }, 18 },
-+  { "gfxmenu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x2b6ff87d, 0x63ce2ca2, 0x2b6ff87d, 0xf00f044e, 0xa9d58ccd, 0xe2c46577, 0xe2c46577, 0xe2c46577, 0xb79bcf7d, 0xb79bcf7d, 0xb79bcf7d, 0xbc30ed71, 0xbc30ed71, 0xbc30ed71, 0xaa4593fe, 0xf00f044e, 0xf00f044e, }, 18 },
-+  { "gfxmenu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xe61cadba, 0x9880b727, 0xe61cadba, 0xdf5f2fc0, 0x5411be8b, 0x4449774e, 0x4449774e, 0x4449774e, 0x3bf7d1da, 0x3bf7d1da, 0x3bf7d1da, 0xd2ddee01, 0xd2ddee01, 0xd2ddee01, 0xc9cbf769, 0xdf5f2fc0, 0xdf5f2fc0, }, 18 },
-+  { "gfxmenu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x1c3742c9, 0xbe54acf7, 0x9b4ce770, 0xbe54acf7, 0x3111489, 0x740d78cf, 0x314c4c59, 0x314c4c59, 0x314c4c59, 0xdae9a625, 0xdae9a625, 0xdae9a625, 0xcbf8af57, 0xcbf8af57, 0xcbf8af57, 0x1c3742c9, 0x3111489, 0x3111489, }, 18 },
-+  { "gfxmenu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0xee571de5, 0x568aaeff, 0xee571de5, 0xe328b7a7, 0xbcda144c, 0xf56e1b60, 0xf56e1b60, 0xf56e1b60, 0x9a27c771, 0x9a27c771, 0x9a27c771, 0xd6d05397, 0xd6d05397, 0xd6d05397, 0xcc5a7bed, 0xe328b7a7, 0xe328b7a7, }, 18 },
-+  { "gfxmenu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xef4a3312, 0x1db9877c, 0x7e1afeae, 0x1db9877c, 0x8fc0c430, 0x5d55a141, 0x96f335c6, 0x96f335c6, 0x96f335c6, 0x504171d8, 0x504171d8, 0x504171d8, 0x69f71c0, 0x69f71c0, 0x69f71c0, 0xef4a3312, 0x8fc0c430, 0x8fc0c430, }, 18 },
-+  { "gfxmenu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x54e48d80, 0x151819bd, 0xea8d4865, 0x151819bd, 0x11d75fd2, 0x6d6bb4bc, 0x650ccd09, 0x650ccd09, 0x650ccd09, 0xe4ff3bd8, 0xe4ff3bd8, 0xe4ff3bd8, 0xc5308b73, 0xc5308b73, 0xc5308b73, 0x54e48d80, 0x11d75fd2, 0x11d75fd2, }, 18 },
-+  { "gfxterm_ar", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd0b06c3d, 0xde50d1a5, 0xd0b06c3d, 0x9346a17a, 0x59c36f00, 0x59c36f00, 0xacff5d47, 0xacff5d47, 0xacff5d47, 0xd27f3021, 0xd27f3021, 0xd27f3021, 0xdd5cd33, 0xdd5cd33, 0xdd5cd33, 0x59c36f00, 0x9346a17a, 0x9346a17a, 0x59c36f00, }, 20 },
-+  { "gfxterm_ar", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xf32d50c1, 0x730a7ed, 0xf32d50c1, 0xdd28d5be, 0xaa4593fe, 0xaa4593fe, 0xba8a2d4c, 0xba8a2d4c, 0xba8a2d4c, 0x1c7f202b, 0x1c7f202b, 0x1c7f202b, 0x4df6782, 0x4df6782, 0x4df6782, 0xaa4593fe, 0xdd28d5be, 0xdd28d5be, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ar", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x711a4ac1, 0x6396f14c, 0x711a4ac1, 0x2c0d2745, 0xc9cbf769, 0xc9cbf769, 0x6b6ccbb0, 0x6b6ccbb0, 0x6b6ccbb0, 0x95b40a7c, 0x95b40a7c, 0x95b40a7c, 0xc97c723, 0xc97c723, 0xc97c723, 0xc9cbf769, 0x2c0d2745, 0x2c0d2745, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ar", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x29baad6a, 0x348b1f2b, 0x29baad6a, 0x311b3fe8, 0x9813a416, 0x9813a416, 0xe8e982cc, 0xe8e982cc, 0xe8e982cc, 0x793204ff, 0x793204ff, 0x793204ff, 0xddb20d3c, 0xddb20d3c, 0xddb20d3c, 0x9813a416, 0x311b3fe8, 0x311b3fe8, 0x9813a416, }, 20 },
-+  { "gfxterm_ar", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xf834b3bb, 0x3951bd1a, 0xf834b3bb, 0xed49fb08, 0x5fcf013d, 0x5fcf013d, 0x5aefa2a7, 0x5aefa2a7, 0x5aefa2a7, 0x88ffbad1, 0x88ffbad1, 0x88ffbad1, 0x35c61ecb, 0x35c61ecb, 0x35c61ecb, 0x5fcf013d, 0xed49fb08, 0xed49fb08, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ar", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x7e9a7a47, 0xb1651b5a, 0x7e9a7a47, 0x418ed00f, 0xdd28f52b, 0xdd28f52b, 0x83f9db69, 0x83f9db69, 0x83f9db69, 0xa2c5228d, 0xa2c5228d, 0xa2c5228d, 0xe1656ac7, 0xe1656ac7, 0xe1656ac7, 0xdd28f52b, 0x418ed00f, 0x418ed00f, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ar", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xc6a0340, 0x7dd5855c, 0xc6a0340, 0x95716931, 0x43d1f34, 0x43d1f34, 0x5f1c24c0, 0x5f1c24c0, 0x5f1c24c0, 0x20168d68, 0x20168d68, 0x20168d68, 0x7137c7da, 0x7137c7da, 0x7137c7da, 0x43d1f34, 0x95716931, 0x95716931, 0x43d1f34, }, 20 },
-+  { "gfxterm_cyr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xd3798aaa, 0xab48784c, 0xd3798aaa, 0x908f47ed, 0x59c36f00, 0x59c36f00, 0x1688ec7c, 0x1688ec7c, 0x1688ec7c, 0x6808811a, 0x6808811a, 0x6808811a, 0xb7a27c08, 0xb7a27c08, 0xb7a27c08, 0x59c36f00, 0x908f47ed, 0x908f47ed, 0x59c36f00, }, 20 },
-+  { "gfxterm_cyr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xc30d9d2a, 0x60b9ed26, 0xc30d9d2a, 0xed081855, 0xaa4593fe, 0xaa4593fe, 0x3eba2192, 0x3eba2192, 0x3eba2192, 0x984f2cf5, 0x984f2cf5, 0x984f2cf5, 0x80ef6b5c, 0x80ef6b5c, 0x80ef6b5c, 0xaa4593fe, 0xed081855, 0xed081855, 0xaa4593fe, }, 20 },
-+  { "gfxterm_cyr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xe469e6af, 0x46ac2012, 0xe469e6af, 0xb97e8b2b, 0xc9cbf769, 0xc9cbf769, 0x60f0d993, 0x60f0d993, 0x60f0d993, 0x9e28185f, 0x9e28185f, 0x9e28185f, 0x70bd500, 0x70bd500, 0x70bd500, 0xc9cbf769, 0xb97e8b2b, 0xb97e8b2b, 0xc9cbf769, }, 20 },
-+  { "gfxterm_cyr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x8538d2ef, 0xab143284, 0x8538d2ef, 0x9d99406d, 0x9813a416, 0x9813a416, 0x7e8326ec, 0x7e8326ec, 0x7e8326ec, 0xef58a0df, 0xef58a0df, 0xef58a0df, 0x4bd8a91c, 0x4bd8a91c, 0x4bd8a91c, 0x9813a416, 0x9d99406d, 0x9d99406d, 0x9813a416, }, 20 },
-+  { "gfxterm_cyr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x8115198c, 0x1abdaee1, 0x8115198c, 0x9468513f, 0x5fcf013d, 0x5fcf013d, 0xa5e86484, 0xa5e86484, 0xa5e86484, 0x77f87cf2, 0x77f87cf2, 0x77f87cf2, 0xcac1d8e8, 0xcac1d8e8, 0xcac1d8e8, 0x5fcf013d, 0x9468513f, 0x9468513f, 0x5fcf013d, }, 20 },
-+  { "gfxterm_cyr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xea03b805, 0x74148290, 0xea03b805, 0xd517124d, 0xdd28f52b, 0xdd28f52b, 0x8f6eee40, 0x8f6eee40, 0x8f6eee40, 0xae5217a4, 0xae5217a4, 0xae5217a4, 0xedf25fee, 0xedf25fee, 0xedf25fee, 0xdd28f52b, 0xd517124d, 0xd517124d, 0xdd28f52b, }, 20 },
-+  { "gfxterm_cyr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xa044490f, 0xe23458db, 0xa044490f, 0x395f237e, 0x43d1f34, 0x43d1f34, 0xe1ca82c2, 0xe1ca82c2, 0xe1ca82c2, 0x9ec02b6a, 0x9ec02b6a, 0x9ec02b6a, 0xcfe161d8, 0xcfe161d8, 0xcfe161d8, 0x43d1f34, 0x395f237e, 0x395f237e, 0x43d1f34, }, 20 },
-+  { "gfxterm_heb", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xf3259b30, 0xf1f01411, 0xf3259b30, 0xb0d35677, 0x59c36f00, 0x59c36f00, 0x97895f8e, 0x97895f8e, 0x97895f8e, 0xe90932e8, 0xe90932e8, 0xe90932e8, 0x36a3cffa, 0x36a3cffa, 0x36a3cffa, 0x59c36f00, 0xb0d35677, 0xb0d35677, 0x59c36f00, }, 20 },
-+  { "gfxterm_heb", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x53a43759, 0xe0f26bfa, 0x53a43759, 0x7da1b226, 0xaa4593fe, 0xaa4593fe, 0xbf482a4e, 0xbf482a4e, 0xbf482a4e, 0x19bd2729, 0x19bd2729, 0x19bd2729, 0x11d6080, 0x11d6080, 0x11d6080, 0xaa4593fe, 0x7da1b226, 0x7da1b226, 0xaa4593fe, }, 20 },
-+  { "gfxterm_heb", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xd7ff8d53, 0x665b2728, 0xd7ff8d53, 0x8ae8e0d7, 0xc9cbf769, 0xc9cbf769, 0x5a693e73, 0x5a693e73, 0x5a693e73, 0xa4b1ffbf, 0xa4b1ffbf, 0xa4b1ffbf, 0x3d9232e0, 0x3d9232e0, 0x3d9232e0, 0xc9cbf769, 0x8ae8e0d7, 0x8ae8e0d7, 0xc9cbf769, }, 20 },
-+  { "gfxterm_heb", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x99fddcbe, 0x6d5c8895, 0x99fddcbe, 0x815c4e3c, 0x9813a416, 0x9813a416, 0x9bcf9821, 0x9bcf9821, 0x9bcf9821, 0xa141e12, 0xa141e12, 0xa141e12, 0xae9417d1, 0xae9417d1, 0xae9417d1, 0x9813a416, 0x815c4e3c, 0x815c4e3c, 0x9813a416, }, 20 },
-+  { "gfxterm_heb", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x5797846, 0x25a6ad40, 0x5797846, 0x100430f5, 0x5fcf013d, 0x5fcf013d, 0xddc86daf, 0xddc86daf, 0xddc86daf, 0xfd875d9, 0xfd875d9, 0xfd875d9, 0xb2e1d1c3, 0xb2e1d1c3, 0xb2e1d1c3, 0x5fcf013d, 0x100430f5, 0x100430f5, 0x5fcf013d, }, 20 },
-+  { "gfxterm_heb", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x30653ae8, 0x7fcd187, 0x30653ae8, 0xf7190a0, 0xdd28f52b, 0xdd28f52b, 0x24c3d325, 0x24c3d325, 0x24c3d325, 0x5ff2ac1, 0x5ff2ac1, 0x5ff2ac1, 0x465f628b, 0x465f628b, 0x465f628b, 0xdd28f52b, 0xf7190a0, 0xf7190a0, 0xdd28f52b, }, 20 },
-+  { "gfxterm_heb", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x3bd91638, 0x1d74dd4a, 0x3bd91638, 0xa2c27c49, 0x43d1f34, 0x43d1f34, 0x53d1ad3d, 0x53d1ad3d, 0x53d1ad3d, 0x2cdb0495, 0x2cdb0495, 0x2cdb0495, 0x7dfa4e27, 0x7dfa4e27, 0x7dfa4e27, 0x43d1f34, 0xa2c27c49, 0xa2c27c49, 0x43d1f34, }, 20 },
-+  { "gfxterm_gre", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xbe2c351a, 0x2692720, 0xbe2c351a, 0xfddaf85d, 0x59c36f00, 0x59c36f00, 0x1b2e2301, 0x1b2e2301, 0x1b2e2301, 0x65ae4e67, 0x65ae4e67, 0x65ae4e67, 0xba04b375, 0xba04b375, 0xba04b375, 0x59c36f00, 0xfddaf85d, 0xfddaf85d, 0x59c36f00, }, 20 },
-+  { "gfxterm_gre", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x1eca82e1, 0xe8fa59cc, 0x1eca82e1, 0x30cf079e, 0xaa4593fe, 0xaa4593fe, 0xaf27ddc5, 0xaf27ddc5, 0xaf27ddc5, 0x9d2d0a2, 0x9d2d0a2, 0x9d2d0a2, 0x1172970b, 0x1172970b, 0x1172970b, 0xaa4593fe, 0x30cf079e, 0x30cf079e, 0xaa4593fe, }, 20 },
-+  { "gfxterm_gre", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xa9ccd435, 0x1ac646eb, 0xa9ccd435, 0xf4dbb9b1, 0xc9cbf769, 0xc9cbf769, 0x86d69aa0, 0x86d69aa0, 0x86d69aa0, 0x780e5b6c, 0x780e5b6c, 0x780e5b6c, 0xe12d9633, 0xe12d9633, 0xe12d9633, 0xc9cbf769, 0xf4dbb9b1, 0xf4dbb9b1, 0xc9cbf769, }, 20 },
-+  { "gfxterm_gre", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xf96d568, 0x7ad05c1b, 0xf96d568, 0x173747ea, 0x9813a416, 0x9813a416, 0xacf9792a, 0xacf9792a, 0xacf9792a, 0x3d22ff19, 0x3d22ff19, 0x3d22ff19, 0x99a2f6da, 0x99a2f6da, 0x99a2f6da, 0x9813a416, 0x173747ea, 0x173747ea, 0x9813a416, }, 20 },
-+  { "gfxterm_gre", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xa0dc6b9c, 0xc2761148, 0xa0dc6b9c, 0xb5a1232f, 0x5fcf013d, 0x5fcf013d, 0x4e05748b, 0x4e05748b, 0x4e05748b, 0x9c156cfd, 0x9c156cfd, 0x9c156cfd, 0x212cc8e7, 0x212cc8e7, 0x212cc8e7, 0x5fcf013d, 0xb5a1232f, 0xb5a1232f, 0x5fcf013d, }, 20 },
-+  { "gfxterm_gre", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xcd722f7d, 0xe4df8d6b, 0xcd722f7d, 0xf2668535, 0xdd28f52b, 0xdd28f52b, 0xbdbb8019, 0xbdbb8019, 0xbdbb8019, 0x9c8779fd, 0x9c8779fd, 0x9c8779fd, 0xdf2731b7, 0xdf2731b7, 0xdf2731b7, 0xdd28f52b, 0xf2668535, 0xf2668535, 0xdd28f52b, }, 20 },
-+  { "gfxterm_gre", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xa6c99d2f, 0x1de04317, 0xa6c99d2f, 0x3fd2f75e, 0x43d1f34, 0x43d1f34, 0x3f85b7d3, 0x3f85b7d3, 0x3f85b7d3, 0x408f1e7b, 0x408f1e7b, 0x408f1e7b, 0x11ae54c9, 0x11ae54c9, 0x11ae54c9, 0x43d1f34, 0x3fd2f75e, 0x3fd2f75e, 0x43d1f34, }, 20 },
-+  { "gfxterm_ru", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x1e35b709, 0x2683bf92, 0x1e35b709, 0x5dc37a4e, 0x59c36f00, 0x59c36f00, 0xd697967f, 0xd697967f, 0xd697967f, 0xa817fb19, 0xa817fb19, 0xa817fb19, 0x77bd060b, 0x77bd060b, 0x77bd060b, 0x59c36f00, 0x5dc37a4e, 0x5dc37a4e, 0x59c36f00, }, 20 },
-+  { "gfxterm_ru", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x53ff7735, 0x8cbf197c, 0x53ff7735, 0x7dfaf24a, 0xaa4593fe, 0xaa4593fe, 0x389a922, 0x389a922, 0x389a922, 0xa57ca445, 0xa57ca445, 0xa57ca445, 0xbddce3ec, 0xbddce3ec, 0xbddce3ec, 0xaa4593fe, 0x7dfaf24a, 0x7dfaf24a, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ru", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x5217c47d, 0x7c8ae63e, 0x5217c47d, 0xf00a9f9, 0xc9cbf769, 0xc9cbf769, 0x3995409, 0x3995409, 0x3995409, 0xfd4195c5, 0xfd4195c5, 0xfd4195c5, 0x6462589a, 0x6462589a, 0x6462589a, 0xc9cbf769, 0xf00a9f9, 0xf00a9f9, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ru", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x45b67706, 0x375fb5db, 0x45b67706, 0x5d17e584, 0x9813a416, 0x9813a416, 0x8195719b, 0x8195719b, 0x8195719b, 0x104ef7a8, 0x104ef7a8, 0x104ef7a8, 0xb4cefe6b, 0xb4cefe6b, 0xb4cefe6b, 0x9813a416, 0x5d17e584, 0x5d17e584, 0x9813a416, }, 20 },
-+  { "gfxterm_ru", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xfc209a25, 0xd5c20779, 0xfc209a25, 0xe95dd296, 0x5fcf013d, 0x5fcf013d, 0xe5699efe, 0xe5699efe, 0xe5699efe, 0x37798688, 0x37798688, 0x37798688, 0x8a402292, 0x8a402292, 0x8a402292, 0x5fcf013d, 0xe95dd296, 0xe95dd296, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ru", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x77f956f0, 0xfb0cc079, 0x77f956f0, 0x48edfcb8, 0xdd28f52b, 0xdd28f52b, 0xd51b1dc9, 0xd51b1dc9, 0xd51b1dc9, 0xf427e42d, 0xf427e42d, 0xf427e42d, 0xb787ac67, 0xb787ac67, 0xb787ac67, 0xdd28f52b, 0x48edfcb8, 0x48edfcb8, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ru", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x1d9ac82a, 0xa254aa53, 0x1d9ac82a, 0x8481a25b, 0x43d1f34, 0x43d1f34, 0xc304df68, 0xc304df68, 0xc304df68, 0xbc0e76c0, 0xbc0e76c0, 0xbc0e76c0, 0xed2f3c72, 0xed2f3c72, 0xed2f3c72, 0x43d1f34, 0x8481a25b, 0x8481a25b, 0x43d1f34, }, 20 },
-+  { "gfxterm_fr", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xa6239a89, 0x8dc4bfbb, 0xa6239a89, 0xe5d557ce, 0x59c36f00, 0x59c36f00, 0x244cf807, 0x244cf807, 0x244cf807, 0x5acc9561, 0x5acc9561, 0x5acc9561, 0x85666873, 0x85666873, 0x85666873, 0x59c36f00, 0xe5d557ce, 0xe5d557ce, 0x59c36f00, }, 20 },
-+  { "gfxterm_fr", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x742cede9, 0x83bb7a50, 0x742cede9, 0x5a296896, 0xaa4593fe, 0xaa4593fe, 0xd83f8aeb, 0xd83f8aeb, 0xd83f8aeb, 0x7eca878c, 0x7eca878c, 0x7eca878c, 0x666ac025, 0x666ac025, 0x666ac025, 0xaa4593fe, 0x5a296896, 0x5a296896, 0xaa4593fe, }, 20 },
-+  { "gfxterm_fr", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xe20a98b0, 0x7e8cedef, 0xe20a98b0, 0xbf1df534, 0xc9cbf769, 0xc9cbf769, 0x2748b88c, 0x2748b88c, 0x2748b88c, 0xd9907940, 0xd9907940, 0xd9907940, 0x40b3b41f, 0x40b3b41f, 0x40b3b41f, 0xc9cbf769, 0xbf1df534, 0xbf1df534, 0xc9cbf769, }, 20 },
-+  { "gfxterm_fr", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x8f911ca4, 0xcbf1d895, 0x8f911ca4, 0x97308e26, 0x9813a416, 0x9813a416, 0x5b359bf4, 0x5b359bf4, 0x5b359bf4, 0xcaee1dc7, 0xcaee1dc7, 0xcaee1dc7, 0x6e6e1404, 0x6e6e1404, 0x6e6e1404, 0x9813a416, 0x97308e26, 0x97308e26, 0x9813a416, }, 20 },
-+  { "gfxterm_fr", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x1bf82c82, 0xc7b39627, 0x1bf82c82, 0xe856431, 0x5fcf013d, 0x5fcf013d, 0xa9dbae99, 0xa9dbae99, 0xa9dbae99, 0x7bcbb6ef, 0x7bcbb6ef, 0x7bcbb6ef, 0xc6f212f5, 0xc6f212f5, 0xc6f212f5, 0x5fcf013d, 0xe856431, 0xe856431, 0x5fcf013d, }, 20 },
-+  { "gfxterm_fr", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xfae19a5c, 0xd1e8fabb, 0xfae19a5c, 0xc5f53014, 0xdd28f52b, 0xdd28f52b, 0xfa2c5565, 0xfa2c5565, 0xfa2c5565, 0xdb10ac81, 0xdb10ac81, 0xdb10ac81, 0x98b0e4cb, 0x98b0e4cb, 0x98b0e4cb, 0xdd28f52b, 0xc5f53014, 0xc5f53014, 0xdd28f52b, }, 20 },
-+  { "gfxterm_fr", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x9a18f7bc, 0x5fcecc43, 0x9a18f7bc, 0x3039dcd, 0x43d1f34, 0x43d1f34, 0x287a2b96, 0x287a2b96, 0x287a2b96, 0x5770823e, 0x5770823e, 0x5770823e, 0x651c88c, 0x651c88c, 0x651c88c, 0x43d1f34, 0x3039dcd, 0x3039dcd, 0x43d1f34, }, 20 },
-+  { "gfxterm_quot", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x65112dfc, 0x3dec17f, 0x65112dfc, 0x26e7e0bb, 0x59c36f00, 0x59c36f00, 0x620c0067, 0x620c0067, 0x620c0067, 0x1c8c6d01, 0x1c8c6d01, 0x1c8c6d01, 0xc3269013, 0xc3269013, 0xc3269013, 0x59c36f00, 0x26e7e0bb, 0x26e7e0bb, 0x59c36f00, }, 20 },
-+  { "gfxterm_quot", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x2b3430fb, 0x8f1eb743, 0x2b3430fb, 0x531b584, 0xaa4593fe, 0xaa4593fe, 0xa8a596c8, 0xa8a596c8, 0xa8a596c8, 0xe509baf, 0xe509baf, 0xe509baf, 0x16f0dc06, 0x16f0dc06, 0x16f0dc06, 0xaa4593fe, 0x531b584, 0x531b584, 0xaa4593fe, }, 20 },
-+  { "gfxterm_quot", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xb523e920, 0xfafb6f8, 0xb523e920, 0xe83484a4, 0xc9cbf769, 0xc9cbf769, 0x3ce35e1d, 0x3ce35e1d, 0x3ce35e1d, 0xc23b9fd1, 0xc23b9fd1, 0xc23b9fd1, 0x5b18528e, 0x5b18528e, 0x5b18528e, 0xc9cbf769, 0xe83484a4, 0xe83484a4, 0xc9cbf769, }, 20 },
-+  { "gfxterm_quot", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xa9bf7336, 0x1a1f7a01, 0xa9bf7336, 0xb11ee1b4, 0x9813a416, 0x9813a416, 0x43fda3fa, 0x43fda3fa, 0x43fda3fa, 0xd22625c9, 0xd22625c9, 0xd22625c9, 0x76a62c0a, 0x76a62c0a, 0x76a62c0a, 0x9813a416, 0xb11ee1b4, 0xb11ee1b4, 0x9813a416, }, 20 },
-+  { "gfxterm_quot", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xe5271912, 0xf5d10273, 0xe5271912, 0xf05a51a1, 0x5fcf013d, 0x5fcf013d, 0xf3582c48, 0xf3582c48, 0xf3582c48, 0x2148343e, 0x2148343e, 0x2148343e, 0x9c719024, 0x9c719024, 0x9c719024, 0x5fcf013d, 0xf05a51a1, 0xf05a51a1, 0x5fcf013d, }, 20 },
-+  { "gfxterm_quot", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x66a34f49, 0x32dbeb97, 0x66a34f49, 0x59b7e501, 0xdd28f52b, 0xdd28f52b, 0xb3c7ef80, 0xb3c7ef80, 0xb3c7ef80, 0x92fb1664, 0x92fb1664, 0x92fb1664, 0xd15b5e2e, 0xd15b5e2e, 0xd15b5e2e, 0xdd28f52b, 0x59b7e501, 0x59b7e501, 0xdd28f52b, }, 20 },
-+  { "gfxterm_quot", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x7c2f19da, 0xd7bece67, 0x7c2f19da, 0xe53473ab, 0x43d1f34, 0x43d1f34, 0xa0717008, 0xa0717008, 0xa0717008, 0xdf7bd9a0, 0xdf7bd9a0, 0xdf7bd9a0, 0x8e5a9312, 0x8e5a9312, 0x8e5a9312, 0x43d1f34, 0xe53473ab, 0xe53473ab, 0x43d1f34, }, 20 },
-+  { "gfxterm_piglatin", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x37943894, 0x78248c70, 0x37943894, 0x7462f5d3, 0x59c36f00, 0x59c36f00, 0xf4be229a, 0xf4be229a, 0xf4be229a, 0x8a3e4ffc, 0x8a3e4ffc, 0x8a3e4ffc, 0x5594b2ee, 0x5594b2ee, 0x5594b2ee, 0x59c36f00, 0x7462f5d3, 0x7462f5d3, 0x59c36f00, }, 20 },
-+  { "gfxterm_piglatin", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xd5158e6c, 0xdc71ba0f, 0xd5158e6c, 0xfb100b13, 0xaa4593fe, 0xaa4593fe, 0xd3ed72a3, 0xd3ed72a3, 0xd3ed72a3, 0x75187fc4, 0x75187fc4, 0x75187fc4, 0x6db8386d, 0x6db8386d, 0x6db8386d, 0xaa4593fe, 0xfb100b13, 0xfb100b13, 0xaa4593fe, }, 20 },
-+  { "gfxterm_piglatin", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x6277a9e6, 0xa3265ffb, 0x6277a9e6, 0x3f60c462, 0xc9cbf769, 0xc9cbf769, 0x2dcf8a8d, 0x2dcf8a8d, 0x2dcf8a8d, 0xd3174b41, 0xd3174b41, 0xd3174b41, 0x4a34861e, 0x4a34861e, 0x4a34861e, 0xc9cbf769, 0x3f60c462, 0x3f60c462, 0xc9cbf769, }, 20 },
-+  { "gfxterm_piglatin", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0x81115dc4, 0xddf3f768, 0x81115dc4, 0x99b0cf46, 0x9813a416, 0x9813a416, 0x9b9d96df, 0x9b9d96df, 0x9b9d96df, 0xa4610ec, 0xa4610ec, 0xa4610ec, 0xaec6192f, 0xaec6192f, 0xaec6192f, 0x9813a416, 0x99b0cf46, 0x99b0cf46, 0x9813a416, }, 20 },
-+  { "gfxterm_piglatin", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x5e96a904, 0x27864d3d, 0x5e96a904, 0x4bebe1b7, 0x5fcf013d, 0x5fcf013d, 0x18cae7f4, 0x18cae7f4, 0x18cae7f4, 0xcadaff82, 0xcadaff82, 0xcadaff82, 0x77e35b98, 0x77e35b98, 0x77e35b98, 0x5fcf013d, 0x4bebe1b7, 0x4bebe1b7, 0x5fcf013d, }, 20 },
-+  { "gfxterm_piglatin", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xd00b19f8, 0xba73a9c6, 0xd00b19f8, 0xef1fb3b0, 0xdd28f52b, 0xdd28f52b, 0xb660046d, 0xb660046d, 0xb660046d, 0x975cfd89, 0x975cfd89, 0x975cfd89, 0xd4fcb5c3, 0xd4fcb5c3, 0xd4fcb5c3, 0xdd28f52b, 0xef1fb3b0, 0xef1fb3b0, 0xdd28f52b, }, 20 },
-+  { "gfxterm_piglatin", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x8b4b98cd, 0x78ddc6e4, 0x8b4b98cd, 0x1250f2bc, 0x43d1f34, 0x43d1f34, 0x4889d3fd, 0x4889d3fd, 0x4889d3fd, 0x37837a55, 0x37837a55, 0x37837a55, 0x66a230e7, 0x66a230e7, 0x66a230e7, 0x43d1f34, 0x1250f2bc, 0x1250f2bc, 0x43d1f34, }, 20 },
-+  { "gfxterm_ch", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0xfecb570e, 0xccb97a7a, 0xfecb570e, 0xbd3d9a49, 0x59c36f00, 0x59c36f00, 0x40281258, 0x40281258, 0x40281258, 0x3ea87f3e, 0x3ea87f3e, 0x3ea87f3e, 0xe102822c, 0xe102822c, 0xe102822c, 0x59c36f00, 0xbd3d9a49, 0xbd3d9a49, 0x59c36f00, }, 20 },
-+  { "gfxterm_ch", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x897d1fac, 0xaa982529, 0x897d1fac, 0xa7789ad3, 0xaa4593fe, 0xaa4593fe, 0xa482510, 0xa482510, 0xa482510, 0xacbd2877, 0xacbd2877, 0xacbd2877, 0xb41d6fde, 0xb41d6fde, 0xb41d6fde, 0xaa4593fe, 0xa7789ad3, 0xa7789ad3, 0xaa4593fe, }, 20 },
-+  { "gfxterm_ch", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xd02a5297, 0xe627ab58, 0xd02a5297, 0x8d3d3f13, 0xc9cbf769, 0xc9cbf769, 0xbf0a8b7f, 0xbf0a8b7f, 0xbf0a8b7f, 0x41d24ab3, 0x41d24ab3, 0x41d24ab3, 0xd8f187ec, 0xd8f187ec, 0xd8f187ec, 0xc9cbf769, 0x8d3d3f13, 0x8d3d3f13, 0xc9cbf769, }, 20 },
-+  { "gfxterm_ch", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xa653dcda, 0x3392e976, 0xa653dcda, 0xbef24e58, 0x9813a416, 0x9813a416, 0x4f2bc106, 0x4f2bc106, 0x4f2bc106, 0xdef04735, 0xdef04735, 0xdef04735, 0x7a704ef6, 0x7a704ef6, 0x7a704ef6, 0x9813a416, 0xbef24e58, 0xbef24e58, 0x9813a416, }, 20 },
-+  { "gfxterm_ch", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xe2d7b585, 0x35241f36, 0xe2d7b585, 0xf7aafd36, 0x5fcf013d, 0x5fcf013d, 0xf2bd04db, 0xf2bd04db, 0xf2bd04db, 0x20ad1cad, 0x20ad1cad, 0x20ad1cad, 0x9d94b8b7, 0x9d94b8b7, 0x9d94b8b7, 0x5fcf013d, 0xf7aafd36, 0xf7aafd36, 0x5fcf013d, }, 20 },
-+  { "gfxterm_ch", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x72ff749c, 0xeda8c283, 0x72ff749c, 0x4debded4, 0xdd28f52b, 0xdd28f52b, 0xb8c9cc22, 0xb8c9cc22, 0xb8c9cc22, 0x99f535c6, 0x99f535c6, 0x99f535c6, 0xda557d8c, 0xda557d8c, 0xda557d8c, 0xdd28f52b, 0x4debded4, 0x4debded4, 0xdd28f52b, }, 20 },
-+  { "gfxterm_ch", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0xb7cac764, 0xeb4bf417, 0xb7cac764, 0x2ed1ad15, 0x43d1f34, 0x43d1f34, 0xce718801, 0xce718801, 0xce718801, 0xb17b21a9, 0xb17b21a9, 0xb17b21a9, 0xe05a6b1b, 0xe05a6b1b, 0xe05a6b1b, 0x43d1f34, 0x2ed1ad15, 0x2ed1ad15, 0x43d1f34, }, 20 },
-+  { "gfxterm_red", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x930e8e13, 0xf5c16290, 0x930e8e13, 0x27f5f1c0, 0x59c36f00, 0x59c36f00, 0xbad4e11, 0xbad4e11, 0xbad4e11, 0x752d2377, 0x752d2377, 0x752d2377, 0xaa87de65, 0xaa87de65, 0xaa87de65, 0x59c36f00, 0x27f5f1c0, 0x27f5f1c0, 0x59c36f00, }, 20 },
-+  { "gfxterm_red", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xff9301f2, 0x5bb9864a, 0xff9301f2, 0x31c145de, 0xaa4593fe, 0xaa4593fe, 0x23bf2c32, 0x23bf2c32, 0x23bf2c32, 0x854a2155, 0x854a2155, 0x854a2155, 0x9dea66fc, 0x9dea66fc, 0x9dea66fc, 0xaa4593fe, 0x31c145de, 0x31c145de, 0xaa4593fe, }, 20 },
-+  { "gfxterm_red", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xfc5938ef, 0x46d56737, 0xfc5938ef, 0x23cf2668, 0xc9cbf769, 0xc9cbf769, 0xa8c549aa, 0xa8c549aa, 0xa8c549aa, 0x561d8866, 0x561d8866, 0x561d8866, 0xcf3e4539, 0xcf3e4539, 0xcf3e4539, 0xc9cbf769, 0x23cf2668, 0x23cf2668, 0xc9cbf769, }, 20 },
-+  { "gfxterm_red", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xe7160822, 0x54b60115, 0xe7160822, 0x168efa6f, 0x9813a416, 0x9813a416, 0xb774a5aa, 0xb774a5aa, 0xb774a5aa, 0x26af2399, 0x26af2399, 0x26af2399, 0x822f2a5a, 0x822f2a5a, 0x822f2a5a, 0x9813a416, 0x168efa6f, 0x168efa6f, 0x9813a416, }, 20 },
-+  { "gfxterm_red", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0xf655f9b2, 0xe6a3e2d3, 0xf655f9b2, 0xd1d7405f, 0x5fcf013d, 0x5fcf013d, 0x2accaa08, 0x2accaa08, 0x2accaa08, 0xf8dcb27e, 0xf8dcb27e, 0xf8dcb27e, 0x45e51664, 0x45e51664, 0x45e51664, 0x5fcf013d, 0xd1d7405f, 0xd1d7405f, 0x5fcf013d, }, 20 },
-+  { "gfxterm_red", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x2d85ebdc, 0x79fd4f02, 0x2d85ebdc, 0xc48ae2b6, 0xdd28f52b, 0xdd28f52b, 0x76b28a95, 0x76b28a95, 0x76b28a95, 0x578e7371, 0x578e7371, 0x578e7371, 0x142e3b3b, 0x142e3b3b, 0x142e3b3b, 0xdd28f52b, 0xc48ae2b6, 0xc48ae2b6, 0xdd28f52b, }, 20 },
-+  { "gfxterm_red", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x29c00f98, 0x8251d825, 0x29c00f98, 0x35a750d1, 0x43d1f34, 0x43d1f34, 0x48b70bc8, 0x48b70bc8, 0x48b70bc8, 0x37bda260, 0x37bda260, 0x37bda260, 0x669ce8d2, 0x669ce8d2, 0x669ce8d2, 0x43d1f34, 0x35a750d1, 0x35a750d1, 0x43d1f34, }, 20 },
-+  { "gfxterm_high", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x4afab717, 0x2c355b94, 0x4afab717, 0x1166d9d0, 0x59c36f00, 0x59c36f00, 0x620c0067, 0x620c0067, 0x620c0067, 0x1c8c6d01, 0x1c8c6d01, 0x1c8c6d01, 0xc3269013, 0xc3269013, 0xc3269013, 0x59c36f00, 0x1166d9d0, 0x1166d9d0, 0x59c36f00, }, 20 },
-+  { "gfxterm_high", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xe3daadd4, 0x47f02a6c, 0xe3daadd4, 0x5ea9fb21, 0xaa4593fe, 0xaa4593fe, 0xa8a596c8, 0xa8a596c8, 0xa8a596c8, 0xe509baf, 0xe509baf, 0xe509baf, 0x16f0dc06, 0x16f0dc06, 0x16f0dc06, 0xaa4593fe, 0x5ea9fb21, 0x5ea9fb21, 0xaa4593fe, }, 20 },
-+  { "gfxterm_high", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0xf140d1df, 0x4bcc8e07, 0xf140d1df, 0x7c962dcb, 0xc9cbf769, 0xc9cbf769, 0x3ce35e1d, 0x3ce35e1d, 0x3ce35e1d, 0xc23b9fd1, 0xc23b9fd1, 0xc23b9fd1, 0x5b18528e, 0x5b18528e, 0x5b18528e, 0xc9cbf769, 0x7c962dcb, 0x7c962dcb, 0xc9cbf769, }, 20 },
-+  { "gfxterm_high", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x9813a416, 0xe709a12d, 0x54a9a81a, 0xe709a12d, 0xde04d65c, 0x9813a416, 0x9813a416, 0x43fda3fa, 0x43fda3fa, 0x43fda3fa, 0xd22625c9, 0xd22625c9, 0xd22625c9, 0x76a62c0a, 0x76a62c0a, 0x76a62c0a, 0x9813a416, 0xde04d65c, 0xde04d65c, 0x9813a416, }, 20 },
-+  { "gfxterm_high", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x65eff77c, 0x7519ec1d, 0x65eff77c, 0x1cd7d353, 0x5fcf013d, 0x5fcf013d, 0xf3582c48, 0xf3582c48, 0xf3582c48, 0x2148343e, 0x2148343e, 0x2148343e, 0x9c719024, 0x9c719024, 0x9c719024, 0x5fcf013d, 0x1cd7d353, 0x1cd7d353, 0x5fcf013d, }, 20 },
-+  { "gfxterm_high", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xdd28f52b, 0x7318831a, 0x276027c4, 0x7318831a, 0xd7e4f5bb, 0xdd28f52b, 0xdd28f52b, 0xb3c7ef80, 0xb3c7ef80, 0xb3c7ef80, 0x92fb1664, 0x92fb1664, 0x92fb1664, 0xd15b5e2e, 0xd15b5e2e, 0xd15b5e2e, 0xdd28f52b, 0xd7e4f5bb, 0xd7e4f5bb, 0xdd28f52b, }, 20 },
-+  { "gfxterm_high", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x43d1f34, 0x6927a7d4, 0xc2b67069, 0x6927a7d4, 0xfc345163, 0x43d1f34, 0x43d1f34, 0xa0717008, 0xa0717008, 0xa0717008, 0xdf7bd9a0, 0xdf7bd9a0, 0xdf7bd9a0, 0x8e5a9312, 0x8e5a9312, 0x8e5a9312, 0x43d1f34, 0xfc345163, 0xfc345163, 0x43d1f34, }, 20 },
-+  { "videotest", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0xe6012f70, 0xe6012f70, 0xe6012f70, 0xe6012f70, 0xe6012f70, }, 5 },
-+  { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xfb6be77b, 0xfb6be77b, 0xfb6be77b, 0xfb6be77b, 0xfb6be77b, }, 5 },
-+  { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0x67c0629f, 0x67c0629f, 0x67c0629f, 0x67c0629f, 0x67c0629f, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x8f20afbb, 0xd8f7abc, 0x8f937344, 0xd3ca643, 0x8e471645, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xdca764da, 0x9f76da9a, 0x5b04185a, 0x18d5a61a, 0xd60deb2b, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0x7b87af36, 0x7cb96093, 0x75fa307c, 0x72c4ffd9, 0x677c91a2, }, 5 },
-+  { "videotest", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x72981c65, 0x50120635, 0x378c28c5, 0x15063295, 0xf8b07525, }, 5 },
-+  { "videotest", 640, 480, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi256 */, (grub_uint32_t []) { 0xc8f64b58, 0xc8f64b58, 0xc8f64b58, 0xc8f64b58, 0xc8f64b58, }, 5 },
-+  { "videotest", 800, 600, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi256 */, (grub_uint32_t []) { 0x2b499dfa, 0x2b499dfa, 0x2b499dfa, 0x2b499dfa, 0x2b499dfa, }, 5 },
-+  { "videotest", 1024, 768, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi256 */, (grub_uint32_t []) { 0x6156b420, 0x6156b420, 0x6156b420, 0x6156b420, 0x6156b420, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 640x480xrgba5550 */, (grub_uint32_t []) { 0x363285ca, 0x363285ca, 0x363285ca, 0x363285ca, 0x363285ca, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 800x600xrgba5550 */, (grub_uint32_t []) { 0x25bb37f4, 0x25bb37f4, 0x25bb37f4, 0x25bb37f4, 0x25bb37f4, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 1024x768xrgba5550 */, (grub_uint32_t []) { 0xeeab9e91, 0xeeab9e91, 0xeeab9e91, 0xeeab9e91, 0xeeab9e91, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 640x480xrgba5650 */, (grub_uint32_t []) { 0x26a9a50b, 0x26a9a50b, 0x26a9a50b, 0x26a9a50b, 0x26a9a50b, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 800x600xrgba5650 */, (grub_uint32_t []) { 0x2c0f4fe7, 0x2c0f4fe7, 0x2c0f4fe7, 0x2c0f4fe7, 0x2c0f4fe7, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 1024x768xrgba5650 */, (grub_uint32_t []) { 0x46c11052, 0x46c11052, 0x46c11052, 0x46c11052, 0x46c11052, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 640x480xrgba8880 */, (grub_uint32_t []) { 0xe56cf615, 0xcd2be572, 0xb5e2d0db, 0x9da5c3bc, 0x4470bb89, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 800x600xrgba8880 */, (grub_uint32_t []) { 0x2a25b871, 0x4bf85361, 0xe99e6e51, 0x88438541, 0xa8be62c0, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 1024x768xrgba8880 */, (grub_uint32_t []) { 0x81523037, 0xd8c0bfd3, 0x32772fff, 0x6be5a01b, 0xe2f47956, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 640x480xbgra5550 */, (grub_uint32_t []) { 0x1833bb41, 0x1833bb41, 0x1833bb41, 0x1833bb41, 0x1833bb41, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 800x600xbgra5550 */, (grub_uint32_t []) { 0x2c39a0e8, 0x2c39a0e8, 0x2c39a0e8, 0x2c39a0e8, 0x2c39a0e8, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 1024x768xbgra5550 */, (grub_uint32_t []) { 0xf0d4c23, 0xf0d4c23, 0xf0d4c23, 0xf0d4c23, 0xf0d4c23, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 640x480xbgra5650 */, (grub_uint32_t []) { 0x456d063c, 0x456d063c, 0x456d063c, 0x456d063c, 0x456d063c, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 800x600xbgra5650 */, (grub_uint32_t []) { 0x47e15a2e, 0x47e15a2e, 0x47e15a2e, 0x47e15a2e, 0x47e15a2e, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 1024x768xbgra5650 */, (grub_uint32_t []) { 0x54d7300d, 0x54d7300d, 0x54d7300d, 0x54d7300d, 0x54d7300d, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 640x480xbgra8880 */, (grub_uint32_t []) { 0x770da211, 0x8ef2528e, 0x811e35de, 0x78e1c541, 0x9ec6fb7e, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 800x600xbgra8880 */, (grub_uint32_t []) { 0xeb181fbc, 0xae648cc1, 0x61e13946, 0x249daa3b, 0xfb0624b9, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 1024x768xbgra8880 */, (grub_uint32_t []) { 0x2b6f64dc, 0xc25f8431, 0xfce2d3f7, 0x15d2331a, 0x81987c7b, }, 5 },
-+  { "videotest", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 640x480xbgra8888 */, (grub_uint32_t []) { 0xa260f7dd, 0x3e2f4980, 0x9f13fd96, 0x35c43cb, 0xd886e34b, }, 5 },
-+  { "videotest", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 800x600xbgra8888 */, (grub_uint32_t []) { 0x41a9bff8, 0xa0d3f7c3, 0x86b1597f, 0x67cb1144, 0xca740407, }, 5 },
-+  { "videotest", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 1024x768xbgra8888 */, (grub_uint32_t []) { 0x8f7a3b6d, 0xcb84c6e3, 0x687c071, 0x42793dff, 0x996dbba4, }, 5 },
--- 
-2.14.3
-

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

@@ -1,7 +1,7 @@
-From 030f2f742200a96667296e48a1d748333b5b1e42 Mon Sep 17 00:00:00 2001
+From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 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 126/225] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 081/198] 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 e7410494b..206110458 100644
+index f9caccb97..6d452da02 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -495,6 +495,13 @@ script = {
+@@ -486,6 +486,13 @@ script = {
    condition = COND_HOST_LINUX;
  };
  

0081-grub-fs-tester-Fix-bashism.patch

@@ -1,25 +0,0 @@
-From 4f31bfe1d36e95ca3b1cdaf6a9d45d1e3722ad2f Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@google.com>
-Date: Wed, 30 Aug 2017 17:22:58 +0200
-Subject: [PATCH 081/225] grub-fs-tester: Fix bashism
-
----
- 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 fd7e0f14b..15969d796 100644
---- a/tests/util/grub-fs-tester.in
-+++ b/tests/util/grub-fs-tester.in
-@@ -957,7 +957,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
- 	    esac
- 	    # Make sure file is not exact multiple of block size. This helps to force
- 	    # tail packing in case of squash4.
--	    : $((BLOCKCNT--))
-+	    BLOCKCNT="$((BLOCKCNT-1))"
- 	    case x"$fs" in
- 		x"ntfscomp")
- 		    setfattr -h -v 0x00000800 -n system.ntfs_attrib_be "$MNTPOINTRW/$OSDIR";;
--- 
-2.14.3
-

0082-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
-From 5144efc5a79f0321dd7495513b460ad32d1aa91d Mon Sep 17 00:00:00 2001
+From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 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 127/225] Add fw_path variable (revised)
+Subject: [PATCH 082/198] 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