[coreboot-gerrit] Change in coreboot[master]: wip

[Lance Zhao (Code Review)]

Hello Lijian Zhao,

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

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

to review the following change.

Change subject: wip
......................................................................

wip

Signed-off-by: Lijian Zhao 
Change-Id: I40a91053a66781948a773489128b00979d7b4538
---
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Kconfig.name
M payloads/external/tianocore/Makefile
3 files changed, 6 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/34638/1

diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index 0d1ff99..9b5a41f 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -49,9 +49,9 @@

config TIANOCORE_REVISION_ID
    string "Insert a commit's SHA-1 or a branch name"
-	depends on TIANOCORE_MASTER
    help
-	   The commit's SHA-1 or branch name of the revision to use.
+	   The commit's SHA-1 or branch name of the revision to use. Choose "upstream/master"
+	   for master branch of Tianocore release on github.

choice
    prompt "Target architecture"
diff --git a/payloads/external/tianocore/Kconfig.name b/payloads/external/tianocore/Kconfig.name
index 62f0d6f..7b0b300 100644
--- a/payloads/external/tianocore/Kconfig.name
+++ b/payloads/external/tianocore/Kconfig.name
@@ -1,5 +1,5 @@
 config PAYLOAD_TIANOCORE
-	bool "Tianocore payload package"
+	bool "Tianocore payload"
    depends on ARCH_X86
    help
      Select this option if you want to build a coreboot image
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 806380c..78a0c28 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -25,14 +25,15 @@
 ifeq ($(CONFIG_TIANOCORE_UEFIPAYLOAD),y)
 bootloader=UefiPayloadPkg
 build_flavor=-D BOOTLOADER=COREBOOT -D PCIE_BASE=$(CONFIG_MMCONF_BASE_ADDRESS)
-TAG-$(CONFIG_TIANOCORE_MASTER)=$(CONFIG_TIANOCORE_REVISION_ID)
 else
 bootloader=CorebootPayloadPkg
-build_flavor=
 # STABLE revision is MrChromebox's coreboot framebuffer (coreboot_fb) branch
 TAG-$(CONFIG_TIANOCORE_STABLE)=origin/$(project_git_branch)
 endif

+ifneq ($(CONFIG_TIANOCORE_REVISION_ID),)
+TAG-y=$(CONFIG_TIANOCORE_REVISION_ID)
+endif

export EDK_TOOLS_PATH=$(project_dir)/BaseTools