diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-02-05 13:58:29 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-02-05 23:37:54 +0100 |
| commit | 275fb63832158c0131575bcd2b6b441a0a1c5df1 (patch) | |
| tree | 843dd25d4651d04dc1e0e015812457b4b16fefa9 /src | |
| parent | 15a66a10b53c257b549f6c9efe6355e39556a8c5 (diff) | |
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@google.com>
Reviewed-on: http://review.coreboot.org/2284
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Kconfig | 14 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Kconfig b/src/Kconfig index 95afbe1acc..92bdf113da 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 67789ce755..419507b4da 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" |