On Mon, Mar 31, 2014 at 8:28 AM, Laszlo Ersek <[email protected]> wrote: > On 03/31/14 16:56, Paolo Bonzini wrote: >> 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 >> Cc: Jordan Justen <[email protected]> >> Cc: Laszlo Ersek <[email protected]> >> Signed-off-by: Paolo Bonzini <[email protected]> >> --- >> OvmfPkg/OvmfPkgIa32.dsc | 5 ++++- >> OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++- >> OvmfPkg/OvmfPkgX64.dsc | 5 ++++- >> 3 files changed, 12 insertions(+), 3 deletions(-) >> >> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc >> index 760bd41..2d76a9b 100644 >> --- a/OvmfPkg/OvmfPkgIa32.dsc >> +++ b/OvmfPkg/OvmfPkgIa32.dsc >> @@ -494,7 +494,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 >> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc >> index 268d722..44354b9 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.dsc >> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc >> @@ -501,7 +501,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 >> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc >> index 924ccef..fbf4b61 100644 >> --- a/OvmfPkg/OvmfPkgX64.dsc >> +++ b/OvmfPkg/OvmfPkgX64.dsc >> @@ -499,7 +499,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 >> > > Reviewed-by: Laszlo Ersek <[email protected]>
Reviewed-by: Jordan Justen <[email protected]> Laszlo, Paolo, I committed 5 patches in r15418-r15422: * OvmfPkg: PlatformPei: lifecycle fixes for the LockBox area * OvmfPkg: AcpiS3SaveDxe: do not load if S3 is unsupported/disabled in qemu * OvmfPkg: AcpiPlatformDxe: download ACPI tables from QEMU * OvmfPkg: non-null PcdLib instance for the CSM VideoDxe * OvmfPkg: add a catch-all match for PCI devices in the OpenFirmware path Thanks for the contributions! -Jordan ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
