diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2021-05-10 11:02:13 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-05-13 08:30:57 +0000 |
| commit | d3b49b4cda8f0516f872f4ccf37f89fc4bab3a75 (patch) | |
| tree | f34fb2b7be119faa1719a88e793a0006865a7bd7 /payloads/external/tianocore/Kconfig | |
| parent | 14ea5a0947e25084cfd840544ef5990ac95e6cea (diff) | |
payloads/Tianocore: Update default build target, simplify build options
Drop the deprecated COREBOOTPAYLOAD option, and replace it with MrChromebox's
updated UefiPayloadPkg option. Simplify the Kconfig options to make it easier
to build from upstream edk2 master. Drop the TIANOCORE_USE_8254_TIMER Kconfig
option since it applied only to CorebootPayloadPkg. Clean up the Makefile now
that we're only building from a single Tianocore package/target.
Test: build/boot qemu Q35 target with both UefiPayload and Upstream options.
Change-Id: If545fbd0c30be6dcc6ff43107b80980fa23a527e
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54019
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads/external/tianocore/Kconfig')
| -rw-r--r-- | payloads/external/tianocore/Kconfig | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 87b6e15582..e53be168bc 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -4,26 +4,26 @@ config PAYLOAD_FILE string "Tianocore binary" default "payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd" help - The result of a corebootPkg build + The result of a UefiPayloadPkg build choice prompt "Tianocore payload" - default TIANOCORE_COREBOOTPAYLOAD + default TIANOCORE_UEFIPAYLOAD help - Select which type of payload Tianocore will build (default is CorebootPayload) - CorebootPayload: MrChromebox's customized version of Tianocore which works on most - (all?) x86_64 devices - UEFIPayload: Use upstream Tianocore payload from https://github.com/tianocore/edk2 - -config TIANOCORE_COREBOOTPAYLOAD - bool "CorebootPayload" - help - Select this option to build using MrChromebox's custom Tianocore tree - i.e. a version of Tianocore that builds without any errors and just works. + Select which type of payload Tianocore will build (default is UefiPayload) + UefiPayload: MrChromebox's customized fork of Tianocore which works on most + x86_64 devices + Upstream: Use upstream Tianocore payload from https://github.com/tianocore/edk2 config TIANOCORE_UEFIPAYLOAD bool "UEFIPayload" help + Select this option to build using MrChromebox's custom Tianocore fork, + which incorporates fixes/improvements from System 76's and 9elements' trees. + +config TIANOCORE_UPSTREAM + bool "Upstream" + help Select this option if you want to use upstream EDK2 to build Tianocore. endchoice @@ -76,11 +76,6 @@ config TIANOCORE_RELEASE endchoice -config TIANOCORE_USE_8254_TIMER - bool "TianoCore 8254 Timer" - help - Use 8254 Timer for legacy support. - config TIANOCORE_BOOTSPLASH_IMAGE bool "Use a custom bootsplash image" help |