From 744e3898006f33ee6ef281e9aacee141ce3d938f Mon Sep 17 00:00:00 2001 From: Nicholas Sudsgaard Date: Sat, 2 Mar 2024 10:09:14 +0900 Subject: [PATCH] payload/external/edk2: Explicitly define the build arch as X64 Upstream commit 11ad164bce (UefiPayloadPkg: Make UPL build script arch agnostic, 2024-02-22) changes the build script's behavior to not assume the arch. Without defining BUILD_ARCH, the build script will not function properly and results in the payload failing to build. Both UefiPayload and Universal Payload can only be built in X64. Change-Id: Icd942d0c15a99231d09f9cbdc5eb48333b6aa6e5 Signed-off-by: Nicholas Sudsgaard Reviewed-on: https://review.coreboot.org/c/coreboot/+/80883 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth Reviewed-by: Sean Rhodes --- payloads/external/edk2/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 4cb7f0f32b..ef3327ee0b 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -37,6 +37,8 @@ BUILD_STR += -s endif endif +BUILD_STR += -D BUILD_ARCH=X64 + # # EDK II (edk2/master) has the following build options relevant to coreboot: #