x86: Show an error if video fails

If video is enabled we expect it to work. Avoid silent failure by adding
a panic if things go wrong.

Expand the SPL malloc-area for qemu-x86_64 to avoid a panic.

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

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index f761fbc..aad7485 100644 (file)
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -300,9 +300,14 @@ void spl_board_init(void)
 
        if (CONFIG_IS_ENABLED(VIDEO)) {
                struct udevice *dev;
+               int ret;
 
                /* Set up PCI video in SPL if required */
-               uclass_first_device_err(UCLASS_PCI, &dev);
-               uclass_first_device_err(UCLASS_VIDEO, &dev);
+               ret = uclass_first_device_err(UCLASS_PCI, &dev);
+               if (ret)
+                       panic("Failed to set up PCI");
+               ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
+               if (ret)
+                       panic("Failed to set up video");
        }
 }

diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 39375c7..2771a4b 100644 (file)
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000
 CONFIG_MAX_CPUS=2
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
-CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x3000
 CONFIG_SPL_TEXT_BASE=0xfffd0000
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200