ShellPkg: Refine the fomat in INF/DEC files to follow spec.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>





git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16634 6f19259b-4bc3-4df7-8a09-765794883524

15 files changed, 260 insertions, 261 deletions

diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
index e20ac08a7e..4749c06819 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -2,7 +2,7 @@
 #  This is the shell application

 #

 #  Copyright (c) 2013, Hewlett-Packard Development Company, L.P.

-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -72,39 +72,39 @@
   HandleParsingLib

 

 [Guids]

-  gShellVariableGuid                                      # ALWAYS_CONSUMES

-  gShellMapGuid                                           # ALWAYS_CONSUMES

-  gShellAliasGuid                                         # ALWAYS_CONSUMES

+  gShellVariableGuid                                      ## CONSUMES ## GUID

+  gShellMapGuid                                           ## CONSUMES ## GUID

+  gShellAliasGuid                                         ## CONSUMES ## GUID

 

 [Protocols]

-  gEfiShellProtocolGuid                                   # ALWAYS_PRODUCES

-                                                          # SOMETIMES_CONSUMES

-  gEfiShellParametersProtocolGuid                         # ALWAYS_PRODUCES

-                                                          # SOMETIMES_CONSUMES

+  gEfiShellProtocolGuid                                   ## PRODUCES

+                                                          ## SOMETIMES_CONSUMES

+  gEfiShellParametersProtocolGuid                         ## PRODUCES

+                                                          ## SOMETIMES_CONSUMES

 

-#  gEfiShellEnvironment2Guid                               # SOMETIMES_PRODUCES

-#  gEfiShellInterfaceGuid                                  # SOMETIMES_PRODUCES

+#  gEfiShellEnvironment2Guid                              ## SOMETIMES_PRODUCES

+#  gEfiShellInterfaceGuid                                 ## SOMETIMES_PRODUCES

 

-  gEfiSimpleTextInputExProtocolGuid                       # ALWAYS_CONSUMES

-  gEfiSimpleTextInProtocolGuid                            # ALWAYS_CONSUMES

-  gEfiSimpleTextOutProtocolGuid                           # ALWAYS_CONSUMES

-  gEfiSimpleFileSystemProtocolGuid                        # ALWAYS_CONSUMES

-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMES

-  gEfiComponentName2ProtocolGuid                          # ALWAYS_CONSUMES

-  gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMES

-  gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMES

+  gEfiSimpleTextInputExProtocolGuid                       ## CONSUMES

+  gEfiSimpleTextInProtocolGuid                            ## CONSUMES

+  gEfiSimpleTextOutProtocolGuid                           ## CONSUMES

+  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES

+  gEfiLoadedImageProtocolGuid                             ## CONSUMES

+  gEfiComponentName2ProtocolGuid                          ## CONSUMES

+  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES

+  gEfiDevicePathProtocolGuid                              ## CONSUMES

 

 [Pcd]

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols  # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform   # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii  # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault     # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize    # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault    # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount       # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole         # ALWAYS_CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier             # ALWAYS_CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols  ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform   ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii  ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault     ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize    ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault    ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount       ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole         ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier             ## CONSUMES

 

diff --git a/ShellPkg/Library/UefiDpLib/UefiDpLib.inf b/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
index 9488a49813..70d2163d2b 100644
--- a/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
+++ b/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Display Performance Application, Module information file.

 #

-# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.

+# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -65,11 +65,11 @@
   DevicePathLib

 

 [Protocols]

-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED

-  gEfiDriverBindingProtocolGuid                           # SOMETIMES_CONSUMED

-  gEfiComponentName2ProtocolGuid                          # SOMETIMES_CONSUMED

-  gEfiLoadedImageDevicePathProtocolGuid                   # SOMETIMES_CONSUMED

+  gEfiLoadedImageProtocolGuid                             ## CONSUMES

+  gEfiDriverBindingProtocolGuid                           ## SOMETIMES_CONSUMES

+  gEfiComponentName2ProtocolGuid                          ## SOMETIMES_CONSUMES

+  gEfiLoadedImageDevicePathProtocolGuid                   ## SOMETIMES_CONSUMES

 

 [Pcd]

-  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize

-  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask # ALWAYS_CONSUMED

+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize   ## UNDEFINED

+  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask          ## CONSUMES

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index c95f41b115..96c8425d61 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.

 #  Copyright (c) 2013 - 2014, Hewlett-Packard Development Company, L.P.<BR>

-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -51,148 +51,148 @@
   SortLib

 

 [Protocols]

-  gEfiSimpleFileSystemProtocolGuid                        ##CONSUMES

+  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES

 

   # shell 2.0

-  gEfiShellProtocolGuid                                   ##SOMETIMES_CONSUMED

-  gEfiShellParametersProtocolGuid                         ##SOMETIMES_CONSUMED

+  gEfiShellProtocolGuid                                   ## SOMETIMES_CONSUMES

+  gEfiShellParametersProtocolGuid                         ## SOMETIMES_CONSUMES

 

   # 'old' shell

-  gEfiShellEnvironment2Guid                               ##SOMETIMES_CONSUMED

-  gEfiShellInterfaceGuid                                  ##SOMETIMES_CONSUMED

+  gEfiShellEnvironment2Guid                               ## SOMETIMES_CONSUMES

+  gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES

 

-  gEfiUnicodeCollation2ProtocolGuid                       ##CONSUMES

-  gEfiDevicePathToTextProtocolGuid                        ##CONSUMES

-  gEfiBusSpecificDriverOverrideProtocolGuid               ##CONSUMES

-  gEfiDevicePathUtilitiesProtocolGuid                     ##CONSUMES

-  gEfiDevicePathFromTextProtocolGuid                      ##CONSUMES

-  gEfiPlatformDriverOverrideProtocolGuid                  ##CONSUMES

-  gEfiSimpleTextInProtocolGuid                            ##CONSUMES

-  gEfiPlatformToDriverConfigurationProtocolGuid           ##CONSUMES

-  gEfiDriverSupportedEfiVersionProtocolGuid               ##CONSUMES

-  gEfiLoadedImageProtocolGuid                             ##CONSUMES

-  gEfiDevicePathProtocolGuid                              ##CONSUMES

-  gEfiLoadedImageDevicePathProtocolGuid                   ##CONSUMES

-  gEfiSimpleTextOutProtocolGuid                           ##UNDEFINED

-  gEfiSimplePointerProtocolGuid                           ##UNDEFINED

-  gEfiAbsolutePointerProtocolGuid                         ##UNDEFINED

-  gEfiSerialIoProtocolGuid                                ##UNDEFINED

-  gEfiEdidDiscoveredProtocolGuid                          ##UNDEFINED

-  gEfiEdidActiveProtocolGuid                              ##UNDEFINED

-  gEfiEdidOverrideProtocolGuid                            ##UNDEFINED

-  gEfiLoadFileProtocolGuid                                ##UNDEFINED

-  gEfiLoadFile2ProtocolGuid                               ##UNDEFINED

-  gEfiTapeIoProtocolGuid                                  ##UNDEFINED

-  gEfiDiskIoProtocolGuid                                  ##UNDEFINED

-  gEfiBlockIoProtocolGuid                                 ##UNDEFINED

-  gEfiUnicodeCollationProtocolGuid                        ##UNDEFINED

-  gEfiPciRootBridgeIoProtocolGuid                         ##UNDEFINED

-  gEfiPciIoProtocolGuid                                   ##UNDEFINED

-  gEfiScsiPassThruProtocolGuid                            ##UNDEFINED

-  gEfiScsiIoProtocolGuid                                  ##UNDEFINED

-  gEfiExtScsiPassThruProtocolGuid                         ##UNDEFINED

-  gEfiIScsiInitiatorNameProtocolGuid                      ##UNDEFINED

-  gEfiUsbIoProtocolGuid                                   ##UNDEFINED

-  gEfiUsbHcProtocolGuid                                   ##UNDEFINED

-  gEfiUsb2HcProtocolGuid                                  ##UNDEFINED

-  gEfiDebugSupportProtocolGuid                            ##UNDEFINED

-  gEfiDebugPortProtocolGuid                               ##UNDEFINED

-  gEfiDecompressProtocolGuid                              ##UNDEFINED

-  gEfiAcpiTableProtocolGuid                               ##UNDEFINED

-  gEfiEbcProtocolGuid                                     ##UNDEFINED

-  gEfiSimpleNetworkProtocolGuid                           ##UNDEFINED

-  gEfiNetworkInterfaceIdentifierProtocolGuid              ##UNDEFINED

-  gEfiNetworkInterfaceIdentifierProtocolGuid_31           ##UNDEFINED

-  gEfiPxeBaseCodeProtocolGuid                             ##UNDEFINED

-  gEfiPxeBaseCodeCallbackProtocolGuid                     ##UNDEFINED

-  gEfiBisProtocolGuid                                     ##UNDEFINED

-  gEfiManagedNetworkServiceBindingProtocolGuid            ##UNDEFINED

-  gEfiManagedNetworkProtocolGuid                          ##UNDEFINED

-  gEfiArpServiceBindingProtocolGuid                       ##UNDEFINED

-  gEfiArpProtocolGuid                                     ##UNDEFINED

-  gEfiDhcp4ServiceBindingProtocolGuid                     ##UNDEFINED

-  gEfiDhcp4ProtocolGuid                                   ##UNDEFINED

-  gEfiTcp4ServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiTcp4ProtocolGuid                                    ##UNDEFINED

-  gEfiIp4ServiceBindingProtocolGuid                       ##UNDEFINED

-  gEfiIp4ProtocolGuid                                     ##UNDEFINED

-  gEfiIp4ConfigProtocolGuid                               ##UNDEFINED

-  gEfiUdp4ServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiUdp4ProtocolGuid                                    ##UNDEFINED

-  gEfiMtftp4ServiceBindingProtocolGuid                    ##UNDEFINED

-  gEfiMtftp4ProtocolGuid                                  ##UNDEFINED

-  gEfiAuthenticationInfoProtocolGuid                      ##UNDEFINED

-  gEfiHashServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiHashProtocolGuid                                    ##UNDEFINED

-  gEfiHiiFontProtocolGuid                                 ##UNDEFINED

-  gEfiHiiStringProtocolGuid                               ##UNDEFINED

-  gEfiHiiImageProtocolGuid                                ##UNDEFINED

-  gEfiHiiConfigRoutingProtocolGuid                        ##UNDEFINED

-  gEfiHiiConfigAccessProtocolGuid                         ##UNDEFINED

-  gEfiFormBrowser2ProtocolGuid                            ##UNDEFINED

-  gEfiDeviceIoProtocolGuid                                ##UNDEFINED

-  gEfiUgaDrawProtocolGuid                                 ##UNDEFINED

-  gEfiUgaIoProtocolGuid                                   ##UNDEFINED

-  gEfiDriverConfigurationProtocolGuid                     ##UNDEFINED

-  gEfiDriverConfiguration2ProtocolGuid                    ##UNDEFINED

-  gEfiSimpleTextInputExProtocolGuid                       ##UNDEFINED

-  gEfiIp6ServiceBindingProtocolGuid                       ##UNDEFINED

-  gEfiIp6ProtocolGuid                                     ##UNDEFINED

-  gEfiIp6ConfigProtocolGuid                               ##UNDEFINED

-  gEfiMtftp6ServiceBindingProtocolGuid                    ##UNDEFINED

-  gEfiMtftp6ProtocolGuid                                  ##UNDEFINED

-  gEfiDhcp6ServiceBindingProtocolGuid                     ##UNDEFINED

-  gEfiDhcp6ProtocolGuid                                   ##UNDEFINED

-  gEfiUdp6ServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiUdp6ProtocolGuid                                    ##UNDEFINED

-  gEfiTcp6ServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiTcp6ProtocolGuid                                    ##UNDEFINED

-  gEfiVlanConfigProtocolGuid                              ##UNDEFINED

-  gEfiEapProtocolGuid                                     ##UNDEFINED

-  gEfiEapManagementProtocolGuid                           ##UNDEFINED

-  gEfiFtp4ServiceBindingProtocolGuid                      ##UNDEFINED

-  gEfiFtp4ProtocolGuid                                    ##UNDEFINED

-  gEfiIpSecConfigProtocolGuid                             ##UNDEFINED

-  gEfiDriverHealthProtocolGuid                            ##UNDEFINED

-  gEfiDeferredImageLoadProtocolGuid                       ##UNDEFINED

-  gEfiUserCredentialProtocolGuid                          ##UNDEFINED

-  gEfiUserManagerProtocolGuid                             ##UNDEFINED

-  gEfiAtaPassThruProtocolGuid                             ##UNDEFINED

-  gEfiFirmwareManagementProtocolGuid                      ##UNDEFINED

-  gEfiIpSecProtocolGuid                                   ##UNDEFINED

-  gEfiIpSec2ProtocolGuid                                  ##UNDEFINED

-  gEfiKmsProtocolGuid                                     ##UNDEFINED

-  gEfiBlockIo2ProtocolGuid                                ##UNDEFINED

-  gEfiStorageSecurityCommandProtocolGuid                  ##UNDEFINED

-  gEfiUserCredential2ProtocolGuid                         ##UNDEFINED

-  gPcdProtocolGuid                                        ##UNDEFINED

-  gEfiTcgProtocolGuid                                     ##UNDEFINED

-  gEfiHiiPackageListProtocolGuid                          ##UNDEFINED

-  gEfiDriverFamilyOverrideProtocolGuid                    ##UNDEFINED

-  gEfiIdeControllerInitProtocolGuid                       ##UNDEFINED

-  gEfiDiskIo2ProtocolGuid                                 ##UNDEFINED

-  gEfiAdapterInformationProtocolGuid                      ##UNDEFINED

-  gEfiShellDynamicCommandProtocolGuid                     ##UNDEFINED

+  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES

+  gEfiDevicePathToTextProtocolGuid                        ## CONSUMES

+  gEfiBusSpecificDriverOverrideProtocolGuid               ## CONSUMES

+  gEfiDevicePathUtilitiesProtocolGuid                     ## CONSUMES

+  gEfiDevicePathFromTextProtocolGuid                      ## CONSUMES

+  gEfiPlatformDriverOverrideProtocolGuid                  ## CONSUMES

+  gEfiSimpleTextInProtocolGuid                            ## CONSUMES

+  gEfiPlatformToDriverConfigurationProtocolGuid           ## CONSUMES

+  gEfiDriverSupportedEfiVersionProtocolGuid               ## CONSUMES

+  gEfiLoadedImageProtocolGuid                             ## CONSUMES

+  gEfiDevicePathProtocolGuid                              ## CONSUMES

+  gEfiLoadedImageDevicePathProtocolGuid                   ## CONSUMES

+  gEfiSimpleTextOutProtocolGuid                           ## UNDEFINED

+  gEfiSimplePointerProtocolGuid                           ## UNDEFINED

+  gEfiAbsolutePointerProtocolGuid                         ## UNDEFINED

+  gEfiSerialIoProtocolGuid                                ## UNDEFINED

+  gEfiEdidDiscoveredProtocolGuid                          ## UNDEFINED

+  gEfiEdidActiveProtocolGuid                              ## UNDEFINED

+  gEfiEdidOverrideProtocolGuid                            ## UNDEFINED

+  gEfiLoadFileProtocolGuid                                ## UNDEFINED

+  gEfiLoadFile2ProtocolGuid                               ## UNDEFINED

+  gEfiTapeIoProtocolGuid                                  ## UNDEFINED

+  gEfiDiskIoProtocolGuid                                  ## UNDEFINED

+  gEfiBlockIoProtocolGuid                                 ## UNDEFINED

+  gEfiUnicodeCollationProtocolGuid                        ## UNDEFINED

+  gEfiPciRootBridgeIoProtocolGuid                         ## UNDEFINED

+  gEfiPciIoProtocolGuid                                   ## UNDEFINED

+  gEfiScsiPassThruProtocolGuid                            ## UNDEFINED

+  gEfiScsiIoProtocolGuid                                  ## UNDEFINED

+  gEfiExtScsiPassThruProtocolGuid                         ## UNDEFINED

+  gEfiIScsiInitiatorNameProtocolGuid                      ## UNDEFINED

+  gEfiUsbIoProtocolGuid                                   ## UNDEFINED

+  gEfiUsbHcProtocolGuid                                   ## UNDEFINED

+  gEfiUsb2HcProtocolGuid                                  ## UNDEFINED

+  gEfiDebugSupportProtocolGuid                            ## UNDEFINED

+  gEfiDebugPortProtocolGuid                               ## UNDEFINED

+  gEfiDecompressProtocolGuid                              ## UNDEFINED

+  gEfiAcpiTableProtocolGuid                               ## UNDEFINED

+  gEfiEbcProtocolGuid                                     ## UNDEFINED

+  gEfiSimpleNetworkProtocolGuid                           ## UNDEFINED

+  gEfiNetworkInterfaceIdentifierProtocolGuid              ## UNDEFINED

+  gEfiNetworkInterfaceIdentifierProtocolGuid_31           ## UNDEFINED

+  gEfiPxeBaseCodeProtocolGuid                             ## UNDEFINED

+  gEfiPxeBaseCodeCallbackProtocolGuid                     ## UNDEFINED

+  gEfiBisProtocolGuid                                     ## UNDEFINED

+  gEfiManagedNetworkServiceBindingProtocolGuid            ## UNDEFINED

+  gEfiManagedNetworkProtocolGuid                          ## UNDEFINED

+  gEfiArpServiceBindingProtocolGuid                       ## UNDEFINED

+  gEfiArpProtocolGuid                                     ## UNDEFINED

+  gEfiDhcp4ServiceBindingProtocolGuid                     ## UNDEFINED

+  gEfiDhcp4ProtocolGuid                                   ## UNDEFINED

+  gEfiTcp4ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiTcp4ProtocolGuid                                    ## UNDEFINED

+  gEfiIp4ServiceBindingProtocolGuid                       ## UNDEFINED

+  gEfiIp4ProtocolGuid                                     ## UNDEFINED

+  gEfiIp4ConfigProtocolGuid                               ## UNDEFINED

+  gEfiUdp4ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiUdp4ProtocolGuid                                    ## UNDEFINED

+  gEfiMtftp4ServiceBindingProtocolGuid                    ## UNDEFINED

+  gEfiMtftp4ProtocolGuid                                  ## UNDEFINED

+  gEfiAuthenticationInfoProtocolGuid                      ## UNDEFINED

+  gEfiHashServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiHashProtocolGuid                                    ## UNDEFINED

+  gEfiHiiFontProtocolGuid                                 ## UNDEFINED

+  gEfiHiiStringProtocolGuid                               ## UNDEFINED

+  gEfiHiiImageProtocolGuid                                ## UNDEFINED

+  gEfiHiiConfigRoutingProtocolGuid                        ## UNDEFINED

+  gEfiHiiConfigAccessProtocolGuid                         ## UNDEFINED

+  gEfiFormBrowser2ProtocolGuid                            ## UNDEFINED

+  gEfiDeviceIoProtocolGuid                                ## UNDEFINED

+  gEfiUgaDrawProtocolGuid                                 ## UNDEFINED

+  gEfiUgaIoProtocolGuid                                   ## UNDEFINED

+  gEfiDriverConfigurationProtocolGuid                     ## UNDEFINED

+  gEfiDriverConfiguration2ProtocolGuid                    ## UNDEFINED

+  gEfiSimpleTextInputExProtocolGuid                       ## UNDEFINED

+  gEfiIp6ServiceBindingProtocolGuid                       ## UNDEFINED

+  gEfiIp6ProtocolGuid                                     ## UNDEFINED

+  gEfiIp6ConfigProtocolGuid                               ## UNDEFINED

+  gEfiMtftp6ServiceBindingProtocolGuid                    ## UNDEFINED

+  gEfiMtftp6ProtocolGuid                                  ## UNDEFINED

+  gEfiDhcp6ServiceBindingProtocolGuid                     ## UNDEFINED

+  gEfiDhcp6ProtocolGuid                                   ## UNDEFINED

+  gEfiUdp6ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiUdp6ProtocolGuid                                    ## UNDEFINED

+  gEfiTcp6ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiTcp6ProtocolGuid                                    ## UNDEFINED

+  gEfiVlanConfigProtocolGuid                              ## UNDEFINED

+  gEfiEapProtocolGuid                                     ## UNDEFINED

+  gEfiEapManagementProtocolGuid                           ## UNDEFINED

+  gEfiFtp4ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiFtp4ProtocolGuid                                    ## UNDEFINED

+  gEfiIpSecConfigProtocolGuid                             ## UNDEFINED

+  gEfiDriverHealthProtocolGuid                            ## UNDEFINED

+  gEfiDeferredImageLoadProtocolGuid                       ## UNDEFINED

+  gEfiUserCredentialProtocolGuid                          ## UNDEFINED

+  gEfiUserManagerProtocolGuid                             ## UNDEFINED

+  gEfiAtaPassThruProtocolGuid                             ## UNDEFINED

+  gEfiFirmwareManagementProtocolGuid                      ## UNDEFINED

+  gEfiIpSecProtocolGuid                                   ## UNDEFINED

+  gEfiIpSec2ProtocolGuid                                  ## UNDEFINED

+  gEfiKmsProtocolGuid                                     ## UNDEFINED

+  gEfiBlockIo2ProtocolGuid                                ## UNDEFINED

+  gEfiStorageSecurityCommandProtocolGuid                  ## UNDEFINED

+  gEfiUserCredential2ProtocolGuid                         ## UNDEFINED

+  gPcdProtocolGuid                                        ## UNDEFINED

+  gEfiTcgProtocolGuid                                     ## UNDEFINED

+  gEfiHiiPackageListProtocolGuid                          ## UNDEFINED

+  gEfiDriverFamilyOverrideProtocolGuid                    ## UNDEFINED

+  gEfiIdeControllerInitProtocolGuid                       ## UNDEFINED

+  gEfiDiskIo2ProtocolGuid                                 ## UNDEFINED

+  gEfiAdapterInformationProtocolGuid                      ## UNDEFINED

+  gEfiShellDynamicCommandProtocolGuid                     ## UNDEFINED

 

 [Guids]

-  gEfiFileInfoGuid                                        ##CONSUMES

-  gEfiShellEnvironment2ExtGuid                            ##CONSUMES

-  gEfiPcAnsiGuid                                          ##UNDEFINED

-  gEfiVT100Guid                                           ##UNDEFINED

-  gEfiVT100PlusGuid                                       ##UNDEFINED

-  gEfiVTUTF8Guid                                          ##UNDEFINED

-  gEfiStandardErrorDeviceGuid                             ##UNDEFINED

-  gEfiConsoleInDeviceGuid                                 ##UNDEFINED

-  gEfiConsoleOutDeviceGuid                                ##UNDEFINED

-  gEfiFileSystemInfoGuid                                  ##UNDEFINED

-  gEfiGlobalVariableGuid                                  ##UNDEFINED

-  gEfiPartTypeSystemPartGuid                              ##UNDEFINED

-  gEfiPartTypeLegacyMbrGuid                               ##UNDEFINED

-  gHandleParsingHiiGuid                                   ##UNDEFINED

-  gEfiAdapterInfoMediaStateGuid                           ##SOMETIMES CONSUMES

-  gEfiAdapterInfoNetworkBootGuid                          ##SOMETIMES CONSUMES

-  gEfiAdapterInfoSanMacAddressGuid                        ##SOMETIMES CONSUMES

+  gEfiFileInfoGuid                                        ## CONSUMES ## GUID

+  gEfiShellEnvironment2ExtGuid                            ## CONSUMES ## GUID

+  gEfiPcAnsiGuid                                          ## UNDEFINED

+  gEfiVT100Guid                                           ## UNDEFINED

+  gEfiVT100PlusGuid                                       ## UNDEFINED

+  gEfiVTUTF8Guid                                          ## UNDEFINED

+  gEfiStandardErrorDeviceGuid                             ## UNDEFINED

+  gEfiConsoleInDeviceGuid                                 ## UNDEFINED

+  gEfiConsoleOutDeviceGuid                                ## UNDEFINED

+  gEfiFileSystemInfoGuid                                  ## UNDEFINED

+  gEfiGlobalVariableGuid                                  ## UNDEFINED

+  gEfiPartTypeSystemPartGuid                              ## UNDEFINED

+  gEfiPartTypeLegacyMbrGuid                               ## UNDEFINED

+  gHandleParsingHiiGuid                                   ## UNDEFINED

+  gEfiAdapterInfoMediaStateGuid                           ## SOMETIMES_CONSUMES ## GUID

+  gEfiAdapterInfoNetworkBootGuid                          ## SOMETIMES_CONSUMES ## GUID

+  gEfiAdapterInfoSanMacAddressGuid                        ## SOMETIMES_CONSUMES ## GUID

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ##CONSUMES

-  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids       ##CONSUMES
\ No newline at end of file
+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids       ## CONSUMES
\ No newline at end of file
diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
index 596bb35096..bacaeec1cd 100644
--- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides shell install1 functions

 #

-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -43,4 +43,4 @@
   PrintLib

 

 [Guids]

-  gShellBcfgHiiGuid

+  gShellBcfgHiiGuid             ## SOMETIMES_CONSUMES ## HII

diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
index 69972cee43..500b1663ca 100644
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides interface to shell functionality for shell commands and applications.

 #

-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -38,7 +38,7 @@
 

 

 [Protocols]

-  gEfiShellParametersProtocolGuid                         # ALWAYS_CONSUMED

-  gEfiShellInterfaceGuid                                  # SOMETIMES_CONSUMED

+  gEfiShellParametersProtocolGuid                         ## CONSUMES

+  gEfiShellInterfaceGuid                                  ## SOMETIMES_CONSUMES

   

 

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
index 38df3b31f7..1de52991bf 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides interface to shell internal functions for shell commands.

 #

-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -49,21 +49,21 @@
   HandleParsingLib

 

 [Protocols]

-  gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED

-  gEfiShellProtocolGuid                                   # ALWAYS_CONSUMED

-  gEfiShellParametersProtocolGuid                         # ALWAYS_CONSUMED

-  gEfiShellDynamicCommandProtocolGuid                     # SOMETIMES_CONSUMED

-  gEfiUsbIoProtocolGuid                                   ## SOMETIMES_CONSUMED

+  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES

+  gEfiShellProtocolGuid                                   ## CONSUMES

+  gEfiShellParametersProtocolGuid                         ## CONSUMES

+  gEfiShellDynamicCommandProtocolGuid                     ## SOMETIMES_CONSUMES

+  gEfiUsbIoProtocolGuid                                   ## SOMETIMES_CONSUMES

 

 [Guids]

-  gEfiSasDevicePathGuid                                   # ALWAYS_CONSUMED

+  gEfiSasDevicePathGuid                                   ## CONSUMES ## GUID

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        ## ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdUsbExtendedDecode         ## SOMETIMES_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames  ## SOMETIMES_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellVendorExtendedDecode ## SOMETIMES_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdUsbExtendedDecode         ## SOMETIMES_CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellDecodeIScsiMapNames  ## SOMETIMES_CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellVendorExtendedDecode ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiUnicodeCollation2ProtocolGuid

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index d1d732d50a..dc41b75d24 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell Debug1 profile functions

 #

-# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -117,20 +117,20 @@
   BcfgCommandLib

 

 [Pcd]

-  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask              # ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize        # ALWAYS_CONSUMED

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength      # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask              ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize        ## CONSUMES

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength      ## CONSUMES

 

 [Protocols]

-  gEfiPciRootBridgeIoProtocolGuid

-  gEfiBlockIoProtocolGuid

-  gEfiSimplePointerProtocolGuid

+  gEfiPciRootBridgeIoProtocolGuid             ## CONSUMES

+  gEfiBlockIoProtocolGuid                     ## CONSUMES

+  gEfiSimplePointerProtocolGuid               ## CONSUMES

 

 [Guids]

-  gEfiGlobalVariableGuid

-  gEfiSmbiosTableGuid

-  gEfiMpsTableGuid

-  gEfiSalSystemTableGuid

-  gEfiAcpi10TableGuid

-  gEfiAcpi20TableGuid

-  gShellDebug1HiiGuid

+  gEfiGlobalVariableGuid          ## SOMETIMES_CONSUMES ## GUID

+  gEfiSmbiosTableGuid             ## SOMETIMES_CONSUMES ## SystemTable

+  gEfiMpsTableGuid                ## SOMETIMES_CONSUMES ## SystemTable

+  gEfiSalSystemTableGuid          ## SOMETIMES_CONSUMES ## SystemTable

+  gEfiAcpi10TableGuid             ## SOMETIMES_CONSUMES ## SystemTable

+  gEfiAcpi20TableGuid             ## SOMETIMES_CONSUMES ## SystemTable

+  gShellDebug1HiiGuid             ## SOMETIMES_CONSUMES ## HII

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index 2050c71ecd..a813b3b614 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell driver1 profile functions

 #

-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -58,16 +58,16 @@
   PeCoffGetEntryPointLib

 

 [Pcd]

-  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask  # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask  ## CONSUMES

 

 [Protocols]

-  gEfiDriverHealthProtocolGuid                    # ALWAYS_CONSUMED

-  gEfiDriverFamilyOverrideProtocolGuid            # ALWAYS_CONSUMED

-  gEfiHiiConfigAccessProtocolGuid                 # ALWAYS_CONSUMED

-  gEfiHiiDatabaseProtocolGuid                     # ALWAYS_CONSUMED

+  gEfiDriverHealthProtocolGuid                    ## CONSUMES

+  gEfiDriverFamilyOverrideProtocolGuid            ## CONSUMES

+  gEfiHiiConfigAccessProtocolGuid                 ## CONSUMES

+  gEfiHiiDatabaseProtocolGuid                     ## CONSUMES

 

 [Guids]

-  gEfiGlobalVariableGuid                          # ALWAYS_CONSUMED

-  gEfiConsoleInDeviceGuid                         # ALWAYS_CONSUMED

-  gEfiConsoleOutDeviceGuid                        # ALWAYS_CONSUMED

-  gShellDriver1HiiGuid                            ## PRODUCES

+  gEfiGlobalVariableGuid                          ## CONSUMES ## GUID

+  gEfiConsoleInDeviceGuid                         ## CONSUMES ## GUID

+  gEfiConsoleOutDeviceGuid                        ## CONSUMES ## GUID

+  gShellDriver1HiiGuid                            ## PRODUCES ## HII

diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
index ed207f9bf9..dc1b6223e7 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides shell install1 functions

 #

-#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -45,7 +45,7 @@
   BcfgCommandLib

 

 [Pcd]

-  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask ## CONSUMES

 

 [Guids]

-  gShellInstall1HiiGuid

+  gShellInstall1HiiGuid                         ## UNDEFINED 

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
index 617fc50197..d21ad41ca9 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 #  Provides shell level 1 functions

 #

-#  Copyright (c) 2009-2011, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2009-2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -52,7 +52,7 @@
   PrintLib

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## CONSUMES

 

 [Guids]

-  gShellLevel1HiiGuid

+  gShellLevel1HiiGuid       ## SOMETIMES_CONSUMES ## HII

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 7060c7738f..324d210d31 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell level 2 functions

 #

-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved. <BR>

+# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -67,18 +67,18 @@
   DevicePathLib

 

 [Protocols]

-  gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED

-  gEfiShellProtocolGuid                                   # ALWAYS_CONSUMED

-  gEfiShellParametersProtocolGuid                         # ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED

-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED

-  gEfiSimpleFileSystemProtocolGuid                        # ALWAYS_CONSUMED

+  gEfiUnicodeCollation2ProtocolGuid                       ## CONSUMES

+  gEfiShellProtocolGuid                                   ## CONSUMES

+  gEfiShellParametersProtocolGuid                         ## CONSUMES

+  gEfiDevicePathProtocolGuid                              ## CONSUMES

+  gEfiLoadedImageProtocolGuid                             ## CONSUMES

+  gEfiSimpleFileSystemProtocolGuid                        ## CONSUMES

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         # ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize    # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize    ## CONSUMES

 

 [Guids]

-  gEfiFileSystemInfoGuid

-  gEfiFileInfoGuid

-  gShellLevel2HiiGuid

+  gEfiFileSystemInfoGuid                                  ## CONSUMES ## GUID

+  gEfiFileInfoGuid                                        ## UNDEFINED

+  gShellLevel2HiiGuid                                     ## SOMETIMES_CONSUMES ## HII

diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
index 79a4060833..03ea221cf5 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
@@ -3,7 +3,7 @@
 # Note that the interactive versions of the time, date, and timezone functions are handled in the level 2 library.

 #

 # Copyright (c) 2013, Hewlett-Packard Development Company, L.P.

-# Copyright (c) 2009-2014, Intel Corporation. All rights reserved. <BR>

+# Copyright (c) 2009-2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -62,13 +62,13 @@
   HandleParsingLib

 

 [Guids]

-  gEfiFileInfoGuid

-  gShellLevel3HiiGuid

+  gEfiFileInfoGuid                                        ## UNDEFINED

+  gShellLevel3HiiGuid                                     ## SOMETIMES_CONSUMES ## HII

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel

-  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize

-  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize    ## SOMETIMES_CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellSupplier             ## SOMETIMES_CONSUMES

 

 [Protocols]

-  gEfiShellDynamicCommandProtocolGuid                     # SOMETIMES_CONSUMED

+  gEfiShellDynamicCommandProtocolGuid                     ## SOMETIMES_CONSUMES

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index 8eedfce8b6..6ed76cc2bc 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -50,20 +50,20 @@
   SortLib

 

 [Protocols]

-  gEfiSimpleFileSystemProtocolGuid              # ALWAYS_CONSUMED

+  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES

 

   # shell 2.0

-  gEfiShellProtocolGuid                         # SOMETIMES_CONSUMED

-  gEfiShellParametersProtocolGuid               # SOMETIMES_CONSUMED

+  gEfiShellProtocolGuid                         ## SOMETIMES_CONSUMES

+  gEfiShellParametersProtocolGuid               ## SOMETIMES_CONSUMES

 

   # 'old' shell

-  gEfiShellEnvironment2Guid                     # SOMETIMES_CONSUMED

-  gEfiShellInterfaceGuid                        # SOMETIMES_CONSUMED

+  gEfiShellEnvironment2Guid                     ## SOMETIMES_CONSUMES

+  gEfiShellInterfaceGuid                        ## SOMETIMES_CONSUMES

 

 [Guids]

-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED

-  gEfiShellEnvironment2ExtGuid                  # ALWAYS_CONSUMED

+  gEfiFileInfoGuid                              ## CONSUMES ## GUID

+  gEfiShellEnvironment2ExtGuid                  ## CONSUMES ## GUID

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     ## CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       ## CONSUMES

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
index 4857a7e795..527d2efbf0 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file

 # Provides shell network1 functions

 #

-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

+# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -51,17 +51,17 @@
   NetLib

 

 [Pcd]

-  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask # ALWAYS_CONSUMED

+  gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask ## CONSUMES

 

 [Protocols]

-  gEfiCpuArchProtocolGuid                       # ALWAYS_CONSUMED

-  gEfiIp6ProtocolGuid                           # SOMETIMES_CONSUMED

-  gEfiIp6ServiceBindingProtocolGuid             # SOMETIMES_CONSUMED

-  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED

+  gEfiCpuArchProtocolGuid                       ## CONSUMES

+  gEfiIp6ProtocolGuid                           ## SOMETIMES_CONSUMES

+  gEfiIp6ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES

+  gEfiIp6ConfigProtocolGuid                     ## SOMETIMES_CONSUMES

 

-  gEfiIp6ProtocolGuid                           # SOMETIMES_CONSUMED

-  gEfiIp6ServiceBindingProtocolGuid             # SOMETIMES_CONSUMED

-  gEfiIp6ConfigProtocolGuid                     # SOMETIMES_CONSUMED

+  gEfiIp6ProtocolGuid                           ## SOMETIMES_CONSUMES

+  gEfiIp6ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES

+  gEfiIp6ConfigProtocolGuid                     ## SOMETIMES_CONSUMES

   

 [Guids]

-  gShellNetwork1HiiGuid
\ No newline at end of file
+  gShellNetwork1HiiGuid                         ## SOMETIMES_CONSUMES ## HII
\ No newline at end of file
diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index 0fece09123..776f022655 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -1,9 +1,8 @@
 ## @file ShellPkg.dec

-#

 # This Package provides all definitions for EFI and UEFI Shell

 #

 # (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.

-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>

 #

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License which accompanies this distribution.