Re: [edk2-devel] [PATCH v2 07/10] OvmfPkg/Csm/LegacyBiosDxe: Update to make it build for OVMF

["Laszlo Ersek" <lersek@redhat.com>]

On 05/27/19 05:03, Wu, Hao A wrote:
> 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 LegacyBiosDxe in IntelFrameworkModulePkg with the one
> copied in OvmfPkg within DSC/FDF files.
> 
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf | 22 +++++++++-----------
>  1 file changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
> index 471d37365c..f6379dcc46 100644
> --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
> +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
> @@ -3,7 +3,7 @@
>  #
>  # This driver installs Legacy Bios Protocol to support CSM module work in EFI system.
>  #
> -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -13,7 +13,7 @@ [Defines]
>    INF_VERSION                    = 0x00010005
>    BASE_NAME                      = LegacyBiosDxe
>    MODULE_UNI_FILE                = LegacyBiosDxe.uni
> -  FILE_GUID                      = F122A15C-C10B-4d54-8F48-60F4F06DD1AD
> +  FILE_GUID                      = 46482D14-7CA1-4977-9DDB-64D747E13DE6
>    MODULE_TYPE                    = DXE_DRIVER
>    VERSION_STRING                 = 1.0
>  
> @@ -50,9 +50,7 @@ [Sources.X64]
>  [Packages]
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
> -  IntelFrameworkPkg/IntelFrameworkPkg.dec
> -  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> -
> +  OvmfPkg/OvmfPkg.dec
>  
>  [LibraryClasses]
>    DevicePathLib
> @@ -116,13 +114,13 @@ [Protocols]
>    gEdkiiIoMmuProtocolGuid                       ## CONSUMES
>  
>  [Pcd]
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion  ## CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize       ## CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress        ## SOMETIMES_CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize             ## CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHighPmmMemorySize            ## CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase      ## CONSUMES
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize      ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion  ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdEbdaReservedMemorySize       ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdEndOpromShadowAddress        ## SOMETIMES_CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdLowPmmMemorySize             ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdHighPmmMemorySize            ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdOpromReservedMemoryBase      ## CONSUMES
> +  gUefiOvmfPkgTokenSpaceGuid.PcdOpromReservedMemorySize      ## CONSUMES
>  
>  [Depex]
>    gEfiLegacyRegion2ProtocolGuid AND gEfiLegacyInterruptProtocolGuid AND gEfiLegacyBiosPlatformProtocolGuid AND gEfiLegacy8259ProtocolGuid AND gEfiGenericMemTestProtocolGuid AND gEfiCpuArchProtocolGuid AND gEfiTimerArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>