Do not clear debug register. New performance code does not use Debug register to...

[mirror_edk2.git] / MdePkg / MdePkg.fpd

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 911413554664ebed29fc3b0e4042ff2989da60dc..db7b2fe924025e2d55ec1ad8be49e612264b2054 100644 (file)
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -1,15 +1,5 @@
 <?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
-<PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <PlatformHeader>\r
     <PlatformName>MdePkgAll</PlatformName>\r
     <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>\r
@@ -17,20 +7,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Abstract>EFI/Tiano MdePkg Package</Abstract>\r
     <Description>This FPD file is used for Package Level build.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
-    <License>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
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
   <PlatformDefinitions>\r
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BuildTargets>DEBUG</BuildTargets>\r
+    <BuildTargets>DEBUG RELEASE</BuildTargets>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
-    <OutputDirectory/>\r
+    <OutputDirectory>Build/Mde</OutputDirectory>\r
+    <SkuInfo>\r
+      <UiSkuName SkuID="0">DEFAULT</UiSkuName>\r
+    </SkuInfo>\r
   </PlatformDefinitions>\r
   <Flash>\r
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>\r
@@ -41,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -49,7 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -57,7 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -65,207 +58,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-          <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-          <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdSpinLockTimeout</C_Name>\r
-          <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-          <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-          <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-          <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdSpinLockTimeout</C_Name>\r
-          <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-          <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-          <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-          <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdSpinLockTimeout</C_Name>\r
-          <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-          <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-          <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-          <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdSpinLockTimeout</C_Name>\r
-          <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-          <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-          <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-          <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>1000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdSpinLockTimeout</C_Name>\r
-          <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10000000</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-          <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -307,12 +100,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT64</DatumType>\r
+          <MaxDatumSize>8</MaxDatumSize>\r
+          <Value>0x0ffffc000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdFSBClock</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -341,7 +154,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -349,7 +162,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -357,7 +170,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -373,7 +186,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -391,16 +204,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8987081e-daeb-44a9-8bef-a195b22d9417">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdPciExpressBaseAddress</C_Name>\r
-          <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT64</DatumType>\r
-          <MaxDatumSize>8</MaxDatumSize>\r
-          <Value>0xE0000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -423,7 +226,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT64</DatumType>\r
           <MaxDatumSize>8</MaxDatumSize>\r
           <Value>0xE0000000</Value>\r
@@ -434,12 +237,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4c38a173-b317-4f29-a7bf-1cc7e10ccb10">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="51C4C059-67F0-4e3c-9A55-FF42A8291C8C">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -481,7 +278,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -497,7 +294,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -505,7 +302,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -513,7 +310,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -583,23 +380,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x07</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-          <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -615,7 +396,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -631,7 +412,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -647,7 +428,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -683,6 +464,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -705,7 +504,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -713,7 +512,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -721,7 +520,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -737,7 +536,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -745,7 +544,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -753,7 +552,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -823,7 +622,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -831,7 +630,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -839,7 +638,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -847,7 +646,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -882,13 +681,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdFSBClock</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -917,7 +720,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -925,7 +728,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -933,7 +736,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -949,7 +752,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -967,16 +770,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8987081e-daeb-44a9-8bef-a195b22d9417">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdPciExpressBaseAddress</C_Name>\r
-          <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT64</DatumType>\r
-          <MaxDatumSize>8</MaxDatumSize>\r
-          <Value>0xE0000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -999,7 +792,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT64</DatumType>\r
           <MaxDatumSize>8</MaxDatumSize>\r
           <Value>0xE0000000</Value>\r
@@ -1010,12 +803,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4c38a173-b317-4f29-a7bf-1cc7e10ccb10">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="51C4C059-67F0-4e3c-9A55-FF42A8291C8C">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -1057,7 +844,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1073,7 +860,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1081,7 +868,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1089,7 +876,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1159,23 +946,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x07</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-          <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1191,7 +962,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1207,7 +978,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1223,7 +994,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1259,6 +1030,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -1281,7 +1070,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1289,7 +1078,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1297,7 +1086,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1313,7 +1102,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1321,7 +1110,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1329,7 +1118,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1399,7 +1188,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1407,7 +1196,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1415,7 +1204,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1423,7 +1212,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1465,12 +1254,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT64</DatumType>\r
+          <MaxDatumSize>8</MaxDatumSize>\r
+          <Value>0x0ffffc000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdFSBClock</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -1499,7 +1308,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1507,7 +1316,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1515,7 +1324,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1531,7 +1340,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -1549,16 +1358,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8987081e-daeb-44a9-8bef-a195b22d9417">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdPciExpressBaseAddress</C_Name>\r
-          <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT64</DatumType>\r
-          <MaxDatumSize>8</MaxDatumSize>\r
-          <Value>0xE0000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -1581,7 +1380,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT64</DatumType>\r
           <MaxDatumSize>8</MaxDatumSize>\r
           <Value>0xE0000000</Value>\r
@@ -1592,12 +1391,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4c38a173-b317-4f29-a7bf-1cc7e10ccb10">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="51C4C059-67F0-4e3c-9A55-FF42A8291C8C">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -1639,7 +1432,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1655,7 +1448,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1663,7 +1456,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1671,7 +1464,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1741,23 +1534,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x07</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-          <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1773,7 +1550,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1789,7 +1566,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1805,7 +1582,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -1841,6 +1618,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -1863,7 +1658,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1871,7 +1666,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1879,7 +1674,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1895,7 +1690,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -1903,7 +1698,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1911,7 +1706,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1981,7 +1776,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1989,7 +1784,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1997,7 +1792,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2005,7 +1800,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2040,13 +1835,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdFSBClock</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -2075,7 +1874,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -2083,7 +1882,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2091,7 +1890,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2107,7 +1906,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -2125,16 +1924,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8987081e-daeb-44a9-8bef-a195b22d9417">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdPciExpressBaseAddress</C_Name>\r
-          <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT64</DatumType>\r
-          <MaxDatumSize>8</MaxDatumSize>\r
-          <Value>0xE0000000</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -2157,7 +1946,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <Token>0x0000000A</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT64</DatumType>\r
           <MaxDatumSize>8</MaxDatumSize>\r
           <Value>0xE0000000</Value>\r
@@ -2168,12 +1957,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
-    <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4c38a173-b317-4f29-a7bf-1cc7e10ccb10">\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="51C4C059-67F0-4e3c-9A55-FF42A8291C8C">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -2215,7 +1998,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2231,7 +2014,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -2239,7 +2022,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2247,7 +2030,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2317,23 +2100,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
-          <DatumType>UINT8</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>0x07</Value>\r
-        </PcdData>\r
-      </PcdBuildDefinition>\r
-      <ModuleSaBuildOptions>\r
-        <FvBinding>NULL</FvBinding>\r
-        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
-      </ModuleSaBuildOptions>\r
-    </ModuleSA>\r
-    <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">\r
-      <PcdBuildDefinition>\r
-        <PcdData ItemType="FIXED_AT_BUILD">\r
-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-          <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2349,7 +2116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -2365,7 +2132,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -2381,7 +2148,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPostCodePropertyMask</C_Name>\r
           <Token>0x0000000b</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x00</Value>\r
@@ -2417,6 +2184,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
@@ -2439,7 +2224,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -2447,7 +2232,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2455,7 +2240,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2471,7 +2256,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x0f</Value>\r
@@ -2479,7 +2264,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2487,7 +2272,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2552,229 +2337,144 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <FfsFormatKey>LIBRARY</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
+    <!--Mod: PeiServicesTablePointerLibKr1 Type: PEIM Path: MdePkg\Library\PeiServicesTablePointerLibKr1\PeiServicesTablePointerLibKr1.msa-->\r
+    <ModuleSA ModuleGuid="C5F16B67-888F-44ba-ABDB-C2354FB63C49" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="IPF">\r
+      <ModuleSaBuildOptions>\r
+        <FvBinding>NULL</FvBinding>\r
+        <FfsFormatKey>LIBRARY</FfsFormatKey>\r
+      </ModuleSaBuildOptions>\r
+    </ModuleSA>\r
   </FrameworkModules>\r
   <BuildOptions>\r
-    <Options>\r
-      <!-- MSFT tool chain options definition : IA32 -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">\r
-        "/nologo", "/W3", "/WX", "/GX", "/Gy", "/Gs-", "/c", "/D EFI32", "/D UNICODE", "/FI${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">\r
-        "/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:I386", "/ALIGN:32", "/DLL", "/LTCG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">\r
-        "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- GCC tool chain options definition : IA32 -->\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "-c", "-imacros ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry _${ENTRYPOINT}"\r
-      </Option>\r
-      <!-- MSFT tool chain options definition : X64 -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">\r
-        "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64", "/O1i", "/FAcs", "/FI${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">\r
-        "/NOLOGO"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">\r
-        "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">\r
-        "/nologo", "/W3", "/WX", "/c", "/DEFI32"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r
-        "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- MSFT tool chain options definition : IPF -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">\r
-        "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64", "/O1i", "/FI${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">\r
-        "/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">\r
-        "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/nologo", "/P", "/TC" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- INTEL tool chain options definition : EBC -->\r
-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="CC">\r
-        "-nologo", "-FAcs", "-c", "-W3", "-WX", "-FI${DEST_DIR_DEBUG}/AutoGen.h"\r
-      </Option>\r
-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="SLINK">\r
-        "/lib", "/NOLOGO", "/MACHINE:EBC"\r
-      </Option>\r
-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">\r
-        "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
-      </Option>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-x assembler-with-cpp", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-nologo", "-P", "-TC" </Option>\r
-    </Options>    \r
-\r
-         <Ffs FfsKey="APPLICATION">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_PE32" /> \r
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-               <Section SectionType="EFI_SECTION_VERSION" /> \r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="BINARY">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections  EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_RAW" /> \r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-         \r
-         <Ffs FfsKey="FILE">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_RAW"/> \r
-           </Sections>\r
-         </Ffs>\r
-         \r
-         <Ffs FfsKey="PE32_PEIM_CompressPEIM">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" /> \r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> \r
-       \r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_PEI_DEPEX" />\r
-             <Sections EncapsulationType="Compress">\r
-               <Section SectionType="EFI_SECTION_PE32" /> \r
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-               <Section SectionType="EFI_SECTION_VERSION" /> \r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="PEI_CORE">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_PE32"/>\r
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-             <Section SectionType="EFI_SECTION_VERSION"/>\r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="PE32_PEIM_Relocatable">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> \r
-             <Section SectionType="EFI_SECTION_PE32"/> \r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="DXE_CORE">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections EncapsulationType="Compress">\r
-             <Section SectionType="EFI_SECTION_PE32" /> \r
-             <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-             <Section SectionType="EFI_SECTION_VERSION" /> \r
-           </Sections>\r
-         </Ffs>\r
-       \r
-       \r
-         <Ffs FfsKey="BS_DRIVER">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> \r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> \r
-       \r
-           <Sections EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />\r
-               <Section SectionType="EFI_SECTION_PE32" />\r
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-               <Section SectionType="EFI_SECTION_VERSION" />\r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-         \r
-         <Ffs FfsKey="RT_DRIVER">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> \r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> \r
-       \r
-           <Sections EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />\r
-               <Section SectionType="EFI_SECTION_PE32" />\r
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-               <Section SectionType="EFI_SECTION_VERSION" />\r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-         \r
-         <Ffs FfsKey="SAL_RT_DRIVER">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> \r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> \r
-       \r
-           <Sections EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />\r
-               <Section SectionType="EFI_SECTION_PE32" />\r
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />\r
-               <Section SectionType="EFI_SECTION_VERSION" />\r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-               \r
-         <Ffs FfsKey="COMBINED_PEIM_DRIVER">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> \r
-             <Section SectionType="EFI_SECTION_PE32"/> \r
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-             <Section SectionType="EFI_SECTION_VERSION"/> \r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="PE32_PEIM">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections>\r
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> \r
-             <Section SectionType="EFI_SECTION_PE32"/> \r
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
-             <Section SectionType="EFI_SECTION_VERSION"/> \r
-           </Sections>\r
-         </Ffs>\r
-       \r
-         <Ffs FfsKey="Logo">\r
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />\r
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />\r
-           <Sections EncapsulationType="Compress">\r
-             <Sections EncapsulationType="Guid-Defined">\r
-               <Section SectionType="EFI_SECTION_RAW" /> \r
-             </Sections>\r
-           </Sections>\r
-         </Ffs>\r
-         \r
+    <Ffs FfsKey="APPLICATION">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_PE32"/>\r
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+          <Section SectionType="EFI_SECTION_VERSION"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="BINARY">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_RAW"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="FILE">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_RAW"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="PE32_PEIM_CompressPEIM">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+        <Sections EncapsulationType="Compress">\r
+          <Section SectionType="EFI_SECTION_PE32"/>\r
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+          <Section SectionType="EFI_SECTION_VERSION"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="PEI_CORE">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_PE32"/>\r
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+        <Section SectionType="EFI_SECTION_VERSION"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="PE32_PEIM_Relocatable">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+        <Section SectionType="EFI_SECTION_PE32"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="DXE_CORE">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Section SectionType="EFI_SECTION_PE32"/>\r
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+        <Section SectionType="EFI_SECTION_VERSION"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="BS_DRIVER">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+          <Section SectionType="EFI_SECTION_PE32"/>\r
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+          <Section SectionType="EFI_SECTION_VERSION"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="RT_DRIVER">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+          <Section SectionType="EFI_SECTION_PE32"/>\r
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+          <Section SectionType="EFI_SECTION_VERSION"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="SAL_RT_DRIVER">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+          <Section SectionType="EFI_SECTION_PE32"/>\r
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+          <Section SectionType="EFI_SECTION_VERSION"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="COMBINED_PEIM_DRIVER">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+        <Section SectionType="EFI_SECTION_PE32"/>\r
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+        <Section SectionType="EFI_SECTION_VERSION"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="PE32_PEIM">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections>\r
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>\r
+        <Section SectionType="EFI_SECTION_PE32"/>\r
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>\r
+        <Section SectionType="EFI_SECTION_VERSION"/>\r
+      </Sections>\r
+    </Ffs>\r
+    <Ffs FfsKey="Logo">\r
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>\r
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>\r
+      <Sections EncapsulationType="Compress">\r
+        <Sections EncapsulationType="Guid-Defined">\r
+          <Section SectionType="EFI_SECTION_RAW"/>\r
+        </Sections>\r
+      </Sections>\r
+    </Ffs>\r
   </BuildOptions>\r
-</PlatformSurfaceArea>\r
+</PlatformSurfaceArea>
\ No newline at end of file