UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Dxe / Tcg2Dxe.inf

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
index 49402d902c835c5c9f6db03c86555037ebccc4c4..7dc7a2683d713ac7f7b31f46a709a902fbccff58 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
@@ -17,12 +17,7 @@
 #  buffer overflow, integer overflow.\r
 #\r
 # Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -90,6 +85,7 @@
 \r
   gTcgEvent2EntryHobGuid                             ## SOMETIMES_CONSUMES  ## HOB\r
   gTpm2StartupLocalityHobGuid                        ## SOMETIMES_CONSUMES  ## HOB\r
+  gTcg800155PlatformIdEventHobGuid                   ## SOMETIMES_CONSUMES  ## HOB\r
 \r
 [Protocols]\r
   gEfiTcg2ProtocolGuid                               ## PRODUCES\r
@@ -107,9 +103,17 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks                     ## CONSUMES\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTcgLogAreaMinLen                         ## CONSUMES\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTcg2FinalLogAreaLen                      ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev                         ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml                        ## PRODUCES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa                        ## PRODUCES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision               ## CONSUMES\r
 \r
 [Depex]\r
-  TRUE\r
+  # According to PcdTpm2AcpiTableRev definition in SecurityPkg.dec\r
+  # This PCD should be configured at DynamicHii or DynamicHiiEx.\r
+  # So, this PCD read operation depends on GetVariable service.\r
+  # Add VariableArch protocol dependency to make sure PCD read works.\r
+  gEfiVariableArchProtocolGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   Tcg2DxeExtra.uni\r