summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-11-06 02:04:48 -0800
committerBin Meng <bmeng.cn@gmail.com>2015-11-13 06:46:21 -0800
commit20cbafa6fab07303d525a3473a27c90c67e85ed6 (patch)
treef2c7782ceef5dd5864771f94d0bd759fca1eec70 /arch/x86
parent643b0f75e71098f6deddddc9a17c4cbc1dc96957 (diff)
x86: qemu: Remove call to vgabios execution
The call to pci_run_vga_bios() is not needed as this is handled in the vesa_fb driver. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/qemu/pci.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/x86/cpu/qemu/pci.c b/arch/x86/cpu/qemu/pci.c
index 2e944569b5..8515d106e3 100644
--- a/arch/x86/cpu/qemu/pci.c
+++ b/arch/x86/cpu/qemu/pci.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <pci.h>
-#include <pci_rom.h>
#include <asm/pci.h>
#include <asm/arch/device.h>
#include <asm/arch/qemu.h>
@@ -51,11 +50,8 @@ void board_pci_setup_hose(struct pci_controller *hose)
int board_pci_post_scan(struct pci_controller *hose)
{
- int ret = 0;
u16 device, xbcs;
int pam, i;
- pci_dev_t vga;
- ulong start;
/*
* i440FX and Q35 chipset have different PAM register offset, but with
@@ -96,20 +92,7 @@ int board_pci_post_scan(struct pci_controller *hose)
CONFIG_PCIE_ECAM_BASE | BAR_EN);
}
- /*
- * QEMU emulated graphic card shows in the PCI configuration space with
- * PCI vendor id and device id as an artificial pair 0x1234:0x1111.
- * It is on PCI bus 0, function 0, but device number is not consistent
- * for the two x86 targets it supports. For i440FX and PIIX chipset
- * board, it shows as device 2, while for Q35 and ICH9 chipset board,
- * it shows as device 1.
- */
- vga = i440fx ? I440FX_VGA : Q35_VGA;
- start = get_timer(0);
- ret = pci_run_vga_bios(vga, NULL, PCI_ROM_USE_NATIVE);
- debug("BIOS ran in %lums\n", get_timer(start));
-
- return ret;
+ return 0;
}
#ifdef CONFIG_GENERATE_MP_TABLE