Clean up MSA file of the checked in modules which include:

1) remove unused library class
2) remove unreferenced GUIDs

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2401 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
index 92edf3e0aacadcc3488ea2a47f26dd78bf755edb..f58eddd8bf63254764e67bf3385ff721a3d56b02 100644 (file)
--- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
+++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
@@ -22,9 +22,6 @@
     <OutputFileBasename>HelloWorld</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>HelloWorld</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
index 6a74c262de99ac3ced1e0924ffbe79814afa42a8..a675ad563d8bb64a8b68a6dd3085563038b56cff 100644 (file)
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>CirrusLogic5430UgaDraw</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>555F76EA-785F-40d7-9174-153C43636C68</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for CirrusLogic5430 module</Abstract>\r
   <MsaHeader>\r
     <ModuleName>CirrusLogic5430UgaDraw</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>555F76EA-785F-40d7-9174-153C43636C68</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for CirrusLogic5430 module</Abstract>\r

-    <Description>\r
-      Cirrus Logic 5430 Controller Driver.This driver is a sample implementation\r
+    <Description>Cirrus Logic 5430 Controller Driver.This driver is a sample implementation\r

       of the UGA Draw Protocol for the Cirrus Logic 5430 family of PCI video controllers.\r
       This driver is only usable in the EFI pre-boot environment.  This sample is\r
       intended to show how the UGA Draw Protocol is able to function.  The UGA I/O\r
       Protocol is not implemented in this sample.  A fully compliant EFI UGA driver\r
       requires both the UGA Draw and the UGA I/O Protocol.  Please refer to Microsoft's\r
       documentation on UGA for details on how to write a UGA driver that is able\r
       of the UGA Draw Protocol for the Cirrus Logic 5430 family of PCI video controllers.\r
       This driver is only usable in the EFI pre-boot environment.  This sample is\r
       intended to show how the UGA Draw Protocol is able to function.  The UGA I/O\r
       Protocol is not implemented in this sample.  A fully compliant EFI UGA driver\r
       requires both the UGA Draw and the UGA I/O Protocol.  Please refer to Microsoft's\r
       documentation on UGA for details on how to write a UGA driver that is able\r

-      to function both in the EFI pre-boot environment and from the OS runtime.\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+      to function both in the EFI pre-boot environment and from the OS runtime.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -40,15 +38,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>MemoryAllocationLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>MemoryAllocationLib</Keyword>\r
     </LibraryClass>\r


@@ -81,4 +73,4 @@
       <ComponentName>gCirrusLogic5430ComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
       <ComponentName>gCirrusLogic5430ComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
index d4af1f85bfc2db6e2d2a2f8b6edfdaa943c4a9e9..9e71d0e97055b31309d9000fc3d5e5a30bbad1c3 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Ehci</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Ehci</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Ehci module</Abstract>\r
     <Description>This module provides USB2 Host Controller Protocol implementation for Enhanced Host Controller Interface</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Ehci module</Abstract>\r
     <Description>This module provides USB2 Host Controller Protocol implementation for Enhanced Host Controller Interface</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 9d73da2d05bcbff5f3084e12c4d41935e23b0b3b..712ae999da6998f95b1a7f85e8d356533033c7e7 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -9,7 +9,7 @@
     <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO\r
        space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
        support hot plug.</Description>\r
     <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO\r
        space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
        support hot plug.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -54,9 +54,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DevicePathLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DevicePathLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PeCoffGetEntryPointLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r


@@ -145,9 +142,6 @@
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>\r
     </GuidCNames>\r

-    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>\r
-    </GuidCNames>\r

     <GuidCNames Usage="PRIVATE">\r
       <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="PRIVATE">\r
       <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
index 32d673fa04a611375500a83548218ddce1c8cfe0..4f5aa7053eb207293d40de25adf3b4623675cac7 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Uhci</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Uhci</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Uhci module</Abstract>\r
     <Description>This module provides USB Host Controller Protocol implementation for Universal Host Controller Interface</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Uhci module</Abstract>\r
     <Description>This module provides USB Host Controller Protocol implementation for Universal Host Controller Interface</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
index 419c433b42b0b0125fcde04c14b29ec57a9435a0..b9c7b28ffa97862ba99e13c4b8f2c81c5a5a0fdf 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Undi</ModuleName>\r
     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>Undi</ModuleName>\r
     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Undi module.</Abstract>\r
     <Description>This module provides support for Universal Network Driver Interface</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Undi module.</Abstract>\r
     <Description>This module provides support for Universal Network Driver Interface</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -22,33 +22,21 @@
     <OutputFileBasename>Undi</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>Undi</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>HobLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r


@@ -62,7 +50,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r

   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="TO_START">\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="TO_START">\r

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
index d5323ba7cd03fcb79f8a76f10ca37107fd118c01..4dba8273b84007c331b5d87f7ee4602450b7f820 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>ScsiBus</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>0167CCC4-D0F7-4f21-A3EF-9E64B7CDCE8B</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Scsi Bus module.</Abstract>\r
   <MsaHeader>\r
     <ModuleName>ScsiBus</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>0167CCC4-D0F7-4f21-A3EF-9E64B7CDCE8B</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Scsi Bus module.</Abstract>\r

-    <Description>\r
-      SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -42,9 +40,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkScsiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkScsiLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
index 0ed8f2ed16ac93941d93393732a68fcb7de47b69..eb722a2116380e446da950c5d8ad667315f9f621 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>ScsiDisk</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>0A66E322-3740-4cce-AD62-BD172CECCA35</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Scsi Disk module.Revision History</Abstract>\r
   <MsaHeader>\r
     <ModuleName>ScsiDisk</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>0A66E322-3740-4cce-AD62-BD172CECCA35</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Scsi Disk module.Revision History</Abstract>\r

-    <Description>\r
-       Scsi Disk driver. This driver detected the Scsi disk media and export block io protocol\r
-    </Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>Scsi Disk driver. This driver detected the Scsi disk media and export block io protocol</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -33,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r


@@ -45,9 +40,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkScsiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>EdkScsiLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
index a8884352e3ab93510fd5b851616fc426dfa55544..ac857bd07ebad5b090d8009792d2d855c222ae2a 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>UsbBot</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>UsbBot</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbBot module</Abstract>\r
     <Description>This module provides support for USB Bulk-Only Transport</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbBot module</Abstract>\r
     <Description>This module provides support for USB Bulk-Only Transport</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
index 6e43a1b94065ee2daf93a27cc9ab637a13be0b0d..4fb76bbf809582101b04b3aa55109805db175b29 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
@@ -76,7 +76,6 @@ typedef struct {
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBotDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBotComponentName;\r
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBotDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBotComponentName;\r

-extern EFI_GUID                     gUsbBotDriverGuid;\r

 \r
 //\r
 // Bot Driver Binding Protocol\r
 \r
 //\r
 // Bot Driver Binding Protocol\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
index 974c419208e16337170a51cce8cdc35245f76bb1..bc7715dfd66b50956d6069509471a66dc088908a 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>UsbBus</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>UsbBus</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbBus module</Abstract>\r
     <Description>This module provides support for USB bus enumeration and USB IO protocol implementation</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbBus module</Abstract>\r
     <Description>This module provides support for USB bus enumeration and USB IO protocol implementation</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
index ce0e69801373a08cfa0217720e8595edee5b4e99..be60aedb769fbace28e5e485228d9403a9ba5e08 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
@@ -173,7 +173,6 @@ typedef struct _usb_bus_controller_device {
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBusDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBusComponentName;\r
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBusDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBusComponentName;\r

-extern EFI_GUID                     gUSBBusDriverGuid;\r

 \r
 //\r
 // EFI_DRIVER_BINDING_PROTOCOL Protocol Interface\r
 \r
 //\r
 // EFI_DRIVER_BINDING_PROTOCOL Protocol Interface\r

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
index f6b3186d94cc728c9d5096084634d39fb7da117e..7eec693f2dc6e35f90a4405b8905df1c683efa50 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>UsbMassStorage</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>UsbMassStorage</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbMassStorage module</Abstract>\r
     <Description>This module provides Block IO interface for USB mass storage class</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbMassStorage module</Abstract>\r
     <Description>This module provides Block IO interface for USB mass storage class</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -31,18 +31,12 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>EdkUsbLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>MemoryAllocationLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>MemoryAllocationLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
index 1b10780afc25967e0ae3963f5fae58f1d4c752e4..0cbae7a7c3c7512f13a5a84815b0a30bf65b2d71 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>UsbMouse</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>UsbMouse</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r


@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbMouse module</Abstract>\r
     <Description>This module provides support for USB mouse device</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for UsbMouse module</Abstract>\r
     <Description>This module provides support for USB mouse device</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
index ac071db311475b26f554d64f6d7e8f73ef3d4ccd..47aecc87dafc40e29eae0e72334cb90993294a13 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
@@ -73,7 +73,6 @@ USBMouseRecoveryHandler (
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbMouseDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMouseComponentName;\r
 //\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbMouseDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMouseComponentName;\r

-extern EFI_GUID                     gEfiUsbMouseDriverGuid;\r

 \r
 VOID\r
 MouseReportStatusCode (\r
 \r
 VOID\r
 MouseReportStatusCode (\r

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index 55d2dbacdf79d4f16a5de110babb152474db7cb3..1ed9c09df1fbfcb6d7f35eb086489bb34736b68d 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>DxeMain</ModuleName>\r
     <ModuleType>DXE_CORE</ModuleType>\r
     <GuidValue>D6A2CB7F-6A18-4e2f-B43B-9920A733700A</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DxeMain module.</Abstract>\r
   <MsaHeader>\r
     <ModuleName>DxeMain</ModuleName>\r
     <ModuleType>DXE_CORE</ModuleType>\r
     <GuidValue>D6A2CB7F-6A18-4e2f-B43B-9920A733700A</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DxeMain module.</Abstract>\r

-    <Description>This module provide an DXE CIS compliant implementation.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This module provide an DXE CIS compliant implementation of DXE Core.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
     <License>All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -104,7 +104,7 @@
     <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r


@@ -113,16 +113,16 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r


@@ -173,7 +173,7 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r


@@ -188,6 +188,9 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r


@@ -214,12 +217,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>\r
     </GuidCNames>\r

-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>\r
-    </GuidCNames>\r
-    <!--<GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>LoadPeImage</GuidCName>\r
-    </GuidCNames>-->\r

     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>\r
     </GuidCNames>\r


@@ -229,6 +226,12 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiEventReadyToBootGuid</GuidCName>\r
+    </GuidCNames>\r
+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiEventLegacyBootGuid</GuidCName>\r
+    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index fa11a87737efd175f90b466287ae539c8ca226a0..c5529661696cda5fcf7cd1b83e929915f6641c08 100644 (file)
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for DxeIpl module</Abstract>\r
     <Description>The responsibility of this module is to load the DXE Core from a Firmware Volume.  This implementation i used to load a 32-bit DXE Core.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DxeIpl module</Abstract>\r
     <Description>The responsibility of this module is to load the DXE Core from a Firmware Volume.  This implementation i used to load a 32-bit DXE Core.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
     <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


@@ -34,9 +34,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>HobLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PerformanceLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeiServicesLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PeiServicesLib</Keyword>\r
     </LibraryClass>\r


@@ -70,6 +67,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r

+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PeCoffLib</Keyword>\r
+    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DxeLoad.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DxeLoad.c</Filename>\r


@@ -134,7 +134,7 @@
     </Extern>\r
   </Externs>\r
   <PcdCoded>\r
     </Extern>\r
   </Externs>\r
   <PcdCoded>\r

-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">\r
+    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED" SupArchList="IA32">\r

       <C_Name>PcdDxeIplSwitchToLongMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DefaultValue>TRUE</DefaultValue>\r
       <C_Name>PcdDxeIplSwitchToLongMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DefaultValue>TRUE</DefaultValue>\r

diff --git a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index c764b3907eaae43d5fa7aab382666b7baaaded9d..4cf44523ed02ccd232e3df491be587b62cbda80b 100644 (file)
--- a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -29,9 +29,6 @@ TransferOldDataToNewDataRange (
   IN PEI_CORE_INSTANCE        *PrivateData\r
   );\r
 \r
   IN PEI_CORE_INSTANCE        *PrivateData\r
   );\r
 \r

-EFI_GUID gEfiPeiCorePrivateGuid = EFI_PEI_CORE_PRIVATE_GUID;\r
-\r
-\r

 EFI_STATUS\r
 PeiDispatcher (\r
   IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r
 EFI_STATUS\r
 PeiDispatcher (\r
   IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r


@@ -529,6 +526,9 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

+  //\r
+  //Build private HOB to PEI core to transfer old NEM-range data to new NEM-range\r
+  //\r

   return BuildGuidDataHob (&gEfiPeiCorePrivateGuid, PrivateData, sizeof (PEI_CORE_INSTANCE));\r
 }\r
 \r
   return BuildGuidDataHob (&gEfiPeiCorePrivateGuid, PrivateData, sizeof (PEI_CORE_INSTANCE));\r
 }\r
 \r

diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index 8aa97350bb2c0a3ea93ed585b1e2f378655d931c..53c429f6e0ef6bef2f428c99cef544217cf36197 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -24,12 +24,8 @@ Revision History
 #ifndef _PEI_MAIN_H_\r
 #define _PEI_MAIN_H_\r
 \r
 #ifndef _PEI_MAIN_H_\r
 #define _PEI_MAIN_H_\r
 \r

-//\r
-//Build private HOB to PEI core to transfer old NEM-range data to new NEM-range\r
-//\r
-#define EFI_PEI_CORE_PRIVATE_GUID  \\r
-  {0xd641a0f5, 0xcb7c, 0x4846, { 0xa3, 0x80, 0x1d, 0x01, 0xb4, 0xd9, 0xe3, 0xb9 } }\r
- \r
+extern EFI_GUID gEfiPeiCorePrivateGuid;\r
+\r

 //\r
 // Pei Core private data structures\r
 //\r
 //\r
 // Pei Core private data structures\r
 //\r

diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index 5daf40f64dcc54067ff7e49ca2cbdd3502d0a345..b8873a8ab6f385e0fd1b1b6b5d92bb32b67e51fa 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for PeiMain module</Abstract>\r
     <Description>This module provide an DXE CIS compliant implementation.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for PeiMain module</Abstract>\r
     <Description>This module provide an DXE CIS compliant implementation.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r


@@ -52,9 +52,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>TimerLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>TimerLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="SOMETIMES_CONSUMED">\r
-      <Keyword>PeCoffLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PeiMain.h</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PeiMain.h</Filename>\r


@@ -105,6 +102,11 @@
       <PpiNotifyCName>gEfiPeiSecurityPpiGuid</PpiNotifyCName>\r
     </PpiNotify>\r
   </PPIs>\r
       <PpiNotifyCName>gEfiPeiSecurityPpiGuid</PpiNotifyCName>\r
     </PpiNotify>\r
   </PPIs>\r

+  <Guids>\r
+    <GuidCNames Usage="PRIVATE">\r
+      <GuidCName>gEfiPeiCorePrivateGuid</GuidCName>\r
+    </GuidCNames>\r
+  </Guids>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r


@@ -112,4 +114,4 @@
       <ModuleEntryPoint>PeiCore</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint>PeiCore</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>\r

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index c4ef7723ce522c63e5040baf5a8202cc89b3290a..42db3586cb84142917837b1a0621aa249c3c1743 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -7,12 +7,12 @@
     <Abstract>EFI/Framework Reference Module Package for All Architectures</Abstract>\r
     <Description>This FPD file is used for Package Level build.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
     <Abstract>EFI/Framework Reference Module Package for All Architectures</Abstract>\r
     <Description>This FPD file is used for Package Level build.</Description>\r
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

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

       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r


@@ -7220,14 +7220,6 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r

-        <PcdData ItemType="FEATURE_FLAG">\r
-          <C_Name>PcdDxeIplSwitchToLongMode</C_Name>\r
-          <Token>0x0001003b</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>BOOLEAN</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>FALSE</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r
         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r


@@ -11962,14 +11954,6 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r

-        <PcdData ItemType="FEATURE_FLAG">\r
-          <C_Name>PcdDxeIplSwitchToLongMode</C_Name>\r
-          <Token>0x0001003b</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>BOOLEAN</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>FALSE</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r
         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r


@@ -16511,14 +16495,6 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
         </PcdData>\r

-        <PcdData ItemType="FEATURE_FLAG">\r
-          <C_Name>PcdDxeIplSwitchToLongMode</C_Name>\r
-          <Token>0x0001003b</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>BOOLEAN</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>FALSE</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r
         <PcdData ItemType="FEATURE_FLAG">\r
           <C_Name>PcdDxeIplSupportEfiDecompress</C_Name>\r
           <Token>0x00010034</Token>\r


@@ -20771,6 +20747,38 @@
         <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
       </Libraries>\r
       <PcdBuildDefinition>\r
         <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
       </Libraries>\r
       <PcdBuildDefinition>\r

+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+          <Token>0x00000001</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+          <Token>0x00000002</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+          <Token>0x00000003</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdSpinLockTimeout</C_Name>\r
+          <Token>0x00000004</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>10000000</Value>\r
+        </PcdData>\r

         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>\r
           <Token>0x101</Token>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>\r
           <Token>0x101</Token>\r


@@ -20779,6 +20787,45 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>320</Value>\r
         </PcdData>\r

+      </PcdBuildDefinition>\r
+    </ModuleSA>\r
+    <!--Mod: Undi Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Bus\Pci\Undi\RuntimeDxe\Undi.msa-->\r
+    <ModuleSA ModuleGuid="A1f436EA-A127-4EF8-957C-8048606FF670" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3" SupArchList="IA32">\r
+      <Libraries>\r
+        <!--Pkg: MdePkg Mod: UefiBootServicesTableLib Path: MdePkg\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.msa-->\r
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->\r
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverModelLib Path: MdePkg\Library\UefiDriverModelLib\UefiDriverModelLib.msa-->\r
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: EdkModulePkg Mod: EdkUefiRuntimeLib Path: EdkModulePkg\Library\EdkUefiRuntimeLib\EdkUefiRuntimeLib.msa-->\r
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: DxeMemoryLib Path: MdePkg\Library\DxeMemoryLib\DxeMemoryLib.msa-->\r
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->\r
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->\r
+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseDebugLibNull Path: MdePkg\Library\BaseDebugLibNull\BaseDebugLibNull.msa-->\r
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+      </Libraries>\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r

         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r


@@ -20812,11 +20859,238 @@
           <Value>10000000</Value>\r
         </PcdData>\r
       </PcdBuildDefinition>\r
           <Value>10000000</Value>\r
         </PcdData>\r
       </PcdBuildDefinition>\r

+      <ModuleSaBuildOptions>\r
+        <FvBinding>NULL</FvBinding>\r
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
+      </ModuleSaBuildOptions>\r
+    </ModuleSA>\r
+    <!--Mod: Undi Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Bus\Pci\Undi\RuntimeDxe\Undi.msa-->\r
+    <ModuleSA ModuleGuid="A1f436EA-A127-4EF8-957C-8048606FF670" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3" SupArchList="X64">\r
+      <Libraries>\r
+        <!--Pkg: MdePkg Mod: UefiDriverModelLib Path: MdePkg\Library\UefiDriverModelLib\UefiDriverModelLib.msa-->\r
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->\r
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: EdkModulePkg Mod: EdkUefiRuntimeLib Path: EdkModulePkg\Library\EdkUefiRuntimeLib\EdkUefiRuntimeLib.msa-->\r
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiBootServicesTableLib Path: MdePkg\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.msa-->\r
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: DxeMemoryLib Path: MdePkg\Library\DxeMemoryLib\DxeMemoryLib.msa-->\r
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->\r
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->\r
+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseDebugLibNull Path: MdePkg\Library\BaseDebugLibNull\BaseDebugLibNull.msa-->\r
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+      </Libraries>\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+          <Token>0x00000001</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+          <Token>0x00000002</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+          <Token>0x00000003</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdSpinLockTimeout</C_Name>\r
+          <Token>0x00000004</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>10000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
+      <ModuleSaBuildOptions>\r
+        <FvBinding>NULL</FvBinding>\r
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
+      </ModuleSaBuildOptions>\r
+    </ModuleSA>\r
+    <!--Mod: Undi Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Bus\Pci\Undi\RuntimeDxe\Undi.msa-->\r
+    <ModuleSA ModuleGuid="A1f436EA-A127-4EF8-957C-8048606FF670" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3" SupArchList="IPF">\r
+      <Libraries>\r
+        <!--Pkg: EdkModulePkg Mod: EdkUefiRuntimeLib Path: EdkModulePkg\Library\EdkUefiRuntimeLib\EdkUefiRuntimeLib.msa-->\r
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r
+        <!--Pkg: EdkModulePkg Mod: EdkDxeRuntimeSalLib Path: EdkModulePkg\Library\EdkDxeRuntimeSalLib\EdkDxeRuntimeSalLib.msa-->\r
+        <Instance ModuleGuid="61999c3c-72a5-4506-a4ff-4271d18a1d14" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiBootServicesTableLib Path: MdePkg\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.msa-->\r
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverModelLib Path: MdePkg\Library\UefiDriverModelLib\UefiDriverModelLib.msa-->\r
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->\r
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: DxeMemoryLib Path: MdePkg\Library\DxeMemoryLib\DxeMemoryLib.msa-->\r
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->\r
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->\r
+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseDebugLibNull Path: MdePkg\Library\BaseDebugLibNull\BaseDebugLibNull.msa-->\r
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+      </Libraries>\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+          <Token>0x00000001</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+          <Token>0x00000002</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+          <Token>0x00000003</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdSpinLockTimeout</C_Name>\r
+          <Token>0x00000004</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>10000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
+      <ModuleSaBuildOptions>\r
+        <FvBinding>NULL</FvBinding>\r
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
+      </ModuleSaBuildOptions>\r
+    </ModuleSA>\r
+    <!--Mod: Undi Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Bus\Pci\Undi\RuntimeDxe\Undi.msa-->\r
+    <ModuleSA ModuleGuid="A1f436EA-A127-4EF8-957C-8048606FF670" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3" SupArchList="EBC">\r
+      <Libraries>\r
+        <!--Pkg: EdkModulePkg Mod: EdkUefiRuntimeLib Path: EdkModulePkg\Library\EdkUefiRuntimeLib\EdkUefiRuntimeLib.msa-->\r
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->\r
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiBootServicesTableLib Path: MdePkg\Library\UefiBootServicesTableLib\UefiBootServicesTableLib.msa-->\r
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: UefiDriverModelLib Path: MdePkg\Library\UefiDriverModelLib\UefiDriverModelLib.msa-->\r
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: DxeMemoryLib Path: MdePkg\Library\DxeMemoryLib\DxeMemoryLib.msa-->\r
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->\r
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->\r
+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+        <!--Pkg: MdePkg Mod: BaseDebugLibNull Path: MdePkg\Library\BaseDebugLibNull\BaseDebugLibNull.msa-->\r
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>\r
+      </Libraries>\r
+      <PcdBuildDefinition>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdComponentNameDisable</C_Name>\r
+          <Token>0x0000000d</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FEATURE_FLAG">\r
+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>\r
+          <Token>0x0000000e</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>BOOLEAN</DatumType>\r
+          <MaxDatumSize>1</MaxDatumSize>\r
+          <Value>FALSE</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+          <Token>0x00000001</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+          <Token>0x00000002</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+          <Token>0x00000003</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>1000000</Value>\r
+        </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdSpinLockTimeout</C_Name>\r
+          <Token>0x00000004</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>10000000</Value>\r
+        </PcdData>\r
+      </PcdBuildDefinition>\r
+      <ModuleSaBuildOptions>\r
+        <FvBinding>NULL</FvBinding>\r
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>\r
+      </ModuleSaBuildOptions>\r

     </ModuleSA>\r
     </ModuleSA>\r

-    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->\r
-    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->\r
-    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->\r
-    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->\r

   </FrameworkModules>\r
   <DynamicPcdBuildDefinitions>\r
     <PcdBuildData ItemType="DYNAMIC">\r
   </FrameworkModules>\r
   <DynamicPcdBuildDefinitions>\r
     <PcdBuildData ItemType="DYNAMIC">\r


@@ -21041,4 +21315,4 @@
       </Sections>\r
     </Ffs>\r
   </BuildOptions>\r
       </Sections>\r
     </Ffs>\r
   </BuildOptions>\r

-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>\r

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 305d45bb0bd408e47d5730b78806c0b1ff13a19e..e7f6ab78943ff153528fa221070eb29ec2e96883 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -650,6 +650,11 @@
       <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

+    <Entry Name="EfiPeiCorePrivateGuid">\r
+      <C_Name>gEfiPeiCorePrivateGuid</C_Name>\r
+      <GuidValue>d641a0f5-cb7c-4846-a380-1d01b4d9e3b9</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

     <Entry Name="GenericPlatformVariable" GuidTypeList="EFI_VARIABLE">\r
       <C_Name>gEfiGenericPlatformVariableGuid</C_Name>\r
       <GuidValue>59d1c24f-50f1-401a-b101-f33e0daed443</GuidValue>\r
     <Entry Name="GenericPlatformVariable" GuidTypeList="EFI_VARIABLE">\r
       <C_Name>gEfiGenericPlatformVariableGuid</C_Name>\r
       <GuidValue>59d1c24f-50f1-401a-b101-f33e0daed443</GuidValue>\r


@@ -1285,4 +1290,4 @@
       <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>\r
     </PcdEntry>\r
   </PcdDeclarations>\r
       <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>\r
     </PcdEntry>\r
   </PcdDeclarations>\r

-</PackageSurfaceArea>
\ No newline at end of file
+</PackageSurfaceArea>\r