Change in coreboot[master]: payloads/tianocore: Specify Build Directory

[Sean Rhodes (Code Review)]

Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61572 )

Change subject: payloads/tianocore: Specify Build Directory
......................................................................

payloads/tianocore: Specify Build Directory

Pass build directory of `Build/coreboot` so all variants will output to the
same directory. This only makes the Makefile simpler.

Signed-off-by: Sean Rhodes 
Change-Id: I055f7fb13c7b5f7f1703230e329160da2ef3f137
---
M payloads/external/tianocore/Makefile
1 file changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/61572/1

diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index ebf8973..6065ff2 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -25,6 +25,7 @@
 BUILD_STR = -q
 BUILD_STR += -a IA32 -a X64
 BUILD_STR += -D BOOTLOADER=COREBOOT
+BUILD_STR += OUTPUT_DIRECTORY = Build/coreboot
 ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y)
 BUILD_STR += -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 else
@@ -89,8 +90,6 @@
 BUILD_STR += -D USE_HPET_TIMER = TRUE
 endif

-bootloader = $(word 9,$(subst /, ,$(BUILD_STR)))
-
 export EDK_TOOLS_PATH=$(project_dir)/BaseTools

all: clean build
@@ -149,7 +148,7 @@
    		cat ../tools_def.txt >> $(project_dir)/Conf/tools_def.txt; \
    	fi; \
    	build $(BUILD_STR); \
-		mv $(project_dir)/Build/$(bootloader)*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \
+		mv $(project_dir)/Build/coreboot/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \
    	git checkout MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true

clean: