From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: hao.a.wu@intel.com) Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Sun, 26 May 2019 20:04:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 May 2019 20:04:20 -0700 X-ExtLoop1: 1 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.8]) by fmsmga007.fm.intel.com with ESMTP; 26 May 2019 20:04:18 -0700 From: "Wu, Hao A" To: devel@edk2.groups.io Cc: Hao A Wu , David Woodhouse , Ray Ni , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v2 06/10] OvmfPkg/Csm/VideoDxe: Update to make it build for OVMF Date: Mon, 27 May 2019 11:03:46 +0800 Message-Id: <20190527030350.11996-7-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190527030350.11996-1-hao.a.wu@intel.com> References: <20190527030350.11996-1-hao.a.wu@intel.com> 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: David Woodhouse Cc: Ray Ni Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Hao A Wu --- 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 @@ [Defines] 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 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + OvmfPkg/OvmfPkg.dec [LibraryClasses] MemoryAllocationLib @@ -70,9 +68,9 @@ [Protocols] 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.12.0.windows.1