GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Stefan Reinauer 2013-02-05 13:58:29 -08:00 committed by Stefan Reinauer
parent 15a66a10b5
commit 275fb63832
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Kconfig
View File

@ -536,13 +536,6 @@ config FILO_MASTER
Newest FILO version Newest FILO version
endchoice endchoice
config TIANOCORE_FILE
string "Tianocore FILE"
depends on PAYLOAD_TIANOCORE
default "COREBOOT.FD"
help
The result of a corebootPkg build
config PAYLOAD_FILE config PAYLOAD_FILE
string "Payload path and filename" string "Payload path and filename"
depends on PAYLOAD_ELF depends on PAYLOAD_ELF
@ -558,6 +551,13 @@ config PAYLOAD_FILE
depends on PAYLOAD_FILO depends on PAYLOAD_FILO
default "payloads/external/FILO/filo/build/filo.elf" 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? # TODO: Defined if no payload? Breaks build?
config COMPRESSED_PAYLOAD_LZMA config COMPRESSED_PAYLOAD_LZMA
bool "Use LZMA compression for payloads" bool "Use LZMA compression for payloads"

2
src/arch/x86/Makefile.inc
View File

@ -101,7 +101,7 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y)
endif endif
ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y) ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y)
@printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" @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 endif
ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
@printf " CONFIG $(DOTCONFIG)\n" @printf " CONFIG $(DOTCONFIG)\n"