tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-30 17:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

embed OvmfVideo.rom into OVMF.fd

Browse Source 
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
This commit is contained in:
jljusten 2012-07-10 22:43:19 +00:00
parent bab41b50f6
commit aadb1d098d
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OvmfPkg/OvmfPkgIa32.fdf
View File

@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif !endif
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
################################################################################ ################################################################################
[FV.FVMAIN_COMPACT] [FV.FVMAIN_COMPACT]
@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) { FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw RAW RAW |.raw
} }
[OptionRom.OvmfVideo]
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
PCI_DEVICE_ID = 0x00B8
}

7
OvmfPkg/OvmfPkgIa32X64.fdf
View File

@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif !endif
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
################################################################################ ################################################################################
[FV.FVMAIN_COMPACT] [FV.FVMAIN_COMPACT]
@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) { FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw RAW RAW |.raw
} }
[OptionRom.OvmfVideo]
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
PCI_DEVICE_ID = 0x00B8
}

7
OvmfPkg/OvmfPkgX64.fdf
View File

@ -266,6 +266,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif !endif
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
################################################################################ ################################################################################
[FV.FVMAIN_COMPACT] [FV.FVMAIN_COMPACT]
@ -384,8 +386,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) { FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw RAW RAW |.raw
} }
[OptionRom.OvmfVideo]
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
PCI_DEVICE_ID = 0x00B8
}

3
OvmfPkg/README
View File

@ -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. * QEMU 0.9.1 or later is required.
* Either copy, rename or symlink OVMF.FD => bios.bin * 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. * 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.) (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 * 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 * Optionally you can use the QEMU -serial command to capture the
OVMF debug messages. For example: -serial file:serial.log OVMF debug messages. For example: -serial file:serial.log
* The EFI shell is built into OVMF builds at this time, so it should * The EFI shell is built into OVMF builds at this time, so it should

3
OvmfPkg/build.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # 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 # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 mkdir $QEMU_FIRMWARE_DIR
fi fi
ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin 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 if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
AUTO_QEMU_HDA="-hda fat:$BUILD_ROOT_ARCH" AUTO_QEMU_HDA="-hda fat:$BUILD_ROOT_ARCH"
else else