I am seeing NT32 build failure due to this check-in. When I reverted 15966, 
build completed successfully. 

   Creating library 
c:\dev\sourceforge08262014\edk2\Build\NT32IA32\DEBUG_VS2008x86\IA32\IntelFrameworkModulePkg\Universal\BdsDxe\BdsDxe\DEBUG\BdsDxe.lib
 and object 
c:\dev\sourceforge08262014\edk2\Build\NT32IA32\DEBUG_VS2008x86\IA32\IntelFrameworkModulePkg\Universal\BdsDxe\BdsDxe\DEBUG\BdsDxe.exp
BdsDxe.lib(ConsoleOption.obj) : error LNK2001: unresolved external symbol 
_gEfiUartDevicePathGuid
c:\dev\sourceforge08262014\edk2\Build\NT32IA32\DEBUG_VS2008x86\IA32\IntelFrameworkModulePkg\Universal\BdsDxe\BdsDxe\DEBUG\BdsDxe.dll
 : fatal error LNK1120: 1 unresolved externals
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 
9.0\Vc\bin\link.exe"' : return code '0x460'
Stop.


build...
 : error 7000: Failed to execute command
        C:\Program Files (x86)\Microsoft Visual Studio 9.0\Vc\bin\nmake.exe 
/nologo tbuild 
[c:\dev\sourceforge08262014\edk2\Build\NT32IA32\DEBUG_VS2008x86\IA32\IntelFrameworkModulePkg\Universal\BdsDxe\BdsDxe]


build...
 : error F002: Failed to build module
        
c:\dev\sourceforge08262014\edk2\IntelFrameworkModulePkg\Universal\BdsDxe\BdsDxe.inf
 [IA32, VS2008x86, DEBUG]

- Failed -
Build end time: 09:56:24, Aug.28 2014
Build total time: 00:00:55



-----Original Message-----
From: [email protected] [mailto:[email protected]] 
Sent: Thursday, August 28, 2014 1:59 AM
To: [email protected]
Subject: SF.net SVN: edk2:[15966] trunk/edk2/IntelFrameworkModulePkg

Revision: 15966
          http://sourceforge.net/p/edk2/code/15966
Author:   lgao4
Date:     2014-08-28 06:58:44 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
IntelFrameworkModulePkg: INF/DEC file updates to EDK II packages

1. Usage information in INF file comment blocks are either incomplete or 
incorrect.  
This includes usage information for 
Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes.  
The syntax for usage information in comment blocks is defined in the EDK II 
Module Information (INF) Specification

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zeng, Star <[email protected]>
Reviewed-by: Gao, Liming <[email protected]>

Modified Paths:
--------------
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
    trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
    trunk/edk2/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
    trunk/edk2/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
    trunk/edk2/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
    
trunk/edk2/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
    
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,12 +1,12 @@
 ## @file
-# Component description file for IsaBus module.
+# Generates ISA I/O Protocols based on the ISA ACPI Protocol instances.
 #
-# Discovers all the ISA Controllers and their resources by using the ISA ACPI 
-# Protocol, produces an instance of the ISA I/O Protocol for every ISA 
+# Discovers all the ISA Controllers and their resources by using the ISA ACPI
+# Protocol, produces an instance of the ISA I/O Protocol for every ISA
 # Controller found. This driver is designed to manage a PCI-to-ISA bridge 
Device
-# such as LPC bridge.
+# such as an LPC bridge.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaBusDxe
+  MODULE_UNI_FILE                = IsaBusDxe.uni
   FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -58,13 +59,15 @@
   DebugLib
 
 [Protocols]
-  gEfiIsaIoProtocolGuid                         # PROTOCOL BY_START
-  gEfiIsaAcpiProtocolGuid                       # PROTOCOL TO_START
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL TO_START
+  gEfiIsaIoProtocolGuid                         ## BY_START
+  gEfiDevicePathProtocolGuid                    ## BY_START
+  gEfiIsaAcpiProtocolGuid                       ## TO_START
+  gEfiPciIoProtocolGuid                         ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiGenericMemTestProtocolGuid                ## TO_START
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures  ## 
CONSUMES
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaBusDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf    
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf    
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,17 +1,12 @@
 ## @file
-# Component description file for IsaFloppy module.
+# Provides ISA Floppy Disk support.
 #
-# ISA Floppy Disk UEFI Driver conforming to the UEFI driver model
+# Provides ISA Floppy Disk UEFI Driver conforming to the UEFI driver model. The
+# driver provides support for two drives per controller, DMA channel 2, 
diskette
+# change line and write protect.  Currently only 1.44MB drives are supported.
 #
-#  1. Support two types diskette drive  
-#     1.44M drive and 2.88M drive (and now only support 1.44M)
-#  2. Support two diskette drives per floppy disk controller
-#  3. Use DMA channel 2 to transfer data
-#  4. Do not use interrupt
-#  5. Support diskette change line signal and write protect
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
-# Copyright (c) 2007 - 2010, 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. The full text of the license may be 
found at
@@ -25,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaFloppyDxe
+  MODULE_UNI_FILE                = IsaFloppyDxe.uni
   FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -62,10 +58,21 @@
   PcdLib
 
 [Protocols]
-  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
+  gEfiIsaIoProtocolGuid                               ## TO_START
+  gEfiBlockIoProtocolGuid                             ## BY_START
+  gEfiDevicePathProtocolGuid                          ## TO_START
 
 [FeaturePcd]
-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable        # CONSUMES
-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable       # CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable    ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable   ## CONSUMES
+
+#
+# [Event]
+#   ##
+#   # Floppy motor control timer event.
+#   #
+#   EVENT_TYPE_PERIODIC_TIMER   ## CONSUMES
+#
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaFloppyDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.inf    
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyPei/IsaFloppyPei.inf    
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,10 +1,11 @@
 ## @file
 # ISA Floppy PEIM to support recovery boot via floppy disk.
 #
-# This module detects Floppy devices. If found, it will install BlockIo PPI.
-#  This module is only dispatched in Recovery Boot mode.
+# This module detects and supports ISA Floppy drives. If a drive is discovered
+# the PEIM will install the BlockIo PPI. This module is only dispatched if it
+# is in the Recovery Boot mode.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -25,6 +26,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaFloppyPei
+  MODULE_UNI_FILE                = IsaFloppyPei.uni
   FILE_GUID                      = 7F6E0A24-DBFD-43df-9755-0292D7D3DD48
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -43,8 +45,9 @@
   Fdc.h
 
 [Packages]
+  MdePkg/MdePkg.dec
+  IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   IoLib
@@ -58,11 +61,13 @@
   PcdLib
 
 [Ppis]
-  gEfiPeiVirtualBlockIoPpiGuid    # PPI ALWAYS_PRODUCED
+  gEfiPeiVirtualBlockIoPpiGuid    ## PRODUCES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFdcBaseAddress
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFdcBaseAddress   ## CONSUMES
 
 [Depex]
   gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaFloppyPeiExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf    
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf    
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,10 +1,12 @@
 ## @file
-# Component description file for IsaIoDxe module.
-#
 # Produces an instance of the ISA I/O Protocol for every SIO controller.
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Produces an instance of the ISA I/O Protocol for every SIO controller. The 
ISA
+# I/O protocols are installed based off of the information provided by each
+# instance of the SIO Protocol found.
 #
+# Copyright (c) 2010 - 2014, 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. The full text of the license may be 
found at
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaIoDxe
+  MODULE_UNI_FILE                = IsaIoDxe.uni
   FILE_GUID                      = 61AD3083-DCAD-4850-A50C-73B23B3B14F9
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,13 +58,14 @@
   DebugLib
 
 [Protocols]
-  gEfiIsaIoProtocolGuid                         # PROTOCOL BY_START
-  gEfiSioProtocolGuid                           # PROTOCOL TO_START
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL TO_START
+  gEfiIsaIoProtocolGuid                         ## BY_START
+  gEfiSioProtocolGuid                           ## TO_START
+  gEfiPciIoProtocolGuid                         ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiGenericMemTestProtocolGuid                ## TO_START
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures  ## 
CONSUMES
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaIoDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf    
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf    
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,6 +1,9 @@
 ## @file
 # Serial driver for standard UARTS on an ISA bus.
 #
+# Produces the Serial I/O protocol for standard UARTS using ISA I/O. This 
driver
+# supports the 8250, 16450, 16550 and 16550A UART types.
+#
 # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
@@ -16,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IsaSerialDxe
+  MODULE_UNI_FILE                = IsaSerialDxe.uni
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -53,19 +57,22 @@
   DebugLib
 
 [Guids]
-  gEfiUartDevicePathGuid
+  gEfiUartDevicePathGuid                        ## SOMETIMES_CONSUMES   ## GUID
 
 [Protocols]
   gEfiIsaIoProtocolGuid                         ## TO_START
   gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSerialIoProtocolGuid                      ## BY_START
+  gEfiDevicePathProtocolGuid                    ## BY_START
 
 [FeaturePcd]
-  
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
-  
+  
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE 
  ## CONSUMES
+
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200  ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8       ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1         ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1       ## CONSUMES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  IsaSerialDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf    
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf    
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,11 +1,11 @@
 ## @file
-# Ps2 Keyboard UEFI Driver which produce gEfiSimpleTextInProtocolGuid and 
gEfiSimpleTextInputExProtocolGuid
-# protocol. 
-# The keyboard type implemented follows IBM compatible PS2 protocol, with Scan 
Codes Set 1.
+# Ps2 Keyboard Driver.
 #
-# This dirver directly uses IsaIo protocol service to support KeyBoard work.
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Ps2 Keyboard Driver for UEFI. The keyboard type implemented follows IBM
+# compatible PS2 protocol using Scan Code Set 1.
 #
+# Copyright (c) 2006 - 2014, 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.  The full text of the license may be 
found at
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Ps2KeyboardDxe
+  MODULE_UNI_FILE                = Ps2KeyboardDxe.uni
   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -59,25 +60,26 @@
   PcdLib
   
 [Protocols]
-  gEfiPs2PolicyProtocolGuid                     # PROTOCOL TO_START
-  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START
-  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL BY_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
+  gEfiSimpleTextInProtocolGuid                  ## BY_START
+  gEfiSimpleTextInputExProtocolGuid             ## BY_START
+  gEfiPs2PolicyProtocolGuid                     ## SOMETIMES_CONSUMES
+  gEfiIsaIoProtocolGuid                         ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification   ## 
CONSUMES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection             ## 
SOMETIMES_CONSUMES
 
+#
 # [Event]
+#
 #   ##
-#   # Event will be signaled for WaitForKey event.
+#   # Timer event used to read key strokes at a regular interval.
 #   #
-#   EVT_NOTIFY_WAIT                             ## PRODUCES
+#   EVENT_TYPE_PERIODIC_TIMER   ## CONSUMES
 #
-#   ##
-#   # Event will be used to poll mouse state.
-#   #
-#   EVT_NOTIFY_SIGNAL                           ## PRODUCES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Ps2KeyboardDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
        2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
        2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,9 +1,11 @@
 ## @file
-# Ps2 Mouse Simulate TouchPad Driver
+# PS2 Mouse driver providing absolute (touch pad) pointer support.
 #
-# This dirver directly uses IsaIo protocol service to support a faked Ps2 
TouchPad work.
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# This driver simulates a touch pad absolute pointing device using a standard
+# PS2 mouse as the input hardware.
 #
+# Copyright (c) 2006 - 2014, 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.  The full text of the license may be 
found at
@@ -18,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Ps2MouseAbsolutePointerDxe
+  MODULE_UNI_FILE                = Ps2MouseAbsolutePointerDxe.uni
   FILE_GUID                      = 2899C94A-1FB6-4b1a-B96B-8364975303E0
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -59,15 +62,16 @@
   gEfiDevicePathProtocolGuid                    ## TO_START
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification   
## CONSUMES
 
+#
 # [Event]
+#
 #   ##
-#   # Event for EFI_SIMPLE_POINTER_PROTOCOL.WaitForInput.
+#   # Timer event used to check the mouse state at a regular interval.
 #   #
-#   EVENT_TYPE_NOTIFY_WAIT                             ## PRODUCES
+#   EVENT_TYPE_PERIODIC_TIMER   ## CONSUMES
 #
-#   # Periodic timer event to poll the fake Ps2 mouse device and get its 
packet data.
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                          ## PRODUCES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  Ps2MouseAbsolutePointerDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,9 +1,10 @@
 ## @file
-# Ps2 Mouse Driver.
+# PS2 Mouse Driver.
 #
-# This dirver directly uses IsaIo protocol service to support Ps2 mouse work.
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# This dirver provides support for PS2 based mice.
 #
+# Copyright (c) 2006 - 2014, 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.  The full text of the license may be 
found at
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Ps2MouseDxe
+  MODULE_UNI_FILE                = Ps2MouseDxe.uni
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -59,14 +61,16 @@
   gEfiDevicePathProtocolGuid                    ## TO_START
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification   
## CONSUMES
 
+#
 # [Event]
+#
 #   ##
-#   # Event for EFI_SIMPLE_POINTER_PROTOCOL.WaitForInput.
+#   # Timer event used to check the mouse state at a regular interval.
 #   #
-#   EVENT_TYPE_NOTIFY_WAIT                             ## PRODUCES
+#   EVENT_TYPE_PERIODIC_TIMER   ## CONSUMES
 #
-#   # Periodic timer event to poll the Ps2 mouse device and get its packet 
data.
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                          ## PRODUCES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Ps2MouseDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,10 +1,10 @@
 ## @file
-# Component description file for IdeBus module.
+# IDE bus driver.
 #
-# IDE bus driver. This driver will enumerate IDE device and export the blockIo
-#  protocol for every device.
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# This driver will enumerate IDE device and export the blockIo protocol for 
every device.
 #
+# Copyright (c) 2006 - 2014, 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. The full text of the license may be 
found at
@@ -18,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IdeBusDxe
+  MODULE_UNI_FILE                = IdeBusDxe.uni
   FILE_GUID                      = 69FD8E47-A161-4550-B01A-5594CEB2B2B2
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -70,15 +71,18 @@
 
 
 [Guids]
-  gEfiDiskInfoIdeInterfaceGuid                  # CONSUMES  ## GUID
-  gEfiEventExitBootServicesGuid                 # CONSUMES  ## Event
+  gEfiDiskInfoIdeInterfaceGuid                  ## SOMETIMES_PRODUCES ## 
UNDEFINED # DiskInfo Interface Guid
+  gEfiEventExitBootServicesGuid                 ## CONSUMES  ## Event
 
 
 [Protocols]
-  gEfiDiskInfoProtocolGuid                      # BY_START
-  gEfiBlockIoProtocolGuid                       # BY_START
-  gEfiIdeControllerInitProtocolGuid             # TO_START
-  gEfiPciIoProtocolGuid                         # TO_START
-  gEfiDevicePathProtocolGuid                    # TO_START
+  gEfiDiskInfoProtocolGuid                      ## BY_START
+  gEfiBlockIoProtocolGuid                       ## BY_START
+  gEfiIdeControllerInitProtocolGuid             ## TO_START
+  gEfiPciIoProtocolGuid                         ## TO_START
+  ## TO_START
+  ## BY_START
+  gEfiDevicePathProtocolGuid
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  IdeBusDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf    
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf    
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,7 @@
 ## @file
 # VGA Mini Port Driver that manages VGA device and produces VGA Mini Port 
Protocol.
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
@@ -17,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VgaMiniPort
+  MODULE_UNI_FILE                = VgaMiniPort.uni
   FILE_GUID                      = 15C5E761-58D8-461a-9173-CAB020916264
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -52,4 +53,5 @@
   gEfiPciIoProtocolGuid                         ## TO_START
   gEfiVgaMiniPortProtocolGuid                   ## BY_START
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  VgaMiniPortExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,8 +1,11 @@
 ## @file
-#  Component description file for BIOS Block IO module.
+# BIOS Block IO module.
 #
-# Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+# This is the UEFI driver to thunk legacy BIOS int13 interface into UEFI block 
IO interface.
+# Once connected it installs EfiBlockIoProtocol on top of legacy BIOS int13.
 #
+# Copyright (c) 1999 - 2014, 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.  The
@@ -17,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BlockIoDxe
+  MODULE_UNI_FILE                = BlockIoDxe.uni
   FILE_GUID                      = 4495E47E-42A9-4007-8c17-B6664F909D04
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -41,18 +45,21 @@
 
 
 [Protocols]
-  gEfiBlockIoProtocolGuid
-  gEfiDevicePathProtocolGuid
-  gEfiPciIoProtocolGuid
-  gEfiLegacyBiosProtocolGuid
+  gEfiBlockIoProtocolGuid    ## BY_START
+  gEfiDevicePathProtocolGuid ## BY_START
+  gEfiDevicePathProtocolGuid ## TO_START
+  gEfiPciIoProtocolGuid      ## TO_START
+  gEfiLegacyBiosProtocolGuid ## TO_START
 
 
 [Guids]
-  gEfiLegacyBiosGuid
-  gBlockIoVendorGuid
+  gEfiLegacyBiosGuid ## PRODUCES            ## UNDEFINED
+  gBlockIoVendorGuid ## SOMETIMES_CONSUMES  ## UNDEFINED
 
 [Packages]
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  BlockIoDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf    
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/KeyboardDxe/KeyboardDxe.inf    
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,10 +1,10 @@
 ## @file
-# Component description file for BiosKeyboard module.
+# Ps2 Keyboard driver.
 #
-# Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol 
service.
-# This dirver uses legacy INT16 to get the key stroke status.
+# Ps2 Keyboard driver by using Legacy Bios protocol service and IsaIo protocol 
+# service. This dirver uses legacy INT16 to get the key stroke status.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = KeyboardDxe
+  MODULE_UNI_FILE                = KeyboardDxe.uni
   FILE_GUID                      = 5479662B-6AE4-49e8-A6BD-6DE4B625811F
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -60,15 +61,17 @@
   PcdLib
 
 [Protocols]
-  gEfiIsaIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START
-  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL BY_START
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL TO_START
-  gEfiPs2PolicyProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
+  gEfiIsaIoProtocolGuid                         ## TO_START
+  gEfiSimpleTextInProtocolGuid                  ## BY_START
+  gEfiSimpleTextInputExProtocolGuid             ## BY_START
+  gEfiLegacyBiosProtocolGuid                    ## CONSUMES
+  gEfiPs2PolicyProtocolGuid                     ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE
+  
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE  
## CONSUMES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection
\ No newline at end of file
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection                
  ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  KeyboardDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,9 @@
 ## @file
+# SNP driver On Legacy NIC ROM.
+#
 # Thunk wrapper UEFI driver to produce EFI SNP protocol based on legacy 16 NIC 
ROM.
 #
-# Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -16,6 +18,7 @@
 
 [Defines]
   BASE_NAME                            = BiosSnp16
+  MODULE_UNI_FILE                      = BiosSnp16.uni
   FILE_GUID                            = D0CAA91E-2DE4-4b0d-B3DC-09C67E854E34
   MODULE_TYPE                          = UEFI_DRIVER
   INF_VERSION                          = 0x00010005
@@ -52,16 +55,19 @@
   MemoryAllocationLib
 
 [Guids]
-  gEfiEventExitBootServicesGuid
+  gEfiEventExitBootServicesGuid         ##CONSUMES  ##Event
 
 [Protocols]
-  gEfiNetworkInterfaceIdentifierProtocolGuid
-  gEfiDevicePathProtocolGuid
-  gEfiSimpleNetworkProtocolGuid
-  gEfiPciIoProtocolGuid
-  gEfiLegacyBiosProtocolGuid
+  gEfiNetworkInterfaceIdentifierProtocolGuid  ##BY_START
+  gEfiDevicePathProtocolGuid                  ##BY_START
+  gEfiDevicePathProtocolGuid                  ##TO_START
+  gEfiSimpleNetworkProtocolGuid               ##BY_START
+  gEfiPciIoProtocolGuid                       ##TO_START
+  gEfiLegacyBiosProtocolGuid                  ##CONSUMES
 
 [Packages]
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  BiosSnp16Extra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -4,7 +4,7 @@
 # This driver by using Legacy Bios protocol service to support csm Video
 # and produce Graphics Output Protocol.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BiosVideoDxe
+  MODULE_UNI_FILE                = BiosVideoDxe.uni
   FILE_GUID                      = 0B04B2ED-861C-42cd-A22F-C3AAFACCB896
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -61,22 +62,26 @@
 
 
 [Guids]
-  gEfiLegacyBiosGuid                            # ALWAYS_PRODUCED
-  gEfiEventExitBootServicesGuid
+  gEfiLegacyBiosGuid                            ## PRODUCES  ##GUID # Install 
Legacy BIOS GUID to mark this driver as a BIOS Thunk Driver
+  gEfiEventExitBootServicesGuid                 ## CONSUMES  ##Event
 
 [Protocols]
-  gEfiVgaMiniPortProtocolGuid                   # PROTOCOL BY_START
-  gEfiEdidDiscoveredProtocolGuid                # PROTOCOL BY_START
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL BY_START
-  gEfiEdidActiveProtocolGuid                    # PROTOCOL BY_START
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL TO_START
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
-  gEfiEdidOverrideProtocolGuid                  # PROTOCOL TO_START
+  gEfiVgaMiniPortProtocolGuid                   ## BY_START
+  gEfiEdidDiscoveredProtocolGuid                ## BY_START
+  gEfiGraphicsOutputProtocolGuid                ## BY_START
+  gEfiEdidActiveProtocolGuid                    ## BY_START
+  gEfiLegacyBiosProtocolGuid                    ## CONSUMES
+  gEfiPciIoProtocolGuid                         ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiDevicePathProtocolGuid                    ## BY_START
+  gEfiEdidOverrideProtocolGuid                  ## SOMETIMES_CONSUMES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution  
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoSetTextVgaModeEnable  
## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable        
## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable        
## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution                 
## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution                   
## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  BiosVideoDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -3,7 +3,7 @@
 #
 # This driver installs Legacy Bios Protocol to support CSM module work in EFI 
system.
 #
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -19,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = LegacyBiosDxe
+  MODULE_UNI_FILE                = LegacyBiosDxe.uni
   FILE_GUID                      = F122A15C-C10B-4d54-8F48-60F4F06DD1AD
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -102,48 +103,48 @@
 
 
 [Guids]
-  gEfiDiskInfoIdeInterfaceGuid                  # ALWAYS_CONSUMED
-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED
-  gEfiLegacyBiosGuid                            # ALWAYS_PRODUCED
+  gEfiDiskInfoIdeInterfaceGuid                  ## SOMETIMES_CONSUMES ##GUID 
#Used in LegacyBiosBuildIdeData() to assure device is a disk
+  gEfiSmbiosTableGuid                           ## SOMETIMES_CONSUMES 
##SystemTable
+  gEfiLegacyBiosGuid                            ## SOMETIMES_CONSUMES ##GUID 
#Used in LegacyBiosInstallVgaRom() to locate handle buffer
 
 [Guids.IA32]
-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpi20TableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED
+  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES 
##SystemTable
+  gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES 
##SystemTable
 
 [Guids.X64]
-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpi20TableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED
+  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES 
##SystemTable
+  gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES 
##SystemTable
 
 
 [Protocols]
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
-  gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiTimerArchProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiIsaIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
-  gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiPciIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiDiskInfoProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacy8259ProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacyBiosPlatformProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacyInterruptProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacyRegion2ProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED
+  gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES
+  gEfiDevicePathProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiPciRootBridgeIoProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiTimerArchProtocolGuid                     ## CONSUMES
+  gEfiIsaIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiGenericMemTestProtocolGuid                ## CONSUMES
+  gEfiDiskInfoProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiSimpleTextInProtocolGuid                  ## SOMETIMES_CONSUMES
+  gEfiLegacy8259ProtocolGuid                    ## CONSUMES
+  gEfiLegacyBiosPlatformProtocolGuid            ## CONSUMES
+  gEfiLegacyInterruptProtocolGuid               ## CONSUMES
+  gEfiLegacyRegion2ProtocolGuid                 ## CONSUMES
+  gEfiLegacyBiosProtocolGuid                    ## PRODUCES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHighPmmMemorySize
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion  ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize       ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEndOpromShadowAddress        ## 
SOMETIMES_CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLowPmmMemorySize             ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHighPmmMemorySize            ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase      ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize      ## 
CONSUMES
 
 [Depex]
   gEfiLegacyRegion2ProtocolGuid AND gEfiLegacyInterruptProtocolGuid AND 
gEfiLegacyBiosPlatformProtocolGuid AND gEfiLegacy8259ProtocolGuid AND 
gEfiGenericMemTestProtocolGuid AND gEfiCpuArchProtocolGuid AND 
gEfiTimerArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  LegacyBiosDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -2,7 +2,7 @@
 #  This library instance produces UefiDecompressLib and Tiano Custom 
decompression algorithm.
 #  Tiano custom decompression algorithm shares most of code with Uefi 
Decompress algorithm.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -16,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BaseUefiTianoDecompressLib
+  MODULE_UNI_FILE                = BaseUefiTianoDecompressLib.uni
   FILE_GUID                      = d774c4d9-c121-4da3-a5e2-0f317e3c630c
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
@@ -43,4 +44,5 @@
   ExtractGuidedSectionLib
 
 [Guids]
-  gTianoCustomDecompressGuid      ## PRODUCED  ## GUID specifies tiano custom 
decompress algorithm.
+  gTianoCustomDecompressGuid      ## PRODUCES  ## UNDEFINED # specifies tiano 
custom decompress algorithm.
+

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,7 @@
 ## @file
-# Capsule library instance for DXE_DRIVER, DXE_RUNTIME_DRIVER
+# Capsule library instance for DXE_DRIVER, DXE_RUNTIME_DRIVER.
 #
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, 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
@@ -16,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DxeCapsuleLib
+  MODULE_UNI_FILE                = DxeCapsuleLib.uni
   FILE_GUID                      = 654950df-1ede-4b04-b144-6b77845736ad
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -47,8 +48,8 @@
   DevicePathLib
 
 [Protocols]
-  gEfiFirmwareManagementProtocolGuid      # CONSUMES
+  gEfiFirmwareManagementProtocolGuid      ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEfiCapsuleGuid                         # SOMETIMES_CONSUMED
-  gEfiFmpCapsuleGuid                      # SOMETIMES_CONSUMED
+  gEfiCapsuleGuid                         ## SOMETIMES_CONSUMED ## GUID # 
Capsule Image Header Guid
+  gEfiFmpCapsuleGuid                      ## SOMETIMES_CONSUMED ## GUID

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
       2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
       2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,8 +1,7 @@
 ## @file
-#  DXE report status code library
+#  Framework DXE report status code library to support EFI1.1 and UEFI2.0 
system.
 #
-#  Retrieve status code and report status code in DXE phase
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -17,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DxeReportStatusCodeLib
+  MODULE_UNI_FILE                = DxeReportStatusCodeLib.uni
   FILE_GUID                      = 3ddc3b12-99ea-4364-b315-6310a2050be5
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -47,12 +47,12 @@
   DevicePathLib
 
 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES ## 
UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES ## 
UNDEFINED
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES (Used if 
revision of the EFI Specification is not less than 0x20000)
+  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES # Used 
if revision of the EFI Specification is not less than 0x20000
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask  ## CONSUMES
 

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,4 +1,5 @@
 ## @file
+#  General BDS library.
 #  
 #  General BDS defines and produce general interfaces for platform BDS driver 
including:
 #  1) BDS boot policy interface;
@@ -19,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = GenericBdsLib
+  MODULE_UNI_FILE                = GenericBdsLib.uni
   FILE_GUID                      = e405ec31-ccaa-4dd4-83e8-0aec01703f7e
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -70,47 +72,75 @@
   ReportStatusCodeLib
 
 [Guids]
-  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The 
identifier of memory type information type in system table)
-  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## 
Variable:L"BootCurrent" (The boot option of current boot)
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID
-  gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## 
Variable:L"PerfDataMemAddr" (The ACPI address of performance data)
-  gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify 
the device path for UARD device)
-  gLastEnumLangGuid                             ## SOMETIMES_PRODUCES ## 
Variable:L"LastEnumLang" (Platform language at last time enumeration.)
-  gHdBootDevicePathVariablGuid                  ## SOMETIMES_PRODUCES ## 
Variable:L"HDDP" (The device path of Boot file on Hard device.)
-  gBdsLibStringPackageGuid                      ## PRODUCES ## GUID (HII 
String PackageList Guid)
-  gEfiLegacyDevOrderVariableGuid                ## CONSUMES ## GUID
-  gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES
+  ## SOMETIMES_CONSUMES ## HOB         # The hob holding memory type 
information
+  ## SOMETIMES_CONSUMES ## SystemTable # The identifier of memory type 
information type in system table
+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation"
+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryTypeInformation"
+  gEfiMemoryTypeInformationGuid                 
+  ## SOMETIMES_CONSUMES ## Variable:L"BootXXXX"    # Boot option variable
+  ## SOMETIMES_PRODUCES ## Variable:L"BootXXXX"    # Boot option variable
+  ## SOMETIMES_CONSUMES ## Variable:L"DriverXXXX"  # Driver load option.
+  ## SOMETIMES_PRODUCES ## Variable:L"DriverXXXX"  # Driver load option.
+  ## SOMETIMES_CONSUMES ## Variable:L"BootNext"    # Next Boot Option
+  ## SOMETIMES_PRODUCES ## Variable:L"BootNext"    # Next Boot Option
+  ## SOMETIMES_CONSUMES ## Variable:L"BootOrder"   # The boot option array
+  ## SOMETIMES_PRODUCES ## Variable:L"BootOrder"   # The boot option array
+  ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" # The driver order list
+  ## SOMETIMES_CONSUMES ## Variable:L"ConIn"       # The device path of 
console in device
+  ## SOMETIMES_PRODUCES ## Variable:L"ConIn"       # The device path of 
console in device
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOut"      # The device path of 
console out device
+  ## SOMETIMES_PRODUCES ## Variable:L"ConOut"      # The device path of 
console out device
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"      # The device path of error 
out device
+  ## SOMETIMES_PRODUCES ## Variable:L"ErrOut"      # The device path of error 
out device
+  ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" # The boot option of 
current boot
+  ## SOMETIMES_PRODUCES ## Variable:L"BootNext"    # The number of next boot 
option
+  gEfiGlobalVariableGuid
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES ## GUID
+  gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## 
Variable:L"PerfDataMemAddr" # The ACPI address of performance data
+  gLastEnumLangGuid                             ## SOMETIMES_PRODUCES ## 
Variable:L"LastEnumLang" # Platform language at last time enumeration.
+  gHdBootDevicePathVariablGuid                  ## SOMETIMES_PRODUCES ## 
Variable:L"HDDP" # The device path of Boot file on Hard device.
+  gBdsLibStringPackageGuid                      ## CONSUMES ## HII # HII 
String PackageList Guid
+  ## SOMETIMES_PRODUCES ## Variable:L"LegacyDevOrder"
+  ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"
+  gEfiLegacyDevOrderVariableGuid
+  gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES ## GUID
 
 [Protocols]
-  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL CONSUMES
-  gEfiLoadFileProtocolGuid                      # PROTOCOL CONSUMES
-  gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES
-  gEfiPciIoProtocolGuid                         # PROTOCOL CONSUMES
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL CONSUMES
-  gEfiSimpleNetworkProtocolGuid                 # PROTOCOL CONSUMES
-  gEfiDebugPortProtocolGuid                     # PROTOCOL CONSUMES
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL CONSUMES
-  gEfiBlockIoProtocolGuid                       # PROTOCOL CONSUMES
-  gEfiFirmwareVolume2ProtocolGuid               # PROTOCOL CONSUMES
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL SOMETIMES_CONSUMES
-  gEfiCpuArchProtocolGuid                       # PROTOCOL CONSUMES
-  gEfiDevicePathProtocolGuid                    # PROTOCOL CONSUMES
-  gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES
-  gEfiUgaDrawProtocolGuid |gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport # 
PROTOCOL SOMETIMES_CONSUMES
-  gEfiOEMBadgingProtocolGuid                    # PROTOCOL CONSUMES
-  gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES
-  gEfiUserManagerProtocolGuid                   # PROTOCOL CONSUMES
-  gEfiUsbIoProtocolGuid                         # PROTOCOL SOMETIMES_CONSUMES
-  gEfiBootLogoProtocolGuid                      # PROTOCOL SOMETIMES_CONSUMES
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
+  gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiSimpleTextOutProtocolGuid                 ## CONSUMES
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES
+  gEfiSimpleNetworkProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiDebugPortProtocolGuid                     ## SOMETIMES_CONSUMES
+  gEfiSimpleTextInProtocolGuid                  ## CONSUMES
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiLegacyBiosProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiAcpiS3SaveProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
+  gEfiUgaDrawProtocolGuid |gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## 
SOMETIMES_CONSUMES
+  gEfiOEMBadgingProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiHiiFontProtocolGuid                       ## CONSUMES
+  gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES
+  gEfiUsbIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport                   ## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart
-  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange ## 
SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad  ## 
SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## 
SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable      ## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile      ## CONSUMES
+
+#
+# [BootMode] 
+#   RECOVERY_FULL    ## SOMETIMES_CONSUMES # Memory Type Information variable
+#
+

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
  2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
  2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,12 +1,11 @@
 ## @file
-#  LzmaArchCustomDecompressLib produces LZMA custom decompression algorithm 
-#  with the converter for the different arch code.
+#  LzmaArchCustomDecompressLib produces LZMA custom decompression algorithm 
with the converter for the different arch code.
 #
 #  It is based on the LZMA SDK 4.65.
-#  LZMA SDK 4.65 was placed in the public domain on 2009-02-03.  
+#  LZMA SDK 4.65 was placed in the public domain on 2009-02-03.
 #  It was released on the http://www.7-zip.org/sdk.html website.
 #
-#  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2014, 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
@@ -21,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = LzmaArchDecompressLib
+  MODULE_UNI_FILE                = LzmaArchDecompressLib.uni
   FILE_GUID                      = A853C1D2-E003-4cc4-9DD1-8824AD79FE48
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
@@ -56,7 +56,7 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [Guids.Ia32, Guids.X64]
-  gLzmaF86CustomDecompressGuid ## PRODUCED  ## GUID specifies LZMA custom 
decompress algorithm with converter for x86 code.
+  gLzmaF86CustomDecompressGuid    ## PRODUCES  ## GUID # specifies LZMA custom 
decompress algorithm with converter for x86 code.
 
 [LibraryClasses]
   BaseLib

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
      2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
      2014-08-28 06:58:44 UTC (rev 15966)
@@ -2,10 +2,10 @@
 #  LzmaCustomDecompressLib produces LZMA custom decompression algorithm.
 #
 #  It is based on the LZMA SDK 4.65.
-#  LZMA SDK 4.65 was placed in the public domain on 2009-02-03.  
+#  LZMA SDK 4.65 was placed in the public domain on 2009-02-03.
 #  It was released on the http://www.7-zip.org/sdk.html website.
 #
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, 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
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = LzmaDecompressLib
+  MODULE_UNI_FILE                = LzmaDecompressLib.uni
   FILE_GUID                      = 35194660-7421-44ad-9636-e44885f092d1
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
@@ -51,7 +52,7 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [Guids]
-  gLzmaCustomDecompressGuid  ## PRODUCED  ## GUID specifies LZMA custom 
decompress algorithm.
+  gLzmaCustomDecompressGuid  ## PRODUCES  ## UNDEFINED # specifies LZMA custom 
decompress algorithm.
 
 [LibraryClasses]
   BaseLib

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
        2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
        2014-08-28 06:58:44 UTC (rev 15966)
@@ -2,7 +2,7 @@
 #  Debug Library based on report status code library
 #
 #  Debug Library for PEIMs and DXE drivers that sends debug messages to 
ReportStatusCode
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -17,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiDxeDebugLibReportStatusCode
+  MODULE_UNI_FILE                = PeiDxeDebugLibReportStatusCode.uni
   FILE_GUID                      = bda39d3a-451b-4350-8266-81ab10fa0523
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -46,10 +47,9 @@
   DebugPrintErrorLevelLib
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue  ## SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask      ## CONSUMES
 
 [Guids]
-  gEfiStatusCodeDataTypeDebugGuid    ## CONSUMES
-  
-  
\ No newline at end of file
+  gEfiStatusCodeDataTypeDebugGuid    ## SOMETIMES_CONSUMES ## GUID
+

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf    
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf    
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -5,7 +5,7 @@
 #  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
 #  in PI 1.2 specification. 
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiRecoveryLib
+  MODULE_UNI_FILE                = PeiRecoveryLib.uni
   FILE_GUID                      = C0227547-0811-4cbb-ABEA-DECD22829122
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0

Modified: trunk/edk2/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf    
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf    
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,11 +1,11 @@
 ## @file
+#  This library provides API to invoke the S3 resume vector in the ACPI Table 
in S3 resume mode.
 #
-#  This library provides API to invoke the S3 resume vector in the APCI Table 
in S3 resume mode. 
 #  This library instance is no longer used and module using this library
 #  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined
 #  in PI 1.2 specification. 
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiS3Lib
+  MODULE_UNI_FILE                = PeiS3Lib.uni
   FILE_GUID                      = EFB7D3A8-DEB9-4bed-B6D6-3B09BEEB835A
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -44,6 +45,5 @@
   DebugLib
 
 [Ppis]
-  gEfiPeiS3ResumePpiGuid                # ALWAYS_CONSUMES
+  gEfiPeiS3ResumePpiGuid                ## CONSUMES
 
-

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
        2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf
        2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,9 +1,7 @@
 ## @file
+#  NULL implementation for PlatformBdsLib library class interfaces.
 #  
-#  Provide NULL implementation for PlatformBdsLib library class interfaces 
which
-#  should be implemented by OEM.
-#  
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2014, 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.  The full text of the license may be 
found at
@@ -17,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PlatformBdsLib
+  MODULE_UNI_FILE                = PlatformBdsLib.uni
   FILE_GUID                      = 143B5044-7C1B-4904-9778-EA16F1F3D554
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
  2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
  2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,11 +1,11 @@
 ## @file
-#  Report status code library instance which supports logging message in SMM, 
as well as DXE & runtime phase.
+#  Framework Report status code library instance which supports logging 
message in SMM, as well as DXE & runtime phase.
 #
 #  This library instance supports status code report in SMM, as well as DXE & 
runtime phase.
 #  In SMM, it logs message via SMM Status Code Protocol.
 #  Otherwise, it logs message to ReportStatusCode() in framework runtime 
services table or runtime report status code protocol.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmmRuntimeDxeReportStatusCodeLibFramework
+  MODULE_UNI_FILE                = 
SmmRuntimeDxeReportStatusCodeLibFramework.uni
   FILE_GUID                      = D65D9F72-7BCE-4f73-A673-47AF446A1A31
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -56,17 +57,17 @@
   MemoryAllocationLib
 
 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES ## 
UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES ## 
UNDEFINED
   gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
   gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
 
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid             ## CONSUMES
-  gEfiSmmBaseProtocolGuid                       ## CONSUMES
-  gEfiSmmStatusCodeProtocolGuid                 ## CONSUMES
+  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES
+  gEfiSmmBaseProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiSmmStatusCodeProtocolGuid                 ## SOMETIMES_CONSUMES
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask ## CONSUMES
 

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
   2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
   2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,6 @@
 ## @file
-# Component description file for AcpiS3Save module.
+# AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data.
 #
-# This is an implementation of the ACPI S3 Save protocol.
 # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials are
@@ -17,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = AcpiS3SaveDxe
+  MODULE_UNI_FILE                = AcpiS3SaveDxe.uni
   FILE_GUID                      = 2BDED685-F733-455f-A840-43A22B791FB3
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -53,28 +53,30 @@
   DxeServicesLib
 
 [Guids]
-  gEfiAcpiVariableGuid                          # ALWAYS_CONSUMED
-  gEfiAcpiS3ContextGuid                         # ALWAYS_CONSUMED
-  gEfiAcpiVariableCompatiblityGuid              # SOMETIME_CONSUMED 
L"AcpiGlobalVariable"
-  gEfiAcpi20TableGuid                           # ALWAYS_CONSUMED  System Table
-  gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED  System Table
+  gEfiAcpiVariableGuid                          ## PRODUCES  ## UNDEFINED # 
LockBox Save Data.
+  gEfiAcpiS3ContextGuid                         ## PRODUCES  ## UNDEFINED # 
LockBox Save Data.
+  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES  ## 
SystemTable
+  gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES  ## 
SystemTable
+  ## SOMETIMES_CONSUMES ## Variable:L"AcpiGlobalVariable"
+  ## SOMETIMES_PRODUCES ## Variable:L"AcpiGlobalVariable"
+  gEfiAcpiVariableCompatiblityGuid
 
 [Protocols]
-  gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED
-  gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLegacyRegion2ProtocolGuid                 # PROTOCOL SOMETIMES_CONSUMED
-  gFrameworkEfiMpServiceProtocolGuid            # PROTOCOL SOMETIMES_CONSUMED
-  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES
+  gEfiAcpiS3SaveProtocolGuid                    ## PRODUCES
+  gFrameworkEfiMpServiceProtocolGuid            ## SOMETIMES_CONSUMES
+  ## NOTIFY
+  ## SOMETIMES_CONSUMES
+  gEdkiiVariableLockProtocolGuid
 
 [FeaturePcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport          ## 
CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## 
CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode                 ## 
CONSUMES
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## 
CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## 
SOMETIMES_CONSUMES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize       ## 
CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable                         ## 
CONSUMES
   ## SOMETIMES_CONSUMES
   ## SOMETIMES_PRODUCES
   gEfiMdeModulePkgTokenSpaceGuid.PcdIdentifyMappingPageTablePtr
@@ -85,4 +87,6 @@
   # AcpiS3SaveDxe module is executed. 
   #
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid AND 
gEfiMpServiceProtocolGuid
-  
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  AcpiS3SaveDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
 2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
 2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,10 +1,10 @@
 ## @file
-# Acpi Support Dirver to install Acpi Support Protocol.
+# Acpi Support Dirver to install Framework Acpi Support Protocol.
 #
 # This driver initializes ACPI support protocol instance data structure and 
intstall 
 # ACPI support protocol to provide Get, Set and Publish Table services.
 #
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -20,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = AcpiSupportDxe
+  MODULE_UNI_FILE                = AcpiSupportDxe.uni
   FILE_GUID                      = 506533a6-e626-4500-b14f-17939c0e5b60
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -56,22 +57,25 @@
 
 
 [Guids]
-  gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpiTableGuid
+  gEfiAcpi10TableGuid                           ## PRODUCES ## SystemTable
+  gEfiAcpiTableGuid                             ## PRODUCES ## SystemTable
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdInstallAcpiSupportProtocol
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdInstallAcpiSupportProtocol ## 
CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## CONSUMES
 
 [Protocols]
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
-  gEfiAcpiSupportProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
+  gEfiAcpiTableProtocolGuid                     ## PRODUCES
+  gEfiAcpiSupportProtocolGuid                   ## SOMETIMES_PRODUCES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  AcpiSupportDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,6 +1,6 @@
 ## @file
+#  BDSDxe module is core driver for BDS phase.
 #
-#  BDSDxe module is core driver for BDS phase. 
 #  When DxeCore dispatching all DXE driver, this module will produce 
architecture protocol 
 #  gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will 
invoke Entry
 #  interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
@@ -28,6 +28,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BdsDxe
+  MODULE_UNI_FILE                = BdsDxe.uni
   FILE_GUID                      = FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0 
@@ -113,93 +114,114 @@
   UefiHiiServicesLib
   
 [Guids]
-                                                ## SOMETIMES_PRODUCES ## 
Variable:L"BootXX" (Boot option variable)
-                                                ## SOMETIMES_PRODUCES ## 
Variable:L"PlatformLang" (Platform supported languange in Rfc4646 format)
-                                                ## SOMETIMES_PRODUCES ## 
Variable:L"Lang" (Platform supported languange in Iso639 format)
-                                                ## 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)
-  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## 
Variable:L"BootNext" (The number of next boot option)
-  gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES ## GUID (Indicate 
the information type is volume)
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID (Indicate 
the information type is file)
-  gEfiHiiPlatformSetupFormsetGuid               ## CONSUMES ## GUID (Indicate 
the formset class guid to be displayed)
-  gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended 
IFR Guid Opcode)
-  gEfiHiiDriverHealthFormsetGuid                ## CONSUMES ## GUID (Indicate 
the Driver Health formset class guid to be displayed)
-  gEfiLegacyDevOrderVariableGuid                ## SOMETIMES_PRODUCES ## 
Variable:L"LegacyDevOrder"
-  gFrontPageFormSetGuid                         ## PRODUCES           ## 
FrontPage HII Package
-  gBootMaintFormSetGuid                         ## SOMETIMES_PRODUCES ## 
BootMaint HII Package
-  gFileExploreFormSetGuid                       ## SOMETIMES_PRODUCES ## 
FileExplore HII Package
-  gBootManagerFormSetGuid                       ## SOMETIMES_PRODUCES ## 
BootManager HII Package
-  gDeviceManagerFormSetGuid                     ## SOMETIMES_PRODUCES ## 
DeviceManager HII Package
-  gDriverHealthFormSetGuid                      ## SOMETIMES_PRODUCES ## 
DriverHealth HII Package
-  gConnectConInEventGuid                        ## CONSUMES ## GUID (Connect 
ConIn Event)
-  gEfiFmpCapsuleGuid                            ## CONSUMES ## GUID (FMP 
Capsule)
-  gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES
+  ## SOMETIMES_PRODUCES ## Variable:L"BootXXXX"          # Boot option variable
+  ## SOMETIMES_PRODUCES ## Variable:L"DriverXXXX"        # Driver load option.
+  ## SOMETIMES_PRODUCES ## Variable:L"PlatformLang"      # Platform supported 
languange in Rfc4646 format
+  ## SOMETIMES_PRODUCES ## Variable:L"Lang"              # Platform supported 
languange in Iso639 format
+  ## SOMETIMES_PRODUCES ## Variable:L"LangCodes"         # Value of 
PcdUefiVariableDefaultLangCodes
+  ## PRODUCES           ## Variable:L"PlatformLangCodes" # Value of 
PcdUefiVariableDefaultPlatformLangCodes
+  ## SOMETIMES_PRODUCES ## Variable:L"KeyXXXX"  # Hotkey option variable
+  ## PRODUCES           ## Variable:L"HwErrRecSupport"   # The level of 
platform supported hardware Error Record Persistence
+  ## PRODUCES           ## Variable:L"Timeout"     # The time out value in 
second of showing progress bar
+  ## 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 ## 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_PRODUCES ## Variable:L"ConIn"  # The device path of console in 
device
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOut" # The device path of console out 
device
+  ## SOMETIMES_PRODUCES ## Variable:L"ConOut" # The device path of console out 
device
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" # The device path of error out 
device
+  ## SOMETIMES_PRODUCES ## Variable:L"ErrOut" # The device path of error out 
device
+  ## SOMETIMES_CONSUMES ## Variable:L"ConInDev"  # The device path of console 
in device
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOutDev" # The device path of console 
out device
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOutDev" # The device path of error 
out device
+  ## SOMETIMES_PRODUCES ## Variable:L"BootNext"  # The number of next boot 
option
+  gEfiGlobalVariableGuid
+  gEfiFileSystemVolumeLabelInfoIdGuid           ## SOMETIMES_CONSUMES ## 
UNDEFINED # Indicate the information type is volume
+  gEfiFileInfoGuid                              ## SOMETIMES_CONSUMES ## 
UNDEFINED # Indicate the information type is file
+  gEfiHiiPlatformSetupFormsetGuid               ## SOMETIMES_CONSUMES ## 
UNDEFINED # Indicate the formset class guid to be displayed
+  gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## 
UNDEFINED # Extended IFR Guid Opcode
+  gEfiHiiDriverHealthFormsetGuid                ## SOMETIMES_CONSUMES ## 
UNDEFINED # Indicate the Driver Health formset class guid to be displayed
+  ## SOMETIMES_PRODUCES ## Variable:L"LegacyDevOrder"
+  ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder"
+  gEfiLegacyDevOrderVariableGuid
+  gFrontPageFormSetGuid                         ## SOMETIMES_CONSUMES ## HII # 
FrontPage HII Package
+  gBootMaintFormSetGuid                         ## SOMETIMES_CONSUMES ## HII # 
BootMaint HII Package
+  gFileExploreFormSetGuid                       ## SOMETIMES_CONSUMES ## HII # 
FileExplore HII Package
+  gBootManagerFormSetGuid                       ## SOMETIMES_CONSUMES ## HII # 
BootManager HII Package
+  gDeviceManagerFormSetGuid                     ## SOMETIMES_CONSUMES ## HII # 
DeviceManager HII Package
+  gDriverHealthFormSetGuid                      ## SOMETIMES_CONSUMES ## HII # 
DriverHealth HII Package
+  ## SOMETIMES_PRODUCES ## Event
+  ## SOMETIMES_CONSUMES ## Event
+  gConnectConInEventGuid
+  gEfiFmpCapsuleGuid                            ## SOMETIMES_CONSUMES ## GUID 
# FMP Capsule
+  gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES ## GUID
 
 [Protocols]
-  gEfiSimpleFileSystemProtocolGuid              ## PROTOCOL CONSUMES
-  gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES
-  gEfiBdsArchProtocolGuid                       ## PROTOCOL PRODUCES
-  gEfiSmbiosProtocolGuid                        ## PROTOCOL CONSUMES
-  gEfiGenericMemTestProtocolGuid                ## PROTOCOL CONSUMES
-  gEfiLegacyBiosProtocolGuid                    ## PROTOCOL CONSUMES
-  gEfiUgaDrawProtocolGuid |gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## 
PROTOCOL SOMETIMES_CONSUMES
-  gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES
-  gEfiGraphicsOutputProtocolGuid                ## PROTOCOL SOMETIMES_CONSUMES
-  gEfiSimpleTextInputExProtocolGuid             ## PROTOCOL CONSUMES
-  gEfiHiiConfigAccessProtocolGuid               ## PROTOCOL CONSUMES
-  gEfiFormBrowser2ProtocolGuid                  ## PROTOCOL CONSUMES
-  gEfiSerialIoProtocolGuid                      ## PROTOCOL CONSUMES
-  gEfiDevicePathProtocolGuid                    ## PROTOCOL CONSUMES
-  gEfiDriverHealthProtocolGuid                  ## PROTOCOL SOMETIMES_CONSUMES
-  gEfiPciIoProtocolGuid                         ## PROTOCOL CONSUMES
-  gEfiBootLogoProtocolGuid                      ## PROTOCOL SOMETIMES_CONSUMES
-  gEdkiiVariableLockProtocolGuid                ## PROTOCOL CONSUMES
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
+  gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiBdsArchProtocolGuid                       ## PRODUCES
+  gEfiSmbiosProtocolGuid                        ## CONSUMES
+  gEfiGenericMemTestProtocolGuid                ## SOMETIMES_CONSUMES
+  gEfiLegacyBiosProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiUgaDrawProtocolGuid |gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## 
SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
+  ## CONSUMES
+  ## NOTIFY
+  gEfiSimpleTextInputExProtocolGuid             
+  gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_PRODUCES
+  gEfiFormBrowser2ProtocolGuid                  ## CONSUMES
+  gEfiSerialIoProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiDriverHealthProtocolGuid                  ## SOMETIMES_CONSUMES
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate
-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate    ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport                   ## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable ## CONSUMES
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes          ## 
SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang               ## 
SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes  ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang       ## 
SOMETIMES_CONSUMES
+  ## CONSUMES
+  ## PRODUCES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow     ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn  ## PRODUCES
+  ## SOMETIMES_CONSUMES
+  ## SOMETIMES_PRODUCES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  ## CONSUMES
+  ## PRODUCES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor   ## CONSUMES   
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution  ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution    ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand       ## 
SOMETIMES_CONSUMES
+  ## CONSUMES
+  ## SOMETIMES_PRODUCES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn
+  ## CONSUMES
+  ## SOMETIMES_PRODUCES
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
-  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution 
## CONSUMES
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution   
## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable                      
## CONSUMES
 
 [Depex]
   TRUE
 
 #
 # [BootMode] 
-#   BOOT_ON_FLASH_UPDATE    ## SOMETIMES_CONSUMES (Update Capsule Image)
+#   FLASH_UPDATE    ## SOMETIMES_CONSUMES # Update Capsule Image
 #
-#  
-# [Hob]
-#   HOB                     ## SOMETIMES_CONSUMES  ## GUID EXTENSION Capsule 
Data Hob
-#
-# 
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  BdsDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,7 @@
 ## @file
 #  VGA Class Driver that managers VGA devices and produces Simple Text Output 
Protocol.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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         
@@ -17,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VgaClassDxe
+  MODULE_UNI_FILE                = VgaClassDxe.uni
   FILE_GUID                      = BF89F10D-B205-474f-96E3-7A7BB1B4A407
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -54,9 +55,10 @@
 
 
 [Protocols]
-  gEfiSimpleTextOutProtocolGuid                 # PROTOCOL BY_START
-  gEfiVgaMiniPortProtocolGuid                   # PROTOCOL TO_START
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
+  gEfiSimpleTextOutProtocolGuid                 ## BY_START
+  gEfiVgaMiniPortProtocolGuid                   ## TO_START
+  gEfiPciIoProtocolGuid                         ## TO_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  VgaClassDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf  
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf  
2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,7 @@
 ## @file
 #  Module that produces the Framework CPU I/O Protocol using the services of 
the I/O Library
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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. The full text of the license may be 
found at
@@ -14,6 +14,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CpuIoDxe
+  MODULE_UNI_FILE                = CpuIoDxe.uni
   FILE_GUID                      = BAE7599F-3C6B-43b7-BDF0-9CE07AA91AA6
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -45,3 +46,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuIoDxeExtra.uni

Modified: trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf      
2014-08-28 06:55:48 UTC (rev 15965)
+++ trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf      
2014-08-28 06:58:44 UTC (rev 15966)
@@ -21,7 +21,7 @@
 #  drivers to be aware of all reporting formats.
 #  For more information, please ref http://www.intel.com/technology/framework/
 #  
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -36,6 +36,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DataHubDxe
+  MODULE_UNI_FILE                = DataHubDxe.uni
   FILE_GUID                      = 53BCC14F-C24F-434C-B294-8ED2D4CC1860
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -69,9 +70,11 @@
 
 
 [Protocols]
-  gEfiDataHubProtocolGuid                       # PROTOCOL PRODUCED
+  gEfiDataHubProtocolGuid                       ## PRODUCES
 
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DataHubDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
  2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
  2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,7 +1,7 @@
 ## @file
-#  This driver takes DEBUG () info from Data Hub and writes it to StdErr if it 
exists.
+#  This driver takes DEBUG info from Data Hub and writes it to StdErr if it 
exists.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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
@@ -15,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DataHubStdErrDxe
+  MODULE_UNI_FILE                = DataHubStdErrDxe.uni
   FILE_GUID                      = CA515306-00CE-4032-874E-11B755FF6866
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -42,13 +43,15 @@
   DebugLib
 
 [Guids]
-  gEfiStatusCodeDataTypeDebugGuid               # SOMETIMES_CONSUMED
-  gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES ## 
UNDEFINED  # DataRecord Date Type
+  gEfiDataHubStatusCodeRecordGuid               ## SOMETIMES_CONSUMES ## 
UNDEFINED  # DataRecordGuid
 
 
 [Protocols]
-  gEfiDataHubProtocolGuid                       # PROTOCOL CONSUMED
+  gEfiDataHubProtocolGuid                       ## CONSUMES
 
 [Depex]
   gEfiDataHubProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DataHubStdErrDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
   2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
   2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,8 +1,10 @@
 ## @file
-#  FwVolDxe driver produces Firmware Volume2 protocol with full services
+#  FwVolDxe Driver.
+#
+#  This driver produces Firmware Volume2 protocol with full services
 #  (read/write, get/set) based on Firmware Volume Block protocol.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FwVolDxe
+  MODULE_UNI_FILE                = FwVolDxe.uni
   FILE_GUID                      = 233C2592-1CEC-494a-A097-15DC96379777
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,9 +58,9 @@
 
 
 [Guids]
-  gEfiFirmwareVolumeTopFileGuid                ## CONSUMES
-  gEfiFirmwareFileSystem2Guid                  ## CONSUMES
-  gEfiFirmwareFileSystem3Guid                  ## CONSUMES
+  gEfiFirmwareVolumeTopFileGuid                ## CONSUMES ## File # VTF file
+  gEfiFirmwareFileSystem2Guid                  ## CONSUMES ## GUID # File 
System Guid
+  gEfiFirmwareFileSystem3Guid                  ## CONSUMES ## GUID # File 
System Guid
 
 [Protocols]
   gEfiSectionExtractionProtocolGuid            ## CONSUMES
@@ -67,3 +70,5 @@
 [Depex]
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiSectionExtractionProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  FwVolDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
     2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
     2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,9 +1,11 @@
 ## @file
+# Update Driver for Capulse update.
+#
 # This driver is intended to be put in a capsule (FV). If all goes well, 
 # then it should be dispatched from the capsule FV, then find the image 
 # in the same FV and program it in a target Firmware Volume device.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
@@ -18,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = UpdateDriverDxe
+  MODULE_UNI_FILE                = UpdateDriverDxe.uni
   FILE_GUID                      = 0E84FC69-29CC-4C6D-92AC-6D476921850F
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -57,8 +60,8 @@
   DevicePathLib
 
 [Guids]
-  gEfiConfigFileNameGuid                        ## CONSUMES FileName to store 
ConfigFile
-  gEfiUpdateDataFileGuid                        ## CONSUMES FileName to store 
Capsule Data.
+  gEfiConfigFileNameGuid                        ## CONSUMES ## File # FileName 
to store ConfigFile
+  gEfiUpdateDataFileGuid                        ## CONSUMES ## File # FileName 
to store Capsule Data.
 
 [Protocols]
   gEfiFaultTolerantWriteProtocolGuid            ## CONSUMES
@@ -69,3 +72,5 @@
 [Depex]
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiFaultTolerantWriteProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  UpdateDriverDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
    2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
    2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,5 +1,5 @@
 ## @file
-#  Produces the Legacy Region Protocol.
+#  Produces Framework Legacy Region Protocol.
 #
 #  This generic implementation of the Legacy Region Protocol does not actually 
 #  perform any lock/unlock operations.  This module may be used on platforms 
@@ -7,7 +7,7 @@
 #  be used as a template driver for implementing the Legacy Region Protocol on
 #  a platform that does support HW locking of the legacy memory regions.
 #
-# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, 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.  The full text of the license may be 
found at
@@ -21,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = LegacyRegionDxe
+  MODULE_UNI_FILE                = LegacyRegionDxe.uni
   FILE_GUID                      = 8C439043-85CA-467a-96F1-CB14F4D0DCDA
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -49,3 +50,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  LegacyRegionDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
  2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
  2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,12 +1,11 @@
 ## @file
-#  
 #  Section Extraction Dxe Driver produces framework section extract protocol.
 #
 #  The section is implemented as a linked list of section streams,
 #  where each stream contains a linked list of children, which may be leaves or
 #  encapsulations. Encapsulation section will further generate new section 
stream entries.
 #  
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, 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.  The full text of the license may be 
found at
@@ -20,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SectionExtractionDxe
+  MODULE_UNI_FILE                = SectionExtractionDxe.uni
   FILE_GUID                      = 801ADCA0-815E-46a4-84F7-657F53621A57
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -47,10 +47,11 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec
 
 [Protocols]
-  gEfiSectionExtractionProtocolGuid    ## PRODUCEDS
-  gEfiDecompressProtocolGuid           ## CONSUMEDS
+  gEfiSectionExtractionProtocolGuid    ## PRODUCES
+  gEfiDecompressProtocolGuid           ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiDecompressProtocolGuid
-  
-  
\ No newline at end of file
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SectionExtractionDxeExtra.uni

Modified: 
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf
===================================================================
--- 
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf
 2014-08-28 06:55:48 UTC (rev 15965)
+++ 
trunk/edk2/IntelFrameworkModulePkg/Universal/StatusCode/DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.inf
 2014-08-28 06:58:44 UTC (rev 15966)
@@ -1,8 +1,7 @@
 ## @file
-#  Status Code Handler Driver which produces datahub handler and hook it
-#  onto the DXE status code router.
+#  Status Code Handler Driver which produces datahub handler.
 #

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to