OvmfPkg/Csm/VideoDxe: Update to make it build for OVMF
authorHao A Wu <hao.a.wu@intel.com>
Wed, 15 May 2019 06:59:43 +0000 (14:59 +0800)
committerHao A Wu <hao.a.wu@intel.com>
Fri, 14 Jun 2019 05:05:41 +0000 (13:05 +0800)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1811

This commit will update the driver's INF file to:

A) Assign a new file GUID;
B) Consume the PCDs duplicated in OvmfPkg DEC file;
C) Remove the IntelFramework[Module]Pkg DEC file dependency.

Please note that a subsequent commit (final patch of the series) will:

Replace the use of VideoDxe in IntelFrameworkModulePkg with the one copied
in OvmfPkg within DSC/FDF files.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: David Woodhouse <dwmw2@infradead.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf

index 1526bc4..1ed4020 100644 (file)
@@ -4,7 +4,7 @@
 # This driver by using Legacy Bios protocol service to support csm Video\r
 # and produce Graphics Output Protocol.\r
 #\r
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -14,7 +14,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BiosVideoDxe\r
   MODULE_UNI_FILE                = BiosVideoDxe.uni\r
-  FILE_GUID                      = 0B04B2ED-861C-42cd-A22F-C3AAFACCB896\r
+  FILE_GUID                      = 8669E6C9-842B-4B49-BCC3-32C96D244750\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
 \r
@@ -38,9 +38,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
-\r
+  OvmfPkg/OvmfPkg.dec\r
 \r
 [LibraryClasses]\r
   MemoryAllocationLib\r
@@ -70,9 +68,9 @@
   gEfiEdidOverrideProtocolGuid                  ## SOMETIMES_CONSUMES\r
 \r
 [Pcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable  ## CONSUMES\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable        ## CONSUMES\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable        ## SOMETIMES_CONSUMES\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable                 ## CONSUMES\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable                       ## CONSUMES\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable                       ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution                 ## SOMETIMES_CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution                   ## SOMETIMES_CONSUMES\r
 \r