changed module's duplicated guid value

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

1 files changed, 108 insertions, 112 deletions

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.msa
index cd6c30ab60..c2835c8c8e 100644
--- 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"?>

+<!--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.
--->
-<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.-->

+<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">

+  <MsaHeader>

+    <BaseName>DxeIplX64</BaseName>

+    <ModuleType>PEIM</ModuleType>

+    <ComponentType>PE32_PEIM</ComponentType>

+    <Guid>0c55bdf7-d71d-4962-8fcb-348773e48929</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
       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>

+    <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>
\ No newline at end of file