commit e04cca1d05e2329a5beee18a302467ba7ae482ed
author Paolo Bonzini <pbonzini@redhat.com> Mon Mar 31 20:36:15 2014 +0000
committer jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> Mon Mar 31 20:36:15 2014 +0000
tree 4466ec19be9ac0b220142fedc0b4a2dc0d248f9f
parent 96bbdbc856930abf38d0cc289536ebd11043f80f

OvmfPkg: non-null PcdLib instance for the CSM VideoDxe

VideoDxe is a UEFI_DRIVER, so it has by default a null instance
of PcdLib.  It accesses two PCDs that are now dynamic
(gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
and gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution).
Similar to r15362 (OvmfPkg: non-null PcdLib instance for
GraphicsConsoleDxe, 2014-03-22), we need to specify a non-null
instance of PcdLib.

This patch unbreaks the CSM VideoDxe module for OvmfPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15421 6f19259b-4bc3-4df7-8a09-765794883524

OvmfPkg/OvmfPkgIa32X64.dsc

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 75ff5f0..26d1132 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -524,7 +524,10 @@
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

 

 !ifdef $(CSM_ENABLE)

-  IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf

+  IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {

+    <LibraryClasses>

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

+  }

   IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf

   OvmfPkg/Csm/Csm16/Csm16.inf

 !endif