| Message ID | 1523509343-18123-14-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 611309383d19ec806bdf38bea70fc2d7636ae64f |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | bootvx: Various enhancements to booting VxWorks x86 kernels | expand |
On 11 April 2018 at 23:02, Bin Meng <bmeng.cn@gmail.com> wrote: > 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> > --- > > Changes in v2: None > > drivers/pci/pci_rom.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, Apr 13, 2018 at 12:42 AM, Simon Glass <sjg@chromium.org> wrote: > On 11 April 2018 at 23:02, Bin Meng <bmeng.cn@gmail.com> wrote: >> 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> >> --- >> >> Changes in v2: None >> >> drivers/pci/pci_rom.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 46fe5e6..7f46194 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -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;
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> --- Changes in v2: None drivers/pci/pci_rom.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)