#3 Add blscfg command and improve BootLoaderSpec support
Closed 4 years ago by pjones. Opened 4 years ago by javierm.
rpms/ javierm/grub2 master  into  master

@@ -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/198] Bump version to 2.03

+ Subject: [PATCH 001/206] Bump version to 2.03

  

  ---

   configure.ac                |   2 +-
@@ -9,7 +9,7 @@ 

   2 files changed, 99 insertions(+), 99 deletions(-)

  

  diff --git a/configure.ac b/configure.ac

- index edd184154..d10d8adac 100644

+ index edd184154f7e..d10d8adac581 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
@@ -22,7 +22,7 @@ 

   AC_CONFIG_AUX_DIR([build-aux])

   

  diff --git a/grub-core/tests/checksums.h b/grub-core/tests/checksums.h

- index 68d8ce7c7..921e57ff4 100644

+ index 68d8ce7c7753..921e57ff48d0 100644

  --- a/grub-core/tests/checksums.h

  +++ b/grub-core/tests/checksums.h

  @@ -1,101 +1,101 @@

@@ -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/198] Remove bashisms from tests.

+ Subject: [PATCH 002/206] Remove bashisms from tests.

  

  Those tests don't actually need bash. Just use common shebang.

  ---
@@ -19,7 +19,7 @@ 

   11 files changed, 11 insertions(+), 11 deletions(-)

  

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index a459353e8..0d8162e98 100644

+ index a459353e8a51..0d8162e98b04 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -1,4 +1,4 @@
@@ -29,7 +29,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in

- index e7e625701..7e9ab86aa 100644

+ index e7e625701152..7e9ab86aabb2 100644

  --- a/tests/grub_cmd_regexp.in

  +++ b/tests/grub_cmd_regexp.in

  @@ -1,4 +1,4 @@
@@ -39,7 +39,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in

- index c594ae3fc..2f518dd9e 100644

+ index c594ae3fc14e..2f518dd9e342 100644

  --- a/tests/grub_cmd_set_date.in

  +++ b/tests/grub_cmd_set_date.in

  @@ -1,4 +1,4 @@
@@ -49,7 +49,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index eb362aa24..05b8f6b73 100644

+ index eb362aa2439d..05b8f6b73faa 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -1,4 +1,4 @@
@@ -59,7 +59,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in

- index 6269891c9..49ae8a9c8 100644

+ index 6269891c9eed..49ae8a9c830e 100644

  --- a/tests/grub_cmd_test.in

  +++ b/tests/grub_cmd_test.in

  @@ -1,4 +1,4 @@
@@ -69,7 +69,7 @@ 

   # create a randome file

   empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in

- index 3fb15e35c..0e8d645eb 100644

+ index 3fb15e35c8ac..0e8d645eb6be 100644

  --- a/tests/grub_cmd_tr.in

  +++ b/tests/grub_cmd_tr.in

  @@ -1,4 +1,4 @@
@@ -79,7 +79,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in

- index c8cc26376..b32f24466 100644

+ index c8cc26376337..b32f24466592 100644

  --- a/tests/grub_func_test.in

  +++ b/tests/grub_func_test.in

  @@ -1,4 +1,4 @@
@@ -89,7 +89,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in

- index 2765b61ac..63b60a2ea 100644

+ index 2765b61acbb8..63b60a2ea067 100644

  --- a/tests/grub_script_blockarg.in

  +++ b/tests/grub_script_blockarg.in

  @@ -1,4 +1,4 @@
@@ -99,7 +99,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in

- index e46401c4c..2b7829568 100644

+ index e46401c4c9f1..2b7829568380 100644

  --- a/tests/grub_script_expansion.in

  +++ b/tests/grub_script_expansion.in

  @@ -1,4 +1,4 @@
@@ -109,7 +109,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/help_test.in b/tests/help_test.in

- index e780924ef..aa9645835 100644

+ index e780924ef7b0..aa96458355b7 100644

  --- a/tests/help_test.in

  +++ b/tests/help_test.in

  @@ -1,4 +1,4 @@
@@ -119,7 +119,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in

- index d5ef7f9ea..80ebdc59f 100644

+ index d5ef7f9ea62d..80ebdc59fd53 100644

  --- a/tests/test_sha512sum.in

  +++ b/tests/test_sha512sum.in

  @@ -1,4 +1,4 @@

@@ -1,14 +1,14 @@ 

  From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:35:59 +0300

- Subject: [PATCH 003/198] fs-tester: make sh-compatible

+ Subject: [PATCH 003/206] fs-tester: make sh-compatible

  

  ---

   tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------

   1 file changed, 169 insertions(+), 137 deletions(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 2337771a1..4515d165e 100644

+ index 2337771a1b9c..4515d165e6e9 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1,4 +1,4 @@

@@ -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/198] support busybox date.

+ Subject: [PATCH 004/206] support busybox date.

  

  Busybox date doesn't understand weekdays in -d input,

  so strip them beforehand.
@@ -11,7 +11,7 @@ 

   2 files changed, 3 insertions(+), 3 deletions(-)

  

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index 0d8162e98..60f039ebc 100644

+ index 0d8162e98b04..60f039ebc8bb 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -9,7 +9,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ];
@@ -24,7 +24,7 @@ 

   ndt="$(date -u +%s)"

   

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index 05b8f6b73..ac51d4209 100644

+ index 05b8f6b73faa..ac51d42098e0 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -11,8 +11,8 @@ fi

@@ -1,14 +1,14 @@ 

  From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 21:24:05 +0300

- Subject: [PATCH 005/198] Don't retrieve fstime when it's not useful.

+ Subject: [PATCH 005/206] Don't retrieve fstime when it's not useful.

  

  ---

   tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------

   1 file changed, 24 insertions(+), 24 deletions(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 4515d165e..bf47305f3 100644

+ index 4515d165e6e9..bf47305f3e8d 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1328,31 +1328,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do

file modified
+3 -3
@@ -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/198] Support lseek64.

+ Subject: [PATCH 006/206] Support lseek64.

  

  Android doesn't have 64-bit off_t, so use off64_t instead.

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 12 insertions(+), 1 deletion(-)

  

  diff --git a/configure.ac b/configure.ac

- index d10d8adac..e0262e159 100644

+ index d10d8adac581..e0262e159f03 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -373,7 +373,10 @@ case "$host_os" in
@@ -26,7 +26,7 @@ 

   

   if test x$USE_NLS = xno; then

  diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c

- index 2a8c5882e..5450cf416 100644

+ index 2a8c5882e3d1..5450cf4166e0 100644

  --- a/grub-core/osdep/unix/hostdisk.c

  +++ b/grub-core/osdep/unix/hostdisk.c

  @@ -77,11 +77,19 @@ grub_util_get_fd_size (grub_util_fd_t fd, const char *name, unsigned *log_secsiz

@@ -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/198] Use $(SHELL) rather than /bin/sh.

+ Subject: [PATCH 007/206] Use $(SHELL) rather than /bin/sh.

  

  /bin/sh doesn't exist under termux.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 04e9395fd..809a8aa26 100644

+ index 04e9395fd949..809a8aa26bfb 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -278,7 +278,7 @@ BUILT_SOURCES += symlist.h

@@ -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/198] po: Use @SHELL@ rather than /bin/sh.

+ Subject: [PATCH 008/206] po: Use @SHELL@ rather than /bin/sh.

  

  /bin/sh might not exist.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/po/Makefile.in.in b/po/Makefile.in.in

- index 3619458e8..e68e9da84 100644

+ index 3619458e85f2..e68e9da843d9 100644

  --- a/po/Makefile.in.in

  +++ b/po/Makefile.in.in

  @@ -15,7 +15,7 @@ PACKAGE = @PACKAGE@

@@ -1,14 +1,14 @@ 

  From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:52:48 +0300

- Subject: [PATCH 009/198] Add termux path to dict.

+ Subject: [PATCH 009/206] Add termux path to dict.

  

  ---

   tests/util/grub-fs-tester.in | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index bf47305f3..468d9e785 100644

+ index bf47305f3e8d..468d9e7856db 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -259,7 +259,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do

@@ -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/198] Fix shebang for termux.

+ Subject: [PATCH 010/206] Fix shebang for termux.

  

  Termux doesn't have a /bin/sh. So we needto use $SHELL.

  Keep /bin/sh as much as possible.
@@ -69,7 +69,7 @@ 

   60 files changed, 69 insertions(+), 59 deletions(-)

  

  diff --git a/configure.ac b/configure.ac

- index e0262e159..ee2c86537 100644

+ index e0262e159f03..ee2c86537e98 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -459,6 +459,16 @@ case "$build_os" in
@@ -90,7 +90,7 @@ 

   gl_INIT

   

  diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in

- index 03cc3b7f6..3de06ee01 100644

+ index 03cc3b7f69ed..3de06ee018f8 100644

  --- a/grub-core/genmod.sh.in

  +++ b/grub-core/genmod.sh.in

  @@ -1,4 +1,4 @@
@@ -100,7 +100,7 @@ 

   

   # Copyright (C) 2010 Free Software Foundation, Inc.

  diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in

- index 2e8716b42..9bc767532 100644

+ index 2e8716b425cb..9bc7675327a6 100644

  --- a/grub-core/gensyminfo.sh.in

  +++ b/grub-core/gensyminfo.sh.in

  @@ -1,4 +1,4 @@
@@ -110,7 +110,7 @@ 

   

   # Copyright (C) 2010 Free Software Foundation, Inc.

  diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in

- index faf0ad30e..f6cd657ce 100644

+ index faf0ad30edbe..f6cd657ce0f8 100644

  --- a/grub-core/modinfo.sh.in

  +++ b/grub-core/modinfo.sh.in

  @@ -1,4 +1,4 @@
@@ -120,7 +120,7 @@ 

   # User-controllable options

   grub_modinfo_target_cpu=@target_cpu@

  diff --git a/tests/ahci_test.in b/tests/ahci_test.in

- index 1d01d1f59..7df560462 100644

+ index 1d01d1f59a0a..7df56046201e 100644

  --- a/tests/ahci_test.in

  +++ b/tests/ahci_test.in

  @@ -1,4 +1,4 @@
@@ -130,7 +130,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/btrfs_test.in b/tests/btrfs_test.in

- index c55d9477f..2b37ddd33 100644

+ index c55d9477f78e..2b37ddd3324c 100644

  --- a/tests/btrfs_test.in

  +++ b/tests/btrfs_test.in

  @@ -1,4 +1,4 @@
@@ -140,7 +140,7 @@ 

   set -e

   

  diff --git a/tests/cdboot_test.in b/tests/cdboot_test.in

- index 1cc901977..75acdfedb 100644

+ index 1cc901977c22..75acdfedb7fe 100644

  --- a/tests/cdboot_test.in

  +++ b/tests/cdboot_test.in

  @@ -1,4 +1,4 @@
@@ -150,7 +150,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/core_compress_test.in b/tests/core_compress_test.in

- index 1003587cc..9d216ebcf 100644

+ index 1003587ccca6..9d216ebcff60 100644

  --- a/tests/core_compress_test.in

  +++ b/tests/core_compress_test.in

  @@ -1,4 +1,4 @@
@@ -160,7 +160,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/cpio_test.in b/tests/cpio_test.in

- index 0b09db549..5742cf17b 100644

+ index 0b09db549f07..5742cf17b9d8 100644

  --- a/tests/cpio_test.in

  +++ b/tests/cpio_test.in

  @@ -1,4 +1,4 @@
@@ -170,7 +170,7 @@ 

   set -e

   

  diff --git a/tests/ehci_test.in b/tests/ehci_test.in

- index 7dd8d3e8f..b197f8cdc 100644

+ index 7dd8d3e8fbd4..b197f8cdc922 100644

  --- a/tests/ehci_test.in

  +++ b/tests/ehci_test.in

  @@ -1,4 +1,4 @@
@@ -180,7 +180,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/example_scripted_test.in b/tests/example_scripted_test.in

- index 09633e893..783b7f138 100644

+ index 09633e89341e..783b7f13853f 100644

  --- a/tests/example_scripted_test.in

  +++ b/tests/example_scripted_test.in

  @@ -1,4 +1,4 @@
@@ -190,7 +190,7 @@ 

   

   true

  diff --git a/tests/exfat_test.in b/tests/exfat_test.in

- index fc1a0fe5e..cd3cd4cb2 100644

+ index fc1a0fe5ec03..cd3cd4cb2f70 100644

  --- a/tests/exfat_test.in

  +++ b/tests/exfat_test.in

  @@ -1,4 +1,4 @@
@@ -200,7 +200,7 @@ 

   set -e

   

  diff --git a/tests/ext234_test.in b/tests/ext234_test.in

- index c986960a8..892b99cbd 100644

+ index c986960a8bec..892b99cbdf64 100644

  --- a/tests/ext234_test.in

  +++ b/tests/ext234_test.in

  @@ -1,4 +1,4 @@
@@ -210,7 +210,7 @@ 

   set -e

   

  diff --git a/tests/fat_test.in b/tests/fat_test.in

- index 1d132b517..b6b4748ca 100644

+ index 1d132b51703c..b6b4748ca694 100644

  --- a/tests/fat_test.in

  +++ b/tests/fat_test.in

  @@ -1,4 +1,4 @@
@@ -220,7 +220,7 @@ 

   set -e

   

  diff --git a/tests/fddboot_test.in b/tests/fddboot_test.in

- index a59645b7f..2d7dfc889 100644

+ index a59645b7f873..2d7dfc8891f6 100644

  --- a/tests/fddboot_test.in

  +++ b/tests/fddboot_test.in

  @@ -1,4 +1,4 @@
@@ -230,7 +230,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in

- index 8909e4021..bfb638227 100644

+ index 8909e4021fb1..bfb6382274e4 100644

  --- a/tests/file_filter_test.in

  +++ b/tests/file_filter_test.in

  @@ -1,4 +1,4 @@
@@ -240,7 +240,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/gettext_strings_test.in b/tests/gettext_strings_test.in

- index 5c305e75b..813999ebe 100644

+ index 5c305e75b7e9..813999ebe6ea 100644

  --- a/tests/gettext_strings_test.in

  +++ b/tests/gettext_strings_test.in

  @@ -1,4 +1,4 @@
@@ -250,7 +250,7 @@ 

   cd '@srcdir@'

   

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index 60f039ebc..f7c9ca004 100644

+ index 60f039ebc8bb..f7c9ca00432f 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -1,4 +1,4 @@
@@ -260,7 +260,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in

- index 7e9ab86aa..6520bd6d7 100644

+ index 7e9ab86aabb2..6520bd6d79ac 100644

  --- a/tests/grub_cmd_regexp.in

  +++ b/tests/grub_cmd_regexp.in

  @@ -1,4 +1,4 @@
@@ -270,7 +270,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in

- index 2f518dd9e..aac120a6c 100644

+ index 2f518dd9e342..aac120a6c527 100644

  --- a/tests/grub_cmd_set_date.in

  +++ b/tests/grub_cmd_set_date.in

  @@ -1,4 +1,4 @@
@@ -280,7 +280,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index ac51d4209..8797f6632 100644

+ index ac51d42098e0..8797f6632845 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -1,4 +1,4 @@
@@ -290,7 +290,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in

- index 49ae8a9c8..3399eb292 100644

+ index 49ae8a9c830e..3399eb292940 100644

  --- a/tests/grub_cmd_test.in

  +++ b/tests/grub_cmd_test.in

  @@ -1,4 +1,4 @@
@@ -300,7 +300,7 @@ 

   # create a randome file

   empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in

- index 0e8d645eb..bed469c03 100644

+ index 0e8d645eb6be..bed469c03ddc 100644

  --- a/tests/grub_cmd_tr.in

  +++ b/tests/grub_cmd_tr.in

  @@ -1,4 +1,4 @@
@@ -310,7 +310,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in

- index b32f24466..c67f9e422 100644

+ index b32f24466592..c67f9e422534 100644

  --- a/tests/grub_func_test.in

  +++ b/tests/grub_func_test.in

  @@ -1,4 +1,4 @@
@@ -320,7 +320,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in

- index 89ed763d3..bd8735491 100644

+ index 89ed763d3f4e..bd8735491be3 100644

  --- a/tests/grub_script_blanklines.in

  +++ b/tests/grub_script_blanklines.in

  @@ -1,4 +1,4 @@
@@ -330,7 +330,7 @@ 

   

   @builddir@/grub-script-check <<EOF

  diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in

- index 63b60a2ea..6ea9b8c3d 100644

+ index 63b60a2ea067..6ea9b8c3d87c 100644

  --- a/tests/grub_script_blockarg.in

  +++ b/tests/grub_script_blockarg.in

  @@ -1,4 +1,4 @@
@@ -340,7 +340,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in

- index 2e076427a..392fe2e7a 100644

+ index 2e076427afbc..392fe2e7ab0f 100644

  --- a/tests/grub_script_dollar.in

  +++ b/tests/grub_script_dollar.in

  @@ -1,4 +1,4 @@
@@ -350,7 +350,7 @@ 

   

   @builddir@/grub-script-check << EOF

  diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in

- index 2b7829568..9d0dcdd29 100644

+ index 2b7829568380..9d0dcdd29100 100644

  --- a/tests/grub_script_expansion.in

  +++ b/tests/grub_script_expansion.in

  @@ -1,4 +1,4 @@
@@ -360,7 +360,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in

- index 3ac26540b..f17a9bf95 100644

+ index 3ac26540bbd7..f17a9bf95e6d 100644

  --- a/tests/grub_script_final_semicolon.in

  +++ b/tests/grub_script_final_semicolon.in

  @@ -1,4 +1,4 @@
@@ -370,7 +370,7 @@ 

   

   @builddir@/grub-script-check <<EOF

  diff --git a/tests/grub_script_no_commands.in b/tests/grub_script_no_commands.in

- index c31d267e5..996bb1810 100644

+ index c31d267e5fdf..996bb181043d 100644

  --- a/tests/grub_script_no_commands.in

  +++ b/tests/grub_script_no_commands.in

  @@ -1,4 +1,4 @@
@@ -380,7 +380,7 @@ 

   

   # grub-script-check refuses to pass a file with no commands; this usually

  diff --git a/tests/gzcompress_test.in b/tests/gzcompress_test.in

- index 11b6bb208..42c8fe7c4 100644

+ index 11b6bb208302..42c8fe7c4e8f 100644

  --- a/tests/gzcompress_test.in

  +++ b/tests/gzcompress_test.in

  @@ -1,4 +1,4 @@
@@ -390,7 +390,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/hddboot_test.in b/tests/hddboot_test.in

- index c229716a6..6d70847a5 100644

+ index c229716a6429..6d70847a5dec 100644

  --- a/tests/hddboot_test.in

  +++ b/tests/hddboot_test.in

  @@ -1,4 +1,4 @@
@@ -400,7 +400,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/help_test.in b/tests/help_test.in

- index aa9645835..b08cf2013 100644

+ index aa96458355b7..b08cf201382e 100644

  --- a/tests/help_test.in

  +++ b/tests/help_test.in

  @@ -1,4 +1,4 @@
@@ -410,7 +410,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/hfs_test.in b/tests/hfs_test.in

- index e3e88f190..d7ec56bef 100644

+ index e3e88f190677..d7ec56beffa7 100644

  --- a/tests/hfs_test.in

  +++ b/tests/hfs_test.in

  @@ -1,4 +1,4 @@
@@ -420,7 +420,7 @@ 

   set -e

   

  diff --git a/tests/hfsplus_test.in b/tests/hfsplus_test.in

- index f947c4a44..85f1c37dc 100644

+ index f947c4a447fe..85f1c37dce6a 100644

  --- a/tests/hfsplus_test.in

  +++ b/tests/hfsplus_test.in

  @@ -1,4 +1,4 @@
@@ -430,7 +430,7 @@ 

   set -e

   

  diff --git a/tests/iso9660_test.in b/tests/iso9660_test.in

- index fdcc9e124..571b938d7 100644

+ index fdcc9e124208..571b938d7a08 100644

  --- a/tests/iso9660_test.in

  +++ b/tests/iso9660_test.in

  @@ -1,4 +1,4 @@
@@ -440,7 +440,7 @@ 

   set -e

   

  diff --git a/tests/jfs_test.in b/tests/jfs_test.in

- index c2e5ecedd..6cf7576b3 100644

+ index c2e5eceddcd2..6cf7576b35ed 100644

  --- a/tests/jfs_test.in

  +++ b/tests/jfs_test.in

  @@ -1,4 +1,4 @@
@@ -450,7 +450,7 @@ 

   set -e

   

  diff --git a/tests/lzocompress_test.in b/tests/lzocompress_test.in

- index 41984c254..4e5f7e078 100644

+ index 41984c25419b..4e5f7e078d51 100644

  --- a/tests/lzocompress_test.in

  +++ b/tests/lzocompress_test.in

  @@ -1,4 +1,4 @@
@@ -460,7 +460,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/minixfs_test.in b/tests/minixfs_test.in

- index 1784b1261..3b16a4de0 100644

+ index 1784b1261f75..3b16a4de0931 100644

  --- a/tests/minixfs_test.in

  +++ b/tests/minixfs_test.in

  @@ -1,4 +1,4 @@
@@ -470,7 +470,7 @@ 

   set -e

   

  diff --git a/tests/netboot_test.in b/tests/netboot_test.in

- index c757023d9..9f71e3d88 100644

+ index c757023d989e..9f71e3d88542 100644

  --- a/tests/netboot_test.in

  +++ b/tests/netboot_test.in

  @@ -1,4 +1,4 @@
@@ -480,7 +480,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/nilfs2_test.in b/tests/nilfs2_test.in

- index 780b60ec1..ad44d5b33 100644

+ index 780b60ec1ac9..ad44d5b33c8a 100644

  --- a/tests/nilfs2_test.in

  +++ b/tests/nilfs2_test.in

  @@ -1,4 +1,4 @@
@@ -490,7 +490,7 @@ 

   set -e

   

  diff --git a/tests/ntfs_test.in b/tests/ntfs_test.in

- index e25c6384a..9eb7b01f6 100644

+ index e25c6384a9cd..9eb7b01f66e9 100644

  --- a/tests/ntfs_test.in

  +++ b/tests/ntfs_test.in

  @@ -1,4 +1,4 @@
@@ -500,7 +500,7 @@ 

   set -e

   

  diff --git a/tests/ohci_test.in b/tests/ohci_test.in

- index 7fede6f26..8693f8c47 100644

+ index 7fede6f262c1..8693f8c47287 100644

  --- a/tests/ohci_test.in

  +++ b/tests/ohci_test.in

  @@ -1,4 +1,4 @@
@@ -510,7 +510,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/partmap_test.in b/tests/partmap_test.in

- index f8dc456fb..6ef518b0a 100644

+ index f8dc456fb8c6..6ef518b0adc1 100644

  --- a/tests/partmap_test.in

  +++ b/tests/partmap_test.in

  @@ -1,4 +1,4 @@
@@ -520,7 +520,7 @@ 

   

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/pata_test.in b/tests/pata_test.in

- index c1d0f63ea..4b18fdef3 100644

+ index c1d0f63ea21b..4b18fdef3d35 100644

  --- a/tests/pata_test.in

  +++ b/tests/pata_test.in

  @@ -1,4 +1,4 @@
@@ -530,7 +530,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/pseries_test.in b/tests/pseries_test.in

- index 226494593..655eb4f3a 100644

+ index 226494593d15..655eb4f3a63a 100644

  --- a/tests/pseries_test.in

  +++ b/tests/pseries_test.in

  @@ -1,4 +1,4 @@
@@ -540,7 +540,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/reiserfs_test.in b/tests/reiserfs_test.in

- index 678efe7b3..b5fed7635 100644

+ index 678efe7b3666..b5fed7635673 100644

  --- a/tests/reiserfs_test.in

  +++ b/tests/reiserfs_test.in

  @@ -1,4 +1,4 @@
@@ -550,7 +550,7 @@ 

   set -e

   

  diff --git a/tests/romfs_test.in b/tests/romfs_test.in

- index 83e09315a..98bb50c32 100644

+ index 83e09315acf6..98bb50c324b6 100644

  --- a/tests/romfs_test.in

  +++ b/tests/romfs_test.in

  @@ -1,4 +1,4 @@
@@ -560,7 +560,7 @@ 

   set -e

   

  diff --git a/tests/squashfs_test.in b/tests/squashfs_test.in

- index ec34e0108..2f044f95d 100644

+ index ec34e0108c3b..2f044f95d99b 100644

  --- a/tests/squashfs_test.in

  +++ b/tests/squashfs_test.in

  @@ -1,4 +1,4 @@
@@ -570,7 +570,7 @@ 

   set -e

   

  diff --git a/tests/syslinux_test.in b/tests/syslinux_test.in

- index fc4edd8ef..4ea86390e 100644

+ index fc4edd8ef6b9..4ea86390e0a3 100644

  --- a/tests/syslinux_test.in

  +++ b/tests/syslinux_test.in

  @@ -1,4 +1,4 @@
@@ -580,7 +580,7 @@ 

   set -e

   

  diff --git a/tests/tar_test.in b/tests/tar_test.in

- index 46ba3bce2..6e2f2de8b 100644

+ index 46ba3bce295b..6e2f2de8b7ff 100644

  --- a/tests/tar_test.in

  +++ b/tests/tar_test.in

  @@ -1,4 +1,4 @@
@@ -590,7 +590,7 @@ 

   set -e

   

  diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in

- index 80ebdc59f..027092a8b 100644

+ index 80ebdc59fd53..027092a8b17f 100644

  --- a/tests/test_sha512sum.in

  +++ b/tests/test_sha512sum.in

  @@ -1,4 +1,4 @@
@@ -600,7 +600,7 @@ 

   # create a randome file

   file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/udf_test.in b/tests/udf_test.in

- index fe244e2bd..fb92f0173 100644

+ index fe244e2bdfc8..fb92f0173cc7 100644

  --- a/tests/udf_test.in

  +++ b/tests/udf_test.in

  @@ -1,4 +1,4 @@
@@ -610,7 +610,7 @@ 

   set -e

   

  diff --git a/tests/uhci_test.in b/tests/uhci_test.in

- index 89e2c1805..4af72fd8f 100644

+ index 89e2c18051ac..4af72fd8fea5 100644

  --- a/tests/uhci_test.in

  +++ b/tests/uhci_test.in

  @@ -1,4 +1,4 @@
@@ -620,7 +620,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 468d9e785..88cbe7365 100644

+ index 468d9e7856db..88cbe7365e92 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1,4 +1,4 @@
@@ -630,7 +630,7 @@ 

   set -e

   

  diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in

- index 5adce0a47..8a87109b1 100644

+ index 5adce0a47fe3..8a87109b1524 100644

  --- a/tests/util/grub-shell-tester.in

  +++ b/tests/util/grub-shell-tester.in

  @@ -1,4 +1,4 @@
@@ -640,7 +640,7 @@ 

   

   # Compares GRUB script output with BASH output.

  diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in

- index 814f36c6b..d690d6734 100644

+ index 814f36c6bd24..d690d6734efb 100644

  --- a/tests/util/grub-shell.in

  +++ b/tests/util/grub-shell.in

  @@ -1,4 +1,4 @@
@@ -650,7 +650,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/xfs_test.in b/tests/xfs_test.in

- index 3807e2e5c..03a351359 100644

+ index 3807e2e5c77e..03a3513595dc 100644

  --- a/tests/xfs_test.in

  +++ b/tests/xfs_test.in

  @@ -1,4 +1,4 @@
@@ -660,7 +660,7 @@ 

   set -e

   

  diff --git a/tests/xzcompress_test.in b/tests/xzcompress_test.in

- index b2bd999ec..03bfb5e95 100644

+ index b2bd999ec071..03bfb5e951dd 100644

  --- a/tests/xzcompress_test.in

  +++ b/tests/xzcompress_test.in

  @@ -1,4 +1,4 @@
@@ -670,7 +670,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/zfs_test.in b/tests/zfs_test.in

- index 047120e47..eee62c10d 100644

+ index 047120e47a0e..eee62c10d704 100644

  --- a/tests/zfs_test.in

  +++ b/tests/zfs_test.in

  @@ -1,4 +1,4 @@

file modified
+2 -2
@@ -1,14 +1,14 @@ 

  From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Wed, 3 May 2017 12:58:15 +0200

- Subject: [PATCH 011/198] Add strtoull test.

+ Subject: [PATCH 011/206] Add strtoull test.

  

  ---

   grub-core/Makefile.core.def | 5 +++++

   1 file changed, 5 insertions(+)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 2dfa22a92..8dcd0e5a9 100644

+ index 2dfa22a9271b..8dcd0e5a9982 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1961,6 +1961,11 @@ module = {

@@ -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/198] strtoull: Fix behaviour on chars between '9' and 'a'.

+ Subject: [PATCH 012/206] strtoull: Fix behaviour on chars between '9' and 'a'.

  

  Reported by: Aaron Miller <aaronmiller@fb.com>

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 18 insertions(+), 8 deletions(-)

  

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index d1a54df6c..3b633d51f 100644

+ index d1a54df6c12e..3b633d51f4c6 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -391,12 +391,13 @@ grub_strtoull (const char *str, char **end, int base)
@@ -34,7 +34,7 @@ 

         found = 1;

   

  diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c

- index d4822a124..96781fb39 100644

+ index d4822a124565..96781fb39b5f 100644

  --- a/grub-core/tests/lib/functional_test.c

  +++ b/grub-core/tests/lib/functional_test.c

  @@ -26,14 +26,23 @@ GRUB_MOD_LICENSE ("GPLv3+");

@@ -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/198] Add Virtual LAN support.

+ Subject: [PATCH 013/206] 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
@@ -26,7 +26,7 @@ 

   7 files changed, 92 insertions(+), 20 deletions(-)

  

  diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c

- index 4b68c4151..54306e3b1 100644

+ index 4b68c4151a11..54306e3b16d2 100644

  --- a/grub-core/net/arp.c

  +++ b/grub-core/net/arp.c

  @@ -111,8 +111,8 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
@@ -56,7 +56,7 @@ 

       if (grub_net_addr_cmp (&inf->address, &target_addr) == 0

   	&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))

  diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c

- index a78d164db..002446be1 100644

+ index a78d164db1a0..002446be1c38 100644

  --- a/grub-core/net/drivers/ieee1275/ofnet.c

  +++ b/grub-core/net/drivers/ieee1275/ofnet.c

  @@ -153,11 +153,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
@@ -96,7 +96,7 @@ 

   

     if (gateway_addr.ipv4 != 0)

  diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c

- index c397b1b34..4d7ceed6f 100644

+ index c397b1b348ce..4d7ceed6f93c 100644

  --- a/grub-core/net/ethernet.c

  +++ b/grub-core/net/ethernet.c

  @@ -18,6 +18,7 @@
@@ -192,7 +192,7 @@ 

     grub_netbuff_free (nb);

     return GRUB_ERR_NONE;

  diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c

- index aba4f8908..7c95cc746 100644

+ index aba4f89087bc..7c95cc7464a0 100644

  --- a/grub-core/net/ip.c

  +++ b/grub-core/net/ip.c

  @@ -228,12 +228,13 @@ handle_dgram (struct grub_net_buff *nb,
@@ -294,7 +294,7 @@ 

     grub_netbuff_free (nb);

     return GRUB_ERR_NONE;

  diff --git a/include/grub/net.h b/include/grub/net.h

- index 2192fa186..1096b2432 100644

+ index 2192fa186288..1096b24322eb 100644

  --- a/include/grub/net.h

  +++ b/include/grub/net.h

  @@ -291,6 +291,7 @@ struct grub_net_network_level_interface
@@ -313,7 +313,7 @@ 

  +

   #endif /* ! GRUB_NET_HEADER */

  diff --git a/include/grub/net/arp.h b/include/grub/net/arp.h

- index bb1703622..8d9d08113 100644

+ index bb1703622e15..8d9d081134f5 100644

  --- a/include/grub/net/arp.h

  +++ b/include/grub/net/arp.h

  @@ -22,10 +22,11 @@
@@ -331,7 +331,7 @@ 

   

   #endif 

  diff --git a/include/grub/net/ip.h b/include/grub/net/ip.h

- index dcceaa568..ab9d68f98 100644

+ index dcceaa568946..ab9d68f98252 100644

  --- a/include/grub/net/ip.h

  +++ b/include/grub/net/ip.h

  @@ -48,7 +48,8 @@ grub_err_t

@@ -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/198] mkimage: Pass layout to mkimage_generate_elfXX rather

+ Subject: [PATCH 014/206] mkimage: Pass layout to mkimage_generate_elfXX rather

   than some fields.

  

  This allows easier extension of this function without having too long of
@@ -13,7 +13,7 @@ 

   3 files changed, 24 insertions(+), 23 deletions(-)

  

  diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h

- index 1a18708a8..b3a5ca132 100644

+ index 1a18708a89c6..b3a5ca132bc4 100644

  --- a/include/grub/util/mkimage.h

  +++ b/include/grub/util/mkimage.h

  @@ -51,13 +51,13 @@ grub_mkimage_load_image64 (const char *kernel_path,
@@ -35,7 +35,7 @@ 

   struct grub_install_image_target_desc

   {

  diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c

- index e63f148e4..3fab93e20 100644

+ index e63f148e48cf..3fab93e20884 100644

  --- a/util/grub-mkimagexx.c

  +++ b/util/grub-mkimagexx.c

  @@ -185,8 +185,8 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
@@ -147,7 +147,7 @@ 

   	shdr->sh_size = grub_host_to_target32 (XEN_NOTE_SIZE);

   	shdr->sh_link = grub_host_to_target32 (0);

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 9ad4cfe42..528166c87 100644

+ index 9ad4cfe4223b..528166c87ac4 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -1638,10 +1638,10 @@ grub_install_generate_image (const char *dir, const char *prefix,

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

+ Subject: [PATCH 015/206] 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.
@@ -20,7 +20,7 @@ 

   create mode 100644 include/grub/arm/startup.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 8dcd0e5a9..fb59a7b1d 100644

+ index 8dcd0e5a9982..fb59a7b1d6a3 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -105,7 +105,7 @@ kernel = {
@@ -45,7 +45,7 @@ 

  similarity index 77%

  rename from grub-core/kern/arm/uboot/startup.S

  rename to grub-core/kern/arm/startup.S

- index 5efaae16e..640837cba 100644

+ index 5efaae16e838..640837cba516 100644

  --- a/grub-core/kern/arm/uboot/startup.S

  +++ b/grub-core/kern/arm/startup.S

  @@ -86,7 +86,7 @@ FUNCTION(codestart)
@@ -136,7 +136,7 @@ 

  +entry_state:

  diff --git a/grub-core/kern/arm/uboot/init.c b/grub-core/kern/arm/uboot/init.c

  new file mode 100644

- index 000000000..2a6aa3fdd

+ index 000000000000..2a6aa3fdd3dd

  --- /dev/null

  +++ b/grub-core/kern/arm/uboot/init.c

  @@ -0,0 +1,70 @@
@@ -212,7 +212,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/uboot/uboot.S b/grub-core/kern/arm/uboot/uboot.S

  new file mode 100644

- index 000000000..d128775f1

+ index 000000000000..d128775f19ea

  --- /dev/null

  +++ b/grub-core/kern/arm/uboot/uboot.S

  @@ -0,0 +1,73 @@
@@ -290,7 +290,7 @@ 

  +

  +	END

  diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c

- index 5dcc106ed..3e338645c 100644

+ index 5dcc106ed9bc..3e338645c573 100644

  --- a/grub-core/kern/uboot/init.c

  +++ b/grub-core/kern/uboot/init.c

  @@ -36,30 +36,14 @@
@@ -325,7 +325,7 @@ 

   uboot_timer_ms (void)

   {

  diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c

- index 6800a4beb..cf0168e62 100644

+ index 6800a4beb1c4..cf0168e62ddd 100644

  --- a/grub-core/kern/uboot/uboot.c

  +++ b/grub-core/kern/uboot/uboot.c

  @@ -39,48 +39,13 @@
@@ -379,7 +379,7 @@ 

    * All functions below are wrappers around the grub_uboot_syscall() function

  diff --git a/include/grub/arm/startup.h b/include/grub/arm/startup.h

  new file mode 100644

- index 000000000..9afb6c57c

+ index 000000000000..9afb6c57c0bc

  --- /dev/null

  +++ b/include/grub/arm/startup.h

  @@ -0,0 +1,16 @@

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

+ Subject: [PATCH 016/206] 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.
@@ -23,7 +23,7 @@ 

   rename include/grub/{i386 => }/coreboot/lbio.h (93%)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 809a8aa26..781d0ffbf 100644

+ index 809a8aa26bfb..781d0ffbf750 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -112,7 +112,7 @@ endif
@@ -36,7 +36,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index fb59a7b1d..45ed0fa6b 100644

+ index fb59a7b1d6a3..45ed0fa6b1ce 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -166,7 +166,7 @@ kernel = {
@@ -68,7 +68,7 @@ 

     enable = i386_efi;

     enable = i386_qemu;

  diff --git a/grub-core/commands/i386/coreboot/cb_timestamps.c b/grub-core/commands/i386/coreboot/cb_timestamps.c

- index e72f38d6e..e97ea6bed 100644

+ index e72f38d6e057..e97ea6bed98b 100644

  --- a/grub-core/commands/i386/coreboot/cb_timestamps.c

  +++ b/grub-core/commands/i386/coreboot/cb_timestamps.c

  @@ -20,7 +20,7 @@
@@ -81,7 +81,7 @@ 

   

   GRUB_MOD_LICENSE ("GPLv3+");

  diff --git a/grub-core/commands/i386/coreboot/cbls.c b/grub-core/commands/i386/coreboot/cbls.c

- index e0a10596f..102291f42 100644

+ index e0a10596fe27..102291f424ab 100644

  --- a/grub-core/commands/i386/coreboot/cbls.c

  +++ b/grub-core/commands/i386/coreboot/cbls.c

  @@ -20,7 +20,7 @@
@@ -95,7 +95,7 @@ 

   GRUB_MOD_LICENSE ("GPLv3+");

  diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c

  new file mode 100644

- index 000000000..996d3f407

+ index 000000000000..996d3f407382

  --- /dev/null

  +++ b/grub-core/kern/coreboot/cbtable.c

  @@ -0,0 +1,70 @@
@@ -173,7 +173,7 @@ 

  similarity index 97%

  rename from grub-core/kern/i386/coreboot/mmap.c

  rename to grub-core/kern/coreboot/mmap.c

- index 4d29f6b7d..caf8f7cef 100644

+ index 4d29f6b7d905..caf8f7cef1b4 100644

  --- a/grub-core/kern/i386/coreboot/mmap.c

  +++ b/grub-core/kern/coreboot/mmap.c

  @@ -16,8 +16,8 @@
@@ -204,7 +204,7 @@ 

   		     /* Multiboot mmaps match with the coreboot mmap

   		        definition.  Therefore, we can just pass type

  diff --git a/grub-core/kern/i386/coreboot/cbtable.c b/grub-core/kern/i386/coreboot/cbtable.c

- index 1669bc0ca..34a2b59be 100644

+ index 1669bc0ca23a..34a2b59be1ff 100644

  --- a/grub-core/kern/i386/coreboot/cbtable.c

  +++ b/grub-core/kern/i386/coreboot/cbtable.c

  @@ -17,7 +17,7 @@
@@ -283,7 +283,7 @@ 

     return 0;

   }

  diff --git a/grub-core/term/i386/coreboot/cbmemc.c b/grub-core/term/i386/coreboot/cbmemc.c

- index 25e64a05c..129248c7f 100644

+ index 25e64a05c032..129248c7f472 100644

  --- a/grub-core/term/i386/coreboot/cbmemc.c

  +++ b/grub-core/term/i386/coreboot/cbmemc.c

  @@ -23,7 +23,7 @@
@@ -299,7 +299,7 @@ 

  similarity index 99%

  rename from grub-core/video/i386/coreboot/cbfb.c

  rename to grub-core/video/coreboot/cbfb.c

- index dede0c37e..9af81fa5b 100644

+ index dede0c37ea3e..9af81fa5b01b 100644

  --- a/grub-core/video/i386/coreboot/cbfb.c

  +++ b/grub-core/video/coreboot/cbfb.c

  @@ -25,7 +25,7 @@
@@ -315,7 +315,7 @@ 

  similarity index 93%

  rename from include/grub/i386/coreboot/lbio.h

  rename to include/grub/coreboot/lbio.h

- index 1c3fa6f19..5076d36c7 100644

+ index 1c3fa6f1953c..5076d36c71ba 100644

  --- a/include/grub/i386/coreboot/lbio.h

  +++ b/include/grub/coreboot/lbio.h

  @@ -20,6 +20,9 @@

@@ -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/198] Rename uboot/halt.c to dummy/halt.c.

+ Subject: [PATCH 017/206] Rename uboot/halt.c to dummy/halt.c.

  

  It's not U-Boot specific and it's a stub.

  ---
@@ -11,7 +11,7 @@ 

   rename grub-core/lib/{uboot => dummy}/halt.c (100%)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 45ed0fa6b..2a38bd4bc 100644

+ index 45ed0fa6b1ce..2a38bd4bc8a8 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -841,7 +841,7 @@ module = {

@@ -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/198] Rename uboot/datetime to dummy/datetime.

+ Subject: [PATCH 018/206] Rename uboot/datetime to dummy/datetime.

  

  It's just a stub and is not UBoot-specific.

  ---
@@ -11,7 +11,7 @@ 

   rename grub-core/lib/{uboot => dummy}/datetime.c (91%)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 2a38bd4bc..6540dc951 100644

+ index 2a38bd4bc8a8..6540dc951d4c 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1552,7 +1552,7 @@ module = {
@@ -27,7 +27,7 @@ 

  similarity index 91%

  rename from grub-core/lib/uboot/datetime.c

  rename to grub-core/lib/dummy/datetime.c

- index 4be716928..cf693fc6b 100644

+ index 4be716928a55..cf693fc6b621 100644

  --- a/grub-core/lib/uboot/datetime.c

  +++ b/grub-core/lib/dummy/datetime.c

  @@ -18,7 +18,6 @@

@@ -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/198] arm-coreboot: Start new port.

+ Subject: [PATCH 019/206] arm-coreboot: Start new port.

  

  ---

   configure.ac                           |   2 +
@@ -31,7 +31,7 @@ 

   create mode 100644 include/grub/arm/coreboot/kernel.h

  

  diff --git a/configure.ac b/configure.ac

- index ee2c86537..571f7a0b5 100644

+ index ee2c86537e98..571f7a0b5aa4 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -167,6 +167,7 @@ case "$target_cpu"-"$platform" in
@@ -51,7 +51,7 @@ 

   AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ])

   AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi])

  diff --git a/gentpl.py b/gentpl.py

- index f08bcc404..ed268178b 100644

+ index f08bcc404f6a..ed268178b4db 100644

  --- a/gentpl.py

  +++ b/gentpl.py

  @@ -31,7 +31,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
@@ -91,7 +91,7 @@ 

   for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)

   

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 781d0ffbf..bec058554 100644

+ index 781d0ffbf750..bec0585549a1 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -239,6 +239,16 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
@@ -112,7 +112,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 6540dc951..411dca46b 100644

+ index 6540dc951d4c..411dca46bf28 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -92,6 +92,8 @@ kernel = {
@@ -199,7 +199,7 @@ 

     sparc64_ieee1275 = lib/ieee1275/cmos.c;

  diff --git a/grub-core/kern/arm/coreboot/cbtable.c b/grub-core/kern/arm/coreboot/cbtable.c

  new file mode 100644

- index 000000000..8a655bb5c

+ index 000000000000..8a655bb5cc28

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/cbtable.c

  @@ -0,0 +1,40 @@
@@ -245,7 +245,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/coreboot/coreboot.S b/grub-core/kern/arm/coreboot/coreboot.S

  new file mode 100644

- index 000000000..a1104526c

+ index 000000000000..a1104526c154

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/coreboot.S

  @@ -0,0 +1,44 @@
@@ -295,7 +295,7 @@ 

  +

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

  new file mode 100644

- index 000000000..51ecaceb0

+ index 000000000000..51ecaceb005b

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -0,0 +1,127 @@
@@ -428,7 +428,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c

  new file mode 100644

- index 000000000..ebefb99d5

+ index 000000000000..ebefb99d58f8

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/timer.c

  @@ -0,0 +1,65 @@
@@ -498,7 +498,7 @@ 

  +    grub_fatal ("No timer found");

  +}

  diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S

- index 640837cba..3946fe8e1 100644

+ index 640837cba516..3946fe8e1830 100644

  --- a/grub-core/kern/arm/startup.S

  +++ b/grub-core/kern/arm/startup.S

  @@ -24,6 +24,7 @@
@@ -527,7 +527,7 @@ 

   	@ Since we _are_ the C run-time, we need to manually zero the BSS

   	@ region before continuing

  diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c

- index 996d3f407..aec63dbd1 100644

+ index 996d3f407382..aec63dbd1209 100644

  --- a/grub-core/kern/coreboot/cbtable.c

  +++ b/grub-core/kern/coreboot/cbtable.c

  @@ -23,6 +23,8 @@
@@ -541,7 +541,7 @@ 

   grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header)

  diff --git a/grub-core/lib/dummy/reboot.c b/grub-core/lib/dummy/reboot.c

  new file mode 100644

- index 000000000..b8cbed8f8

+ index 000000000000..b8cbed8f8117

  --- /dev/null

  +++ b/grub-core/lib/dummy/reboot.c

  @@ -0,0 +1,32 @@
@@ -578,7 +578,7 @@ 

  +  while (1);

  +}

  diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

- index 5b39f02bb..01374ee78 100644

+ index 5b39f02bb2e5..01374ee78fa6 100644

  --- a/grub-core/loader/arm/linux.c

  +++ b/grub-core/loader/arm/linux.c

  @@ -31,6 +31,8 @@
@@ -597,7 +597,7 @@ 

  +#endif

  diff --git a/include/grub/arm/coreboot/console.h b/include/grub/arm/coreboot/console.h

  new file mode 100644

- index 000000000..13a14b783

+ index 000000000000..13a14b783839

  --- /dev/null

  +++ b/include/grub/arm/coreboot/console.h

  @@ -0,0 +1,29 @@
@@ -632,7 +632,7 @@ 

  +#endif /* ! GRUB_MACHINE_CONSOLE_HEADER */

  diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h

  new file mode 100644

- index 000000000..09cd7fe32

+ index 000000000000..09cd7fe328c7

  --- /dev/null

  +++ b/include/grub/arm/coreboot/kernel.h

  @@ -0,0 +1,44 @@
@@ -681,7 +681,7 @@ 

  +

  +#endif /* ! GRUB_KERNEL_MACHINE_HEADER */

  diff --git a/include/grub/offsets.h b/include/grub/offsets.h

- index c88c86d4d..bf0689fc9 100644

+ index c88c86d4d2eb..bf0689fc99a8 100644

  --- a/include/grub/offsets.h

  +++ b/include/grub/offsets.h

  @@ -122,6 +122,12 @@
@@ -698,7 +698,7 @@ 

      for PowerMac to prevent "CLAIM failed" error.  The real fix is to

      rewrite grub-mkimage to generate valid ELF files.  */

  diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c

- index 3fab93e20..a2bb05439 100644

+ index 3fab93e20884..a2bb05439f0c 100644

  --- a/util/grub-mkimagexx.c

  +++ b/util/grub-mkimagexx.c

  @@ -87,7 +87,8 @@ struct fixup_block_list
@@ -764,7 +764,7 @@ 

         {

   	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 528166c87..6aa77ed73 100644

+ index 528166c87ac4..6aa77ed73675 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -533,6 +533,45 @@ static const struct grub_install_image_target_desc image_targets[] =

@@ -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/198] Add support for device-tree-based drivers.

+ Subject: [PATCH 020/206] Add support for device-tree-based drivers.

  

  ---

   conf/Makefile.common               |   4 +-
@@ -22,7 +22,7 @@ 

   create mode 100644 include/grub/fdtbus.h

  

  diff --git a/conf/Makefile.common b/conf/Makefile.common

- index 11296b550..311da61c6 100644

+ index 11296b550a7c..311da61c6c59 100644

  --- a/conf/Makefile.common

  +++ b/conf/Makefile.common

  @@ -86,9 +86,11 @@ CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST
@@ -39,7 +39,7 @@ 

   # Define these variables to calm down automake

   

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index bec058554..fc6ca3051 100644

+ index bec0585549a1..fc6ca305147d 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -368,6 +368,16 @@ terminal.lst: $(MARKER_FILES)
@@ -60,7 +60,7 @@ 

   	(for pp in $^; do \

   	  b=`basename $$pp .marker`; \

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 411dca46b..77d0b019e 100644

+ index 411dca46bf28..77d0b019eb28 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -158,6 +158,8 @@ kernel = {
@@ -74,7 +74,7 @@ 

     terminfoinkernel = term/tparm.c;

  diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c

  new file mode 100644

- index 000000000..6fb077000

+ index 000000000000..6fb077000a57

  --- /dev/null

  +++ b/grub-core/bus/fdt.c

  @@ -0,0 +1,255 @@
@@ -334,7 +334,7 @@ 

  +  return dtb;

  +}

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index 51ecaceb0..aec75c672 100644

+ index 51ecaceb005b..aec75c672a24 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -33,6 +33,7 @@
@@ -379,7 +379,7 @@ 

   }

   

  diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c

- index b5d520f20..bdc630244 100644

+ index b5d520f20888..bdc6302448d0 100644

  --- a/grub-core/lib/fdt.c

  +++ b/grub-core/lib/fdt.c

  @@ -102,13 +102,13 @@ static grub_uint32_t *get_next_node (const void *fdt, char *node_name)
@@ -589,7 +589,7 @@ 

   		       const void *val, grub_uint32_t len)

   {

  diff --git a/include/grub/fdt.h b/include/grub/fdt.h

- index fdfca75bf..75525fa31 100644

+ index fdfca75bf487..75525fa317c3 100644

  --- a/include/grub/fdt.h

  +++ b/include/grub/fdt.h

  @@ -20,6 +20,7 @@
@@ -633,7 +633,7 @@ 

     grub_uint32_t _val = grub_cpu_to_be32(val); \

  diff --git a/include/grub/fdtbus.h b/include/grub/fdtbus.h

  new file mode 100644

- index 000000000..985837e55

+ index 000000000000..985837e55f6c

  --- /dev/null

  +++ b/include/grub/fdtbus.h

  @@ -0,0 +1,73 @@
@@ -711,7 +711,7 @@ 

  +

  +#endif

  diff --git a/include/grub/kernel.h b/include/grub/kernel.h

- index 20ddf2da2..ecd88ca72 100644

+ index 20ddf2da297d..ecd88ca72c6d 100644

  --- a/include/grub/kernel.h

  +++ b/include/grub/kernel.h

  @@ -28,7 +28,8 @@ enum
@@ -725,7 +725,7 @@ 

   

   /* The module header.  */

  diff --git a/include/grub/util/install.h b/include/grub/util/install.h

- index 5ca4811cd..6abd288c3 100644

+ index 5ca4811cd130..6abd288c313e 100644

  --- a/include/grub/util/install.h

  +++ b/include/grub/util/install.h

  @@ -176,7 +176,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
@@ -738,7 +738,7 @@ 

   const struct grub_install_image_target_desc *

   grub_install_get_image_target (const char *arg);

  diff --git a/util/grub-install-common.c b/util/grub-install-common.c

- index 452b230da..8539ff348 100644

+ index 452b230daedc..8539ff3484dc 100644

  --- a/util/grub-install-common.c

  +++ b/util/grub-install-common.c

  @@ -499,7 +499,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
@@ -751,7 +751,7 @@ 

       grub_install_pop_module ();

   }

  diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c

- index aba19d21b..98d24cc06 100644

+ index aba19d21b9a7..98d24cc06ea5 100644

  --- a/util/grub-mkimage.c

  +++ b/util/grub-mkimage.c

  @@ -71,6 +71,7 @@ static struct argp_option options[] = {
@@ -794,7 +794,7 @@ 

     grub_util_file_sync  (fp);

     fclose (fp);

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 6aa77ed73..e22d82afa 100644

+ index 6aa77ed73675..e22d82afa61a 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -777,13 +777,12 @@ grub_install_generate_image (const char *dir, const char *prefix,

@@ -1,14 +1,14 @@ 

  From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:26:36 +0200

- Subject: [PATCH 021/198] arm-coreboot: Support for vexpress timer.

+ Subject: [PATCH 021/206] arm-coreboot: Support for vexpress timer.

  

  ---

   grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++

   1 file changed, 36 insertions(+)

  

  diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c

- index ebefb99d5..d97b844f8 100644

+ index ebefb99d58f8..d97b844f8487 100644

  --- a/grub-core/kern/arm/coreboot/timer.c

  +++ b/grub-core/kern/arm/coreboot/timer.c

  @@ -21,6 +21,7 @@

@@ -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/198] arm-coreboot: Export FDT routines.

+ Subject: [PATCH 022/206] arm-coreboot: Export FDT routines.

  

  We need to use them from modules as well.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 2 insertions(+)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index fc6ca3051..147e6959c 100644

+ index fc6ca305147d..147e6959c971 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -246,7 +246,9 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

@@ -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/198] at_keyboard: Split protocol from controller code.

+ Subject: [PATCH 023/206] at_keyboard: Split protocol from controller code.

  

  On vexpress controller is different but protocol is the same, so reuse the

  code.
@@ -16,7 +16,7 @@ 

   create mode 100644 include/grub/ps2.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 77d0b019e..6ade6e950 100644

+ index 77d0b019eb28..6ade6e950576 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -251,6 +251,7 @@ kernel = {
@@ -44,7 +44,7 @@ 

   };

   

  diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c

- index b4ea9ff7e..3ab4e205f 100644

+ index b4ea9ff7e637..3ab4e205f40b 100644

  --- a/grub-core/term/at_keyboard.c

  +++ b/grub-core/term/at_keyboard.c

  @@ -22,212 +22,21 @@
@@ -567,7 +567,7 @@ 

   }

  diff --git a/grub-core/term/ps2.c b/grub-core/term/ps2.c

  new file mode 100644

- index 000000000..7ae4e9f2f

+ index 000000000000..7ae4e9f2f8cd

  --- /dev/null

  +++ b/grub-core/term/ps2.c

  @@ -0,0 +1,387 @@
@@ -959,7 +959,7 @@ 

  +    }

  +}

  diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h

- index b4f8ff0a0..b031523eb 100644

+ index b4f8ff0a0611..b031523eb7df 100644

  --- a/include/grub/at_keyboard.h

  +++ b/include/grub/at_keyboard.h

  @@ -27,10 +27,6 @@
@@ -975,7 +975,7 @@ 

   #define KEYBOARD_SCANCODE(x)	((x) & 0x7f)

  diff --git a/include/grub/ps2.h b/include/grub/ps2.h

  new file mode 100644

- index 000000000..4f2e527e4

+ index 000000000000..4f2e527e4976

  --- /dev/null

  +++ b/include/grub/ps2.h

  @@ -0,0 +1,43 @@

@@ -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/198] arm_coreboot: Support keyboard for vexpress.

+ Subject: [PATCH 024/206] arm_coreboot: Support keyboard for vexpress.

  

  ---

   grub-core/Makefile.am              |   1 +
@@ -12,7 +12,7 @@ 

   create mode 100644 grub-core/term/arm/pl050.c

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 147e6959c..a2aaf9f54 100644

+ index 147e6959c971..a2aaf9f54b00 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -240,6 +240,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
@@ -24,7 +24,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 6ade6e950..6be6e7f61 100644

+ index 6ade6e950576..6be6e7f61ee7 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -160,6 +160,9 @@ kernel = {
@@ -38,7 +38,7 @@ 

     terminfoinkernel = term/terminfo.c;

     terminfoinkernel = term/tparm.c;

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index aec75c672..a06ccb72f 100644

+ index aec75c672a24..a06ccb72f42e 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -133,6 +133,7 @@ grub_machine_init (void)
@@ -51,7 +51,7 @@ 

   void

  diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c

  new file mode 100644

- index 000000000..e4cda3056

+ index 000000000000..e4cda305666d

  --- /dev/null

  +++ b/grub-core/term/arm/pl050.c

  @@ -0,0 +1,189 @@

@@ -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/198] arm_coreboot: Support grub-mkstandalone.

+ Subject: [PATCH 025/206] arm_coreboot: Support grub-mkstandalone.

  

  ---

   include/grub/util/install.h |  6 +++++-
@@ -10,7 +10,7 @@ 

   3 files changed, 22 insertions(+), 3 deletions(-)

  

  diff --git a/include/grub/util/install.h b/include/grub/util/install.h

- index 6abd288c3..5910b0c09 100644

+ index 6abd288c313e..5910b0c09bc8 100644

  --- a/include/grub/util/install.h

  +++ b/include/grub/util/install.h

  @@ -29,6 +29,8 @@
@@ -41,7 +41,7 @@ 

   

   extern char *grub_install_source_directory;

  diff --git a/util/grub-install-common.c b/util/grub-install-common.c

- index 8539ff348..9e3e358c9 100644

+ index 8539ff3484dc..9e3e358c96ae 100644

  --- a/util/grub-install-common.c

  +++ b/util/grub-install-common.c

  @@ -73,6 +73,7 @@ grub_install_help_filter (int key, const char *text,
@@ -94,7 +94,7 @@ 

   

   char *

  diff --git a/util/grub-install.c b/util/grub-install.c

- index 9074d3e9e..75e3e5ba6 100644

+ index 9074d3e9e52d..75e3e5ba6f07 100644

  --- a/util/grub-install.c

  +++ b/util/grub-install.c

  @@ -486,6 +486,7 @@ have_bootdev (enum grub_install_plat pl)

@@ -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/198] arm_coreboot: Support loading linux images.

+ Subject: [PATCH 026/206] arm_coreboot: Support loading linux images.

  

  ---

   grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------
@@ -9,7 +9,7 @@ 

   2 files changed, 83 insertions(+), 65 deletions(-)

  

  diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

- index 01374ee78..260cbf068 100644

+ index 01374ee78fa6..260cbf06861e 100644

  --- a/grub-core/loader/arm/linux.c

  +++ b/grub-core/loader/arm/linux.c

  @@ -31,8 +31,6 @@
@@ -271,7 +271,7 @@ 

   }

  -#endif

  diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h

- index a66caad13..f217f8281 100644

+ index a66caad13db8..f217f8281ade 100644

  --- a/include/grub/arm/linux.h

  +++ b/include/grub/arm/linux.h

  @@ -46,6 +46,22 @@ grub_arm_firmware_get_machine_type (void)

@@ -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