pci: video: Only print out when everything is OK
authorBin Meng <bmeng.cn@gmail.com>
Thu, 12 Apr 2018 05:02:18 +0000 (22:02 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Mon, 16 Apr 2018 14:38:52 +0000 (22:38 +0800)
If video initialization fails, the "Video:" output message will be
mixed with the next console log. Change to print out such message
only when everything is OK, which improves the boot log readability.

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

index 46fe5e62471207e9099526413a6e9aa032923dfa..7f461943f88adfcf86812232514b29d8c22f38c3 100644 (file)
@@ -355,8 +355,6 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void))
        struct video_priv *uc_priv = dev_get_uclass_priv(dev);
        int ret;
 
-       printf("Video: ");
-
        /* If we are running from EFI or coreboot, this can't work */
        if (!ll_boot_init()) {
                printf("Not available (previous bootloader prevents it)\n");
@@ -377,7 +375,7 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void))
                return ret;
        }
 
-       printf("%dx%dx%d\n", uc_priv->xsize, uc_priv->ysize,
+       printf("Video: %dx%dx%d\n", uc_priv->xsize, uc_priv->ysize,
               mode_info.vesa.bits_per_pixel);
 
        return 0;