From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=yi.qian@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3216C21B02822 for ; Tue, 19 Mar 2019 02:00:11 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2019 02:00:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,497,1544515200"; d="scan'208";a="153659713" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 19 Mar 2019 02:00:02 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 19 Mar 2019 02:00:00 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 19 Mar 2019 01:59:59 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.163]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.113]) with mapi id 14.03.0415.000; Tue, 19 Mar 2019 16:59:57 +0800 From: "Qian, Yi" To: "Sun, Zailiang" , "edk2-devel@lists.01.org" CC: "Wei, David" Thread-Topic: [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup. Thread-Index: AQHU3i6IelrIwtw40Ua5baUE9KRVeqYSp95g Date: Tue, 19 Mar 2019 08:59:57 +0000 Message-ID: References: <20190319083316.33208-1-zailiang.sun@intel.com> In-Reply-To: <20190319083316.33208-1-zailiang.sun@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 09:00:11 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed by Qian, Yi Thanks Qian Yi > -----Original Message----- > From: Sun, Zailiang > Sent: Tuesday, March 19, 2019 4:33 PM > To: edk2-devel@lists.01.org > Cc: Qian, Yi ; Wei, David > Subject: [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup. >=20 > In V2: no new changes >=20 > Remove modules of EdkCompatibilityPkg from DSC/FDF of Vlv2TbltDevicePkg > to make this platform ECP free. >=20 > Test: Boot to 64-bit Windows 10. >=20 > Cc: Zailiang Sun > Cc: Yi Qian > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: David Wei > --- > 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 +++++--= --- > Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf | 6 +++--- > 14 files changed, 30 insertions(+), 362 deletions(-) >=20 > 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 >=20 > - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved. > + Copyright (c) 2004 - 2018, Intel Corporation. All rights > + reserved.
>=20 >=20 > This program and the accompanying materials are licensed and made > available under @@ -35,7 +35,7 @@ Abstract: >=20 > #include > #include > -#include > +#include > #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 =3D LocateSupportProtocol (&gEfiFirmwareVolumeProtocolGuid, > (VOID **) &FwVol, 1); > + Status =3D LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid, > + (VOID **) &FwVol, 1); > ASSERT_EFI_ERROR (Status); >=20 > // > 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 > # >=20 > # This program and the accompanying materials are licensed and made > available under >=20 > # the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -77,7 +77,7 @@ > gEfiMpServiceProtocolGuid > gEfiGlobalNvsAreaProtocolGuid > gEfiTcgProtocolGuid > - gEfiFirmwareVolumeProtocolGuid > + gEfiFirmwareVolume2ProtocolGuid > gIgdOpRegionProtocolGuid >=20 > [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 > #include > #include > -#include > +#include > #include > #include >=20 > @@ -66,12 +66,12 @@ GetRawImage ( > EFI_HANDLE *HandleBuffer; > UINTN HandleCount; > UINTN Index; > - EFI_FIRMWARE_VOLUME_PROTOCOL *Fv; > + EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv; > UINT32 AuthenticationStatus; >=20 > Status =3D gBS->LocateHandleBuffer ( > ByProtocol, > - &gEfiFirmwareVolumeProtocolGuid, > + &gEfiFirmwareVolume2ProtocolGuid, > NULL, > &HandleCount, > &HandleBuffer > @@ -86,7 +86,7 @@ GetRawImage ( > for (Index =3D 0; Index < HandleCount; Index++) { > Status =3D gBS->HandleProtocol( > HandleBuffer[Index], > - &gEfiFirmwareVolumeProtocolGuid, > + &gEfiFirmwareVolume2ProtocolGuid, > (VOID **) &Fv > ); >=20 > 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 > # >=20 > # This program and the accompanying materials are licensed and made > available under >=20 > # the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -42,7 +42,7 @@ > [Protocols] > gEfiPciPlatformProtocolGuid > gEfiCpuIoProtocolGuid > - gEfiFirmwareVolumeProtocolGuid > + gEfiFirmwareVolume2ProtocolGuid > gEfiPciRootBridgeIoProtocolGuid > gEfiPciIoProtocolGuid >=20 > 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 >=20 > - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved. > + Copyright (c) 2004 - 2018, Intel Corporation. All rights > + reserved.
>=20 >=20 > This program and the accompanying materials are licensed and made > available under >=20 > the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -29,8 +29,6 @@ Abstract: > #include "PlatformBootMode.h" > #include >=20 > -#include > - > // > // Priority of our boot modes, highest priority first // @@ -100,56 +98= ,6 @@ > CapsulePpiNotifyCallback ( > return Status; > } >=20 > -/** > - 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[] =3D BOOT_STATE_VARIABLE_NAME= ; > - EFI_PEI_READ_ONLY_VARIABLE2_PPI *PeiVar; > - > - Status =3D (**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 =3D sizeof (BOOLEAN); > - Status =3D PeiVar->GetVariable ( > - PeiVar, > - VarName, > - &gEfiBootStateGuid, > - NULL, > - &DataSize, > - &BootState > - ); > - if (EFI_ERROR (Status) || (BootState =3D=3D 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) > } >=20 > - 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 > # >=20 > # This program and the accompanying materials are licensed and made > available under >=20 > # the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -74,7 +74,6 @@ > IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec > UefiCpuPkg/UefiCpuPkg.dec > CryptoPkg/CryptoPkg.dec > - EdkCompatibilityPkg/EdkCompatibilityPkg.dec >=20 > [LibraryClasses] > PeimEntryPoint > @@ -121,7 +120,6 @@ > gRecoveryOnDataCdGuid > gMfgModeVariableGuid > gEfiNormalSetupGuid > - gEfiBootStateGuid > gEfiVlv2VariableGuid >=20 > [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 =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET > INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/P > eiSmmControl.inf > INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/M > pS3.inf > -INF > EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobTh > unk/AcpiVariableHobOnSmramReserveHobThunk.inf > !endif >=20 > # INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Pi > SmmCommunicationPei.inf > @@ -679,15 +678,7 @@ INF > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf > !endif >=20 > - # > - # ECP > - # > -INF > EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/Le > gacyRegion2OnLegacyRegionThunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBase > OnSmmBase2Thunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmA > ccess2OnSmmAccessThunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/Smm > Control2OnSmmControlThunk.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 =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET > INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/P > eiSmmControl.inf > INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/M > pS3.inf > -INF > EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobTh > unk/AcpiVariableHobOnSmramReserveHobThunk.inf > !endif >=20 > # INF RuleOverride =3D BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Pi > SmmCommunicationPei.inf > @@ -635,15 +634,6 @@ INF > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf > !endif >=20 > - # > - # ECP > - # > -INF > EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/Le > gacyRegion2OnLegacyRegionThunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBase > OnSmmBase2Thunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmA > ccess2OnSmmAccessThunk.inf > -INF > EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/Smm > Control2OnSmmControlThunk.inf > -INF EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf > # > # SMBIOS > # > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index eb7c205a10..ac401c4826 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -195,7 +195,6 @@ >=20 > PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor > mFlashAccessLib/PlatformFlashAccessLib.inf >=20 > MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfo > rmFlashAccessLib/PlatformFlashAccessLib.inf >=20 > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLi > bGraphics/DisplayUpdateProgressLibGraphics.inf > - > LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/Ue > fiLanguageLib.inf >=20 > SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz > ationLib.inf >=20 > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf > @@ -475,79 +474,6 @@ >=20 > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgen > tLib.inf > !endif >=20 > - > - > ########################################################## > ###################### > -# > -# Library Section - list of all EDK/Framework libraries -# - > ########################################################## > ###################### > -[Libraries.common] > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseL > ib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryL > ib/BaseMemoryLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/ > BasePrintLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLib > Null/BaseDebugLibNull.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntr= i > nsic/BaseIoLibIntrinsic.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMa > intenanceLib/BaseCacheMaintenanceLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib > /BasePciCf8Lib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpres > sLib/BasePciExpressLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8 > /BasePciLibCf8.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPci= E > xpress/BasePciLibPciExpress.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffG > etEntryPointLib/BasePeCoffGetEntryPointLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib > /BasePeCoffLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntime > DxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/Pei > HobLib.inf > - EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf > - EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf > - > EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLi > b.inf > - EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf > - EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.i= nf > - EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProto > colLib.inf > -[Libraries.IA32] > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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/PeiServicesTa > blePointerLibMm7/PeiServicesTablePointerLibMm7.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAll > ocationLib/PeiMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLi= b > /PeiServicesLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStat > usCodeLib/PeiReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.in > f > - > - $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf > -[Libraries.X64] > - > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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.in > f > - EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRunt > imeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupport= L > ib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.i= nf > - EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServi > cesTableLib/UefiBootServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryA > llocationLib/DxeMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiL= i > b.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/Dx > eHobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeS > ervicesTableLib/UefiRuntimeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportSta > tusCodeLib/DxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib= .in > f > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePat > hLib/UefiDevicePathLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverMo > delLib/UefiDriverModelLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTa > bleLib/DxeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRunti > meDriverLib/EdkDxeRuntimeDriverLib.inf > - > - >=20 > ########################################################## > ###################### > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform = @@ - > 865,7 +791,6 @@ [PcdsDynamicHii.common.DEFAULT] >=20 > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlo > balVariableGuid|0x0|5 # Variable: L"Timeout" >=20 > gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSup > port"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" > - > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState" > |gEfiBootStateGuid|0x0|TRUE >=20 > [PcdsDynamicDefault.common.DEFAULT] >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x > 0 > @@ -1048,7 +973,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > UefiCpuPkg/CpuIoPei/CpuIoPei.inf > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >=20 > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/M > pS3.inf > - > EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobTh > unk/AcpiVariableHobOnSmramReserveHobThunk.inf > # > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Pi > SmmCommunicationPei.inf >=20 > !if $(RECOVERY_ENABLE) > @@ -1496,17 +1420,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf >=20 > !endif >=20 > - # > - # ECP > - # > - > EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Framewor > kHiiOnUefiHiiThunk.inf > - > EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/Le > gacyRegion2OnLegacyRegionThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBase > OnSmmBase2Thunk.inf > - EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf > - > EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmA > ccess2OnSmmAccessThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/Smm > Control2OnSmmControlThunk.inf > - > EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmSta > tusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk.inf > - EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf > # > # SMBIOS > # > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index b2f0d73f6d..7235ac1027 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -195,7 +195,6 @@ >=20 > PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor > mFlashAccessLib/PlatformFlashAccessLib.inf >=20 > MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfo > rmFlashAccessLib/PlatformFlashAccessLib.inf >=20 > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLi > bGraphics/DisplayUpdateProgressLibGraphics.inf > - > LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/Ue > fiLanguageLib.inf >=20 > SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz > ationLib.inf >=20 > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/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/UefiShellComma > ndL > + ib.inf > + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsi > + ngLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > !if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE @@= - > 475,79 +476,6 @@ >=20 > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgen > tLib.inf > !endif >=20 > - > - > ########################################################## > ###################### > -# > -# Library Section - list of all EDK/Framework libraries -# - > ########################################################## > ###################### > -[Libraries.common] > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseL > ib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryL > ib/BaseMemoryLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/ > BasePrintLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLib > Null/BaseDebugLibNull.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntr= i > nsic/BaseIoLibIntrinsic.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMa > intenanceLib/BaseCacheMaintenanceLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib > /BasePciCf8Lib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpres > sLib/BasePciExpressLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8 > /BasePciLibCf8.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPci= E > xpress/BasePciLibPciExpress.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffG > etEntryPointLib/BasePeCoffGetEntryPointLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib > /BasePeCoffLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntime > DxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/Pei > HobLib.inf > - EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf > - EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf > - > EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLi > b.inf > - EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf > - EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.i= nf > - EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProto > colLib.inf > -[Libraries.IA32] > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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/PeiServicesTa > blePointerLibMm7/PeiServicesTablePointerLibMm7.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAll > ocationLib/PeiMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLi= b > /PeiServicesLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStat > usCodeLib/PeiReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.in > f > - > - $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf > -[Libraries.IA32] > - > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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.in > f > - EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRunt > imeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupport= L > ib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.i= nf > - EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServi > cesTableLib/UefiBootServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryA > llocationLib/DxeMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiL= i > b.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/Dx > eHobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeS > ervicesTableLib/UefiRuntimeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportSta > tusCodeLib/DxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib= .in > f > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePat > hLib/UefiDevicePathLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverMo > delLib/UefiDriverModelLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTa > bleLib/DxeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRunti > meDriverLib/EdkDxeRuntimeDriverLib.inf > - > - >=20 > ########################################################## > ###################### > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform = @@ - > 865,7 +793,6 @@ [PcdsDynamicHii.common.DEFAULT] >=20 > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlo > balVariableGuid|0x0|5 # Variable: L"Timeout" >=20 > gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSup > port"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" > - > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState" > |gEfiBootStateGuid|0x0|TRUE >=20 > [PcdsDynamicDefault.common.DEFAULT] >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x > 0 > @@ -1048,7 +975,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > UefiCpuPkg/CpuIoPei/CpuIoPei.inf > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >=20 > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/M > pS3.inf > - > EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobTh > unk/AcpiVariableHobOnSmramReserveHobThunk.inf > # > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Pi > SmmCommunicationPei.inf >=20 > !if $(RECOVERY_ENABLE) > @@ -1484,17 +1410,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf >=20 > !endif >=20 > - # > - # ECP > - # > - > EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Framewor > kHiiOnUefiHiiThunk.inf > - > EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/Le > gacyRegion2OnLegacyRegionThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBase > OnSmmBase2Thunk.inf > - EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf > - > EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmA > ccess2OnSmmAccessThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/Smm > Control2OnSmmControlThunk.inf > - > EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmSta > tusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk.inf > - EdkCompatibilityPkg/Compatibility/FvOnFv2Thunk/FvOnFv2Thunk.inf > # > # SMBIOS > # > @@ -1538,9 +1453,9 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.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) =3D=3D TRUE > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index aa62c07f17..c60e4c70ea 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -195,7 +195,6 @@ >=20 > PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor > mFlashAccessLib/PlatformFlashAccessLib.inf >=20 > MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfo > rmFlashAccessLib/PlatformFlashAccessLib.inf >=20 > DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLi > bGraphics/DisplayUpdateProgressLibGraphics.inf > - > LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/Ue > fiLanguageLib.inf >=20 > SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz > ationLib.inf >=20 > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL > ib/DxeSecurityManagementLib.inf > IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf > @@ -477,79 +476,6 @@ >=20 > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgen > tLib.inf > !endif >=20 > - > - > ########################################################## > ###################### > -# > -# Library Section - list of all EDK/Framework libraries -# - > ########################################################## > ###################### > -[Libraries.common] > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseL > ib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryL > ib/BaseMemoryLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/ > BasePrintLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLib > Null/BaseDebugLibNull.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntr= i > nsic/BaseIoLibIntrinsic.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMa > intenanceLib/BaseCacheMaintenanceLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciCf8Lib > /BasePciCf8Lib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciExpres > sLib/BasePciExpressLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibCf8 > /BasePciLibCf8.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePciLibPci= E > xpress/BasePciLibPciExpress.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffG > etEntryPointLib/BasePeCoffGetEntryPointLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePeCoffLib > /BasePeCoffLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntime > DxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/Pei > HobLib.inf > - EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf > - EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf > - > EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLi > b.inf > - EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf > - EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiProtocolLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/EfiDriverLib.i= nf > - EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Protocol/EdkFrameworkProto > colLib.inf > -[Libraries.IA32] > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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/PeiServicesTa > blePointerLibMm7/PeiServicesTablePointerLibMm7.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiMemoryAll > ocationLib/PeiMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesLi= b > /PeiServicesLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStat > usCodeLib/PeiReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/ArchProtocolLib.in > f > - > - $(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf > -[Libraries.X64] > - > - EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf > - > EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.in > f > - 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.in > f > - EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRunt > imeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/EfiIfrSupport= L > ib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/Print/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.i= nf > - EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf > - EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiBootServi > cesTableLib/UefiBootServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeMemoryA > llocationLib/DxeMemoryAllocationLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiL= i > b.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/Dx > eHobLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeS > ervicesTableLib/UefiRuntimeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportSta > tusCodeLib/DxeReportStatusCodeLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/HiiLib/HiiLib= .in > f > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDevicePat > hLib/UefiDevicePathLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverMo > delLib/UefiDriverModelLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeServicesTa > bleLib/DxeServicesTableLib.inf > - > EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRunti > meDriverLib/EdkDxeRuntimeDriverLib.inf > - > - >=20 > ########################################################## > ###################### > # > # Pcd Section - list of all EDK II PCD Entries defined by this Platform = @@ - > 867,7 +793,6 @@ [PcdsDynamicHii.common.DEFAULT] >=20 > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlo > balVariableGuid|0x0|5 # Variable: L"Timeout" >=20 > gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSup > port"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" > - > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState" > |gEfiBootStateGuid|0x0|TRUE >=20 > [PcdsDynamicDefault.common.DEFAULT] >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x > 0 > @@ -1050,7 +975,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > UefiCpuPkg/CpuIoPei/CpuIoPei.inf > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >=20 > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/M > pS3.inf > - > EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobTh > unk/AcpiVariableHobOnSmramReserveHobThunk.inf > # > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Pi > SmmCommunicationPei.inf >=20 > !if $(RECOVERY_ENABLE) > @@ -1498,17 +1422,6 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf >=20 > !endif >=20 > - # > - # ECP > - # > - > EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Framewor > kHiiOnUefiHiiThunk.inf > - > EdkCompatibilityPkg/Compatibility/LegacyRegion2OnLegacyRegionThunk/Le > gacyRegion2OnLegacyRegionThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBase > OnSmmBase2Thunk.inf > - EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.inf > - > EdkCompatibilityPkg/Compatibility/SmmAccess2OnSmmAccessThunk/SmmA > ccess2OnSmmAccessThunk.inf > - > EdkCompatibilityPkg/Compatibility/SmmControl2OnSmmControlThunk/Smm > Control2OnSmmControlThunk.inf > - > EdkCompatibilityPkg/Compatibility/FrameworkSmmStatusCodeOnPiSmmSta > tusCodeThunk/FrameworkSmmStatusCodeOnPiSmmStatusCodeThunk.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 > # >=20 > # This program and the accompanying materials are licensed and made > available under >=20 > # the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -65,7 +65,7 @@ > gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode >=20 > [Protocols] > - gEfiSmmBaseProtocolGuid > + gEfiSmmBase2ProtocolGuid > gEfiSmmIchnDispatchProtocolGuid > gEfiGlobalNvsAreaProtocolGuid > gEfiSmmSwDispatchProtocolGuid > @@ -86,7 +86,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress >=20 > [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 @@ >=20 > /*++ >=20 > -Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved > +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved >=20 >=20 > This program and the accompanying materials are licensed and made > available under >=20 > the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -48,7 +48,7 @@ Abstract: >=20 > #include > #include > -#include > +#include > #include #include > #include @@ -135,7 +135,7 @@ > GetIntegratedIntelVbtPtr ( > EFI_PHYSICAL_ADDRESS VbtAddress =3D 0; > UINTN FvProtocolCount; > EFI_HANDLE *FvHandles; > - EFI_FIRMWARE_VOLUME_PROTOCOL *Fv; > + EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv; > UINTN Index; > UINT32 AuthenticationStatus; >=20 > @@ -147,7 +147,7 @@ GetIntegratedIntelVbtPtr ( > *VbtFileBuffer =3D NULL; > Status =3D gBS->LocateHandleBuffer ( > ByProtocol, > - &gEfiFirmwareVolumeProtocolGuid, > + &gEfiFirmwareVolume2ProtocolGuid, > NULL, > &FvProtocolCount, > &FvHandles > @@ -157,7 +157,7 @@ GetIntegratedIntelVbtPtr ( > for (Index =3D 0; Index < FvProtocolCount; Index++) { > Status =3D gBS->HandleProtocol ( > FvHandles[Index], > - &gEfiFirmwareVolumeProtocolGuid, > + &gEfiFirmwareVolume2ProtocolGuid, > (VOID **) &Fv > ); > VbtBufferSize =3D 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 > # >=20 > # This program and the accompanying materials are licensed and made > available under >=20 > # the terms and conditions of the BSD License that accompanies this > distribution. >=20 > @@ -65,7 +65,7 @@ > gIgdOpRegionProtocolGuid > gEfiGlobalNvsAreaProtocolGuid > gEfiPciIoProtocolGuid > - gEfiFirmwareVolumeProtocolGuid > + gEfiFirmwareVolume2ProtocolGuid > gEfiCpuIoProtocolGuid >=20 > [Depex] > @@ -74,6 +74,6 @@ > gEfiCpuIoProtocolGuid AND > gEfiDataHubProtocolGuid AND > gEfiGlobalNvsAreaProtocolGuid AND > - gEfiFirmwareVolumeProtocolGuid AND > + gEfiFirmwareVolume2ProtocolGuid AND > gEfiHiiDatabaseProtocolGuid >=20 > -- > 2.19.1.windows.1