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>

diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
index 77ef210fb2859f5ba4708f07f398d499d700cda4..128c44d695e15b2541e893b834537636cedafddc 100644 (file)
--- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+++ b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
@@ -45,44 +45,44 @@
   VarCheckLib\r
 \r
 [Guids]\r
-  ## CONSUMES   ## Variable:L"LangCodes"\r
-  ## CONSUMES   ## Variable:L"Lang"\r
-  ## CONSUMES   ## Variable:L"Timeout"\r
-  ## CONSUMES   ## Variable:L"PlatformLangCodes"\r
-  ## CONSUMES   ## Variable:L"PlatformLang"\r
-  ## CONSUMES   ## Variable:L"ConIn"\r
-  ## CONSUMES   ## Variable:L"ConOut"\r
-  ## CONSUMES   ## Variable:L"ErrOut"\r
-  ## CONSUMES   ## Variable:L"ConInDev"\r
-  ## CONSUMES   ## Variable:L"ConOutDev"\r
-  ## CONSUMES   ## Variable:L"ErrOutDev"\r
-  ## CONSUMES   ## Variable:L"BootOrder"\r
-  ## CONSUMES   ## Variable:L"BootNext"\r
-  ## CONSUMES   ## Variable:L"BootCurrent"\r
-  ## CONSUMES   ## Variable:L"BootOptionSupport"\r
-  ## CONSUMES   ## Variable:L"DriverOrder"\r
-  ## CONSUMES   ## Variable:L"SysPrepOrder"\r
-  ## CONSUMES   ## Variable:L"HwErrRecSupport"\r
-  ## CONSUMES   ## Variable:L"SetupMode"\r
-  ## CONSUMES   ## Variable:L"PK"\r
-  ## CONSUMES   ## Variable:L"KEK"\r
-  ## CONSUMES   ## Variable:L"SignatureSupport"\r
-  ## CONSUMES   ## Variable:L"SecureBoot"\r
-  ## CONSUMES   ## Variable:L"KEKDefault"\r
-  ## CONSUMES   ## Variable:L"PKDefault"\r
-  ## CONSUMES   ## Variable:L"dbDefault"\r
-  ## CONSUMES   ## Variable:L"dbxDefault"\r
-  ## CONSUMES   ## Variable:L"dbtDefault"\r
-  ## CONSUMES   ## Variable:L"OsIndicationsSupported"\r
-  ## CONSUMES   ## Variable:L"OsIndications"\r
-  ## CONSUMES   ## Variable:L"VendorKeys"\r
-  ## CONSUMES   ## Variable:L"Boot####"\r
-  ## CONSUMES   ## Variable:L"Driver####"\r
-  ## CONSUMES   ## Variable:L"SysPrep####"\r
-  ## CONSUMES   ## Variable:L"Key####"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"LangCodes"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Timeout"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLangCodes"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ConIn"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ConOut"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ErrOut"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ConInDev"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ConOutDev"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"ErrOutDev"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"BootOrder"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"BootNext"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"BootCurrent"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"BootOptionSupport"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DriverOrder"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SysPrepOrder"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SetupMode"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"KEK"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SignatureSupport"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SecureBoot"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"KEKDefault"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"PKDefault"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"dbDefault"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"dbxDefault"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"dbtDefault"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"OsIndicationsSupported"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"OsIndications"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"VendorKeys"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Boot####"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Driver####"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"SysPrep####"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"Key####"\r
   gEfiGlobalVariableGuid\r
-  ## CONSUMES   ## Variable:L"DB"\r
-  ## CONSUMES   ## Variable:L"DBX"\r
-  ## CONSUMES   ## Variable:L"DBT"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"DBT"\r
   gEfiImageSecurityDatabaseGuid\r
-  gEfiHardwareErrorVariableGuid  ## CONSUMES    ## Variable:L"HwErrRec####"\r
+  gEfiHardwareErrorVariableGuid  ## SOMETIMES_CONSUMES    ## Variable:L"HwErrRec####"\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 5e7b5c534160b4172f2c8d8f7cd0bcb835692db2..6214966c458be9cf3f37aa6097bd0295040b86fb 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -78,14 +78,14 @@
   gEdkiiVarCheckProtocolGuid                    ## PRODUCES\r
 \r
 [Guids]\r
-  ## PRODUCES             ## GUID # Signature of Variable store header\r
-  ## CONSUMES             ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiAuthenticatedVariableGuid\r
 \r
-  ## PRODUCES             ## GUID # Signature of Variable store header\r
-  ## CONSUMES             ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiVariableGuid\r
@@ -96,14 +96,17 @@
   ## SOMETIMES_PRODUCES   ## Variable:L"Lang"\r
   gEfiGlobalVariableGuid\r
 \r
-  gEfiMemoryOverwriteControlDataGuid            ## CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"\r
-  gEfiMemoryOverwriteRequestControlLockGuid     ## PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"\r
+  gEfiMemoryOverwriteControlDataGuid            ## SOMETIMES_CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"\r
+  gEfiMemoryOverwriteRequestControlLockGuid     ## SOMETIMES_PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"\r
 \r
   gEfiEventVirtualAddressChangeGuid             ## CONSUMES             ## Event\r
   gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID\r
   gEfiEndOfDxeEventGroupGuid                    ## CONSUMES             ## Event\r
   gEdkiiFaultTolerantWriteGuid                  ## SOMETIMES_CONSUMES   ## HOB\r
-  gEdkiiVarErrorFlagGuid                        ## CONSUMES             ## GUID\r
+\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"VarErrorFlag"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"VarErrorFlag"\r
+  gEdkiiVarErrorFlagGuid\r
 \r
   ## SOMETIMES_CONSUMES   ## Variable:L"DB"\r
   ## SOMETIMES_CONSUMES   ## Variable:L"DBX"\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
index 02f01064f39cf79e943f33d17462be4cd08d6a73..5f9017252406893e892382e533c5836851550472 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
@@ -86,14 +86,14 @@
   gEdkiiSmmVarCheckProtocolGuid                 ## PRODUCES\r
 \r
 [Guids]\r
-  ## PRODUCES             ## GUID # Signature of Variable store header\r
-  ## CONSUMES             ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiAuthenticatedVariableGuid\r
 \r
-  ## PRODUCES             ## GUID # Signature of Variable store header\r
-  ## CONSUMES             ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_CONSUMES   ## GUID # Signature of Variable store header\r
+  ## SOMETIMES_PRODUCES   ## GUID # Signature of Variable store header\r
   ## SOMETIMES_CONSUMES   ## HOB\r
   ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiVariableGuid\r
@@ -104,13 +104,16 @@
   ## SOMETIMES_PRODUCES   ## Variable:L"Lang"\r
   gEfiGlobalVariableGuid\r
 \r
-  gEfiMemoryOverwriteControlDataGuid            ## CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"\r
-  gEfiMemoryOverwriteRequestControlLockGuid     ## PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"\r
+  gEfiMemoryOverwriteControlDataGuid            ## SOMETIMES_CONSUMES   ## Variable:L"MemoryOverwriteRequestControl"\r
+  gEfiMemoryOverwriteRequestControlLockGuid     ## SOMETIMES_PRODUCES   ## Variable:L"MemoryOverwriteRequestControlLock"\r
 \r
   gSmmVariableWriteGuid                         ## PRODUCES             ## GUID # Install protocol\r
   gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID\r
   gEdkiiFaultTolerantWriteGuid                  ## SOMETIMES_CONSUMES   ## HOB\r
-  gEdkiiVarErrorFlagGuid                        ## CONSUMES             ## GUID\r
+\r
+  ## SOMETIMES_CONSUMES   ## Variable:L"VarErrorFlag"\r
+  ## SOMETIMES_PRODUCES   ## Variable:L"VarErrorFlag"\r
+  gEdkiiVarErrorFlagGuid\r
   gZeroGuid                                     ## SOMETIMES_CONSUMES   ## GUID\r
 \r
 [Pcd]\r