diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2022-08-02 10:00:56 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-09-01 14:15:13 +0000 |
| commit | 234c42f7ed0ad15cbe3b5627d74b689551130bd6 (patch) | |
| tree | 9121b494c8a18a1441b50d1d6201514e428d8819 /payloads | |
| parent | 461d1c8268d8ff480ab8d62213381bd28a1e2e97 (diff) | |
| download | coreboot-234c42f7ed0ad15cbe3b5627d74b689551130bd6.tar.gz | |
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 <sean@starlabs.systems>
Change-Id: If94abd4e28917718c76ad5945966e7be668c8f61
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66364
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/edk2/Makefile | 9 |
1 files 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!"; \ |