diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:42:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:42:56 -0500 |
| commit | db7a7dee6878fe7539d5967de1caff83246254e0 (patch) | |
| tree | 27a94cac552d2015cc53cd29658f15f834475a5c /drivers/video | |
| parent | c956662cc3e2475b451afa9a8b639c0ccc49d432 (diff) | |
| parent | ba877efb802edb7080703e4dd99e51a437e44f26 (diff) | |
| download | talos-obmc-uboot-db7a7dee6878fe7539d5967de1caff83246254e0.tar.gz talos-obmc-uboot-db7a7dee6878fe7539d5967de1caff83246254e0.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/vesa_fb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/vesa_fb.c b/drivers/video/vesa_fb.c index 3dacafd6bf..47f824a726 100644 --- a/drivers/video/vesa_fb.c +++ b/drivers/video/vesa_fb.c @@ -23,6 +23,7 @@ struct pci_device_id vesa_video_ids[] = { { .vendor = 0x1002, .device = 0x5159 }, { .vendor = 0x1002, .device = 0x4752 }, { .vendor = 0x1002, .device = 0x5452 }, + { .vendor = 0x8086, .device = 0x0f31 }, {}, }; @@ -41,8 +42,10 @@ 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); + bootstage_start(BOOTSTAGE_ID_ACCUM_LCD, "vesa display"); + ret = pci_run_vga_bios(dev, NULL, PCI_ROM_USE_NATIVE | + PCI_ROM_ALLOW_FALLBACK); + bootstage_accum(BOOTSTAGE_ID_ACCUM_LCD); if (ret) { printf("failed to run video BIOS: %d\n", ret); return NULL; @@ -58,7 +61,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; } |
