diff options
| author | Konstantin Aladyshev <aladyshev@nicevt.ru> | 2015-01-24 18:52:10 +0400 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-10-25 07:28:38 +0100 |
| commit | 6544cb3f1b431f96bb6d16f86e2cb4f75a4188b3 (patch) | |
| tree | dc020da109acdc4186feaf5f403578f4f9c00ef4 | |
| parent | 4731423b910213a7ad8ee0a3050501f0349b622d (diff) | |
Separate bootsplash image menuconfig option from others
The possibility of adding a bootsplash image to ROM should be independent
from VGA_ROM_RUN and VESA menuconfig options.
For example, the stored image could be saved in CBFS not for coreboot
but for later use in SeaBIOS.
Change-Id: I3a0ed53489c40d4d44bd4ebc358ae6667e6c797f
Signed-off-by: Konstantin Aladyshev <aladyshev@nicevt.ru>
Reviewed-on: http://review.coreboot.org/12129
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | src/Kconfig | 17 | ||||
| -rw-r--r-- | src/device/Kconfig | 13 |
3 files changed, 21 insertions, 11 deletions
diff --git a/Makefile.inc b/Makefile.inc index 310944b813..984c886819 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -661,7 +661,7 @@ endif @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ print -cbfs-files-$(CONFIG_BOOTSPLASH) += bootsplash.jpg +cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash.jpg bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) bootsplash.jpg-type := bootsplash diff --git a/src/Kconfig b/src/Kconfig index 368384dc92..3b7a249b51 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -325,6 +325,23 @@ config RAM_CODE_SUPPORT If enabled, coreboot discovers RAM configuration (value obtained by reading board straps) and stores it in coreboot table. +config BOOTSPLASH_IMAGE + bool "Add a bootsplash image" + help + Select this option if you have a bootsplash image that you would + like to add to your ROM. + + This will only add the image to the ROM. To actually run it check + options under 'Display' section. + +config BOOTSPLASH_FILE + string "Bootsplash path and filename" + depends on BOOTSPLASH_IMAGE + default "bootsplash.jpg" + help + The path and filename of the file to use as graphical bootsplash + screen. The file format has to be jpg. + endmenu source "src/acpi/Kconfig" diff --git a/src/device/Kconfig b/src/device/Kconfig index bcf7dad2a0..784b6d794c 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -556,15 +556,8 @@ config BOOTSPLASH This option shows a graphical bootsplash screen. The graphics are loaded from the CBFS file bootsplash.jpg. - You will be able to specify the location and file name of the - image later. - -config BOOTSPLASH_FILE - string "Bootsplash path and filename" - depends on BOOTSPLASH - default "bootsplash.jpg" - help - The path and filename of the file to use as graphical bootsplash - screen. The file format has to be jpg. + You can either specify the location and file name of the + image in the 'General' section or add it manually to CBFS, using, + for example, cbfstool. endmenu |