x86: coreboot: Support getting a logo from virtio

Enable this feature so that a splash screen can be provided.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c
index 11294d6e870e78c662b85cc31d02e287d64e7faf..3b90ae75386bf86da2893227b1a442f011495efb 100644 (file)
--- a/board/coreboot/coreboot/coreboot.c
+++ b/board/coreboot/coreboot/coreboot.c
@@ -4,10 +4,11 @@
  */
 
 #include <common.h>
-#include <asm/cb_sysinfo.h>
-#include <asm/global_data.h>
+#include <splash.h>
 #include <init.h>
 #include <smbios.h>
+#include <asm/cb_sysinfo.h>
+#include <asm/global_data.h>
 
 int board_early_init_r(void)
 {
@@ -65,3 +66,18 @@ fallback:
        return checkboard();
 }
 #endif
+
+static struct splash_location coreboot_splash_locations[] = {
+       {
+               .name = "virtio_fs",
+               .storage = SPLASH_STORAGE_VIRTIO,
+               .flags = SPLASH_STORAGE_RAW,
+               .devpart = "0",
+       },
+};
+
+int splash_screen_prepare(void)
+{
+       return splash_source_load(coreboot_splash_locations,
+                                 ARRAY_SIZE(coreboot_splash_locations));
+}

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 1cf5c037e850c4803ca14520b5066a998f57fdd3..d6d679fd7dd9371ed1b140298294f85e1da5df4a 100644 (file)
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -10,6 +10,9 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define SPLASH_SETTINGS "splashsource=virtio_fs\0" \
+       "splashimage=0x1000000\0"
+
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index a03913d5e794360c055a0cb8779c757fa45be902..394978b9d905d78658ec3816e5a9f1b9b35e072c 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -81,9 +81,14 @@
 #define DISTRO_BOOTENV
 #endif
 
+#ifndef SPLASH_SETTINGS
+#define SPLASH_SETTINGS
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS                      \
        DISTRO_BOOTENV                                  \
        CONFIG_STD_DEVICES_SETTINGS                     \
+       SPLASH_SETTINGS                                 \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \