Vlv2TbltDevicePkg: Reorganize the libraries

* Simplify the logic of importing TpmMeasurementLib
* Import BaseCryptLib, OpensslLib, and IntrinsicLib unconditionally
  since FmpDxe needs them
* Import FileExplorerLib unconditionally since UiApp needs it
* Update the import of TPM/TCG libraries

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

4 files changed, 66 insertions, 119 deletions

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index e4e86cbb..eb7ae465 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -197,7 +197,6 @@
   TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf

   Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf

   Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-

 !endif

 

   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf

@@ -215,8 +214,9 @@
   # CryptLib

   #

 !if $(TPM_ENABLED) == TRUE

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!else

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

 !endif

 

  BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf

@@ -224,34 +224,28 @@
   StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !else

-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 !endif

+

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+

   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-!endif

 !if $(NETWORK_TLS_ENABLE) == TRUE

   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 

-

-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

 

 [LibraryClasses.IA32.SEC]

@@ -305,18 +299,13 @@
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !if $(TPM_ENABLED) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

 !endif

 

   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

   EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

-!endif

-

   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

 

 [LibraryClasses.IA32.DXE_DRIVER]

@@ -370,6 +359,10 @@
 !endif

   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

 

+!if $(TPM_ENABLED) == TRUE

+  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf

+!endif

+

 [LibraryClasses.IA32.SMM_CORE]

   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf

   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf

@@ -389,10 +382,7 @@
 

 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER]

   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

-!endif

-!if $(TPM_ENABLED) == TRUE

+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

 

@@ -794,8 +784,6 @@
   SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

   SecurityPkg/Tcg/TcgPei/TcgPei.inf {

     <LibraryClasses>

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

 }

 !endif

@@ -925,7 +913,6 @@
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {

     <LibraryClasses>

       PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf

-      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

   }

   MdeModulePkg/Logo/LogoDxe.inf

   MdeModulePkg/Application/UiApp/UiApp.inf {

@@ -1019,9 +1006,9 @@
   Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf

 

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {

     <LibraryClasses>

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   }

 

   SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index bc986eae..69f2b22a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -199,7 +199,6 @@
   TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf

   Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf

   Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-

 !endif

 

   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf

@@ -217,8 +216,9 @@
   # CryptLib

   #

 !if $(TPM_ENABLED) == TRUE

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!else

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

 !endif

 

  BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf

@@ -226,35 +226,28 @@
   StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !else

-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 !endif

+

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+

   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-!endif

 !if $(NETWORK_TLS_ENABLE) == TRUE

   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 

-

-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

-

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

 

 [LibraryClasses.IA32.SEC]

@@ -308,18 +301,13 @@
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !if $(TPM_ENABLED) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

 !endif

 

   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

   EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

-!endif

-

   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

 

 [LibraryClasses.X64.DXE_DRIVER]

@@ -373,6 +361,10 @@
 !endif

   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

 

+!if $(TPM_ENABLED) == TRUE

+  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf

+!endif

+

 [LibraryClasses.X64.SMM_CORE]

   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf

   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf

@@ -392,10 +384,7 @@
 

 [LibraryClasses.X64.DXE_RUNTIME_DRIVER]

   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

-!endif

-!if $(TPM_ENABLED) == TRUE

+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

 

@@ -797,10 +786,8 @@
   SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

   SecurityPkg/Tcg/TcgPei/TcgPei.inf {

     <LibraryClasses>

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

-}

+  }

 !endif

 

  Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {

@@ -941,7 +928,6 @@
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {

     <LibraryClasses>

       PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf

-      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

   }

   MdeModulePkg/Logo/LogoDxe.inf

   MdeModulePkg/Application/UiApp/UiApp.inf {

@@ -1035,9 +1021,9 @@
   Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf

 

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {

     <LibraryClasses>

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   }

 

   SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index f2f02e5f..7092ab6e 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -197,7 +197,6 @@
   TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf

   Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf

   Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-

 !endif

 

   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf

@@ -215,8 +214,9 @@
   # CryptLib

   #

 !if $(TPM_ENABLED) == TRUE

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!else

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

 !endif

 

  BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf

@@ -224,34 +224,28 @@
   StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !else

-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 !endif

+

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+

   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-!endif

 !if $(NETWORK_TLS_ENABLE) == TRUE

   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 

-

-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

 

 [LibraryClasses.IA32.SEC]

@@ -305,18 +299,13 @@
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !if $(TPM_ENABLED) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

 !endif

 

   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

   EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

-!endif

-

   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

 

 [LibraryClasses.IA32.DXE_DRIVER]

@@ -370,6 +359,10 @@
 !endif

   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

 

+!if $(TPM_ENABLED) == TRUE

+  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf

+!endif

+

 [LibraryClasses.IA32.SMM_CORE]

   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf

   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf

@@ -389,10 +382,7 @@
 

 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER]

   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

-!endif

-!if $(TPM_ENABLED) == TRUE

+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

 

@@ -794,8 +784,6 @@
   SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

   SecurityPkg/Tcg/TcgPei/TcgPei.inf {

     <LibraryClasses>

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

 }

 !endif

@@ -925,7 +913,6 @@
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {

     <LibraryClasses>

       PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf

-      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

   }

   MdeModulePkg/Logo/LogoDxe.inf

   MdeModulePkg/Application/UiApp/UiApp.inf {

@@ -1019,9 +1006,9 @@
   Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf

 

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {

     <LibraryClasses>

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   }

 

   SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 4184c946..23856119 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -199,7 +199,6 @@
   TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf

   Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf

   Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-

 !endif

 

   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf

@@ -217,8 +216,9 @@
   # CryptLib

   #

 !if $(TPM_ENABLED) == TRUE

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+!else

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

 !endif

 

  BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf

@@ -226,34 +226,28 @@
   StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !else

-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 !endif

+

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+

   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-!endif

 !if $(NETWORK_TLS_ENABLE) == TRUE

   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 

-

-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

 

 [LibraryClasses.IA32.SEC]

@@ -307,18 +301,13 @@
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !if $(TPM_ENABLED) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

 !endif

 

   LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

   EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf

-

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

-!endif

-

   HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

 

 [LibraryClasses.X64.DXE_DRIVER]

@@ -372,6 +361,10 @@
 !endif

   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

 

+!if $(TPM_ENABLED) == TRUE

+  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf

+!endif

+

 [LibraryClasses.X64.SMM_CORE]

   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf

   SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf

@@ -391,10 +384,7 @@
 

 [LibraryClasses.X64.DXE_RUNTIME_DRIVER]

   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

-!endif

-!if $(TPM_ENABLED) == TRUE

+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

 

@@ -796,10 +786,8 @@
   SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

   SecurityPkg/Tcg/TcgPei/TcgPei.inf {

     <LibraryClasses>

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

-}

+  }

 !endif

 

  Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {

@@ -940,7 +928,6 @@
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {

     <LibraryClasses>

       PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf

-      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

   }

   MdeModulePkg/Logo/LogoDxe.inf

   MdeModulePkg/Application/UiApp/UiApp.inf {

@@ -1034,9 +1021,9 @@
   Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf

 

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {

     <LibraryClasses>

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   }

 

   SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {