summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2020-12-27 20:35:26 -0600
committerMichael Niewöhner <foss@mniewoehner.de>2020-12-30 01:27:51 +0000
commit4b9b44696d8f8dabc269802655f1a18e5afd481a (patch)
tree4592ec895cf036b2708e260b25222760fd4f94c9 /payloads
parentfca152cb89b1481c660819664cc2d76a2a15e011 (diff)
payloads/tianocore: Clean up build string
Extract the architecture (-a) and package (-p) options into a new variable (ARCH) to simplify the construction of BUILD_STR. Test: build/boot various boards w/Tianocore payload Change-Id: I490d48428ac56d613d0b704700dfcf4ebfb2d245 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48942 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/tianocore/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index a29dfd2d8e..198c17f6fe 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -40,11 +40,13 @@ endif
TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y)
- BUILD_STR=-q -a IA32 -t COREBOOT -p $(bootloader)/$(bootloader)Ia32.dsc -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT) $(build_flavor)
+ARCH=-a IA32 -p $(bootloader)/$(bootloader)Ia32.dsc
else
- BUILD_STR=-q -a IA32 -a X64 -t COREBOOT -p $(bootloader)/$(bootloader)Ia32X64.dsc -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT) $(build_flavor)
+ARCH=-a IA32 -a X64 -p $(bootloader)/$(bootloader)Ia32X64.dsc
endif
+BUILD_STR=-q $(ARCH) -t COREBOOT -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT) $(build_flavor)
+
all: clean build
$(project_dir):