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

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>
This commit is contained in:
Konstantin Aladyshev 2015-01-24 18:52:10 +04:00 committed by Patrick Georgi
parent 4731423b91
commit 6544cb3f1b
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -661,7 +661,7 @@ endif
@printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n"
$(CBFSTOOL) $@ print $(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-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE))
bootsplash.jpg-type := bootsplash bootsplash.jpg-type := bootsplash

17
src/Kconfig
View File

@ -325,6 +325,23 @@ config RAM_CODE_SUPPORT
If enabled, coreboot discovers RAM configuration (value obtained by If enabled, coreboot discovers RAM configuration (value obtained by
reading board straps) and stores it in coreboot table. 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 endmenu
source "src/acpi/Kconfig" source "src/acpi/Kconfig"

13
src/device/Kconfig
View File

@ -556,15 +556,8 @@ config BOOTSPLASH
This option shows a graphical bootsplash screen. The graphics are This option shows a graphical bootsplash screen. The graphics are
loaded from the CBFS file bootsplash.jpg. loaded from the CBFS file bootsplash.jpg.
You will be able to specify the location and file name of the You can either specify the location and file name of the
image later. image in the 'General' section or add it manually to CBFS, using,
for example, cbfstool.
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.
endmenu endmenu