MdeModulePkg: Update Guid/Protocol usages in INF files.

V2: Update VariableSmm inf to align the change in VariableRuntimeDxe.inf.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

3 files changed, 59 insertions, 53 deletions

diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
index 77ef210fb2..128c44d695 100644
--- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+++ b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
@@ -45,44 +45,44 @@
   VarCheckLib

 

 [Guids]

-  ## CONSUMES   ## Variable:L"LangCodes"

-  ## CONSUMES   ## Variable:L"Lang"

-  ## CONSUMES   ## Variable:L"Timeout"

-  ## CONSUMES   ## Variable:L"PlatformLangCodes"

-  ## CONSUMES   ## Variable:L"PlatformLang"

-  ## CONSUMES   ## Variable:L"ConIn"

-  ## CONSUMES   ## Variable:L"ConOut"

-  ## CONSUMES   ## Variable:L"ErrOut"

-  ## CONSUMES   ## Variable:L"ConInDev"

-  ## CONSUMES   ## Variable:L"ConOutDev"

-  ## CONSUMES   ## Variable:L"ErrOutDev"

-  ## CONSUMES   ## Variable:L"BootOrder"

-  ## CONSUMES   ## Variable:L"BootNext"

-  ## CONSUMES   ## Variable:L"BootCurrent"

-  ## CONSUMES   ## Variable:L"BootOptionSupport"

-  ## CONSUMES   ## Variable:L"DriverOrder"

-  ## CONSUMES   ## Variable:L"SysPrepOrder"

-  ## CONSUMES   ## Variable:L"HwErrRecSupport"

-  ## CONSUMES   ## Variable:L"SetupMode"

-  ## CONSUMES   ## Variable:L"PK"

-  ## CONSUMES   ## Variable:L"KEK"

-  ## CONSUMES   ## Variable:L"SignatureSupport"

-  ## CONSUMES   ## Variable:L"SecureBoot"

-  ## CONSUMES   ## Variable:L"KEKDefault"

-  ## CONSUMES   ## Variable:L"PKDefault"

-  ## CONSUMES   ## Variable:L"dbDefault"

-  ## CONSUMES   ## Variable:L"dbxDefault"

-  ## CONSUMES   ## Variable:L"dbtDefault"

-  ## CONSUMES   ## Variable:L"OsIndicationsSupported"

-  ## CONSUMES   ## Variable:L"OsIndications"

-  ## CONSUMES   ## Variable:L"VendorKeys"

-  ## CONSUMES   ## Variable:L"Boot####"

-  ## CONSUMES   ## Variable:L"Driver####"

-  ## CONSUMES   ## Variable:L"SysPrep####"

-  ## CONSUMES   ## Variable:L"Key####"

+  ## SOMETIMES_CONSUMES   ## Variable:L"LangCodes"

+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"

+  ## SOMETIMES_CONSUMES   ## Variable:L"Timeout"

+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLangCodes"

+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ConIn"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ConOut"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ErrOut"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ConInDev"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ConOutDev"

+  ## SOMETIMES_CONSUMES   ## Variable:L"ErrOutDev"

+  ## SOMETIMES_CONSUMES   ## Variable:L"BootOrder"

+  ## SOMETIMES_CONSUMES   ## Variable:L"BootNext"

+  ## SOMETIMES_CONSUMES   ## Variable:L"BootCurrent"

+  ## SOMETIMES_CONSUMES   ## Variable:L"BootOptionSupport"

+  ## SOMETIMES_CONSUMES   ## Variable:L"DriverOrder"

+  ## SOMETIMES_CONSUMES   ## Variable:L"SysPrepOrder"

+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"

+  ## SOMETIMES_CONSUMES   ## Variable:L"SetupMode"

+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"

+  ## SOMETIMES_CONSUMES   ## Variable:L"KEK"

+  ## SOMETIMES_CONSUMES   ## Variable:L"SignatureSupport"

+  ## SOMETIMES_CONSUMES   ## Variable:L"SecureBoot"

+  ## SOMETIMES_CONSUMES   ## Variable:L"KEKDefault"

+  ## SOMETIMES_CONSUMES   ## Variable:L"PKDefault"

+  ## SOMETIMES_CONSUMES   ## Variable:L"dbDefault"

+  ## SOMETIMES_CONSUMES   ## Variable:L"dbxDefault"

+  ## SOMETIMES_CONSUMES   ## Variable:L"dbtDefault"

+  ## SOMETIMES_CONSUMES   ## Variable:L"OsIndicationsSupported"

+  ## SOMETIMES_CONSUMES   ## Variable:L"OsIndications"

+  ## SOMETIMES_CONSUMES   ## Variable:L"VendorKeys"

+  ## SOMETIMES_CONSUMES   ## Variable:L"Boot####"

+  ## SOMETIMES_CONSUMES   ## Variable:L"Driver####"

+  ## SOMETIMES_CONSUMES   ## Variable:L"SysPrep####"

+  ## SOMETIMES_CONSUMES   ## Variable:L"Key####"

   gEfiGlobalVariableGuid

-  ## CONSUMES   ## Variable:L"DB"

-  ## CONSUMES   ## Variable:L"DBX"

-  ## CONSUMES   ## Variable:L"DBT"

+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"

+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"

+  ## SOMETIMES_CONSUMES   ## Variable:L"DBT"

   gEfiImageSecurityDatabaseGuid

-  gEfiHardwareErrorVariableGuid  ## CONSUMES    ## Variable:L"HwErrRec####"

+  gEfiHardwareErrorVariableGuid  ## SOMETIMES_CONSUMES    ## Variable:L"HwErrRec####"

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 5e7b5c5341..6214966c45 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -78,14 +78,14 @@
   gEdkiiVarCheckProtocolGuid                    ## PRODUCES

 

 [Guids]

-  ## PRODUCES             ## GUID # Signature of Variable store header

-  ## CONSUMES             ## GUID # Signature of Variable store header

+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header

+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header

   ## SOMETIMES_CONSUMES   ## HOB

   ## SOMETIMES_PRODUCES   ## SystemTable

   gEfiAuthenticatedVariableGuid

 

-  ## PRODUCES             ## GUID # Signature of Variable store header

-  ## CONSUMES             ## GUID # Signature of Variable store header

+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header

+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header

   ## SOMETIMES_CONSUMES   ## HOB

   ## SOMETIMES_PRODUCES   ## SystemTable

   gEfiVariableGuid

@@ -96,14 +96,17 @@
   ## SOMETIMES_PRODUCES   ## Variable:L"Lang"

   gEfiGlobalVariableGuid

 

-  gEfiMemoryOverwriteControlDataGuid            ## CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"

-  gEfiMemoryOverwriteRequestControlLockGuid     ## PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"

+  gEfiMemoryOverwriteControlDataGuid            ## SOMETIMES_CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"

+  gEfiMemoryOverwriteRequestControlLockGuid     ## SOMETIMES_PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"

 

   gEfiEventVirtualAddressChangeGuid             ## CONSUMES             ## Event

   gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID

   gEfiEndOfDxeEventGroupGuid                    ## CONSUMES             ## Event

   gEdkiiFaultTolerantWriteGuid                  ## SOMETIMES_CONSUMES   ## HOB

-  gEdkiiVarErrorFlagGuid                        ## CONSUMES             ## GUID

+

+  ## SOMETIMES_CONSUMES   ## Variable:L"VarErrorFlag"

+  ## SOMETIMES_PRODUCES   ## Variable:L"VarErrorFlag"

+  gEdkiiVarErrorFlagGuid

 

   ## SOMETIMES_CONSUMES   ## Variable:L"DB"

   ## SOMETIMES_CONSUMES   ## Variable:L"DBX"

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
index 02f01064f3..5f90172524 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
@@ -86,14 +86,14 @@
   gEdkiiSmmVarCheckProtocolGuid                 ## PRODUCES

 

 [Guids]

-  ## PRODUCES             ## GUID # Signature of Variable store header

-  ## CONSUMES             ## GUID # Signature of Variable store header

+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header

+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header

   ## SOMETIMES_CONSUMES   ## HOB

   ## SOMETIMES_PRODUCES   ## SystemTable

   gEfiAuthenticatedVariableGuid

 

-  ## PRODUCES             ## GUID # Signature of Variable store header

-  ## CONSUMES             ## GUID # Signature of Variable store header

+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header

+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header

   ## SOMETIMES_CONSUMES   ## HOB

   ## SOMETIMES_PRODUCES   ## SystemTable

   gEfiVariableGuid

@@ -104,13 +104,16 @@
   ## SOMETIMES_PRODUCES   ## Variable:L"Lang"

   gEfiGlobalVariableGuid

 

-  gEfiMemoryOverwriteControlDataGuid            ## CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"

-  gEfiMemoryOverwriteRequestControlLockGuid     ## PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"

+  gEfiMemoryOverwriteControlDataGuid            ## SOMETIMES_CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"

+  gEfiMemoryOverwriteRequestControlLockGuid     ## SOMETIMES_PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"

 

   gSmmVariableWriteGuid                         ## PRODUCES             ## GUID # Install protocol

   gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID

   gEdkiiFaultTolerantWriteGuid                  ## SOMETIMES_CONSUMES   ## HOB

-  gEdkiiVarErrorFlagGuid                        ## CONSUMES             ## GUID

+

+  ## SOMETIMES_CONSUMES   ## Variable:L"VarErrorFlag"

+  ## SOMETIMES_PRODUCES   ## Variable:L"VarErrorFlag"

+  gEdkiiVarErrorFlagGuid

   gZeroGuid                                     ## SOMETIMES_CONSUMES   ## GUID

 

 [Pcd]