mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-04-01 12:01:31 +00:00
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>
This commit is contained in:
parent
643b0f75e7
commit
20cbafa6fa
1 changed files with 1 additions and 18 deletions
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <pci.h>
|
#include <pci.h>
|
||||||
#include <pci_rom.h>
|
|
||||||
#include <asm/pci.h>
|
#include <asm/pci.h>
|
||||||
#include <asm/arch/device.h>
|
#include <asm/arch/device.h>
|
||||||
#include <asm/arch/qemu.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 board_pci_post_scan(struct pci_controller *hose)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
|
||||||
u16 device, xbcs;
|
u16 device, xbcs;
|
||||||
int pam, i;
|
int pam, i;
|
||||||
pci_dev_t vga;
|
|
||||||
ulong start;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* i440FX and Q35 chipset have different PAM register offset, but with
|
* 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);
|
CONFIG_PCIE_ECAM_BASE | BAR_EN);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
return 0;
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_GENERATE_MP_TABLE
|
#ifdef CONFIG_GENERATE_MP_TABLE
|
||||||
|
|
Loading…
Add table
Reference in a new issue