diff options
author | Johanna Schander <coreboot@mimoja.de> | 2019-07-28 09:28:33 +0200 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2019-09-15 11:10:58 +0000 |
commit | c544a85d2a211b04d224d2e21ea03aeedfa34dab (patch) | |
tree | cf24d783f19470f0ea3cc4b56fece8a05c557cdc /src/device | |
parent | bfb0c2d543576f266e282a01f5bf1c074a890917 (diff) |
lib/coreboot_table: Show splashscreen in lb_table_init
Every vga init implementation needs to cache the framebuffer state
to be able to fill the lb_framebuffer struct later on in the
fill_lb_framebuffer call. Showing the bootsplash afterwards
guarantees to have the same interface into all the vga drivers.
This is by far from ideal, as it only allows for a single driver at
compile-time and should be adapted in the future.
It was tested on the wip razer blade stealth using vgabios @ 1280x1024
and also in Qemu @ 1280x1024.
By default the qemu framebuffer will be initialized in 800x600@32.
This can be overwriten by configuration by setting
CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_{X,Y}RES .
Change-Id: I4bec06d22423627e8f429c4b47e0dc9920f1464e
Signed-off-by: Johanna Schander <coreboot@mimoja.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34599
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/device')
-rw-r--r-- | src/device/Kconfig | 24 | ||||
-rw-r--r-- | src/device/pci_device.c | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig index e605bc2097..0b9083313c 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -392,18 +392,6 @@ config FRAMEBUFFER_VESA_MODE default 0x11A if FRAMEBUFFER_VESA_MODE_11A default 0x11B if FRAMEBUFFER_VESA_MODE_11B default 0x118 if FRAMEBUFFER_VESA_MODE_USER - -config BOOTSPLASH - prompt "Show graphical bootsplash" - bool - help - This option shows a graphical bootsplash screen. The graphics are - loaded from the CBFS file bootsplash.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. - endif # FRAMEBUFFER_SET_VESA_MODE choice @@ -447,6 +435,18 @@ config LINEAR_FRAMEBUFFER def_bool y depends on VBE_LINEAR_FRAMEBUFFER || GENERIC_LINEAR_FRAMEBUFFER +config BOOTSPLASH + prompt "Show graphical bootsplash" + bool + depends on LINEAR_FRAMEBUFFER + help + This option shows a graphical bootsplash screen. The graphics are + loaded from the CBFS file bootsplash.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. + config LINEAR_FRAMEBUFFER_MAX_WIDTH int "Maximum width in pixels" depends on LINEAR_FRAMEBUFFER && MAINBOARD_USE_LIBGFXINIT diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 5765529f86..84fc82cbe0 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -34,7 +34,6 @@ #include <arch/acpi.h> #include <device/pci_ops.h> #include <bootmode.h> -#include <bootsplash.h> #include <console/console.h> #include <stdlib.h> #include <stdint.h> @@ -766,9 +765,6 @@ void pci_dev_init(struct device *dev) gfx_set_init_done(1); printk(BIOS_DEBUG, "VGA Option ROM was run\n"); timestamp_add_now(TS_OPROM_END); - - if (CONFIG(BOOTSPLASH)) - set_vesa_bootsplash(); } /** Default device operation for PCI devices */ |