summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-01-27 22:13:34 -0700
committerSimon Glass <sjg@chromium.org>2015-02-05 22:16:43 -0700
commitbc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63 (patch)
tree245be28fde3783f007d64ba755ff567f152c0dad /drivers/video
parent2d934e5703b712686c3ec67f6d5eeb137c68805d (diff)
downloadu-boot-imx-bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63.zip
u-boot-imx-bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63.tar.gz
u-boot-imx-bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63.tar.bz2
x86: video: Allow video ROM execution to fall back to the other method
If the BIOS emulator is not available, allow use of native execution if available, and vice versa. This can be controlled by the caller. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/vesa_fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/vesa_fb.c b/drivers/video/vesa_fb.c
index 3a0fea2..9164f8d 100644
--- a/drivers/video/vesa_fb.c
+++ b/drivers/video/vesa_fb.c
@@ -42,8 +42,8 @@ void *video_hw_init(void)
printf("no card detected\n");
return NULL;
}
- printf("bdf %x\n", dev);
- ret = pci_run_vga_bios(dev, NULL, true);
+ ret = pci_run_vga_bios(dev, NULL, PCI_ROM_USE_NATIVE |
+ PCI_ROM_ALLOW_FALLBACK);
if (ret) {
printf("failed to run video BIOS: %d\n", ret);
return NULL;
@@ -59,7 +59,7 @@ void *video_hw_init(void)
sprintf(gdev->modeIdent, "%dx%dx%d", gdev->winSizeX, gdev->winSizeY,
bits_per_pixel);
printf("%s\n", gdev->modeIdent);
- debug("Framex buffer at %x\n", gdev->pciBase);
+ debug("Frame buffer at %x\n", gdev->pciBase);
return (void *)gdev;
}