changed module's duplicated guid value

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

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
index 800c5c2bb343be42d316a2f3e569692e13c4a3d6..e604ccf8ee36fdde653ed7c62151335cac13706a 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebusLite.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <BaseName>IdeBusLite</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>BS_DRIVER</ComponentType>\r
   <MsaHeader>\r
     <BaseName>IdeBusLite</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>BS_DRIVER</ComponentType>\r

-    <Guid>69FD8E47-A161-4550-B01A-5594CEB2B2B2</Guid>\r
+    <Guid>5db1d982-602b-4f27-9457-0513fd96ef00</Guid>\r

     <Version>0</Version>\r
     <Abstract>Component description file for PS2 keyboard module.</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>Component description file for PS2 keyboard module.</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-12 17:09</Created>\r
     <Updated>2006-03-19 15:18</Updated>\r
     <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
     <Created>2006-03-12 17:09</Created>\r
     <Updated>2006-03-19 15:18</Updated>\r
     <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r


@@ -76,11 +72,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </Guids>\r
   <Externs>\r
     <Extern>\r
   </Guids>\r
   <Externs>\r
     <Extern>\r

-      <ModuleEntryPoint></ModuleEntryPoint>\r
+      <ModuleEntryPoint/>\r

     </Extern>\r
     <Extern>\r
       <DriverBinding>gIDEBusDriverBinding</DriverBinding>\r
       <ComponentName>gIDEBusComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
     </Extern>\r
     <Extern>\r
       <DriverBinding>gIDEBusDriverBinding</DriverBinding>\r
       <ComponentName>gIDEBusComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
index 5d629422aef8248ff7f200796c44fc6c9a35f8cc..7f0ca71f905103f990796574b59be8cc7666e812 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <BaseName>PciBusPciBusLite</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>BS_DRIVER</ComponentType>\r
   <MsaHeader>\r
     <BaseName>PciBusPciBusLite</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>BS_DRIVER</ComponentType>\r

-    <Guid>C0734D12-7927-432b-986B-A7E3A35BA005</Guid>\r
+    <Guid>4b186349-7da2-454d-8187-99d85fa03b5c</Guid>\r

     <Version>0</Version>\r
     <Abstract>Component description file for LightPciBus module.</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>Component description file for LightPciBus module.</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-12 17:09</Created>\r
     <Updated>2006-03-19 15:18</Updated>\r
     <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
     <Created>2006-03-12 17:09</Created>\r
     <Updated>2006-03-19 15:18</Updated>\r
     <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r


@@ -108,4 +104,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ComponentName>gPciBusComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
       <ComponentName>gPciBusComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

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

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
index cd6c30ab604a3e06370beb6a2dc19c487091b1dd..c2835c8c8eab0eb1c007f965bc037d76ecefc515 100644 (file)
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
@@ -1,122 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--Copyright (c) 2006, Intel Corporation

 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,
 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.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaHeader>
-    <BaseName>DxeIplX64</BaseName>
-    <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>86D70125-BAA3-4296-A62F-602BEBBB9081</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
-    <Abstract>Component description file for DxeIpl module</Abstract>
-    <Description>FIX ME!</Description>
-    <Copyright>Copyright 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->\r
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <MsaHeader>\r
+    <BaseName>DxeIplX64</BaseName>\r
+    <ModuleType>PEIM</ModuleType>\r
+    <ComponentType>PE32_PEIM</ComponentType>\r
+    <Guid>0c55bdf7-d71d-4962-8fcb-348773e48929</Guid>\r
+    <Version>EDK_RELEASE_VERSION        0x00020000</Version>\r
+    <Abstract>Component description file for DxeIpl module</Abstract>\r
+    <Description>FIX ME!</Description>\r
+    <Copyright>Copyright 2004-2006, 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,
       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>
-    <Created>2006-04-03 23:58</Created>
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>
-  </MsaHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">CacheMaintenanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">TianoDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">CustomDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderX64Lib</LibraryClass>
-  </LibraryClassDefinitions>
-  <SourceFiles>
-    <Filename>DxeIpl.dxs</Filename>
-    <Filename>DxeLoadX64.c</Filename>
-    <Arch ArchType="IA32">
-      <Filename>x64/ImageRead.c</Filename>
-      <Filename>x64/LongMode.asm</Filename>
-      <Filename>x64/DxeLoadFunc.c</Filename>
-      <Filename>x64/VirtualMemory.c</Filename>
-    </Arch>
-  </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-  </Includes>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">Decompress</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">TianoDecompress</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">CustomizedDecompress</Protocol>
-  </Protocols>
-  <Hobs>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">
-      <C_Name>gEfiHobMemoryAllocBspStoreGuid</C_Name>
-      <Guid>0x564b33cd, 0xc92a, 0x4593, 0x90, 0xbf, 0x24, 0x73, 0xe4, 0x3c, 0x63, 0x22</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiDecompressProtocolGuid</C_Name>
-      <Guid>0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>
-      <Guid>0xe84cf29c, 0x191f, 0x4eae, 0x96, 0xe1, 0xf4, 0x6a, 0xec, 0xea, 0xea, 0x0b</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>
-      <Guid>0x9a44198e, 0xa4a2, 0x44e6, 0x8a, 0x1f, 0x39, 0xbe, 0xfd, 0xac, 0x89, 0x6f</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>
-      <Guid>0xd8117cff, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">
-      <C_Name>gEfiHobMemoryAllocModuleGuid</C_Name>
-      <Guid>0xf8e21975, 0x0899, 0x4f58, 0xa4, 0xbe, 0x55, 0x25, 0xa9, 0xc6, 0xd7, 0x7a</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="FIRMWARE_VOLUME">
-      <Name>DecompressedFvmain.fv</Name>
-    </Hob>
-  </Hobs>
-  <PPIs>
-    <Ppi Usage="SOMETIMES_PRODUCED">DxeIpl</Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">FvFileLoader</Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">EndOfPeiSignal</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">RecoveryModule</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">S3Resume</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">SectionExtraction</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">Security</Ppi>
-    <Ppi Usage="PRIVATE">PeiInMemory</Ppi>
-  </PPIs>
-  <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>PeiPeCoffLoader</C_Name>
-    </GuidEntry>
-  </Guids>
-  <Externs>
-    <Extern>
-      <ModuleEntryPoint>PeimInitializeDxeIpl</ModuleEntryPoint>
-    </Extern>
-  </Externs>
-  <BuildOptions ToolChain="MSFT">
-    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>
-  </BuildOptions>
-</ModuleSurfaceArea>
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
+    <Created>2006-04-03 23:58</Created>\r
+    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
+  </MsaHeader>\r
+  <LibraryClassDefinitions>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">CacheMaintenanceLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDecompressLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">TianoDecompressLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">CustomDecompressLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderX64Lib</LibraryClass>\r
+  </LibraryClassDefinitions>\r
+  <SourceFiles>\r
+    <Filename>DxeIpl.dxs</Filename>\r
+    <Filename>DxeLoadX64.c</Filename>\r
+    <Arch ArchType="IA32">\r
+      <Filename>x64/ImageRead.c</Filename>\r
+      <Filename>x64/LongMode.asm</Filename>\r
+      <Filename>x64/DxeLoadFunc.c</Filename>\r
+      <Filename>x64/VirtualMemory.c</Filename>\r
+    </Arch>\r
+  </SourceFiles>\r
+  <Includes>\r
+    <PackageName>MdePkg</PackageName>\r
+    <PackageName>EdkModulePkg</PackageName>\r
+  </Includes>\r
+  <Protocols>\r
+    <Protocol Usage="ALWAYS_CONSUMED">Decompress</Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">TianoDecompress</Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">CustomizedDecompress</Protocol>\r
+  </Protocols>\r
+  <Hobs>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">\r
+      <C_Name>gEfiHobMemoryAllocBspStoreGuid</C_Name>\r
+      <Guid>0x564b33cd, 0xc92a, 0x4593, 0x90, 0xbf, 0x24, 0x73, 0xe4, 0x3c, 0x63, 0x22</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">\r
+      <C_Name>gEfiDecompressProtocolGuid</C_Name>\r
+      <Guid>0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">\r
+      <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>\r
+      <Guid>0xe84cf29c, 0x191f, 0x4eae, 0x96, 0xe1, 0xf4, 0x6a, 0xec, 0xea, 0xea, 0x0b</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">\r
+      <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>\r
+      <Guid>0x9a44198e, 0xa4a2, 0x44e6, 0x8a, 0x1f, 0x39, 0xbe, 0xfd, 0xac, 0x89, 0x6f</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">\r
+      <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>\r
+      <Guid>0xd8117cff, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">\r
+      <C_Name>gEfiHobMemoryAllocModuleGuid</C_Name>\r
+      <Guid>0xf8e21975, 0x0899, 0x4f58, 0xa4, 0xbe, 0x55, 0x25, 0xa9, 0xc6, 0xd7, 0x7a</Guid>\r
+    </Hob>\r
+    <Hob Usage="SOMETIMES_PRODUCED" HobType="FIRMWARE_VOLUME">\r
+      <Name>DecompressedFvmain.fv</Name>\r
+    </Hob>\r
+  </Hobs>\r
+  <PPIs>\r
+    <Ppi Usage="SOMETIMES_PRODUCED">DxeIpl</Ppi>\r
+    <Ppi Usage="SOMETIMES_PRODUCED">FvFileLoader</Ppi>\r
+    <Ppi Usage="SOMETIMES_PRODUCED">EndOfPeiSignal</Ppi>\r
+    <Ppi Usage="SOMETIMES_CONSUMED">RecoveryModule</Ppi>\r
+    <Ppi Usage="SOMETIMES_CONSUMED">S3Resume</Ppi>\r
+    <Ppi Usage="SOMETIMES_CONSUMED">SectionExtraction</Ppi>\r
+    <Ppi Usage="SOMETIMES_CONSUMED">Security</Ppi>\r
+    <Ppi Usage="PRIVATE">PeiInMemory</Ppi>\r
+  </PPIs>\r
+  <Guids>\r
+    <GuidEntry Usage="ALWAYS_CONSUMED">\r
+      <C_Name>PeiPeCoffLoader</C_Name>\r
+    </GuidEntry>\r
+  </Guids>\r
+  <Externs>\r
+    <Extern>\r
+      <ModuleEntryPoint>PeimInitializeDxeIpl</ModuleEntryPoint>\r
+    </Extern>\r
+  </Externs>\r
+  <BuildOptions ToolChain="MSFT">\r
+    <ImageEntryPoint>_ModuleEntryPoint</ImageEntryPoint>\r
+  </BuildOptions>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
index 77820166a1f33e85e11ffd421a775ef705cf7dd2..dd27a8968a0271217c2f0e73783b37169dd66c99 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<LibraryModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaLibHeader>\r
     <BaseName>BasePostCodeLibDebug</BaseName>\r
     <ModuleType>BASE</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r
   <MsaLibHeader>\r
     <BaseName>BasePostCodeLibDebug</BaseName>\r
     <ModuleType>BASE</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r

-    <Guid>55c61087-7367-4546-bc32-4937c5e6aff3</Guid>\r
+    <Guid>19e3bbba-beb1-43e8-b32d-9acbb22c7639</Guid>\r

     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r
     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r


@@ -47,4 +43,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r

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

diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
index 096ed56e387858131d5096562cb25c46cc380d56..184fe8b92cc666d3d82e6d48b1fba6d148c200c2 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
+++ b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<LibraryModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaLibHeader>\r
     <BaseName>BasePostCodeLibPort80</BaseName>\r
     <ModuleType>BASE</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r
   <MsaLibHeader>\r
     <BaseName>BasePostCodeLibPort80</BaseName>\r
     <ModuleType>BASE</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r

-    <Guid>55c61087-7367-4546-bc32-4937c5e6aff3</Guid>\r
+    <Guid>b6e9a733-eb75-41b6-b30c-009bcf3801c8</Guid>\r

     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r
     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r


@@ -47,4 +43,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r

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

diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
index 6f3e0ae1698de0e16faf7994b9ad82473adc1a4e..81fbfabb47928d197cdb8170ad6bca54c3f3f5d1 100644 (file)
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<LibraryModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaLibHeader>\r
     <BaseName>PeiDxePostCodeLibReportStatusCode</BaseName>\r
     <ModuleType>PEIM</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r
   <MsaLibHeader>\r
     <BaseName>PeiDxePostCodeLibReportStatusCode</BaseName>\r
     <ModuleType>PEIM</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r

-    <Guid>55c61087-7367-4546-bc32-4937c5e6aff3</Guid>\r
+    <Guid>e062c52d-78dc-4cc5-b246-b13497a8123c</Guid>\r

     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>FIX ME!</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r
     <Created>2006-03-09 23:16</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r


@@ -48,4 +44,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r
     </PcdEntry>\r
   </PcdCoded>\r

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

diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
index 7856e2b8ce11f4a5d933682d5c07947a70db0ec1..3f6f7f257cc5a3beb2b220aec75aaff955a6d264 100644 (file)
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<LibraryModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaLibHeader>\r
     <BaseName>UefiBootServicesTableLib</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r
   <MsaLibHeader>\r
     <BaseName>UefiBootServicesTableLib</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r

-    <Guid>baa1baa3-0a8d-402c-8042-985115fae953</Guid>\r
+    <Guid>ff5c7a2c-ab7a-4366-8616-11c6e53247b6</Guid>\r

     <Version>0</Version>\r
     <Abstract>UEFI Boot Services Table Library</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>UEFI Boot Services Table Library</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-17 15:49</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r
     <Created>2006-03-17 15:49</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r


@@ -46,4 +42,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>UefiBootServicesTableLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r
       <Constructor>UefiBootServicesTableLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

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

diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
index c0e6dcbcd8a96a7de6b1399a3787c7b23e02f94e..74831d74cd4c1b01edf95cb916caedb16a1a3f94 100644 (file)
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
+<!--Copyright (c) 2006, Intel Corporation
+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.-->\r
+<LibraryModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaLibHeader>\r
     <BaseName>UefiRuntimeServicesTableLib</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r
   <MsaLibHeader>\r
     <BaseName>UefiRuntimeServicesTableLib</BaseName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <ComponentType>LIBRARY</ComponentType>\r

-    <Guid>baa1baa3-0a8d-402c-8042-985115fae953</Guid>\r
+    <Guid>19cbbb97-ff61-45ff-8c3f-dfa66dd118c8</Guid>\r

     <Version>0</Version>\r
     <Abstract>UEFI Runtime Services Table Library</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <Version>0</Version>\r
     <Abstract>UEFI Runtime Services Table Library</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r

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

     <Created>2006-03-17 15:49</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r
     <Created>2006-03-17 15:49</Created>\r
     <Updated>2006-03-19 15:17</Updated>\r
     <Specification>0</Specification>\r


@@ -46,4 +42,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>UefiRuntimeServicesTableLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r
       <Constructor>UefiRuntimeServicesTableLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

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