From 94aa18f527eb1aba7be653a7c20b40cdeeb895c7 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 21 Jul 2021 17:49:58 -0500 Subject: [PATCH] payloads/tianocore: update MrChromebox UEFIPAYLOAD branch Update tianocore branch used with default UEFIPAYLOAD option to mrchromebox/uefipayload_202107 (July 2021) branch. This branch is rebased on edk2 upstream commit 12e34cd2f7900578ee83cb01b8f1696a7bb7511b [OvmfPkg/Bhyve: clean up TPM_ENABLE remnants] vs tag edk2-stable202105. The main changes are fixes for e820 table parsing and support to disable "Above 4G decode", which is required to boot distros with bootloaders that expect to be loaded into RAM below 4G. This fixes booting with Qubes, ZorinOS, Proxmox, among others. Additionally, several commits on top of upstream have been consolidated, reworked, and/or reordered for readability and maintainability. Change-Id: I6f04fd027a0599ca6892a1376938108a2e402ac2 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/56569 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- payloads/external/tianocore/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 92a809ade8..ef3aacfb7a 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -6,7 +6,7 @@ export SHELL := env bash project_name=Tianocore project_dir=$(CURDIR)/tianocore project_git_repo=https://github.com/mrchromebox/edk2 -project_git_branch=uefipayloadpkg +project_git_branch=uefipayload_202107 upstream_git_repo=https://github.com/tianocore/edk2 build_flavor=-D BOOTLOADER=COREBOOT -D PCIE_BASE=$(CONFIG_MMCONF_BASE_ADDRESS) -DPS2_KEYBOARD_ENABLE @@ -14,7 +14,6 @@ build_flavor=-D BOOTLOADER=COREBOOT -D PCIE_BASE=$(CONFIG_MMCONF_BASE_ADDRESS) - ifeq ($(CONFIG_TIANOCORE_UPSTREAM),y) TAG=upstream/master else -# STABLE revision is MrChromebox's UefiPayloadPkg (ueifpayloadpkg) branch TAG=origin/$(project_git_branch) endif