Cleanup meta data for BdsDxe INF file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7421 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index c8136db4fc204b31e528a9d462e592a92115a925..5f925409af2e1942d33819c358ea83bfaa8d26b0 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -87,13 +87,8 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  #\r
-  #This dependency is because of gEfiLegacyBiosProtocolGuid and gEfiDataHubProtocolGuid. It may be removed if a Library class is created to\r
-  #abstract away definition in Framework specification or PI spec incorporates the Legacy Booting Protocols and Data Hub Protocols.\r
-  #\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
-\r
 [LibraryClasses]\r
   DevicePathLib\r
   BaseLib\r
@@ -117,35 +112,51 @@
   CapsuleLib\r
 \r
 [Guids]\r
-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED\r
-  gEfiBootStateGuid                             # ALWAYS_CONSUMED\r
-  gEfiFileSystemVolumeLabelInfoIdGuid           # ALWAYS_CONSUMED\r
-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED\r
-  gEfiGenericPlatformVariableGuid\r
-  gEfiMiscSubClassGuid\r
-  gEfiMemorySubClassGuid\r
-  gEfiProcessorSubClassGuid\r
-  gEfiCapsuleVendorGuid\r
+  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"PlatformLang" (Platform supported languange in Rfc3066 format)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"Lang" (Platform supported languange in Iso639 format)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"KeyOrder" (Number of hotkey)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"KeyXX" (Hotkey option variable)\r
+                                                ## PRODUCES           ## Variable:L"HwErrRecSupport" (The level of platform supported hardware Error Record Persistence)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"BootOptionSupport" (The feature supported in boot option menu, value could be: EFI_BOOT_OPTION_SUPPORT_KEY, EFI_BOOT_OPTION_SUPPORT_APP\r
+                                                ## SOMETIMES_PRODUCES (not PcdUefiVariableDefaultLangDeprecate)## Variable:L"LangCodes" (Value of PcdUefiVariableDefaultLangCodes)\r
+                                                ## PRODUCES           ## Variable:L"PlatformLangCodes" (Value of PcdUefiVariableDefaultPlatformLangCodes)\r
+                                                ## PRODUCES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"BootOrder" (The boot option array)\r
+                                                ## SOMETIMES_PRODUCES ## Variable:L"DriverOrder" (The driver order list)\r
+                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)\r
+                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)\r
+                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)\r
+  gEfiBootStateGuid                             ## SOMETIMES_PRODUCES (Produce when status has not been set yet) ## Variable:L"BootState" (Indicate the state of last boot)\r
+  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES ## GUID (Indicate the information type is volume)\r
+  gEfiFileInfoGuid                              ## CONSUMES ## GUID (Indicate the information type is file)\r
+  gEfiGenericPlatformVariableGuid               ## PRODUCES ## Variable:L"ConOutMode" (The mode of console out device)\r
+                                                ## PRODUCES ## Variable:L"VBIOS" (The option of video BIOS)\r
+  gEfiMiscSubClassGuid                          ## CONSUMES ## GUID (Indicate the datahub for holding misc sub class record)\r
+  gEfiMemorySubClassGuid                        ## CONSUMES ## GUID (Indicate the datahub for holding memory record)\r
+  gEfiProcessorSubClassGuid                     ## CONSUMES ## GUID (Indicate the datahub for holding processor record)\r
+  gEfiCapsuleVendorGuid                         ## CONSUMES ## GUID (Indicate the hob for holding capsure vendor)\r
 \r
 [Protocols]\r
-  gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiFormBrowser2ProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSerialIoProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCES\r
+  gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiFormBrowser2ProtocolGuid                  # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiSerialIoProtocolGuid                      # PROTOCOL ALWAYS_CONSUMES\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES\r
 \r
 [FeaturePcd.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate\r
@@ -162,3 +173,12 @@
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid\r
 \r
+#\r
+# [BootMode] \r
+#   BOOT_ON_FLASH_UPDATE            ## SOMETIMES_CONSUMES\r
+#\r
+#  \r
+# [Hob]\r
+#   CAPSULE_HOB                     ## SOMETIMES_CONSUMES\r
+#\r
+# \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 5cc7abcb5a74be3d63883195961796492fa5e9aa..d513da2ef31eb57f72ab23d54a862e63c2ac192f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -237,8 +237,7 @@ Var_DelDriverOption (
   needed.\r
 \r
   @retval  EFI_SUCCESS  The driver order is updated successfully.\r
-  @return               EFI_STATUS other than EFI_SUCCESS if failed to\r
-                                 Set the "DriverOrder" EFI Variable.\r
+  @return  Other status than EFI_SUCCESS if failed to set the "DriverOrder" EFI Variable.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -875,7 +874,7 @@ Var_UpdateBootOption (
 \r
 /**\r
   This function update the "BootNext" EFI Variable. If there is \r
-  no "BootNex" specified in BMM, this EFI Variable is deleted.\r
+  no "BootNext" specified in BMM, this EFI Variable is deleted.\r
   It also update the BMM context data specified the "BootNext"\r
   vaule.\r
 \r