diff options
| author | Paul Menzel <pmenzel@molgen.mpg.de> | 2019-07-06 09:53:01 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-07-13 12:58:24 +0000 |
| commit | 3555389a8cdb4cb10deeafd2e116a387aa6ec5d4 (patch) | |
| tree | 956f610f8eaad70a8a8318fe5cb8d67caa463e47 | |
| parent | 8417485f95b07aa76d81d7006fa5097d018d6df2 (diff) | |
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 <42.pablo.ms@gmail.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34104
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | payloads/external/GRUB2/Kconfig | 2 | ||||
| -rw-r--r-- | payloads/external/GRUB2/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig index c4edab9d11..552f06a523 100644 --- a/payloads/external/GRUB2/Kconfig +++ b/payloads/external/GRUB2/Kconfig @@ -5,7 +5,7 @@ choice 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 31c40665fe..43da597eb7 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 @@ grub2/build/config.h: $(CONFIG_DEP) | checkout 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)" \ |