converted all surface area description files to new schema

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

2 files changed, 95 insertions, 73 deletions

diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa
index 705bef6..b5ec421 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.msa
@@ -1,43 +1,53 @@
 <?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">

+<!--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 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>NullMemoryTest</BaseName>

+    <ModuleName>NullMemoryTest</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>96B5C032-DF4C-4b6e-8232-438DCF448D0E</Guid>

-    <Version>0</Version>

+    <GuidValue>96B5C032-DF4C-4b6e-8232-438DCF448D0E</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for DiskIo module.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 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-03-12 17:09</Created>

-    <Updated>2006-03-19 15:19</Updated>

-    <Specification>0</Specification>

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

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>NullMemoryTest</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DxeServicesTableLib</LibraryClass>            

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DxeServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>Common.h</Filename>

@@ -45,16 +55,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>NullMemoryTest.h</Filename>

     <Filename>NullMemoryTest.dxs</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED">GenericMemTest</Protocol>    

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>GenericMemTest</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

     <Extern>

       <ModuleEntryPoint>GenericMemoryTestEntryPoint</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
index 2764fb3..f81c0f2 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.msa
@@ -1,54 +1,62 @@
 <?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">

+<!--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 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>PeiBaseMemoryTestInit</BaseName>

+    <ModuleName>PeiBaseMemoryTestInit</ModuleName>

     <ModuleType>PEIM</ModuleType>

-    <ComponentType>PE32_PEIM</ComponentType>

-    <Guid>736EB068-8C01-47c5-964B-1C57BD5D4D64</Guid>

-    <Version>0</Version>

+    <GuidValue>736EB068-8C01-47c5-964B-1C57BD5D4D64</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for DiskIo module.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 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-03-12 17:09</Created>

-    <Updated>2006-03-19 15:19</Updated>

-    <Specification>0</Specification>

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

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>PeiBaseMemoryTestInit</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PeimEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PeiServicesLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>BaseMemoryTest.c</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <PPIs>

-    <Ppi Usage="ALWAYS_PRODUCED">BaseMemoryTest</Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>BaseMemoryTest</PpiCName>

+    </Ppi>

   </PPIs>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

     <Extern>

       <ModuleEntryPoint>PeiBaseMemoryTestInit</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

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