[coreboot-gerrit] Change in coreboot[master]: [WIP]payloads/tianocore: Enable UEFIPayload

[Lance Zhao (Code Review)]

Hello Lijian Zhao,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/34459

to review the following change.

Change subject: [WIP]payloads/tianocore: Enable UEFIPayload
......................................................................

[WIP]payloads/tianocore: Enable UEFIPayload

Corebootpayload package in upstream tianocore had been replaced with
UEFIPayload, make the changes in coreboot side as well.

BUG=N/A
TEST=Able to build with tianocore debug and release build.

Signed-off-by: Lijian Zhao 
Change-Id: I0b7785fde9f4113b2cd91323ac0358b229c5a6e6
---
M payloads/external/tianocore/Makefile
1 file changed, 6 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/34459/1

diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index f208e59..727aa22 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -39,9 +39,9 @@
 endif

ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y)
-	BUILD_STR=-a IA32 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -b $(BUILD_TYPE) $(TIMER)
+	BUILD_STR=-a IA32 -t COREBOOT -p UefiPayloadPkg/UefiPayloadPkgIa32.dsc -b $(BUILD_TYPE) $(TIMER) -D BOOTLOADER=COREBOOT
 else
-	BUILD_STR=-a IA32 -a X64 -t COREBOOT -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -b $(BUILD_TYPE) $(TIMER)
+	BUILD_STR=-a IA32 -a X64 -t COREBOOT -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc -b $(BUILD_TYPE) $(TIMER) -D BOOTLOADER=COREBOOT
 endif

all: clean build
@@ -85,9 +85,9 @@
    	echo "    Copying custom bootsplash image"; \
    	case "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" in \
    		/*) cp $(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \
-				$(project_dir)/CorebootPayloadPkg/Logo/Logo.bmp;; \
+				$(project_dir)/UefiPayloadPkg/Logo/Logo.bmp;; \
    		*) cp $(top)/$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \
-				$(project_dir)/CorebootPayloadPkg/Logo/Logo.bmp;; \
+				$(project_dir)/UefiPayloadPkg/Logo/Logo.bmp;; \
    	esac \
    fi; \
    cd $(project_dir); \
@@ -99,8 +99,8 @@
    		cat ../tools_def.txt >> $(project_dir)/Conf/tools_def.txt; \
    	fi; \
    	build $(BUILD_STR); \
-		mv $(project_dir)/Build/CorebootPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \
-		git checkout CorebootPayloadPkg/Logo/Logo.bmp > /dev/null 2>&1 || true
+		mv $(project_dir)/Build/UefiPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \
+		git checkout UefiPayloadPkg/Logo/Logo.bmp > /dev/null 2>&1 || true

clean:
    test -d $(project_dir) && (cd $(project_dir); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0