x86: Init video in SPL if enabled

When video is required in SPL, set this up ready for use. Ignore any
problems since it may be that video is not actually available and we
still want to continue on to U-Boot proper in that case.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index f27501875eccb6fd6b14701d89c4af0f9d1f7417..039f219f50aed762b51a2064027d291512bfc007 100644 (file)
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <spl.h>
 #include <syscon.h>
+#include <vesa.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/fsp2/fsp_api.h>
@@ -263,4 +264,12 @@ void spl_board_init(void)
 #ifndef CONFIG_TPL
        preloader_console_init();
 #endif
+
+       if (CONFIG_IS_ENABLED(VIDEO)) {
+               struct udevice *dev;
+
+               /* Set up PCI video in SPL if required */
+               uclass_first_device_err(UCLASS_PCI, &dev);
+               uclass_first_device_err(UCLASS_VIDEO, &dev);
+       }
 }