From 234c42f7ed0ad15cbe3b5627d74b689551130bd6 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Tue, 2 Aug 2022 10:00:56 +0100 Subject: payloads/edk2: Remove architecture from build string Whilst UefiPayloadPkg is always built with support for 32-bit and 64-bit, this is not the case for all edk2 targets. Move this to the build command so they can be specified on each target. Also add the `-s` switch, which stands for quiet to suppress edk2 printing War and Peace whilst building. Signed-off-by: Sean Rhodes Change-Id: If94abd4e28917718c76ad5945966e7be668c8f61 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66364 Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- payloads/external/edk2/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 7b5584569f..045ef09dc7 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -8,9 +8,10 @@ export WORKSPACE := $(CURDIR)/workspace export EDK2_PATH := $(WORKSPACE)/$(word 3,$(subst /, ,$(CONFIG_EDK2_REPOSITORY))) export PACKAGES_PATH := $(EDK2_PATH) -BUILD_STR = -a IA32 -a X64 -t COREBOOT -BUILD_STR += -p UefiPayloadPkg/UefiPayloadPkg.dsc -BUILD_STR += -D BOOTLOADER=COREBOOT -q +BUILD_STR = -p UefiPayloadPkg/UefiPayloadPkg.dsc +BUILD_STR += -t COREBOOT +BUILD_STR += -D BOOTLOADER=COREBOOT +BUILD_STR += -q -s # # EDK II has the following build options relevant to coreboot: @@ -182,7 +183,7 @@ $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd: cd $(WORKSPACE); \ source $(EDK2_PATH)/edksetup.sh; \ echo -n "EDK2: Building... "; \ - build -b $(RELEASE_STR) $(BUILD_STR) \ + build -a IA32 -a X64 -b $(RELEASE_STR) $(BUILD_STR) \ -y $(WORKSPACE)/Build/UefiPayloadPkgX64/UEFIPAYLOAD.txt; \ if [ ! -f $@ ]; then \ echo "Failed!"; \ -- cgit v1.2.3