8 files changed, 0 insertions, 2534 deletions
diff --git a/FatBinPkg/FatBinPkg.nspd b/FatBinPkg/FatBinPkg.nspd
deleted file mode 100644
index f56a9f4b8a..0000000000
--- a/FatBinPkg/FatBinPkg.nspd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <SpdHeader>
-    <PackageName>FatBinPkg</PackageName>
-    <GuidValue>EEAC1173-A27D-4c1a-958F-0A7F21C0FFA0</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>This is the Binary Package for the FAT dirver</Abstract>
-    <Description>This package provides FAT drivers which are not licensed under BSD.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>true</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <MsaFiles>
-    <Filename>EnhancedFatDxe/Fat.msa</Filename>
-  </MsaFiles>
-</PackageSurfaceArea>
-\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.nspd b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.nspd
deleted file mode 100644
index d2cf69345c..0000000000
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.nspd
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SpdHeader>
-    <PackageName>IntelFrameworkModulePkg</PackageName>
-    <GuidValue>88894582-7553-4822-B484-624E24B6DECF</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Intel Framework Module Package Reference Implementations</Abstract>
-    <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>false</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <LibraryClassDeclarations>
-    <LibraryClass Name="OemHookStatusCodeLib">
-      <IncludeHeader>Include/Library/OemHookStatusCodeLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PciIncompatibleDeviceSupportLib">
-      <IncludeHeader>Include/Library/PciIncompatibleDeviceSupportLib.h</IncludeHeader>
-      <HelpText>This library includes the PCI incompatible devices list.</HelpText>
-    </LibraryClass>
-  </LibraryClassDeclarations>
-  <MsaFiles>
-    <Filename>Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.msa</Filename>
-    <Filename>Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.msa</Filename>
-    <Filename>Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.msa</Filename>
-    <Filename>Bus/Pci/PciBus/Dxe/PciBus.msa</Filename>
-  </MsaFiles>
-  <GuidDeclarations>
-    <Entry Name="MemoryStatusCodeRecord" GuidTypeList="HOB">
-      <C_Name>gMemoryStatusCodeRecordGuid</C_Name>
-      <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>
-      <HelpText>GUID used to identify status code records HOB that originate from the PEI status code.</HelpText>
-    </Entry>
-    <Entry Name="StatusCode" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiStatusCodeGuid</C_Name>
-      <GuidValue>D083E94C-6560-42E4-B6D4-2DF75ADF6A2A</GuidValue>
-      <HelpText>GUID used to identify Data Hub records.</HelpText>
-    </Entry>
-    <Entry Name="PciOptionRomTable" GuidTypeList="GUID">
-      <C_Name>gEfiPciOptionRomTableGuid</C_Name>
-      <GuidValue>7462660F-1CBD-48DA-AD11-91717913831C</GuidValue>
-      <HelpText>GUID and data structure used to describe the list of PCI Option ROMs present in a system.</HelpText>
-    </Entry>
-    <Entry Name="PciHotplugDevice" GuidTypeList="GUID">
-      <C_Name>gEfiPciHotplugDeviceGuid</C_Name>
-      <GuidValue>0B280816-52E7-4E51-AA57-11BD41CBEFC3</GuidValue>
-      <HelpText>GUIDs used to indicate the device is Pccard hotplug device.</HelpText>
-    </Entry>
-    <Entry Name="IntelFrameworkModulePkgTokenSpace" GuidTypeList="TOKEN_SPACE_GUID">
-      <C_Name>gEfiIntelFrameworkModulePkgTokenSpaceGuid</C_Name>
-      <GuidValue>D3705011-BC19-4af7-BE16-F68030378C15</GuidValue>
-      <HelpText>All PCD define in IntelFrameworkModulePkg is in this token space scope.</HelpText>
-    </Entry>
-  </GuidDeclarations>
-  <ProtocolDeclarations>
-    <Entry Name="PciHotPlugRequest">
-      <C_Name>gEfiPciHotPlugRequestProtocolGuid</C_Name>
-      <GuidValue>19CB87AB-2CB9-4665-8360-DDCF6054F79D</GuidValue>
-      <HelpText>Provide Hot Plug Support by PciBus driver.  PciBus driver is notified by the Protocol caller to start Hot Plug device.</HelpText>
-    </Entry>
-    <Entry Name="PciHotPlugInit">
-      <C_Name>gEfiPciHotPlugInitProtocolGuid</C_Name>
-      <GuidValue>AA0E8BC1-DABC-46B0-A844-37B8169B2BEA</GuidValue>
-      <HelpText>Provide platform specific Hot Plug Support to PciBus driver.  PciBus driver consumes this Protocol to get platform specific information.</HelpText>
-    </Entry>
-    <Entry Name="VgaMiniPort">
-      <C_Name>gEfiVgaMiniPortProtocolGuid</C_Name>
-      <GuidValue>c7735a2f-88f5-4882-ae63-faac8c8b86b3</GuidValue>
-      <HelpText>Provide the text display mode base a VGA controller.</HelpText>
-    </Entry>
-    <Entry Name="Isa Acpi">
-      <C_Name>gEfiIsaAcpiProtocolGuid</C_Name>
-      <GuidValue>64a892dc-5561-4536-92c7-799bfc183355</GuidValue>
-      <HelpText>Provide interface to manage the ISA device resource.</HelpText>
-    </Entry>
-    <Entry Name="Ps2Policy">
-      <C_Name>gEfiPs2PolicyProtocolGuid</C_Name>
-      <GuidValue>4DF19259-DC71-4D46-BEF1-357BB578C418</GuidValue>
-      <HelpText/>
-    </Entry>
-  </ProtocolDeclarations>
-  <PcdDeclarations>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseSerial</C_Name>
-      <Token>0x00010022</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable report staus code to serial I/O. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseMemory</C_Name>
-      <Token>0x00010023</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable save statuc code in GUID'ed HOB. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseOEM</C_Name>
-      <Token>0x00010024</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable send status code to OEM device. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeMemorySize</C_Name>
-      <Token>0x00010025</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT16</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>1</DefaultValue>
-      <HelpText>kbytes size of GUID'ed HOB, if the GUID'ed HOB is full, create new GUID'ed HOB with this size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseEfiSerial</C_Name>
-      <Token>0x00010026</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to switch on/off report status code through serial DXE.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseHardSerial</C_Name>
-      <Token>0x00010027</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to switch on/off report status code to serial device.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseRuntimeMemory</C_Name>
-      <Token>0x00010028</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to switch on/off save status code in runtime memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeUseDataHub</C_Name>
-      <Token>0x00010029</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to switch on/off log status code in data hub.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeReplayInSerial</C_Name>
-      <Token>0x0001002a</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeReplayInRuntimeMemory</C_Name>
-      <Token>0x0001002b</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeReplayInDataHub</C_Name>
-      <Token>0x0001002c</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeReplayInOEM</C_Name>
-      <Token>0x0001002d</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Use to enable/dsable replay status code which saved in GUID'ed HOB in PEI phase to EFI serial.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>
-      <Token>0x0001002e</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT16</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>4</DefaultValue>
-      <HelpText>kbytes size of runtime memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPciIsaEnable</C_Name>
-      <Token>0x00010039</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>This is a switch to enable ISA</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPciVgaEnable</C_Name>
-      <Token>0x0001003a</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Whether VGA decoding is enabled on this platform so we should avoid those aliased resources</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>
-      <Token>0x0001003d</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPciIncompatibleDeviceSupportMask</C_Name>
-      <Token>0x0001003f</Token>
-      <TokenSpaceGuidCName>gEfiIntelFrameworkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>The PCD masks for PCI incompatible devices support.</HelpText>
-    </PcdEntry>
-  </PcdDeclarations>
-</PackageSurfaceArea>
diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.nspd b/IntelFrameworkPkg/IntelFrameworkPkg.nspd
deleted file mode 100644
index 87e720cfe4..0000000000
--- a/IntelFrameworkPkg/IntelFrameworkPkg.nspd
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SpdHeader>
-    <PackageName>IntelFrameworkPkg</PackageName>
-    <GuidValue>2759ded5-bb57-4b06-af4f-c398fa552719</GuidValue>
-    <Version>1.0</Version>
-    <Abstract>Intel Framework Package Reference Implementations</Abstract>
-    <Description>This package provides definitions and libraries that comply to Intel Framework Specifications.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>false</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <LibraryClassDeclarations>
-    <LibraryClass Name="HiiLibFramework">
-      <IncludeHeader>Include/Library/HiiLibFramework.h</IncludeHeader>
-      <HelpText>This library provide the service function for package manipulations based on Intel Framework HII specification.</HelpText>
-    </LibraryClass>
-  </LibraryClassDeclarations>
-  <MsaFiles>
-    <Filename>Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa</Filename>
-    <Filename>Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.msa</Filename>
-    <Filename>Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa</Filename>
-    <Filename>Library/UefiLibFramework/UefiLib.msa</Filename>
-  </MsaFiles>
-  <PackageHeaders>
-    <IncludePkgHeader ModuleType="PEIM">Include/FrameworkPei.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_DRIVER">Include/FrameworkDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/FrameworkDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/FrameworkSmm.h</IncludePkgHeader>
-  </PackageHeaders>
-  <GuidDeclarations>
-    <Entry Name="Capsule">
-      <C_Name>gEfiCapsuleGuid</C_Name>
-      <GuidValue>3B6686BD-0D76-4030-B70E-B5519E2FC5A0</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SmramMemoryReserve" GuidTypeList="HOB">
-      <C_Name>gEfiSmmPeiSmramMemoryReserveGuid</C_Name>
-      <GuidValue>6dadf1d1-d4cc-4910-bb6e-82b1fd80ff3d</GuidValue>
-      <HelpText>SMRAM memory reserve hob</HelpText>
-    </Entry>
-    <Entry Name="SmmCommunicate" GuidTypeList="GUID">
-      <C_Name>gSmmCommunicateHeaderGuid</C_Name>
-      <GuidValue>f328e36c-23b6-4a95-854b-32e19534cd75</GuidValue>
-      <HelpText>GUID as header in SMM communicate messages</HelpText>
-    </Entry>
-    <Entry Name="FrameworkDevicePath" GuidTypeList="GUID">
-      <C_Name>gEfiFrameworkDevicePathGuid</C_Name>
-      <GuidValue>b7084e63-46b7-4d1a-8677-e30b53dbf050</GuidValue>
-      <HelpText>GUID to identify a framework defined device path</HelpText>
-    </Entry>
-    <Entry Name="ProcessorProducer" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiProcessorProducerGuid</C_Name>
-      <GuidValue>1bf06aea-5bec-4a8d-9576-749b09562d30</GuidValue>
-      <HelpText>Processor Producer DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="ProcessorSubClass" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiProcessorSubClassGuid</C_Name>
-      <GuidValue>26fdeb7e-b8af-4ccf-aa97-02633ce48ca7</GuidValue>
-      <HelpText>Processor Sub-class DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="CacheSubClass" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiCacheSubClassGuid</C_Name>
-      <GuidValue>7f0013a7-dc79-4b22-8099-11f75fdc829d</GuidValue>
-      <HelpText>Cache Sub-class DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="MemoryProducer" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiMemoryProducerGuid</C_Name>
-      <GuidValue>1d7add6e-b2da-4b0b-b29f-49cb42f46356</GuidValue>
-      <HelpText>Memory Producer DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="MemorySubClass" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiMemorySubClassGuid</C_Name>
-      <GuidValue>4E8F4EBB-64B9-4e05-9b18-4cfe49235097</GuidValue>
-      <HelpText>Memory Sub-class DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="MiscSubClass" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiMiscSubClassGuid</C_Name>
-      <GuidValue>772484B2-7482-4b91-9f9a-ad43f81c5881</GuidValue>
-      <HelpText>Misc Sub-class DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="MiscProducer" GuidTypeList="DATA_HUB_RECORD">
-      <C_Name>gEfiMiscProducerGuid</C_Name>
-      <GuidValue>62512c92-63c4-4d80-82b1-c1a4dc4480e5</GuidValue>
-      <HelpText>Misc Producer DataHub Record</HelpText>
-    </Entry>
-    <Entry Name="StatusCodeDataTypeDebug">
-      <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>
-      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="StatusCodeSpecificData">
-      <C_Name>gEfiStatusCodeSpecificDataGuid</C_Name>
-      <GuidValue>335984BD-E805-409A-B8F8-D27ECE5FF7A6</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="StatusCodeDataTypeString">
-      <C_Name>gEfiStatusCodeDataTypeStringGuid</C_Name>
-      <GuidValue>92D11080-496F-4D95-BE7E-037488382B0A</GuidValue>
-      <HelpText/>
-    </Entry>
-  </GuidDeclarations>
-  <ProtocolDeclarations>
-    <Entry Name="DataHub">
-      <C_Name>gEfiDataHubProtocolGuid</C_Name>
-      <GuidValue>AE80D021-618E-11D4-BCD7-0080C73C8881</GuidValue>
-      <HelpText>Data Hub Protocol Guid</HelpText>
-    </Entry>
-    <Entry Name="SmmSxDispatch">
-      <C_Name>gEfiSmmSxDispatchProtocolGuid</C_Name>
-      <GuidValue>14fc52be-01dc-426c-91ae-a23c3e220ae8</GuidValue>
-      <HelpText>SMM sleep dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmUsbDispatch">
-      <C_Name>gEfiSmmUsbDispatchProtocolGuid</C_Name>
-      <GuidValue>a05b6ffd-87af-4e42-95c9-6228b63cf3f3</GuidValue>
-      <HelpText>SMM USB dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmSwDispatch">
-      <C_Name>gEfiSmmSwDispatchProtocolGuid</C_Name>
-      <GuidValue>e541b773-dd11-420c-b026-df993653f8bf</GuidValue>
-      <HelpText>SMM software dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmStandbyButtonDispatch">
-      <C_Name>gEfiSmmStandbyButtonDispatchProtocolGuid</C_Name>
-      <GuidValue>78965b98-b0bf-449e-8b22-d2914e498a98</GuidValue>
-      <HelpText>SMM standby button dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmPowerButtonDispatch">
-      <C_Name>gEfiSmmPowerButtonDispatchProtocolGuid</C_Name>
-      <GuidValue>b709efa0-47a6-4b41-b931-12ece7a8ee56</GuidValue>
-      <HelpText>SMM power button dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmPeriodicTimerDispatch">
-      <C_Name>gEfiSmmPeriodicTimerDispatchProtocolGuid</C_Name>
-      <GuidValue>9cca03fc-4c9e-4a19-9b06-ed7b479bde55</GuidValue>
-      <HelpText>SMM periodic timer dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmIchnDispatch">
-      <C_Name>gEfiSmmIchnDispatchProtocolGuid</C_Name>
-      <GuidValue>c50b323e-9075-4f2a-ac8e-d2596a1085cc</GuidValue>
-      <HelpText>SMM ICHn dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmGpiDispatch">
-      <C_Name>gEfiSmmGpiDispatchProtocolGuid</C_Name>
-      <GuidValue>e0744b81-9513-49cd-8cea-e9245e7039da</GuidValue>
-      <HelpText>SMM GPI dispatch protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmControl">
-      <C_Name>gEfiSmmControlProtocolGuid</C_Name>
-      <GuidValue>8d12e231-c667-4fd1-98f2-2449a7e7b2e5</GuidValue>
-      <HelpText>SMM control protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmBase">
-      <C_Name>gEfiSmmBaseProtocolGuid</C_Name>
-      <GuidValue>1390954D-da95-4227-9328-7282c217daa8</GuidValue>
-      <HelpText>SMM base protocol</HelpText>
-    </Entry>
-    <Entry Name="SmmAccess">
-      <C_Name>gEfiSmmAccessProtocolGuid</C_Name>
-      <GuidValue>3792095a-e309-4c1e-aa01-85f5655a17f1</GuidValue>
-      <HelpText>SMM base protocol</HelpText>
-    </Entry>
-    <Entry Name="SectionExtraction">
-      <C_Name>gEfiSectionExtractionProtocolGuid</C_Name>
-      <GuidValue>448F5DA4-6DD7-4FE1-9307-69224192215D</GuidValue>
-      <HelpText>Section Extraction Protocol</HelpText>
-    </Entry>
-    <Entry Name="PciPlatform">
-      <C_Name>gEfiPciPlatformProtocolGuid</C_Name>
-      <GuidValue>07d75280-27d4-4d69-90d0-5643e238b341</GuidValue>
-      <HelpText>PCI Platform protocol</HelpText>
-    </Entry>
-    <Entry Name="PciHotPlugInit">
-      <C_Name>gEfiPciHotPlugInitProtocolGuid</C_Name>
-      <GuidValue>aa0e8bc1-dabc-46b0-a844-37b8169b2bea</GuidValue>
-      <HelpText>PCI Hot-plug Init protocol</HelpText>
-    </Entry>
-    <Entry Name="PciHostBridgeResourceAllocation">
-      <C_Name>gEfiPciHostBridgeResourceAllocationProtocolGuid</C_Name>
-      <GuidValue>CF8034BE-6768-4d8b-b739-7cce683a9fbe</GuidValue>
-      <HelpText>PCI Host Bridge Resource Allocation protocol</HelpText>
-    </Entry>
-    <Entry Name="LegacyRegion">
-      <C_Name>gEfiLegacyRegionProtocolGuid</C_Name>
-      <GuidValue>0fc9013a-0568-4ba9-9b7e-c9c390a6609b</GuidValue>
-      <HelpText>Legacy Region protocol</HelpText>
-    </Entry>
-    <Entry Name="LegacyInterrupt">
-      <C_Name>gEfiLegacyInterruptProtocolGuid</C_Name>
-      <GuidValue>31ce593d-108a-485d-adb2-78f21f2966be</GuidValue>
-      <HelpText>Legacy interrupt protocol</HelpText>
-    </Entry>
-    <Entry Name="LegacyBiosPlatform">
-      <C_Name>gEfiLegacyBiosPlatformProtocolGuid</C_Name>
-      <GuidValue>783658a3-4172-4421-a299-e009079c0cb2</GuidValue>
-      <HelpText>Legacy Bios Platform protocol</HelpText>
-    </Entry>
-    <Entry Name="LegacyBios">
-      <C_Name>gEfiLegacyBiosProtocolGuid</C_Name>
-      <GuidValue>db9a1e3d-45cb-4abb-85b3-e5387fdb2e2d</GuidValue>
-      <HelpText>Legacy Bios protocol</HelpText>
-    </Entry>
-    <Entry Name="Legacy8259">
-      <C_Name>gEfiLegacy8259ProtocolGuid</C_Name>
-      <GuidValue>38321dba-4fe0-4e17-8aec-413055eaedc1</GuidValue>
-      <HelpText>Legacy 8259 protocol</HelpText>
-    </Entry>
-    <Entry Name="IncompatiblePciDeviceSupport">
-      <C_Name>gEfiIncompatiblePciDeviceSupportProtocolGuid</C_Name>
-      <GuidValue>eb23f55a-7863-4ac2-8d3d-956535de0375</GuidValue>
-      <HelpText>Incompatible PCI device support protocol</HelpText>
-    </Entry>
-    <Entry Name="IdeControllerInit">
-      <C_Name>gEfiIdeControllerInitProtocolGuid</C_Name>
-      <GuidValue>a1e37052-80d9-4e65-a317-3e9a55c43ec9</GuidValue>
-      <HelpText>IDE Controller Init protocol</HelpText>
-    </Entry>
-    <Entry Name="Hii">
-      <C_Name>gEfiHiiProtocolGuid</C_Name>
-      <GuidValue>d7ad636e-b997-459b-bf3f-8846897980e1</GuidValue>
-      <HelpText>HII protocol</HelpText>
-    </Entry>
-    <Entry Name="FirmwareVolume">
-      <C_Name>gEfiFirmwareVolumeProtocolGuid</C_Name>
-      <GuidValue>389F751F-1838-4388-8390-cd8154bd27f8</GuidValue>
-      <HelpText>Firmware Volume protocol</HelpText>
-    </Entry>
-    <Entry Name="DataHub">
-      <C_Name>gEfiDataHubProtocolGuid</C_Name>
-      <GuidValue>ae80d021-618e-11d4-bcd7-0080c73c8881</GuidValue>
-      <HelpText>Data Hub protocol</HelpText>
-    </Entry>
-    <Entry Name="CpuIo">
-      <C_Name>gEfiCpuIoProtocolGuid</C_Name>
-      <GuidValue>B0732526-38C8-4b40-8877-61c7b06aac45</GuidValue>
-      <HelpText>CPU I/O protocol</HelpText>
-    </Entry>
-    <Entry Name="BootScriptSave">
-      <C_Name>gEfiBootScriptSaveProtocolGuid</C_Name>
-      <GuidValue>470e1529-b79e-4e32-a0fe-6a156d29f9b2</GuidValue>
-      <HelpText>Boot Script Save protocol</HelpText>
-    </Entry>
-    <Entry Name="AcpiSupport">
-      <C_Name>gEfiAcpiSupportProtocolGuid</C_Name>
-      <GuidValue>dbff9d55-89b7-46da-bddf-677d3dc0241d</GuidValue>
-      <HelpText>ACPI Support protocol</HelpText>
-    </Entry>
-    <Entry Name="AcpiS3Save">
-      <C_Name>gEfiAcpiS3SaveProtocolGuid</C_Name>
-      <GuidValue>125F2DE1-FB85-440C-A54C-4D99358A8D38</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FirmwareVolumeDispatch">
-      <C_Name>gEfiFirmwareVolumeDispatchProtocolGuid</C_Name>
-      <GuidValue>7AA35A69-506C-444F-A7AF-694BF56F71C8</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FormCallback">
-      <C_Name>gEfiFormCallbackProtocolGuid</C_Name>
-      <GuidValue>F3E4543D-CF35-6CEF-35C4-4FE6344DFC54</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Crc32GuidedSectionExtraction">
-      <C_Name>gEfiCrc32GuidedSectionExtractionProtocolGuid</C_Name>
-      <GuidValue>FC1BCDB0-7D31-49AA-936A-A4600D9DD083</GuidValue>
-      <HelpText/>
-    </Entry>
-  </ProtocolDeclarations>
-  <PpiDeclarations>
-    <Entry Name="Smbus">
-      <C_Name>gEfiPeiSmbusPpiGuid</C_Name>
-      <GuidValue>abd42895-78cf-4872-8444-1b5c180bfbda</GuidValue>
-      <HelpText>Smbus PPI</HelpText>
-    </Entry>
-    <Entry Name="S3Resume">
-      <C_Name>gEfiPeiS3ResumePpiGuid</C_Name>
-      <GuidValue>4426CCB2-E684-4a8a-ae40-20d4b025b710</GuidValue>
-      <HelpText>S3 Resume PPI</HelpText>
-    </Entry>
-    <Entry Name="RecoveryModule">
-      <C_Name>gEfiPeiRecoveryModulePpiGuid</C_Name>
-      <GuidValue>FB6D9542-612D-4f45-872f-5cff52e93dcf</GuidValue>
-      <HelpText>Recovery Module PPI</HelpText>
-    </Entry>
-    <Entry Name="BootScriptExecuter">
-      <C_Name>gEfiPeiBootScriptExecuterPpiGuid</C_Name>
-      <GuidValue>abd42895-78cf-4872-8444-1b5c180bfbff</GuidValue>
-      <HelpText>Boot Script Executer PPI</HelpText>
-    </Entry>
-    <Entry Name="IdeBlockIo">
-      <C_Name>gEfiPeiIdeBlockIoPpiGuid</C_Name>
-      <GuidValue>0964e5b22-6459-11d2-8e39-00a0c969723b</GuidValue>
-      <HelpText>IDE Block I/O PPI</HelpText>
-    </Entry>
-    <Entry Name="144FloppyBlockIo">
-      <C_Name>gEfiPei144FloppyBlockIoPpiGuid</C_Name>
-      <GuidValue>da6855bd-07b7-4c05-9ed8-e259fd360e22</GuidValue>
-      <HelpText>1.44 Floppy Block I/O PPI</HelpText>
-    </Entry>
-    <Entry Name="VirtualBlockIo">
-      <C_Name>gEfiPeiVirtualBlockIoPpiGuid</C_Name>
-      <GuidValue>695d8aa1-42ee-4c46-805c-6ea6bce799e3</GuidValue>
-      <HelpText>Virtual Block I/O PPI</HelpText>
-    </Entry>
-    <Entry Name="Security">
-      <C_Name>gEfiPeiSecurityPpiGuid</C_Name>
-      <GuidValue>1388066E-3A57-4EFA-98F3-C12F3A958A29</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SectionExtraction">
-      <C_Name>gEfiPeiSectionExtractionPpiGuid</C_Name>
-      <GuidValue>4F89E208-E144-4804-9EC8-0F894F7E36D7</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ReadOnlyVariable">
-      <C_Name>gEfiPeiReadOnlyVariablePpiGuid</C_Name>
-      <GuidValue>3CDC90C6-13FB-4A75-9E79-59E9DD78B9FA</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DeviceRecoveryModule">
-      <C_Name>gEfiPeiDeviceRecoveryModulePpiGuid</C_Name>
-      <GuidValue>0DE2CE25-446A-45A7-BFC9-37DA26344B37</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PciCfg">
-      <C_Name>gEfiPciCfgPpiInServiceTableGuid</C_Name>
-      <GuidValue>E1F2EBA0-F7B9-4A26-8620-131221642A90</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FvLoadFile">
-      <C_Name>gEfiPeiFvFileLoaderPpiGuid</C_Name>
-      <GuidValue>7e1f0d85-04ff-4bb2-866a-31a2996a48a8</GuidValue>
-      <HelpText>FV Load File PPI</HelpText>
-    </Entry>
-  </PpiDeclarations>
-</PackageSurfaceArea>
-\ No newline at end of file
diff --git a/MdeModulePkg/MdeModulePkg.nspd b/MdeModulePkg/MdeModulePkg.nspd
deleted file mode 100644
index b0a5c98aca..0000000000
--- a/MdeModulePkg/MdeModulePkg.nspd
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SpdHeader>
-    <PackageName>MdeModulePkg</PackageName>
-    <GuidValue>BA0D78D6-2CAF-414b-BD4D-B6762A894288</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Mde Module Package Reference Implementations</Abstract>
-    <Description>This module provides headers and libraries that conform to EFI/PI Industry standards.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>false</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <MsaFiles>
-    <Filename>Application/HelloWorld/HelloWorld.msa</Filename>
-    <Filename>Universal/Disk/DiskIo/Dxe/DiskIo.msa</Filename>
-    <Filename>Universal/Disk/Partition/Dxe/Partition.msa</Filename>
-    <Filename>Universal/Security/SecurityStub/SecurityStub.msa</Filename>
-  </MsaFiles>
-  <GuidDeclarations>
-    <Entry Name="MdeModulePkgTokenSpace">
-      <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>
-      <GuidValue>A1AFF049-FDEB-442a-B320-13AB4CB72BBC</GuidValue>
-      <HelpText>All PCD define in MdeModulePkg is in this token space scope</HelpText>
-    </Entry>
-    <Entry Name="PcdDataBaseHob">
-      <C_Name>gPcdDataBaseHobGuid</C_Name>
-      <GuidValue>EA296D92-0B69-423C-8C28-33B4E0A91268</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PcdPeiCallbackFnTable">
-      <C_Name>gPcdPeiCallbackFnTableHobGuid</C_Name>
-      <GuidValue>C625F4B2-EA09-4675-82D7-BA3682157A14</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SystemNvDataHob">
-      <C_Name>gEfiSystemNvDataHobGuid</C_Name>
-      <GuidValue>D6E5092D-C7B2-4872-AF66-FDC0E6F95E78</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SystemNvDataFv">
-      <C_Name>gEfiSystemNvDataFvGuid</C_Name>
-      <GuidValue>FFF12B8D-7696-4C8B-A985-2747075B4F50</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DiskInfoIde">
-      <C_Name>gEfiDiskInfoIdeInterfaceGuid</C_Name>
-      <GuidValue>5E948FE3-26D3-42B5-AF17-610287188DEC</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DiskInfoScsi">
-      <C_Name>gEfiDiskInfoScsiInterfaceGuid</C_Name>
-      <GuidValue>08F74BAA-EA36-41D9-9521-21A70F8780BC</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DiskInfoUsb">
-      <C_Name>gEfiDiskInfoUsbInterfaceGuid</C_Name>
-      <GuidValue>CB871572-C11A-47B5-B492-675EAFA77727</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="AlternateFvBlock">
-      <C_Name>gEfiAlternateFvBlockGuid</C_Name>
-      <GuidValue>F496922D-172F-4BBC-A1EB-0EEB949C3486</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ConsoleInDevice">
-      <C_Name>gEfiConsoleInDeviceGuid</C_Name>
-      <GuidValue>D3B36F2B-D551-11D4-9A46-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ConsoleOutDevice">
-      <C_Name>gEfiConsoleOutDeviceGuid</C_Name>
-      <GuidValue>D3B36F2C-D551-11D4-9A46-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="StandardErrorDevice">
-      <C_Name>gEfiStandardErrorDeviceGuid</C_Name>
-      <GuidValue>D3B36F2D-D551-11D4-9A46-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HotPlugDevice">
-      <C_Name>gEfiHotPlugDeviceGuid</C_Name>
-      <GuidValue>220AC432-1D43-49E5-A74F-4C9DA67AD23B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PrimaryStandardErrorDevice">
-      <C_Name>gEfiPrimaryStandardErrorDeviceGuid</C_Name>
-      <GuidValue>5A68191B-9B97-4752-9946-E36A5DA942B1</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PrimaryConsoleInDevice">
-      <C_Name>gEfiPrimaryConsoleInDeviceGuid</C_Name>
-      <GuidValue>E451DCBE-96A1-4729-A5CF-6B9C2CFF47FD</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PrimaryConsoleOutDevice">
-      <C_Name>gEfiPrimaryConsoleOutDeviceGuid</C_Name>
-      <GuidValue>62BDF38A-E3D5-492C-950C-23A7F66E672E</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Bmp">
-      <C_Name>gEfiDefaultBmpLogoGuid</C_Name>
-      <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="BootState">
-      <C_Name>gEfiBootStateGuid</C_Name>
-      <GuidValue>60B5E939-0FCF-4227-BA83-6BBED45BC0E3</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PciHotplugDevice">
-      <C_Name>gEfiPciHotplugDeviceGuid</C_Name>
-      <GuidValue>0B280816-52E7-4E51-AA57-11BD41CBEFC3</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="CapsuleVendor">
-      <C_Name>gEfiCapsuleVendorGuid</C_Name>
-      <GuidValue>711C703F-C285-4B10-A3B0-36ECBD3C8BE2</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PeiPerformanceHob">
-      <C_Name>gPeiPerformanceHobGuid</C_Name>
-      <GuidValue>EC4DF5AF-4395-4CC9-94DE-77506D12C7B8</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="GenericPlatformVariable" GuidTypeList="EFI_VARIABLE">
-      <C_Name>gEfiGenericPlatformVariableGuid</C_Name>
-      <GuidValue>59d1c24f-50f1-401a-b101-f33e0daed443</GuidValue>
-      <HelpText>The variable space Guid to pair with a Unicode string name to tag an EFI variable</HelpText>
-    </Entry>
-    <Entry Name="PeiPeCoffLoader">
-      <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>
-      <GuidValue>D8117CFF-94A6-11D4-9A3A-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FlashMapHob">
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <GuidValue>B091E7D2-05A0-4198-94F0-74B7B8C55459</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="MemoryTypeInformation">
-      <C_Name>gEfiMemoryTypeInformationGuid</C_Name>
-      <GuidValue>4C19049F-4137-4DD3-9C10-8B97A83FFDFA</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ShellFile">
-      <C_Name>gEfiShellFileGuid</C_Name>
-      <GuidValue>C57AD6B7-0515-40A8-9D21-551652854E37</GuidValue>
-      <HelpText/>
-    </Entry>
-  </GuidDeclarations>
-  <ProtocolDeclarations>
-    <Entry Name="ExtendedSalVariableServices">
-      <C_Name>gEfiExtendedSalVariableServicesProtocolGuid</C_Name>
-      <GuidValue>4ECB6C53-C641-4370-8CB2-3B0E496E8378</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Capsule">
-      <C_Name>gEfiCapsuleArchProtocolGuid</C_Name>
-      <GuidValue>5053697E-2EBC-4819-90D9-0580DEEE5754</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="CustomizedDecompress">
-      <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>
-      <GuidValue>9A44198E-A4A2-44E6-8A1F-39BEFDAC896F</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="TianoDecompress">
-      <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>
-      <GuidValue>E84CF29C-191F-4EAE-96E1-F46AECEAEA0B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="LoadPeImage">
-      <C_Name>gEfiLoadPeImageProtocolGuid</C_Name>
-      <GuidValue>5CB5C776-60D5-45EE-883C-452708CD743F</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Print">
-      <C_Name>gEfiPrintProtocolGuid</C_Name>
-      <GuidValue>DF2D868E-32FC-4CF0-8E6B-FFD95D1343D0</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="GenericMemTest">
-      <C_Name>gEfiGenericMemTestProtocolGuid</C_Name>
-      <GuidValue>309DE7F1-7F5E-4ACE-B49C-531BE5AA95EF</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DiskInfo">
-      <C_Name>gEfiDiskInfoProtocolGuid</C_Name>
-      <GuidValue>D432A67F-14DC-484B-B3BB-3F0291849327</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FvbExtension">
-      <C_Name>gEfiFvbExtensionProtocolGuid</C_Name>
-      <GuidValue>53A4C71B-B581-4170-91B3-8DB87A4B5C46</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FaultTolerantWriteLite">
-      <C_Name>gEfiFaultTolerantWriteLiteProtocolGuid</C_Name>
-      <GuidValue>3F557189-8DAE-45AE-A0B3-2B99CA7AA7A0</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ConsoleControl">
-      <C_Name>gEfiConsoleControlProtocolGuid</C_Name>
-      <GuidValue>F42F7782-012E-4C12-9956-49F94304F721</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="OEMBadging">
-      <C_Name>gEfiOEMBadgingProtocolGuid</C_Name>
-      <GuidValue>170E13C0-BF1B-4218-871D-2ABDC6F887BC</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UsbAtapi">
-      <C_Name>gEfiUsbAtapiProtocolGuid</C_Name>
-      <GuidValue>2B2F68DA-0CD2-44CF-8E8B-BBA20B1B5B75</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Performance">
-      <C_Name>gPerformanceProtocolGuid</C_Name>
-      <GuidValue>76B6BDFA-2ACD-4462-9E3F-CB58C969D937</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ScsiIo">
-      <C_Name>gEfiScsiIoProtocolGuid</C_Name>
-      <GuidValue>403CD195-F233-48EC-8455-B2E52F1D9E02</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FindFv">
-      <C_Name>gEfiFindFvPpiGuid</C_Name>
-      <GuidValue>36164812-A023-44E5-BD85-05BF3C7700AA</GuidValue>
-      <HelpText/>
-    </Entry>
-  </ProtocolDeclarations>
-  <PpiDeclarations>
-    <Entry Name="BaseMemoryTest">
-      <C_Name>gPeiBaseMemoryTestPpiGuid</C_Name>
-      <GuidValue>B6EC423C-21D2-490D-85C6-DD5864EAA674</GuidValue>
-      <HelpText/>
-    </Entry>
-  </PpiDeclarations>
-  <PcdDeclarations>
-    <PcdEntry>
-      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-      <Token>0x0001000f</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x08</DefaultValue>
-      <HelpText>The maximum number of callback function, which will be triggered when
-        a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdVpdBaseAddress</C_Name>
-      <Token>0x00010010</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>The base address of the VPD (Vital Product Data) region. It is
-        normally a region reserved on flash.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdSupportUpdateCapsuleRest</C_Name>
-      <Token>0x0001001d</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Indicate whether platform can support update capsule across a system reset</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdMaxSizePopulateCapsule</C_Name>
-      <Token>0x0001001e</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Indicate the max size the platform can support in case of populated capsules</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>
-      <Token>0x0001001f</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Indicate the max size the platform can support in case of non-populated capsules</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPeiPcdDatabaseTraverseEnabled</C_Name>
-      <Token>0x00010020</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database
-        traverse capability. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>
-      <Token>0x00010021</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database
-        traverse capability. Disable it can reduce the size of final image generated.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdMaxPeiPerformanceLogEntries</C_Name>
-      <Token>0x0001002f</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>28</DefaultValue>
-      <HelpText>Maximun number of performance log entries during PEI phase.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPeiPcdDatabaseSetEnabled</C_Name>
-      <Token>0x00010030</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the SET capability of PCD service PEIM. If a platform does not do PCD SET operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPeiPcdDatabaseGetSizeEnabled</C_Name>
-      <Token>0x00010031</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the GET size capability of PCD service PEIM. If a platform does not do PCD get size operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPeiPcdDatabaseCallbackOnSetEnabled</C_Name>
-      <Token>0x00010032</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the Callback On SET capability of PCD service PEIM. If a platform does not register any callback on set  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPeiPcdDatabaseExEnabled</C_Name>
-      <Token>0x00010033</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>This feature flag can be used to enable or disable the PCD service PEIM to handle DynamicEX PCD. If a platform has no module to use DynamicEX  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>
-      <Token>0x30000001</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Base address of the variable section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageVariableSize</C_Name>
-      <Token>0x30000002</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Size of the variable section in NV firmware volume..</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
-      <Token>0x30000013</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Base address of the FTW spare block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
-      <Token>0x30000014</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Size of the FTW spare block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
-      <Token>0x30000010</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Base address of the FTW working block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
-      <Token>0x30000011</Token>
-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
-      <DefaultValue>0x0</DefaultValue>
-      <HelpText>Size of the FTW working block section in NV firmware volume.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>
-      <Token>0x00010034</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the EFI Compression algorithm</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDxeIplSupportTianoDecompress</C_Name>
-      <Token>0x00010035</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the Tiano Compression algorithm</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDxeIplSupportCustomDecompress</C_Name>
-      <Token>0x00010036</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL must support decompressing files compressed with the Custom Compression algorithm</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDevicePathSupportDevicePathToText</C_Name>
-      <Token>0x00010037</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If TRUE, then the Device Path To Text Protocol should be produced by the platform</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDevicePathSupportDevicePathFromText</C_Name>
-      <Token>0x00010038</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If TRUE, then the Device Path From Text Protocol should be produced by the platform</HelpText>
-    </PcdEntry>
-    <PcdEntry SupArchList="IA32">
-      <C_Name>PcdDxeIplSwitchToLongMode</C_Name>
-      <Token>0x0001003b</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>If this feature is enabled, then the DXE IPL will load a 64-bit DxeCore.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDxeIplBuildShareCodeHobs</C_Name>
-      <Token>0x0001003c</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdNtEmulatorEnable</C_Name>
-      <Token>0x0001003e</Token>
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this PCD is set as TRUE, NT emulator will be endabled.</HelpText>
-    </PcdEntry>
-  </PcdDeclarations>
-</PackageSurfaceArea>
diff --git a/MdePkg/MdePkg.nspd b/MdePkg/MdePkg.nspd
deleted file mode 100644
index 0e1ce8835a..0000000000
--- a/MdePkg/MdePkg.nspd
+++ /dev/null
@@ -1,1153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SpdHeader>
-    <PackageName>MdePkg</PackageName>
-    <GuidValue>1E73767F-8F52-4603-AEB4-F29B510B6766</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Framework Module Development Environment Industry Standards</Abstract>
-    <Description>This Package provides headers and libraries that conform to EFI/PI Industry standards.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>false</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <LibraryClassDeclarations>
-    <LibraryClass Name="BaseLib">
-      <IncludeHeader>Include/Library/BaseLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="BaseMemoryLib">
-      <IncludeHeader>Include/Library/BaseMemoryLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="CacheMaintenanceLib">
-      <IncludeHeader>Include/Library/CacheMaintenanceLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="CpuLib">
-      <IncludeHeader>Include/Library/CpuLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="DebugLib">
-      <IncludeHeader>Include/Library/DebugLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="DevicePathLib">
-      <IncludeHeader>Include/Library/DevicePathLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="DxeCoreEntryPoint">
-      <IncludeHeader>Include/Library/DxeCoreEntryPoint.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="DxeServicesTableLib">
-      <IncludeHeader>Include/Library/DxeServicesTableLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="DxeSmmDriverEntryPoint">
-      <IncludeHeader>Include/Library/DxeSmmDriverEntryPoint.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="FvbServiceLib">
-      <IncludeHeader>Include/Library/FvbServiceLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="HiiLib">
-      <IncludeHeader>Include/Library/HiiLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="HobLib">
-      <IncludeHeader>Include/Library/HobLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="IfrSupportLib">
-      <IncludeHeader>Include/Library/IfrSupportLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="IoLib">
-      <IncludeHeader>Include/Library/IoLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="MemoryAllocationLib">
-      <IncludeHeader>Include/Library/MemoryAllocationLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PcdLib">
-      <IncludeHeader>Include/Library/PcdLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PciCf8Lib">
-      <IncludeHeader>Include/Library/PciCf8Lib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PciExpressLib">
-      <IncludeHeader>Include/Library/PciExpressLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PciLib">
-      <IncludeHeader>Include/Library/PciLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PciSegmentLib">
-      <IncludeHeader>Include/Library/PciSegmentLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeCoffGetEntryPointLib">
-      <IncludeHeader>Include/Library/PeCoffGetEntryPointLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeCoffLib">
-      <IncludeHeader>Include/Library/PeCoffLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeiCoreEntryPoint">
-      <IncludeHeader>Include/Library/PeiCoreEntryPoint.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeimEntryPoint">
-      <IncludeHeader>Include/Library/PeimEntryPoint.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeiServicesLib">
-      <IncludeHeader>Include/Library/PeiServicesLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PeiServicesTablePointerLib">
-      <IncludeHeader>Include/Library/PeiServicesTablePointerLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PerformanceLib">
-      <IncludeHeader>Include/Library/PerformanceLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PostCodeLib">
-      <IncludeHeader>Include/Library/PostCodeLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="PrintLib">
-      <IncludeHeader>Include/Library/PrintLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="ReportStatusCodeLib">
-      <IncludeHeader>Include/Library/ReportStatusCodeLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="ResourcePublicationLib">
-      <IncludeHeader>Include/Library/ResourcePublicationLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="ScsiLib">
-      <IncludeHeader>Include/Library/ScsiLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="SmbusLib">
-      <IncludeHeader>Include/Library/SmbusLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="TimerLib">
-      <IncludeHeader>Include/Library/TimerLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiApplicationEntryPoint" SupArchList="IA32 X64 IPF EBC ARM PPC" SupModuleList="UEFI_APPLICATION">
-      <IncludeHeader>Include/Library/UefiApplicationEntryPoint.h</IncludeHeader>
-      <HelpText>Library to abstract entry point to a EFI Application.</HelpText>
-    </LibraryClass>
-    <LibraryClass Name="UefiBootServicesTableLib">
-      <IncludeHeader>Include/Library/UefiBootServicesTableLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiDecompressLib">
-      <IncludeHeader>Include/Library/UefiDecompressLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiDriverEntryPoint">
-      <IncludeHeader>Include/Library/UefiDriverEntryPoint.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiLib">
-      <IncludeHeader>Include/Library/UefiLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiRuntimeLib">
-      <IncludeHeader>Include/Library/UefiRuntimeLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UefiRuntimeServicesTableLib">
-      <IncludeHeader>Include/Library/UefiRuntimeServicesTableLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="UsbLib">
-      <IncludeHeader>Include/Library/UsbLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="CustomDecompressLib">
-      <IncludeHeader>Include/Library/CustomDecompressLib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
-    <LibraryClass Name="SalLib" SupArchList="IPF">
-      <IncludeHeader>Include/Library/SalLib.h</IncludeHeader>
-      <HelpText>Implement the SAL call</HelpText>
-    </LibraryClass>
-  </LibraryClassDeclarations>
-  <MsaFiles>
-    <Filename>Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa</Filename>
-    <Filename>Library/BaseDebugLibNull/BaseDebugLibNull.msa</Filename>
-    <Filename>Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa</Filename>
-    <Filename>Library/BaseLib/BaseLib.msa</Filename>
-    <Filename>Library/BaseMemoryLib/BaseMemoryLib.msa</Filename>
-    <Filename>Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa</Filename>
-    <Filename>Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa</Filename>
-    <Filename>Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa</Filename>
-    <Filename>Library/BasePciCf8Lib/BasePciCf8Lib.msa</Filename>
-    <Filename>Library/BasePciExpressLib/BasePciExpressLib.msa</Filename>
-    <Filename>Library/BasePciLibCf8/BasePciLibCf8.msa</Filename>
-    <Filename>Library/BasePciLibPciExpress/BasePciLibPciExpress.msa</Filename>
-    <Filename>Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa</Filename>
-    <Filename>Library/BasePeCoffLib/BasePeCoffLib.msa</Filename>
-    <Filename>Library/BasePerformanceLibNull/BasePerformanceLibNull.msa</Filename>
-    <Filename>Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa</Filename>
-    <Filename>Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa</Filename>
-    <Filename>Library/BasePrintLib/BasePrintLib.msa</Filename>
-    <Filename>Library/BaseTimerLibNull/BaseTimerLibNull.msa</Filename>
-    <Filename>Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa</Filename>
-    <Filename>Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa</Filename>
-    <Filename>Library/DxeCoreHobLib/DxeCoreHobLib.msa</Filename>
-    <Filename>Library/DxeHobLib/DxeHobLib.msa</Filename>
-    <Filename>Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa</Filename>
-    <Filename>Library/DxePcdLib/DxePcdLib.msa</Filename>
-    <Filename>Library/DxeServicesTableLib/DxeServicesTableLib.msa</Filename>
-    <Filename>Library/DxeSmbusLib/DxeSmbusLib.msa</Filename>
-    <Filename>Library/HiiLib/HiiLib.msa</Filename>
-    <Filename>Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa</Filename>
-    <Filename>Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa</Filename>
-    <Filename>Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa</Filename>
-    <Filename>Library/PeiHobLib/PeiHobLib.msa</Filename>
-    <Filename>Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa</Filename>
-    <Filename>Library/PeimEntryPoint/PeimEntryPoint.msa</Filename>
-    <Filename>Library/PeiPcdLib/PeiPcdLib.msa</Filename>
-    <Filename>Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa</Filename>
-    <Filename>Library/PeiServicesLib/PeiServicesLib.msa</Filename>
-    <Filename>Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa</Filename>
-    <Filename>Library/PeiSmbusLib/PeiSmbusLib.msa</Filename>
-    <Filename>Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa</Filename>
-    <Filename>Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa</Filename>
-    <Filename>Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa</Filename>
-    <Filename>Library/UefiDebugLibConOut/UefiDebugLibConOut.msa</Filename>
-    <Filename>Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa</Filename>
-    <Filename>Library/UefiDevicePathLib/UefiDevicePathLib.msa</Filename>
-    <Filename>Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa</Filename>
-    <Filename>Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa</Filename>
-    <Filename>Library/UefiLib/UefiLib.msa</Filename>
-    <Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>
-    <Filename>Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa</Filename>
-    <Filename>Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa</Filename>
-    <Filename>Library/UefiUsbLib/UefiUsbLib.msa</Filename>
-  </MsaFiles>
-  <PackageHeaders>
-    <IncludePkgHeader ModuleType="BASE">Include/Base.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="SEC">Include/PiPei.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="PEI_CORE">Include/PiPei.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="PEIM">Include/PiPei.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_CORE">Include/PiDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_DRIVER">Include/PiDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/PiDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/PiDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/PiDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>
-  </PackageHeaders>
-  <GuidDeclarations>
-    <Entry Name="MdePkgTokenSpace">
-      <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>
-      <GuidValue>914AEBE7-4635-459b-AA1C-11E219B03A10</GuidValue>
-      <HelpText>All PCD define in MdePkg is in this token space scope</HelpText>
-    </Entry>
-    <Entry Name="Acpi10Table">
-      <C_Name>gEfiAcpi10TableGuid</C_Name>
-      <GuidValue>EB9D2D30-2D88-11D3-9A16-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Acpi20Table">
-      <C_Name>gEfiAcpi20TableGuid</C_Name>
-      <GuidValue>8868E871-E4F1-11D3-BC22-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Acpi30Table">
-      <C_Name>gEfiAcpi30TableGuid</C_Name>
-      <GuidValue>8868E871-E4F1-11D3-BC22-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DebugImageInfoTable">
-      <C_Name>gEfiDebugImageInfoTableGuid</C_Name>
-      <GuidValue>49152E77-1ADA-4764-B7A2-7AFEFED95E8B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="GlobalVariable">
-      <C_Name>gEfiGlobalVariableGuid</C_Name>
-      <GuidValue>8BE4DF61-93CA-11D2-AA0D-00E098032B8C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PartTypeUnused">
-      <C_Name>gEfiPartTypeUnusedGuid</C_Name>
-      <GuidValue>00000000-0000-0000-0000-000000000000</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PartTypeSystemPart">
-      <C_Name>gEfiPartTypeSystemPartGuid</C_Name>
-      <GuidValue>C12A7328-F81F-11D2-BA4B-00A0C93EC93B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PartTypeLegacyMbr">
-      <C_Name>gEfiPartTypeLegacyMbrGuid</C_Name>
-      <GuidValue>024DEE41-33E7-11D3-9D69-0008C781F39F</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="MpsTable">
-      <C_Name>gEfiMpsTableGuid</C_Name>
-      <GuidValue>EB9D2D2F-2D88-11D3-9A16-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PcAnsi">
-      <C_Name>gEfiPcAnsiGuid</C_Name>
-      <GuidValue>E0C14753-F9BE-11D2-9A0C-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="VT100">
-      <C_Name>gEfiVT100Guid</C_Name>
-      <GuidValue>DFA66065-B419-11D3-9A2D-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="VT100Plus">
-      <C_Name>gEfiVT100PlusGuid</C_Name>
-      <GuidValue>7BAEC70B-57E0-4C76-8E87-2F9E28088343</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="VTUTF8">
-      <C_Name>gEfiVTUTF8Guid</C_Name>
-      <GuidValue>AD15A0D6-8BEC-4ACF-A073-D01DE77E2D88</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SalSystemTable">
-      <C_Name>gEfiSalSystemTableGuid</C_Name>
-      <GuidValue>EB9D2D32-2D88-11D3-9A16-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SmbiosTable">
-      <C_Name>gEfiSmbiosTableGuid</C_Name>
-      <GuidValue>EB9D2D31-2D88-11D3-9A16-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Apriori">
-      <C_Name>gAprioriGuid</C_Name>
-      <GuidValue>FC510EE7-FFDC-11D4-BD41-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DxeServicesTable">
-      <C_Name>gEfiDxeServicesTableGuid</C_Name>
-      <GuidValue>05AD34BA-6F02-4214-952E-4DA0398E2BB9</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FirmwareFileSystem">
-      <C_Name>gEfiFirmwareFileSystemGuid</C_Name>
-      <GuidValue>7A9354D9-0468-444A-81CE-0BF617D890DF</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FirmwareVolumeTopFile">
-      <C_Name>gEfiFirmwareVolumeTopFileGuid</C_Name>
-      <GuidValue>1BA0062E-C779-4582-8566-336AE8F78F09</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HobList">
-      <C_Name>gEfiHobListGuid</C_Name>
-      <GuidValue>7739F24C-93D7-11D4-9A3A-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HobMemoryAllocBspStore">
-      <C_Name>gEfiHobMemoryAllocBspStoreGuid</C_Name>
-      <GuidValue>564B33CD-C92A-4593-90BF-2473E43C6322</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HobMemoryAllocStack">
-      <C_Name>gEfiHobMemoryAllocStackGuid</C_Name>
-      <GuidValue>4ED4BF27-4092-42E9-807D-527B1D00C9BD</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HobMemoryAllocModule">
-      <C_Name>gEfiHobMemoryAllocModuleGuid</C_Name>
-      <GuidValue>F8E21975-0899-4F58-A4BE-5525A9C6D77A</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FileInfo">
-      <C_Name>gEfiFileInfoGuid</C_Name>
-      <GuidValue>09576E92-6D3F-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FileSystemInfo">
-      <C_Name>gEfiFileSystemInfoGuid</C_Name>
-      <GuidValue>09576E93-6D3F-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FileSystemVolumeLabelInfoId">
-      <C_Name>gEfiFileSystemVolumeLabelInfoIdGuid</C_Name>
-      <GuidValue>DB47D7D3-FE81-11D3-9A35-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="AuthenticationChapRadius">
-      <C_Name>gEfiAuthenticationChapRadiusGuid</C_Name>
-      <GuidValue>D6062B50-15CA-11DA-9219-001083FFCA4D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="AuthenticationChapLocal">
-      <C_Name>gEfiAuthenticationChapLocalGuid</C_Name>
-      <GuidValue>C280C73E-15CA-11DA-B0CA-001083FFCA4D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmSha1">
-      <C_Name>gEfiHashAlgorithmSha1Guid</C_Name>
-      <GuidValue>2AE9D80F-3FB2-4095-B7B1-E93157B946B6</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmSha224">
-      <C_Name>gEfiHashAlgorithmSha224Guid</C_Name>
-      <GuidValue>8DF01A06-9BD5-4BF7-B021-DB4FD9CCF45B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmSha256">
-      <C_Name>gEfiHashAlgorithmSha256Guid</C_Name>
-      <GuidValue>51AA59DE-FDF2-4EA3-BC63-875FB7842EE9</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmSha384">
-      <C_Name>gEfiHashAlgorithmSha384Guid</C_Name>
-      <GuidValue>EFA96432-DE33-4DD2-AEE6-328C33DF777A</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmSha512">
-      <C_Name>gEfiHashAlgorithmSha512Guid</C_Name>
-      <GuidValue>CAA4381E-750C-4770-B870-7A23B4E42130</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashAlgorithmMD5">
-      <C_Name>gEfiHashAlgorithmMD5Guid</C_Name>
-      <GuidValue>0AF7C79C-65B5-4319-B0AE-44EC484E4AD7</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="BootObjectAuthorizationParmset">
-      <C_Name>gBootObjectAuthorizationParmsetGuid</C_Name>
-      <GuidValue>EDD35E31-07B9-11D2-83A3-00A0C91FADCF</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EventLegacyBoot">
-      <C_Name>gEfiEventLegacyBootGuid</C_Name>
-      <GuidValue>2A571201-4966-47F6-8B86-F31E41F32F10</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EventExitBootServices">
-      <C_Name>gEfiEventExitBootServicesGuid</C_Name>
-      <GuidValue>27ABF055-B1B8-4C26-8048-748F37BAA2DF</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EventVirtualAddressChange">
-      <C_Name>gEfiEventVirtualAddressChangeGuid</C_Name>
-      <GuidValue>13FA7698-C831-49C7-87EA-8F43FCC25196</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EventMemoryMapChange">
-      <C_Name>gEfiEventMemoryMapChangeGuid</C_Name>
-      <GuidValue>78BEE926-692F-48FD-9EDB-01422EF0D7AB</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EventReadyToBoot">
-      <C_Name>gEfiEventReadyToBootGuid</C_Name>
-      <GuidValue>7CE88FB3-4BD7-4679-87A8-A8D8DEE50D2B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HardwareErrorVariable">
-      <C_Name>gEfiHardwareErrorVariableGuid</C_Name>
-      <GuidValue>414E6BDD-E47B-47CC-B244-BB61020CF516</GuidValue>
-      <HelpText/>
-    </Entry>
-  </GuidDeclarations>
-  <ProtocolDeclarations>
-    <Entry Name="Bds">
-      <C_Name>gEfiBdsArchProtocolGuid</C_Name>
-      <GuidValue>665E3FF6-46CC-11D4-9A38-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Cpu">
-      <C_Name>gEfiCpuArchProtocolGuid</C_Name>
-      <GuidValue>26BACCB1-6F42-11D4-BCE7-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Metronome">
-      <C_Name>gEfiMetronomeArchProtocolGuid</C_Name>
-      <GuidValue>26BACCB2-6F42-11D4-BCE7-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="MonotonicCounter">
-      <C_Name>gEfiMonotonicCounterArchProtocolGuid</C_Name>
-      <GuidValue>1DA97072-BDDC-4B30-99F1-72A0B56FFF2A</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="RealTimeClock">
-      <C_Name>gEfiRealTimeClockArchProtocolGuid</C_Name>
-      <GuidValue>27CFAC87-46CC-11D4-9A38-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Reset">
-      <C_Name>gEfiResetArchProtocolGuid</C_Name>
-      <GuidValue>27CFAC88-46CC-11D4-9A38-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Runtime">
-      <C_Name>gEfiRuntimeArchProtocolGuid</C_Name>
-      <GuidValue>b7dfb4e1-052f-449f-87be-9818fc91b733</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Security">
-      <C_Name>gEfiSecurityArchProtocolGuid</C_Name>
-      <GuidValue>A46423E3-4617-49F1-B9FF-D1BFA9115839</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="StatusCode">
-      <C_Name>gEfiStatusCodeRuntimeProtocolGuid</C_Name>
-      <GuidValue>D2B2B828-0826-48A7-B3DF-983C006024F0</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Timer">
-      <C_Name>gEfiTimerArchProtocolGuid</C_Name>
-      <GuidValue>26BACCB3-6F42-11D4-BCE7-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Variable">
-      <C_Name>gEfiVariableArchProtocolGuid</C_Name>
-      <GuidValue>1E5668E2-8481-11D4-BCF1-0080C73C8881</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="VariableWrite">
-      <C_Name>gEfiVariableWriteArchProtocolGuid</C_Name>
-      <GuidValue>6441F818-6362-4E44-B570-7DBA31DD2453</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="WatchdogTimer">
-      <C_Name>gEfiWatchdogTimerArchProtocolGuid</C_Name>
-      <GuidValue>665E3FF5-46CC-11D4-9A38-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FirmwareVolumeBlock">
-      <C_Name>gEfiFirmwareVolumeBlockProtocolGuid</C_Name>
-      <GuidValue>DE28BC59-6228-41BD-BDF6-A3B9ADB58DA1</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FormBrowser">
-      <C_Name>gEfiFormBrowserProtocolGuid</C_Name>
-      <GuidValue>E5A1333E-E1B4-4D55-CEEB-35C3EF133443</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PcdProtocol">
-      <C_Name>gPcdProtocolGuid</C_Name>
-      <GuidValue>11B34006-D85B-4D0A-A290-D5A571310EF7</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Bis">
-      <C_Name>gEfiBisProtocolGuid</C_Name>
-      <GuidValue>0B64AAB0-5429-11D4-9816-00A0C91FADCF</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="BlockIo">
-      <C_Name>gEfiBlockIoProtocolGuid</C_Name>
-      <GuidValue>964E5B21-6459-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="BusSpecificDriverOverride">
-      <C_Name>gEfiBusSpecificDriverOverrideProtocolGuid</C_Name>
-      <GuidValue>3BC1B285-8A15-4A82-AABF-4D7D13FB3265</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ComponentName">
-      <C_Name>gEfiComponentNameProtocolGuid</C_Name>
-      <GuidValue>107A772C-D5E1-11D4-9A46-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ComponentName2">
-      <C_Name>gEfiComponentName2ProtocolGuid</C_Name>
-      <GuidValue>6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DebugPort">
-      <C_Name>gEfiDebugPortProtocolGuid</C_Name>
-      <GuidValue>EBA4E8D2-3858-41EC-A281-2647BA9660D0</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DebugSupport">
-      <C_Name>gEfiDebugSupportProtocolGuid</C_Name>
-      <GuidValue>2755590C-6F3C-42FA-9EA4-A3BA543CDA25</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Decompress">
-      <C_Name>gEfiDecompressProtocolGuid</C_Name>
-      <GuidValue>D8117CFE-94A6-11D4-9A3A-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DevicePath">
-      <C_Name>gEfiDevicePathProtocolGuid</C_Name>
-      <GuidValue>09576E91-6D3F-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DiskIo">
-      <C_Name>gEfiDiskIoProtocolGuid</C_Name>
-      <GuidValue>CE345171-BA0B-11D2-8E4F-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DriverBinding">
-      <C_Name>gEfiDriverBindingProtocolGuid</C_Name>
-      <GuidValue>18A031AB-B443-4D1A-A5C0-0C09261E9F71</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DriverConfiguration">
-      <C_Name>gEfiDriverConfigurationProtocolGuid</C_Name>
-      <GuidValue>107A772B-D5E1-11D4-9A46-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UefiDriverConfiguration">
-      <C_Name>gUefiDriverConfigurationProtocolGuid</C_Name>
-      <GuidValue>BFD7DC1D-24F1-40D9-82E7-2E09BB6B4EBE</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DriverDiagnostics">
-      <C_Name>gEfiDriverDiagnosticsProtocolGuid</C_Name>
-      <GuidValue>0784924F-E296-11D4-9A49-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UefiDriverDiagnostics">
-      <C_Name>gUefiDriverDiagnosticsProtocolGuid</C_Name>
-      <GuidValue>4D330321-025F-4AAC-90D8-5ED900173B63</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Ebc">
-      <C_Name>gEfiEbcProtocolGuid</C_Name>
-      <GuidValue>13AC6DD1-73D0-11D4-B06B-00AA00BD6DE7</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="NetworkInterfaceIdentifier">
-      <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid</C_Name>
-      <GuidValue>E18541CD-F755-4F73-928D-643C8A79B229</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="NetworkInterfaceIdentifier31">
-      <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid_31</C_Name>
-      <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="LoadedImage">
-      <C_Name>gEfiLoadedImageProtocolGuid</C_Name>
-      <GuidValue>5B1B31A1-9562-11D2-8E3F-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="LoadFile">
-      <C_Name>gEfiLoadFileProtocolGuid</C_Name>
-      <GuidValue>56EC3091-954C-11D2-8E3F-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PciIo">
-      <C_Name>gEfiPciIoProtocolGuid</C_Name>
-      <GuidValue>4CF5B200-68B8-4CA5-9EEC-B23E3F50029A</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PciRootBridgeIo">
-      <C_Name>gEfiPciRootBridgeIoProtocolGuid</C_Name>
-      <GuidValue>2F707EBB-4A1A-11D4-9A38-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PlatformDriverOverride">
-      <C_Name>gEfiPlatformDriverOverrideProtocolGuid</C_Name>
-      <GuidValue>6B30C738-A391-11D4-9A3B-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PxeBaseCode">
-      <C_Name>gEfiPxeBaseCodeProtocolGuid</C_Name>
-      <GuidValue>03C4E603-AC28-11D3-9A2D-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PxeBaseCodeCallBack">
-      <C_Name>gEfiPxeBaseCodeCallbackProtocolGuid</C_Name>
-      <GuidValue>245DCA21-FB7B-11D3-8F01-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ScsiPassThru">
-      <C_Name>gEfiScsiPassThruProtocolGuid</C_Name>
-      <GuidValue>A59E8FCF-BDA0-43BB-90B1-D3732ECAA877</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SerialIo">
-      <C_Name>gEfiSerialIoProtocolGuid</C_Name>
-      <GuidValue>BB25CF6F-F1D4-11D2-9A0C-0090273FC1FD</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SimpleFileSystem">
-      <C_Name>gEfiSimpleFileSystemProtocolGuid</C_Name>
-      <GuidValue>964E5B22-6459-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SimpleNetwork">
-      <C_Name>gEfiSimpleNetworkProtocolGuid</C_Name>
-      <GuidValue>A19832B9-AC25-11D3-9A2D-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SimplePointer">
-      <C_Name>gEfiSimplePointerProtocolGuid</C_Name>
-      <GuidValue>31878C87-0B75-11D5-9A4F-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SimpleTextIn">
-      <C_Name>gEfiSimpleTextInProtocolGuid</C_Name>
-      <GuidValue>387477C1-69C7-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SimpleTextOut">
-      <C_Name>gEfiSimpleTextOutProtocolGuid</C_Name>
-      <GuidValue>387477C2-69C7-11D2-8E39-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UgaDraw">
-      <C_Name>gEfiUgaDrawProtocolGuid</C_Name>
-      <GuidValue>982C298B-F4FA-41CB-B838-77AA688FB839</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UgaIo">
-      <C_Name>gEfiUgaIoProtocolGuid</C_Name>
-      <GuidValue>61A4D49E-6F68-4F1B-B922-A86EED0B07A2</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UnicodeCollation">
-      <C_Name>gEfiUnicodeCollationProtocolGuid</C_Name>
-      <GuidValue>1D85CD7F-F43D-11D2-9A0C-0090273FC14D</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UsbHc">
-      <C_Name>gEfiUsbHcProtocolGuid</C_Name>
-      <GuidValue>F5089266-1AA0-4953-97D8-562F8A73B519</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="UsbIo">
-      <C_Name>gEfiUsbIoProtocolGuid</C_Name>
-      <GuidValue>2B2F68D6-0CD2-44CF-8E8B-BBA20B1B5B75</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Arp">
-      <C_Name>gEfiArpProtocolGuid</C_Name>
-      <GuidValue>F4B427BB-BA21-4F16-BC4E-43E416AB619C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ArpServiceBinding">
-      <C_Name>gEfiArpServiceBindingProtocolGuid</C_Name>
-      <GuidValue>F44C00EE-1F2C-4A00-AA09-1C9F3E0800A3</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Dhcp4">
-      <C_Name>gEfiDhcp4ProtocolGuid</C_Name>
-      <GuidValue>8A219718-4EF5-4761-91C8-C0F04BDA9E56</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Dhcp4ServiceBinding">
-      <C_Name>gEfiDhcp4ServiceBindingProtocolGuid</C_Name>
-      <GuidValue>9D9A39D8-BD42-4A73-A4D5-8EE94BE11380</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Ip4">
-      <C_Name>gEfiIp4ProtocolGuid</C_Name>
-      <GuidValue>41D94CD2-35B6-455A-8258-D4E51334AADD</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Ip4ServiceBinding">
-      <C_Name>gEfiIp4ServiceBindingProtocolGuid</C_Name>
-      <GuidValue>C51711E7-B4BF-404A-BFB8-0A048EF1FFE4</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Ip4Config">
-      <C_Name>gEfiIp4ConfigProtocolGuid</C_Name>
-      <GuidValue>3B95AA31-3793-434B-8667-C8070892E05E</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ManagedNetwork">
-      <C_Name>gEfiManagedNetworkProtocolGuid</C_Name>
-      <GuidValue>3B95AA31-3793-434B-8667-C8070892E05E</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ManagedNetworkServiceBinding">
-      <C_Name>gEfiManagedNetworkServiceBindingProtocolGuid</C_Name>
-      <GuidValue>F36FF770-A7E1-42CF-9ED2-56F0F271F44C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Mtftp4">
-      <C_Name>gEfiMtftp4ProtocolGuid</C_Name>
-      <GuidValue>78247C57-63DB-4708-99C2-A8B4A9A61F6B</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Mtftp4ServiceBinding">
-      <C_Name>gEfiMtftp4ServiceBindingProtocolGuid</C_Name>
-      <GuidValue>2FE800BE-8F01-4AA6-946B-D71388E1833F</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Tcp4">
-      <C_Name>gEfiTcp4ProtocolGuid</C_Name>
-      <GuidValue>65530BC7-A359-410F-B010-5AADC7EC2B62</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Tcp4ServiceBinding">
-      <C_Name>gEfiTcp4ServiceBindingProtocolGuid</C_Name>
-      <GuidValue>00720665-67EB-4A99-BAF7-D3C33A1C7CC9</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Udp4">
-      <C_Name>gEfiUdp4ProtocolGuid</C_Name>
-      <GuidValue>3AD9DF29-4501-478D-B1F8-7F7FE70E50F3</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Udp4ServiceBinding">
-      <C_Name>gEfiUdp4ServiceBindingProtocolGuid</C_Name>
-      <GuidValue>83F01464-99BD-45E5-B383-AF6305D8E9E6</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="AuthenticationInfo">
-      <C_Name>gEfiAuthenticationInfoProtocolGuid</C_Name>
-      <GuidValue>7671D9D0-53DB-4173-AA69-2327F21F0BC7</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DevicePathFromText">
-      <C_Name>gEfiDevicePathFromTextProtocolGuid</C_Name>
-      <GuidValue>05C99A21-C70F-4AD2-8A5F-35DF3343F51E</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DevicePathToText">
-      <C_Name>gEfiDevicePathToTextProtocolGuid</C_Name>
-      <GuidValue>8B843E20-8132-4852-90CC-551A4E4A7F1C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DevicePathUtilities">
-      <C_Name>gEfiDevicePathUtilitiesProtocolGuid</C_Name>
-      <GuidValue>0379BE4E-D706-437D-B037-EDB82FB772A4</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EdidActive">
-      <C_Name>gEfiEdidActiveProtocolGuid</C_Name>
-      <GuidValue>BD8C1056-9F36-44EC-92A8-A6337F817986</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EdidDiscovered">
-      <C_Name>gEfiEdidDiscoveredProtocolGuid</C_Name>
-      <GuidValue>1C0C34F6-D380-41FA-A049-8AD06C1A66AA</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EdidOverride">
-      <C_Name>gEfiEdidOverrideProtocolGuid</C_Name>
-      <GuidValue>48ECB431-FB72-45C0-A922-F458FE040BD5</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="GraphicsOutput">
-      <C_Name>gEfiGraphicsOutputProtocolGuid</C_Name>
-      <GuidValue>9042A9DE-23DC-4A38-96FB-7ADED080516A</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Hash">
-      <C_Name>gEfiHashProtocolGuid</C_Name>
-      <GuidValue>C5184932-DBA5-46DB-A5BA-CC0BDA9C1435</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="HashServiceBinding">
-      <C_Name>gEfiHashServiceBindingProtocolGuid</C_Name>
-      <GuidValue>42881C98-A4F3-44B0-A39D-DFA18667D8CD</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="IScsiInitiatorName">
-      <C_Name>gEfiIScsiInitiatorNameProtocolGuid</C_Name>
-      <GuidValue>59324945-EC44-4C0D-B1CD-9DB139DF070C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ScsiIoExt">
-      <C_Name>gEfiScsiIoProtocolGuid</C_Name>
-      <GuidValue>932F4736-2362-4002-803E-3CD54B138F85</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="ExtScsiPassThru">
-      <C_Name>gEfiExtScsiPassThruProtocolGuid</C_Name>
-      <GuidValue>143B7632-B81B-4CB7-ABD3-B625A5B9BFFE</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="TapeIo">
-      <C_Name>gEfiTapeIoProtocolGuid</C_Name>
-      <GuidValue>1E93E633-D65A-459E-AB84-93D9EC266D18</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Usb2Hc">
-      <C_Name>gEfiUsb2HcProtocolGuid</C_Name>
-      <GuidValue>3E745226-9818-45B6-A2AC-D7CD0E8BA2BC</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SecurityPolicy">
-      <C_Name>gEfiSecurityPolicyProtocolGuid</C_Name>
-      <GuidValue>78E4D245-CD4D-4A05-A2BA-4743E86CFCAB</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="AcpiSupport">
-      <C_Name>gEfiAcpiTableProtocolGuid</C_Name>
-      <GuidValue>FFE06BDD-6107-46A6-7BB2-5A9C7EC5275C</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DeviceIo">
-      <C_Name>gEfiDeviceIoProtocolGuid</C_Name>
-      <GuidValue>AF6AC311-84C3-11D2-8E3C-00A0C969723B</GuidValue>
-      <HelpText/>
-    </Entry>
-  </ProtocolDeclarations>
-  <PpiDeclarations>
-    <Entry Name="BootInRecoveryMode">
-      <C_Name>gEfiPeiBootInRecoveryModePpiGuid</C_Name>
-      <GuidValue>17EE496A-D8E4-4B9A-94D1-CE8272300850</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="CpuIo">
-      <C_Name>gEfiPeiCpuIoPpiInstalledGuid</C_Name>
-      <GuidValue>E6AF1F7B-FC3F-46DA-A828-A3B457A44282</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="DxeIpl">
-      <C_Name>gEfiDxeIplPpiGuid</C_Name>
-      <GuidValue>0AE8CE5D-E448-4437-A8D7-EBF5F194F731</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="EndOfPeiSignal">
-      <C_Name>gEfiEndOfPeiSignalPpiGuid</C_Name>
-      <GuidValue>605EA650-C65C-42E1-BA80-91A52AB618C6</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="FvFileLoader">
-      <C_Name>gEfiPeiFvFileLoaderPpiGuid</C_Name>
-      <GuidValue>7E1F0D85-04FF-4BB2-866A-31A2996A48A8</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="MasterBootMode">
-      <C_Name>gEfiPeiMasterBootModePpiGuid</C_Name>
-      <GuidValue>7408D748-FC8C-4EE6-9288-C4BEC092A410</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="MemoryDiscovered">
-      <C_Name>gEfiPeiMemoryDiscoveredPpiGuid</C_Name>
-      <GuidValue>F894643D-C449-42D1-8EA8-85BDD8C65BDE</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Reset">
-      <C_Name>gEfiPeiResetPpiGuid</C_Name>
-      <GuidValue>EF398D58-9DFD-4103-BF94-78C6F4FE712F</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="SecPlatformInformation">
-      <C_Name>gEfiSecPlatformInformationPpiGuid</C_Name>
-      <GuidValue>6F8C2B35-FEF4-448D-8256-E11B19D61077</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="StatusCode">
-      <C_Name>gEfiPeiStatusCodePpiGuid</C_Name>
-      <GuidValue>229832D3-7A30-4B36-B827-F40CB7D45436</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="PcdPpi">
-      <C_Name>gPcdPpiGuid</C_Name>
-      <GuidValue>06E81C58-4AD7-44BC-8390-F10265F72480</GuidValue>
-      <HelpText/>
-    </Entry>
-    <Entry Name="Stall">
-      <C_Name>gEfiPeiStallPpiGuid</C_Name>
-      <GuidValue>1F4C6F90-B06B-48D8-A201-BAE5F1CD7D56</GuidValue>
-      <HelpText/>
-    </Entry>
-  </PpiDeclarations>
-  <PcdDeclarations>
-    <PcdEntry>
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-      <Token>0x00000001</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
-                number of characters (not counting the NULL-terminator) in a
-                Unicode string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>
-      <Token>0x00000002</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
-                of characters (not counting the NULL-terminator) in an ASCII
-                string cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdMaximumLinkedListLength</C_Name>
-      <Token>0x00000003</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
-                of nodes (not counting the list header) in a linked list
-                cannot exceed it.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdSpinLockTimeout</C_Name>
-      <Token>0x00000004</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>10000000</DefaultValue>
-      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
-                value (unit: millisecond) for spin lock.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0f</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>0x80000000</DefaultValue>
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <Token>0x00000007</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x06</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Progress Code, Error Code and Debug Code.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <Token>0x00000008</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0xAF</DefaultValue>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000009</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of
-                Performance Measurement.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPostCodePropertyMask</C_Name>
-      <Token>0x0000000b</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT8</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
-                Code, Post Code Description.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdPciExpressBaseAddress</C_Name>
-      <Token>0x0000000a</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT64</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>0xE0000000</DefaultValue>
-      <HelpText>The base address of PCI Express MMIO window.</HelpText>
-    </PcdEntry>
-    <PcdEntry SupArchList="IPF">
-      <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>
-      <Token>0x0000000c</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT64</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>0x0ffffc000000</DefaultValue>
-      <HelpText>The base address of IPF IO Block</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdFSBClock</C_Name>
-      <Token>0x0000000c</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>200000000</DefaultValue>
-      <HelpText>This value is FSB Clock frequency. Its unit is Hz and its default value is 200000000, that means FSB frequency is 200Mhz.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdComponentNameDisable</C_Name>
-      <Token>0x0000000d</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this value is set TRUE, autogen will replace Compoent Name Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDriverDiagnostics2Disable</C_Name>
-      <Token>0x0000000e</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this value is set TRUE, autogen will replace Driver Diagnostics Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdComponentName2Disable</C_Name>
-      <Token>0x0000000f</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this value is set TRUE, autogen will replace Compoent Name Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDriverDiagnostics2Disable</C_Name>
-      <Token>0x00000010</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>If this value is set TRUE, autogen will replace Driver Diagnostics Protocol instance with NULL.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>
-      <Token>0x101</Token>
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>
-      <DefaultValue>320</DefaultValue>
-      <HelpText>This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console.</HelpText>
-    </PcdEntry>
-  </PcdDeclarations>
-</PackageSurfaceArea>
diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa
deleted file mode 100644
index a6b47792a6..0000000000
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>AtapiPassThruDxe</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>E49061CE-99A7-41d3-AB3A-36E5CFBAD63E</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Description file for the Atapi Pass Thru driver.</Abstract>
-    <Description>This driver simulates SCSI devices with Atapi devices to test the SCSI IO protocol.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>AtapiPassThruDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <SourceFiles>
-    <Filename>AtapiPassThru.c</Filename>
-    <Filename>AtapiPassThru.h</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>DriverSupportedEfiVersion.c</Filename>
-  </SourceFiles>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseMemoryLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <Protocols>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiExtScsiPassThruProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDriverSupportedEfiVersionProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdSupportScsiPassThru</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Atapi Pass Thru driver supports to produce Scsi Pass Thru protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdExtSupportScsiPassThru</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Atapi Pass Thru driver supports to produce Ext Scsi Pass Thru protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDriverSupportedEfiVersion</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The firmware version field filled in EFI Driver Supported EFI Version protocol.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeAtapiPassThru</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PackageDependencies>
-    <Package PackageVersion="0.1" PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageVersion="0.1" PackageGuid="AA3865E8-7F30-4f59-8696-99F560101852"/>
-  </PackageDependencies>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
deleted file mode 100644
index 0620eb24ac..0000000000
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <MsaHeader>
-    <ModuleName>AtapiPassThruDxe</ModuleName>
-    <ModuleType>UEFI_DRIVER</ModuleType>
-    <GuidValue>555F76EA-785F-40d7-9174-153C43636C68</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Component description file for CirrusLogic5430 module.</Abstract>
-    <Description>Cirrus Logic 5430 Controller Driver.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>AtapiPassThruDxe</OutputFileBasename>
-  </ModuleDefinitions>
-  <SourceFiles>
-    <Filename>CirrusLogic5430.c</Filename>
-    <Filename>CirrusLogic5430.h</Filename>
-    <Filename>CirrusLogic5430GraphicsOutput.c</Filename>
-    <Filename>CirrusLogic5430UgaDraw.c</Filename>
-    <Filename>ComponentName.c</Filename>
-    <Filename>DriverSupportedEfiVersion.c</Filename>
-  </SourceFiles>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>DebugLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiDriverEntryPoint</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiBootServicesTableLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>MemoryAllocationLib</Keyword>
-    </LibraryClass>
-  </LibraryClassDefinitions>
-  <Protocols>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="BY_START">
-      <ProtocolCName>gEfiExtScsiPassThruProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="TO_START">
-      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>
-    </Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">
-      <ProtocolCName>gEfiDriverSupportedEfiVersionProtocolGuid</ProtocolCName>
-    </Protocol>
-  </Protocols>
-  <PcdCoded>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdSupportGop</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Cirrus Logic 5430 driver supports to produce GOP protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="FEATURE_FLAG">
-      <C_Name>PcdExtSupportUga</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>Cirrus Logic 5430 driver supports to produce UGA protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry PcdItemType="DYNAMIC">
-      <C_Name>PcdDriverSupportedEfiVersion</C_Name>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The firmware version field filled in EFI Driver Supported EFI Version protocol.</HelpText>
-    </PcdEntry>
-  </PcdCoded>
-  <Externs>
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
-    <Extern>
-      <ModuleEntryPoint>InitializeCirrusLogic5430</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <PackageDependencies>
-    <Package PackageVersion="0.1" PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>
-    <Package PackageVersion="0.1" PackageGuid="AA3865E8-7F30-4f59-8696-99F560101852"/>
-  </PackageDependencies>
-</ModuleSurfaceArea>
-\ No newline at end of file
diff --git a/OptionRomPkg/OptionRomPkg.nspd b/OptionRomPkg/OptionRomPkg.nspd
deleted file mode 100644
index 7a4d6d0500..0000000000
--- a/OptionRomPkg/OptionRomPkg.nspd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <SpdHeader>
-    <PackageName>OptionRomPkg</PackageName>
-    <GuidValue>AA3865E8-7F30-4f59-8696-99F560101852</GuidValue>
-    <Version>0.1</Version>
-    <Abstract>Option Rom Package Reference Implementations.</Abstract>
-    <Description>This package is designed to interoperate with the EDK II open source project
-at http://www.tianocore.org, and this package is required to build PCI compliant
-Option ROM image for all CPU architectures, including EBC target.
-A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.</Description>
-    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
-    <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>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </SpdHeader>
-  <PackageDefinitions>
-    <ReadOnly>false</ReadOnly>
-    <RePackage>false</RePackage>
-  </PackageDefinitions>
-  <MsaFiles>
-    <Filename>AtapiPassThruDxe/AtapiPassThruDxe.msa</Filename>
-    <Filename>CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa</Filename>
-  </MsaFiles>
-  <GuidDeclarations>
-    <Entry Name="OptionRomPkgTokenSpace" GuidTypeList="TOKEN_SPACE_GUID">
-      <C_Name>gOptionRomPkgTokenSpaceGuid</C_Name>
-      <GuidValue>1E43298F-3478-41a7-B577-86064635C728</GuidValue>
-      <HelpText>Token space GUID for OptionRomPkg</HelpText>
-    </Entry>
-  </GuidDeclarations>
-  <PcdDeclarations>
-    <PcdEntry>
-      <C_Name>PcdSupportScsiPassThru</C_Name>
-      <Token>0x00010001</Token>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>Option Rom Package driver to support the Scsi Pass Thru protocol</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdSupportExtScsiPassThru</C_Name>
-      <Token>0x00010002</Token>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>Option Rom Package driver to support the Ext Scsi Pass Thru protocol</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdDriverSupportedEfiVersion</C_Name>
-      <Token>0x00010003</Token>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>UINT32</DatumType>
-      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>0x0002000a</DefaultValue>
-      <HelpText>The firmware version field of Driver Supported EFI version protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdSupportGop</C_Name>
-      <Token>0x00010004</Token>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>The driver in OptionRomPkg to support GOP protocol.</HelpText>
-    </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdSupportUga</C_Name>
-      <Token>0x00010005</Token>
-      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>TRUE</DefaultValue>
-      <HelpText>The driver in OptionRomPkg to support UGA protocol.</HelpText>
-    </PcdEntry>
-  </PcdDeclarations>
-</PackageSurfaceArea>
-\ No newline at end of file