summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-05-25 22:36:27 +0800
committerSimon Glass <sjg@chromium.org>2015-06-04 02:39:40 -0600
commit4be2f42bbc8171eae930db37f370f10779c5b02c (patch)
treeeca1cd196755740b614bdeb06e9d9df10b16dbe5 /arch/x86/include
parent0fcb7acf6748d2ee0b7abfd75e074840be6b7e0e (diff)
downloadu-boot-imx-4be2f42bbc8171eae930db37f370f10779c5b02c.zip
u-boot-imx-4be2f42bbc8171eae930db37f370f10779c5b02c.tar.gz
u-boot-imx-4be2f42bbc8171eae930db37f370f10779c5b02c.tar.bz2
x86: qemu: Adjust VGA initialization
As VGA option rom needs to run at C segment, although QEMU PAM emulation seems to only guard E/F segments, for correctness, move VGA initialization after PAM decode C/D/E/F segments. Also since we already tested QEMU targets to differentiate I440FX and Q35 platforms, change to locate the VGA device via hardcoded b.d.f instead of dynamic search for its vendor id & device id pair. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/arch-qemu/device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/arch-qemu/device.h b/arch/x86/include/asm/arch-qemu/device.h
index 2a8d460..75a435e 100644
--- a/arch/x86/include/asm/arch-qemu/device.h
+++ b/arch/x86/include/asm/arch-qemu/device.h
@@ -13,7 +13,9 @@
#define PIIX_ISA PCI_BDF(0, 1, 0)
#define PIIX_IDE PCI_BDF(0, 1, 1)
#define PIIX_USB PCI_BDF(0, 1, 2)
+#define I440FX_VGA PCI_BDF(0, 2, 0)
#define QEMU_Q35 PCI_BDF(0, 0, 0)
+#define Q35_VGA PCI_BDF(0, 1, 0)
#endif /* _QEMU_DEVICE_H_ */