[coreboot-gerrit] Change in coreboot[master]: payloads: Update GRUB stable from 2.02 to 2.04

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34104 )

Change subject: payloads: Update GRUB stable from 2.02 to 2.04
......................................................................

payloads: Update GRUB stable from 2.02 to 2.04

GRUB 2.04 was released on July 5th, 2019, so update. The only change-log
is the git history. Some coreboot related changes are listed below.

1.  coreboot: Changed cbmemc to support updated console format from
    coreboot.
2.  ahci: Increase time-out from 10 s to 32 s
3.  normal/menu: Do not treat error values as key presses

When building from the git repository, `./bootstrap.sh` needs to be run
to set up Gnulib. Ignore the exit code, as older versions might not have
this script.

Change-Id: Iab0b87164ed86f15d3415af935998b59e0d76c45
Signed-off-by: Pablo 
Signed-off-by: Paul Menzel 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34104
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M payloads/external/GRUB2/Kconfig
M payloads/external/GRUB2/Makefile
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index c4edab9..552f06a 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -5,7 +5,7 @@
    default GRUB2_STABLE

config GRUB2_STABLE
-	bool "2.02"
+	bool "2.04"
    help
      Stable GRUB2 version

diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
index 31c4066..43da597 100644
--- a/payloads/external/GRUB2/Makefile
+++ b/payloads/external/GRUB2/Makefile
@@ -1,9 +1,9 @@
 TAG-$(CONFIG_GRUB2_MASTER)=
 TAG-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID)
-TAG-$(CONFIG_GRUB2_STABLE)=e54c99aaff5e5f6f5d3b06028506c57e66d8ef77
+TAG-$(CONFIG_GRUB2_STABLE)=grub-2.04
 NAME-$(CONFIG_GRUB2_MASTER)=HEAD
 NAME-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID)
-NAME-$(CONFIG_GRUB2_STABLE)=2.02
+NAME-$(CONFIG_GRUB2_STABLE)=2.04

project_git_repo=https://git.savannah.gnu.org/git/grub.git/
 project_dir=grub2
@@ -28,7 +28,7 @@
    echo "    CONFIG     GRUB2 $(NAME-y)"
    rm -rf grub2/build
    mkdir grub2/build
-	cd grub2 && ./autogen.sh
+	cd grub2 && ./bootstrap.sh ; ./autogen.sh
    cd grub2/build && ../configure CC="$(HOSTCC)" LD="$(LD)" \
    FREETYPE="pkg-config freetype2" BUILD_FREETYPE="pkg-config freetype2" \
    TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \