From 2ff7bff68c7523308a025e1f10d90269cd5b3f0a Mon Sep 17 00:00:00 2001 From: jljusten Date: Tue, 14 Jul 2009 23:32:41 +0000 Subject: [PATCH] Separate Cirrus Logic video driver out from main OVMF firmware. Now a CirrusLogic5446.rom file will be generated. For QEMU, it can be used as a replacement for the vgabios-cirrus.bin file. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8944 6f19259b-4bc3-4df7-8a09-765794883524 MU SOURCE COMMIT:712bd83b42da4f4c13bf28e5fdfec72aac5a8e85 --- Platforms/OvmfPkg/OvmfPkg.fdf | 7 +++++-- Platforms/OvmfPkg/OvmfPkgIa32X64.fdf | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Platforms/OvmfPkg/OvmfPkg.fdf b/Platforms/OvmfPkg/OvmfPkg.fdf index 3472e780..897e3dcd 100644 --- a/Platforms/OvmfPkg/OvmfPkg.fdf +++ b/Platforms/OvmfPkg/OvmfPkg.fdf @@ -138,8 +138,6 @@ INF PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf -INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf @@ -309,3 +307,8 @@ INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf RAW RAW |.raw } +[OptionRom.CirrusLogic5446] +INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf { + PCI_DEVICE_ID = 0x00B8 + } + diff --git a/Platforms/OvmfPkg/OvmfPkgIa32X64.fdf b/Platforms/OvmfPkg/OvmfPkgIa32X64.fdf index bf776151..c368ae60 100644 --- a/Platforms/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/Platforms/OvmfPkg/OvmfPkgIa32X64.fdf @@ -115,7 +115,7 @@ INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf INF IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF PcAtChipsetPkg/KbcResetDxe/Reset.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf -INF PcAtChipsetPkg\PcatRealTimeClockRuntimeDxe\PcatRealTimeClockRuntimeDxe.inf +INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf @@ -138,8 +138,6 @@ INF PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf -INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf @@ -316,3 +314,8 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 { RAW RAW |.raw } +[OptionRom.CirrusLogic5446] +INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf { + PCI_DEVICE_ID = 0x00B8 + } +