[coreboot] New patch to review for coreboot: 11330db Don't add another Kconfig special case for Tiano

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2284

-gerrit

commit 11330db62191be27f1442dcd7000d399800452b4
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Tue Feb 5 13:58:29 2013 -0800

    Don't add another Kconfig special case for Tiano
    
    We don't need a special Kconfig variable anymore
    because the FV _is_ the payload, unlike with the
    old tianocoreboot implementation.
    
    Change-Id: I349b5a95783e4146e3ab7f926871188cf2021935
    Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
 src/Kconfig               | 14 +++++++-------
 src/arch/x86/Makefile.inc |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 95afbe1..92bdf11 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -536,13 +536,6 @@ config FILO_MASTER
 	  Newest FILO version
 endchoice
 
-config TIANOCORE_FILE
-	string "Tianocore FILE"
-	depends on PAYLOAD_TIANOCORE
-	default "COREBOOT.FD"
-	help
-	  The result of a corebootPkg build
-
 config PAYLOAD_FILE
 	string "Payload path and filename"
 	depends on PAYLOAD_ELF
@@ -558,6 +551,13 @@ config PAYLOAD_FILE
 	depends on PAYLOAD_FILO
 	default "payloads/external/FILO/filo/build/filo.elf"
 
+config PAYLOAD_FILE
+	string "Tianocore firmware volume"
+	depends on PAYLOAD_TIANOCORE
+	default "COREBOOT.fd"
+	help
+	  The result of a corebootPkg build
+
 # TODO: Defined if no payload? Breaks build?
 config COMPRESSED_PAYLOAD_LZMA
 	bool "Use LZMA compression for payloads"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 67789ce..419507b 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -101,7 +101,7 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y)
 endif
 ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y)
 	@printf "    PAYLOAD    Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"
-	$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_TIANOCORE_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
+	$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
 endif
 ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
 	@printf "    CONFIG     $(DOTCONFIG)\n"