diff options
| author | Simon Glass <sjg@chromium.org> | 2015-01-27 22:13:34 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-02-05 22:16:43 -0700 |
| commit | bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63 (patch) | |
| tree | 245be28fde3783f007d64ba755ff567f152c0dad /arch/x86 | |
| parent | 2d934e5703b712686c3ec67f6d5eeb137c68805d (diff) | |
| download | talos-obmc-uboot-bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63.tar.gz talos-obmc-uboot-bc17d8f4ac41a6a4bcc4b28f1c6216a5a034fa63.zip | |
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 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/ivybridge/gma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/cpu/ivybridge/gma.c b/arch/x86/cpu/ivybridge/gma.c index 6cf9654e02..821ea25019 100644 --- a/arch/x86/cpu/ivybridge/gma.c +++ b/arch/x86/cpu/ivybridge/gma.c @@ -758,7 +758,8 @@ int gma_func0_init(pci_dev_t dev, struct pci_controller *hose, #ifdef CONFIG_VIDEO start = get_timer(0); - ret = pci_run_vga_bios(dev, int15_handler, false); + ret = pci_run_vga_bios(dev, int15_handler, PCI_ROM_USE_NATIVE | + PCI_ROM_ALLOW_FALLBACK); debug("BIOS ran in %lums\n", get_timer(start)); #endif /* Post VBIOS init */ |
