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

2 files changed, 54 insertions, 35 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index c8136db4fc..5f925409af 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -87,13 +87,8 @@
 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

-  #

-  #This dependency is because of gEfiLegacyBiosProtocolGuid and gEfiDataHubProtocolGuid. It may be removed if a Library class is created to

-  #abstract away definition in Framework specification or PI spec incorporates the Legacy Booting Protocols and Data Hub Protocols.

-  #

   IntelFrameworkPkg/IntelFrameworkPkg.dec

 

-

 [LibraryClasses]

   DevicePathLib

   BaseLib

@@ -117,35 +112,51 @@
   CapsuleLib

 

 [Guids]

-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED

-  gEfiBootStateGuid                             # ALWAYS_CONSUMED

-  gEfiFileSystemVolumeLabelInfoIdGuid           # ALWAYS_CONSUMED

-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED

-  gEfiGenericPlatformVariableGuid

-  gEfiMiscSubClassGuid

-  gEfiMemorySubClassGuid

-  gEfiProcessorSubClassGuid

-  gEfiCapsuleVendorGuid

+  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"PlatformLang" (Platform supported languange in Rfc3066 format)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"Lang" (Platform supported languange in Iso639 format)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"KeyOrder" (Number of hotkey)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"KeyXX" (Hotkey option variable)

+                                                ## PRODUCES           ## Variable:L"HwErrRecSupport" (The level of platform supported hardware Error Record Persistence)

+                                                ## 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

+                                                ## SOMETIMES_PRODUCES (not PcdUefiVariableDefaultLangDeprecate)## Variable:L"LangCodes" (Value of PcdUefiVariableDefaultLangCodes)

+                                                ## PRODUCES           ## Variable:L"PlatformLangCodes" (Value of PcdUefiVariableDefaultPlatformLangCodes)

+                                                ## PRODUCES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"BootOrder" (The boot option array)

+                                                ## SOMETIMES_PRODUCES ## Variable:L"DriverOrder" (The driver order list)

+                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)

+                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)

+                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)

+  gEfiBootStateGuid                             ## SOMETIMES_PRODUCES (Produce when status has not been set yet) ## Variable:L"BootState" (Indicate the state of last boot)

+  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES ## GUID (Indicate the information type is volume)

+  gEfiFileInfoGuid                              ## CONSUMES ## GUID (Indicate the information type is file)

+  gEfiGenericPlatformVariableGuid               ## PRODUCES ## Variable:L"ConOutMode" (The mode of console out device)

+                                                ## PRODUCES ## Variable:L"VBIOS" (The option of video BIOS)

+  gEfiMiscSubClassGuid                          ## CONSUMES ## GUID (Indicate the datahub for holding misc sub class record)

+  gEfiMemorySubClassGuid                        ## CONSUMES ## GUID (Indicate the datahub for holding memory record)

+  gEfiProcessorSubClassGuid                     ## CONSUMES ## GUID (Indicate the datahub for holding processor record)

+  gEfiCapsuleVendorGuid                         ## CONSUMES ## GUID (Indicate the hob for holding capsure vendor)

 

 [Protocols]

-  gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

-  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMED

-  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED

-  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

-  gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

-  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

-  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

-  gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED

-  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED

-  gEfiFormBrowser2ProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED

-  gEfiSerialIoProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

+  gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMES

+  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMES

+  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMES

+  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCES

+  gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES

+  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMES

+  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES

+  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMES

+  gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMES

+  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES

+  gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES

+  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMES

+  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_CONSUMES

+  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMES

+  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMES

+  gEfiFormBrowser2ProtocolGuid                  # PROTOCOL ALWAYS_CONSUMES

+  gEfiSerialIoProtocolGuid                      # PROTOCOL ALWAYS_CONSUMES

+  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES

 

 [FeaturePcd.common]

   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate

@@ -162,3 +173,12 @@
 [Depex]

   gEfiHiiDatabaseProtocolGuid

 

+#

+# [BootMode] 

+#   BOOT_ON_FLASH_UPDATE            ## SOMETIMES_CONSUMES

+#

+#  

+# [Hob]

+#   CAPSULE_HOB                     ## SOMETIMES_CONSUMES

+#

+# 

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 5cc7abcb5a..d513da2ef3 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -237,8 +237,7 @@ Var_DelDriverOption (
   needed.

 

   @retval  EFI_SUCCESS  The driver order is updated successfully.

-  @return               EFI_STATUS other than EFI_SUCCESS if failed to

-                                 Set the "DriverOrder" EFI Variable.

+  @return  Other status than EFI_SUCCESS if failed to set the "DriverOrder" EFI Variable.

 

 **/

 EFI_STATUS

@@ -875,7 +874,7 @@ Var_UpdateBootOption (
 

 /**

   This function update the "BootNext" EFI Variable. If there is 

-  no "BootNex" specified in BMM, this EFI Variable is deleted.

+  no "BootNext" specified in BMM, this EFI Variable is deleted.

   It also update the BMM context data specified the "BootNext"

   vaule.