public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Liming" <liming.gao@intel.com>
To: "Wei, David" <david.wei@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>,
	"Wei, David" <david.wei@intel.com>,
	"Qian, Yi" <yi.qian@intel.com>
Subject: Re: [Patch] Vlv2TbltDevicePkg: ECP Cleanup.
Date: Wed, 28 Nov 2018 13:54:29 +0000	[thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E378FBB@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20181128133732.18596-1-david.wei@intel.com>

Great work! After this update, there is no platform to consume EdkCompatibilityPkg. We can finally remove EdkCompatibilityPkg it from edk2 trunk. 

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of zwei4
> Sent: Wednesday, November 28, 2018 9:38 PM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Wei, David <david.wei@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [edk2] [Patch] Vlv2TbltDevicePkg: ECP Cleanup.
> 
> Remove modules of EdkCompatibilityPkg from DSC/FDF of Vlv2TbltDevicePkg to make this platform ECP free.
> 
> Test: Boot to 64-bit Windows 10.
> 
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: David Wei <david.wei@intel.com>
> ---
>  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c      |  8 +-
>  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf    |  4 +-
>  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c        |  8 +-
>  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf      |  4 +-
>  Vlv2TbltDevicePkg/PlatformPei/BootMode.c           | 56 +------------
>  Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf      |  4 +-
>  Vlv2TbltDevicePkg/PlatformPkg.fdf                  | 11 +--
>  Vlv2TbltDevicePkg/PlatformPkgGcc.fdf               | 10 ---
>  Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc            | 87 ---------------------
>  Vlv2TbltDevicePkg/PlatformPkgIA32.dsc              | 91 +---------------------
>  Vlv2TbltDevicePkg/PlatformPkgX64.dsc               | 87 ---------------------
>  Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf      |  6 +-
>  Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c | 10 +--
>  .../VlvPlatformInitDxe/VlvPlatformInitDxe.inf      |  6 +-
>  14 files changed, 30 insertions(+), 362 deletions(-)
> 
> diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> index 4a913eb723..d575533319 100644
> --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>
> 
> 
>    This program and the accompanying materials are licensed and made available under
> @@ -35,7 +35,7 @@ Abstract:
> 
>  #include <PiDxe.h>
>  #include <Protocol/TcgService.h>
> -#include <Protocol/FirmwareVolume.h>
> +#include <Protocol/FirmwareVolume2.h>
>  #include "AcpiPlatform.h"
>  #include "AcpiPlatformHooks.h"
>  #include "AcpiPlatformHooksLib.h"
> @@ -785,7 +785,7 @@ AcpiPlatformEntryPoint (
>    EFI_STATUS                    Status;
>    EFI_STATUS                    AcpiStatus;
>    EFI_ACPI_SUPPORT_PROTOCOL     *AcpiSupport;
> -  EFI_FIRMWARE_VOLUME_PROTOCOL  *FwVol;
> +  EFI_FIRMWARE_VOLUME2_PROTOCOL  *FwVol;
>    INTN                          Instance;
>    EFI_ACPI_COMMON_HEADER        *CurrentTable;
>    UINTN                         TableHandle;
> @@ -856,7 +856,7 @@ AcpiPlatformEntryPoint (
>    //
>    // Locate the firmware volume protocol.
>    //
> -  Status = LocateSupportProtocol (&gEfiFirmwareVolumeProtocolGuid, (VOID **) &FwVol, 1);
> +  Status = LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid, (VOID **) &FwVol, 1);
>    ASSERT_EFI_ERROR (Status);
> 
>    //
> diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> index 24fa913b33..74a531369d 100644
> --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> @@ -1,6 +1,6 @@
>  #
>  #
> -# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
> +# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made available under
> 
>  # the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -77,7 +77,7 @@
>    gEfiMpServiceProtocolGuid
>    gEfiGlobalNvsAreaProtocolGuid
>    gEfiTcgProtocolGuid
> -  gEfiFirmwareVolumeProtocolGuid
> +  gEfiFirmwareVolume2ProtocolGuid
>    gIgdOpRegionProtocolGuid
> 
>  [Pcd]
> diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> index 08f5df2a25..27ae9de7a0 100644
> --- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> +++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> @@ -36,7 +36,7 @@ Abstract:
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/UefiRuntimeServicesTableLib.h>
>  #include <Library/DebugLib.h>
> -#include <Protocol/FirmwareVolume.h>
> +#include <Protocol/FirmwareVolume2.h>
>  #include <Library/HobLib.h>
>  #include <IndustryStandard/Pci22.h>
> 
> @@ -66,12 +66,12 @@ GetRawImage (
>    EFI_HANDLE                    *HandleBuffer;
>    UINTN                         HandleCount;
>    UINTN                         Index;
> -  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
> +  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;
>    UINT32                        AuthenticationStatus;
> 
>    Status = gBS->LocateHandleBuffer (
>                    ByProtocol,
> -                  &gEfiFirmwareVolumeProtocolGuid,
> +                  &gEfiFirmwareVolume2ProtocolGuid,
>                    NULL,
>                    &HandleCount,
>                    &HandleBuffer
> @@ -86,7 +86,7 @@ GetRawImage (
>    for (Index = 0; Index < HandleCount; Index++) {
>      Status = gBS->HandleProtocol(
>                      HandleBuffer[Index],
> -                    &gEfiFirmwareVolumeProtocolGuid,
> +                    &gEfiFirmwareVolume2ProtocolGuid,
>                      (VOID **) &Fv
>                      );
> 
> diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
> index a296c24b75..ce3140f830 100644
> --- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
> +++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
> @@ -1,6 +1,6 @@
>  #/*++
>  #
> -# Copyright (c)  2003  - 2014, Intel Corporation. All rights reserved
> +# Copyright (c)  2003  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made available under
> 
>  # the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -42,7 +42,7 @@
>  [Protocols]
>    gEfiPciPlatformProtocolGuid
>    gEfiCpuIoProtocolGuid
> -  gEfiFirmwareVolumeProtocolGuid
> +  gEfiFirmwareVolume2ProtocolGuid
>    gEfiPciRootBridgeIoProtocolGuid
>    gEfiPciIoProtocolGuid
> 
> diff --git a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
> index 95be1c0f28..66a6680e9c 100644
> --- a/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
> +++ b/Vlv2TbltDevicePkg/PlatformPei/BootMode.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>
> 
> 
>    This program and the accompanying materials are licensed and made available under
> 
>    the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -29,8 +29,6 @@ Abstract:
>  #include "PlatformBootMode.h"
>  #include <Guid/SetupVariable.h>
> 
> -#include <Guid/BootState.h>
> -
>  //
>  // Priority of our boot modes, highest priority first
>  //
> @@ -100,56 +98,6 @@ CapsulePpiNotifyCallback (
>    return Status;
>  }
> 
> -/**
> -  Check CMOS register bit to determine if previous boot was successful
> -
> -  @param PeiServices    pointer to the PEI Service Table
> -
> -  @retval TRUE          - Previous Boot was success
> -  @retval FALSE         - Previous Boot wasn't success
> -
> -**/
> -BOOLEAN
> -IsPreviousBootSuccessful(
> -  IN CONST EFI_PEI_SERVICES   **PeiServices
> -
> -  )
> -{
> -  EFI_STATUS                      Status;
> -  BOOLEAN                         BootState;
> -  UINTN                           DataSize;
> -  CHAR16                          VarName[] = BOOT_STATE_VARIABLE_NAME;
> -  EFI_PEI_READ_ONLY_VARIABLE2_PPI *PeiVar;
> -
> -  Status = (**PeiServices).LocatePpi (
> -                             PeiServices,
> -                             &gEfiPeiReadOnlyVariable2PpiGuid,
> -                             0,
> -                             NULL,
> -                                (void **)&PeiVar
> -                             );
> -  ASSERT_EFI_ERROR (Status);
> -
> -  //
> -  // Get last Boot State Variable to confirm that it is not a first boot .
> -  //
> -
> -  DataSize = sizeof (BOOLEAN);
> -  Status = PeiVar->GetVariable (
> -                     PeiVar,
> -                     VarName,
> -                     &gEfiBootStateGuid,
> -                     NULL,
> -                     &DataSize,
> -                     &BootState
> -                     );
> -  if (EFI_ERROR (Status) || (BootState == TRUE)) {
> -    return FALSE;
> -  }
> -
> -  DEBUG ((EFI_D_INFO, "Previous boot cycle successfully completed handover to OS\n"));
> -  return TRUE;
> -}
>  #ifdef NOCS_S3_SUPPORT
>  EFI_STATUS
>  UpdateBootMode (
> @@ -190,7 +138,7 @@ UpdateBootMode (
>      } // switch (SleepType)
>    }
> 
> -  if (IsFastBootEnabled (PeiServices) && IsPreviousBootSuccessful (PeiServices)) {
> +  if (IsFastBootEnabled (PeiServices)) {
>      DEBUG ((EFI_D_INFO, "Prioritizing Boot mode to BOOT_WITH_MINIMAL_CONFIGURATION\n"));
>      PrioritizeBootMode (&BootMode, BOOT_WITH_MINIMAL_CONFIGURATION);
>    }
> diff --git a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> index 9c1cd08db5..2ecb347d18 100644
> --- a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> +++ b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> @@ -1,6 +1,6 @@
>  #
>  #
> -# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
> +# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made available under
> 
>  # the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -74,7 +74,6 @@
>    IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
>    CryptoPkg/CryptoPkg.dec
> -  EdkCompatibilityPkg/EdkCompatibilityPkg.dec
> 
>  [LibraryClasses]
>    PeimEntryPoint
> @@ -121,7 +120,6 @@
>    gRecoveryOnDataCdGuid
>    gMfgModeVariableGuid
>    gEfiNormalSetupGuid
> -  gEfiBootStateGuid
>    gEfiVlv2VariableGuid
> 
>  [Pcd.common]
> diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
> index 0d13ad9f56..ff0b32e635 100644
> --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
> +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
> @@ -316,7 +316,6 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
>  INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf
>  INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
>  INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf
> -INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf
>  !endif
> 
>  # INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf
> @@ -679,15 +678,7 @@ INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>  !endif
> 
> -  #
> -  #  ECP
> -  #
> -INF EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf
> +
>    #
>    # SMBIOS
>    #
> diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> index 847286328a..eeecf9e45b 100644
> --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> @@ -272,7 +272,6 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
>  INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf
>  INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
>  INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf
> -INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf
>  !endif
> 
>  # INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf
> @@ -635,15 +634,6 @@ INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
>  !endif
> 
> -  #
> -  #  ECP
> -  #
> -INF EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf
> -INF EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf
>    #
>    # SMBIOS
>    #
> diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index f8ad29df59..5b2e723818 100644
> --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -195,7 +195,6 @@
>    PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
> -  LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
>    SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>    IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
> @@ -474,79 +473,6 @@
>    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
>  !endif
> 
> -
> -################################################################################
> -#
> -# Library Section - list of all EDK/Framework libraries
> -#
> -################################################################################
> -[Libraries.common]
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
> -
> EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCod
> eLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
> -  EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
> -  EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
> -  EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
> -[Libraries.IA32]
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -
> -  $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf
> -[Libraries.X64]
> -
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
> -
> -
>  ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform
> @@ -866,7 +792,6 @@
>  [PcdsDynamicHii.common.DEFAULT]
>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
>    gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable:
> L"HwErrRecSupport"
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
> 
>  [PcdsDynamicDefault.common.DEFAULT]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
> @@ -1049,7 +974,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
>    UefiCpuPkg/CpuIoPei/CpuIoPei.inf
>    UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
>    $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf
> -  EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf
>  #  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf
> 
>  !if $(RECOVERY_ENABLE)
> @@ -1497,17 +1421,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
> 
>  !endif
> 
> -  #
> -  #  ECP
> -  #
> -  EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
> -  EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf
> -  EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf
> -
> EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusC
> odeThunk.inf
> -  EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf
>    #
>    # SMBIOS
>    #
> diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index ca3b2ff902..117b30dca9 100644
> --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -195,7 +195,6 @@
>    PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
> -  LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
>    SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>    IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
> @@ -283,6 +282,8 @@
>  !endif
>    ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
>    ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +  ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> +  HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>  !if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE
> @@ -474,79 +475,6 @@
>    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
>  !endif
> 
> -
> -################################################################################
> -#
> -# Library Section - list of all EDK/Framework libraries
> -#
> -################################################################################
> -[Libraries.common]
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
> -
> EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCod
> eLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
> -  EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
> -  EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
> -  EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
> -[Libraries.IA32]
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -
> -  $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf
> -[Libraries.IA32]
> -
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
> -
> -
>  ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform
> @@ -866,7 +794,6 @@
>  [PcdsDynamicHii.common.DEFAULT]
>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
>    gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable:
> L"HwErrRecSupport"
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
> 
>  [PcdsDynamicDefault.common.DEFAULT]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
> @@ -1049,7 +976,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
>    UefiCpuPkg/CpuIoPei/CpuIoPei.inf
>    UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
>    $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf
> -  EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf
>  #  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf
> 
>  !if $(RECOVERY_ENABLE)
> @@ -1485,17 +1411,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
> 
>  !endif
> 
> -  #
> -  #  ECP
> -  #
> -  EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
> -  EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf
> -  EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf
> -
> EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusC
> odeThunk.inf
> -  EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf
>    #
>    # SMBIOS
>    #
> @@ -1539,9 +1454,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
>      MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
>      MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>      MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>      NetworkPkg/TcpDxe/TcpDxe.inf
> +    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>      !if $(NETWORK_IP6_ENABLE) == TRUE
>        NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>        NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index ccdd856cee..34aeb90841 100644
> --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -195,7 +195,6 @@
>    PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
>    DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
> -  LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
>    SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>    IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
> @@ -476,79 +475,6 @@
>    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
>  !endif
> 
> -
> -################################################################################
> -#
> -# Library Section - list of all EDK/Framework libraries
> -#
> -################################################################################
> -[Libraries.common]
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/BasePrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib/BasePciCf8Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpressLib/BasePciExpressLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8/BasePciLibCf8.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib/BasePeCoffLib.inf
> -
> EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCod
> eLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf
> -  EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
> -  EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.inf
> -  EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProtocolLib.inf
> -[Libraries.IA32]
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLib/PeiServicesLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -
> -  $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf
> -[Libraries.X64]
> -
> -  EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
> -  EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
> -  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
> -  EdkCompatibilityPkg/Foundation/Framework/Ppi/EdkFrameworkPpiLib.inf
> -  EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupportLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTableLib/DxeServicesTableLib.inf
> -  EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
> -
> -
>  ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform
> @@ -868,7 +794,6 @@
>  [PcdsDynamicHii.common.DEFAULT]
>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
>    gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable:
> L"HwErrRecSupport"
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
> 
>  [PcdsDynamicDefault.common.DEFAULT]
>    gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
> @@ -1051,7 +976,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
>    UefiCpuPkg/CpuIoPei/CpuIoPei.inf
>    UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
>    $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MpS3.inf
> -  EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf
>  #  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf
> 
>  !if $(RECOVERY_ENABLE)
> @@ -1499,17 +1423,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
> 
>  !endif
> 
> -  #
> -  #  ECP
> -  #
> -  EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
> -  EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/LegacyRegion2OnLegacyRegionThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf
> -  EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmAccess2OnSmmAccessThunk.inf
> -  EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/SmmControl2OnSmmControlThunk.inf
> -
> EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusC
> odeThunk.inf
> -  EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf
>    #
>    # SMBIOS
>    #
> diff --git a/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf b/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
> index 69e0a5d990..342661abd6 100644
> --- a/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
> +++ b/Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
> @@ -1,6 +1,6 @@
>  #
>  #
> -# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
> +# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made available under
> 
>  # the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -65,7 +65,7 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
> 
>  [Protocols]
> -  gEfiSmmBaseProtocolGuid
> +  gEfiSmmBase2ProtocolGuid
>    gEfiSmmIchnDispatchProtocolGuid
>    gEfiGlobalNvsAreaProtocolGuid
>    gEfiSmmSwDispatchProtocolGuid
> @@ -86,7 +86,7 @@
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> 
>  [Depex]
> -  gEfiSmmBaseProtocolGuid                 AND
> +  gEfiSmmBase2ProtocolGuid                 AND
>    gEfiSmmAccess2ProtocolGuid               AND
>    gEfiSmmPowerButtonDispatchProtocolGuid  AND
>    gEfiSmmSxDispatchProtocolGuid           AND
> diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
> index f8dc3f14f3..6460b58b4e 100644
> --- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
> +++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
> @@ -1,7 +1,7 @@
> 
>  /*++
> 
> -Copyright (c)  2011  - 2014, Intel Corporation. All rights reserved
> +Copyright (c)  2011  - 2018, Intel Corporation. All rights reserved
> 
> 
>    This program and the accompanying materials are licensed and made available under
> 
>    the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -48,7 +48,7 @@ Abstract:
> 
>  #include <Protocol/IgdOpRegion.h>
>  #include <Protocol/FrameworkHii.h>
> -#include <Protocol/FirmwareVolume.h>
> +#include <Protocol/FirmwareVolume2.h>
>  #include <Protocol/PlatformGopPolicy.h>
>  #include <Protocol/PciIo.h>
>  #include <Protocol/CpuIo.h>
> @@ -135,7 +135,7 @@ GetIntegratedIntelVbtPtr (
>    EFI_PHYSICAL_ADDRESS          VbtAddress = 0;
>    UINTN                         FvProtocolCount;
>    EFI_HANDLE                    *FvHandles;
> -  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
> +  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;
>    UINTN                         Index;
>    UINT32                        AuthenticationStatus;
> 
> @@ -147,7 +147,7 @@ GetIntegratedIntelVbtPtr (
>    *VbtFileBuffer = NULL;
>    Status = gBS->LocateHandleBuffer (
>                    ByProtocol,
> -                  &gEfiFirmwareVolumeProtocolGuid,
> +                  &gEfiFirmwareVolume2ProtocolGuid,
>                    NULL,
>                    &FvProtocolCount,
>                    &FvHandles
> @@ -157,7 +157,7 @@ GetIntegratedIntelVbtPtr (
>      for (Index = 0; Index < FvProtocolCount; Index++) {
>        Status = gBS->HandleProtocol (
>                        FvHandles[Index],
> -                      &gEfiFirmwareVolumeProtocolGuid,
> +                      &gEfiFirmwareVolume2ProtocolGuid,
>                        (VOID **) &Fv
>                        );
>        VbtBufferSize = 0;
> diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
> b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
> index cea185fba8..990ac0fd18 100644
> --- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
> +++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf
> @@ -2,7 +2,7 @@
>  #
>  #/*++
>  #
> -#  Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
> +#  Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made available under
> 
>  # the terms and conditions of the BSD License that accompanies this distribution.
> 
> @@ -65,7 +65,7 @@
>    gIgdOpRegionProtocolGuid
>    gEfiGlobalNvsAreaProtocolGuid
>    gEfiPciIoProtocolGuid
> -  gEfiFirmwareVolumeProtocolGuid
> +  gEfiFirmwareVolume2ProtocolGuid
>    gEfiCpuIoProtocolGuid
> 
>  [Depex]
> @@ -74,6 +74,6 @@
>    gEfiCpuIoProtocolGuid                      AND
>    gEfiDataHubProtocolGuid                 AND
>    gEfiGlobalNvsAreaProtocolGuid       AND
> -  gEfiFirmwareVolumeProtocolGuid   AND
> +  gEfiFirmwareVolume2ProtocolGuid   AND
>    gEfiHiiDatabaseProtocolGuid
> 
> --
> 2.14.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


      reply	other threads:[~2018-11-28 13:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28 13:37 [Patch] Vlv2TbltDevicePkg: ECP Cleanup zwei4
2018-11-28 13:54 ` Gao, Liming [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E378FBB@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox