SecurityPkg: Update protocol usage in module INF files.

Update TCG and Library module uses gEdkiiVariableLockProtocolGuid
as SOMETIMES_CONSUMES instead of CONSUMES to follow the code logic.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>

diff --git a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
index bad4fe41b1d90ce4eb3fbcede5b4d23ee79bcf1c..f4aa0da0f072f931ed9150814c96216b8ed8cb59 100644 (file)
--- a/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
@@ -57,11 +57,11 @@
   Tcg2PpVendorLib\r
 \r
 [Protocols]\r
   Tcg2PpVendorLib\r
 \r
 [Protocols]\r

-  gEfiTcg2ProtocolGuid                 ## CONSUMES\r
-  gEdkiiVariableLockProtocolGuid       ## CONSUMES\r
+  gEfiTcg2ProtocolGuid                 ## SOMETIMES_CONSUMES\r
+  gEdkiiVariableLockProtocolGuid       ## SOMETIMES_CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  ## CONSUMES           ## HII\r
+  ## SOMETIMES_CONSUMES ## HII\r

   ## SOMETIMES_PRODUCES ## Variable:L"Tcg2PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"Tcg2PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"Tcg2PhysicalPresenceFlags"\r
   ## SOMETIMES_PRODUCES ## Variable:L"Tcg2PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"Tcg2PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"Tcg2PhysicalPresenceFlags"\r

diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
index b48b887ad32702b469367153413c9e97e7ba0277..3aacba5c2b19b91360005c782caf567ec3671ba3 100644 (file)
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
@@ -57,11 +57,11 @@
   TcgPpVendorLib\r
 \r
 [Protocols]\r
   TcgPpVendorLib\r
 \r
 [Protocols]\r

-  gEfiTcgProtocolGuid                   ## CONSUMES\r
-  gEdkiiVariableLockProtocolGuid        ## CONSUMES\r
+  gEfiTcgProtocolGuid                   ## SOMETIMES_CONSUMES\r
+  gEdkiiVariableLockProtocolGuid        ## SOMETIMES_CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  ## CONSUMES           ## HII\r
+  ## SOMETIMES_CONSUMES ## HII\r

   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r

diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
index 06122269aaea77435674da7aebde9a568d2400bd..1c123efe78dcb3fedcbe4a7a8af179505afb10c6 100644 (file)
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
+++ b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
@@ -57,11 +57,11 @@
   TrEEPpVendorLib\r
 \r
 [Protocols]\r
   TrEEPpVendorLib\r
 \r
 [Protocols]\r

-  gEfiTrEEProtocolGuid                 ## CONSUMES\r
-  gEdkiiVariableLockProtocolGuid       ## CONSUMES\r
+  gEfiTrEEProtocolGuid                 ## SOMETIMES_CONSUMES\r
+  gEdkiiVariableLockProtocolGuid       ## SOMETIMES_CONSUMES\r

 \r
 [Guids]\r
 \r
 [Guids]\r

-  ## CONSUMES           ## HII\r
+  ## SOMETIMES_CONSUMES ## HII\r

   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"\r
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresenceFlags"\r

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
index dd2247b957c7c22067b42c625ef9ffcad2418161..d9340d6f53a5a300ca7f219240e486f033720e1f 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -70,7 +70,7 @@
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiDevicePathProtocolGuid                    ## PRODUCES\r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiDevicePathProtocolGuid                    ## PRODUCES\r

-  gEdkiiVariableLockProtocolGuid                ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES\r

   gEfiTcg2ProtocolGuid                          ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiTcg2ProtocolGuid                          ## CONSUMES\r
 \r
 [Pcd]\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
index 9935e40497c9fba5656af604926cbc0ed9e59171..368570aea0278093d65c12a6951e87e6738f9984 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
@@ -72,7 +72,7 @@
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiDevicePathProtocolGuid                    ## PRODUCES\r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES\r
   gEfiDevicePathProtocolGuid                    ## PRODUCES\r

-  gEdkiiVariableLockProtocolGuid                ## CONSUMES\r
+  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES\r

 \r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid            ## CONSUMES\r
 \r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid            ## CONSUMES\r