summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2012-07-10 22:43:19 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2012-07-10 22:43:19 +0000
commitaadb1d098d4daf34b8bf8169f8784dfc00023241 (patch)
tree2701cce3b8e07a011e004f07bb7bb9ebce794351
parentbab41b50f64c6660fd7e01840f158ce2955b2983 (diff)
downloadedk2-platforms-aadb1d098d4daf34b8bf8169f8784dfc00023241.tar.xz
embed OvmfVideo.rom into OVMF.fd
This enables qemu to use OVMF with a single -bios option. Based on <http://lists.xen.org/archives/html/xen-devel/2012-03/msg01992.html>. v1->v2: - move xen-devel link from code to commit message - cover all three FDF files Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> [jordan.l.justen@intel.com: remove vgabios-cirrus.bin from build.sh/README] Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13520 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--OvmfPkg/OvmfPkgIa32.fdf7
-rw-r--r--OvmfPkg/OvmfPkgIa32X64.fdf7
-rw-r--r--OvmfPkg/OvmfPkgX64.fdf7
-rw-r--r--OvmfPkg/README3
-rwxr-xr-xOvmfPkg/build.sh3
5 files changed, 8 insertions, 19 deletions
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 9cf27835fb..f31d002192 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+
################################################################################
[FV.FVMAIN_COMPACT]
@@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw
}
-
-[OptionRom.OvmfVideo]
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
- PCI_DEVICE_ID = 0x00B8
- }
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 36bc067a9a..71c9b981f0 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+
################################################################################
[FV.FVMAIN_COMPACT]
@@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw
}
-
-[OptionRom.OvmfVideo]
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
- PCI_DEVICE_ID = 0x00B8
- }
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 01ca4c4269..e234f4fdae 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+
################################################################################
[FV.FVMAIN_COMPACT]
@@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw
}
-
-[OptionRom.OvmfVideo]
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
- PCI_DEVICE_ID = 0x00B8
- }
diff --git a/OvmfPkg/README b/OvmfPkg/README
index d6b6f8c27d..04a658fa31 100644
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -60,11 +60,10 @@ http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=How_to_build_OVM
* QEMU 0.9.1 or later is required.
* Either copy, rename or symlink OVMF.FD => bios.bin
-* Either copy, rename or symlink OvmfVideo.rom => vgabios-cirrus.bin
* Be sure to use qemu-system-x86_64, if you are using and X64 firmware.
(qemu-system-x86_64 works for the IA32 firmware as well, of course.)
* Use the QEMU -L parameter to specify the directory where the bios.bin
- and vgabios-cirrus.bin files are located.
+ file is located.
* Optionally you can use the QEMU -serial command to capture the
OVMF debug messages. For example: -serial file:serial.log
* The EFI shell is built into OVMF builds at this time, so it should
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 28c7d38313..e500e2c7a0 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -191,7 +191,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
mkdir $QEMU_FIRMWARE_DIR
fi
ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
- ln -sf $FV_DIR/OvmfVideo.rom $QEMU_FIRMWARE_DIR/vgabios-cirrus.bin
if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
AUTO_QEMU_HDA="-hda fat:$BUILD_ROOT_ARCH"
else