Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62548 )
Change subject: payloads/tianocore: Fix up Kconfig repo, bootsplash options ......................................................................
payloads/tianocore: Fix up Kconfig repo, bootsplash options
Commit 0884f210 [payloads/tianocore: Rework Makefile] added a "custom" option for the edk2 payload, but neglected to clear the default edk2 repo and tag/branch fields, leaving the defaults for the UEFIPAYLOAD option. Clear these to make it ovbious they should be set by the user.
It also removed the Kconfig guarding the use of a custom bootsplash image, leaving the default "bootsplash.bmp" which does not exist, causing a silent failure when building. Add a BMP of the coreboot logo as the default bootsplash and adjust the path/filename. Correct the help text since it was not adjusted when the "use" Kconfig was removed in 0084f210.
Change-Id: I1b6af815564fc02eb93c4727d15963361095cc75 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M payloads/external/tianocore/Kconfig A payloads/external/tianocore/coreboot_logo.bmp 2 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/62548/1
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 4194290..e7542dc 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -46,6 +46,7 @@ string "URL to git repository for edk2" default "https://github.com/tianocore/edk2" if TIANOCORE_UPSTREAM default "https://github.com/mrchromebox/edk2" if TIANOCORE_UEFIPAYLOAD || TIANOCORE_COREBOOTPAYLOAD + default "" if TIANOCORE_CUSTOM help coreboot supports an array of build options which can be found below. These options will only have an effect if the relevant options exist in the target repository. @@ -55,6 +56,7 @@ default "origin/uefipayload_202107" if TIANOCORE_UEFIPAYLOAD default "origin/master" if TIANOCORE_UPSTREAM default "origin/coreboot_fb" if TIANOCORE_COREBOOTPAYLOAD + default "" if TIANOCORE_CUSTOM help The commit's SHA-1 or branch name of the revision to use. This must exist in TIANOCORE_REPOSITORY, and in the case of a branch name, prefixed with origin i.e. @@ -94,17 +96,13 @@
config TIANOCORE_BOOTSPLASH_FILE string "Tianocore Bootsplash path and filename" - default "bootsplash.bmp" + default "payloads/external/tianocore/coreboot_logo.bmp" help - Select this option if you have a bootsplash image that you would - like to be used. If this option is not selected, the default - coreboot logo (European Brown Hare) will used. - The path and filename of the file to use as graphical bootsplash image. The file must be an uncompressed BMP, in BMP 3 format.
- Linux can create these with the below command: - `convert splosh.bmp BMP3:splash.bmp` + Override the default option if you have a custom bootsplash image that + you would like to be used; otherwise, the coreboot logo will be used.
This image will also be used as the BGRT boot image, which may persist through your OS boot process. diff --git a/payloads/external/tianocore/coreboot_logo.bmp b/payloads/external/tianocore/coreboot_logo.bmp new file mode 100644 index 0000000..3997e96 --- /dev/null +++ b/payloads/external/tianocore/coreboot_logo.bmp Binary files differ