Add temporary fix for PeLoader

[mirror_edk2.git] / EdkModulePkg / EdkModulePkg.spd

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index f2bdfa04015d410df9c0e5279076c64dc6d481e9..883df1873f79aa8f36e8e45d82a1e4c52c73057e 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,655 +1,995 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r
   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r

-    <Guid>0xb6ec423c, 0x21d2, 0x490d, 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74</Guid>\r
-    <Version>0</Version>\r
+    <GuidValue>B6EC423C-21D2-490D-85C6-DD5864EAA674</GuidValue>\r
+    <Version>0.3</Version>\r

     <Abstract>Edk Module Package Reference Implementations</Abstract>\r
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>\r
     <Abstract>Edk Module Package Reference Implementations</Abstract>\r
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>\r

-    <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>\r
-    <License>\r
-      All rights reserved.\r
+    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <License>All rights reserved.\r

       This program and the accompanying materials are licensed and made available \r
       under the terms and conditions of the BSD License which accompanies this distribution.\r
       The full text of the license may be found at http://opensource.org/licenses/bsd-license.php\r
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES\r
       This program and the accompanying materials are licensed and made available \r
       under the terms and conditions of the BSD License which accompanies this distribution.\r
       The full text of the license may be found at http://opensource.org/licenses/bsd-license.php\r
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES\r

-      OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-    </License>\r
-    <Created>2006-02-21 17:43</Created>\r
-    <Updated>2006-03-19 16:26</Updated>\r
-    <URL>http://www.TianoCore.org</URL>\r
-    <PackageType>SOURCE</PackageType>\r
+      OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </SpdHeader>\r
+  <PackageDefinitions>\r

     <ReadOnly>true</ReadOnly>\r
     <RePackage>false</RePackage>\r
     <ReadOnly>true</ReadOnly>\r
     <RePackage>false</RePackage>\r

-  </SpdHeader>\r
+  </PackageDefinitions>\r

   <LibraryClassDeclarations>\r
   <LibraryClassDeclarations>\r

-    <LibraryClassDeclaration>\r
-      <LibraryClass>CustomDecompressLib</LibraryClass>\r
+    <LibraryClass Name="CustomDecompressLib">\r

       <IncludeHeader>Include/Library/CustomDecompressLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/CustomDecompressLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkBsDataHubStatusCodeLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/EdkBsDataHubStatusCodeLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkDxeSalLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkDxeSalLib">\r

       <IncludeHeader>Include/Library/EdkDxeSalLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkDxeSalLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkFvbServiceLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkFvbServiceLib">\r

       <IncludeHeader>Include/Library/EdkFvbServiceLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkFvbServiceLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkGraphicsLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkGraphicsLib">\r

       <IncludeHeader>Include/Library/EdkGraphicsLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkGraphicsLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkIfrSupportLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkIfrSupportLib">\r

       <IncludeHeader>Include/Library/EdkIfrSupportLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkIfrSupportLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkMemoryStatusCodeLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/EdkMemoryStatusCodeLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkPeCoffLoaderLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkPeCoffLoaderLib">\r

       <IncludeHeader>Include/Library/EdkPeCoffLoaderLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkPeCoffLoaderLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkPeCoffLoaderX64Lib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkPeCoffLoaderX64Lib">\r

       <IncludeHeader>Include/Library/EdkPeCoffLoaderX64Lib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkPeCoffLoaderX64Lib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkRtMemoryStatusCodeLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/EdkRtMemoryStatusCodeLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkRtPlatformStatusCodeLib</LibraryClass>\r
-      <IncludeHeader>Include/Library/EdkRtPlatformStatusCodeLib.h</IncludeHeader>\r
-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkScsiLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkScsiLib">\r

       <IncludeHeader>Include/Library/EdkScsiLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkScsiLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>EdkUsbLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="EdkUsbLib">\r

       <IncludeHeader>Include/Library/EdkUsbLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/EdkUsbLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
-    <LibraryClassDeclaration>\r
-      <LibraryClass>TianoDecompressLib</LibraryClass>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="TianoDecompressLib">\r

       <IncludeHeader>Include/Library/TianoDecompressLib.h</IncludeHeader>\r
       <IncludeHeader>Include/Library/TianoDecompressLib.h</IncludeHeader>\r

-    </LibraryClassDeclaration>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="SerialPortLib">\r
+      <IncludeHeader>Include/Library/SerialPortLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </LibraryClass>\r
+    <LibraryClass Name="OemHookStatusCodeLib">\r
+      <IncludeHeader>Include/Library/OemHookStatusCodeLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </LibraryClass>\r

   </LibraryClassDeclarations>\r
   </LibraryClassDeclarations>\r

+  <IndustryStdIncludes>\r
+    <IndustryStdHeader Name="CapsuleName">\r
+      <IncludeHeader>Include/Common/CapsuleName.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DecompressLibraryHob">\r
+      <IncludeHeader>Include/Common/DecompressLibraryHob.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FlashMap">\r
+      <IncludeHeader>Include/Common/FlashMap.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Variable">\r
+      <IncludeHeader>Include/Common/Variable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="WorkingBlockHeader">\r
+      <IncludeHeader>Include/Common/WorkingBlockHeader.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="AlternateFvBlock">\r
+      <IncludeHeader>Include/Guid/AlternateFvBlock.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Bmp">\r
+      <IncludeHeader>Include/Guid/Bmp.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BootState">\r
+      <IncludeHeader>Include/Guid/BootState.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CapsuleVendor">\r
+      <IncludeHeader>Include/Guid/CapsuleVendor.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CompatibleMemoryTested">\r
+      <IncludeHeader>Include/Guid/CompatibleMemoryTested.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ConsoleInDevice">\r
+      <IncludeHeader>Include/Guid/ConsoleInDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ConsoleOutDevice">\r
+      <IncludeHeader>Include/Guid/ConsoleOutDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ExtendedSalGuid">\r
+      <IncludeHeader>Include/Guid/ExtendedSalGuid.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FlashMapHob">\r
+      <IncludeHeader>Include/Guid/FlashMapHob.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="HotPlugDevice">\r
+      <IncludeHeader>Include/Guid/HotPlugDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MemoryTypeInformation">\r
+      <IncludeHeader>Include/Guid/MemoryTypeInformation.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="MiniShellFile">\r
+      <IncludeHeader>Include/Guid/MiniShellFile.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciHotplugDevice">\r
+      <IncludeHeader>Include/Guid/PciHotplugDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciOptionRomTable">\r
+      <IncludeHeader>Include/Guid/PciOptionRomTable.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiPeCoffLoader">\r
+      <IncludeHeader>Include/Guid/PeiPeCoffLoader.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiPerformanceHob">\r
+      <IncludeHeader>Include/Guid/PeiPerformanceHob.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PrimaryConsoleInDevice">\r
+      <IncludeHeader>Include/Guid/PrimaryConsoleInDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PrimaryConsoleOutDevice">\r
+      <IncludeHeader>Include/Guid/PrimaryConsoleOutDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PrimaryStandardErrorDevice">\r
+      <IncludeHeader>Include/Guid/PrimaryStandardErrorDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ShellFile">\r
+      <IncludeHeader>Include/Guid/ShellFile.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StandardErrorDevice">\r
+      <IncludeHeader>Include/Guid/StandardErrorDevice.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCode">\r
+      <IncludeHeader>Include/Guid/StatusCode.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCodeCallerId">\r
+      <IncludeHeader>Include/Guid/StatusCodeCallerId.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SystemNvDataGuid">\r
+      <IncludeHeader>Include/Guid/SystemNvDataGuid.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CustomDecompressLib">\r
+      <IncludeHeader>Include/Library/CustomDecompressLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkDxeSalLib">\r
+      <IncludeHeader>Include/Library/EdkDxeSalLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkFvbServiceLib">\r
+      <IncludeHeader>Include/Library/EdkFvbServiceLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkGraphicsLib">\r
+      <IncludeHeader>Include/Library/EdkGraphicsLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkIfrSupportLib">\r
+      <IncludeHeader>Include/Library/EdkIfrSupportLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkPeCoffLoaderLib">\r
+      <IncludeHeader>Include/Library/EdkPeCoffLoaderLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkPeCoffLoaderX64Lib">\r
+      <IncludeHeader>Include/Library/EdkPeCoffLoaderX64Lib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkScsiLib">\r
+      <IncludeHeader>Include/Library/EdkScsiLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkUsbLib">\r
+      <IncludeHeader>Include/Library/EdkUsbLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="TianoDecompressLib">\r
+      <IncludeHeader>Include/Library/TianoDecompressLib.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="BaseMemoryTest">\r
+      <IncludeHeader>Include/Ppi/BaseMemoryTest.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FlashMap">\r
+      <IncludeHeader>Include/Ppi/FlashMap.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PeiInMemory">\r
+      <IncludeHeader>Include/Ppi/PeiInMemory.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="StatusCodeMemory">\r
+      <IncludeHeader>Include/Ppi/StatusCodeMemory.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="AcpiS3Save">\r
+      <IncludeHeader>Include/Protocol/AcpiS3Save.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Capsule">\r
+      <IncludeHeader>Include/Protocol/Capsule.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ConsoleControl">\r
+      <IncludeHeader>Include/Protocol/ConsoleControl.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="CustomizedDecompress">\r
+      <IncludeHeader>Include/Protocol/CustomizedDecompress.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugAssert">\r
+      <IncludeHeader>Include/Protocol/DebugAssert.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DebugLevel">\r
+      <IncludeHeader>Include/Protocol/DebugLevel.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="DiskInfo">\r
+      <IncludeHeader>Include/Protocol/DiskInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkDecompress">\r
+      <IncludeHeader>Include/Protocol/EdkDecompress.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ExtendedSalBootService">\r
+      <IncludeHeader>Include/Protocol/ExtendedSalBootService.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FaultTolerantWriteLite">\r
+      <IncludeHeader>Include/Protocol/FaultTolerantWriteLite.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FvbExtension">\r
+      <IncludeHeader>Include/Protocol/FvbExtension.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="GenericMemoryTest">\r
+      <IncludeHeader>Include/Protocol/GenericMemoryTest.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IsaAcpi">\r
+      <IncludeHeader>Include/Protocol/IsaAcpi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="IsaIo">\r
+      <IncludeHeader>Include/Protocol/IsaIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="LoadPe32Image">\r
+      <IncludeHeader>Include/Protocol/LoadPe32Image.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="OEMBadging">\r
+      <IncludeHeader>Include/Protocol/OEMBadging.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PciHotPlugRequest">\r
+      <IncludeHeader>Include/Protocol/PciHotPlugRequest.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Performance">\r
+      <IncludeHeader>Include/Protocol/Performance.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="Print">\r
+      <IncludeHeader>Include/Protocol/Print.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PxeDhcp4">\r
+      <IncludeHeader>Include/Protocol/PxeDhcp4.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="PxeDhcp4CallBack">\r
+      <IncludeHeader>Include/Protocol/PxeDhcp4CallBack.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="ScsiIo">\r
+      <IncludeHeader>Include/Protocol/ScsiIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="SecurityPolicy">\r
+      <IncludeHeader>Include/Protocol/SecurityPolicy.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UgaIo">\r
+      <IncludeHeader>Include/Protocol/UgaIo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="UgaSplash">\r
+      <IncludeHeader>Include/Protocol/UgaSplash.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="usbatapi">\r
+      <IncludeHeader>Include/Protocol/usbatapi.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkDxe">\r
+      <IncludeHeader>Include/EdkDxe.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkDxeCore">\r
+      <IncludeHeader>Include/EdkDxeCore.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkPeiCore">\r
+      <IncludeHeader>Include/EdkPeiCore.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="EdkPeim">\r
+      <IncludeHeader>Include/EdkPeim.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+  </IndustryStdIncludes>\r

   <MsaFiles>\r
   <MsaFiles>\r

-    <MsaFile>\r
-      <Filename>Application/HelloWorld/HelloWorld.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/IdeBus/Dxe/idebus.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/IdeBus/Dxe/idebusLite.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/PciBus/Dxe/LightPciBus.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/PciBus/Dxe/PciBus.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/PciBus/Dxe/PciBusLite.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/Uhci/Dxe/Uhci.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Pci/Undi/RuntimeDxe/Undi.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbBot/Dxe/UsbBot.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbBus/Dxe/UsbBus.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbKb/Dxe/UsbKb.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Bus/Usb/UsbMouse/Dxe/UsbMouse.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Core/Dxe/DxeMain.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Core/DxeIplPeim/DxeIpl.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Core/Pei/PeiMain.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxePrintLib/EdkDxePrintLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkDxeSalLib/EdkDxeSalLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkFvbServiceLib/EdkFvbServiceLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkGraphicsLib/EdkGraphicsLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkIfrSupportLib/EdkIfrSupportLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkMemoryStatusCodeLib/EdkMemoryStatusCodeLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkRuntimeStatusCodeLib/BsDataHubStatusCode/BsDataHubStatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkRuntimeStatusCodeLib/RtMemoryStatusCode/RtMemoryStatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkRuntimeStatusCodeLib/RtPlatformStatusCode/RtPlatformStatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkScsiLib/EdkScsiLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Library/EdkUsbLib/EdkUsbLib.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Console/ConSplitter/Dxe/ConSplitter.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Console/Terminal/Dxe/Terminal.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/DataHub/DataHub/Dxe/DataHub.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Debugger/Debugport/Dxe/DebugPort.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/DebugSupport/Dxe/DebugSupport.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Disk/DiskIo/Dxe/DiskIo.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Disk/DiskIoPartition/dxe/DiskIoPartition.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Disk/Partition/Dxe/Partition.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Disk/UnicodeCollation/English/Dxe/English.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Ebc/Dxe/Ebc.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Network/PxeBc/Dxe/BC.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Network/Snp32_64/Dxe/SNP.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Runtime/RuntimeDxe/Runtime.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Security/SecurityStub/Dxe/SecurityStub.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/StatusCode/RuntimeDxe/StatusCode.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Variable/Pei/Variable.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariable.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/Variable/RuntimeDxe/Variable.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile>\r
-      <Filename>Universal/WatchdogTimer/Dxe/WatchDogTimer.msa</Filename>\r
-    </MsaFile>\r
+    <Filename>Application/HelloWorld/HelloWorld.msa</Filename>\r
+    <Filename>Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa</Filename>\r
+    <Filename>Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa</Filename>\r
+    <Filename>Bus/Pci/IdeBus/Dxe/idebus.msa</Filename>\r
+    <Filename>Bus/Pci/PciBus/Dxe/PciBus.msa</Filename>\r
+    <Filename>Bus/Pci/Uhci/Dxe/Uhci.msa</Filename>\r
+    <Filename>Bus/Pci/Ehci/Dxe/Ehci.msa</Filename>\r
+    <Filename>Bus/Pci/Undi/RuntimeDxe/Undi.msa</Filename>\r
+    <Filename>Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa</Filename>\r
+    <Filename>Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa</Filename>\r
+    <Filename>Bus/Usb/UsbBot/Dxe/UsbBot.msa</Filename>\r
+    <Filename>Bus/Usb/UsbBus/Dxe/UsbBus.msa</Filename>\r
+    <Filename>Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa</Filename>\r
+    <Filename>Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa</Filename>\r
+    <Filename>Bus/Usb/UsbKb/Dxe/UsbKb.msa</Filename>\r
+    <Filename>Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa</Filename>\r
+    <Filename>Bus/Usb/UsbMouse/Dxe/UsbMouse.msa</Filename>\r
+    <Filename>Core/Dxe/DxeMain.msa</Filename>\r
+    <Filename>Core/DxeIplPeim/DxeIpl.msa</Filename>\r
+    <Filename>Core/DxeIplX64Peim/DxeIplX64.msa</Filename>\r
+    <Filename>Core/Pei/PeiMain.msa</Filename>\r
+    <Filename>Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa</Filename>\r
+    <Filename>Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.msa</Filename>\r
+    <Filename>Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.msa</Filename>\r
+    <Filename>Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa</Filename>\r
+    <Filename>Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.msa</Filename>\r
+    <Filename>Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.msa</Filename>\r
+    <Filename>Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa</Filename>\r
+    <Filename>Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.msa</Filename>\r
+    <Filename>Library/DxePerformanceLib/DxePerformanceLib.msa</Filename>\r
+    <Filename>Library/EdkDxePrintLib/EdkDxePrintLib.msa</Filename>\r
+    <Filename>Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa</Filename>\r
+    <Filename>Library/EdkDxeSalLib/EdkDxeSalLib.msa</Filename>\r
+    <Filename>Library/EdkFvbServiceLib/EdkFvbServiceLib.msa</Filename>\r
+    <Filename>Library/EdkGraphicsLib/EdkGraphicsLib.msa</Filename>\r
+    <Filename>Library/EdkIfrSupportLib/EdkIfrSupportLib.msa</Filename>\r
+    <Filename>Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa</Filename>\r
+    <Filename>Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.msa</Filename>\r
+    <Filename>Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.msa</Filename>\r
+    <Filename>Library/PeiPerformanceLib/PeiPerformanceLib.msa</Filename>\r
+    <Filename>Library/EdkScsiLib/EdkScsiLib.msa</Filename>\r
+    <Filename>Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa</Filename>\r
+    <Filename>Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa</Filename>\r
+    <Filename>Library/EdkUsbLib/EdkUsbLib.msa</Filename>\r
+    <Filename>Library/EdkSerialPortLibNull/EdkSerialPortLibNull.msa</Filename>\r
+    <Filename>Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa</Filename>\r
+    <Filename>Universal/Console/ConSplitter/Dxe/ConSplitter.msa</Filename>\r
+    <Filename>Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa</Filename>\r
+    <Filename>Universal/Console/Terminal/Dxe/Terminal.msa</Filename>\r
+    <Filename>Universal/DataHub/DataHub/Dxe/DataHub.msa</Filename>\r
+    <Filename>Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa</Filename>\r
+    <Filename>Universal/DevicePath/Dxe/DevicePath.msa</Filename>\r
+    <Filename>Universal/Debugger/Debugport/Dxe/DebugPort.msa</Filename>\r
+    <Filename>Universal/DebugSupport/Dxe/DebugSupport.msa</Filename>\r
+    <Filename>Universal/Disk/DiskIo/Dxe/DiskIo.msa</Filename>\r
+    <Filename>Universal/Disk/Partition/Dxe/Partition.msa</Filename>\r
+    <Filename>Universal/Disk/UnicodeCollation/English/Dxe/English.msa</Filename>\r
+    <Filename>Universal/Ebc/Dxe/Ebc.msa</Filename>\r
+    <Filename>Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa</Filename>\r
+    <Filename>Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa</Filename>\r
+    <Filename>Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa</Filename>\r
+    <Filename>Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa</Filename>\r
+    <Filename>Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa</Filename>\r
+    <Filename>Universal/Network/PxeBc/Dxe/BC.msa</Filename>\r
+    <Filename>Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa</Filename>\r
+    <Filename>Universal/Network/Snp32_64/Dxe/SNP.msa</Filename>\r
+    <Filename>Universal/PCD/Pei/Pcd.msa</Filename>\r
+    <Filename>Universal/PCD/Dxe/Pcd.msa</Filename>\r
+    <Filename>Universal/Runtime/RuntimeDxe/Runtime.msa</Filename>\r
+    <Filename>Universal/Security/SecurityStub/Dxe/SecurityStub.msa</Filename>\r
+    <Filename>Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.msa</Filename>\r
+    <Filename>Universal/UserInterface/DriverSample/DriverSample.msa</Filename>\r
+    <Filename>Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa</Filename>\r
+    <Filename>Universal/Variable/Pei/Variable.msa</Filename>\r
+    <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariable.msa</Filename>\r
+    <Filename>Universal/Variable/RuntimeDxe/Variable.msa</Filename>\r
+    <Filename>Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa</Filename>\r
+    <Filename>Universal/WatchdogTimer/Dxe/WatchDogTimer.msa</Filename>\r
+    <Filename>Universal/StatusCode/Pei/PeiStatusCode.msa</Filename>\r
+    <Filename>Universal/StatusCode/Dxe/DxeStatusCode.msa</Filename>\r

   </MsaFiles>\r
   <PackageHeaders>\r
   </MsaFiles>\r
   <PackageHeaders>\r

-    <IncludeHeader ModuleType="SEC">Include/EdkPeim.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="PEI_CORE">Include/EdkPeiCore.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="PEIM">Include/EdkPeim.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_CORE">Include/EdkDxeCore.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_DRIVER">Include/EdkDxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_RUNTIME_DRIVER">Include/EdkDxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludeHeader>\r
-    <IncludeHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludeHeader>\r
+    <IncludePkgHeader ModuleType="SEC">Include/EdkPeim.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="PEI_CORE">Include/EdkPeiCore.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="PEIM">Include/EdkPeim.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_CORE">Include/EdkDxeCore.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
+    <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>\r

   </PackageHeaders>\r
   <GuidDeclarations>\r
   </PackageHeaders>\r
   <GuidDeclarations>\r

+    <Entry Name="GenericPlatformTokenSpace">\r
+      <C_Name>gEfiGenericPlatformTokenSpaceGuid</C_Name>\r
+      <GuidValue>18D15EA6-9E14-40a1-B39C-59C44DA9D891</GuidValue>\r
+      <HelpText>\r
+        This is the token space GUID for platform generic PCD definitions.\r
+        Now FlashLayout and Platform CPU belong to this space.\r
+      </HelpText>      \r
+    </Entry> \r
+    <Entry Name="EdkModulePkgTokenSpace">\r
+      <C_Name>gEfiEdkModulePkgTokenSpaceGuid</C_Name>\r
+      <GuidValue>8CC4092F-F60E-46d1-B41C-1E761DF50582</GuidValue>\r
+      <HelpText>All PCD define in EdkModulePkg is in this token space scope</HelpText>\r
+    </Entry>\r
+    <Entry Name="PcdDataBaseHob">\r
+      <C_Name>gPcdDataBaseHobGuid</C_Name>\r
+      <GuidValue>EA296D92-0B69-423C-8C28-33B4E0A91268</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r
+    <Entry Name="PcdPeiCallbackFnTable">\r
+      <C_Name>gPcdPeiCallbackFnTableHobGuid</C_Name>\r
+      <GuidValue>C625F4B2-EA09-4675-82D7-BA3682157A14</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="PeiPeCoffLoader">\r
       <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>\r
     <Entry Name="PeiPeCoffLoader">\r
       <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>\r

-      <Guid>0xd8117cff, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>D8117CFF-94A6-11D4-9A3A-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="FlashMapHob">\r
       <C_Name>gEfiFlashMapHobGuid</C_Name>\r
     </Entry>\r
     <Entry Name="FlashMapHob">\r
       <C_Name>gEfiFlashMapHobGuid</C_Name>\r

-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>\r
+      <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeString">\r
       <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeString">\r
       <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>\r

-      <Guid>0x92D11080, 0x496F, 0x4D95, 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A</Guid>\r
+      <GuidValue>92D11080-496F-4D95-BE7E-037488382B0A</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeDebug">\r
       <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeDebug">\r
       <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>\r

-      <Guid>0x9A4E9246, 0xD553, 0x11D5, 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9</Guid>\r
+      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeAssert">\r
       <C_Name>gEfiStatusCodeDataTypeAssertGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeAssert">\r
       <C_Name>gEfiStatusCodeDataTypeAssertGuid</C_Name>\r

-      <Guid>0xDA571595, 0x4D99, 0x487C, 0x82, 0x7C, 0x26, 0x22, 0x67, 0x7D, 0x33, 0x07</Guid>\r
+      <GuidValue>DA571595-4D99-487C-827C-2622677D3307</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeExceptionHandler">\r
       <C_Name>gEfiStatusCodeDataTypeExceptionHandlerGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeExceptionHandler">\r
       <C_Name>gEfiStatusCodeDataTypeExceptionHandlerGuid</C_Name>\r

-      <Guid>0x3BC2BD12, 0xAD2E, 0x11D5, 0x87, 0xDD, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9</Guid>\r
+      <GuidValue>3BC2BD12-AD2E-11D5-87DD-00062945C3B9</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeError">\r
       <C_Name>gEfiStatusCodeDataTypeErrorGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeError">\r
       <C_Name>gEfiStatusCodeDataTypeErrorGuid</C_Name>\r

-      <Guid>0xAB359CE3, 0x99B3, 0xAE18, 0xC8, 0x9D, 0x95, 0xD3, 0xB0, 0x72, 0xE1, 0x9B</Guid>\r
+      <GuidValue>AB359CE3-99B3-AE18-C89D-95D3B072E19B</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeDataTypeProgressCode">\r
       <C_Name>gEfiStatusCodeDataTypeProgressCodeGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeDataTypeProgressCode">\r
       <C_Name>gEfiStatusCodeDataTypeProgressCodeGuid</C_Name>\r

-      <Guid>0xA356AB39, 0x35C4, 0x35DA, 0xB3, 0x7A, 0xF8, 0xEA, 0x9E, 0x8B, 0x36, 0xA3</Guid>\r
+      <GuidValue>A356AB39-35C4-35DA-B37A-F8EA9E8B36A3</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeSpecificData">\r
       <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeSpecificData">\r
       <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>\r

-      <Guid>0x335984bd, 0xe805, 0x409a, 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6</Guid>\r
+      <GuidValue>335984BD-E805-409A-B8F8-D27ECE5FF7A6</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="SystemNvDataHob">\r
       <C_Name>gEfiSystemNvDataHobGuid</C_Name>\r
     </Entry>\r
     <Entry Name="SystemNvDataHob">\r
       <C_Name>gEfiSystemNvDataHobGuid</C_Name>\r

-      <Guid>0xd6e5092d, 0xc7b2, 0x4872, 0xaf, 0x66, 0xfd, 0xc0, 0xe6, 0xf9, 0x5e, 0x78</Guid>\r
+      <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="SystemNvDataFv">\r
       <C_Name>gEfiSystemNvDataFvGuid</C_Name>\r
     </Entry>\r
     <Entry Name="SystemNvDataFv">\r
       <C_Name>gEfiSystemNvDataFvGuid</C_Name>\r

-      <Guid>0xfff12b8d, 0x7696, 0x4c8b, 0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50</Guid>\r
+      <GuidValue>FFF12B8D-7696-4C8B-A985-2747075B4F50</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DiskInfoIde">\r
       <C_Name>gEfiDiskInfoIdeInterfaceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DiskInfoIde">\r
       <C_Name>gEfiDiskInfoIdeInterfaceGuid</C_Name>\r

-      <Guid>0x5e948fe3, 0x26d3, 0x42b5, 0xaf, 0x17, 0x61, 0x02, 0x87, 0x18, 0x8d, 0xec</Guid>\r
+      <GuidValue>5E948FE3-26D3-42B5-AF17-610287188DEC</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DiskInfoScsi">\r
       <C_Name>gEfiDiskInfoScsiInterfaceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DiskInfoScsi">\r
       <C_Name>gEfiDiskInfoScsiInterfaceGuid</C_Name>\r

-      <Guid>0x8f74baa, 0xea36, 0x41d9, 0x95, 0x21, 0x21, 0xa7, 0x0f, 0x87, 0x80, 0xbc</Guid>\r
+      <GuidValue>08F74BAA-EA36-41D9-9521-21A70F8780BC</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DiskInfoUsb">\r
       <C_Name>gEfiDiskInfoUsbInterfaceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DiskInfoUsb">\r
       <C_Name>gEfiDiskInfoUsbInterfaceGuid</C_Name>\r

-      <Guid>0xcb871572, 0xc11a, 0x47b5, 0xb4, 0x92, 0x67, 0x5e, 0xaf, 0xa7, 0x77, 0x27</Guid>\r
+      <GuidValue>CB871572-C11A-47B5-B492-675EAFA77727</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="AlternateFvBlock">\r
       <C_Name>gEfiAlternateFvBlockGuid</C_Name>\r
     </Entry>\r
     <Entry Name="AlternateFvBlock">\r
       <C_Name>gEfiAlternateFvBlockGuid</C_Name>\r

-      <Guid>0xf496922d, 0x172f, 0x4bbc, 0xa1, 0xeb, 0x0e, 0xeb, 0x94, 0x9c, 0x34, 0x86</Guid>\r
+      <GuidValue>F496922D-172F-4BBC-A1EB-0EEB949C3486</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ConsoleInDevice">\r
       <C_Name>gEfiConsoleInDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ConsoleInDevice">\r
       <C_Name>gEfiConsoleInDeviceGuid</C_Name>\r

-      <Guid>0xd3b36f2b, 0xd551, 0x11d4, 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>D3B36F2B-D551-11D4-9A46-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ConsoleOutDevice">\r
       <C_Name>gEfiConsoleOutDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ConsoleOutDevice">\r
       <C_Name>gEfiConsoleOutDeviceGuid</C_Name>\r

-      <Guid>0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>D3B36F2C-D551-11D4-9A46-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StandardErrorDevice">\r
       <C_Name>gEfiStandardErrorDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StandardErrorDevice">\r
       <C_Name>gEfiStandardErrorDeviceGuid</C_Name>\r

-      <Guid>0xd3b36f2d, 0xd551, 0x11d4, 0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>D3B36F2D-D551-11D4-9A46-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="HotPlugDevice">\r
       <C_Name>gEfiHotPlugDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="HotPlugDevice">\r
       <C_Name>gEfiHotPlugDeviceGuid</C_Name>\r

-      <Guid>0x220ac432, 0x1d43, 0x49e5, 0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b</Guid>\r
+      <GuidValue>220AC432-1D43-49E5-A74F-4C9DA67AD23B</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PrimaryStandardErrorDevice">\r
       <C_Name>gEfiPrimaryStandardErrorDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PrimaryStandardErrorDevice">\r
       <C_Name>gEfiPrimaryStandardErrorDeviceGuid</C_Name>\r

-      <Guid>0x5a68191b, 0x9b97, 0x4752, 0x99, 0x46, 0xe3, 0x6a, 0x5d, 0xa9, 0x42, 0xb1</Guid>\r
+      <GuidValue>5A68191B-9B97-4752-9946-E36A5DA942B1</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PrimaryConsoleInDevice">\r
       <C_Name>gEfiPrimaryConsoleInDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PrimaryConsoleInDevice">\r
       <C_Name>gEfiPrimaryConsoleInDeviceGuid</C_Name>\r

-      <Guid>0xe451dcbe, 0x96a1, 0x4729, 0xa5, 0xcf, 0x6b, 0x9c, 0x2c, 0xff, 0x47, 0xfd</Guid>\r
+      <GuidValue>E451DCBE-96A1-4729-A5CF-6B9C2CFF47FD</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PrimaryConsoleOutDevice">\r
       <C_Name>gEfiPrimaryConsoleOutDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PrimaryConsoleOutDevice">\r
       <C_Name>gEfiPrimaryConsoleOutDeviceGuid</C_Name>\r

-      <Guid>0x62bdf38a, 0xe3d5, 0x492c, 0x95, 0x0c, 0x23, 0xa7, 0xf6, 0x6e, 0x67, 0x2e</Guid>\r
+      <GuidValue>62BDF38A-E3D5-492C-950C-23A7F66E672E</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="Bmp">\r
       <C_Name>gEfiDefaultBmpLogoGuid</C_Name>\r
     </Entry>\r
     <Entry Name="Bmp">\r
       <C_Name>gEfiDefaultBmpLogoGuid</C_Name>\r

-      <Guid>0x7BB28B99, 0x61BB, 0x11d5, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D</Guid>\r
+      <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="BootState">\r
       <C_Name>gEfiBootStateGuid</C_Name>\r
     </Entry>\r
     <Entry Name="BootState">\r
       <C_Name>gEfiBootStateGuid</C_Name>\r

-      <Guid>0x60b5e939, 0xfcf, 0x4227, 0xba, 0x83, 0x6b, 0xbe, 0xd4, 0x5b, 0xc0, 0xe3</Guid>\r
+      <GuidValue>60B5E939-0FCF-4227-BA83-6BBED45BC0E3</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ShellFile">\r
       <C_Name>gEfiShellFileGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ShellFile">\r
       <C_Name>gEfiShellFileGuid</C_Name>\r

-      <Guid>0xc57ad6b7, 0x0515, 0x40a8, 0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37</Guid>\r
+      <GuidValue>C57AD6B7-0515-40A8-9D21-551652854E37</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="MiniShellFile">\r
       <C_Name>gEfiMiniShellFileGuid</C_Name>\r
     </Entry>\r
     <Entry Name="MiniShellFile">\r
       <C_Name>gEfiMiniShellFileGuid</C_Name>\r

-      <Guid>0x86ad232b, 0xd33a, 0x465c, 0xbf, 0x5f, 0x41, 0x37, 0x0b, 0xa9, 0x2f, 0xe2</Guid>\r
+      <GuidValue>86AD232B-D33A-465C-BF5F-41370BA92FE2</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCode">\r
       <C_Name>gEfiStatusCodeGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCode">\r
       <C_Name>gEfiStatusCodeGuid</C_Name>\r

-      <Guid>0xd083e94c, 0x6560, 0x42e4, 0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a</Guid>\r
+      <GuidValue>D083E94C-6560-42E4-B6D4-2DF75ADF6A2A</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PciOptionRomTable">\r
       <C_Name>gEfiPciOptionRomTableGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PciOptionRomTable">\r
       <C_Name>gEfiPciOptionRomTableGuid</C_Name>\r

-      <Guid>0x7462660f, 0x1cbd, 0x48da, 0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c</Guid>\r
+      <GuidValue>7462660F-1CBD-48DA-AD11-91717913831C</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PciHotplugDevice">\r
       <C_Name>gEfiPciHotplugDeviceGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PciHotplugDevice">\r
       <C_Name>gEfiPciHotplugDeviceGuid</C_Name>\r

-      <Guid>0x0b280816, 0x52e7, 0x4e51, 0xaa, 0x57, 0x11, 0xbd, 0x41, 0xcb, 0xef, 0xc3</Guid>\r
+      <GuidValue>0B280816-52E7-4E51-AA57-11BD41CBEFC3</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="MemoryTypeInformation">\r
       <C_Name>gEfiMemoryTypeInformationGuid</C_Name>\r
     </Entry>\r
     <Entry Name="MemoryTypeInformation">\r
       <C_Name>gEfiMemoryTypeInformationGuid</C_Name>\r

-      <Guid>0x4c19049f, 0x4137, 0x4dd3, 0x9c, 0x10, 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa</Guid>\r
+      <GuidValue>4C19049F-4137-4DD3-9C10-8B97A83FFDFA</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="CapsuleVendor">\r
       <C_Name>gEfiCapsuleVendorGuid</C_Name>\r
     </Entry>\r
     <Entry Name="CapsuleVendor">\r
       <C_Name>gEfiCapsuleVendorGuid</C_Name>\r

-      <Guid>0x711C703F, 0xC285, 0x4B10, 0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2</Guid>\r
+      <GuidValue>711C703F-C285-4B10-A3B0-36ECBD3C8BE2</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="CompatibleMemoryTested">\r
       <C_Name>gEfiCompatibleMemoryTestedGuid</C_Name>\r
     </Entry>\r
     <Entry Name="CompatibleMemoryTested">\r
       <C_Name>gEfiCompatibleMemoryTestedGuid</C_Name>\r

-      <Guid>0x64c475ef, 0x344b, 0x492c, 0x93, 0xad, 0xab, 0x9e, 0xb4, 0x39, 0x50, 0x4</Guid>\r
+      <GuidValue>64C475EF-344B-492C-93AD-AB9EB4395004</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r
+    <Entry Name="PeiPerformanceHob">\r
+      <C_Name>gPeiPerformanceHobGuid</C_Name>\r
+      <GuidValue>EC4DF5AF-4395-4CC9-94DE-77506D12C7B8</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r
+    <Entry Name="MemoryStatusCodeRecord">\r
+      <C_Name>gMemoryStatusCodeRecordGuid</C_Name>\r
+      <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     </Entry>\r
   </GuidDeclarations>\r
   <ProtocolDeclarations>\r

+    <Entry Name="Capsule">\r
+      <C_Name>gEfiCapsuleArchProtocolGuid</C_Name>\r
+      <GuidValue>5053697E-2EBC-4819-90D9-0580DEEE5754</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="CustomizedDecompress">\r
       <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>\r
     <Entry Name="CustomizedDecompress">\r
       <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>\r

-      <Guid>0x9a44198e, 0xa4a2, 0x44e6, 0x8a, 0x1f, 0x39, 0xbe, 0xfd, 0xac, 0x89, 0x6f</Guid>\r
+      <GuidValue>9A44198E-A4A2-44E6-8A1F-39BEFDAC896F</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DebugLevel">\r
       <C_Name>gEfiDebugLevelProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DebugLevel">\r
       <C_Name>gEfiDebugLevelProtocolGuid</C_Name>\r

-      <Guid>0x8d4c62e6, 0xcd98, 0x4e1d, 0xad, 0x6e, 0x48, 0xbb, 0x50, 0xd2, 0x9f, 0xf7</Guid>\r
+      <GuidValue>8D4C62E6-CD98-4E1D-AD6E-48BB50D29FF7</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="TianoDecompress">\r
       <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="TianoDecompress">\r
       <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>\r

-      <Guid>0xe84cf29c, 0x191f, 0x4eae, 0x96, 0xe1, 0xf4, 0x6a, 0xec, 0xea, 0xea, 0x0b</Guid>\r
+      <GuidValue>E84CF29C-191F-4EAE-96E1-F46AECEAEA0B</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="LoadPeImage">\r
       <C_Name>gEfiLoadPeImageProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="LoadPeImage">\r
       <C_Name>gEfiLoadPeImageProtocolGuid</C_Name>\r

-      <Guid>0x5cb5c776, 0x60d5, 0x45ee, 0x88, 0x3c, 0x45, 0x27, 0x08, 0xcd, 0x74, 0x3f</Guid>\r
+      <GuidValue>5CB5C776-60D5-45EE-883C-452708CD743F</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="Print">\r
       <C_Name>gEfiPrintProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="Print">\r
       <C_Name>gEfiPrintProtocolGuid</C_Name>\r

-      <Guid>0xdf2d868e, 0x32fc, 0x4cf0, 0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0</Guid>\r
+      <GuidValue>DF2D868E-32FC-4CF0-8E6B-FFD95D1343D0</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="GenericMemTest">\r
       <C_Name>gEfiGenericMemTestProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="GenericMemTest">\r
       <C_Name>gEfiGenericMemTestProtocolGuid</C_Name>\r

-      <Guid>0x309de7f1, 0x7f5e, 0x4ace, 0xb4, 0x9c, 0x53, 0x1b, 0xe5, 0xaa, 0x95, 0xef</Guid>\r
+      <GuidValue>309DE7F1-7F5E-4ACE-B49C-531BE5AA95EF</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DiskInfo">\r
       <C_Name>gEfiDiskInfoProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DiskInfo">\r
       <C_Name>gEfiDiskInfoProtocolGuid</C_Name>\r

-      <Guid>0xd432a67f, 0x14dc, 0x484b, 0xb3, 0xbb, 0x3f, 0x02, 0x91, 0x84, 0x93, 0x27</Guid>\r
+      <GuidValue>D432A67F-14DC-484B-B3BB-3F0291849327</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="FvbExtension">\r
       <C_Name>gEfiFvbExtensionProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="FvbExtension">\r
       <C_Name>gEfiFvbExtensionProtocolGuid</C_Name>\r

-      <Guid>0x53a4c71b, 0xb581, 0x4170, 0x91, 0xb3, 0x8d, 0xb8, 0x7a, 0x4b, 0x5c, 0x46</Guid>\r
+      <GuidValue>53A4C71B-B581-4170-91B3-8DB87A4B5C46</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="FaultTolerantWriteLite">\r
       <C_Name>gEfiFaultTolerantWriteLiteProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="FaultTolerantWriteLite">\r
       <C_Name>gEfiFaultTolerantWriteLiteProtocolGuid</C_Name>\r

-      <Guid>0x3f557189, 0x8dae, 0x45ae, 0xa0, 0xb3, 0x2b, 0x99, 0xca, 0x7a, 0xa7, 0xa0</Guid>\r
+      <GuidValue>3F557189-8DAE-45AE-A0B3-2B99CA7AA7A0</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ConsoleControl">\r
       <C_Name>gEfiConsoleControlProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ConsoleControl">\r
       <C_Name>gEfiConsoleControlProtocolGuid</C_Name>\r

-      <Guid>0xf42f7782, 0x12e, 0x4c12, 0x99, 0x56, 0x49, 0xf9, 0x43, 0x04, 0xf7, 0x21</Guid>\r
+      <GuidValue>F42F7782-012E-4C12-9956-49F94304F721</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="OEMBadging">\r
       <C_Name>gEfiOEMBadgingProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="OEMBadging">\r
       <C_Name>gEfiOEMBadgingProtocolGuid</C_Name>\r

-      <Guid>0x170e13c0, 0xbf1b, 0x4218, 0x87, 0x1d, 0x2a, 0xbd, 0xc6, 0xf8, 0x87, 0xbc</Guid>\r
+      <GuidValue>170E13C0-BF1B-4218-871D-2ABDC6F887BC</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="UgaSplash">\r
       <C_Name>gEfiUgaSplashProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="UgaSplash">\r
       <C_Name>gEfiUgaSplashProtocolGuid</C_Name>\r

-      <Guid>0xa45b3a0d, 0x2e55, 0x4c03, 0xad, 0x9c, 0x27, 0xd4, 0x82, 0x0b, 0x50, 0x7e</Guid>\r
+      <GuidValue>A45B3A0D-2E55-4C03-AD9C-27D4820B507E</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="AcpiS3Save">\r
       <C_Name>gEfiAcpiS3SaveProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="AcpiS3Save">\r
       <C_Name>gEfiAcpiS3SaveProtocolGuid</C_Name>\r

-      <Guid>0x125f2de1, 0xfb85, 0x440c, 0xa5, 0x4c, 0x4d, 0x99, 0x35, 0x8a, 0x8d, 0x38</Guid>\r
-    </Entry>\r
-    <Entry Name="Performance">\r
-      <C_Name>gEfiPerformanceProtocolGuid</C_Name>\r
-      <Guid>0xFFECFFFF, 0x923C, 0x14d2, 0x9E, 0x3F, 0x22, 0xA0, 0xC9, 0x69, 0x56, 0x3B</Guid>\r
+      <GuidValue>125F2DE1-FB85-440C-A54C-4D99358A8D38</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PxeDhcp4">\r
       <C_Name>gEfiPxeDhcp4ProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PxeDhcp4">\r
       <C_Name>gEfiPxeDhcp4ProtocolGuid</C_Name>\r

-      <Guid>0x03c4e624, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x29, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>03C4E624-AC28-11D3-9A2D-0090293FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PxeDhcp4Callback">\r
       <C_Name>gEfiPxeDhcp4CallbackProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PxeDhcp4Callback">\r
       <C_Name>gEfiPxeDhcp4CallbackProtocolGuid</C_Name>\r

-      <Guid>0xc1544c01, 0x92a4, 0x4198, 0x8a, 0x84, 0x77, 0x85, 0x83, 0xc2, 0x36, 0x21</Guid>\r
+      <GuidValue>C1544C01-92A4-4198-8A84-778583C23621</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="UgaIo">\r
       <C_Name>gEfiUgaIoProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="UgaIo">\r
       <C_Name>gEfiUgaIoProtocolGuid</C_Name>\r

-      <Guid>0x61a4d49e, 0x6f68, 0x4f1b, 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0x0b, 0x07, 0xa2</Guid>\r
+      <GuidValue>61A4D49E-6F68-4F1B-B922-A86EED0B07A2</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="DebugAssert">\r
       <C_Name>gEfiDebugAssertProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="DebugAssert">\r
       <C_Name>gEfiDebugAssertProtocolGuid</C_Name>\r

-      <Guid>0xbe499c92, 0x7d4b, 0x11d4, 0xbc, 0xee, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>\r
+      <GuidValue>BE499C92-7D4B-11D4-BCEE-0080C73C8881</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="UsbAtapi">\r
       <C_Name>gEfiUsbAtapiProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="UsbAtapi">\r
       <C_Name>gEfiUsbAtapiProtocolGuid</C_Name>\r

-      <Guid>0x2B2F68DA, 0x0CD2, 0x44cf, 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75</Guid>\r
+      <GuidValue>2B2F68DA-0CD2-44CF-8E8B-BBA20B1B5B75</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="PciHotPlugRequest">\r
       <C_Name>gEfiPciHotPlugRequestProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="PciHotPlugRequest">\r
       <C_Name>gEfiPciHotPlugRequestProtocolGuid</C_Name>\r

-      <Guid>0x19cb87ab, 0x2cb9, 0x4665, 0x83, 0x60, 0xdd, 0xcf, 0x60, 0x54, 0xf7, 0x9d</Guid>\r
+      <GuidValue>19CB87AB-2CB9-4665-8360-DDCF6054F79D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ExtendedSalBootService">\r
       <C_Name>gEfiExtendedSalBootServiceProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ExtendedSalBootService">\r
       <C_Name>gEfiExtendedSalBootServiceProtocolGuid</C_Name>\r

-      <Guid>0xde0ee9a4, 0x3c7a, 0x44f2, 0xb7, 0x8b, 0xe3, 0xcc, 0xd6, 0x9c, 0x3a, 0xf7</Guid>\r
+      <GuidValue>DE0EE9A4-3C7A-44F2-B78B-E3CCD69C3AF7</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ExtendedSalVariableServices">\r
       <C_Name>gEfiExtendedSalVariableServicesProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ExtendedSalVariableServices">\r
       <C_Name>gEfiExtendedSalVariableServicesProtocolGuid</C_Name>\r

-      <Guid>0x4ecb6c53, 0xc641, 0x4370, 0x8c, 0xb2, 0x3b, 0x0e, 0x49, 0x6e, 0x83, 0x78</Guid>\r
+      <GuidValue>4ECB6C53-C641-4370-8CB2-3B0E496E8378</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="ExtendedSalStatusCodeServices">\r
       <C_Name>gEfiExtendedSalStatusCodeServicesProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="ExtendedSalStatusCodeServices">\r
       <C_Name>gEfiExtendedSalStatusCodeServicesProtocolGuid</C_Name>\r

-      <Guid>0x00dbd91d, 0x55e9, 0x420f, 0x96, 0x39, 0x5e, 0x9f, 0x84, 0x37, 0xb4, 0x4f</Guid>\r
+      <GuidValue>00DBD91D-55E9-420F-9639-5E9F8437B44F</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="IsaIo">\r
       <C_Name>gEfiIsaIoProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="IsaIo">\r
       <C_Name>gEfiIsaIoProtocolGuid</C_Name>\r

-      <Guid>0x7ee2bd44, 0x3da0, 0x11d4, 0x9a, 0x38, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+      <GuidValue>7EE2BD44-3DA0-11D4-9A38-0090273FC14D</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="IsaAcpi">\r
       <C_Name>gEfiIsaAcpiProtocolGuid</C_Name>\r
     </Entry>\r
     <Entry Name="IsaAcpi">\r
       <C_Name>gEfiIsaAcpiProtocolGuid</C_Name>\r

-      <Guid>0x64a892dc, 0x5561, 0x4536, 0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55</Guid>\r
+      <GuidValue>64A892DC-5561-4536-92C7-799BFC183355</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r
+    <Entry Name="Performance">\r
+      <C_Name>gPerformanceProtocolGuid</C_Name>\r
+      <GuidValue>76B6BDFA-2ACD-4462-9E3F-CB58C969D937</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r
+    <Entry Name="ScsiIo">\r
+      <C_Name>gEfiScsiIoProtocolGuid</C_Name>\r
+      <GuidValue>403CD195-F233-48EC-8455-B2E52F1D9E02</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
   </ProtocolDeclarations>\r
   <PpiDeclarations>\r
     <Entry Name="PeiInMemory">\r
       <C_Name>gPeiInMemoryGuid</C_Name>\r
     </Entry>\r
   </ProtocolDeclarations>\r
   <PpiDeclarations>\r
     <Entry Name="PeiInMemory">\r
       <C_Name>gPeiInMemoryGuid</C_Name>\r

-      <Guid>0x643b8786, 0xb417, 0x48d2, 0x8f, 0x5e, 0x78, 0x19, 0x93, 0x1c, 0xae, 0xd8</Guid>\r
+      <GuidValue>643B8786-B417-48D2-8F5E-7819931CAED8</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="FlashMap">\r
       <C_Name>gPeiFlashMapPpiGuid</C_Name>\r
     </Entry>\r
     <Entry Name="FlashMap">\r
       <C_Name>gPeiFlashMapPpiGuid</C_Name>\r

-      <Guid>0xf34c2fa0, 0xde88, 0x4270, 0x84, 0x14, 0x96, 0x12, 0x22, 0xf4, 0x52, 0x1c</Guid>\r
+      <GuidValue>F34C2FA0-DE88-4270-8414-961222F4521C</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="BaseMemoryTest">\r
       <C_Name>gPeiBaseMemoryTestPpiGuid</C_Name>\r
     </Entry>\r
     <Entry Name="BaseMemoryTest">\r
       <C_Name>gPeiBaseMemoryTestPpiGuid</C_Name>\r

-      <Guid>0xb6ec423c, 0x21d2, 0x490d, 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74</Guid>\r
+      <GuidValue>B6EC423C-21D2-490D-85C6-DD5864EAA674</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
     <Entry Name="StatusCodeMemory">\r
       <C_Name>gPeiStatusCodeMemoryPpiGuid</C_Name>\r
     </Entry>\r
     <Entry Name="StatusCodeMemory">\r
       <C_Name>gPeiStatusCodeMemoryPpiGuid</C_Name>\r

-      <Guid>0x26f8ab01, 0xd3cd, 0x489c, 0x98, 0x4f, 0xdf, 0xde, 0xf7, 0x68, 0x39, 0x5b</Guid>\r
+      <GuidValue>26F8AB01-D3CD-489C-984F-DFDEF768395B</GuidValue>\r
+      <HelpText/>\r

     </Entry>\r
   </PpiDeclarations>\r
     </Entry>\r
   </PpiDeclarations>\r

-  <PcdDefinitions>\r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-      <Token>0x00000001</Token>\r
+  <PcdDeclarations>\r
+    <PcdEntry>\r
+      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
+      <Token>0x0001000f</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <DatumType>UINT32</DatumType>\r
       <DatumType>UINT32</DatumType>\r

-      <DefaultValue>1000000</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <HelpText>The maximum number of callback function, which will be triggered when \r
+        a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-      <Token>0x00000002</Token>\r
+    <PcdEntry>\r
+      <C_Name>PcdVpdBaseAddress</C_Name>\r
+      <Token>0x00010010</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <DatumType>UINT32</DatumType>\r
       <DatumType>UINT32</DatumType>\r

-      <DefaultValue>1000000</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <HelpText>The base address of the VPD (Vital Product Data) region. It is \r
+        normally a region reserved on flash.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-      <Token>0x00000003</Token>\r
+    <PcdEntry>\r
+      <C_Name>PcdSupportUpdateCapsuleRest</C_Name>\r
+      <Token>0x00010020</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <HelpText>Indicate whether platform can support update capsule across a system reset</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdMaxSizePopulateCapsule</C_Name>\r
+      <Token>0x00010021</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <DatumType>UINT32</DatumType>\r
       <DatumType>UINT32</DatumType>\r

-      <DefaultValue>1000000</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <HelpText>Indicate the max size the platform can support in case of populated capsules</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdSpinLockTimeout</C_Name>\r
-      <Token>0x00000004</Token>\r
+    <PcdEntry>\r
+      <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>\r
+      <Token>0x00010022</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

       <DatumType>UINT32</DatumType>\r
       <DatumType>UINT32</DatumType>\r

-      <DefaultValue>10000000</DefaultValue>\r
+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <HelpText>Indicate the max size the platform can support in case of non-populated capsules</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0x0f</DefaultValue>\r
+    <PcdEntry>\r
+      <C_Name>PcdPeiPcdDatabaseTraverseEnabled</C_Name>\r
+      <Token>0x00010020</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>TRUE</DefaultValue>\r
+      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database \r
+        traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <DefaultValue>0x80000000</DefaultValue>\r
+    <PcdEntry>\r
+      <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>\r
+      <Token>0x00010021</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>TRUE</DefaultValue>\r
+      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database \r
+        traverse capability. Disable it can reduce the size of final image generated.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseSerial</C_Name>\r
+      <Token>0x00010022</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>This feature flag can be used to enable or disable report staus code to serial I/O. Disable it can reduce the size of final image generated.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseMemory</C_Name>\r
+      <Token>0x00010023</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>This feature flag can be used to enable or disable save statuc code in GUID'ed HOB. Disable it can reduce the size of final image generated.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseOEM</C_Name>\r
+      <Token>0x00010024</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>This feature flag can be used to enable or disable send status code to OEM device. Disable it can reduce the size of final image generated.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeMemorySize</C_Name>\r
+      <Token>0x00010025</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>UINT16</DatumType>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r
+      <DefaultValue>4</DefaultValue>\r
+      <HelpText>kbytes size of GUID'ed HOB, if the GUID'ed HOB is full, create new GUID'ed HOB with this size.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseEfiSerial</C_Name>\r
+      <Token>0x00010026</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to switch on/off report status code through serial DXE.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseHardSerial</C_Name>\r
+      <Token>0x00010027</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to switch on/off report status code to serial device.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>\r
+      <Token>0x00010028</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to switch on/off save status code in runtime memory.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeUseDataHub</C_Name>\r
+      <Token>0x00010029</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to switch on/off log status code in data hub.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeReplayInSerial</C_Name>\r
+      <Token>0x0001002a</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>\r
+      <Token>0x0001002b</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0x07</DefaultValue>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeReplayInDataHub</C_Name>\r
+      <Token>0x0001002c</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0xAF</DefaultValue>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeReplayInOEM</C_Name>\r
+      <Token>0x0001002d</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>BOOLEAN</DatumType>\r
+      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
+      <DefaultValue>FALSE</DefaultValue>\r
+      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0xAF</DefaultValue>\r
-    </PcdEntry>    \r
-    <PcdEntry ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
-      <Token>0x00000009</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <DefaultValue>0</DefaultValue>\r
+    <PcdEntry>\r
+      <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>\r
+      <Token>0x0001002e</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>UINT16</DatumType>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r
+      <DefaultValue>4</DefaultValue>\r
+      <HelpText>kbytes size of runtime memory.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-  </PcdDefinitions>\r
+  </PcdDeclarations>\r

 </PackageSurfaceArea>\r
 </PackageSurfaceArea>\r