Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48942 )
Change subject: payloads/tianocore: Clean up build string ......................................................................
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.
Change-Id: I490d48428ac56d613d0b704700dfcf4ebfb2d245 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M payloads/external/tianocore/Makefile 1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/48942/1
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index a29dfd2..198c17f 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -40,11 +40,13 @@ 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):
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48942 )
Change subject: payloads/tianocore: Clean up build string ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/48942/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/48942/1//COMMIT_MSG@11 PS1, Line 11: Tested? I don't know if the order of arguments matters.
Hello build bot (Jenkins), Nico Huber, Martin Roth, Stefan Reinauer,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48942
to look at the new patch set (#2).
Change subject: payloads/tianocore: Clean up build string ......................................................................
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 --- M payloads/external/tianocore/Makefile 1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/48942/2
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48942 )
Change subject: payloads/tianocore: Clean up build string ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/48942/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/48942/1//COMMIT_MSG@11 PS1, Line 11:
Tested? I don't know if the order of arguments matters.
Done
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48942 )
Change subject: payloads/tianocore: Clean up build string ......................................................................
Patch Set 2: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48942 )
Change subject: payloads/tianocore: Clean up build string ......................................................................
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 --- M payloads/external/tianocore/Makefile 1 file changed, 4 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Michael Niewöhner: Looks good to me, approved
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index a29dfd2..198c17f 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -40,11 +40,13 @@ 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):
-
Matt DeVillier (Code Review) -
Michael Niewöhner (Code Review)
-
Nico Huber (Code Review)