From 84e0e1674a61107775efcd4c0c51a1f8081a16d6 Mon Sep 17 00:00:00 2001 From: Hao A Wu Date: Wed, 15 May 2019 14:59:43 +0800 Subject: [PATCH] OvmfPkg/Csm/VideoDxe: Update to make it build for OVMF 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 Cc: Jordan Justen Cc: Ard Biesheuvel Signed-off-by: Hao A Wu Reviewed-by: David Woodhouse Reviewed-by: Laszlo Ersek --- OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf b/OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf index 1526bc4cc2..1ed4020661 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf @@ -4,7 +4,7 @@ # This driver by using Legacy Bios protocol service to support csm Video # and produce Graphics Output Protocol. # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -14,7 +14,7 @@ INF_VERSION = 0x00010005 BASE_NAME = BiosVideoDxe MODULE_UNI_FILE = BiosVideoDxe.uni - FILE_GUID = 0B04B2ED-861C-42cd-A22F-C3AAFACCB896 + FILE_GUID = 8669E6C9-842B-4B49-BCC3-32C96D244750 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 @@ -38,9 +38,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + OvmfPkg/OvmfPkg.dec [LibraryClasses] MemoryAllocationLib @@ -70,9 +68,9 @@ gEfiEdidOverrideProtocolGuid ## SOMETIMES_CONSUMES [Pcd] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable ## CONSUMES - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable ## CONSUMES - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable ## SOMETIMES_CONSUMES + gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable ## CONSUMES + gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable ## CONSUMES + gUefiOvmfPkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## SOMETIMES_CONSUMES -- 2.39.2